Merged changes from stable branch up to 2.3.23.

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

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 4662a785ea92f04c33ae471eb0910fd0ef62cc97..6cb3148fa292df4ba18e43afb0dcf8b7ca5c639a 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -49,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;
@@ -95,7 +83,6 @@ function print_receipts()
        $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize(), 9, $orientation);
        if ($orientation == 'L')
        recalculate_cols($cols);
-       $rep->SetHeaderType('Header2');
        $rep->currency = $cur;
        $rep->Font();
        $rep->Info($params, $cols, null, $aligns);
@@ -110,7 +97,7 @@ function print_receipts()
                {
                        $myrow = get_receipt($j, $i);
                        if (!$myrow)
-                               continue;                       
+                               continue;
                        if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
                                continue;
                        }
@@ -120,15 +107,16 @@ function print_receipts()
 
                        $contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']);
                        $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts);
+                       $rep->SetHeaderType('Header2');
                        $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);
@@ -175,7 +163,7 @@ function print_receipts()
                        {
                                $rep->NewLine(1);
                                $rep->TextCol(0, 7, $myrow['curr_code'] . ": " . $words, - 2);
-                       }       
+                       }
                        $rep->Font();
                        $rep->NewLine();
                        $rep->TextCol(6, 7, _("Received / Sign"), - 2);
@@ -190,9 +178,8 @@ function print_receipts()
                        $rep->TextCol(4, 5, _("Branch"), - 2);
                        $rep->TextCol(5, 6, "__________________", - 2);
                        $rep->TextCol(6, 7, "__________________");
-               }       
+               }
        }
        $rep->End();
 }
 
-?>
\ No newline at end of file