Fixed deprecated preg_replace in php >= 5.3.0 with the /e flag in utf8 reports.

[fa-stable.git] / reporting / rep112.php

diff --git a/reporting/rep112.php b/reporting/rep112.php
index cb8ca5fec8c7736693cd518518804fb31c2c6c85..45851689473a163daf57bebcd9c4216fa080ea35 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -33,7 +33,8 @@ function get_receipt($type, $trans_no)
 {
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
                                (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
-                               ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) AS Total, 
+                               ".TB_PREF."debtor_trans.ov_freight_tax) AS Total,
+                               ".TB_PREF."debtor_trans.ov_discount,
                                ".TB_PREF."debtors_master.name AS DebtorName,  ".TB_PREF."debtors_master.debtor_ref,
                                ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.payment_terms, "
                                .TB_PREF."debtors_master.tax_id AS tax_id,
@@ -148,17 +149,24 @@ function print_receipts()
                                $rep->TextColLines(1, 5, $memo, -2);
                        }
 
-                       $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+                       $rep->row = $rep->bottomMargin + (16 * $rep->lineHeight);
 
                        $rep->TextCol(3, 6, _("Total Allocated"), -2);
                        $rep->AmountCol(6, 7, $total_allocated, $dec, -2);
                        $rep->NewLine();
                        $rep->TextCol(3, 6, _("Left to Allocate"), -2);
-                       $rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+                       $rep->AmountCol(6, 7, $myrow['Total'] + $myrow['ov_discount'] - $total_allocated, $dec, -2);
+                       if (floatcmp($myrow['ov_discount'], 0))
+                       {
+                               $rep->NewLine();
+                               $rep->TextCol(3, 6, _("Discount"), - 2);
+                               $rep->AmountCol(6, 7, -$myrow['ov_discount'], $dec, -2);
+                       }       
                        $rep->NewLine();
                        $rep->Font('bold');
                        $rep->TextCol(3, 6, _("TOTAL RECEIPT"), - 2);
                        $rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
+
                        $words = price_in_words($myrow['Total'], ST_CUSTPAYMENT);
                        if ($words != "")
                        {