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

Timestamp:

Jul 5, 2015, 6:24:33 PM (9 years ago)

Author:

chronos

Message:

• Modified: Added Direction column to finance operations and invoices. This column will serve as real direction where ValueSign could be different for storno operations.

File:

• trunk/Modules/Finance/Finance.php (modified) (7 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);
 
 class Finance extends Model
@@ -219 +220 @@
         'Cash' => array('Type' => 'Boolean', 'Caption' => 'Hotově', 'Default' => ''),
         'Taxable' => array('Type' => 'Boolean', 'Caption' => 'Zdanitelné', 'Default' => ''),
-        'ValueSign' => array('Type' => 'TFinanceOperationValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
+        'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
@@ -278 +280 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => '0'),
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => '0'),
-        'ValueSign' => array('Type' => 'TFinanceInvoiceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
+        'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
       ),
     ));
@@ -288 +291 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TFinanceOperationValueSign', array(
+    $this->System->FormManager->RegisterFormType('TFinanceValueSign', array(
       'Type' => 'Enumeration',
       'States' => array(-1 => 'Mínus', 1 => 'Plus'),
+    ));
+    $this->System->FormManager->RegisterFormType('TFinanceDirection', array(
+      'Type' => 'Enumeration',
+      'States' => array(0 => 'Příjem', 1 => 'Výdej'),
     ));
     $this->System->FormManager->RegisterClass('FinanceInvoice', array(
@@ -304 +311 @@
         'TimeDue' => array('Type' => 'Date', 'Caption' => 'Čas splatnosti', 'Default' => ''),
         'TimePayment' => array('Type' => 'Date', 'Caption' => 'Čas zaplacení', 'Default' => '', 'Null' => true),
-        'ValueSign' => array('Type' => 'TFinanceInvoiceValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
+        'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
@@ -331 +339 @@
     $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Group']['Filter'] = true;
 
-    $this->System->FormManager->RegisterFormType('TFinanceInvoiceValueSign', array(
-        'Type' => 'Enumeration',
-        'States' => array(-1 => 'Mínus', 1 => 'Plus'),
-    ));
-
     $this->System->FormManager->RegisterClass('FinanceInvoiceGroup', array(
       'Title' => 'Skupina faktur',
@@ -342 +345 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => '0'),
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => '0'),
-        'ValueSign' => array('Type' => 'TFinanceInvoiceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
+        'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
       ),
     ));