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 fa8961935661a9be7f9caba60f67ca3102ebee5a..51f40a8c775b8bb73792b14b50b9a10f0de626f7 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -25,16 +25,29 @@ class purch_order
        var $supplier_id;
        var $supplier_name;
        var $orig_order_date;
+       var $due_date;
        var $order_no; /*Only used for modification of existing orders otherwise only established when order committed */
        var $lines_on_order = 0;
        var $credit;
        var $tax_group_id;
        var $tax_group_array = null; // saves db queries
        var $tax_included; // type of prices
-       
+       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)
        
-       function purch_order()
+       var $prep_amount = 0; // prepayment required
+       var $alloc; // sum of payments allocated
+       var $prepayments = array();
+
+       var $fixed_asset = false;
+
+       function __construct()
        {
                /*Constructor function initialises a new purchase order object */
                $this->line_items = array();
@@ -53,7 +66,7 @@ class purch_order
        
        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);
@@ -122,8 +135,12 @@ class purch_order
                }
                return 0;
        }
-
-       function get_taxes($shipping_cost=null)
+       
+       //
+       //      Returns taxes for PO/GRN.
+       //      $receival=true in purchase receive context.
+       //
+       function get_taxes($shipping_cost=null, $receival=false)
        {
                $items = array();
                $prices = array();
@@ -132,7 +149,7 @@ class purch_order
 
                foreach ($this->line_items as $ln_itm) {
                        $items[] = $ln_itm->stock_id;
-                       $prices[] = round($ln_itm->quantity * $ln_itm->price,  user_price_dec());
+                       $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);
@@ -142,7 +159,11 @@ class purch_order
                        $val = $taxes['1']['Value'];
                        $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;
        }
 
@@ -195,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)
        {
 
@@ -207,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;
@@ -224,6 +246,21 @@ class po_line_details
                $this->standard_cost =0;
                $this->grn_item_id = $grn_item_id;
        }
+       
+       // 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);
+       }
 }
 
-?>