Bug 5695: Purchase Order Item Description should be saved on the PO line description...

[fa-stable.git] / purchasing / includes / po_class.inc

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index 4eb5c0b74a7873c6a4a8d876f17306be3295211a..51f40a8c775b8bb73792b14b50b9a10f0de626f7 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -32,37 +32,41 @@ class purch_order
        var $tax_group_id;
        var $tax_group_array = null; // saves db queries
        var $tax_included; // type of prices
-       var $tax_algorithm;
-       var $stored_algorithm; // copy to find the change after invoice in processed
        var $terms;
-       
+       var $ex_rate;
+       var $cash_account;
+       var $dimension,
+               $dimension2;
+
        var $reference;
+       var $tax_overrides = array();           // array of taxes manually inserted during sales invoice entry (direct invoice)
        
        var $prep_amount = 0; // prepayment required
        var $alloc; // sum of payments allocated
        var $prepayments = array();
 
-       function purch_order()
+       var $fixed_asset = false;
+
+       function __construct()
        {
                /*Constructor function initialises a new purchase order object */
                $this->line_items = array();
                $this->lines_on_order = $this->order_no = $this->supplier_id = 0;
        }
        
-       function set_supplier($supplier_id, $supplier_name, $curr_code, $tax_group_id, $tax_included, $tax_algorithm)
+       function set_supplier($supplier_id, $supplier_name, $curr_code, $tax_group_id, $tax_included)
        {
                $this->supplier_id = $supplier_id;
                $this->supplier_name = $supplier_name;
                $this->curr_code = $curr_code;
                $this->tax_group_id = $tax_group_id;
                $this->tax_included = $tax_included;
-               $this->stored_algorithm = $this->tax_algorithm = $tax_algorithm;
                $this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
        }
        
        function add_to_order($line_no, $stock_id, $qty, $item_descr, $price, $uom, $req_del_date, $qty_inv, $qty_recd)
        {
-               if ($qty != 0 && isset($qty))
+               if (isset($qty) && $qty != 0)
                {
                        $this->line_items[$line_no] = new po_line_details($line_no, $stock_id, $item_descr, $qty, $price, $uom, 
                                $req_del_date, $qty_inv, $qty_recd);
@@ -148,13 +152,18 @@ class purch_order
                        $prices[] = round($ln_itm->price * ($receival ? $ln_itm->receive_qty : $ln_itm->quantity),  user_price_dec());
                }
                $taxes = get_tax_for_items($items, $prices, $shipping_cost,
-                 $this->tax_group_id, $this->tax_included,  $this->tax_group_array, $this->tax_algorithm);
+                 $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->curr_code == 'CHF') {
                        $val = $taxes['1']['Value'];
-                       $taxes['1']['Value'] = (floatval((intval(round(($val*20),0)))/20));
-               } 
+                       $val1 = (floatval((intval(round(($val*20),0)))/20));
+                       $taxes['1']['Value'] = $val1;
+               }
+               foreach($this->tax_overrides as $id => $value) // add values entered manually
+               {
+                       $taxes[$id]['Override'] = $value;
+               }
                return $taxes;
        }
 
@@ -175,7 +184,7 @@ class purch_order
 
                if (!$this->tax_included ) {
                        $taxes = get_tax_for_items($items, $prices, 0, $this->tax_group_id,
-                       $this->tax_included,  $this->tax_group_array, $this->tax_algorithm);
+                       $this->tax_included,  $this->tax_group_array);
 
                        foreach($taxes as $tax)
                                $total += round($tax['Value'], $dec);
@@ -207,7 +216,7 @@ class po_line_details
        var $standard_cost;
        var $descr_editable;
 
-       function po_line_details($line_no, $stock_item, $item_descr, $qty, $prc, $uom, $req_del_date, 
+       function __construct($line_no, $stock_item, $item_descr, $qty, $prc, $uom, $req_del_date, 
                $qty_inv, $qty_recd, $grn_item_id=0)
        {
 
@@ -219,7 +228,8 @@ class po_line_details
                        return;
 
                $this->descr_editable = $item_row["editable"];
-               if ($item_descr == null || !$this->descr_editable)
+               //if ($item_descr == null || !$this->descr_editable) this was overriding the prchase description!!
+               if ($item_descr == null)
                        $this->item_description = $item_row["description"];
                else
                        $this->item_description = $item_descr;
@@ -237,11 +247,20 @@ class po_line_details
                $this->grn_item_id = $grn_item_id;
        }
        
-       function taxfree_charge_price($po)
+       // Deprecated, use with care. If you need line value as it is calculated in invoice, use taxfree_charge_value below.
+       function taxfree_charge_price($po)
        {
                return get_tax_free_price_for_item($this->stock_id, $this->price, 
                  $po->tax_group_id, $po->tax_included, $po->tax_group_array);
        }
+
+       //
+       // GRN line tax free value.
+       //
+       function taxfree_charge_value($po)
+       {
+               return get_tax_free_price_for_item($this->stock_id, $this->receive_qty*$this->price,
+                 $po->tax_group_id, $po->tax_included, $po->tax_group_array);
+       }
 }
 
-?>