X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=e482386b971a7f9f14998fca9fd46cc814b75e6b;hb=c47544994b38a1540dd049075948493352ca6112;hp=2b31654aeef630beb912828470aad615deb39e82;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index 2b31654a..e482386b 100644 --- a/sales/customer_credit_invoice.php +++ b/sales/customer_credit_invoice.php @@ -20,13 +20,12 @@ $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_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); } @@ -78,7 +77,7 @@ if (isset($_GET['AddedID'])) { display_footer_exit(); } else - check_edit_conflicts(); + check_edit_conflicts(get_post('cart_id')); //----------------------------------------------------------------------------- @@ -88,7 +87,7 @@ function can_process() global $Refs; if (!is_date($_POST['CreditDate'])) { - display_error(_("The entered date is invalid."));; + display_error(_("The entered date is invalid.")); set_focus('CreditDate'); return false; } elseif (!is_date_in_fiscalyear($_POST['CreditDate'])) { @@ -98,15 +97,15 @@ function can_process() } if ($_SESSION['Items']->trans_no==0) { - if (!$Refs->is_valid($_POST['ref'])) { - display_error(_("You must enter a reference."));; + if (!$Refs->is_valid($_POST['ref'], ST_CUSTCREDIT)) { + display_error(_("You must enter a reference.")); set_focus('ref'); return false; } } if (!check_num('ChargeFreightCost', 0)) { - display_error(_("The entered shipping cost is invalid or less than zero."));; + display_error(_("The entered shipping cost is invalid or less than zero.")); set_focus('ChargeFreightCost'); return false; } @@ -227,10 +226,10 @@ function display_credit_items() start_form(); hidden('cart_id'); - start_table(TABLESTYLE2, "width=80%", 5); + start_table(TABLESTYLE2, "width='80%'", 5); echo "