Changeset 645

Timestamp:

Mar 25, 2014, 12:38:20 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: Typ sazby DPH jako samostatná tabulka.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (4 diffs)
• Modules/Finance/Manage.php (modified) (2 diffs)

trunk/Application/FormClasses.php

@@ -142 +142 @@
       'Category' => array('Type' => 'TServiceCategory', 'Caption' => 'Skupina', 'Default' => '', 'Null' => true),
       'Price' => array('Type' => 'Integer', 'Caption' => 'Cena', 'Default' => '0', 'Suffix' => 'Kč'),
-      'VAT' => array('Type' => 'TFinanceVAT', 'Caption' => 'Sazba DPH', 'Default' => '0', 'Suffix' => ''),
+      'VAT' => array('Type' => 'TFinanceVATType', 'Caption' => 'Sazba DPH', 'Default' => '0', 'Suffix' => ''),
       'CustomerCount' => array('Type' => 'Integer', 'Caption' => 'Počet zákazníků', 'Default' => '', 'ReadOnly' => true),
       'Public' => array('Type' => 'Boolean', 'Caption' => 'Veřejné', 'Default' => ''),
@@ -247 +247 @@
     'Filter' => '1',
   ),
+  'TFinanceVATType' => array(
+    'Type' => 'Reference',
+    'Table' => 'FinanceVATType',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
   'TModule' => array(
     'Type' => 'Reference',

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 644; // Subversion revision
-$DatabaseRevision = 633; // SQL structure revision
+$Revision = 645; // Subversion revision
+$DatabaseRevision = 645; // SQL structure revision
 $ReleaseTime = strtotime('2014-03-24');

trunk/Common/Setup/Updates.php

@@ -562 +562 @@
 }
 
+function UpdateTo645($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceVATType` (
+  `Id` int(11) NOT NULL,
+  `Name` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('INSERT INTO `FinanceVATType` FROM (SELECT Id, Name FROM `FinanceVAT`)');
+  $Manager->Execute('ALTER TABLE `FinanceVAT` ADD `ValidTo` DATE NULL ,
+ADD `Type` INT NOT NULL ;');
+  $Manager->Execute('UPDATE `FinanceVAT` SET `Type`=(SELECT `Id` FROM `FinanceVATType` WHERE `FinanceVATType`.`Name`=`FinanceVAT`.`Name`)');
+  $Manager->Execute('ALTER TABLE `FinanceVAT` DROP `Name`');
+}
+
+
 class Updates
 {
@@ -598 +613 @@
       627 => array('Revision' => 632, 'Function' => 'UpdateTo632'),
       632 => array('Revision' => 633, 'Function' => 'UpdateTo633'),
+      633 => array('Revision' => 645, 'Function' => 'UpdateTo645'),
     ));
   }

trunk/Modules/Customer/Customer.php

@@ -51 +51 @@
       ),
       'Actions' => array(
-        array('Caption' => 'Přepočítat', 'URL' => '/finance/manage.php?Operation=Recalculate'),
+        array('Caption' => 'Přepočítat', 'URL' => '/finance/sprava/?Operation=Recalculate'),
       ),
     ));

trunk/Modules/Finance/Finance.php

@@ -18 +18 @@
 define('DOC_LINE_ACCOUNT_IN', 3);
 define('DOC_LINE_ACCOUNT_OUT', 4);
+define('VAT_TYPE_BASE', 2);
 
 
@@ -292 +293 @@
     return($Output);
   }
+  
+  function GetVATByType($TypeId)
+  {
+        $Time = time();
+        $DbResult = $this->Database->select('FinanceVAT', 'Value', '(Type='.$TypeId.
+      ') AND (ValidFrom <= "'.TimeToMysqlDate($Time).'") AND ((ValidTo >= "'.
+      TimeToMysqlDate($Time).'") OR (ValidTo IS NULL)) LIMIT 1');
+    $Row = $DbResult->fetch_array();
+    return($Row[0]);
+  }
 }
 
@@ -383 +394 @@
         'Quantity' => array('Type' => 'Integer', 'Caption' => 'Množství', 'Default' => '1'),
         'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň', 'Default' => '21', 'Suffix' => '%'),
+        'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč', 
+          'ReadOnly' => true, 'SQL' => '`Price` * `Quantity`'),
       ),
     ));
@@ -459 +472 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('FinanceVAT', array(
+      'Title' => 'Sazby DPH',
+      'Table' => 'FinanceVAT',
+      'Items' => array(
+        'Type' => array('Type' => 'TFinanceVATType', 'Caption' => 'Typ', 'Default' => ''),
+        'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => ''),
+        'ValidTo' => array('Type' => 'Date', 'Caption' => 'Platnost do', 'Default' => '', 'Null' => true),
+        'Value' => array('Type' => 'Integer', 'Caption' => 'Hodnota', 'Default' => '', 'Suffix' => '%'),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('FinanceVATType', array(
+      'Title' => 'Sazby DPH',
+      'Table' => 'FinanceVATType',
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+      ),
+    ));
 
     $this->System->AddModule(new Bill($this->System));

trunk/Modules/Finance/Manage.php

@@ -151 +151 @@
         $InvoiceItems = array();
         $MonthlyTotal = 0;
-        $DbResult2 = $this->Database->query('SELECT Service.*, FinanceVAT.Value AS VAT '.
-          'FROM ServiceCustomerRel LEFT JOIN Service '.
-          'ON Service.Id=ServiceCustomerRel.Service '.
-          'LEFT JOIN FinanceVAT ON FinanceVAT.Id=Service.VAT '.
-          'WHERE (ServiceCustomerRel.Customer='.
-          $Member['Id'].') AND (ServiceCustomerRel.Action IS NULL) ');
+        $DbResult2 = $this->Database->query('SELECT `Service`.* '.
+          'FROM `ServiceCustomerRel` LEFT JOIN `Service` '.
+          'ON `Service`.`Id`=`ServiceCustomerRel`.`Service` '.
+          'WHERE (`ServiceCustomerRel`.`Customer`='.
+          $Member['Id'].') AND (`ServiceCustomerRel`.`Action` IS NULL) ');
         while($Service = $DbResult2->fetch_assoc())
         {
           $InvoiceItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'],
-            'Quantity' => $Period['MonthCount'], 'VAT' => $Service['VAT']);
+            'Quantity' => $Period['MonthCount'], 'VAT' => $this->System->Modules['Finance']->GetVATByType($Service['VAT']));
           $MonthlyTotal += $Service['Price'];
         }
@@ -166 +165 @@
         {
           $InvoiceItems[] = array('Description' => 'Spotřeba energie', 'Price' => -$Member['MonthlyPlus'],
-            'Quantity' => $Period['MonthCount'], 'VAT' => 2);
+            'Quantity' => $Period['MonthCount'], 'VAT' => $this->System->Modules['Finance']->GetVATByType(VAT_TYPE_BASE));
           $MonthlyTotal -= $Member['MonthlyPlus'];
         }