Fixed After successful Backup, loader.gif still present

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

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index e891e6494332eefd95d7f3decf28aa0561f7c37c..b197cb0369b1d27d3c31e81f79ead7dfa743c957 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -45,6 +45,8 @@ class purch_order
        var $alloc; // sum of payments allocated
        var $prepayments = array();
 
+       var $fixed_asset = false;
+
        function purch_order()
        {
                /*Constructor function initialises a new purchase order object */
@@ -244,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);
+       }
 }