Temporary fixes for php encoding library bugs ending with segfault.

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

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 696cd6d67c1387d85a944456055a58c3cfa1969c..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");
 
@@ -178,27 +178,12 @@ function check_data()
                return false;
        }
 
-       if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
+       if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
        {
-               display_error(_("You must enter an invoice reference."));
                set_focus('reference');
                return false;
        }
 
-       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
-       {
-               display_error(_("The entered reference is already in use."));
-               set_focus('reference');
-               return false;
-       }
-
-       if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) 
-       {
-               display_error(_("You must enter a supplier's invoice reference."));
-               set_focus('supp_reference');
-               return false;
-       }
-
        if (!is_date( $_SESSION['supp_trans']->tran_date))
        {
                display_error(_("The invoice as entered cannot be processed because the invoice date is in an incorrect format."));
@@ -218,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;
        }