Changeset 628

Timestamp:

Jan 2, 2014, 1:20:35 PM (11 years ago)

Author:

chronos

Message:

• Odstraněno: Ladící výpisy z Fio importu.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (1 diff)
• Modules/FinanceBankAPI/FioAPI.php (modified) (2 diffs)
• Modules/FinanceBankAPI/ImportFio.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (2 diffs)

trunk/Application/FormClasses.php

@@ -62 +62 @@
       'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),        
       'FinanceYear' => array('Type' => 'TFinanceYear', 'Caption' => 'Účetní rok', 'Default' => ''),        
-      'NextNumber' => array('Type' => 'Integer', 'Caption' => 'Další číslo', 'Default' => ''),        
-      'YearPrefix' => array('Type' => 'Boolean', 'Caption' => 'Rok jako předpona', 'Default' => ''),        
+      'NextNumber' => array('Type' => 'Integer', 'Caption' => 'Další číslo', 'Default' => '1'),        
+      'YearPrefix' => array('Type' => 'Boolean', 'Caption' => 'Rok jako přípona', 'Default' => '1'),        
       'Operations' => array('Type' => 'TFinanceOperationListDocumentLine', 'Caption' => 'Finanční operace', 'Default' => ''),
       'Invoices' => array('Type' => 'TFinanceInvoiceListDocumentLine', 'Caption' => 'Faktury', 'Default' => ''),
@@ -79 +79 @@
       'Sequence' => array('Type' => 'TDocumentLineSequenceListYear', 'Caption' => 'Čísleníky', 'Default' => ''),        
     ),
+    //'AfterInsert' => array($this, 'AfterInsertFinanceYear'),
   ),
   'Language' => array(

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 627; // Subversion revision
+$Revision = 628; // Subversion revision
 $DatabaseRevision = 627; // SQL structure revision
 $ReleaseTime = mktime(0, 0, 0, 1, 2, 2014);

trunk/Modules/Finance/Finance.php

@@ -165 +165 @@
       $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY `Year` DESC LIMIT 1');
     } else $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$FinanceYear);
-        echo('rok:'.$FinanceYear.' '.$DbResult->num_rows);
     if($DbResult->num_rows == 0) throw new Exception('Rok '.$FinanceYear.' nenalezen');
     $FinanceYear = $DbResult->fetch_assoc();

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -28 +28 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      echo($DbRow['Id'].',');
       if(is_numeric($DbRow['VariableSymbol']))
       {

trunk/Modules/FinanceBankAPI/FioAPI.php

@@ -31 +31 @@
     $RequestURL = '/ib_api/rest/periods/'.$this->Token.'/'.
       date('Y-m-d', $TimeFrom).'/'.date('Y-m-d', $TimeTo).'/transactions.'.$this->Format;
-    echo($RequestURL);
     $Response = file_get_contents('https://www.fio.cz'.$RequestURL);
     if($Response == FALSE) 
@@ -38 +37 @@
     } else 
     {
-      echo($Response);
       if($this->Format == 'gpc') $Response = iconv('windows-1250', $this->Encoding, $Response);
       $Response = explode("\n", $Response);

trunk/Modules/FinanceBankAPI/ImportFio.php

@@ -13 +13 @@
     $PeriodEnd = time();
     $Records = $Fio->Import($PeriodStart, $PeriodEnd);
-    print_r($Records);
-    //die();
     $Output = '<table>';
       //$Output .= '<tr>';

trunk/Modules/IS/IS.php

@@ -167 +167 @@
             $this->Values = $Class->$Method($Form);
           }
+          $Form->Validate();
           $Form->SaveValuesToDatabase(0);
           $Id = $this->Database->insert_id;
@@ -173 +174 @@
           $Output .= $this->SystemMessage('Přidání položky', 'Nová položka vytvořena');
           $Output .= $this->ShowView($Table, $Id);   
+          if(array_key_exists('AfterInsert', $Form->Definition))
+          {
+            $Class = $Form->Definition['AfterInsert'][0];
+            $Method = $Form->Definition['AfterInsert'][1];
+            $this->Values = $Class->$Method($Form);
+          }
         //$this->Database->update($Table, 'Id='.$Id, 
         //  array('UserCreate' => $this->System->User->User['Id'],