Credit note can be posted without customer selected when search customer List is...

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index aff136119c58a4f5d527236fe1b7bdc37179ded0..4bfc235e52f4cd581b4e9be4de6bf2884929a570 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -165,6 +165,13 @@ function check_data()
 {
        global $SysPrefs;
 
+       if (!get_post('supplier_id')) 
+       {
+               display_error(_("There is no supplier selected."));
+               set_focus('supplier_id');
+               return false;
+       } 
+
        if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
        {
                display_error(_("The credit note cannot be processed because the there are no items or values on the invoice.  Credit notes are expected to have a charge."));

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 6b21c935a1584b30f5cee9b2b325782055a0fd90..d3cef151f0c9717f509b2785006930d5cec14b40 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -170,6 +170,13 @@ function check_data()
 {
        global $Refs;
 
+       if (!get_post('supplier_id')) 
+       {
+               display_error(_("There is no supplier selected."));
+               set_focus('supplier_id');
+               return false;
+       } 
+
        if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
        {
                display_error(_("The invoice cannot be processed because the there are no items or values on the invoice.  Invoices are expected to have a charge."));

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 2a3077b4c5787b5e6c9680d26e92b50fae916284..7a7a8ced1e8ca2f5f0c91156d6f3b386bf300051 100644 (file)
--- 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');