Changeset 477 for trunk

Timestamp:

Jan 1, 2013, 11:01:51 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Údaje o firmě se v dokladech nyní generují obecně dle databáze a předvoleného hlavního id v konfiguračního souboru namísto fixních údajů.
• Upraveno: Tabulka bankovních účtů nyní může obsahovat také účty vázané na ostatní subjekty.
• Přidáno: Předchystání tabulek pro evidenci nabízených služeb zákazníkům.

Location:

trunk

Files:

• Common/Global.php (modified) (1 diff)
• ToDo.txt (modified) (1 diff)
• config.sample.php (modified) (1 diff)
• finance/bills.php (modified) (6 diffs)
• finance/manage.php (modified) (5 diffs)
• sql/updates/477.sql (added)

trunk/Common/Global.php

@@ -338 +338 @@
 function TimeToMysqlDateTime($Time)
 {
-  return(date('Y-m-d H:i:s', $Time));  
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d H:i:s', $Time));  
+}
+
+function TimeToMysqlDate($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d', $Time));  
 }
 

trunk/ToDo.txt

@@ -24 +24 @@
   * API pro napojení jiných systémů
 - Zprovoznit obsluhu stránek přes virtuální URL
+- Umožnit placení více služeb na jeden účet, fakturu
+- Udělat fond IP adres, zobrazit jejich užití, umožnit automatické přiřazení volných
+- Vytvořit třídy pro práci s Mikrotik RouterOS API
 
 Hotové

trunk/config.sample.php

@@ -47 +47 @@
   (
     'MainUserId' => 1,
+    'MainSubjectId' => 1,
   ),
   'MainRouter' => array

trunk/finance/bills.php

@@ -9 +9 @@
   function GenerateBill($BillId)
   {
-    global $SpecificSymbol;
+    global $SpecificSymbol, $Config;
   
-    $DbResult = $this->Database->select('FinanceBills', '*', 'Id='.$BillId);
+    $DbResult = $this->Database->select('FinanceBills', '*', '`Id`='.$BillId);
     $Bill = $DbResult->fetch_assoc();
  
-    $DbResult = $this->Database->select('Subject', '*', 'Id='.$Bill['Subject']);
+    $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Bill['Subject']);
     $Subject = $DbResult->fetch_assoc();
+
+    $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Config['Finance']['MainSubjectId']);
+    $MainSubject = $DbResult->fetch_assoc();
+
+    $DbResult = $this->Database->select('FinanceBankAccount', '*', '(`Subject`='.
+      $Config['Finance']['MainSubjectId'].') AND (`Use`=1)');
+    $MainSubjectAccount = $DbResult->fetch_assoc();
 
     $Dodavka = array();
@@ -25 +32 @@
   
     $PaymentType = array('převodem', 'hotově');
+    $BooleanText = array('Ne', 'Ano');
     
     switch($Bill['Type'])
@@ -33 +41 @@
         '<hr></td></tr>'.
         '<tr><td valign="top" width="50%"><strong>Dodavatel:</strong><br>'.
-        'Ing. Jiří Hajda<br>'.
-        'Zděchov 208<br>'.
-        '75607 Zděchov<br>'.
-        'IČ: 75904535<br>'.
-        'DIČ: CZ8303255884<br>'.
-        'Účet: 218098370 / 0300<br>'.
-        'Neplátce DPH<br>'.
+        $MainSubject['Name'].'<br>'.
+        $MainSubject['AddressStreet'].'<br>'.
+        $MainSubject['AddressPSC'].' '.$MainSubject['AddressTown'].'<br>'.
+        'IČ: '.$MainSubject['IC'].'<br>'.
+        'DIČ: '.$MainSubject['DIC'].'<br>'.
+        'Účet: '.$MainSubjectAccount['Number'].'<br>'.
+        'Plátce DPH: '.$BooleanText[$MainSubject['PayVAT']].'<br>'.
         '</td><td valign="top">'.
         '<strong>Odběratel:</strong><br>'.
@@ -62 +70 @@
         'Datum zdanitel. plnění: '.HumanDate($Bill['TimeCreate']).'<br>'.
         'Datum splatnosti: '.HumanDate($Bill['TimeDue']).'<br>';
+        if(($Bill['PeriodFrom'] != '') and ($Bill['PeriodTo'] != ''))
+          $Output .= 'Fakturované období: '.HumanDate($Bill['PeriodFrom']).' - '.HumanDate($Bill['PeriodTo']).'<br>';
         $Output .= '</td></tr>'.
         '<tr><td colspan="2">'.
@@ -85 +95 @@
     $Output = '<table width="100%" border="1" cellspacing="0" cellpadding="3"><tr><td width="50%">'.
         '<strong>Firma:</strong><br>'.
-        'Ing. Jiří Hajda<br>'.
-        'Zděchov 208<br>'.
-        '75607 Zděchov<br>'.
-        'IČ: 75904535<br>'.
-        'DIČ: CZ8303255884<br>'.
-        'Účet: 218098370 / 0300<br>'.
-        'Neplátce DPH</td><td width="50%" valign="top">'.
+        $MainSubject['Name'].'<br>'.
+        $MainSubject['AddressStreet'].'<br>'.
+        $MainSubject['AddressPSC'].' '.$MainSubject['AddressTown'].'<br>'.
+        'IČ: '.$MainSubject['IC'].'<br>'.
+        'DIČ: '.$MainSubject['DIC'].'<br>'.
+        'Účet: '.$MainSubjectAccount['Number'].'<br>'.
+        'Plátce DPH: '.$BooleanText[$MainSubject['PayVAT']].
+        '</td><td width="50%" valign="top">'.
         '<font size="5"><strong>PŘÍJMOVÝ POKLADNÍ DOKLAD</strong></font><br><br>'.
         'Číslo dokladu: '.$Bill['BillCode'].'<br>'.
