Changeset 899 for trunk/Modules/Finance

Timestamp:

Feb 17, 2021, 12:30:23 PM (4 years ago)

Author:

chronos

Message:

• Modified: AppModule renamed to Module. AppModuleManger renamed to ModuleManager.
• Fixed: Keep Modules Id in ModulesConfig.php in sync with database list of modules.

Location:

trunk/Modules/Finance

Files:

• Finance.php (modified) (4 diffs)
• FinanceModels.php (modified) (18 diffs)

trunk/Modules/Finance/Finance.php

@@ -8 +8 @@
 include_once(dirname(__FILE__).'/Trade.php');
 
-class ModuleFinance extends AppModule
+class ModuleFinance extends Module
 {
   public Finance $Finance;
@@ -21 +21 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Base module for finance management';
-    $this->Dependencies = array('File', 'EmailQueue', 'Subject', 'Document');
-
-    $this->Bill = new Bill($this->System);
-    $this->Finance = new Finance($this->System);
-  }
-
-  function GetModels(): array
-  {
-    return array(FinanceBillingPeriod::GetClassName(), FinanceVatType::GetClassName(), FinanceVat::GetClassName(),
+    $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(),
       FinanceInvoiceGroup::GetClassName(), FinanceInvoice::GetClassName(), FinanceInvoiceItem::GetClassName(),
@@ -35 +28 @@
       Currency::GetClassName(), FinanceBank::GetClassName(), FinanceBankAccount::GetClassName(), FinanceCharge::GetClassName(),
       Contract::GetClassName(), FinanceInvoiceOperationRel::GetClassName());
+
+    $this->Bill = new Bill($this->System);
+    $this->Finance = new Finance($this->System);
   }
 
@@ -632 +628 @@
   }
 
-  static function Cast(AppModule $AppModule): ModuleFinance
-  {
-    if ($AppModule instanceof ModuleFinance)
+  static function Cast(Module $Module): ModuleFinance
+  {
+    if ($Module instanceof ModuleFinance)
     {
-      return $AppModule;
+      return $Module;
     }
-    throw new Exception('Expected ModuleFinance type but '.gettype($AppModule));
+    throw new Exception('Expected ModuleFinance type but '.gettype($Module));
   }
 }

trunk/Modules/Finance/FinanceModels.php

@@ -217 +217 @@
 class FinanceGroup extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -227 +227 @@
 class FinanceOperation extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -250 +250 @@
 class FinanceOperationGroup extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -263 +263 @@
 class FinanceInvoice extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -285 +285 @@
 class FinanceInvoiceGroup extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -298 +298 @@
 class Company extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -309 +309 @@
 class FinanceInvoiceItem extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -323 +323 @@
 class FinanceTreasury extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -334 +334 @@
 class FinanceTreasuryCheck extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -357 +357 @@
 class FinanceBankAccount extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -379 +379 @@
 class FinanceBank extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -392 +392 @@
 class Currency extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -404 +404 @@
 class FinanceCharge extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -422 +422 @@
 class FinanceVat extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -435 +435 @@
 class FinanceVatType extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -445 +445 @@
 class Contract extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -460 +460 @@
 class FinanceBillingPeriod extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -471 +471 @@
 class FinanceInvoiceOperationRel extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());