Hotkey support for viewer links.

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

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 9a730136fb4ed09806b210a394f71cf2fe264f2d..78cf46a88f0712d84a72e3c55588980a94ad98a8 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -54,7 +54,7 @@ class cart
        var $tax_group_id;
        var $tax_group_name;
        var $tax_group_array = null; // saves db queries
-
+       var $price_factor;       // ditto for price calculations
        //-------------------------------------------------------------------------
        //
        //  $trans_no==0 => open new/direct document
@@ -67,7 +67,6 @@ class cart
                $this->sales_type = "";
                $this->trans_type = 30;
                $this->read($type, $trans_no, $view );
-
        }
 
        //-------------------------------------------------------------------------
@@ -76,17 +75,17 @@ class cart
        function read($type, $trans_no = 0, $view=false ) {
 
                if (!is_array($trans_no)) $trans_no = array($trans_no);
-
                if ($trans_no[0]) {
                        if ($type == 30) { // sales order
                                read_sales_order($trans_no[0], $this);
                                if ($view) {    // prepare for DN/IV entry
                                        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;
                                        }
                                }
-                               } else {        // derivative transaction
+                       } else {        // derivative transaction
                                        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);
@@ -112,12 +111,14 @@ class cart
                                                        $sign = 1; // $type==13 ?  1 : -1; // this is strange debtor_trans atavism
                                                        $line = &$this->line_items[$line_no];
 
+                                                       $line->src_id = $srcline['id']; // save src line ids for update
                                                        $line->qty_old = $line->qty_dispatched = $line->quantity;
                                                        $line->quantity += $sign * ($srcline['quantity'] - $srcline['qty_done']); // add free qty on src doc
                                                }
                                        } else {
                                                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;
                                                }
                                        }
@@ -126,11 +127,20 @@ class cart
                                $this->trans_type = $type;
                                $this->trans_no = 0;
                                // set new sales document defaults here
-                               $this->customer_id = '';
+                               if (get_global_customer() != reserved_words::get_all())
+                                 $this->customer_id = get_global_customer();
+                               else
+                                 $this->customer_id = '';
                                $this->document_date = Today();
                                if (!is_date_in_fiscalyear($this->document_date))
                                        $this->document_date = end_fiscalyear();
                                $this->reference = references::get_next($this->trans_type);
+                               if ($type == 10)
+                                 $this->due_date =
+                                       get_invoice_duedate($this->customer_id, $this->document_date);
+                               else
+                                 $this->due_date =
+                                       add_days($this->document_date, sys_prefs::default_delivery_required_by());
                        }
        }
 
@@ -146,17 +156,28 @@ class cart
                        $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);
+                       $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==13 ? key($src->trans_no) : $src->order_no;
                }
+// if we want to save old or derivative document first decode html entities
+// from text fields. For new documents this is not needed.
+               if ($this->trans_no || $this->trans_type != 30) {
+                       $this->reference = @html_entity_decode($this->reference);
+                       $this->Comments = @html_entity_decode($this->Comments);
+                       foreach($this->line_items as $lineno => $line) {
+                               $this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id);
+                               $this->line_items[$lineno]->description = @html_entity_decode($line->description);
+                       }
+               }
                switch($this->trans_type) {
                        case 10:
                                return write_sales_invoice($this);
@@ -189,12 +210,12 @@ class cart
                $this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
        }
 
-       function set_sales_type($sales_type, $sales_name, $tax_included=0)
+       function set_sales_type($sales_type, $sales_name, $tax_included=0, $factor=0)
        {
-           $old_tax_inc = $this->tax_included;
            $this->sales_type = $sales_type;
            $this->sales_type_name = $sales_name;
            $this->tax_included = $tax_included;
+           $this->price_factor = $factor;
        }
 
        function set_location($id, $name)
@@ -227,7 +248,6 @@ class cart
 
        function update_cart_item($line_no, $qty, $price, $disc)
        {
-
                $this->line_items[$line_no]->quantity = $qty;
                $this->line_items[$line_no]->qty_dispatched = $qty;
                $this->line_items[$line_no]->price = $price;
@@ -335,6 +355,12 @@ class cart
                $taxes = get_tax_for_items($items, $prices, $shipping_cost,
                  $this->tax_group_id, $this->tax_included,  $this->tax_group_array);
 
+    // Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
+    if ($this->customer_currency == 'CHF') {
+                       $val = $taxes['1']['Value'];
+      $val1 = (floatval((intval(round(($val*20),0)))/20));
+                       $taxes['1']['Value'] = $val1;
+               } 
                return $taxes;
        }
 
@@ -379,6 +405,7 @@ class line_details
        var $tax_type;
        var $tax_type_name;
        var $src_no;    // number of src doc for this line
+       var $src_id;
        var $quantity;
        var $price;
        var $discount_percent;