X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=7a7a8ced1e8ca2f5f0c91156d6f3b386bf300051;hp=2a3077b4c5787b5e6c9680d26e92b50fae916284;hb=4888cf51abf175a0ed4645e6adb2a326ce7e0e5f;hpb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 2a3077b4..7a7a8ced 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -140,8 +140,25 @@ 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'], ST_CUSTCREDIT)) {
 			display_error( _("You must enter a reference."));
@@ -149,6 +166,7 @@ function can_process()
 			$input_error = 1;
 		}
 	}
+
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date for the credit note is invalid."));
 		set_focus('OrderDate');