Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...
[fa-stable.git] / sales / includes / cart_class.inc
index d8792dd73a094e8858dbdb520c13055fc22c97a2..062d9bad732a49529f6b417d2af54dce4e625a9f 100644 (file)
@@ -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
@@ -81,7 +80,7 @@ class cart
        //  $trans_no!=0 && $no_edit==false => update with parent constarints for reedition
        //  $trans_no!=0 && $no_edit==true => read only: for view, or later child doc entry
        //
-       function Cart($type, $trans_no=0, $no_edit=false) {
+       function Cart($type, $trans_no=0, $prep_child=false) {
                /*Constructor function initialises a new shopping cart */
                $this->line_items = array();
                $this->sales_type = "";
@@ -91,7 +90,8 @@ class cart
                        $this->trans_type = ST_SALESORDER;
                $this->dimension_id = 0;
                $this->dimension2_id = 0;
-               $this->read($type, $trans_no, $no_edit);
+               $this->pos = get_sales_point(user_pos());
+               $this->read($type, $trans_no, $prep_child);
                $this->cart_id = uniqid('');
        }
        
@@ -116,9 +116,12 @@ class cart
                }
                unset($line);
                
-               if ($type == ST_CUSTDELIVERY)
+               if ($type == ST_CUSTDELIVERY) {
                        $this->order_no = key($this->trans_no);
-
+                       $cust = get_customer($this->customer_id);
+                       $this->dimension_id = $cust['dimension_id'];
+                       $this->dimension2_id = $cust['dimension2_id'];
+               }
                if ($type == ST_SALESINVOICE) {
                        $this->due_date = get_invoice_duedate($this->payment, $this->document_date);
                }
@@ -136,37 +139,36 @@ class cart
        function set_parent_constraints($sodata, $src_no) {
 
                $srcdetails = get_sales_parent_lines($this->trans_type, $src_no);
-               
                $src_type = get_parent_type($this->trans_type);
-               if ($src_type == ST_SALESORDER || $src_type == 0) {
-                       $this->src_docs = array( $sodata['order_no']=>$sodata['version']);
-               } else {        // get src_data from debtor_trans
-                       $srcnum = array();
-                       while ($line = db_fetch($srcdetails)) {
-                               $srcnum[] = $line['debtor_trans_no'];
-                       }
-                       $this->src_docs = get_customer_trans_version($src_type, array_values($srcnum));
-               }
+
                // calculate & save: qtys on other docs and free qtys on src doc
-               $line_no = 0;
+               $line_no = 0; $src_docs = array();
                // Loop speed optimisation below depends on fact 
                // that child line_items contains subset of parent lines in _the_same_ order !
-               while ($line_no < count($this->line_items) && $srcline = db_fetch($srcdetails)) {
+               while (($line_no < count($this->line_items)) && ($srcline = db_fetch($srcdetails))) {
                        $line = &$this->line_items[$line_no];
+                       $src_docs[] = $src_type == ST_SALESORDER ?  $srcline['order_no'] : $srcline['debtor_trans_no'];
                        if ($srcline['id'] == $line->src_id) {
                                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;
                        }
                }
+
+               if ($src_type == ST_SALESORDER || $src_type == 0) {
+                       $this->src_docs = array( $sodata['order_no']=>$sodata['version']);
+               } else {
+                       // get src_data from debtor_trans
+                       $this->src_docs = get_customer_trans_version($src_type, array_unique($src_docs));
+               }
        }
        //-------------------------------------------------------------------------
        // Reading document into cart
        //
-       function read($type, $trans_no = 0, $no_edit=false) {
+       function read($type, $trans_no=0, $prep_child=false) {
 
                global $SysPrefs, $Refs;
 
@@ -176,7 +178,7 @@ class cart
                        if ($type == ST_SALESORDER || $type == ST_SALESQUOTE) { // sales order || sales quotation
                                read_sales_order($trans_no[0], $this, $type);
                        } else {        // other type of sales transaction
-                                       read_sales_trans($type, $trans_no, $this);
+                                       read_sales_trans($type, $trans_no, $this); 
                                        if ($this->order_no) { // free hand credit notes have no order_no
                                                $sodata = get_sales_order_header($this->order_no, ST_SALESORDER);
                                                $this->cust_ref = $sodata["customer_ref"];
@@ -184,19 +186,15 @@ 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)
+                                       if (!$prep_child) // this is read for view/reedition
                                                $this->set_parent_constraints($sodata, $trans_no[0]);
+                                       }
                        }
-                       // prepare qtys for derivative document entry (not used in display)
-                       if($no_edit) {
-                               for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
-                                       $line = &$this->line_items[$line_no];
-                                       $line->src_id = $line->id; // save src line ids for update
-                                       $line->qty_dispatched = $line->quantity - $line->qty_done;
-                               }
-                       }
+                       // convert document into child and prepare qtys for entry
+                       if ($prep_child)
+                               $this->prepare_child();
+
                } else { // new document
                                $this->trans_type = $type;
                                $this->trans_no = 0;
@@ -206,7 +204,7 @@ class cart
                                  $this->customer_id = get_global_customer();
                                else
                                  $this->customer_id = '';
-                               $this->document_date =  new_doc_date();
+                               $this->document_date = new_doc_date();
                                if (!is_date_in_fiscalyear($this->document_date))
                                        $this->document_date = end_fiscalyear();
                                $this->reference = $Refs->get_next($this->trans_type);
@@ -237,8 +235,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);
        }
 
