Fixed amibiguity in few text messages to make translations easier, updated gettext...

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

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index b767e9ea9261f66e9ee64245c4f9067bae4bd475..e891e6494332eefd95d7f3decf28aa0561f7c37c 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -33,9 +33,18 @@ 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();
+
        function purch_order()
        {
                /*Constructor function initialises a new purchase order object */
@@ -55,7 +64,7 @@ class purch_order
        
        function add_to_order($line_no, $stock_id, $qty, $item_descr, $price, $uom, $req_del_date, $qty_inv, $qty_recd)
        {
-               if ($qty != 0 && isset($qty))
+               if (isset($qty) && $qty != 0)
                {
                        $this->line_items[$line_no] = new po_line_details($line_no, $stock_id, $item_descr, $qty, $price, $uom, 
                                $req_del_date, $qty_inv, $qty_recd);
@@ -148,7 +157,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;
        }
 
@@ -238,4 +251,3 @@ class po_line_details
        }
 }
 
-?>