Changeset 727

Timestamp:

Jan 6, 2015, 12:02:36 AM (10 years ago)

Author:

chronos

Message:

• Fixed: Errors with periodic finance invoice generation.
• Fixed: In case of generating of incoming invoice wrong outgoing DocumentLine was used.
• Added: Show related bank accounts in Subject view.
• Added: Check if htmldoc is installed in OS.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/Finance/Bill.php (modified) (2 diffs)
• Modules/Finance/Manage.php (modified) (9 diffs)
• Modules/Subject/Subject.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 726; // Subversion revision
+$Revision = 727; // Subversion revision
 $DatabaseRevision = 726; // SQL structure revision
 $ReleaseTime = strtotime('2015-01-05');

trunk/Common/Global.php

@@ -385 +385 @@
 }
 
+function CommandExist($Command)
+{
+  $Result = shell_exec('which '.$Command);
+  return(!empty($Result));
+}
+
 function RemoveDiacritic($Text)
 {

trunk/Modules/Customer/Customer.php

@@ -48 +48 @@
         'MonthlyInternet' => array('Type' => 'Integer', 'Caption' => 'Internet měsíčně', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
         'MonthlyConsumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba měsíčně', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
-        'NetworkDevice' => array('Type' => 'Integer', 'Caption' => 'Podíl na zařízení', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
         'MonthlyPlus' => array('Type' => 'Integer', 'Caption' => 'Měsíčně plus', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
         'Cash' => array('Type' => 'Integer', 'Caption' => 'Kredit', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),

trunk/Modules/Finance/Bill.php

@@ -4 +4 @@
 {
   var $SpecificSymbol = 1; // počítačová sít
-
+  var $Checked;  
+ 
   function GenerateHTML()
   {
@@ -21 +22 @@
   {
         $Encoding = new Encoding();
+        if($this->Checked == false) {
+                if(CommandExist('htmldoc')) {
+                        $this->Checked = true;
+                } else throw new Exception('htmldoc is not installed.');
+        }
     $Output = shell_exec('echo "'.addslashes($Encoding->FromUTF8($HtmlCode)).
       '"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');

trunk/Modules/Finance/Manage.php

@@ -132 +132 @@
     // Generuj účetní položky
     $DbResult = $this->Database->query('SELECT `Member`.*, `MemberPayment`.`MonthlyTotal` AS `MonthlyTotal`, '.
-      'UNIX_TIMESTAMP(`Member`.`BillingPeriodLastDate`), `Subject`.`Name` AS `SubjectName`,'.
+      'UNIX_TIMESTAMP(`Member`.`BillingPeriodLastDate`) AS `BillingPeriodLastUnixTime`, `Subject`.`Name` AS `SubjectName`,'.
       '`MemberPayment`.`MonthlyPlus` AS `MonthlyPlus` '.
       'FROM `MemberPayment` JOIN `Member` ON `Member`.`Id`=`MemberPayment`.`Member` '.
@@ -140 +140 @@
       $Output .= $Member['SubjectName'].': ';
       $Period = $this->GetBillingPeriod($Member['BillingPeriodNext']);
-      if($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)'])
+      if($Period['From'] > $Member['BillingPeriodLastUnixTime'])
       {
         $this->Database->update('Member', 'Id='.$Member['Id'],
@@ -148 +148 @@
       $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
       if(($Period['MonthCount'] > 0) and ($Member['Blocked'] == 0) and
-        ($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']))
+        ($Period['From'] > $Member['BillingPeriodLastUnixTime']))
       {
         $InvoiceItems = array();
@@ -163 +163 @@
           $MonthlyTotal += $Service['Price'];
         }
-        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];
+        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];               
         // We can't produce negative invoice except storno invoice.
         // TODO: In case of negative invoice it is not sufficient to reverse invoicing direction  
         // Other subject should invoice only possitive items. Negative items should be somehow removed. 
-        if($MonthlyTotal >= 0)
+        if($MonthlyTotal >= 0) {
+                $DocumentLine = DOC_LINE_INVOICE_OUT;        
                 $Direction = 1; // Standard out invoice
-          else {
-                $Direction = -1; // In case of negative total value generate reverse invoice for other subject
-                foreach($InvoiceItems as $Index => $Item)
-                        $InvoiceItems[$Index]['Price'] = -$Item['Price'];
-          }
-        
+        } else {
+                $DocumentLine = DOC_LINE_INVOICE_IN;
+          $Direction = -1; // In case of negative total value generate reverse invoice for other subject
+          foreach($InvoiceItems as $Index => $Item)
+                $InvoiceItems[$Index]['Price'] = -$Item['Price'];
+        }        
         
         if($PayPerPeriod != 0)
@@ -181 +182 @@
           $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $Direction, $InvoiceItems, DOC_LINE_INVOICE_OUT, $Period['From'], $Period['To']);
+            $Direction, $InvoiceItems, $DocumentLine, $Period['From'], $Period['To']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);
@@ -308 +309 @@
     global $Config;
 
-    $DbResult = $this->Database->select('Member', '*', 'Id='.$MemberId);
+    $DbResult = $this->Database->select('Member', '*', '`Id`='.$MemberId);
     $Member = $DbResult->fetch_assoc();
 
-    $DbResult = $this->Database->select('MemberPayment', '*', 'Member='.$MemberId);
+    $DbResult = $this->Database->select('MemberPayment', '*', '`Member`='.$MemberId);
     $MemberPayment = $DbResult->fetch_assoc();
 
-    $DbResult = $this->Database->select('Subject', 'Name', 'Id='.$Member['Subject']);
+    $DbResult = $this->Database->select('Subject', 'Name', '`Id`='.$Member['Subject']);
     $Subject = $DbResult->fetch_assoc();
 
-    $DbResult = $this->Database->select('User', '*', 'Id='.$Member['ResponsibleUser']);
+    $DbResult = $this->Database->select('User', '*', '`Id`='.$Member['ResponsibleUser']);
     $User = $DbResult->fetch_assoc();
 
@@ -325 +326 @@
     $Period = $this->GetBillingPeriod($Member['BillingPeriodNext']);
 
-    $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`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
+    $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`='.$Config['Finance']['MainSubjectId'].') '.
+        'AND (`FinanceBankAccount`.`Use`=1)');
     $MainSubjectAccount = $DbResult->fetch_assoc();
 
@@ -336 +339 @@
         $User['Name'].'</strong> ke dni <strong>'.$this->System->HumanDate(time()).'</strong>.<br /><br />'."\n".
         'Váše aktuální služby: ';
-      $DbResult = $this->Database->query('SELECT GROUP_CONCAT(Service.Name) AS Name FROM ServiceCustomerRel LEFT JOIN Service '.
-        'ON Service.Id=ServiceCustomerRel.Service WHERE (ServiceCustomerRel.Customer='.$Member['Id'].') '.
-        'AND ServiceCustomerRel.ChangeAction IS NULL');
+      $DbResult = $this->Database->query('SELECT GROUP_CONCAT(`Service`.`Name`) AS `Name` FROM `ServiceCustomerRel` LEFT JOIN `Service` '.
+        'ON `Service`.`Id`=`ServiceCustomerRel`.`Service` WHERE (`ServiceCustomerRel`.`Customer`='.$Member['Id'].') '.
+        'AND (`ServiceCustomerRel`.`ChangeAction` IS NULL)');
       $Service = $DbResult->fetch_assoc();
       $Content .= '<strong>'.$Service['Name'].'</strong><br />'."\n".
@@ -351 +354 @@
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Popis</th>'.
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Částka [Kč]</th></tr>'."\n";
-      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT Text, Time, (Value*Direction) AS Value, File FROM FinanceOperation WHERE (Subject='.$Member['Subject'].')) UNION ALL '.
-        '(SELECT CONCAT(`Text`, (SELECT GROUP_CONCAT(`Description` SEPARATOR "<br/>") FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`)) AS `Text`, Time, -(Value*Direction) as Value, File FROM FinanceInvoice WHERE (Subject='.
-        $Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
+      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, (`Value`*`Direction`) AS `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
+        '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ", ") FROM `FinanceInvoiceItem` '.
+        'WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, '.
+        '`Time`, -(`Value`*`Direction`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
+        $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())
       {

trunk/Modules/Subject/Subject.php

@@ -28 +28 @@
         'AddressCountry' => array('Type' => 'TCountry', 'Caption' => 'Země', 'Default' => ''),
         'IC' => array('Type' => 'String', 'Caption' => 'IČ', 'Default' => ''),
-        'DIC' => array('Type' => 'String', 'Caption' => 'DIČ', 'Default' => ''),
+        'DIC' => array('Type' => 'String', 'Caption' => 'DIČ', 'Default' => ''),        
         'MapPosition' => array('Type' => 'TMapPosition', 'Caption' => 'Pozice na mapě', 'Default' => '', 'Null' => true),
         'WWW' => array('Type' => 'Hyperlink', 'Caption' => 'WWW', 'Default' => ''),
@@ -39 +39 @@
           'WHERE `FinanceOperation`.`Subject`=#Id), 0) - IFNULL((SELECT SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`Direction`) FROM `FinanceInvoice` '.
           'WHERE `FinanceInvoice`.`Subject`=#Id), 0)'),
+        'BankAccounts' => array('Type' => 'TFinanceBankAccountListSubject', 'Caption' => 'Bankovní účety', 'Default' => ''),
       ),
+    ));
+    $this->System->FormManager->RegisterFormType('TFinanceBankAccountListSubject', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'FinanceBankAccount',
+      'Id' => 'Id',
+      'Ref' => 'Subject',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterClass('SubjectReport', array(