[0004904] Customer Credit Note: fixed invalid inventory GL postings for service items.

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

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 10e2130bfd9e542ab93a0b76ca4ad84bfe63e7cc..aaaf783cea0ff576ed75f33dbb021b8cf4c805c6 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -31,18 +31,20 @@ print_receipts();
 //----------------------------------------------------------------------------------------------------
 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) 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,
-                               ".TB_PREF."debtors_master.address
-                       FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master
-                               WHERE ".TB_PREF."debtor_trans.debtor_no = ".TB_PREF."debtors_master.debtor_no
-                               AND ".TB_PREF."debtor_trans.type = ".db_escape($type)."
-                               AND ".TB_PREF."debtor_trans.trans_no = ".db_escape($trans_no);
+    $sql = "SELECT trans.*,
+                               (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax) AS Total,
+                               trans.ov_discount, 
+                               debtor.name AS DebtorName,
+                               debtor.debtor_ref,
+                               debtor.curr_code,
+                               debtor.payment_terms,
+                               debtor.tax_id AS tax_id,
+                               debtor.address
+                       FROM ".TB_PREF."debtor_trans trans,"
+                               .TB_PREF."debtors_master debtor
+                               WHERE trans.debtor_no = debtor.debtor_no
+                               AND trans.type = ".db_escape($type)."
+                               AND trans.trans_no = ".db_escape($trans_no);
        $result = db_query($sql, "The remittance cannot be retrieved");
        if (db_num_rows($result) == 0)
                return false;
@@ -58,8 +60,9 @@ function print_receipts()
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
        $currency = $_POST['PARAM_2'];
-       $comments = $_POST['PARAM_3'];
-       $orientation = $_POST['PARAM_4'];
+    $email = $_POST['PARAM_3'];
+       $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
        if (!$from || !$to) return;
 
@@ -80,13 +83,10 @@ function print_receipts()
 
        $cur = get_company_Pref('curr_default');
 
-       $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize(), 9, $orientation);
+       if ($email == 0)
+               $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);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -99,12 +99,26 @@ function print_receipts()
                        $myrow = get_receipt($j, $i);
                        if (!$myrow)
                                continue;
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                               continue;
+                       }
                        $res = get_bank_trans($j, $i);
                        $baccount = db_fetch($res);
                        $params['bankaccount'] = $baccount['bank_act'];
 
+                       if ($email == 1)
+                       {
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+                               $rep->title = _('RECEIPT');
+                               $rep->filename = "Receipt" . $i . ".pdf";
+                       }
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       $rep->Info($params, $cols, null, $aligns);
+
                        $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_allocatable_to_cust_transactions($myrow['debtor_no'], $myrow['trans_no'], $myrow['type']);
 
@@ -175,8 +189,13 @@ function print_receipts()
                        $rep->TextCol(4, 5, _("Branch"), - 2);
                        $rep->TextCol(5, 6, "__________________", - 2);
                        $rep->TextCol(6, 7, "__________________");
+                       if ($email == 1)
+                       {
+                               $rep->End($email);
+                       }
                }
        }
-       $rep->End();
+    if ($email == 0)
+               $rep->End();
 }