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

Timestamp:

Feb 17, 2021, 9:27:32 PM (3 years ago)

Author:

chronos

Message:

• Added: Documents section accessible from users panel.
• Added: Contract model moved to separate module Contract.
• Added: New action to generate PDF from Contract.
• Fixed: Allow users to download files only by hash instead of direct id.
• Added: Support for SHA1 as allowed mysql function.

File:

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

trunk/Modules/Finance/Finance.php

@@ -21 +21 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Base module for finance management';
-    $this->Dependencies = array(ModuleFile::GetName(), ModuleEmailQueue::GetName(), ModuleSubject::GetName(), ModuleDocument::GetName());
+    $this->Dependencies = array(ModuleFile::GetName(), ModuleEmailQueue::GetName(), ModuleSubject::GetName(),
+      ModuleDocument::GetName());
     $this->Models = array(FinanceBillingPeriod::GetClassName(), FinanceVatType::GetClassName(), FinanceVat::GetClassName(),
       FinanceGroup::GetClassName(), FinanceOperationGroup::GetClassName(), FinanceOperation::GetClassName(),
@@ -27 +28 @@
       Company::GetClassName(), FinanceTreasury::GetClassName(), FinanceTreasuryCheck::GetClassName(),
       Currency::GetClassName(), FinanceBank::GetClassName(), FinanceBankAccount::GetClassName(), FinanceCharge::GetClassName(),
-      Contract::GetClassName(), FinanceInvoiceOperationRel::GetClassName());
+      FinanceInvoiceOperationRel::GetClassName());
 
     $this->Bill = new Bill($this->System);
@@ -423 +424 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
       ),
-    ));
-    $this->System->FormManager->RegisterClass('Contract', array(
-      'Title' => 'Smlouvy',
-      'Table' => 'Contract',
-      'Items' => array(
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-        'BillCode' => array('Type' => 'TDocumentLineCode', 'Caption' => 'Kód', 'Default' => '', 'Null' => true),
-        'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
-        'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => ''),
-        'ValidTo' => array('Type' => 'Date', 'Caption' => 'Platnost do', 'Default' => '', 'Null' => true),
-        'File' => array('Type' => 'TFile', 'Caption' => 'Soubor', 'Default' => '', 'Null' => true),
-      ),
-      'BeforeInsert' => array($this, 'BeforeInsertContract'),
-    ));
-    $this->System->FormManager->RegisterFormType('TContract', array(
-      'Type' => 'Reference',
-      'Table' => 'Contract',
-      'Id' => 'Id',
-      'Name' => 'BillCode',
-      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterFormType('TFinanceVAT', array(
@@ -541 +522 @@
   }
 
-  function DoStop(): void
-  {
-  }
-
   function BeforeInsertFinanceOperation(Form $Form): array
   {
@@ -550 +527 @@
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $FinanceGroup = $this->Finance->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
-    $Form->Values['BillCode'] = $this->Finance->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
+    $Form->Values['BillCode'] = ModuleDocument::Cast($this->System->GetModule('Document'))->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
     return $Form->Values;
   }
@@ -576 +553 @@
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $Group = $this->Finance->GetFinanceGroupById($Form->Values['Group'], 'FinanceInvoiceGroup');
-    $Form->Values['BillCode'] = $this->Finance->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
+    $Form->Values['BillCode'] = ModuleDocument::Cast($this->System->GetModule('Document'))->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     return $Form->Values;
   }
@@ -621 +598 @@
   }
 
-  function BeforeInsertContract(Form $Form): array
-  {
-    if (array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
-      else $Year = date("Y", $Form->Values['ValidFrom']);
-    $Form->Values['BillCode'] = $this->Finance->GetNextDocumentLineNumberId($Form->Values['DocumentLine'], $Year);
-    return $Form->Values;
-  }
-
   static function Cast(Module $Module): ModuleFinance
   {