Changeset 552

Timestamp:

Jul 7, 2013, 10:41:07 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Generování měsíčních plateb. Chyběla funkce vkládání faktury.
• Opraveno: Pořadí mazání starých tabulek FinanceBills.
• Opraveno: Chyba zobrazení souborů z IS.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/File/File.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/Finance/UserState.php (modified) (1 diff)
• admin/Updates.php (modified) (1 diff)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 551; // Subversion revision
+$Revision = 552; // Subversion revision
 $DatabaseRevision = 551; // SQL structure revision
 $ReleaseTime = '2013-07-07';

trunk/Modules/File/File.php

@@ -83 +83 @@
   function Show()
   {
+    if(array_key_exists('id', $_GET)) $Id = $_GET['id'];
+    else if(array_key_exists('i', $_GET)) $Id = $_GET['i'];
+    else return($this->SystemMessage('Chyba', 'Nezadáno id dokladu'));
     $this->ClearPage = true;
-    $Output = $this->System->Modules['File']->Download($_GET['id']);
+    $Output = $this->System->Modules['File']->Download($Id);
     return($Output);
   }

trunk/Modules/Finance/Manage.php

@@ -99 +99 @@
     $Output .= '<a href="?Operation=ProcessMonthlyPayment">Generovat faktury</a>';
     return($Output);
+  }
+  
+  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $Items,
+  $DocumentLine, $PeriodFrom, $PeriodTo)
+  {
+    global $LastInsertTime;
+    
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+    $SumValue = 0;
+    foreach($Items as $Item)
+        $SumValue = $SumValue + $Item['Price'];
+    $this->Database->insert('FinanceInvoice', array(
+          'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation),
+          'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue, 'BillCode' => $BillCode,
+          'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
+          'Generate' => 1));
+    $InvoiceId = $this->Database->insert_id;
+    foreach($Items as $Item)
+      $this->Database->insert('FinanceInvoiceItem', array('FinanceInvoice' => $InvoiceId,
+        'Description' => $Item['Description'], 'Price' => $Item['Price'], 'Quantity' => $Item['Quantity'], 'VAT' => $Item['VAT']));
+    //$LastInsertTime = $Time;
+    //$this->CheckAdvancesAndLiabilities($Subject);
+    return($InvoiceId);
   }
   

trunk/Modules/Finance/UserState.php

@@ -34 +34 @@
     $DbResult = $this->Database->query('SELECT Member.*, MemberPayment.MonthlyPlus AS MonthlyPlus '.
       'FROM Member LEFT JOIN MemberPayment ON MemberPayment.Member=Member.Id WHERE Member.Subject='.$Subject['Id']);
+    if($DbResult->num_rows == 0) 
+    {
+      return($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));      
+    }
     $Member = $DbResult->fetch_assoc();
     $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';

trunk/admin/Updates.php

@@ -339 +339 @@
   $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD FOREIGN KEY ( `DocumentLine` ) REFERENCES `DocumentLine` (
 `Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
+  $Manager->Execute('DROP TABLE `FinanceBillsItemsOld`');
   $Manager->Execute('DROP TABLE `FinanceBillsOld`');
-  $Manager->Execute('DROP TABLE `FinanceBillsItemsOld`');
 }