[0004212] Work Order Entry: fixed error when voided WO refence is reused.

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

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 044b8437d141f754f81239e49c437efb8be08475..a70b78cb112b47d8fbf33a72b1a53a11fb62e72d 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -31,17 +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 + ".TB_PREF."debtor_trans.ov_discount) AS Total, 
-                               ".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,9 +61,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);
@@ -77,8 +82,9 @@ 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->currency = $cur;
        $rep->Font();
        $rep->Info($params, $cols, null, $aligns);
@@ -94,13 +100,16 @@ 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'];
 
-                       $rep->title = _('RECEIPT');
                        $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']);
 
@@ -133,17 +142,24 @@ 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 != "")
                        {
@@ -169,4 +185,3 @@ function print_receipts()
        $rep->End();
 }
 
-?>
\ No newline at end of file