X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fpayment_terms.php;h=56f6652c432af93f60eb1f33f8d1784e5bf6a943;hb=7618d9d62ee39a932f56565a4ce25d965bf53462;hp=6939c9bdce8e98b96167d90cd48e0710f5c3f256;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/admin/payment_terms.php b/admin/payment_terms.php index 6939c9bd..56f6652c 100644 --- a/admin/payment_terms.php +++ b/admin/payment_terms.php @@ -9,91 +9,68 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; +$page_security = 'SA_PAYTERMS'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("Payment Terms")); +page(_($help_context = "Payment Terms")); include($path_to_root . "/includes/ui.inc"); simple_page_mode(true); + //------------------------------------------------------------------------------------------- if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') { - $inpug_error = 0; + $input_error = 0; if (!is_numeric($_POST['DayNumber'])) { - $inpug_error = 1; + $input_error = 1; display_error( _("The number of days or the day in the following month must be numeric.")); set_focus('DayNumber'); } elseif (strlen($_POST['terms']) == 0) { - $inpug_error = 1; + $input_error = 1; display_error( _("The Terms description must be entered.")); set_focus('terms'); - } - elseif ($_POST['DayNumber'] > 30 && !check_value('DaysOrFoll')) - { - $inpug_error = 1; - display_error( _("When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected.")); - set_focus('DayNumber'); - } - elseif ($_POST['DayNumber'] > 500 && check_value('DaysOrFoll')) - { - $inpug_error = 1; - display_error( _("When the check box is not checked to indicate that the term expects a number of days after which accounts are due, the number entered should be less than 500 days.")); - set_focus('DayNumber'); + } + $early_days = input_num('early_days', 0); + if ($early_days) { + if ($early_days >= $_POST['DayNumber']) { + $input_error = 1; + display_error(_("Early payment days option should be shorter that payment term days.")); + set_focus('early_days'); + } else if (!check_num('early_discount', 0, 100) or input_num('early_discount') == 0) + { + $input_error = 1; + display_error(_("The payment discount must be numeric and is expected to be less than 100% and greater than or equal to 0.")); + set_focus('early_discount'); + } + } else { + if (input_num('early_discount', 0)) { + $input_error = 1; + display_error(_("Early payment days option should be positive and less than payment term days.")); + set_focus('early_days'); + } } - if ($_POST['DayNumber'] == '') - $_POST['DayNumber'] = 0; - - if ($inpug_error != 1) + if ($input_error != 1) { if ($selected_id != -1) { - if (check_value('DaysOrFoll')) - { - $sql = "UPDATE ".TB_PREF."payment_terms SET terms=" . db_escape($_POST['terms']) . ", - day_in_following_month=0, - days_before_due=" . db_escape($_POST['DayNumber']) . " - WHERE terms_indicator = " .db_escape($selected_id); - } - else - { - $sql = "UPDATE ".TB_PREF."payment_terms SET terms=" . db_escape($_POST['terms']) . ", - day_in_following_month=" . db_escape($_POST['DayNumber']) . ", - days_before_due=0 - WHERE terms_indicator = " .db_escape( $selected_id ); - } + update_payment_terms($selected_id, get_post('terms'), get_post('type'), input_num('DayNumber', 0), input_num('early_discount')/100, $early_days); $note = _('Selected payment terms have been updated'); } else { - - if (check_value('DaysOrFoll')) - { - $sql = "INSERT INTO ".TB_PREF."payment_terms (terms, - days_before_due, day_in_following_month) - VALUES (" . - db_escape($_POST['terms']) . ", " . db_escape($_POST['DayNumber']) . ", 0)"; - } - else - { - $sql = "INSERT INTO ".TB_PREF."payment_terms (terms, - days_before_due, day_in_following_month) - VALUES (" . db_escape($_POST['terms']) . ", - 0, " . db_escape($_POST['DayNumber']) . ")"; - } + add_payment_terms(get_post('terms'), get_post('type'), input_num('DayNumber', 0), input_num('early_discount')/100, $early_days); $note = _('New payment terms have been added'); } //run the sql from either of the above possibilites - db_query($sql,"The payment term could not be added or updated"); display_notification($note); $Mode = 'RESET'; } @@ -102,29 +79,20 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if ($Mode == 'Delete') { // PREVENT DELETES IF DEPENDENT RECORDS IN debtors_master - - $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtors_master WHERE payment_terms = '$selected_id'"; - $result = db_query($sql,"check failed"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($selected_id, 'debtors_master', 'payment_terms')) { display_error(_("Cannot delete this payment term, because customer accounts have been created referring to this term.")); } else { - $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE payment_terms = '$selected_id'"; - $result = db_query($sql,"check failed"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($selected_id, 'suppliers', 'payment_terms')) { display_error(_("Cannot delete this payment term, because supplier accounts have been created referring to this term")); } else { //only delete if used in neither customer or supplier accounts - - $sql="DELETE FROM ".TB_PREF."payment_terms WHERE terms_indicator='$selected_id'"; - db_query($sql,"could not delete a payment terms"); + delete_payment_terms($selected_id); display_notification(_('Selected payment terms have been deleted')); } } @@ -135,97 +103,81 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //------------------------------------------------------------------------------------------------- -$sql = "SELECT * FROM ".TB_PREF."payment_terms"; -$result = db_query($sql,"could not get payment terms"); +$result = get_payment_terms_all(check_value('show_inactive')); + start_form(); -start_table($table_style); -$th = array(_("Description"), _("Following Month On"), _("Due After (Days)"), "", ""); +start_table(TABLESTYLE); +$th = array(_("Description"), _("Type"), _("Due After/Days"), _("Early payment discount"),"", ""); +inactive_control_column($th); table_header($th); $k = 0; //row colour counter while ($myrow = db_fetch($result)) { - if ($myrow["day_in_following_month"] == 0) - { - $full_text = _("N/A"); - } - else - { - $full_text = $myrow["day_in_following_month"]; - } - - if ($myrow["days_before_due"] == 0) - { - $after_text = _("N/A"); - } - else - { - $after_text = $myrow["days_before_due"] . " " . _("days"); - } + $days = $myrow['days']; + $percent = $myrow['early_discount']; alt_table_row_color($k); - label_cell($myrow["terms"]); - label_cell($full_text); - label_cell($after_text); - edit_button_cell("Edit".$myrow["terms_indicator"], _("Edit")); - delete_button_cell("Delete".$myrow["terms_indicator"], _("Delete")); + label_cell($pterm_types[$myrow['type']]); + label_cell($myrow['type'] == PTT_DAYS ? "$days "._("days") : ($myrow['type'] == PTT_FOLLOWING ? $days : _("N/A"))); + label_cell(in_array($myrow['type'], array(PTT_FOLLOWING, PTT_DAYS)) ? ($percent==0 ? _("None") : ($percent*100).'/'.$myrow['early_days']) : _("N/A")); + inactive_control_cell($myrow["id"], $myrow["inactive"], 'payment_terms', "id"); + edit_button_cell("Edit".$myrow["id"], _("Edit")); + delete_button_cell("Delete".$myrow["id"], _("Delete")); end_row(); +} -} //END WHILE LIST LOOP - -end_table(); -end_form(); -echo '
'; +inactive_control_row($th); +end_table(1); //------------------------------------------------------------------------------------------------- +if (list_updated('type')) { + $Ajax->activate('edits'); +} -start_form(); +div_start('edits'); -start_table($table_style2); +start_table(TABLESTYLE2); -$day_in_following_month = $days_before_due = 0; if ($selected_id != -1) { if ($Mode == 'Edit') { //editing an existing payment terms - $sql = "SELECT * FROM ".TB_PREF."payment_terms - WHERE terms_indicator='$selected_id'"; - - $result = db_query($sql,"could not get payment term"); - $myrow = db_fetch($result); + $myrow = get_payment_terms($selected_id); $_POST['terms'] = $myrow["terms"]; - $days_before_due = $myrow["days_before_due"]; - $day_in_following_month = $myrow["day_in_following_month"]; + $_POST['type'] = $myrow['type']; + $_POST['DayNumber'] = $myrow['days']; + $_POST['early_discount'] = $myrow['early_discount']*100; + $_POST['early_days'] = $myrow['early_days']; } hidden('selected_id', $selected_id); } + text_row(_("Terms Description:"), 'terms', null, 40, 40); -check_row(_("Due After A Given No. Of Days:"), 'DaysOrFoll', $day_in_following_month == 0); +payment_type_list_row(_("Payment type:"), 'type', null, true); -if (!isset($_POST['DayNumber'])) -{ - if ($days_before_due != 0) - $_POST['DayNumber'] = $days_before_due; - else - $_POST['DayNumber'] = $day_in_following_month; -} - -text_row_ex(_("Days (Or Day In Following Month):"), 'DayNumber', 3); +if ( in_array(get_post('type'), array(PTT_FOLLOWING, PTT_DAYS))) { + text_row_ex(_("Days (Or Day In Following Month):"), 'DayNumber', 3); + small_amount_row(_("Days of early payment discount option:"), 'early_days', null, null, _('days'), 0); + small_amount_row(_("Early payment discount percent:"), 'early_discount', null, null, _('%'), 1); +} else + hidden('DayNumber', 0); end_table(1); +div_end(); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); - -?>