Changeset 741 for trunk/Modules/Finance

Timestamp:

Jul 5, 2015, 6:24:33 PM (10 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.

Location:

trunk/Modules/Finance

Files:

• Bill.php (modified) (4 diffs)
• Finance.php (modified) (7 diffs)
• Manage.php (modified) (3 diffs)

trunk/Modules/Finance/Bill.php

@@ -78 +78 @@
     }
 
-    // If negative value => switch sides
-    if($Invoice['ValueSign'] == -1)
+    // If direction is in => switch sides
+    if($Invoice['Direction'] == FINANCE_DIRECTION_OUT) 
+    {           
+    }
+    else if($Invoice['Direction'] == FINANCE_DIRECTION_IN)
     {
       $Subject = $SubjectTo;
@@ -85 +88 @@
       $SubjectFrom = $Subject;
     }
+    else throw new Exception('Wrong finance direction');
 
     $PaymentType = array('převodem', 'hotově');
@@ -162 +166 @@
 
     $BooleanText = array('Ne', 'Ano');
-    if($Operation['ValueSign'] == -1)
+    if($Operation['Direction'] == FINANCE_DIRECTION_OUT)
     $Desc = array(
       'Type' => 'VÝDAJOVÝ',
@@ -168 +172 @@
       'Target' => 'Vydáno komu',
     );
-    else if($Operation['ValueSign'] == 1)
+    else if($Operation['Direction'] == FINANCE_DIRECTION_IN)
     $Desc = array(
       'Type' => 'PŘÍJMOVÝ',

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'),
       ),
     ));

trunk/Modules/Finance/Manage.php

@@ -101 +101 @@
 
   function InsertInvoice($Subject, $TimeCreation, $TimeDue, $ValueSign, $Items,
-  $Group, $PeriodFrom, $PeriodTo)
+  $Group, $PeriodFrom, $PeriodTo, $Direction)
   {
     global $LastInsertTime;
@@ -114 +114 @@
       'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
       'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue,
-      'ValueSign' => $ValueSign, 'BillCode' => $BillCode,
+      'ValueSign' => $ValueSign, 'BillCode' => $BillCode, 'Direction' => $Direction,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
       'Generate' => 1, 'Group' => $FinanceGroup['Id']));
@@ -185 +185 @@
           $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $FinanceGroup['ValueSign'], $InvoiceItems, $FinanceGroup, $Period['From'], $Period['To']);
+            $FinanceGroup['ValueSign'], $InvoiceItems, $FinanceGroup, $Period['From'], 
+                $Period['To'], $FinanceGroup['Direction']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);