Rerun of Remittance

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 0b23bd6d4e3d8242bba209646495395426a79266..613db1e474cd0ffb4f9584ed4a6bfb42e1ddd32b 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -147,8 +147,8 @@ function fmt_credit($row)
 
 function prt_link($row)
 {
-       if ($row['type'] == ST_SUPPAYMENT || $row['type'] == ST_BANKPAYMENT) 
-               return print_document_link($row['trans_no'], _("Print Remittance"), true, $row['type'], ICON_PRINT);
+       if ($row['type'] == ST_SUPPAYMENT || $row['type'] == ST_BANKPAYMENT || $row['type'] == ST_SUPPCREDIT) 
+               return print_document_link($row['trans_no']."-".$row['type'], _("Print Remittance"), true, ST_SUPPAYMENT, ICON_PRINT);
 }
 
 function check_overdue($row)

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index cb94548e42a5b12820410e1caee27b811d610389..0c8aa7dd4940c75979d984fafdf4f6ec9e786a93 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -70,8 +70,8 @@ if (isset($_GET['AddedID']))
 
        display_notification_centered( _("Payment has been sucessfully entered"));
 
-       submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id, 'prtopt');
-       submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id, null, 1);
+       submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt');
+       submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1);
 
     display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment")));
 

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index b2bcea21d97c89fed03467d49e0e7c095efa1977..955626bb42aa8710ff1d686b5d8d3167539ace76 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -115,7 +115,7 @@ if (isset($emailtype))
 if (isset($header2type) || isset($linetype))
 {
        $doc_Invoice_no = ($doctype==ST_CUSTDELIVERY ? _("Delivery Note No.") : 
-               ($doctype == ST_SUPPAYMENT ? _("Payment No.") :
+               ($doctype == ST_SUPPAYMENT ? _("Remittance No.") :
                (($doctype==ST_SALESQUOTE || $doctype==ST_PURCHORDER || $doctype==ST_SALESORDER) ? _("Order no.") : 
                ($doctype==ST_SALESINVOICE ? _("Invoice No.") : ($doctype==ST_WORKORDER ? _("Word Order No") : _("Credit No."))))));
        $doc_Delivery_no = _("Delivery Note No.");

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 0f53367f2a002229479a3fa3bde0f9c965f80d0c..4899e467b61708ef8b9a6be526ac367b0195212b 100644 (file)
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -114,7 +114,7 @@ if (isset($emailtype))
 if (isset($header2type) || isset($linetype))
 {
        $doc_Invoice_no = ($doctype==ST_CUSTDELIVERY ? "Delivery Note No." :
-               ($doctype == ST_SUPPAYMENT ? "Payment No." :
+               ($doctype == ST_SUPPAYMENT ? "Remittance No." :
                (($doctype == ST_SALESQUOTE || $doctype==ST_PURCHORDER || $doctype==ST_SALESORDER) ? "Order no." : 
                ($doctype==ST_SALESINVOICE ? "Invoice No." : ($doctype == ST_WORKORDER ? "Work Order No" : "Credit No.")))));
        $doc_Delivery_no = "Delivery Note No.";

diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index 0650c98e9afa0afd92ec567d5b116093db965195..4ce4d148d3a37f31b309795a31d2999f9d772c1e 100644 (file)
--- a/reporting/includes/reporting.inc
+++ b/reporting/includes/reporting.inc
@@ -78,7 +78,6 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
                                'PARAM_4' => '');
                        break;
                case ST_SUPPAYMENT :
-               case ST_BANKPAYMENT :
                        $rep = 210;
                        // from, to, currency, bank acc, email, comments
                        $ar = array(

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 1aff54618f8c06a1087bd73099ca10da1c77ae52..cde5447ddb11c44177cb8fdd5f84402a077f95bd 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -328,10 +328,11 @@ class BoxReports
                                case 'REMITTANCE':
                                        $BP = _("BP");
                                        $SP = _("SP");
+                                       $CN = _("CN");
                                        $ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
                                        $sql = "SELECT concat(".TB_PREF."supp_trans.trans_no, '-',
-                                               ".TB_PREF."supp_trans.type) AS TNO, concat(".TB_PREF."supp_trans.$ref, if (type=".ST_BANKPAYMENT.", ' $BP ', ' $SP '), ".TB_PREF."suppliers.supp_name) as IName
-                                               FROM ".TB_PREF."suppliers, ".TB_PREF."supp_trans WHERE (type=".ST_BANKPAYMENT." OR type=".ST_SUPPAYMENT.") AND ".TB_PREF."suppliers.supplier_id=".TB_PREF."supp_trans.supplier_id ORDER BY ".TB_PREF."supp_trans.trans_no DESC";
+                                               ".TB_PREF."supp_trans.type) AS TNO, concat(".TB_PREF."supp_trans.$ref, if (type=".ST_BANKPAYMENT.", ' $BP ', if (type=".ST_SUPPAYMENT.", ' $SP ', ' $CN ')), ".TB_PREF."suppliers.supp_name) as IName
+                                               FROM ".TB_PREF."suppliers, ".TB_PREF."supp_trans WHERE (type=".ST_BANKPAYMENT." OR type=".ST_SUPPAYMENT." OR type=".ST_SUPPCREDIT.") AND ".TB_PREF."suppliers.supplier_id=".TB_PREF."supp_trans.supplier_id ORDER BY ".TB_PREF."supp_trans.trans_no DESC";
                                        return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
                                case 'ITEMS':

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 1a99195e06e732545999fc611868daa45b36f487..f25b792543661359c681f12216a107c2814bde31 100644 (file)
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -98,7 +98,13 @@ function print_remittances()
 
        for ($i = $fno[0]; $i <= $tno[0]; $i++)
        {
-               for ($j = ST_BANKPAYMENT; $j <= ST_SUPPAYMENT; $j = ($j == ST_BANKPAYMENT ? ST_SUPPAYMENT : 999))
+               if ($fno[0] == $tno[0])
+                       $types = array($fno[1]);
+               else
+                       $types = array(ST_BANKPAYMENT, ST_SUPPAYMENT, ST_SUPPCREDIT);
+               foreach ($types as $j)
+               //for ($j = ST_BANKPAYMENT; $j <= ST_SUPPAYMENT; $j = ($j == ST_BANKPAYMENT ? ST_SUPPAYMENT : 999))
+               //for ($j = $ft; $j <= $tt; $j = ($j == ST_BANKPAYMENT ? ST_SUPPAYMENT : 999))
                {
                        $myrow = get_remittance($j, $i);
                        if (!$myrow)