0003667: supplier payment link after entering supplier invoice resultes in erro....

[fa-stable.git] / purchasing / supplier_invoice.php

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index faf540e334c19c4cd261c4c7b9f55e986c726559..e527a980b8fc39011d5012dcb17eaf2593cf4a18 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -69,7 +69,7 @@ if (isset($_GET['AddedID']))
        display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
 
        hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
-               "PInvoice=".$invoice_no);
+               "PInvoice=".$invoice_no."&trans_type=".$trans_type);
 
        hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
 
@@ -203,9 +203,17 @@ function check_data()
                return false;
        }
 
+       if (trim(get_post('supp_reference')) == false)
+       {
+               display_error(_("You must enter a supplier's invoice reference."));
+               set_focus('supp_reference');
+               return false;
+       }
+
        if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
        {       /*Transaction reference already entered */
                display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
+               set_focus('supp_reference');
                return false;
        }