X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fpayment_terms.php;h=7c7afeff77e5b1aaba7b68974fba248f7d31b495;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=ddc4c50945fca768af030f114027629028e7d0fa;hpb=0b253e5e0d23400838d3bfb4f27fb3fb2637b3ab;p=fa-stable.git diff --git a/admin/payment_terms.php b/admin/payment_terms.php index ddc4c509..7c7afeff 100644 --- a/admin/payment_terms.php +++ b/admin/payment_terms.php @@ -9,91 +9,79 @@ 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); + +//------------------------------ +// Helper to translate record content to more intuitive form +// +function term_days($myrow) +{ + return $myrow["day_in_following_month"] != 0 ? $myrow["day_in_following_month"] : + $myrow["days_before_due"]; +} + +function term_type($myrow) +{ + if ($myrow["day_in_following_month"] != 0) + return PTT_FOLLOWING; + + $days = $myrow["days_before_due"]; + + return $days < 0 ? PTT_PRE : ($days ? PTT_DAYS : PTT_CASH); +} + //------------------------------------------------------------------------------------------- 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'); } if ($_POST['DayNumber'] == '') $_POST['DayNumber'] = 0; - if ($inpug_error != 1) + if ($input_error != 1) { + $type = get_post('type'); + $days = input_num('DayNumber'); + $from_now = ($type != PTT_FOLLOWING); + if ($type == PTT_CASH) + $days = 0; + if ($type == PTT_PRE) + $days = -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, $from_now, $_POST['terms'], $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($from_now, $_POST['terms'], $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 +90,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')); } } @@ -141,89 +120,68 @@ if ($Mode == 'RESET') } //------------------------------------------------------------------------------------------------- -$sql = "SELECT * FROM ".TB_PREF."payment_terms"; -if (!check_value('show_inactive')) $sql .= " WHERE !inactive"; -$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"), "", ""); 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"); - } alt_table_row_color($k); - + $type = term_type($myrow); + $days = term_days($myrow); label_cell($myrow["terms"]); - label_cell($full_text); - label_cell($after_text); + label_cell($pterm_types[$type]); + label_cell($type == PTT_DAYS ? "$days "._("days") : ($type == PTT_FOLLOWING ? $days : _("N/A"))); inactive_control_cell($myrow["terms_indicator"], $myrow["inactive"], 'payment_terms', "terms_indicator"); edit_button_cell("Edit".$myrow["terms_indicator"], _("Edit")); delete_button_cell("Delete".$myrow["terms_indicator"], _("Delete")); end_row(); - -} //END WHILE LIST LOOP +} inactive_control_row($th); end_table(1); //------------------------------------------------------------------------------------------------- +if (list_updated('type')) { + $Ajax->activate('edits'); +} + +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['DayNumber'] = term_days($myrow); + $_POST['type'] = term_type($myrow); } 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); +text_row(_("Terms Description:"), 'terms', null, 40, 40); -if (!isset($_POST['DayNumber'])) -{ - if ($days_before_due != 0) - $_POST['DayNumber'] = $days_before_due; - else - $_POST['DayNumber'] = $day_in_following_month; -} +payment_type_list_row(_("Payment type:"), 'type', null, true); -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); +else + hidden('DayNumber', 0); end_table(1); +div_end(); submit_add_or_update_center($selected_id == -1, '', 'both'); @@ -231,4 +189,3 @@ end_form(); end_page(); -?>