Changeset 680

Timestamp:

Jul 27, 2014, 12:28:16 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: Zaokrouhlovat vypočítanou cenu na celé čísla v položkách faktur.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Finance/Bill.php (modified) (12 diffs)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 679; // Subversion revision
+$Revision = 680; // Subversion revision
 $DatabaseRevision = 679; // SQL structure revision
-$ReleaseTime = strtotime('2014-07-26');
+$ReleaseTime = strtotime('2014-07-27');

trunk/Modules/Finance/Bill.php

@@ -29 +29 @@
 class BillInvoice extends Bill
 {
-  var $InvoiceId;  
-  
+  var $InvoiceId;
+
   function ShowSubjectInfo($Subject)
   {
@@ -48 +48 @@
     $DbResult = $this->Database->select('FinanceInvoice', '*', '`Id`='.$this->InvoiceId);
     $Invoice = $DbResult->fetch_assoc();
-   
+
     $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Invoice['Subject']);
     $SubjectTo = $DbResult->fetch_assoc();
@@ -54 +54 @@
     $SubjectTo['PayVAT'] = '';
     $VarSym = $SubjectTo['Id'];
-    
+
     $DbResult = $this->Database->select('Subject', '*', '`Id`='.$this->System->Config['Finance']['MainSubjectId']);
     $SubjectFrom = $DbResult->fetch_assoc();
-    
+
     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
       'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
@@ -63 +63 @@
     $SubjectFromAccount = $DbResult->fetch_assoc();
     $SubjectFrom['Account'] = $SubjectFromAccount['NumberFull'];
-    
+
     $Dodavka = array();
     $InvoiceItems = array();
-    $DbResult = $this->Database->select('FinanceInvoiceItem', '*', 'FinanceInvoice='.$this->InvoiceId);
+    $DbResult = $this->Database->select('FinanceInvoiceItem', '*, CEIL(`Price` * `Quantity`) AS `Total`', '`FinanceInvoice`='.$this->InvoiceId);
     while($Item = $DbResult->fetch_assoc())
     {
       $InvoiceItems[$Item['Id']] = $Item;
     }
-    
+
     // If negative value => switch sides
     if($Invoice['Value'] < 0)
@@ -77 +77 @@
         $Subject = $SubjectTo;
         $SubjectTo = $SubjectFrom;
-        $SubjectFrom = $Subject;   
+        $SubjectFrom = $Subject;
         foreach($InvoiceItems as $Index => $Item)
         {
@@ -83 +83 @@
         }
     }
-    
+
     $PaymentType = array('převodem', 'hotově');
     $BooleanText = array('Ne', 'Ano');
@@ -120 +120 @@
       '<tr><th align="left">Dodávka</th><th align="right">Množství</th><th align="right">Cena/MJ</th><th align="right">Celkem</th></tr>'.
       '<tr><td colspan="4"><hr></td></tr>';
-    
+
     $Total = 0;
     foreach($InvoiceItems as $Item)
@@ -126 +126 @@
       $Output .= '<tr><td>'.$Item['Description'].'</td><td align="right">'.
         $Item['Quantity'].'</td><td align="right">'.$Item['Price'].
-        '&nbsp;Kč</td><td align="right">'.($Item['Quantity'] * $Item['Price']).'&nbsp;Kč</td></tr>';
-      $Total += ($Item['Quantity'] * $Item['Price']);
+        '&nbsp;Kč</td><td align="right">'.$Item['Total'].'&nbsp;Kč</td></tr>';
+      $Total += $Item['Total'];
     }
     $Output .= '<tr><th colspan="3" align="left">Celkem</th><th align="right">'.$Total.'&nbsp;Kč</th></tr>';
@@ -134 +134 @@
       '<tr><td colspan="2"><hr></td></tr>'.
       '</table>';
-      
+
     return($Output);
   }
@@ -141 +141 @@
 class BillOperation extends Bill
 {
-  var $OperationId;  
-  
+  var $OperationId;
+
   function GenerateHTML()
   {
     $DbResult = $this->Database->select('FinanceOperation', '*', '`Id`='.$this->OperationId);
     $Operation = $DbResult->fetch_assoc();
-   
+
     $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Operation['Subject']);
     $Subject = $DbResult->fetch_assoc();
-    
+
     $DbResult = $this->Database->select('Subject', '*', '`Id`='.$this->System->Config['Finance']['MainSubjectId']);
     $MainSubject = $DbResult->fetch_assoc();
-    
+
     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
       'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
       'WHERE (FinanceBankAccount.`Subject`='.$this->System->Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
     $MainSubjectAccount = $DbResult->fetch_assoc();
-    
+
     //$Dodavka = array();
     //$DbResult = $this->Database->select('FinanceInvoiceItem', '*', 'FinanceInvoice='.$BillId);
@@ -168 +168 @@
     if($Operation['Value'] < 0)
     $Desc = array(
-      'Type' => 'VÝDAJOVÝ', 
-      'Signature' => 'Vydal', 
+      'Type' => 'VÝDAJOVÝ',
+      'Signature' => 'Vydal',
       'Sign' => -1,
       'Target' => 'Vydáno komu',
     );
     else $Desc = array(
-      'Type' => 'PŘÍJMOVÝ', 
-      'Signature' => 'Přijal', 
+      'Type' => 'PŘÍJMOVÝ',
+      'Signature' => 'Přijal',
       'Sign' => 1,
       'Target' => 'Přijato od',
@@ -200 +200 @@
     if($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
     if($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
-    $Total = 0;
-    $Description = '';
-    //foreach($Dodavka as $Polozka)
-    //{
-    //  $Description .= $Polozka['Description'].'<br>';
-    //  $Total += ($Polozka['Quantity'] * $Polozka['Price']);
-    //}
     $Description = $Operation['Text'];
     $Total = $Operation['Value'] * $Desc['Sign'];

trunk/Modules/Finance/Finance.php

@@ -399 +399 @@
         'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň', 'Default' => '21', 'Suffix' => '%'),
         'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč',
-          'ReadOnly' => true, 'SQL' => '`Price` * `Quantity`'),
+          'ReadOnly' => true, 'SQL' => 'CEIL(`Price` * `Quantity`)'),
       ),
     ));

trunk/Modules/Finance/Manage.php

@@ -110 +110 @@
     $SumValue = 0;
     foreach($Items as $Item)
-        $SumValue = $SumValue + $Item['Price'] * $Item['Quantity'];
+        $SumValue = $SumValue + ceil($Item['Price'] * $Item['Quantity']);
     $this->Database->insert('FinanceInvoice', array(
           'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
@@ -119 +119 @@
     foreach($Items as $Item)
       $this->Database->insert('FinanceInvoiceItem', array('FinanceInvoice' => $InvoiceId,
-        'Description' => $Item['Description'], 'Price' => $Item['Price'], 'Quantity' => $Item['Quantity'], 'VAT' => $Item['VAT']));
+        'Description' => $Item['Description'], 'Price' => $Item['Price'],
+        'Quantity' => $Item['Quantity'], 'VAT' => $Item['VAT']));
     //$LastInsertTime = $Time;
     //$this->CheckAdvancesAndLiabilities($Subject);