Fixing price formatting of left to allocate

[fa-stable.git] / sales / includes / cart_class.inc

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 628ab43a3ea5e3fd34ea59ed2f03db2b65e769db..ce885a3285e12ce72f53a91f4670d322353cc9b2 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -17,7 +17,7 @@ class cart
        var $trans_type; // invoice, order, delivery note ...
        var $trans_no = array();// array (num1=>ver1,..) or 0 for new
        var $so_type = 0;               // for sales order: simple=0 template=1
-
+       var $cart_id;           // used to detect multi-tab edition conflits
        var $line_items;  //array of objects of class line_details
 
        var $src_docs = array();        // array of arrays(num1=>ver1,...) or 0 for no src
@@ -77,6 +77,7 @@ class cart
                $this->dimension_id = 0;
                $this->dimension2_id = 0;
                $this->read($type, $trans_no, $view );
+               $this->cart_id = uniqid('');
        }
 
        //-------------------------------------------------------------------------
@@ -179,7 +180,7 @@ class cart
                                if ($this->cash) {
                                        $this->Location = $pos['pos_location'];
                                        $this->location_name = $pos['location_name'];
-                                       $this->cash_account = $pos['account_code'];
+                                       $this->cash_account = $pos['pos_account'];
                                        $this->account_name = $pos['bank_account_name'];
                                }
                                } else
@@ -306,7 +307,7 @@ class cart
 
        function remove_from_cart($line_no)
        {
-               unset($this->line_items[$line_no]);
+               array_splice($this->line_items, $line_no, 1);
        }
 
        function clear_items()