Merged last changes from stable.

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

diff --git a/reporting/rep112.php b/reporting/rep112.php
index cb8ca5fec8c7736693cd518518804fb31c2c6c85..062d136538e693a2f173bfb4a786eb28c087eab2 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,
@@ -48,18 +49,6 @@ function get_receipt($type, $trans_no)
     return db_fetch($result);
 }
 
-function get_allocations_for_receipt($debtor_id, $type, $trans_no)
-{
-       $sql = get_alloc_trans_sql("amt, trans.reference, trans.alloc", "trans.trans_no = alloc.trans_no_to
-               AND trans.type = alloc.trans_type_to
-               AND alloc.trans_no_from=$trans_no
-               AND alloc.trans_type_from=$type
-               AND trans.debtor_no=".db_escape($debtor_id),
-               TB_PREF."cust_allocations as alloc");
-       $sql .= " ORDER BY trans_no";
-       return db_query($sql, "Cannot retreive alloc to transactions");
-}
-
 function print_receipts()
 {
        global $path_to_root, $systypes_array;
@@ -109,7 +98,7 @@ function print_receipts()
                {
                        $myrow = get_receipt($j, $i);
                        if (!$myrow)
-                               continue;                       
+                               continue;
                        $res = get_bank_trans($j, $i);
                        $baccount = db_fetch($res);
                        $params['bankaccount'] = $baccount['bank_act'];
@@ -117,14 +106,14 @@ function print_receipts()
                        $contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']);
                        $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts);
                        $rep->NewPage();
-                       $result = get_allocations_for_receipt($myrow['debtor_no'], $myrow['type'], $myrow['trans_no']);
+                       $result = get_allocatable_to_cust_transactions($myrow['debtor_no'], $myrow['trans_no'], $myrow['type']);
 
                        $doctype = ST_CUSTPAYMENT;
 
                        $total_allocated = 0;
                        $rep->TextCol(0, 4,     _("As advance / full / part / payment towards:"), -2);
                        $rep->NewLine(2);
-                       
+
                        while ($myrow2=db_fetch($result))
                        {
                                $rep->TextCol(0, 1,     $systypes_array[$myrow2['type']], -2);
@@ -148,23 +137,30 @@ 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 != "")
                        {
                                $rep->NewLine(1);
                                $rep->TextCol(0, 7, $myrow['curr_code'] . ": " . $words, - 2);
-                       }       
+                       }
                        $rep->Font();
                        $rep->NewLine();
                        $rep->TextCol(6, 7, _("Received / Sign"), - 2);
@@ -179,7 +175,7 @@ function print_receipts()
                        $rep->TextCol(4, 5, _("Branch"), - 2);
                        $rep->TextCol(5, 6, "__________________", - 2);
                        $rep->TextCol(6, 7, "__________________");
-               }       
+               }
        }
        $rep->End();
 }