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

[fa-stable.git] / sales / credit_note_entry.php

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 7ef6ea7435801fa3502251f92f00e720e8c8758d..7a7a8ced1e8ca2f5f0c91156d6f3b386bf300051 100644 (file)
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -26,7 +26,7 @@ include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
        $js .= get_js_open_window(900, 500);
 }
 if (user_use_date_picker()) {
@@ -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');
@@ -270,7 +288,7 @@ hidden('cart_id');
 $customer_error = display_credit_header($_SESSION['Items']);
 
 if ($customer_error == "") {
-       start_table(TABLESTYLE, "width=80%", 10);
+       start_table(TABLESTYLE, "width='80%'", 10);
        echo "<tr><td>";
        display_credit_items(_("Credit Note Items"), $_SESSION['Items']);
        credit_options_controls($_SESSION['Items']);
@@ -288,4 +306,3 @@ echo "</tr></table></center>";
 end_form();
 end_page();
 
-?>