From 52dfb535dcbd64ca5eaf48581b32c5a4ad25e029 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 4 May 2009 07:57:27 +0000 Subject: [PATCH] Purchase Order document shows wrong purch data conversion if purch data --- CHANGELOG.txt | 4 ++++ reporting/rep209.php | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ecfeeed..2aabc1f 100644 --- 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 f8847fd..f369a0e 100644 --- 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'])); -- 2.30.2