Changeset 326 for trunk/finance

Timestamp:

Dec 13, 2011, 9:13:03 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Zprovozněn import plateb z CSV souboru převedeného z SYLK formátu excelu exportovaného z bankovnictví poštovní spořitelny.

File:

• trunk/finance/import.php (modified) (5 diffs)

trunk/finance/import.php

@@ -26 +26 @@
   }
   
-  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $DocumentLine)
-  {
-
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
-    $this->Database->insert('FinanceOperation', array('Text' => $Text, 'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
-  }
-
   function Prepare()
   {   
@@ -73 +66 @@
       $Automatic = '';
       $Manual = '';
-      $Output .= '<form action="?Operation=insert" method="post">';
+      $Output = '<form action="?Operation=insert" method="post">';
       $I = 0;
       foreach($Data as $Key => $Value)
@@ -79 +72 @@
         if(count($Value) <= 1) continue;
         if($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
+        $Time = explode('.', $Value[0]);
+        $Time = $Time[2].'-'.$Time[1].'-'.$Time[0];
+        $Money = $Value[1];
         if(is_numeric($Value[5]))
         {
-          $Time = explode('.', $Value[0]);
-          $Time = $Time[2].'-'.$Time[1].'-'.$Time[0];
-          $Money = $Value[1];
           $Subject = $Value[5] * 1;
-          $Automatic .= '<tr>'.
-            '<td>Automaticky</td>'.
+          $DbResult = $this->Database->query('SELECT Id FROM Subject WHERE Id='.$this->Database->real_escape_string($Subject));
+          if($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
+        } else
+        {
+          $Subject = '? ('.$Value[5].')';
+        }
+        if(!is_numeric($Subject)) 
+        {
+          $Mode = 'Ručně';
+          $Style = 'style="background-color: LightPink;" ';
+        } else 
+        {
+          $Mode = 'Automaticky';
+          $Style = '';
+        }
+    
+        if($Money < 0) $Text = 'Platba převodem';
+          else $Text = 'Přijatá platba';
+        $Automatic .= '<tr>'.
+            //'<td>'.$Mode.'</td>'.
             '<td><input type="text" name="Date'.$I.'" value="'.$Time.'"/></td>'.
-            '<td><input type="text" name="Subject'.$I.'" value="'.$Subject.'"/></td>'.
+            '<td><input type="text" '.$Style.'name="Subject'.$I.'" value="'.$Subject.'"/></td>'.
             '<td>'.$Value[8].'</td>'.
             '<td><input type="text" name="Money'.$I.'" value="'.$Money.'"/></td>'.
-            '<td><input type="text" name="Text'.$I.'" value="Vklad"/></td>'.
+            '<td><input type="text" name="Text'.$I.'" value="'.$Text.'"/></td>'.
             '<td><input type="text" name="Taxable'.$I.'" value="1"/></td>'.
             '<td><input type="text" name="Network'.$I.'" value="1"/></td>'.
             '</tr><tr><td colspan="7">'.implode(', ', $Value).'</td></tr>'; 
-        } else
-        {
-          $Time = explode('.', $Value[0]);
-          $Time = $Time[2].'-'.$Time[1].'-'.$Time[0];
-          $Money = $Value[1];
-          $Subject = '?';
-          $Automatic .= '<tr>'.
-            '<td>Ručně</td>'.
-            '<td><input type="text" name="Date'.$I.'" value="'.$Time.'"/></td>'.
-            '<td><input type="text" name="Subject'.$I.'" value="'.$Subject.'"/></td>'.
-            '<td>'.$Value[8].'</td>'.
-            '<td><input type="text" name="Money'.$I.'" value="'.$Money.'"/></td>'.
-            '<td><input type="text" name="Text'.$I.'" value="Vklad"/></td>'.
-            '<td><input type="text" name="Taxable'.$I.'" value="1"/></td>'.
-            '<td><input type="text" name="Network'.$I.'" value="1"/></td>'.
-            '</tr><tr><td colspan="7">'.implode(', ', $Value).'</td></tr>'; 
-        }
         $I++;
       }
       $Output .= '<table class="WideTable">'.
-        '<tr><th>Zpracování</th><th>Datum</th><th>Var. symbol</th><th>Protiúčet</th><th>Částka [Kč]</th><th>Text</th><th>Zdanitelné</th><th>Síť</th></tr>';
+        '<tr>'.
+        //'<th>Zpracování</th>'.
+        '<th>Datum</th><th>Var. symbol</th><th>Protiúčet</th><th>Částka [Kč]</th><th>Text</th><th>Zdanitelné</th><th>Síť</th></tr>';
       $Output .= $Automatic.'</table>';
       $Output .= '<input type="hidden" name="ItemCount" value="'.$I.'"/>'; 
@@ -123 +119 @@
   }
   
+  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $DocumentLine)
+  {
+
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+    $this->Database->insert('FinanceOperation', array('Text' => $Text, 'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
+  }
+
   function Insert()
   {
@@ -128 +131 @@
     $Output = '';
     
-    for($I = 0; $I < $_POST['ItemCount']; $I++)
+    for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
       if($_POST['Money'.$I] < 0) $DocumentLine = 4;
         else $DocumentLine = 3;
-      $this->InsertMoney($_POST['Subject'.$I], $_POST['Money'.$I], 0, $_POST['Taxable'.$I], $_POST['Date'.$I], $_POST['Text'.$I], $DocumentLine);
+      $Date = explode('-', $_POST['Date'.$I]);
+      $Date = mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]);
+      $this->InsertMoney($_POST['Subject'.$I], $_POST['Money'.$I], 0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $DocumentLine);
       $Output .= $I.', ';
       $this->System->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');