Ticket #220: invoices.php.patch

modules/bms/include/invoices.php

@@ -164 +164 @@
                                 <?php
 
                                 foreach($statuses as $therecord){
-                                        ?><option value="<?php echo $therecord["id"]?>" <?php if($statusid==$therecord["id"]) echo "selected=\"selected\""?>><?php echo $therecord["name"]?></option><?php
+                                        ?><option value="<?php echo $therecord["id"]?>" <?php if($statusid==$therecord["id"]) echo "selected=\"selected\""?>><?php ___ ($therecord["name"]);?></option><?php
                                 }//endforeach
                                 
                                 ?>
@@ -368 +368 @@
                 
                 }//end function
                 
+                
                 // CLASS OVERRIDES ======================================================================================
                 
                 function getDefaults(){
@@ -401 +402 @@
                         $therecord["hascredit"]=0;
                         $therecord["creditlimit"]=0;
                         $therecord["creditleft"]=0;
+                        // mw
+                        $therecord['invoice_id']=0; // for individual invoice number
                         return $therecord;
                 }
                 
@@ -432 +435 @@
                                 $therecord["creditleft"] = $therecord["creditlimit"] - $arrecord["amtopen"];
                         } else
                                 $therecord["creditleft"] =0;
-                                
+
                         return $therecord;
                 }
                 
