Fixed bugs 312-314, imporved debug error handling, updated gettext template.

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

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 34db947a40d2be68e3929375fdc5819d89c85899..286f9f373dcd89642d3f9f8ffe2e1eb8849177a1 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -65,7 +65,6 @@ class cart
        var $price_factor;       // ditto for price calculations
 
        var     $pos;                   // user assigned POS
-       var $cash;                      // cash transaction - helper variable not stored in db
        var $cash_account;
        var $account_name;
        var $cash_discount;     // not used as of FA 2.1
@@ -91,6 +90,7 @@ class cart
                        $this->trans_type = ST_SALESORDER;
                $this->dimension_id = 0;
                $this->dimension2_id = 0;
+               $this->pos = get_sales_point(user_pos());
                $this->read($type, $trans_no, $no_edit);
                $this->cart_id = uniqid('');
        }
@@ -142,8 +142,8 @@ class cart
                        $this->src_docs = array( $sodata['order_no']=>$sodata['version']);
                } else {        // get src_data from debtor_trans
                        $srcnum = array();
-                       foreach($srcdetails as $line) {
-                               $srcnum = $line['debtor_trans_no'];
+                       while ($line = db_fetch($srcdetails)) {
+                               $srcnum[] = $line['debtor_trans_no'];
                        }
                        $this->src_docs = get_customer_trans_version($src_type, array_values($srcnum));
                }
@@ -157,7 +157,8 @@ class cart
                                if ($this->trans_type == ST_SALESINVOICE)
                                        $line->src_no = $srcline['debtor_trans_no'];
                                $line->qty_old = $line->qty_dispatched = $line->quantity;
-                               $line->quantity += $srcline['quantity'] - $srcline['qty_done']; // add free qty on src doc
+                               $line->quantity += $srcline['quantity'] - 
+                                       ($src_type==ST_SALESORDER ? $srcline['qty_sent'] : $srcline['qty_done']); // add free qty on src doc
                                $line_no++;
                                break;
                        }
@@ -184,10 +185,10 @@ class cart
                                        //      $this->customer_currency = $sodata["curr_code"];
                                                $this->delivery_to = $sodata["deliver_to"];
                                                $this->delivery_address = $sodata["delivery_address"];
-                                       }
                                        // child transaction reedition - update with parent info unless it is freehand
-                                       if (!$no_edit)
-                                               $this->set_parent_constraints($sodata, $trans_no[0]);
+                                               if (!$no_edit)
+                                                       $this->set_parent_constraints($sodata, $trans_no[0]);
+                                       }
                        }
                        // prepare qtys for derivative document entry (not used in display)
                        if($no_edit) {
@@ -237,8 +238,7 @@ class cart
                                } else
                                        $this->due_date =
                                                add_days($this->document_date, $SysPrefs->default_delivery_required_by());
-                       $this->pos = user_pos();
-                       }
+               }
                $this->credit = get_current_cust_credit($this->customer_id);
        }
 
@@ -301,17 +301,13 @@ class cart
                $this->customer_currency = $currency;
                $this->payment = $payment;
                $this->payment_terms = get_payment_terms($payment);
-               $this->cash = $this->payment_terms['cash_sale'];
                $this->cash_discount = $cdiscount;
 
-               $pos = get_sales_point($this->pos);
-               if (!$pos['cash_sale'] || !$pos['credit_sale']) 
-                       $this->pos = -1; // mark not editable payment type
-               if ($this->cash) {
-                       $this->Location = $pos['pos_location'];
-                       $this->location_name = $pos['location_name'];
-                       $this->cash_account = $pos['pos_account'];
-                       $this->account_name = $pos['bank_account_name'];
+               if ($this->payment_terms['cash_sale']) {
+                       $this->Location = $this->pos['pos_location'];
+                       $this->location_name = $this->pos['location_name'];
+                       $this->cash_account = $this->pos['pos_account'];
+                       $this->account_name = $this->pos['bank_account_name'];
                }
                $this->credit = get_current_cust_credit($customer_id);
        }
@@ -348,10 +344,11 @@ class cart
                        $this->freight_cost = $freight_cost;
        }
 
-       function add_to_cart($line_no, $stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0)
+       function add_to_cart($line_no, $stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0,
+               $src_id=0)
        {
                $line = new line_details($stock_id, $qty, $price, $disc,
-                       $qty_done,  $standard_cost, $description, $id, $src_no);
+                       $qty_done,  $standard_cost, $description, $id, $src_no, $src_id);
 
                if ($line->valid) {
                        $this->line_items[$line_no] = $line;
@@ -465,7 +462,8 @@ class cart
 
                foreach ($this->line_items as $ln_itm) {
                        $items[] = $ln_itm->stock_id;
-                       $prices[] = round(($ln_itm->qty_dispatched *
+                       $prices[] = round(((
+                               $this->trans_type==ST_SALESORDER ?      $ln_itm->quantity : $ln_itm->qty_dispatched) *
                                $ln_itm->line_price()* (1 - $ln_itm->discount_percent)),  user_price_dec());
                }
 
@@ -573,12 +571,13 @@ class line_details
 
 
        function line_details ($stock_id, $qty, $prc, $disc_percent,
-               $qty_done, $standard_cost, $description, $id=0, $src_no=0 )
+               $qty_done, $standard_cost, $description, $id=0, $src_no=0, $src_id=0)
        {
        /* Constructor function to add a new LineDetail object with passed params */
 
                $this->id = $id;
                $this->src_no = $src_no;
+               $this->src_id = $src_id;
                $item_row = get_item($stock_id);
 
                if (!$item_row)