X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=c2fe7c6113f9d7cfcdb62c792b55392903396107;hb=fec081ddbcf4f2ceb4b325f30cfc1005e855b724;hp=0d1e6c9fd75455983b2a322037187d08a3cfdc12;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 0d1e6c9f..c2fe7c61 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -21,9 +21,9 @@ include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); -if ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); //---------------------------------------------------------------------------------------- @@ -161,7 +161,7 @@ if (isset($_POST['AddGLCodeToTrans'])) { function check_data() { - global $total_grn_value, $total_gl_value, $Refs, $SysPrefs; + global $Refs, $SysPrefs; if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { @@ -210,12 +210,6 @@ function check_data() return false; } - if ($_SESSION['supp_trans']->ov_amount < ($total_gl_value + $total_grn_value)) - { - display_error(_("The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed.")); - return false; - } - if (!$SysPrefs->allow_negative_stock()) { foreach ($_SESSION['supp_trans']->grn_items as $n => $item) { if (is_inventory_item($item->item_code)) @@ -356,9 +350,9 @@ invoice_header($_SESSION['supp_trans']); if ($_POST['supplier_id']=='') display_error('No supplier found for entered search text'); else { - $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1); + display_grn_items($_SESSION['supp_trans'], 1); - $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1); + display_gl_items($_SESSION['supp_trans'], 1); div_start('inv_tot'); invoice_totals($_SESSION['supp_trans']); @@ -380,4 +374,3 @@ br(); end_form(); end_page(); -?>