Changeset 549 for trunk

Timestamp:

Jul 6, 2013, 12:22:02 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: Vlastnost Generate u plateb a faktur pro určení, které doklady se mají zpožděně generovat jako PDF.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (2 diffs)
• Modules/Finance/Manage.php (modified) (2 diffs)
• admin/Updates.php (modified) (2 diffs)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 547; // Subversion revision
-$DatabaseRevision = 535; // SQL structure revision
-$ReleaseTime = '2013-06-12';
+$Revision = 549; // Subversion revision
+$DatabaseRevision = 549; // SQL structure revision
+$ReleaseTime = '2013-07-05';
 

trunk/Modules/Finance/Finance.php

@@ -366 +366 @@
         'BankAccount' => array('Type' => 'TFinanceBankAccount', 'Caption' => 'Účet', 'Default' => '', 'Null' => true),
         'Treasury' => array('Type' => 'TFinanceTreasury', 'Caption' => 'Pokladna', 'Default' => '', 'Null' => true),
+        'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
       ),
     ));
@@ -380 +381 @@
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
+        'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
         'Items' => array('Type' => 'TFinanceInvoiceItemListInvoice', 'Caption' => 'Položky', 'Default' => ''),
       ),

trunk/Modules/Finance/Manage.php

@@ -148 +148 @@
       'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 
       'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue, 'BillCode' => $BillCode,
-      'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo)));
+      'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
+      'Generate' => 1));
     $InvoiceId = $this->Database->insert_id;
     foreach($Items as $Item)
@@ -552 +553 @@
     // FinanceInvoice
     $DbResult = $this->Database->query('SELECT * FROM `FinanceInvoice` WHERE (`BillCode` <> "") '.
-      'AND (`Value` != 0) AND (`File` IS NULL)');
+      'AND (`Value` != 0) AND (`File` IS NULL) AND (`Generate` = 1)');
     while($Row = $DbResult->fetch_assoc())
     {

trunk/admin/Updates.php

@@ -314 +314 @@
 }
 
+function UpdateTo535($Manager)
+{
+  $Manager->Execute("ALTER TABLE `FinanceOperation` ADD `Generate` INT NOT NULL DEFAULT '0',
+ADD INDEX ( `Generate` ) ;");
+  $Manager->Execute("ALTER TABLE `FinanceInvoice` ADD `Generate` INT NOT NULL DEFAULT '0',
+ADD INDEX ( `Generate` ) ;");
+}
+
 $Updates = array(
   491 => array('Revision' => 493, 'Function' => 'UpdateTo493'),
@@ -330 +338 @@
   526 => array('Revision' => 527, 'Function' => 'UpdateTo527'),
   527 => array('Revision' => 535, 'Function' => 'UpdateTo535'),
+  535 => array('Revision' => 549, 'Function' => 'UpdateTo549'),
 );