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

Timestamp:

Jan 3, 2015, 5:55:34 PM (10 years ago)

Author:

chronos

Message:

• Modified: Invoice negative values replaced by Direction column which is used to determine if invoice is in or out invoice.

File:

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

trunk/Modules/Finance/Finance.php

@@ -186 +186 @@
     while($Member = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(-Value*Direction), 0) FROM FinanceOperation '.
-          'WHERE Subject='.$Member['Subject'].') + (SELECT COALESCE(SUM(-Value), 0) FROM FinanceInvoice '.
-          'WHERE Subject='.$Member['Subject'].')) as Cash');
+      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(-SUM(Value*Direction), 0) FROM FinanceOperation '.
+          'WHERE Subject='.$Member['Subject'].') + (SELECT COALESCE(-SUM(Value*Direction), 0) FROM FinanceInvoice '.
+          'WHERE Subject='.$Member['Subject'].')) AS Cash');
       $Cash = $DbResult2->fetch_row();
       $Cash = $Cash[0];
@@ -277 +277 @@
       'DefaultSortOrder' => 1,
       'Items' => array(
-        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '1'),
+        'Direction' => array('Type' => 'TFinanceOperationDirection', 'Caption' => 'Směr', 'Default' => '1'),
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
         'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
@@ -337 +337 @@
     $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Treasury']['Hidden'] = true;
     
-    $this->System->FormManager->RegisterFormType('TFinanceDirection', array(
+    $this->System->FormManager->RegisterFormType('TFinanceOperationDirection', array(
       'Type' => 'Enumeration',
       'States' => array(-1 => 'Výdej', 1 => 'Příjem'),
@@ -347 +347 @@
       'DefaultSortOrder' => 1,
       'Items' => array(
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
+        'Direction' => array('Type' => 'TFinanceInvoiceDirection', 'Caption' => 'Směr', 'Default' => '1'),
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
         'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
@@ -367 +368 @@
       'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
     ));
+    $this->System->FormManager->RegisterClass('FinanceInvoiceIn', $this->System->FormManager->Classes['FinanceInvoice']);
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Title'] = 'Přijaté faktury';
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Direction']['Default'] = -1;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Direction']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Direction']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['DocumentLine']['Default'] = DOC_LINE_INVOICE_IN;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['DocumentLine']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['DocumentLine']['Filter'] = true;
+        
+    $this->System->FormManager->RegisterClass('FinanceInvoiceOut', $this->System->FormManager->Classes['FinanceInvoice']);
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Title'] = 'Vydané faktury';
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Direction']['Default'] = 1;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Direction']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Direction']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['DocumentLine']['Default'] = DOC_LINE_INVOICE_OUT;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['DocumentLine']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['DocumentLine']['Filter'] = true;
+
+    $this->System->FormManager->RegisterFormType('TFinanceInvoiceDirection', array(
+                'Type' => 'Enumeration',
+                'States' => array(-1 => 'Příjem', 1 => 'Výdej'),
+    ));
+    
     $this->System->FormManager->RegisterClass('Company', array(
       'Title' => 'Firma',