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

Timestamp:

Oct 25, 2015, 9:51:51 PM (9 years ago)

Author:

chronos

Message:

• Modified: Now IS Dashboard is not dependent on other modules. They need to register their view to IS dashboard.
• Fixed: Wrong sign of created finance operations from bank import.
• Added: Storno invoices now have special groups in FinanceInvoiceGroup table.

Both Storno and previous storned documents should be linked together using new table FinanceInvoiceStorno.
Also they should be marked as not visible to user.

File:

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

trunk/Modules/Finance/Finance.php

@@ -333 +333 @@
         'PeriodTo' => array('Type' => 'Date', 'Caption' => 'Období do', 'Default' => '', 'Null' => true),
         'Cash' => array('Type' => 'Boolean', 'Caption' => 'Platit hotově', 'Default' => ''),
+        'VisibleToUser' => array('Type' => 'Boolean', 'Caption' => 'Viditelné uživatelům', 'Default' => '1'),
         'Items' => array('Type' => 'TFinanceInvoiceItemListInvoice', 'Caption' => 'Položky', 'Default' => ''),
+        'StornoBy' => array('Type' => 'TFinanceInvoiceStornoListBy', 'Caption' => 'Storno doklady', 'Default' => ''),
+        'StornoOf' => array('Type' => 'TFinanceInvoiceStornoListOf', 'Caption' => 'Původní doklady', 'Default' => ''),
         'OperationRel' => array('Type' => 'TFinanceInvoiceOperationRelListInvoice', 'Caption' => 'Platba', 'Default' => ''),
         'OperationRelCount' => array('Type' => 'Integer', 'Caption' => 'Plateb',
@@ -365 +368 @@
         'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
         'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
+        'Items' => array('Type' => 'TFinanceInvoiceListGroup', 'Caption' => 'Faktury', 'Default' => ''),
+      ),
+    ));
+
+    $this->System->FormManager->RegisterClass('FinanceInvoiceStorno', array(
+      'Title' => 'Storno faktur',
+      'Table' => 'FinanceInvoiceStorno',
+      'Items' => array(
+        'StornoBy' => array('Type' => 'TFinanceInvoice', 'Caption' => 'Storno doklad', 'Default' => ''),
+        'StornoOf' => array('Type' => 'TFinanceInvoice', 'Caption' => 'Původní doklad', 'Default' => ''),
       ),
     ));
@@ -557 +570 @@
     ));
 
+
     $this->System->AddModule(new Bill($this->System));
     $this->System->AddModule(new Finance($this->System));
     $this->System->Modules['Finance']->MainSubject = $Config['Finance']['MainSubjectId'];
     $this->System->Modules['Finance']->DirectoryId = $Config['Finance']['DirectoryId'];
+
+    $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('Finance',
+      array('ModuleFinance', 'ShowDashboardItem'));
+  }
+
+  function ShowDashboardItem()
+  {
+    $DbResult = $this->Database->select('FinanceOperation', 'ROUND(SUM(`Value`))', '1');
+    $DbRow = $DbResult->fetch_row();
+    $Output = 'Stav placení: '.$DbRow['0'].' Kč<br/>';
+    return $Output;
   }