From 4d4371fb200bb27fd6b680ebd2d1aaa450a0be7e Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 18 Mar 2009 21:16:47 +0000 Subject: [PATCH] Form submit/escape hotkeys added. --- admin/attachments.php | 2 +- admin/change_current_user_password.php | 2 +- admin/company_preferences.php | 2 +- admin/display_prefs.php | 2 +- admin/fiscalyears.php | 2 +- admin/forms_setup.php | 2 +- admin/gl_setup.php | 2 +- admin/payment_terms.php | 2 +- admin/print_profiles.php | 4 ++-- admin/printers.php | 2 +- admin/shipping_companies.php | 2 +- admin/users.php | 2 +- admin/view_print_transaction.php | 2 +- admin/void_transaction.php | 6 +++--- dimensions/dimension_entry.php | 4 ++-- dimensions/inquiry/search_dimensions.php | 2 +- dimensions/view/view_dimension.php | 2 +- gl/bank_transfer.php | 2 +- gl/gl_bank.php | 2 +- gl/gl_budget.php | 2 +- gl/gl_journal.php | 2 +- gl/inquiry/bank_inquiry.php | 2 +- gl/inquiry/gl_account_inquiry.php | 2 +- gl/inquiry/gl_trial_balance.php | 2 +- gl/inquiry/tax_inquiry.php | 2 +- gl/manage/bank_accounts.php | 2 +- gl/manage/currencies.php | 2 +- gl/manage/exchange_rates.php | 2 +- gl/manage/gl_account_classes.php | 2 +- gl/manage/gl_account_types.php | 2 +- gl/manage/gl_accounts.php | 4 ++-- gl/manage/gl_quick_entries.php | 2 +- inventory/adjustments.php | 2 +- inventory/cost_update.php | 2 +- inventory/inquiry/stock_movements.php | 2 +- inventory/manage/item_categories.php | 2 +- inventory/manage/item_codes.php | 2 +- inventory/manage/item_units.php | 2 +- inventory/manage/items.php | 6 +++--- inventory/manage/locations.php | 2 +- inventory/manage/movement_types.php | 2 +- inventory/manage/sales_kits.php | 2 +- inventory/prices.php | 2 +- inventory/purchasing_data.php | 2 +- inventory/reorder_level.php | 2 +- inventory/transfers.php | 2 +- manufacturing/manage/bom_edit.php | 2 +- manufacturing/manage/work_centres.php | 2 +- manufacturing/search_work_orders.php | 2 +- manufacturing/work_order_add_finished.php | 2 +- manufacturing/work_order_entry.php | 4 ++-- manufacturing/work_order_issue.php | 2 +- manufacturing/work_order_release.php | 2 +- purchasing/allocations/supplier_allocate.php | 6 +++--- purchasing/inquiry/po_search.php | 2 +- purchasing/inquiry/po_search_completed.php | 2 +- purchasing/inquiry/supplier_allocation_inquiry.php | 2 +- purchasing/inquiry/supplier_inquiry.php | 2 +- purchasing/manage/suppliers.php | 6 +++--- purchasing/po_entry_items.php | 13 ++++++++----- purchasing/po_receive_items.php | 2 +- purchasing/supplier_credit.php | 2 +- purchasing/supplier_invoice.php | 2 +- purchasing/supplier_payment.php | 2 +- reporting/includes/reports_classes.inc | 14 ++++++++------ sales/allocations/customer_allocate.php | 6 +++--- sales/credit_note_entry.php | 2 +- sales/customer_credit_invoice.php | 2 +- sales/customer_delivery.php | 2 +- sales/customer_invoice.php | 2 +- sales/customer_payments.php | 2 +- sales/inquiry/customer_allocation_inquiry.php | 2 +- sales/inquiry/customer_inquiry.php | 2 +- sales/inquiry/sales_deliveries_view.php | 2 +- sales/inquiry/sales_orders_view.php | 2 +- sales/manage/credit_status.php | 2 +- sales/manage/customer_branches.php | 2 +- sales/manage/customers.php | 4 ++-- sales/manage/recurrent_invoices.php | 2 +- sales/manage/sales_areas.php | 2 +- sales/manage/sales_groups.php | 2 +- sales/manage/sales_people.php | 2 +- sales/manage/sales_points.php | 2 +- sales/manage/sales_types.php | 2 +- taxes/item_tax_types.php | 2 +- taxes/tax_groups.php | 2 +- taxes/tax_types.php | 2 +- 87 files changed, 116 insertions(+), 111 deletions(-) diff --git a/admin/attachments.php b/admin/attachments.php index 12bab651..cf1c1696 100644 --- a/admin/attachments.php +++ b/admin/attachments.php @@ -239,7 +239,7 @@ end_table(1); if (isset($_POST['filterType'])) hidden('filterType', $_POST['filterType']); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php index d38f96cd..e8005ae3 100644 --- a/admin/change_current_user_password.php +++ b/admin/change_current_user_password.php @@ -94,7 +94,7 @@ table_section_title(_("Enter your new password in the fields.")); end_table(1); -submit_center( 'UPDATE_ITEM', _('Change password'), true, '', true); +submit_center( 'UPDATE_ITEM', _('Change password'), true, '', 'default'); end_form(); end_page(); ?> diff --git a/admin/company_preferences.php b/admin/company_preferences.php index ac5eb449..feddf62f 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -176,7 +176,7 @@ end_row(); end_outer_table(1); hidden('coy_logo', $_POST['coy_logo']); -submit_center('update', _("Update"), true, '', true); +submit_center('update', _("Update"), true, '', 'default'); end_form(2); //------------------------------------------------------------------------------------------------- diff --git a/admin/display_prefs.php b/admin/display_prefs.php index 316733a7..81d951ad 100644 --- a/admin/display_prefs.php +++ b/admin/display_prefs.php @@ -129,7 +129,7 @@ text_row_ex(_("Query page size:"), 'query_size', 5, 5, '', user_query_size()); end_outer_table(1); -submit_center('setprefs', _("Update"), true, '', true); +submit_center('setprefs', _("Update"), true, '', 'default'); end_form(2); diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php index 4e62ad72..b3de0f89 100644 --- a/admin/fiscalyears.php +++ b/admin/fiscalyears.php @@ -196,7 +196,7 @@ function display_fiscalyear_edit($selected_id) end_table(1); - submit_add_or_update_center($selected_id == -1, '', true); + submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); } diff --git a/admin/forms_setup.php b/admin/forms_setup.php index 46676617..a15cfe4a 100644 --- a/admin/forms_setup.php +++ b/admin/forms_setup.php @@ -58,7 +58,7 @@ while ($type = db_fetch($systypes)) end_outer_table(1); -submit_center('setprefs', _("Update"), true, '', true); +submit_center('setprefs', _("Update"), true, '', 'default'); end_form(2); diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 354e76c2..2fa03f36 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -212,7 +212,7 @@ text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POS end_outer_table(1); -submit_center('submit', _("Update"), true, '', true); +submit_center('submit', _("Update"), true, '', 'default'); end_form(2); diff --git a/admin/payment_terms.php b/admin/payment_terms.php index 6939c9bd..0a706422 100644 --- a/admin/payment_terms.php +++ b/admin/payment_terms.php @@ -222,7 +222,7 @@ text_row_ex(_("Days (Or Day In Following Month):"), 'DayNumber', 3); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); diff --git a/admin/print_profiles.php b/admin/print_profiles.php index 8052a38a..f22c1941 100644 --- a/admin/print_profiles.php +++ b/admin/print_profiles.php @@ -174,10 +174,10 @@ else div_start('controls'); if (get_post('profile_id') == '') { - submit_center('submit', _("Add New Profile"), true, '', true); + submit_center('submit', _("Add New Profile"), true, '', 'default'); } else { submit_center_first('submit', _("Update Profile"), - _('Update printer profile'), true); + _('Update printer profile'), 'default'); submit_center_last('delete', _("Delete Profile"), _('Delete printer profile (only if not used by any user)'), true); } diff --git a/admin/printers.php b/admin/printers.php index 227c1d65..20753ac7 100644 --- a/admin/printers.php +++ b/admin/printers.php @@ -142,7 +142,7 @@ text_row(_("Timeout").':', 'tout', null, 5, 5); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php index 17726cc3..f32efae2 100644 --- a/admin/shipping_companies.php +++ b/admin/shipping_companies.php @@ -163,7 +163,7 @@ text_row_ex(_("Address:"), 'address', 50); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); end_page(); diff --git a/admin/users.php b/admin/users.php index 71db09ce..578def43 100644 --- a/admin/users.php +++ b/admin/users.php @@ -218,7 +218,7 @@ check_row(_("Use popup window for reports:"), 'rep_popup', $_POST['rep_popup'], end_table(1); -submit_add_or_update_center($selected_id == '', '', true); +submit_add_or_update_center($selected_id == '', '', 'default'); end_form(); end_page(); diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php index b9931d44..d6d8ca3b 100644 --- a/admin/view_print_transaction.php +++ b/admin/view_print_transaction.php @@ -60,7 +60,7 @@ function viewing_controls() ref_cells(_("to #:"), 'ToTransNo'); - submit_cells('ProcessSearch', _("Search"), '', '', true); + submit_cells('ProcessSearch', _("Search"), '', '', 'default'); end_row(); end_table(1); diff --git a/admin/void_transaction.php b/admin/void_transaction.php index 31f8506b..1be108f8 100644 --- a/admin/void_transaction.php +++ b/admin/void_transaction.php @@ -117,7 +117,7 @@ function voiding_controls() end_table(1); if (!isset($_POST['ProcessVoiding'])) - submit_center('ProcessVoiding', _("Void Transaction"), true, '', true); + submit_center('ProcessVoiding', _("Void Transaction"), true, '', 'default'); else { if (!exist_transaction($_POST['filterType'],$_POST['trans_no'])) @@ -126,7 +126,7 @@ function voiding_controls() unset($_POST['trans_no']); unset($_POST['memo_']); unset($_POST['date_']); - submit_center('ProcessVoiding', _("Void Transaction"), true, '', true); + submit_center('ProcessVoiding', _("Void Transaction"), true, '', 'default'); } else { @@ -138,7 +138,7 @@ function voiding_controls() display_note($view_str); br(); submit_center_first('ConfirmVoiding', _("Proceed"), '', true); - submit_center_last('CancelVoiding', _("Cancel"), '', true); + submit_center_last('CancelVoiding', _("Cancel"), '', 'cancel'); } } diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php index 9014f22a..c0e99521 100644 --- a/dimensions/dimension_entry.php +++ b/dimensions/dimension_entry.php @@ -257,13 +257,13 @@ end_table(1); if ($selected_id != -1) { echo "
"; - submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), true); + submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), 'default'); submit('close', _("Close This Dimension"), true, _('Mark this dimension as closed'), true); submit_center_last('delete', _("Delete This Dimension"), _('Delete unused dimension'), true); } else { - submit_center('ADD_ITEM', _("Add"), true, '', true); + submit_center('ADD_ITEM', _("Add"), true, '', 'default'); } end_form(); diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index 8e43471f..fb261b94 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -85,7 +85,7 @@ if (!$outstanding_only) else $_POST['OpenOnly'] = 1; -submit_cells('SearchOrders', _("Search"), '', '', true); +submit_cells('SearchOrders', _("Search"), '', '', 'default'); end_row(); end_table(); diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php index a8ad64d1..9d74b06b 100644 --- a/dimensions/view/view_dimension.php +++ b/dimensions/view/view_dimension.php @@ -83,7 +83,7 @@ if (!isset($_POST['TransToDate'])) $_POST['TransToDate'] = Today(); date_cells(_("from:"), 'TransFromDate'); date_cells(_("to:"), 'TransToDate'); -submit_cells('Show',_("Show")); +submit_cells('Show',_("Show"), '', false, 'default'); end_row(); diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php index 36e28a6a..0f4ea916 100644 --- a/gl/bank_transfer.php +++ b/gl/bank_transfer.php @@ -94,7 +94,7 @@ function gl_payment_controls() echo ""; end_table(1); // outer table - submit_center('AddPayment',_("Enter Transfer"), true, '', true); + submit_center('AddPayment',_("Enter Transfer"), true, '', 'default'); end_form(); } diff --git a/gl/gl_bank.php b/gl/gl_bank.php index ff7f196a..b9ce9882 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -292,7 +292,7 @@ end_table(1); submit_center_first('Update', _("Update"), '', null); submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? - _("Process Payment"):_("Process Deposit"), '', true); + _("Process Payment"):_("Process Deposit"), '', 'default'); end_form(); diff --git a/gl/gl_budget.php b/gl/gl_budget.php index 6c4db527..0afded12 100644 --- a/gl/gl_budget.php +++ b/gl/gl_budget.php @@ -185,7 +185,7 @@ if (db_has_gl_accounts()) end_table(1); div_end(); submit_center_first('update', _("Update"), '', null); - submit('add', _("Save"), true, '', true); + submit('add', _("Save"), true, '', 'default'); submit_center_last('delete', _("Delete"), '', true); } end_form(); diff --git a/gl/gl_journal.php b/gl/gl_journal.php index 8d285334..8b178118 100644 --- a/gl/gl_journal.php +++ b/gl/gl_journal.php @@ -266,7 +266,7 @@ end_row(); end_table(1); submit_center('Process', _("Process Journal Entry"), true , - _('Process journal entry only if debits equal to credits'), true); + _('Process journal entry only if debits equal to credits'), 'default'); end_form(); //------------------------------------------------------------------------------------------------ diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index 94ccef8d..9c627670 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -46,7 +46,7 @@ bank_accounts_list_cells(_("Account:"), 'bank_account', null); date_cells(_("From:"), 'TransAfterDate', '', null, -30); date_cells(_("To:"), 'TransToDate'); -submit_cells('Show',_("Show"),'','', true); +submit_cells('Show',_("Show"),'','', 'default'); end_row(); end_table(); end_form(); diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php index 22b31a78..132d23cc 100644 --- a/gl/inquiry/gl_account_inquiry.php +++ b/gl/inquiry/gl_account_inquiry.php @@ -65,7 +65,7 @@ function gl_inquiry_controls() date_cells(_("from:"), 'TransFromDate', '', null, -30); date_cells(_("to:"), 'TransToDate'); - submit_cells('Show',_("Show"),'','', true); + submit_cells('Show',_("Show"),'','', 'default'); end_row(); diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php index 093307c9..2ea606ee 100644 --- a/gl/inquiry/gl_trial_balance.php +++ b/gl/inquiry/gl_trial_balance.php @@ -46,7 +46,7 @@ function gl_inquiry_controls() check_cells(_("No zero values"), 'NoZero', null); check_cells(_("Only balances"), 'Balance', null); - submit_cells('Show',_("Show"),'','', true); + submit_cells('Show',_("Show"),'','', 'default'); end_table(); end_form(); } diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php index df9cd14b..db10eea0 100644 --- a/gl/inquiry/tax_inquiry.php +++ b/gl/inquiry/tax_inquiry.php @@ -62,7 +62,7 @@ function tax_inquiry_controls() date_cells(_("from:"), 'TransFromDate', '', null, -30); date_cells(_("to:"), 'TransToDate'); - submit_cells('Show',_("Show"),'','', true); + submit_cells('Show',_("Show"),'','', 'default'); end_row(); diff --git a/gl/manage/bank_accounts.php b/gl/manage/bank_accounts.php index e794f697..45bea5e8 100644 --- a/gl/manage/bank_accounts.php +++ b/gl/manage/bank_accounts.php @@ -184,7 +184,7 @@ textarea_row(_("Bank Address:"), 'bank_address', null, 40, 5); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); diff --git a/gl/manage/currencies.php b/gl/manage/currencies.php index f1b91de0..d5db45f3 100644 --- a/gl/manage/currencies.php +++ b/gl/manage/currencies.php @@ -223,7 +223,7 @@ function display_currency_edit($selected_id) end_table(1); - submit_add_or_update_center($selected_id == '', '', true); + submit_add_or_update_center($selected_id == '', '', 'default'); end_form(); } diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php index 19ac833e..d0c42d21 100644 --- a/gl/manage/exchange_rates.php +++ b/gl/manage/exchange_rates.php @@ -143,7 +143,7 @@ function display_rate_edit() end_table(1); - submit_add_or_update_center($selected_id == '', '', true); + submit_add_or_update_center($selected_id == '', '', 'default'); display_note(_("Exchange rates are entered against the company currency."), 1); } diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php index 65a6429d..139cc8f5 100644 --- a/gl/manage/gl_account_classes.php +++ b/gl/manage/gl_account_classes.php @@ -167,7 +167,7 @@ yesno_list_row(_("Balance Sheet:"), 'Balance', null, "", "", false); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php index 19093b21..76e91faa 100644 --- a/gl/manage/gl_account_types.php +++ b/gl/manage/gl_account_types.php @@ -188,7 +188,7 @@ class_list_row(_("Class Type:"), 'class_id', null); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'default'); end_form(); diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index f5ddabdb..459c3766 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -247,11 +247,11 @@ end_table(1); if ($selected_account == "") { - submit_center('add', _("Add Account"), true, '', true); + submit_center('add', _("Add Account"), true, '', 'default'); } else { - submit_center_first('update', _("Update Account"), '', true); + submit_center_first('update', _("Update Account"), '', 'default'); submit_center_last('delete', _("Delete account"), '',true); } end_form(); diff --git a/gl/manage/gl_quick_entries.php b/gl/manage/gl_quick_entries.php index 137cfaa4..faa958a8 100644 --- a/gl/manage/gl_quick_entries.php +++ b/gl/manage/gl_quick_entries.php @@ -216,7 +216,7 @@ amount_row(_("Default Base Amount").':', 'base_amount', price_format(0)); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/inventory/adjustments.php b/inventory/adjustments.php index bd8f1bed..e1ce7024 100644 --- a/inventory/adjustments.php +++ b/inventory/adjustments.php @@ -229,7 +229,7 @@ adjustment_options_controls(); end_outer_table(1, false); submit_center_first('Update', _("Update"), '', null); -submit_center_last('Process', _("Process Adjustment"), '', true); +submit_center_last('Process', _("Process Adjustment"), '', 'default'); end_form(); end_page(); diff --git a/inventory/cost_update.php b/inventory/cost_update.php index 0cf4fb6d..0b22ac18 100644 --- a/inventory/cost_update.php +++ b/inventory/cost_update.php @@ -126,7 +126,7 @@ else end_table(1); div_end(); -submit_center('UpdateData', _("Update")); +submit_center('UpdateData', _("Update"), true, false, 'default'); end_form(); end_page(); diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php index cd225d52..1192cd06 100644 --- a/inventory/inquiry/stock_movements.php +++ b/inventory/inquiry/stock_movements.php @@ -53,7 +53,7 @@ locations_list_cells(_("From Location:"), 'StockLocation', null); date_cells(_("From:"), 'AfterDate', '', null, -30); date_cells(_("To:"), 'BeforeDate'); -submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), true); +submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default'); end_table(); end_form(); diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php index 904afc79..b5ded413 100644 --- a/inventory/manage/item_categories.php +++ b/inventory/manage/item_categories.php @@ -221,7 +221,7 @@ if ($dim < 2) 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(); diff --git a/inventory/manage/item_codes.php b/inventory/manage/item_codes.php index ce802e2c..3ac092bb 100644 --- a/inventory/manage/item_codes.php +++ b/inventory/manage/item_codes.php @@ -179,7 +179,7 @@ stock_categories_list_row(_("Category:"), 'category_id', null); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php index 95473885..de6154a6 100644 --- a/inventory/manage/item_units.php +++ b/inventory/manage/item_units.php @@ -135,7 +135,7 @@ number_list_row(_("Decimal Places:"), 'decimals', null, 0, 6, _("User Quantity D end_table(1); -submit_add_or_update_center($selected_id == '', '', true); +submit_add_or_update_center($selected_id == '', '', 'both'); end_form(); diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 6993000d..c09c1c48 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -415,12 +415,12 @@ div_end(); div_start('controls'); if (!isset($_POST['NewStockID']) || $new_item) { - submit_center('addupdate', _("Insert New Item"), true, '', true); + submit_center('addupdate', _("Insert New Item"), true, '', 'default'); } else { - submit_center_first('addupdate', _("Update Item"), '', true); - submit_return('select', _("Return"), _("Select this items and return to document entry."), true); + submit_center_first('addupdate', _("Update Item"), '', 'default'); + submit_return('select', _("Return"), _("Select this items and return to document entry."), 'default'); submit_center_last('delete', _("Delete This Item"), '', true); } diff --git a/inventory/manage/locations.php b/inventory/manage/locations.php index e0c3b146..bf36ac41 100644 --- a/inventory/manage/locations.php +++ b/inventory/manage/locations.php @@ -187,7 +187,7 @@ text_row_ex(_("Facsimile No:"), 'fax', 30, 30); email_row_ex(_("E-mail:"), 'email', 30); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php index 69e8fe16..3e5d0602 100644 --- a/inventory/manage/movement_types.php +++ b/inventory/manage/movement_types.php @@ -134,7 +134,7 @@ text_row(_("Description:"), 'name', null, 50, 50); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php index 59ca9e4d..a45dde70 100644 --- a/inventory/manage/sales_kits.php +++ b/inventory/manage/sales_kits.php @@ -245,7 +245,7 @@ if (get_post('item_code') == '') { qty_row(_("Quantity:"), 'quantity', number_format2(1, $dec), '', $units, $dec); end_table(1); - submit_add_or_update_center($selected_id == -1, '', true); + submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); //---------------------------------------------------------------------------------- diff --git a/inventory/prices.php b/inventory/prices.php index 67de34c8..28059515 100644 --- a/inventory/prices.php +++ b/inventory/prices.php @@ -184,7 +184,7 @@ small_amount_row(_("Price:"), 'price', null, '', _('per') .' '.$kit["units"]); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); div_end(); end_form(); diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php index 4371c829..4ba08be5 100644 --- a/inventory/purchasing_data.php +++ b/inventory/purchasing_data.php @@ -233,7 +233,7 @@ text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php index 7fe5f7d9..962dd268 100644 --- a/inventory/reorder_level.php +++ b/inventory/reorder_level.php @@ -93,7 +93,7 @@ while ($myrow = db_fetch($result)) end_table(1); div_end(); -submit_center('UpdateData', _("Update")); +submit_center('UpdateData', _("Update"), true, false, 'default'); end_form(); end_page(); diff --git a/inventory/transfers.php b/inventory/transfers.php index 897b647c..b3d91338 100644 --- a/inventory/transfers.php +++ b/inventory/transfers.php @@ -233,7 +233,7 @@ end_row(); end_table(1); submit_center_first('Update', _("Update"), '', null); -submit_center_last('Process', _("Process Transfer"), '', true); +submit_center_last('Process', _("Process Transfer"), '', 'default'); end_form(); end_page(); diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index 3b2e70d6..e50e8947 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -279,7 +279,7 @@ start_form(); qty_row(_("Quantity:"), 'quantity', null, null, null, $dec); end_table(1); - submit_add_or_update_center($selected_id == -1, '', true); + submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); } // ---------------------------------------------------------------------------------- diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php index 19227df8..116e4fec 100644 --- a/manufacturing/manage/work_centres.php +++ b/manufacturing/manage/work_centres.php @@ -144,7 +144,7 @@ text_row_ex(_("Description:"), 'description', 50); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php index 348d283f..f14a5733 100644 --- a/manufacturing/search_work_orders.php +++ b/manufacturing/search_work_orders.php @@ -75,7 +75,7 @@ if ($outstanding_only==0) stock_manufactured_items_list_cells(_("for item:"), 'SelectedStockItem', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(); diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php index b8036c37..f2178e95 100644 --- a/manufacturing/work_order_add_finished.php +++ b/manufacturing/work_order_add_finished.php @@ -171,7 +171,7 @@ textarea_row(_("Memo:"), 'memo_', null, 40, 3); end_table(1); -submit_center_first('Process', _("Process"), '', true); +submit_center_first('Process', _("Process"), '', 'default'); submit_center_last('ProcessAndClose', _("Process And Close Order"), '', true); end_form(); diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index c4d3dd5d..bcbfd00a 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -408,7 +408,7 @@ if (isset($selected_id)) { echo ""; - submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), true); + submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), 'default'); if (isset($_POST['released'])) { submit_cells('close', _("Close This Work Order"),'','',true); @@ -419,7 +419,7 @@ if (isset($selected_id)) } else { - submit_center('ADD_ITEM', _("Add Workorder"), true, '', true); + submit_center('ADD_ITEM', _("Add Workorder"), true, '', 'default'); } end_form(); diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php index 1d994381..78a6ba38 100644 --- a/manufacturing/work_order_issue.php +++ b/manufacturing/work_order_issue.php @@ -215,7 +215,7 @@ echo ""; end_table(); -submit_center('Process', _("Process Issue"), true, '', true); +submit_center('Process', _("Process Issue"), true, '', 'default'); end_form(); diff --git a/manufacturing/work_order_release.php b/manufacturing/work_order_release.php index 9cb8e22e..b66613b1 100644 --- a/manufacturing/work_order_release.php +++ b/manufacturing/work_order_release.php @@ -96,7 +96,7 @@ if (can_process($myrow)) end_table(1); - submit_center('release', _("Release Work Order"), true, '', true); + submit_center('release', _("Release Work Order"), true, '', 'default'); hidden('selected_id', $selected_id); hidden('stock_id', $myrow['stock_id']); diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php index 8e3cabd4..900f5cc1 100644 --- a/purchasing/allocations/supplier_allocate.php +++ b/purchasing/allocations/supplier_allocate.php @@ -249,15 +249,15 @@ function edit_allocations_for_transaction($type, $trans_no) hidden('TotalNumberOfAllocs', $counter); submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true); - submit('Process', _("Process"), true, _('Process allocations'), true); + submit('Process', _("Process"), true, _('Process allocations'), 'default'); submit_center_last('Cancel', _("Back to Allocations"), - _('Abandon allocations and return to selection of allocatable amounts'), true); + _('Abandon allocations and return to selection of allocatable amounts'), 'cancel'); } else { display_note(_("There are no unsettled transactions to allocate."), 0, 1); submit_center('Cancel', _("Back to Allocations"), true, - _('Abandon allocations and return to selection of allocatable amounts'), true); + _('Abandon allocations and return to selection of allocatable amounts'), 'cancel'); } div_end(); diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php index 49c9b306..bd863ff2 100644 --- a/purchasing/inquiry/po_search.php +++ b/purchasing/inquiry/po_search.php @@ -68,7 +68,7 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true); stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(); end_form(); diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index a9ca0c56..cd9c77ac 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -66,7 +66,7 @@ locations_list_cells(_("into location:"), 'StockLocation', null, true); stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(); end_form(); diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 4ede5ca0..1b99f735 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -54,7 +54,7 @@ supp_allocations_list_cell("filterType", null); check_cells(_("show settled:"), 'showSettled', null); -submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); set_global_supplier($_POST['supplier_id']); diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 6814bba4..6db3ef91 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -50,7 +50,7 @@ date_cells(_("To:"), 'TransToDate'); supp_allocations_list_cell("filterType", null); -submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 8fc3d870..2681c4b5 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -288,14 +288,14 @@ div_start('controls'); if (!$new_supplier) { submit_center_first('submit', _("Update Supplier"), - _('Update supplier data'), true); - submit_return('select', _("Return"), _("Select this supplier and return to document entry."), true); + _('Update supplier data'), 'default'); + submit_return('select', _("Return"), _("Select this supplier and return to document entry."), 'cancel'); submit_center_last('delete', _("Delete Supplier"), _('Delete supplier data if have been never used'), true); } else { - submit_center('submit', _("Add New Supplier Details"), true, '', true); + submit_center('submit', _("Add New Supplier Details"), true, '', 'default'); } div_end(); end_form(); diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index a394281c..c17dccaa 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -154,12 +154,15 @@ function handle_cancel_po() if($_SESSION['PO']->order_no != 0) { delete_po($_SESSION['PO']->order_no); - } + } else { + unset($_SESSION['PO']); + meta_forward($path_to_root.'/index.php','application=AP'); + } $_SESSION['PO']->clear_items(); $_SESSION['PO'] = new purch_order; - display_note(_("This purchase order has been cancelled."), 0, 1); + display_notification(_("This purchase order has been cancelled.")); hyperlink_params($path_to_root . "/purchasing/po_entry_items.php", _("Enter a new purchase order"), "NewOrder=Yes"); echo "
"; @@ -413,13 +416,13 @@ div_start('controls', 'items_table'); if ($_SESSION['PO']->order_has_items()) { if ($_SESSION['PO']->order_no) - submit_center_first('Commit', _("Update Order"), '', true); + submit_center_first('Commit', _("Update Order"), '', 'default'); else - submit_center_first('Commit', _("Place Order"), '', true); + submit_center_first('Commit', _("Place Order"), '', 'default'); submit_center_last('CancelOrder', _("Cancel Order")); } else - submit_center('CancelOrder', _("Cancel Order")); + submit_center('CancelOrder', _("Cancel Order"), true, false, 'cancel'); div_end(); //--------------------------------------------------------------------------------------------------- diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php index 78bbff9a..7b50b4da 100644 --- a/purchasing/po_receive_items.php +++ b/purchasing/po_receive_items.php @@ -309,7 +309,7 @@ display_heading(_("Items to Receive")); display_po_receive_items(); echo '
'; -submit_center_first('Update', _("Update"), '', true); +submit_center_first('Update', _("Update"), '', 'default'); submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), true); end_form(); diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 625b9e4d..e31b6bb1 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -348,7 +348,7 @@ if (get_post('AddGLCodeToTrans')) $Ajax->activate('inv_tot'); br(); -submit_center('PostCreditNote', _("Enter Credit Note"), true, '', true); +submit_center('PostCreditNote', _("Enter Credit Note"), true, '', 'default'); br(); end_form(); diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 34f15204..a0782e2b 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -416,7 +416,7 @@ if (get_post('AddGLCodeToTrans')) $Ajax->activate('inv_tot'); br(); -submit_center('PostInvoice', _("Enter Invoice"), true, '', true); +submit_center('PostInvoice', _("Enter Invoice"), true, '', 'default'); br(); end_form(); diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 3dad427c..df057e28 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -122,7 +122,7 @@ function display_controls() //echo ""; end_outer_table(1); // outer table - submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true); + submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default'); if ($bank_currency != $supplier_currency) { diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 363e2284..1e0090a1 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -44,15 +44,17 @@ class BoxReports $style = $class_counter==$_REQUEST['Class'] ? '' : "style='display:none'"; $acc = access_string($key); $st_classes .= "$acc[0]
"; + .$_SERVER['PHP_SELF']."?Class=$class_counter'" + ." class='menu_option' id='".default_focus()."'" + ." onclick='return showClass($class_counter);'$acc[1]>$acc[0]
"; $st_reports .= "
\n"; foreach($value as $report) { $acc = access_string($report->name); $st_reports .= "
" . _("Reports For Class: ") . " $key
id" - ."'$acc[1]>$acc[0]
\n"; + .$_SERVER['PHP_SELF']."?Class=$class_counter&rep_id=$report->id'" + ." id='".default_focus()."'" + ."$acc[1]>$acc[0]
\n"; if (isset($_REQUEST['rep_id']) && $_REQUEST['rep_id']==$report->id) { $action = $path_to_root.'/reporting/prn_redirect.php'; @@ -61,8 +63,8 @@ class BoxReports . "
\n"; $st_params .= hidden('REP_ID', $report->id, false); $st_params .= submit('Rep'.$report->id, - _("Display: ") . access_string($report->name,true), - false, '', $pdf_debug==0) . '

'; + _("Display: ") . access_string($report->name, true), + false, '', $pdf_debug ? false : 'default') . '

'; $st_params .= $report->getDisplay() . "\n
\n"; $Ajax->addUpdate(true, 'rep_form', $st_params); diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php index e8a5c5ec..b709c751 100644 --- a/sales/allocations/customer_allocate.php +++ b/sales/allocations/customer_allocate.php @@ -252,15 +252,15 @@ function edit_allocations_for_transaction($type, $trans_no) hidden('TotalNumberOfAllocs', $counter); submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true); - submit('Process', _("Process"), true, _('Process allocations'), true); - submit_center_last('Cancel', _("Back to Allocations"),_('Abandon allocations and return to selection of allocatable amounts'), true); + submit('Process', _("Process"), true, _('Process allocations'), 'default'); + submit_center_last('Cancel', _("Back to Allocations"),_('Abandon allocations and return to selection of allocatable amounts'), 'cancel'); } else { display_note(_("There are no unsettled transactions to allocate."), 0, 1); submit_center('Cancel', _("Back to Allocations"), true, - _('Abandon allocations and return to selection of allocatable amounts'), true); + _('Abandon allocations and return to selection of allocatable amounts'), 'cancel'); } div_end(); end_form(); diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index 63c5ea2f..a33f3407 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -278,7 +278,7 @@ if ($customer_error == "") { echo "
"; submit_cells('Update', _("Update")); -submit_cells('ProcessCredit', _("Process Credit Note")); +submit_cells('ProcessCredit', _("Process Credit Note"), '', false, 'default'); echo "
"; end_form(); diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index 23715748..2d13e547 100644 --- a/sales/customer_credit_invoice.php +++ b/sales/customer_credit_invoice.php @@ -385,7 +385,7 @@ display_credit_options(); echo "
"; submit('Update', _("Update"), true, _('Update credit value for quantities entered'), true); echo " "; -submit('ProcessCredit', _("Process Credit Note"), true, '', true); +submit('ProcessCredit', _("Process Credit Note"), true, '', 'default'); echo "
"; end_form(); diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 97f4ce02..f7793338 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -470,7 +470,7 @@ div_end(); submit_center_first('Update', _("Update"), _('Refresh document page'), true); submit_center_last('process_delivery', _("Process Dispatch"), - _('Check entered data and save document'), true); + _('Check entered data and save document'), 'default'); end_form(); diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 9836de48..6c43ef22 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -512,7 +512,7 @@ end_table(1); submit_center_first('Update', _("Update"), _('Refresh document page'), true); submit_center_last('process_invoice', _("Process Invoice"), - _('Check entered data and save document'), true); + _('Check entered data and save document'), 'default'); end_form(); diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 5c871834..4f232a9a 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -236,7 +236,7 @@ function display_item_form() echo"
"; - submit_center('AddPaymentItem', _("Add Payment"), true, '', true); + submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default'); } echo "
"; diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index 614cebe7..3313cebf 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -48,7 +48,7 @@ cust_allocations_list_cells(_("Type:"), 'filterType', null); check_cells(" " . _("show settled:"), 'showSettled', null); -submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); set_global_customer($_POST['customer_id']); diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 90ac0da6..997e858b 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -51,7 +51,7 @@ if (!isset($_POST['filterType'])) cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true); -submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); end_form(); diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index 36eaf063..7995696d 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -108,7 +108,7 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true); stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); hidden('OutstandingOnly', $_POST['OutstandingOnly']); diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index 6422d690..7fab5191 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -184,7 +184,7 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true); stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); hidden('order_view_mode', $_POST['order_view_mode']); diff --git a/sales/manage/credit_status.php b/sales/manage/credit_status.php index 8d9400cc..20e6d117 100644 --- a/sales/manage/credit_status.php +++ b/sales/manage/credit_status.php @@ -150,7 +150,7 @@ yesno_list_row(_("Dissallow invoicing ?"), 'DisallowInvoices', null); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php index 3dced4db..0e0fe1b9 100644 --- a/sales/manage/customer_branches.php +++ b/sales/manage/customer_branches.php @@ -337,7 +337,7 @@ textarea_row(_("Billing Address:"), 'br_address', null, 35, 5); end_outer_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/sales/manage/customers.php b/sales/manage/customers.php index ba754756..87389b60 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -292,13 +292,13 @@ end_outer_table(1); div_start('controls'); if ($new_customer) { - submit_center('submit', _("Add New Customer"), true, '', true); + submit_center('submit', _("Add New Customer"), true, '', 'default'); } else { submit_center_first('submit', _("Update Customer"), _('Update customer data'), true); - submit_return('select', _("Return"), _("Select this customer and return to document entry."), true); + submit_return('select', _("Return"), _("Select this customer and return to document entry."), 'default'); submit_center_last('delete', _("Delete Customer"), _('Delete customer data if have been never used'), true); } diff --git a/sales/manage/recurrent_invoices.php b/sales/manage/recurrent_invoices.php index eace174d..4e83cb02 100644 --- a/sales/manage/recurrent_invoices.php +++ b/sales/manage/recurrent_invoices.php @@ -188,7 +188,7 @@ date_row(_("End:"), 'end', null, null, 0, 0, 5); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php index c7baeee5..48ec7352 100644 --- a/sales/manage/sales_areas.php +++ b/sales/manage/sales_areas.php @@ -131,7 +131,7 @@ text_row_ex(_("Area Name:"), 'description', 30); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/sales/manage/sales_groups.php b/sales/manage/sales_groups.php index 0fb676c6..3fa4cc47 100644 --- a/sales/manage/sales_groups.php +++ b/sales/manage/sales_groups.php @@ -131,7 +131,7 @@ text_row_ex(_("Group Name:"), 'description', 30); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php index 04e1948d..d3179924 100644 --- a/sales/manage/sales_people.php +++ b/sales/manage/sales_people.php @@ -182,7 +182,7 @@ amount_row(_("Break Pt.:"), 'break_pt'); percent_row(_("Provision")." 2:", 'provision2'); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/sales/manage/sales_points.php b/sales/manage/sales_points.php index ac949c08..a8a47af4 100644 --- a/sales/manage/sales_points.php +++ b/sales/manage/sales_points.php @@ -131,7 +131,7 @@ cash_accounts_list_row(_("Default cash account").':', 'account'); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/sales/manage/sales_types.php b/sales/manage/sales_types.php index 1c4071bf..d7213335 100644 --- a/sales/manage/sales_types.php +++ b/sales/manage/sales_types.php @@ -165,7 +165,7 @@ check_row(_("Tax included").':', 'tax_included', $_POST['tax_included']); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php index 91f21c97..ac4d2f0a 100644 --- a/taxes/item_tax_types.php +++ b/taxes/item_tax_types.php @@ -199,7 +199,7 @@ if (!isset($_POST['exempt']) || $_POST['exempt'] == 0) end_table(1); } -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php index bc947284..f4d919b0 100644 --- a/taxes/tax_groups.php +++ b/taxes/tax_groups.php @@ -233,7 +233,7 @@ for ($i = 0; $i < 5; $i++) end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/taxes/tax_types.php b/taxes/tax_types.php index 6639e05a..b2eb2b9b 100644 --- a/taxes/tax_types.php +++ b/taxes/tax_types.php @@ -158,7 +158,7 @@ gl_all_accounts_list_row(_("Purchasing GL Account:"), 'purchasing_gl_code', null end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); -- 2.30.2