From: Joe Hunt Date: Wed, 17 Dec 2008 14:39:28 +0000 (+0000) Subject: [0000101] More wonderful rounding issues X-Git-Tag: 2.3-final~1354 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=4232965822b3543f7fe44e15dd395f2b8ab0d7eb;p=fa-stable.git [0000101] More wonderful rounding issues --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a26d6818..40d481ce 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,14 @@ Legend: ! -> Note $ -> Affected files +17-Dec-2008 Joe Hunt +# [0000101] More wonderful rounding issues +$ /includes/ui/ui_view.inc + /purchasing/includes/db/invoice_db.inc + /sales/includes/db/sales_credit_db.inc + /sales/includes/db/sales_delivery_db.inc + /sales/includes/db/sales_invoice_db.inc + 16-Dec-2008 Joe Hunt # [0000100] Keep getting left allocated weird results (rounding problems). $ /includes/ui/ui_view.inc diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index d30db81b..3aa462f7 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -453,7 +453,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) { label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)", number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan); - $total += $taxitem['Value']; + $total += round2($taxitem['Value'], user_price_dec()); } } diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index fe26bf44..f69ebe40 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -118,6 +118,7 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang foreach ($taxes as $taxitem) { + $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); $tax_total += $taxitem['Value']; } diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc index 5629c528..dfb4c21b 100644 --- a/sales/includes/db/sales_credit_db.inc +++ b/sales/includes/db/sales_credit_db.inc @@ -31,7 +31,8 @@ function write_credit_note($credit_note, $write_off_acc) $tax_total = 0; foreach ($taxes as $taxitem) { - $tax_total += $taxitem['Value']; + $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); + $tax_total += $taxitem['Value']; } if ($credit_note->tax_included == 0) { diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc index 11aa2f66..abbf8bb9 100644 --- a/sales/includes/db/sales_delivery_db.inc +++ b/sales/includes/db/sales_delivery_db.inc @@ -21,6 +21,7 @@ function write_sales_delivery(&$delivery,$bo_policy) $taxes = $delivery->get_taxes(); // all taxes with freight_tax foreach ($taxes as $taxitem) { + $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); $tax_total += $taxitem['Value']; } /* Insert/update the debtor_trans */ diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc index 798b726e..87b9eb7e 100644 --- a/sales/includes/db/sales_invoice_db.inc +++ b/sales/includes/db/sales_invoice_db.inc @@ -35,6 +35,7 @@ function write_sales_invoice(&$invoice) $taxes = $invoice->get_taxes(); // all taxes with freight_tax foreach ($taxes as $taxitem) { + $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); $ov_gst += $taxitem['Value']; }