Changeset 632

Timestamp:

Jan 3, 2014, 5:55:20 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Vztahy faktura - platba lze definovat jako vztah N:M. Jedna platba může být přiřazena k více fakturám. K jedné fakturě může být přiřazeno více plateb.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Finance/Finance.php (modified) (3 diffs)
• images/favicons/Currency.png (added)

trunk/Application/FormClasses.php

@@ -35 +35 @@
     ),
   ),
+  'FinanceInvoiceOperationRel' => array(
+    'Title' => 'Zaplacení faktůr',
+    'Table' => 'FinanceInvoiceOperationRel',
+    'Items' => array(
+      'Invoice' => array('Type' => 'TFinanceInvoice', 'Caption' => 'Faktura', 'Default' => ''),        
+      'Operation' => array('Type' => 'TFinanceOperation', 'Caption' => 'Platba', 'Default' => ''),        
+    ),
+  ),
   'ServiceCustomerRel' => array(
     'Title' => 'Vztahy služba - zákazník',
@@ -602 +610 @@
     'Filter' => '1',
   ),
+  'TFinanceInvoiceOperationRelListInvoice' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'FinanceInvoiceOperationRel',
+    'Id' => 'Id',
+    'Ref' => 'Invoice',
+    'Filter' => '1',
+  ),
+  'TFinanceInvoiceOperationRelListOperation' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'FinanceInvoiceOperationRel',
+    'Id' => 'Id',
+    'Ref' => 'Operation',
+    'Filter' => '1',
+  ),
   'TServiceCustomerRelListCustomer' => array(
     'Type' => 'ManyToOne',

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 630; // Subversion revision
-$DatabaseRevision = 627; // SQL structure revision
+$Revision = 632; // Subversion revision
+$DatabaseRevision = 632; // SQL structure revision
 $ReleaseTime = mktime(0, 0, 0, 2, 2, 2014);

trunk/Common/Setup/Updates.php

@@ -542 +542 @@
 }
 
+function UpdateTo632($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceInvoiceOperationRel` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Invoice` int(11) NOT NULL,
+  `Operation` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Invoice` (`Invoice`),
+  KEY `Operation` (`Operation`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+  $Manager->Execute('ALTER TABLE `FinanceInvoiceOperationRel`
+  ADD CONSTRAINT `FinanceInvoiceOperationRel_ibfk_2` FOREIGN KEY (`Operation`) REFERENCES `FinanceOperation` (`Id`),
+  ADD CONSTRAINT `FinanceInvoiceOperationRel_ibfk_1` FOREIGN KEY (`Invoice`) REFERENCES `FinanceInvoice` (`Id`);');
+}
+
 class Updates
 {
@@ -576 +591 @@
       619 => array('Revision' => 620, 'Function' => 'UpdateTo620'),
       620 => array('Revision' => 627, 'Function' => 'UpdateTo627'),
+      627 => array('Revision' => 632, 'Function' => 'UpdateTo632'),
     ));
   }

trunk/Modules/Finance/Finance.php

@@ -345 +345 @@
         'Treasury' => array('Type' => 'TFinanceTreasury', 'Caption' => 'Pokladna', 'Default' => '', 'Null' => true),
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
+        'InvoiceRel' => array('Type' => 'TFinanceInvoiceOperationRelListOperation', 'Caption' => 'Zaplacené faktury', 'Default' => ''),       
       ),
       'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
@@ -363 +364 @@
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
         'Items' => array('Type' => 'TFinanceInvoiceItemListInvoice', 'Caption' => 'Položky', 'Default' => ''),
+        'OperationRel' => array('Type' => 'TFinanceInvoiceOperationRelListInvoice', 'Caption' => 'Platba', 'Default' => ''),
       ),
       'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
@@ -450 +452 @@
         'ReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Cílová položka', 'Default' => '0', 'Null' => true),
       ),
-    ));    
+    ));      
     
     $this->System->AddModule(new Bill($this->System));