Merged changes up to 2.3.16 into unstable

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

diff --git a/reporting/rep112.php b/reporting/rep112.php
index c510160a1566486adaae4f7f0a74e27917c1a148..b2d6879ed07582ffe522fd092b6c5fbf00116b6e 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -48,18 +48,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;
@@ -70,9 +58,11 @@ function print_receipts()
        $to = $_POST['PARAM_1'];
        $currency = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_4'];
 
        if (!$from || !$to) return;
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
        $fno = explode("-", $from);
@@ -89,8 +79,10 @@ function print_receipts()
 
        $cur = get_company_Pref('curr_default');
 
-       $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize());
-       $rep->SetHeaderType('Header2');
+       $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,11 +102,10 @@ function print_receipts()
                        $baccount = db_fetch($res);
                        $params['bankaccount'] = $baccount['bank_act'];
 
-                       $rep->title = _('RECEIPT');
                        $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;