X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=07b41b282fc1f991eb7c1aae436c6bb7cc12e5ab;hb=c09be0dad6b05131e240349a375af7a4b7bf3444;hp=33afd6c48763c6097ec19ef1543ab02553710796;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 33afd6c4..07b41b28 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -14,6 +14,8 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+	$js .= get_js_date_picker();
 page(_("Enter Supplier Invoice"), false, false, "", $js);
 
 
@@ -70,34 +72,40 @@ function check_data()
 	if (!references::is_valid($_SESSION['supp_trans']->reference)) 
 	{
 		display_error(_("You must enter an invoice reference."));
+		set_focus('reference');
 		return false;
 	}
 
 	if (!is_new_reference($_SESSION['supp_trans']->reference, 20)) 
 	{
 		display_error(_("The entered reference is already in use."));
+		set_focus('reference');
 		return false;
 	}
 
 	if (!references::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."));
+		set_focus('trans_date');
 		return false;
 	} 
 	elseif (!is_date_in_fiscalyear($_SESSION['supp_trans']->tran_date)) 
 	{
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('trans_date');
 		return false;
 	}
 	if (!is_date( $_SESSION['supp_trans']->due_date))
 	{
 		display_error(_("The invoice as entered cannot be processed because the due date is in an incorrect format."));
+		set_focus('due_date');
 		return false;
 	}
 
@@ -148,25 +156,27 @@ echo "<tr><td valign=center>"; // outer table
 echo "<center>";
 
 invoice_header($_SESSION['supp_trans']);
+if ($_POST['supplier_id']=='') 
+	display_error('No supplier found for entered search text');
+else {
+	echo "</td></tr><tr><td valign=center>"; // outer table
 
-echo "</td></tr><tr><td valign=center>"; // outer table
+	echo "<center>";
 
-echo "<center>";
-
-display_grn_items($_SESSION['supp_trans']);
+	display_grn_items($_SESSION['supp_trans']);
 
-display_gl_items($_SESSION['supp_trans']);
-
-//echo "</td></tr><tr><td align=center colspan=2>"; // outer table
-echo "<br>";
-invoice_totals($_SESSION['supp_trans']);
+	display_gl_items($_SESSION['supp_trans']);
 
+	//echo "</td></tr><tr><td align=center colspan=2>"; // outer table
+	echo "<br>";
+	invoice_totals($_SESSION['supp_trans']);
+}
 echo "</td></tr>";
 
 end_table(); // outer table
 
 echo "<br>";
-submit_center('PostInvoice', _("Enter Invoice"));
+submit_center('PostInvoice', _("Enter Invoice"), true, '', true);
 echo "<br>";
 
 end_form();