Added dimension edition on purchase invoice entry.

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

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index 30a30dea4363eef1296d92c37f7bc5e04b96da11..47129816ac1b7501303319d38426d5b708d76b6b 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -35,8 +35,13 @@ class purch_order
        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)
        
        var $prep_amount = 0; // prepayment required
        var $alloc; // sum of payments allocated
@@ -153,8 +158,13 @@ class purch_order
        // Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
            if ($this->curr_code == 'CHF') {
                        $val = $taxes['1']['Value'];
-                       $taxes['1']['Value'] = (floatval((intval(round(($val*20),0)))/20));
-               } 
+                       $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;
        }
 
@@ -244,4 +254,3 @@ class po_line_details
        }
 }
 
-?>