Changeset 789

Timestamp:

Jan 16, 2016, 4:58:06 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Error during insertion of new contracts.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 788; // Subversion revision
+$Revision = 789; // Subversion revision
 $DatabaseRevision = 785; // SQL structure revision
 $ReleaseTime = strtotime('2016-01-15');

trunk/Modules/Finance/Finance.php

@@ -540 +540 @@
         'File' => array('Type' => 'TFile', 'Caption' => 'Soubor', 'Default' => '', 'Null' => true),
       ),
-      'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
+      'BeforeInsert' => array($this, 'BeforeInsertContract'),
     ));
     $this->System->FormManager->RegisterFormType('TContract', array(
@@ -668 +668 @@
     return($Form->Values);
   }
+
+  function BeforeInsertContract($Form)
+  {
+    if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+      else $Year = date("Y", $Form->Values['ValidFrom']);
+    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Form->Values['DocumentLine'], $Year);
+    return($Form->Values);
+  }
 }