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

Timestamp:

Mar 16, 2014, 1:33:22 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: Při úpravě ve formuláři pro typ OneToMany přidána možnost přidat novou vztaženou položku.
• Přidáno: Možnost předefinovat předvolené hodnoty nových položek formuláře. Použito především pro vztažené položky typu OneToMany.

File:

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

trunk/Modules/Finance/Finance.php

@@ -15 +15 @@
 define('TARIFF_FREE', 7);
 define('INVOICE_DUE_DAYS', 15);
-define('INVOICE_OUT_DOC_LINE', 6);
+define('DOC_LINE_INVOICE_OUT', 6);
+define('DOC_LINE_ACCOUNT_IN', 3);
+define('DOC_LINE_ACCOUNT_OUT', 4);
+
 
 class Finance extends Model
@@ -302 +305 @@
     $this->Description = 'Base module for finance management';
     $this->Dependencies = array('File', 'EmailQueue');
-  }  
+  }
 
   function DoInstall()
   {
   }
-  
+
   function DoUninstall()
-  {     
-  }
-  
+  {
+  }
+
   function DoStart()
   {
     global $Config;
-    
+
     $this->System->RegisterPage('finance', 'PageFinance');
     $this->System->RegisterPage(array('finance', 'spotreba'), 'PageFinanceConsumption');
@@ -324 +327 @@
     $this->System->RegisterPage(array('finance', 'sprava'), 'PageFinanceManage');
     $this->System->RegisterPage(array('finance', 'platby'), 'PageFinanceUserState');
-    $this->System->RegisterPage(array('finance', 'import'), 'PageFinanceImportPayment');    
+    $this->System->RegisterPage(array('finance', 'import'), 'PageFinanceImportPayment');
     $this->System->RegisterPage(array('finance', 'zivnost'), 'PageFinanceTaxFiling');
 
@@ -345 +348 @@
         'Treasury' => array('Type' => 'TFinanceTreasury', 'Caption' => 'Pokladna', 'Default' => '', 'Null' => true),
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
-        'InvoiceRel' => array('Type' => 'TFinanceInvoiceOperationRelListOperation', 'Caption' => 'Zaplacené faktury', 'Default' => ''),       
+        'InvoiceRel' => array('Type' => 'TFinanceInvoiceOperationRelListOperation', 'Caption' => 'Zaplacené faktury', 'Default' => ''),
       ),
       'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
@@ -378 +381 @@
         'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň', 'Default' => '21', 'Suffix' => '%'),
       ),
-    ));    
+    ));
     $this->System->FormManager->RegisterClass('FinanceTreasury', array(
       'Title' => 'Pokladny',
@@ -386 +389 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
         'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => ''),
-        'State' => array('Type' => 'Float', 'Caption' => 'Stav', 'Default' => '', 
+        'State' => array('Type' => 'Float', 'Caption' => 'Stav', 'Default' => '',
           'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`Treasury`=#Id)'),
@@ -409 +412 @@
         'LastImportDate' => array('Type' => 'Date', 'Caption' => 'Datum posledního importu', 'Default' => ''),
         'LastImportId' => array('Type' => 'String', 'Caption' => 'Id posledního importu', 'Default' => ''),
-        'State' => array('Type' => 'Float', 'Caption' => 'Stav', 'Default' => '', 
+        'State' => array('Type' => 'Float', 'Caption' => 'Stav', 'Default' => '',
           'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`BankAccount`=#Id)'),
@@ -432 +435 @@
       'Table' => 'Currency',
       'Items' => array(
-        'Code' => array('Type' => 'String', 'Caption' => 'Kód'),
+        'Code' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
         'Symbol' => array('Type' => 'String', 'Caption' => 'Symbol', 'Default' => ''),
@@ -452 +455 @@
         'ReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Cílová položka', 'Default' => '0', 'Null' => true),
       ),
-    ));      
-    
+    ));
+
     $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'];
-  }  
-  
+  }
+
   function DoStop()
-  { 
-  } 
-  
+  {
+  }
+
   function BeforeInsertFinanceOperation($Form)
   {
@@ -470 +473 @@
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
     return($Form->Values);
-  }  
+  }
 }