[0005214] Stock Check Sheet: changed option name to less confusing for shortages...

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

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 1bc3db242f5b0528d2f98a2a65bde6275125bd14..f7e05815c285efc2185f7a336e75d07c05ff97c5 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -71,7 +71,7 @@ class Cart
        var $dimension_id;
        var $dimension2_id;
        var $payment;
-       var $payment_terms; // cached payment terms
+       var $payment_terms = array('cash_sale' => false, 'days_before_due' => 0); // cached payment terms
        var $credit;
        // prepayment mode:
        var $prepaid=false;     // true for documents issued in prepayment mode
@@ -293,11 +293,11 @@ class Cart
                {
                        if (!empty($SysPrefs->prefs['ref_no_auto_increase']))
                                $this->reference = $Refs->get_next($this->trans_type, null, array('date' => Today()));
-                       if (!is_new_reference($this->reference, $this->trans_type))     
+                       else    
                        {
                                commit_transaction();
                                return -1;
-                       }       
+                       }
                }
                if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY) && !$this->is_prepaid()) {
                        // this is direct document - first add parent
@@ -565,7 +565,6 @@ class Cart
                $total = $this->get_items_total() + $this->freight_cost;
                $dec = user_price_dec();
                if (!$this->tax_included ) {
-                       $total += $this->get_shipping_tax();
                        $taxes = $this->get_taxes();
                        foreach($taxes as $tax)
                                $total += round($tax['Value'], $dec);