[Frontaccounting-cvs_updates] /hg/p/frontaccounting/mercurial: 0002443: Receipts and Remittanc...

[FrontAccounting <fro...@us...>]

details:   http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hg/p/frontaccounting/mercurial/rev/7344b6533b47
changeset: 3307:7344b6533b47
user:      Joe
date:      Tue Sep 17 10:31:17 2013 +0200
description:
0002443: Receipts and Remittances now show discounts.

diffstat:

 reporting/rep112.php |  14 +++++++++++---
 reporting/rep210.php |  16 +++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diffs (83 lines):

diff -r d610236e0894 -r 7344b6533b47 reporting/rep112.php
--- a/reporting/rep112.php	Mon Sep 16 23:27:52 2013 +0200
+++ b/reporting/rep112.php	Tue Sep 17 10:31:17 2013 +0200
@@ -33,7 +33,8 @@
 {
     $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 @@
 				$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 != "")
 			{
diff -r d610236e0894 -r 7344b6533b47 reporting/rep210.php
--- a/reporting/rep210.php	Mon Sep 16 23:27:52 2013 +0200
+++ b/reporting/rep210.php	Tue Sep 17 10:31:17 2013 +0200
@@ -33,7 +33,8 @@
 function get_remittance($type, $trans_no)
 {
    	$sql = "SELECT ".TB_PREF."supp_trans.*, 
-   		(".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, 
+   		(".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst) AS Total,
+   		".TB_PREF."supp_trans.ov_discount,
    		".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no, 
    		".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."suppliers.gst_no AS tax_id, 
    		".TB_PREF."suppliers.address
@@ -155,18 +156,27 @@
 				$rep->NewLine();
 				$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);
 			$myrow['Total'] *= -1;
-			$rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+			$myrow['ov_discount'] *= -1;
+			$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 REMITTANCE"), - 2);
 			$rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
+
 			$words = price_in_words($myrow['Total'], ST_SUPPAYMENT);
 			if ($words != "")
 			{