X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=1288e5173e6a0fa90192d049ee7b7c606978bd90;hb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;hp=06e30233e0cbedd476e441849ba85acad44a4cd8;hpb=d34add5e762a470a52fade37173b4491462ee22a;p=fa-stable.git diff --git a/reporting/rep107.php b/reporting/rep107.php index 06e30233..1288e517 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -104,11 +104,11 @@ function print_invoices() $SubTotal = 0; while ($myrow2=db_fetch($result)) { - $Net = round($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), - user_price_dec()); - $SubTotal += $Net; + $Net = round($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), + user_price_dec()); + $SubTotal += $Net; $DisplayPrice = number_format2($myrow2["unit_price"],$dec); - $DisplayQty = number_format2($sign*$myrow2["quantity"],user_qty_dec()); + $DisplayQty = number_format2($sign*$myrow2["quantity"],get_qty_dec($myrow2['stock_id'])); $DisplayNet = number_format2($Net,$dec); if ($myrow2["discount_percent"]==0) $DisplayDiscount =""; @@ -159,7 +159,7 @@ function print_invoices() while ($tax_item = db_fetch($tax_items)) { $DisplayTax = number_format2($sign*$tax_item['amount'], $dec); - + if ($tax_item['included_in_price']) { $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .