From e82fa1f01d7f0d7706b9d3e2efaa9a31cc0777f6 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 28 Jul 2008 22:14:46 +0000 Subject: [PATCH] Fixed control buttons reset after record deletion. --- CHANGELOG.txt | 23 +++++++++++++++++++++++ admin/fiscalyears.php | 9 ++++----- admin/payment_terms.php | 2 +- admin/shipping_companies.php | 2 +- gl/manage/bank_accounts.php | 2 +- gl/manage/currencies.php | 9 ++++----- gl/manage/gl_account_classes.php | 2 +- gl/manage/gl_account_types.php | 2 +- inventory/manage/item_categories.php | 2 +- inventory/manage/item_units.php | 2 +- inventory/manage/locations.php | 2 +- inventory/manage/movement_types.php | 3 +-- manufacturing/manage/work_centres.php | 2 +- sales/manage/credit_status.php | 2 +- sales/manage/customer_branches.php | 2 +- sales/manage/sales_areas.php | 2 +- sales/manage/sales_people.php | 2 +- sales/manage/sales_types.php | 2 +- taxes/item_tax_types.php | 2 +- taxes/tax_groups.php | 2 +- taxes/tax_types.php | 2 +- 21 files changed, 49 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a103830d..9db7e0d4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,29 @@ Legend: ! -> Note $ -> Affected files +28-Jul-2008 Janusz Dobrowolski +# Fixed control buttons reset after record deletion. +$ /admin/fiscalyears.php + /admin/payment_terms.php + /admin/shipping_companies.php + /gl/manage/bank_accounts.php + /gl/manage/currencies.php + /gl/manage/gl_account_classes.php + /gl/manage/gl_account_types.php + /inventory/manage/item_categories.php + /inventory/manage/item_units.php + /inventory/manage/locations.php + /inventory/manage/movement_types.php + /manufacturing/manage/work_centres.php + /sales/manage/credit_status.php + /sales/manage/customer_branches.php + /sales/manage/sales_areas.php + /sales/manage/sales_people.php + /sales/manage/sales_types.php + /taxes/item_tax_types.php + /taxes/tax_groups.php + /taxes/tax_types.php + 27-Jul-2008 Janusz Dobrowolski # Fixed record selection on pages using non-numeric selectors with simple_page_mode() helper. $ /includes/ui/ui_controls.inc diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php index 1c9af0dc..9bbf4040 100644 --- a/admin/fiscalyears.php +++ b/admin/fiscalyears.php @@ -94,12 +94,11 @@ function handle_delete() { global $selected_id, $Mode; - if (!check_can_delete($selected_id)) - return; + if (check_can_delete($selected_id)) { //only delete if used in neither customer or supplier, comp prefs, bank trans accounts - - delete_fiscalyear($selected_id); - display_notification(_('Selected fiscal year has been deleted')); + delete_fiscalyear($selected_id); + display_notification(_('Selected fiscal year has been deleted')); + } $Mode = 'RESET'; } diff --git a/admin/payment_terms.php b/admin/payment_terms.php index 0bb78419..24969c94 100644 --- a/admin/payment_terms.php +++ b/admin/payment_terms.php @@ -117,10 +117,10 @@ if ($Mode == 'Delete') $sql="DELETE FROM ".TB_PREF."payment_terms WHERE terms_indicator='$selected_id'"; db_query($sql,"could not delete a payment terms"); display_notification(_('Selected payment terms have been deleted')); - $Mode = 'RESET'; } } //end if payment terms used in customer or supplier accounts + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php index e01ad9ef..1c16fa3f 100644 --- a/admin/shipping_companies.php +++ b/admin/shipping_companies.php @@ -83,9 +83,9 @@ if ($Mode == 'Delete') $sql="DELETE FROM ".TB_PREF."shippers WHERE shipper_id=$selected_id"; db_query($sql,"could not delete shipper"); display_notification(_('Selected shipping company has been deleted')); - $Mode = 'RESET'; } } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/gl/manage/bank_accounts.php b/gl/manage/bank_accounts.php index ffe3683e..5081e3b5 100644 --- a/gl/manage/bank_accounts.php +++ b/gl/manage/bank_accounts.php @@ -66,8 +66,8 @@ elseif( $Mode == 'Delete') { delete_bank_account($selected_id); display_notification(_('Selected bank account has been deleted')); - $Mode = 'RESET'; } //end if Delete bank account + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/gl/manage/currencies.php b/gl/manage/currencies.php index eb36170e..eadbaf92 100644 --- a/gl/manage/currencies.php +++ b/gl/manage/currencies.php @@ -123,12 +123,11 @@ function check_can_delete() function handle_delete() { global $selected_id, $Mode; - if (!check_can_delete()) - return; + if (check_can_delete()) { //only delete if used in neither customer or supplier, comp prefs, bank trans accounts - - delete_currency($selected_id); - display_notification(_('Selected currency has been deleted')); + delete_currency($selected_id); + display_notification(_('Selected currency has been deleted')); + } $Mode = 'RESET'; } diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php index 53dd536c..8de53227 100644 --- a/gl/manage/gl_account_classes.php +++ b/gl/manage/gl_account_classes.php @@ -77,8 +77,8 @@ if ($Mode == 'Delete') { delete_account_class($selected_id); display_notification(_('Selected account class has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } //----------------------------------------------------------------------------------- diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php index 4fbf0003..4e2ce39f 100644 --- a/gl/manage/gl_account_types.php +++ b/gl/manage/gl_account_types.php @@ -94,8 +94,8 @@ if ($Mode == 'Delete') { delete_account_type($selected_id); display_notification(_('Selected currency has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') { diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php index 4b3db64b..4bf0cd78 100644 --- a/inventory/manage/item_categories.php +++ b/inventory/manage/item_categories.php @@ -59,8 +59,8 @@ if ($Mode == 'Delete') { delete_item_category($selected_id); display_notification(_('Selected item category has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php index d06828e0..b8e432bc 100644 --- a/inventory/manage/item_units.php +++ b/inventory/manage/item_units.php @@ -57,8 +57,8 @@ if ($Mode == 'Delete') { delete_item_unit($selected_id); display_notification(_('Selected unit has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/inventory/manage/locations.php b/inventory/manage/locations.php index 3fcddeae..4b6d291c 100644 --- a/inventory/manage/locations.php +++ b/inventory/manage/locations.php @@ -101,8 +101,8 @@ if ($Mode == 'Delete') { delete_item_location($selected_id); display_notification(_('Selected location has been deleted')); - $Mode = 'RESET'; } //end if Delete Location + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php index 9660af23..fb866fc2 100644 --- a/inventory/manage/movement_types.php +++ b/inventory/manage/movement_types.php @@ -65,13 +65,12 @@ function can_delete($selected_id) if ($Mode == 'Delete') { - if (can_delete($selected_id)) { delete_movement_type($selected_id); display_notification(_('Selected movement type has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php index 04d10fee..4155fae8 100644 --- a/manufacturing/manage/work_centres.php +++ b/manufacturing/manage/work_centres.php @@ -78,8 +78,8 @@ if ($Mode == 'Delete') { delete_work_centre($selected_id); display_notification(_('Selected work center has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/sales/manage/credit_status.php b/sales/manage/credit_status.php index f4608d08..4373e029 100644 --- a/sales/manage/credit_status.php +++ b/sales/manage/credit_status.php @@ -71,8 +71,8 @@ if ($Mode == 'Delete') { delete_credit_status($selected_id); display_notification(_('Selected credit status has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php index b3f86cfc..cad472e2 100644 --- a/sales/manage/customer_branches.php +++ b/sales/manage/customer_branches.php @@ -140,9 +140,9 @@ elseif ($Mode == 'Delete') $sql="DELETE FROM ".TB_PREF."cust_branch WHERE branch_code='" . $_POST['branch_code']. "' AND debtor_no='" . $_POST['customer_id']. "'"; db_query($sql,"could not delete branch"); display_notification(_('Selected customer branch has been deleted')); - $Mode = 'RESET'; } } //end ifs to test if the branch can be deleted + $Mode = 'RESET'; } if ($Mode == 'RESET' || get_post('_customer_id_update')) diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php index c6e69676..12b603fb 100644 --- a/sales/manage/sales_areas.php +++ b/sales/manage/sales_areas.php @@ -62,8 +62,8 @@ if ($Mode == 'Delete') db_query($sql,"could not delete sales area"); display_notification(_('Selected sales area has been deleted')); - $Mode = 'RESET'; } //end if Delete area + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php index 723fabd3..f0e0550a 100644 --- a/sales/manage/sales_people.php +++ b/sales/manage/sales_people.php @@ -88,8 +88,8 @@ if ($Mode == 'Delete') $sql="DELETE FROM ".TB_PREF."salesman WHERE salesman_code='$selected_id'"; db_query($sql,"The sales-person could not be deleted"); display_notification(_('Selected sales person data have been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/sales/manage/sales_types.php b/sales/manage/sales_types.php index 08de58cb..a99c322b 100644 --- a/sales/manage/sales_types.php +++ b/sales/manage/sales_types.php @@ -83,9 +83,9 @@ if ($Mode == 'Delete') { delete_sales_type($selected_id); display_notification(_('Selected sales type has been deleted')); - $Mode = 'RESET'; } } //end if sales type used in debtor transactions or in customers set up + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php index f8eb7cdc..31237f81 100644 --- a/taxes/item_tax_types.php +++ b/taxes/item_tax_types.php @@ -85,8 +85,8 @@ if ($Mode == 'Delete') { delete_item_tax_type($selected_id); display_notification(_('Selected item tax type has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php index 78993f2a..335691e1 100644 --- a/taxes/tax_groups.php +++ b/taxes/tax_groups.php @@ -119,8 +119,8 @@ if ($Mode == 'Delete') { delete_tax_group($selected_id); display_notification(_('Selected tax group has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') diff --git a/taxes/tax_types.php b/taxes/tax_types.php index d93a29a3..adfa7b9d 100644 --- a/taxes/tax_types.php +++ b/taxes/tax_types.php @@ -78,8 +78,8 @@ if ($Mode == 'Delete') { delete_tax_type($selected_id); display_notification(_('Selected tax type has been deleted')); - $Mode = 'RESET'; } + $Mode = 'RESET'; } if ($Mode == 'RESET') -- 2.30.2