X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=080e8fc36f3d52fadf8e22becda73dc00b3db55c;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=faf540e334c19c4cd261c4c7b9f55e986c726559;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index faf540e3..080e8fc3 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -27,10 +27,6 @@ if (user_use_date_picker())
 	$js .= get_js_date_picker();
 //----------------------------------------------------------------------------------------
 
-check_db_has_suppliers(_("There are no suppliers defined in the system."));
-
-//--------------------------------------------------------------------------------------------------
-
 if (isset($_GET['New']))
 {
 	if (isset( $_SESSION['supp_trans']))
@@ -54,6 +50,8 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['ModifyInvoice']))
 	check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
 
+check_db_has_suppliers(_("There are no suppliers defined in the system."));
+
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -69,7 +67,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 +201,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;
 	}