Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git

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

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index a7b9db37c70775b207c20fce5ac2d8996b1e1773..b197cb0369b1d27d3c31e81f79ead7dfa743c957 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -33,9 +33,20 @@ class purch_order
        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)
        
+       var $prep_amount = 0; // prepayment required
+       var $alloc; // sum of payments allocated
+       var $prepayments = array();
+
+       var $fixed_asset = false;
+
        function purch_order()
        {
                /*Constructor function initialises a new purchase order object */
@@ -148,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;
        }
 
@@ -231,11 +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);
+       }
 }
 
-?>