Fixed control buttons reset after record deletion.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a103830d3b38683c2d4c2313afe0b575410c3ffe..9db7e0d48c7363318fb6f6412934685f4762f60d 100644 (file)
--- 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 1c9af0dc2257cb463088a571d98759532fb22074..9bbf4040579ac14c45f0a948c0675593b8251e55 100644 (file)
--- 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 0bb78419a34634be4ee86e4d10027368317fb0c1..24969c94a268301ac5611b8aff46536c0b7bd8c7 100644 (file)
--- 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 e01ad9eff7312f849c72c0999ad9cd00fe6b4691..1c16fa3f72358dccb17f9e5514200531452fe8d6 100644 (file)
--- 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 ffe3683e1d5276d0b5925c68a56c0c54cae85769..5081e3b5d6140acd32a0f050d7f29fb58f8abcc5 100644 (file)
--- 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 eb36170e7a0827fee5d9495d51835340aaf8af38..eadbaf92656854a40ce4f2aa774069c188770839 100644 (file)
--- 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 53dd536cd62224710ca40ad75865ddf95d32612f..8de53227e5da3b4463dd2a0c7cf208e8f9b8cfaf 100644 (file)
--- 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 4fbf0003ff784076a775d8471af12da6ea7ac854..4e2ce39ffed85b7616aaeca0dacfe04224cdee5a 100644 (file)
--- 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 4b3db64b24f1f93c7fb58f341180b301b20e0f15..4bf0cd78036304d2edbb0ae06dc9dea8c2b9d036 100644 (file)
--- 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 d06828e067250c6ef16b263096d9ba704eae43e7..b8e432bc54f439ed20bb16d2e2d82f793da1f4e3 100644 (file)
--- 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 3fcddeae5ec451150f70abc3bea3fa1e30e5ac3c..4b6d291c5333100adfca23f77d1af4c8a0123d53 100644 (file)
--- 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 9660af2375981cf443a06da99bf751da704230c6..fb866fc2d0c6a308f2d68b8d379244e9299e64f9 100644 (file)
--- 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 04d10fee4aabb9e2d7c9e47a2ff3eb7a9398242e..4155fae8680a1e7c06cc1948dd3c5df0d3df4355 100644 (file)
--- 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 f4608d088e3c10d2cef45fc934d287af768868ab..4373e0291dfa698b23511685d37934a4e2c88a54 100644 (file)
--- 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 b3f86cfc2e5f9edf406f6b300e19bbbf02217b4d..cad472e24c8264c3b646f5bdf2a15830ce1b3d30 100644 (file)
--- 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 c6e69676f2581aed91e0bf5a19764dee93a6bcfa..12b603fb9c655a9443e8b5cd589f7fb847a4dad9 100644 (file)
--- 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 723fabd30cee058991de2a9877ec60e529813b03..f0e0550a77d5585d4ba2d147d24bacaf2c47ebcd 100644 (file)
--- 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 08de58cb3f804dec5a81ed850c525b9aad1cc22e..a99c322bf3822e18fca8ed0a5329f1c11cd69c47 100644 (file)
--- 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 f8eb7cdc3383ff6481606be411a1d4746171eb47..31237f815d8f14cfdfa5006bd7a76be626e4cb93 100644 (file)
--- 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 78993f2a6786e3fd9a450f7ee0733014734e6b33..335691e1e720443ca31461827ae36827ddb4fec5 100644 (file)
--- 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 d93a29a34f4cdd4df1a028e4e06f882c7aef36ef..adfa7b9df70ea0797cb1fdde45fddb3969e7e614 100644 (file)
--- 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')