Changeset 295 for trunk

Timestamp:

Oct 2, 2010, 7:40:25 PM (14 years ago)

Author:

george

Message:

• Přidáno: Funkce pro zpožděné generování chybějících dokladů.

Location:

trunk

Files:

• finance/bills.php (modified) (5 diffs)
• finance/clenove.php (modified) (2 diffs)
• finance/manage.php (modified) (4 diffs)
• sql/updates/295.sql (added)

trunk/finance/bills.php

@@ -27 +27 @@
     
     switch($Bill['Type'])
-          {
-          case 'invoice':
+    {
+    case 'invoice':
         $Output = '<table width="100%"><tr><td colspan="2">'.
         '<font size="6"><div align="center">Faktura - daňový doklad</font></div>'.
@@ -62 +62 @@
         'Datum zdanitel. plnění: '.HumanDate($Bill['TimeCreate']).'<br>'.
         'Datum splatnosti: '.HumanDate($Bill['TimeDue']).'<br>';
-        if(($Bill['TimeFrom'] != '0000-00-00 00:00:00') and ($Bill['TimeTo'] != '0000-00-00 00:00:00'))
-          $Output .= 'Fakturované období: '.HumanDate($Bill['TimeFrom']).' - '.HumanDate($Bill['TimeTo']).'<br>';
+        //if(($Bill['TimeFrom'] != '0000-00-00 00:00:00') and ($Bill['TimeTo'] != '0000-00-00 00:00:00'))
+        //  $Output .= 'Fakturované období: '.HumanDate($Bill['TimeFrom']).' - '.HumanDate($Bill['TimeTo']).'<br>';
         $Output .= '</td></tr>'.
         '<tr><td colspan="2">'.
@@ -83 +83 @@
         '<tr><td colspan="2"><hr></td></tr>'.
         '</table>';
-            break;
-          case 'income':
-                $Output = '<table width="100%" border="1" cellspacing="0" cellpadding="3"><tr><td width="50%">'.
+      break;
+    case 'income':
+    $Output = '<table width="100%" border="1" cellspacing="0" cellpadding="3"><tr><td width="50%">'.
         '<strong>Firma:</strong><br>'.
         'Ing. Jiří Hajda<br>'.
@@ -105 +105 @@
         if($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
         $Total = 0;
-                $Description = '';
+    $Description = '';
         foreach($Dodavka as $Polozka)
         {
@@ -114 +114 @@
         '<tr><td colspan="2"><strong>Částka:</strong> '.$Total.' Kč<br><br>'.
         '</td></tr>'.    
-        '<tr><td colspan="2"><strong>Účel platby:</strong><br>'.$Description.'</td></tr>'.        
-                '<tr><td><br><br>Podpis příjemce:</td><td><br><br>Podpis pokladníka:</td></tr>';
+        '<tr><td colspan="2"><strong>Účel platby:</strong><br>'.$Description.'</td></tr>'.    
+    '<tr><td><br><br>Podpis příjemce:</td><td><br><br>Podpis pokladníka:</td></tr>';
         $Output .= '</table>';
-            break;      
-    }
-        return($Output);
+      break;  
+    }
+  return($Output);
   }
 

trunk/finance/clenove.php

@@ -10 +10 @@
   {
     $Finance = $this->System->Modules['Finance'];
-          $this->System->Modules['Finance']->LoadTariffs(1);
-          if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
+    $this->System->Modules['Finance']->LoadTariffs(1);
+    if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
 
-        // Seznam členů
+  // Seznam členů
     $Output = 'Seznam účastníků:<br>'.
     '<table class="WideTable">'.
     '<tr><th>Zástupce</th><th>Subjekt</th>';
     //<th>Cena za zařízení [Kč]</th>
-    $Output .= '<th>Měsíční poplatek [Kč]</th><th>Stav účtu [Kč]</th><th>Běžící tarif</th><th>Příští tarif</th></tr>';
+    $Output .= '<th>Měsíční poplatek [Kč]</th><th>Stav účtu [Kč]</th><th>Běžící tarif</th><th>Příští tarif</th><th>Poznámky</th><th>WWW</th></tr>';
     $TotalDevice = 0;
     $TotalMonth = 0;
     $TotalCash = 0;
-    $DbResult = $this->Database->query('SELECT MonthlyTotal, Cash, Subject.Id, Subject.Name, NetworkDevice, InternetTariffCurrentMonth, InternetTariffNextMonth, User.Name AS FullName FROM MemberPayment LEFT JOIN Member ON Member.Id=MemberPayment.Member LEFT JOIN Subject ON Subject.Id=Member.Subject JOIN User ON User.Id=Member.ResponsibleUser ORDER BY FullName');
+    $DbResult = $this->Database->query('SELECT MonthlyTotal, Cash, Subject.Id, Subject.WWW, Subject.Note, Subject.Name, NetworkDevice, InternetTariffCurrentMonth, InternetTariffNextMonth, User.Name AS FullName FROM MemberPayment LEFT JOIN Member ON Member.Id=MemberPayment.Member LEFT JOIN Subject ON Subject.Id=Member.Subject JOIN User ON User.Id=Member.ResponsibleUser ORDER BY FullName');
     while($Row = $DbResult->fetch_assoc())
     {
@@ -32 +32 @@
       $Output .= '<tr><td>'.$Row['FullName'].'</td><td><a href="user_state.php?Subject='.$Row['Id'].'">'.$Row['Name'].'</a></td>';
       //<td align="right">'.$Row['network_device'].'</td>
-      $Output .= '<td align="right">'.$Row['MonthlyTotal'].'</td><td align="right">'.$Row['Cash'].'</td><td align="center">'.$Tarif.'</td><td align="center">'.$PristiTarif.'</td></tr>';
+      $Output .= '<td align="right">'.$Row['MonthlyTotal'].'</td><td align="right">'.$Row['Cash'].'</td><td align="center">'.$Tarif.'</td><td align="center">'.$PristiTarif.'</td><td>'.$Row['Note'].'</td><td>'.$Row['WWW'].'</td></tr>';
       $TotalDevice += $Row['NetworkDevice'];
       $TotalMonth += ($Row['MonthlyTotal']);

trunk/finance/manage.php

@@ -54 +54 @@
       case 'MonthlyPayment':
         $Output = $this->ShowMonthlyPayment();
+        break;
+      case 'GenerateBills':
+        $Output = $this->GenerateBills();
         break;
       default:
@@ -68 +71 @@
         $Output .= '<a href="clenove.php">Seznam členů</a><br />';
         $Output .= '<a href="zivnost.php">Živnost</a><br />';
+        $Output .= '<a href="?Operation=GenerateBills">Generovat chybějící doklady</a><br />';
     }
     return($Output);
@@ -538 +542 @@
           $BillCode = $Finance->GetNextDocumentLineNumber(6); // Faktury vydané
           $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], array(array('Description' => 'Připojení k síti', 'Price' => $PayPerPeriod, 'Quantity' => 1)), $Period['From'], $Period['To'], $BillCode);
-          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 'Text' => 'Připojení k síti za období '.$TimePeriodText, 'Bill' => 0, 'BillCode' => $BillCode));
+          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 'Text' => 'Připojení k síti za období '.$TimePeriodText, 'Bill' => 0, 'BillCode' => $BillCode));
           $Output .= $this->SendPaymentEmail($Member['Id']);
           $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
@@ -616 +620 @@
     } else $Output = 'Uživatel '.$User['Name'].' nemá email.';
   }
+  
+  function GenerateBills()
+  {
+    // FinanceClaimsLiablities
+    $DbResult = $this->Database->query('SELECT * FROM FinanceClaimsLiabilities WHERE (BillCode <> "") AND (Value >= 0)');
+    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']);
+      $this->Database->update('FinanceClaimsLiabilities', 'Id='.$Row['Id'], array('Bill' => $BillId));
+      echo('.');
+    }
+
+    // FinanceOperations
+  }
 }