@@ -120 +131 @@
   }
 
-  function CreateBill($SubjectId, $Items, $TimeCreate, $TimeDue, $BillCode = '', $Type = 'invoice')
-  {
-    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime($TimeCreate), 'Subject' => $SubjectId, 'TimeDue' => TimeToMysqlDateTime($TimeDue), 'BillCode' => $BillCode, 'Type' => $Type));
+  function CreateBill($SubjectId, $Items, $TimeCreate, $TimeDue, $BillCode = '', $Type = 'invoice',
+    $PeriodFrom, $PeriodTo)
+  {
+    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime($TimeCreate), 
+      'Subject' => $SubjectId, 'TimeDue' => TimeToMysqlDateTime($TimeDue), 
+      'BillCode' => $BillCode, 'Type' => $Type, 'PeriodFrom' => TimeToMysqlDate($PeriodFrom),
+      'PeriodTo' => TimeToMysqlDate($PeriodTo)));
     $BillId = $this->Database->insert_id;
     foreach($Items as $Item)
     {
-      $this->Database->insert('FinanceBillsItems', array('Bill' => $BillId, 'Description' => $Item['Description'], 'Price' => $Item['Price'], 'Quantity' => $Item['Quantity']));
+      $this->Database->insert('FinanceBillsItems', array('Bill' => $BillId, 
+        'Description' => $Item['Description'], 'Price' => $Item['Price'], 'Quantity' => $Item['Quantity']));
     }
     //Header('Content-Type: application/pdf');

trunk/finance/manage.php

@@ -10 +10 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
-
-    if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; else $Operation = '';
+    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) 
+      return('Nemáte oprávnění');
+
+    if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; 
+      else $Operation = '';
     //$Operation = 'ImportOldData';
     switch($Operation)
@@ -143 +145 @@
   }
 
-  function InsertLiability($Subject, $Value, $TimeCreation, $TimeDue, $Text, $DocumentLine)
+  function InsertLiability($Subject, $Value, $TimeCreation, $TimeDue, $Text, 
+    $DocumentLine, $PeriodFrom, $PeriodTo)
   {
     global $LastInsertTime;
 
     $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
-    $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $Value, 'BillCode' => $BillCode));
+    $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 
+      'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 
+      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $Value, 'BillCode' => $BillCode,
+      'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo)));
     $Output = '.'; //$this->Database->LastQuery.'<br />';
     //$LastInsertTime = $Time;
@@ -240 +246 @@
     $Form->LoadvaluesFromForm();
     //print_r($Form->Values);
-    $this->InsertLiability($Form->Values['Subject'], $Form->Values['Value'], $Form->Values['TimeCreation'], $Form->Values['TimeDue'], $Form->Values['Text'], $Form->Values['DocumentLine']);
+    $this->InsertLiability($Form->Values['Subject'], $Form->Values['Value'], 
+      $Form->Values['TimeCreation'], $Form->Values['TimeDue'], $Form->Values['Text'], 
+      $Form->Values['DocumentLine'], NULL, NULL);
     $LastId = $this->Database->insert_id;
     $DbResult = $this->Database->select('FinanceClaimsLiabilities', 'BillCode', 'Id='.$LastId);
@@ -360 +368 @@
           $Output .= $TimePeriodText.': '.$Member['MonthlyTotal'].' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $BillCode = $Finance->GetNextDocumentLineNumber(6); // Faktury vydané
-          $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], array(array('Description' => 'Připojení k Internetu', 'Price' => $PayPerPeriod, 'Quantity' => 1)), time(), time() + 3600 * 24 * 15, $BillCode);
-          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 'Text' => 'Připojení k Internetu za období '.$TimePeriodText, 'Bill' => $BillId, 'BillCode' => $BillCode));
+          $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], 
+            array(array('Description' => 'Připojení k Internetu', 'Price' => $PayPerPeriod, 
+            'Quantity' => 1)), time(), time() + 3600 * 24 * 15, $BillCode, $Period['From'], $Period['To']);
+          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 
+            'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 
+            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 
+            'Text' => 'Připojení k Internetu za období '.$TimePeriodText, 
+            'Bill' => $BillId, 'BillCode' => $BillCode));
           $Output .= $this->SendPaymentEmail($Member['Id']);
           $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
@@ -453 +467 @@
     while($Row = $DbResult->fetch_assoc())
     {
-      $BillId = $this->System->Modules['Bill']->CreateBill($Row['Subject'], array(array('Description' => $Row['Text'], 'Price' => $Row['Value'], 'Quantity' => 1)), MysqlDateTimeToTime($Row['TimeCreation']), MysqlDateTimeToTime($Row['TimeDue']), $Row['BillCode']);
+      $BillId = $this->System->Modules['Bill']->CreateBill($Row['Subject'], 
+        array(array('Description' => $Row['Text'], 'Price' => $Row['Value'], 'Quantity' => 1)), 
+        MysqlDateTimeToTime($Row['TimeCreation']), MysqlDateTimeToTime($Row['TimeDue']), 
+        $Row['BillCode'], 'invoice', MysqlDateToTime($Row['PeriodFrom']), MysqlDateToTime($Row['PeriodTo']));
       $this->Database->update('FinanceClaimsLiabilities', 'Id='.$Row['Id'], array('Bill' => $BillId));
       echo('.');