Purchase Order document shows wrong purch data conversion if purch data

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ecfeeed4fc21653914dcaaf7af00940b0383bbfc..2aabc1fc89ac43f1654f97a9eea11d1f06a9835f 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+04-May-2009 Joe Hunt
+# Purchase Order document shows wrong purch data conversion if purch data
+$ /reporting/rep209.php
+
 ------------------------------- Release 2.1.2 ----------------------------------
 30-Apr-2009 Joe Hunt
 ! Release 2.1.2

diff --git a/reporting/rep209.php b/reporting/rep209.php
index f8847fd782a15d28cd601fea4f3ff58d1d69eb25..f369a0e7d9342e402afba83c7e474647ffa063eb 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -119,12 +119,11 @@ function print_po()
                                        $myrow2['units'] = $data['suppliers_uom'];
                                if ($data['conversion_factor'] != 1)
                                {
-                                       $myrow2['unit_price'] = round($myrow2['unit_price'] / $data['conversion_factor'], user_price_dec());
-                                       $myrow2['quantiry_ordered'] = round($myrow2['quantiry_ordered'] / $data['conversion_factor'], user_qty_dec());
+                                       $myrow2['unit_price'] = round2($myrow2['unit_price'] * $data['conversion_factor'], user_price_dec());
+                                       $myrow2['quantity_ordered'] = round2($myrow2['quantity_ordered'] / $data['conversion_factor'], user_qty_dec());
                                }
                        }       
-                       $Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]),
-                         user_price_dec());
+                       $Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]), user_price_dec());
                        $SubTotal += $Net;
                        $DisplayPrice = number_format2($myrow2["unit_price"],$dec);
                        $DisplayQty = number_format2($myrow2["quantity_ordered"],get_qty_dec($myrow2['item_code']));