Added links to payments for invoices in customer/supplier allocation inquiry

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

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 87d87ce5881e3b3f6486c3364399a07a438b4c29..d2e06c0964a0e4e221f097366220d21d19f9cf02 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -16,7 +16,7 @@ $page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
 // date_:      2005-05-19
-// Title:      Purchase Orders
+// Title:      Receipts
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -35,9 +35,10 @@ function get_receipt($type, $trans_no)
                                (".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.email, ".TB_PREF."debtors_master.address
-                       FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master 
+                               ".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);
@@ -89,6 +90,7 @@ function print_receipts()
        $cur = get_company_Pref('curr_default');
 
        $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize());
+       $rep->SetHeaderType('Header2');
        $rep->currency = $cur;
        $rep->Font();
        $rep->Info($params, $cols, null, $aligns);
@@ -98,7 +100,7 @@ function print_receipts()
                if ($fno[0] == $tno[0])
                        $types = array($fno[1]);
                else
-                       $types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT, ST_CUSTCREDIT);
+                       $types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT);
                foreach ($types as $j)
                {
                        $myrow = get_receipt($j, $i);
@@ -108,22 +110,15 @@ function print_receipts()
                        $params['bankaccount'] = $baccount['id'];
 
                        $rep->title = _('RECEIPT');
-                       $rep->Header2($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT);
+                       $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']);
 
-                       $linetype = true;
                        $doctype = ST_CUSTPAYMENT;
-                       if ($rep->currency != $myrow['curr_code'])
-                       {
-                               include($path_to_root . "/reporting/includes/doctext2.inc");
-                       }
-                       else
-                       {
-                               include($path_to_root . "/reporting/includes/doctext.inc");
-                       }
 
                        $total_allocated = 0;
-                       $rep->TextCol(0, 4,     $doc_Towards, -2);
+                       $rep->TextCol(0, 4,     _("As advance / full / part / payment towards:"), -2);
                        $rep->NewLine(2);
                        
                        while ($myrow2=db_fetch($result))
@@ -139,19 +134,19 @@ function print_receipts()
                                $total_allocated += $myrow2['amt'];
                                $rep->NewLine(1);
                                if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-                                       $rep->Header2($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT);
+                                       $rep->NewPage();
                        }
 
                        $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 
-                       $rep->TextCol(3, 6, $doc_Total_Allocated, -2);
+                       $rep->TextCol(3, 6, _("Total Allocated"), -2);
                        $rep->AmountCol(6, 7, $total_allocated, $dec, -2);
                        $rep->NewLine();
-                       $rep->TextCol(3, 6, $doc_Left_To_Allocate, -2);
+                       $rep->TextCol(3, 6, _("Left to Allocate"), -2);
                        $rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
                        $rep->NewLine();
                        $rep->Font('bold');
-                       $rep->TextCol(3, 6, $doc_Total_Payment, - 2);
+                       $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 != "")
@@ -161,16 +156,16 @@ function print_receipts()
                        }       
                        $rep->Font();
                        $rep->NewLine();
-                       $rep->TextCol(6, 7, $doc_Received, - 2);
+                       $rep->TextCol(6, 7, _("Received / Sign"), - 2);
                        $rep->NewLine();
-                       $rep->TextCol(0, 2, $doc_by_Cheque, - 2);
+                       $rep->TextCol(0, 2, _("By Cash / Cheque* / Draft No."), - 2);
                        $rep->TextCol(2, 4, "______________________________", - 2);
-                       $rep->TextCol(4, 5, $doc_Dated, - 2);
+                       $rep->TextCol(4, 5, _("Dated"), - 2);
                        $rep->TextCol(5, 6, "__________________", - 2);
                        $rep->NewLine(1);
-                       $rep->TextCol(0, 2, $doc_Drawn, - 2);
+                       $rep->TextCol(0, 2, _("Drawn on Bank"), - 2);
                        $rep->TextCol(2, 4, "______________________________", - 2);
-                       $rep->TextCol(4, 5, $doc_Drawn_Branch, - 2);
+                       $rep->TextCol(4, 5, _("Branch"), - 2);
                        $rep->TextCol(5, 6, "__________________", - 2);
                        $rep->TextCol(6, 7, "__________________");
                }