[0004904] Customer Credit Note: fixed invalid inventory GL postings for service items.

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

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index 7fdef20306065a05a444f3096cbe611f22282ff5..c24119d2b9d26bd226e7c149a83a468cfbfb4db5 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -47,7 +47,7 @@ class purch_order
 
        var $fixed_asset = false;
 
-       function purch_order()
+       function __construct()
        {
                /*Constructor function initialises a new purchase order object */
                $this->line_items = array();
@@ -216,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)
        {
 
@@ -246,10 +246,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);
+       }
 }