X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=7a7a8ced1e8ca2f5f0c91156d6f3b386bf300051;hb=bddfd188fc7b9c754623c0ffd978ca9f0c4fd4e5;hp=8181f7a34c24c3e1154af1642676bb1f622109c1;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 8181f7a3..7a7a8ced 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -83,9 +83,9 @@ if (isset($_GET['AddedID'])) {
 //--------------------------------------------------------------------------------
 
 function line_start_focus() {
-  global $Ajax;
-  $Ajax->activate('items_table');
-  set_focus('_stock_id_edit');
+  	global $Ajax;
+  	$Ajax->activate('items_table');
+  	set_focus('_stock_id_edit');
 }
 
 //-----------------------------------------------------------------------------
@@ -140,15 +140,33 @@ function can_process()
 
 	$input_error = 0;
 
-	if ($_SESSION['Items']->count_items() == 0 && (!check_num('ChargeFreightCost',0)))
+	if (!get_post('customer_id')) 
+	{
+		display_error(_("There is no customer selected."));
+		set_focus('customer_id');
+		return false;
+	} 
+	
+	if (!get_post('branch_id')) 
+	{
+		display_error(_("This customer has no branch defined."));
+		set_focus('branch_id');
 		return false;
+	} 
+	if ($_SESSION['Items']->count_items() == 0 && !input_num('ChargeFreightCost',0))
+	{
+		display_error(_("You must enter at least one non empty item line."));
+		set_focus('AddItem');
+		return false;
+	}
 	if($_SESSION['Items']->trans_no == 0) {
-	    if (!$Refs->is_valid($_POST['ref'])) {
+	    if (!$Refs->is_valid($_POST['ref'], ST_CUSTCREDIT)) {
 			display_error( _("You must enter a reference."));
 			set_focus('ref');
 			$input_error = 1;
 		}
 	}
+
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date for the credit note is invalid."));
 		set_focus('OrderDate');