@@ -250,22 +247,19 @@ class cart
                begin_transaction(); // prevents partial database changes in case of direct delivery/invoice
                if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY)) {
                        // this is direct document - first add parent
-                       $src = (PHP_VERSION<5) ? $this : clone( $this ); // make local copy of this cart
-                       $src->trans_type = get_parent_type($src->trans_type);
-                       $src->reference = 'auto';
-
-                       $src->write(1);
-                       $type = $this->trans_type;
                        $ref = $this->reference;
                        $date = $this->document_date;
-                       // re-read document
-                       $this->read($src->trans_type, key($src->trans_no), true);
+                       $due_date = $this->due_date;
+                       $this->trans_type = get_parent_type($this->trans_type);
+
+                       $this->reference = 'auto'; 
+                       $trans_no = $this->write(1); 
+
+                       // re-read parent document converting it to child
+                       $this->read($this->trans_type, $trans_no, true); 
                        $this->document_date = $date;
                        $this->reference = $ref;
-                       $this->trans_type = $type;
-                       $this->src_docs= $this->trans_no;
-                       $this->trans_no = 0;
-                       $this->order_no= $this->trans_type==ST_CUSTDELIVERY ? key($src->trans_no) : $src->order_no;
+                       $this->due_date = $due_date;
                }
                $this->reference = @html_entity_decode($this->reference, ENT_QUOTES);
                $this->Comments = @html_entity_decode($this->Comments, ENT_QUOTES);
@@ -301,17 +295,11 @@ 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->credit = get_current_cust_credit($customer_id);
        }
@@ -348,10 +336,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 +454,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());
                }
 
@@ -494,12 +484,12 @@ class cart
        function get_shipping_tax()
        {
 
-               $tax_items = get_shipping_tax_as_array();
+               $tax_items = get_shipping_tax_as_array($this->tax_group_id);
                $tax_rate = 0;
                if ($tax_items != null) {
                        foreach ($tax_items as $item_tax) {
                                $index = $item_tax['tax_type_id'];
-                               if (isset($this->tax_group_array[$index])) {
+                               if (isset($this->tax_group_array[$index]['rate'])) {
                                        $tax_rate += $item_tax['rate'];
                                }
                        }
@@ -573,12 +563,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)