Changeset 367

Timestamp:

Jan 19, 2012, 8:23:04 AM (13 years ago)

Author:

chronos

Message:

• Přidáno: Definice některých modelů modulu Finance.

Location:

trunk/Modules

Files:

• Finance/Finance.php (modified) (4 diffs)
• Finance/import.php (modified) (2 diffs)
• Finance/manage.php (modified) (1 diff)
• Finance/zivnost.php (modified) (2 diffs)
• User/User.php (modified) (1 diff)

trunk/Modules/Finance/Finance.php

@@ -6 +6 @@
 include_once('spotreba.php');
 include_once('inventory.php');
+include_once('clenove.php');
 include_once('monthly_overall.php');
 include_once('manage.php');
 include_once('user_state.php');
+include_once('import.php');
+include_once('zivnost.php');
 
 class FinancePage extends Page
@@ -28 +31 @@
         else if($this->System->PathItems[1] == 'clenove') $PageClass = 'FinanceUserList';
         else if($this->System->PathItems[1] == 'sprava') $PageClass = 'FinanceManagePage';
+        else if($this->System->PathItems[1] == 'import') $PageClass = 'FinanceImportPayment';
+        else if($this->System->PathItems[1] == 'zivnost') $PageClass = 'FinanceTaxFilingPage';
         else if($this->System->PathItems[1] == 'mesicni-prehled') $PageClass = 'FinanceMonthlyOverallPage';
         else return(PAGE_NOT_FOUND);
@@ -42 +47 @@
 }
 
+class DocumentLine extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'DocumentLine';
+    $this->AddPropertyString('Name');
+    $this->AddPropertyString('ShortCut');
+  }
+}
+
+class DocumentLineSequence extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'DocumentLineSequence';
+    $this->AddPropertyOneToMany('DocumentLine', 'DocumentLine');
+    $this->AddPropertyOneToMany('FinanceYear', 'FinanceYear');
+    $this->AddPropertyInteger('NextNumber');
+    $this->AddPropertyBoolean('YearPrefix');
+  }
+}
+
+class FinanceYear extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceYear';
+    $this->AddPropertyInteger('Year');
+    $this->AddPropertyDate('DateStart');
+    $this->AddPropertyDate('DateEnd');
+  }
+}
+
+class FinanceTariff extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceTariff';
+    $this->AddPropertyString('Name');
+    $this->AddPropertyInteger('Group');
+    $this->AddPropertyInteger('SpeedMin');
+    $this->AddPropertyInteger('SpeedMax');
+    $this->AddPropertyInteger('UploadAsymmetry');
+    $this->AddPropertyInteger('Price');
+    $this->AddPropertyInteger('MemberCount');
+    $this->AddPropertyOneToMany('ReplaceId', 'FinanceTariff');
+    $this->AddPropertyBoolean('Public');
+  }
+}
+
+class FinanceOperation extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceOperation';
+    $this->AddPropertyDateTime('Time');
+    $this->AddPropertyOneToMany('Subject', 'Subject');
+    $this->AddPropertyBoolean('Cash');
+    $this->AddPropertyFloat('Value');
+    $this->AddPropertyString('BillCode');
+    $this->AddPropertyBoolean('Taxable');
+    $this->AddPropertyOneToMany('Bill', 'FinanceBills');
+    $this->AddPropertyString('Text');
+    $this->AddPropertyBoolean('Network');
+  }
+}
+
+class FinanceClaimsLiabilities extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceClaimsLiabilities';
+    $this->AddPropertyString('BillCode');
+    $this->AddPropertyOneToMany('Subject', 'Subject');
+    $this->AddPropertyDateTime('TimeCreate');
+    $this->AddPropertyDateTime('TimeDue');
+    $this->AddPropertyDateTime('TimePayment');
+    $this->AddPropertyFloat('Value');
+    $this->AddPropertyOneToMany('Bill', 'FinanceBills');
+    $this->AddPropertyString('Text');   
+  }
+}
+
+class FinanceBills extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceBills';
+    $this->AddPropertyDateTime('TimeFrom');
+    $this->AddPropertyOneToMany('Subject', 'Subject');
+    $this->AddPropertyDateTime('TimeTo');
+    $this->AddPropertyDateTime('TimeDue');
+    $this->AddPropertyDateTime('TimeCreate');
+    $this->AddPropertyString('BillCode');
+    $this->AddPropertyString('Type');
+    $this->AddPropertyBoolean('Cash');   
+  }
+}
+
+class FinanceBillsItems extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'FinanceBillsItems';
+    $this->AddPropertyOneToMany('Bill', 'FinanceBills');
+    $this->AddPropertyString('Description');
+    $this->AddPropertyFloat('Price');
+    $this->AddPropertyFloat('Quantity');
+  }
+}
 
 class ModuleFinance extends Module
@@ -80 +203 @@
     $this->Description = 'Accounting processing';
     $this->Dependencies = array('User');
-    $this->Models = array();
+    $this->Models = array('FinanceYear', 'DocumentLine', 'DocumentLineSequence',
+      'FinanceTariff', 'FinanceOperation', 'FinanceClaimsLiabilities',
+      'FinanceBills', 'FinanceBillsItems');
   }
   

trunk/Modules/Finance/import.php

@@ -1 +1 @@
 <?php
-include('../global.php');
 
 class FinanceImportPayment extends Page
@@ -145 +144 @@
 }
 
-$System->AddModule(new FinanceImportPayment());
-$System->Modules['FinanceImportPayment']->GetOutput();
-
 ?>

trunk/Modules/Finance/manage.php

@@ -66 +66 @@
         $Output .= '<a href="?Operation=Recalculate">Přepočet financí</a><br />';
         $Output .= '<a href="?Operation=MonthlyPayment">Měsíční vyúčtování</a><br />';
-        $Output .= '<a href="clenove.php">Seznam členů</a><br />';
-        $Output .= '<a href="zivnost.php">Živnost</a><br />';
+        $Output .= '<a href="../clenove/">Seznam členů</a><br />';
+        $Output .= '<a href="../zivnost/">Živnost</a><br />';
         $Output .= '<a href="?Operation=GenerateBills">Generovat chybějící doklady</a><br />';
-        $Output .= '<a href="import.php">Import plateb</a><br />';
+        $Output .= '<a href="../import/">Import plateb</a><br />';
     }
     return($Output);

trunk/Modules/Finance/zivnost.php

@@ -1 +1 @@
 <?php
-include_once('../global.php');
 
 class FinanceTaxFilingPage extends Page
@@ -289 +288 @@
 }
 
-$System->AddModule(new FinanceTaxFilingPage());
-$System->Modules['FinanceTaxFilingPage']->GetOutput();
-
 ?>

trunk/Modules/User/User.php

@@ -339 +339 @@
     $this->System->Models['User'] = new User($this->Database, $this->System);
     $this->System->Pages['uzivatele'] = 'UserListPage';
+    if(isset($_SERVER['REMOTE_ADDR'])) $this->System->Models['User']->Check();
   }