Changeset 748 for trunk/Modules/Finance/Finance.php

Timestamp:

Sep 30, 2015, 11:55:11 PM (9 years ago)

Author:

chronos

Message:

• Added: Configuration of finance numbers rounding.
• Fixed: Use BillCode column as reference to DocumentLineCode table.
• Fixed: More ValueSign converted to FinanceOperationGroup and FinanceInvoiceGroup.

File:

• trunk/Modules/Finance/Finance.php (modified) (6 diffs)

trunk/Modules/Finance/Finance.php

@@ -17 +17 @@
 define('INVOICE_GROUP_OUT', 2);
 define('VAT_TYPE_BASE', 2);
-define('FINANCE_DIRECTION_OUT', 0);
-define('FINANCE_DIRECTION_IN', 1);
+define('FINANCE_DIRECTION_OUT', 1);
+define('FINANCE_DIRECTION_IN', 0);
 
 class Finance extends Model
@@ -39 +39 @@
   var $BillingPeriods;
   var $DirectoryId;
+  var $Rounding;
 
   function LoadMonthParameters($Period = 1) // 0 - now, 1 - next month
@@ -74 +75 @@
     $this->TotalInternetPaid = $Row['MonthlyInternet'];
     $this->TotalPaid = $Row['MonthlyTotal'];
+    $this->Rounding = $this->System->Config['Finance']['Rounding'];
   }
 
@@ -293 +295 @@
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => '0'),
         'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
-        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
       ),
     ));
@@ -325 +327 @@
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka absolutní', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true),
         'ValueUser' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-          'SQL' => 'SELECT SUM(CEIL(`Price`*`Quantity`)) FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=#Id'),
+          'SQL' => 'SELECT ROUND(SUM(`Price`*`Quantity`), '.$Config['Finance']['Rounding'].') FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=#Id'),
+        'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
         'PeriodFrom' => array('Type' => 'Date', 'Caption' => 'Období od', 'Default' => '', 'Null' => true),
@@ -390 +393 @@
         'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň', 'Default' => '21', 'Suffix' => '%'),
         'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč',
-          'ReadOnly' => true, 'SQL' => 'CEIL(`Price` * `Quantity`)'),
+          'ReadOnly' => true, 'SQL' => 'ROUND(`Price` * `Quantity`, '.$Config['Finance']['Rounding'].')'),
       ),
       'AfterInsert' => array($this, 'AfterInsertFinanceInvoiceItem'),