Added fixed assets module

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

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index 8fc50b41e6c461870e7d525946f8e9c10a0eadec..7fdef20306065a05a444f3096cbe611f22282ff5 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -32,11 +32,11 @@ 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)
@@ -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 */
@@ -52,14 +54,13 @@ class purch_order
                $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);
        }
        
@@ -151,7 +152,7 @@ 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') {
@@ -183,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);
@@ -252,4 +253,3 @@ class po_line_details
        }
 }
 
-?>