@@ -542 +545 @@
                 
                 
                 function updateRecord($variables, $modifiedby = NULL){
-        
+                print "<!--hier ggf. ID aendern zur Zeit: ". __FILE__ ." " . __LINE__  . "//-->";
+
                         if($modifiedby === NULL)
                                 $modifiedby = $_SESSION["userinfo"]["id"];
                 
@@ -608 +612 @@
                         $variables = $this->prepareVariables($variables);
         
                         $newid = parent::insertRecord($variables, $createdby);
+                        //print "hier neue ID einschreiben zur Zeit: ". $newid. " " . __FILE__ ." " . __LINE__ ;
                         
                         if($variables["billingsaveoptions"] != "orderOnly" || $variables["shiptosaveoptions"] != "orderOnly"){
                                 
@@ -660 +665 @@
                                 SELECT
                                         products.partname,
                                         products.partnumber,
-
+                                        lineitems.displayorder,
                                         lineitems.id,
                                         lineitems.productid,
                                         lineitems.taxable,
@@ -690 +695 @@
                         while($therecord = $this->db->fetchArray($this->queryresult)){
                         
                                 ?><tr id="li<?php echo $count?>" class="lineitems">
-                                
-                                        <td colspan="2" class="lineitemsLeft" <?php if($this->invoicetype == "Void" || $this->invoicetype == "Invoice") echo 'nowrap="nowrap"'?>>
+                                        <td align="center" valign="top"><?php echo intval($therecord["displayorder"])+1;?></td>                         
+                                        <td colspan="2" class="lineitemsLeft" <?php if($this->invoicetype == "Void" || $this->invoicetype == "Invoice") echo 'nowrap="nowrap"'?>>                               
                                                 <input type="hidden" id="li<?php echo $count?>ProductID" value="<?php echo $therecord["productid"]?>"/>
                                                 <input type="hidden" id="li<?php echo $count?>Taxable" value="<?php echo $therecord["taxable"]?>"/>
                                                 <input type="hidden" id="li<?php echo $count?>UnitWeight" class="lineitemWeights" value="<?php echo $therecord["unitweight"]?>"/>
@@ -705 +710 @@
                                                         ?>
                                                 </div>
                                         </td>
-                                        
-                                        <td><input id="li<?php echo $count?>Memo" class="lineitemMemos" value="<?php echo formatVariable($therecord["memo"])?>"/></td>
+                                        <td>
+                                                <textarea id="li<?php echo $count?>Memo" class="lineitemMemos" style="width:95%;height:65px;"><?php 
+                                                                echo formatVariable($therecord["memo"]);
+                                                ?></textarea>
+                                        </td>
                                         
-                                        <td><input id="li<?php echo $count?>UnitPrice" class="fieldCurrency lineitemPrices" value="<?php echo formatVariable($therecord["unitprice"], "currency")?>"/></td>
-                                        <td><input id="li<?php echo $count?>Quantity" class="lineitemQuantities" value="<?php echo formatVariable($therecord["quantity"], "real")?>"/></td>
-                                        <td><input id="li<?php echo $count?>Extended" class="uneditable fieldCurrency lineitemExtendeds" readonly="readonly" value="<?php echo formatVariable($therecord["quantity"] * $therecord["unitprice"], "currency")?>"/></td>
+                                        <td valign="top"><input id="li<?php echo $count?>UnitPrice" class="fieldCurrency lineitemPrices" value="<?php echo formatVariable($therecord["unitprice"], "currency")?>"/></td>
+                                        <td valign="top"><input id="li<?php echo $count?>Quantity" class="lineitemQuantities" value="<?php echo formatVariable($therecord["quantity"], "real")?>"/></td>
+                                        <td valign="top"><input id="li<?php echo $count?>Extended" class="uneditable fieldCurrency lineitemExtendeds" readonly="readonly" value="<?php echo formatVariable($therecord["quantity"] * $therecord["unitprice"], "currency")?>"/></td>
                                         
                                         <td class="lineitemsButtonTDs">
                                                 <div id="li<?php echo $count?>ButtonsDiv" class="lineitemsButtonDivs">
@@ -751 +759 @@
                                 $itemRecord = explode("::", $item);
                                 if(count($itemRecord) > 1){
                                 
-                                        $insertstatement ="
+                                $insertstatement ="
                                                 INSERT INTO
                                                         lineitems(
                                                                 invoiceid, 
@@ -784 +792 @@
                                                         NOW()                                                   
                                                 )";
                                         
+                                        
                                         $this->db->query($insertstatement);
-                                                
+                                        
                                         $count++;
                                         
                                 }//end if
@@ -985 +994 @@
                 function mark_rtp(){
                         
                         $whereclause=$this->buildWhereClause();
-                        $whereclause="(".$whereclause.") AND invoices.type='Order'";
+                        $whereclause="(".$whereclause.") AND invoices.type='Order'"; // @TODO Credit Memo
 
                         // since marking RTP is dependent on the payment method type,
                         // items must be updated individually
@@ -1167 +1313 @@
                         
                         if($whereclause)                        
                                 $this->whereclause = "(".$whereclause.") AND ";
-                        
-                        $this->whereclause .= "invoices.type='Order' AND readytopost = 1";
+
+                        // MW added Support for Credit Memo
+                        $this->whereclause .= "( invoices.type='Order' OR invoices.type='Credit Memo' ) AND readytopost = 1";
                 
                 }//end method
                 
@@ -1174 +1321 @@
                 
                 
                 function post($whereclause=NULL){
+                        print "<!-- ReadyToPost -> Rechnungsnummer generieren..." . __FILE__ . " ".__LINE__  . "//-->";
                         
                         if($whereclause)
                                 $this->prepareWhere($whereclause);
-                        
-                        
+
+                                // added invoices.type mw
                         $querystatement = "
                                 SELECT
                                         invoices.id,
@@ -1183 +1331 @@
                                 SELECT
                                         invoices.id,
                                         invoices.clientid,
+                                        invoices.type as invoice_type,
                                         invoices.totalti,
                                         invoices.invoicedate,
                                         paymentmethods.type,
@@ -1197 +1346 @@
                                         ".$this->whereclause;
                         $queryresult = $this->db->query($querystatement);
                         
-                        $count =0;
-                        while($therecord = $this->db->fetchArray($queryresult)){
+                        $count = 0;
+                        $old_invoice_type = '';
+                        while($therecord = $this->db->fetchArray($queryresult))
+                        {
+                                // $old_invoice_type = $therecord['invoice_type'];
+
+                                /*
+                                if ( strtolower ($old_invoice_type) == 'credit memo')
+                                                ;
 
+                                */
                                 $updatestatement = "
                                         UPDATE
                                                 `invoices`
@@ -1234 +1391 @@
                                                 `invoicedate` = NOW(), ";
                                                 
                                 }//end if
+
+
+                                // MW
+                                $iid = $this->generateItemNumber ($old_invoice_type);
+
+                                if ( $iid  )
+                                                $updatestatement .= "invoice_id = '".$iid."', ";
+                                else
+                                {
+                                        print "Fehlermeldung - keine Rechnungsnummer gefunden/generiert. " . __FILE__ . " " . __LINE__;
+                                        continue;       
+                                }               
                                 
                                 $updatestatement .= "
                                                 `modifiedby` = ".$this->modifiedby.",
@@ -1242 +1411 @@
                                                 `id` = ".$therecord["id"];
                                                 
                                 $updateresult = $this->db->query($updatestatement);
-                                                
+        
                                 if($therecord["type"] == "receivable") {
                                         // if type = AR, create AR item
                                         
@@ -1253 +1422 @@
                                         $arrecord["itemdate"] = dateToString(stringToDate($therecord["invoicedate"],"SQL") );
                                         $arrecord["clientid"] = $therecord["clientid"];
                                         $arrecord["relatedid"] = $therecord["id"];
-                                        
+                                                                        
                                         if(!class_exists("phpbmsTable"))
                                                 include("include/tables.php");
                                                 
@@ -1271 +1440 @@
                         
                 }//end method
                 
+                
+         /**
+                * Create a individual invoice number
+                *       @author m.waldeck@ibased.de
+                * @copyright Copyright (c) 2009, Mathias Waldeck, i.based: Systemhaus GmbH & Co. KG
+          * @todo       Implementing various Number-Typs and Integration in central Configuration
+          * 
+          * ALTER TABLE  `invoices` ADD  `invoice_id` VARCHAR( 11 ) NOT NULL AFTER  `clientid` ;
+                */
+
+                function generateItemNumber ( $type = "" )
+                {
+                        $querystatement = '
+                                                SELECT invoice_id 
+                                                FROM  `invoices` 
+                                                ORDER BY  `invoices`.`invoice_id` DESC 
+                                                LIMIT 0 , 1';                   
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $last_invoice_id="";
+                        $therecord=0;
+                        if ( ($therecord = $this->db->fetchArray($queryresult)) && is_array ($therecord) )
+                        {
+                                $last_invoice_id = $therecord['invoice_id'];
+                        }
+                        else 
+                        {
+                                        return FALSE;
+                        }
+
+                        if (substr ($last_invoice_id,-5) < 13950 )      $last_invoice_id = 13950;                               // our first Invoice Number from old erp
+                        
+                        do 
+                        {
+                                // our number type YearMonth +  to number consecutively 
+                                $nr = substr ($last_invoice_id,-5);
+                                $prefix = date ('ym');
+                                $new_invoice_id = $prefix . ($nr + 1);
+                
+                                $querystatement = sprintf ('
+                                                        SELECT invoice_id 
+                                                        FROM  `invoices` WHERE invoice_id = "%s" 
+                                                        ORDER BY  `invoices`.`invoice_id` DESC 
+                                                        LIMIT 0 , 1', $new_invoice_id);                 
+        
+                                $queryresult = $this->db->query($querystatement);
+                        } 
+                        while (mysql_num_rows ($queryresult)>0 );
+
+                        return $new_invoice_id;
+                                
+                }
+        
+                
         }//end class invoicePost
 
 }//end function