From d2cc0860eccf02eaefcd90731ac3af141a841529 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 29 Oct 2009 22:05:40 +0000 Subject: [PATCH] Changed context help organization to enable use of central, multilanguage wiki. --- admin/attachments.php | 2 +- admin/backups.php | 2 +- admin/change_current_user_password.php | 2 +- admin/company_preferences.php | 2 +- admin/create_coy.php | 2 +- admin/display_prefs.php | 2 +- admin/fiscalyears.php | 2 +- admin/forms_setup.php | 2 +- admin/gl_setup.php | 2 +- admin/inst_lang.php | 2 +- admin/inst_module.php | 2 +- admin/inst_upgrade.php | 2 +- admin/payment_terms.php | 2 +- admin/print_profiles.php | 2 +- admin/printers.php | 2 +- admin/security_roles.php | 2 +- admin/shipping_companies.php | 2 +- admin/tags.php | 4 +- admin/users.php | 2 +- admin/view_print_transaction.php | 2 +- admin/void_transaction.php | 2 +- applications/application.php | 1 + applications/customers.php | 2 +- applications/dimensions.php | 2 +- applications/generalledger.php | 2 +- applications/inventory.php | 2 +- applications/manufacturing.php | 2 +- applications/setup.php | 2 +- applications/suppliers.php | 2 +- dimensions/dimension_entry.php | 2 +- dimensions/inquiry/search_dimensions.php | 4 +- dimensions/view/view_dimension.php | 2 +- gl/bank_account_reconcile.php | 2 +- gl/bank_transfer.php | 2 +- gl/gl_bank.php | 4 +- gl/gl_budget.php | 2 +- gl/gl_journal.php | 4 +- gl/inquiry/bank_inquiry.php | 2 +- gl/inquiry/gl_account_inquiry.php | 2 +- gl/inquiry/gl_trial_balance.php | 2 +- gl/inquiry/journal_inquiry.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 | 2 +- gl/manage/gl_quick_entries.php | 2 +- gl/view/bank_transfer_view.php | 2 +- gl/view/gl_deposit_view.php | 2 +- gl/view/gl_payment_view.php | 2 +- gl/view/gl_trans_view.php | 2 +- includes/page/header.inc | 39 +++++++++++-------- inventory/adjustments.php | 2 +- inventory/cost_update.php | 2 +- inventory/inquiry/stock_movements.php | 2 +- inventory/inquiry/stock_status.php | 4 +- inventory/manage/item_categories.php | 2 +- inventory/manage/item_codes.php | 2 +- inventory/manage/item_units.php | 2 +- inventory/manage/items.php | 2 +- 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 +- inventory/view/view_adjustment.php | 2 +- inventory/view/view_transfer.php | 2 +- manufacturing/inquiry/bom_cost_inquiry.php | 2 +- manufacturing/inquiry/where_used_inquiry.php | 2 +- manufacturing/manage/bom_edit.php | 2 +- manufacturing/manage/work_centres.php | 2 +- manufacturing/search_work_orders.php | 4 +- manufacturing/view/wo_issue_view.php | 2 +- manufacturing/view/wo_production_view.php | 2 +- manufacturing/view/work_order_view.php | 2 +- manufacturing/work_order_add_finished.php | 2 +- manufacturing/work_order_costs.php | 2 +- manufacturing/work_order_entry.php | 2 +- manufacturing/work_order_issue.php | 2 +- manufacturing/work_order_release.php | 2 +- purchasing/allocations/supplier_allocate.php | 2 +- .../allocations/supplier_allocation_main.php | 2 +- purchasing/inquiry/po_search.php | 2 +- purchasing/inquiry/po_search_completed.php | 2 +- .../inquiry/supplier_allocation_inquiry.php | 2 +- purchasing/inquiry/supplier_inquiry.php | 2 +- purchasing/manage/suppliers.php | 2 +- purchasing/po_entry_items.php | 4 +- purchasing/po_receive_items.php | 2 +- purchasing/supplier_credit.php | 2 +- purchasing/supplier_invoice.php | 2 +- purchasing/supplier_payment.php | 2 +- purchasing/view/view_grn.php | 2 +- purchasing/view/view_po.php | 2 +- purchasing/view/view_supp_credit.php | 2 +- purchasing/view/view_supp_invoice.php | 2 +- purchasing/view/view_supp_payment.php | 2 +- reporting/reports_main.php | 2 +- sales/allocations/customer_allocate.php | 2 +- .../allocations/customer_allocation_main.php | 2 +- sales/create_recurrent_invoices.php | 2 +- sales/credit_note_entry.php | 4 +- sales/customer_credit_invoice.php | 4 +- sales/customer_delivery.php | 4 +- sales/customer_invoice.php | 6 +-- sales/customer_payments.php | 2 +- sales/inquiry/customer_allocation_inquiry.php | 2 +- sales/inquiry/customer_inquiry.php | 2 +- sales/inquiry/sales_deliveries_view.php | 4 +- sales/manage/credit_status.php | 2 +- sales/manage/customer_branches.php | 2 +- sales/manage/customers.php | 2 +- 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 +- sales/sales_order_entry.php | 14 +++---- sales/view/view_credit.php | 2 +- sales/view/view_dispatch.php | 2 +- sales/view/view_invoice.php | 2 +- sales/view/view_receipt.php | 2 +- sales/view/view_sales_order.php | 4 +- taxes/item_tax_types.php | 2 +- taxes/tax_groups.php | 2 +- taxes/tax_types.php | 2 +- themes/aqua/renderer.php | 4 +- themes/cool/renderer.php | 4 +- themes/default/renderer.php | 4 +- 134 files changed, 179 insertions(+), 171 deletions(-) diff --git a/admin/attachments.php b/admin/attachments.php index 3b39aa94..dafa3e02 100644 --- a/admin/attachments.php +++ b/admin/attachments.php @@ -68,7 +68,7 @@ if ($download_id != -1) $js = ""; if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("Attach Documents"), false, false, "", $js); +page(_($help_context = "Attach Documents"), false, false, "", $js); simple_page_mode(true); //---------------------------------------------------------------------------------------- diff --git a/admin/backups.php b/admin/backups.php index d501999d..3f45f522 100644 --- a/admin/backups.php +++ b/admin/backups.php @@ -34,7 +34,7 @@ if (get_post('download')) { exit; } -page(_("Backup and Restore Database"), false, false, '', ''); +page(_($help_context = "Backup and Restore Database"), false, false, '', ''); check_paths(); diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php index 9b205e19..bb7c9cb0 100644 --- a/admin/change_current_user_password.php +++ b/admin/change_current_user_password.php @@ -13,7 +13,7 @@ $page_security = 'SA_CHGPASSWD'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Change password")); +page(_($help_context = "Change password")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/admin/company_preferences.php b/admin/company_preferences.php index 66a11281..366fc852 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -13,7 +13,7 @@ $page_security = 'SA_SETUPCOMPANY'; $path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Company Setup")); +page(_($help_context = "Company Setup")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/admin/create_coy.php b/admin/create_coy.php index d1050f0e..e1b2882f 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -18,7 +18,7 @@ include_once($path_to_root . "/admin/db/company_db.inc"); include_once($path_to_root . "/admin/db/maintenance_db.inc"); include_once($path_to_root . "/includes/ui.inc"); -page(_("Create/Update Company")); +page(_($help_context = "Create/Update Company")); $comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting', 'attachments'); diff --git a/admin/display_prefs.php b/admin/display_prefs.php index b84c1da6..1de931eb 100644 --- a/admin/display_prefs.php +++ b/admin/display_prefs.php @@ -13,7 +13,7 @@ $page_security = 'SA_SETUPDISPLAY'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("Display Setup")); +page(_($help_context = "Display Setup")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php index 7a4b2a36..a974e4a2 100644 --- a/admin/fiscalyears.php +++ b/admin/fiscalyears.php @@ -21,7 +21,7 @@ include_once($path_to_root . "/admin/db/maintenance_db.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Fiscal Years"), false, false, "", $js); +page(_($help_context = "Fiscal Years"), false, false, "", $js); simple_page_mode(true); //--------------------------------------------------------------------------------------------- diff --git a/admin/forms_setup.php b/admin/forms_setup.php index 9a6be87a..f282b92d 100644 --- a/admin/forms_setup.php +++ b/admin/forms_setup.php @@ -13,7 +13,7 @@ $page_security = 'SA_FORMSETUP'; $path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Forms Setup")); +page(_($help_context = "Forms Setup")); include($path_to_root . "/includes/ui.inc"); diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 6aea5d3b..85f5b843 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -13,7 +13,7 @@ $page_security = 'SA_GLSETUP'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("System and General GL Setup")); +page(_($help_context = "System and General GL Setup")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/admin/inst_lang.php b/admin/inst_lang.php index 214a1dce..77fb8d09 100644 --- a/admin/inst_lang.php +++ b/admin/inst_lang.php @@ -13,7 +13,7 @@ $page_security = 'SA_CREATELANGUAGE'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Install/Update Languages")); +page(_($help_context = "Install/Update Languages")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/admin/db/company_db.inc"); diff --git a/admin/inst_module.php b/admin/inst_module.php index c85dd49a..067e83f0 100644 --- a/admin/inst_module.php +++ b/admin/inst_module.php @@ -13,7 +13,7 @@ $page_security = 'SA_CREATEMODULES'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Install/Activate extensions")); +page(_($help_context = "Install/Activate extensions")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/admin/db/company_db.inc"); diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php index aa0d2838..1d646af2 100644 --- a/admin/inst_upgrade.php +++ b/admin/inst_upgrade.php @@ -13,7 +13,7 @@ $page_security = 'SA_SOFTWAREUPGRADE'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Software Upgrade")); +page(_($help_context = "Software Upgrade")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/admin/db/company_db.inc"); diff --git a/admin/payment_terms.php b/admin/payment_terms.php index 5855b989..1e0f8c65 100644 --- a/admin/payment_terms.php +++ b/admin/payment_terms.php @@ -13,7 +13,7 @@ $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"); diff --git a/admin/print_profiles.php b/admin/print_profiles.php index 02e3701c..1df47c67 100644 --- a/admin/print_profiles.php +++ b/admin/print_profiles.php @@ -15,7 +15,7 @@ include($path_to_root . "/includes/session.inc"); include($path_to_root . "/admin/db/printers_db.inc"); include($path_to_root . "/includes/ui.inc"); -page(_("Printing Profiles")); +page(_($help_context = "Printing Profiles")); $selected_id = get_post('profile_id',''); diff --git a/admin/printers.php b/admin/printers.php index 4c8ad144..d46afeeb 100644 --- a/admin/printers.php +++ b/admin/printers.php @@ -13,7 +13,7 @@ $page_security = 'SA_PRINTERS'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("Printer Locations")); +page(_($help_context = "Printer Locations")); include($path_to_root . "/admin/db/printers_db.inc"); include($path_to_root . "/includes/ui.inc"); diff --git a/admin/security_roles.php b/admin/security_roles.php index 8ca8ce2d..bce6661f 100644 --- a/admin/security_roles.php +++ b/admin/security_roles.php @@ -15,7 +15,7 @@ include_once($path_to_root . "/includes/session.inc"); add_access_extensions(); -page(_("Access setup")); +page(_($help_context = "Access setup")); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/access_levels.inc"); diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php index cb08f69b..19f034b7 100644 --- a/admin/shipping_companies.php +++ b/admin/shipping_companies.php @@ -12,7 +12,7 @@ $page_security = 'SA_SHIPPING'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("Shipping Company")); +page(_($help_context = "Shipping Company")); include($path_to_root . "/includes/ui.inc"); simple_page_mode(true); diff --git a/admin/tags.php b/admin/tags.php index ff8cac51..761b0995 100644 --- a/admin/tags.php +++ b/admin/tags.php @@ -42,11 +42,11 @@ if (!isset($_POST['type'])) { switch ($_POST['type']) { case TAG_ACCOUNT: // Account tags - $_SESSION['page_title'] = _("Account Tags"); + $_SESSION['page_title'] = _($help_context = "Account Tags"); break; case TAG_DIMENSION: // Dimension tags - $_SESSION['page_title'] = _("Dimension Tags"); + $_SESSION['page_title'] = _($help_context = "Dimension Tags"); } page($_SESSION['page_title']); diff --git a/admin/users.php b/admin/users.php index e4446570..52058b29 100644 --- a/admin/users.php +++ b/admin/users.php @@ -13,7 +13,7 @@ $page_security = 'SA_USERS'; $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Users")); +page(_($help_context = "Users")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php index 39694181..b3e35f62 100644 --- a/admin/view_print_transaction.php +++ b/admin/view_print_transaction.php @@ -23,7 +23,7 @@ include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("View or Print Transactions"), false, false, "", $js); +page(_($help_context = "View or Print Transactions"), false, false, "", $js); //---------------------------------------------------------------------------------------- function view_link($trans) diff --git a/admin/void_transaction.php b/admin/void_transaction.php index 55c6a9f0..9fd0184b 100644 --- a/admin/void_transaction.php +++ b/admin/void_transaction.php @@ -24,7 +24,7 @@ if ($use_date_picker) if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("Void a Transaction"), false, false, "", $js); +page(_($help_context = "Void a Transaction"), false, false, "", $js); //---------------------------------------------------------------------------------------- function exist_transaction($type, $type_no) diff --git a/applications/application.php b/applications/application.php index 9220d143..cf8c7c39 100644 --- a/applications/application.php +++ b/applications/application.php @@ -93,6 +93,7 @@ { var $id; var $name; + var $help_context; var $modules; var $enabled; diff --git a/applications/customers.php b/applications/customers.php index 446760fc..1a385b9e 100644 --- a/applications/customers.php +++ b/applications/customers.php @@ -14,7 +14,7 @@ class customers_app extends application function customers_app() { global $installed_extensions; - $this->application("orders",_("&Sales")); + $this->application("orders", _($this->help_context = "&Sales")); $this->add_module(_("Transactions")); $this->add_lapp_function(0, _("Sales &Quotation Entry"), diff --git a/applications/dimensions.php b/applications/dimensions.php index 39ab0a36..bf46ef8d 100644 --- a/applications/dimensions.php +++ b/applications/dimensions.php @@ -15,7 +15,7 @@ class dimensions_app extends application { global $installed_extensions; $dim = get_company_pref('use_dimension'); - $this->application("proj",_("&Dimensions"), $dim); + $this->application("proj", _($this->help_context = "&Dimensions"), $dim); if ($dim > 0) { diff --git a/applications/generalledger.php b/applications/generalledger.php index 5a8a7612..f4e4bc92 100644 --- a/applications/generalledger.php +++ b/applications/generalledger.php @@ -14,7 +14,7 @@ class general_ledger_app extends application function general_ledger_app() { global $installed_extensions; - $this->application("GL",_("&Banking and General Ledger")); + $this->application("GL", _($this->help_context = "&Banking and General Ledger")); $this->add_module(_("Transactions")); $this->add_lapp_function(0, _("&Payments"), diff --git a/applications/inventory.php b/applications/inventory.php index 308c93b0..feb820ba 100644 --- a/applications/inventory.php +++ b/applications/inventory.php @@ -14,7 +14,7 @@ class inventory_app extends application function inventory_app() { global $installed_extensions; - $this->application("stock",_("&Items and Inventory")); + $this->application("stock", _($this->help_context = "&Items and Inventory")); $this->add_module(_("Transactions")); $this->add_lapp_function(0, _("Inventory Location &Transfers"), diff --git a/applications/manufacturing.php b/applications/manufacturing.php index 60650c69..6892ecc2 100644 --- a/applications/manufacturing.php +++ b/applications/manufacturing.php @@ -14,7 +14,7 @@ class manufacturing_app extends application function manufacturing_app() { global $installed_extensions; - $this->application("manuf",_("&Manufacturing")); + $this->application("manuf", _($this->help_context = "&Manufacturing")); $this->add_module(_("Transactions")); $this->add_lapp_function(0, _("Work &Order Entry"), diff --git a/applications/setup.php b/applications/setup.php index 21adb18f..ac392123 100644 --- a/applications/setup.php +++ b/applications/setup.php @@ -14,7 +14,7 @@ class setup_app extends application function setup_app() { global $installed_extensions; - $this->application("system",_("S&etup")); + $this->application("system", _($this->help_context = "S&etup")); $this->add_module(_("Company Setup")); $this->add_lapp_function(0, _("&Company Setup"), diff --git a/applications/suppliers.php b/applications/suppliers.php index 1e5c73e0..304c653c 100644 --- a/applications/suppliers.php +++ b/applications/suppliers.php @@ -14,7 +14,7 @@ class suppliers_app extends application function suppliers_app() { global $installed_extensions; - $this->application("AP",_("&Purchases")); + $this->application("AP", _($this->help_context = "&Purchases")); $this->add_module(_("Transactions")); $this->add_lapp_function(0, _("Purchase &Order Entry"), diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php index 5a5a8825..0777c2a3 100644 --- a/dimensions/dimension_entry.php +++ b/dimensions/dimension_entry.php @@ -24,7 +24,7 @@ include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Dimension Entry"), false, false, "", $js); +page(_($help_context = "Dimension Entry"), false, false, "", $js); //--------------------------------------------------------------------------------------- diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index 1c63c2fc..29b58efe 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -26,12 +26,12 @@ if ($use_date_picker) if (isset($_GET['outstanding_only']) && $_GET['outstanding_only']) { $outstanding_only = 1; - page(_("Search Outstanding Dimensions"), false, false, "", $js); + page(_($help_context = "Search Outstanding Dimensions"), false, false, "", $js); } else { $outstanding_only = 0; - page(_("Search Dimensions"), false, false, "", $js); + page(_($help_context = "Search Dimensions"), false, false, "", $js); } //----------------------------------------------------------------------------------- // Ajax updates diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php index bc0cdf5c..2fe54071 100644 --- a/dimensions/view/view_dimension.php +++ b/dimensions/view/view_dimension.php @@ -17,7 +17,7 @@ include_once($path_to_root . "/includes/session.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("View Dimension"), true, false, "", $js); +page(_($help_context = "View Dimension"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php index d1dbba01..2fca2b34 100644 --- a/gl/bank_account_reconcile.php +++ b/gl/bank_account_reconcile.php @@ -30,7 +30,7 @@ if ($use_date_picker) add_js_file('reconcile.js'); -page(_("Reconcile Bank Account"), false, false, "", $js); +page(_($help_context = "Reconcile Bank Account"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php index f971fc56..2256a4a0 100644 --- a/gl/bank_transfer.php +++ b/gl/bank_transfer.php @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Transfer between Bank Accounts"), false, false, "", $js); +page(_($help_context = "Transfer between Bank Accounts"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); diff --git a/gl/gl_bank.php b/gl/gl_bank.php index 0458b152..f0b007e0 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -30,11 +30,11 @@ if ($use_date_picker) $js .= get_js_date_picker(); if (isset($_GET['NewPayment'])) { - $_SESSION['page_title'] = _("Bank Account Payment Entry"); + $_SESSION['page_title'] = _($help_context = "Bank Account Payment Entry"); handle_new_order(ST_BANKPAYMENT); } else if(isset($_GET['NewDeposit'])) { - $_SESSION['page_title'] = _("Bank Account Deposit Entry"); + $_SESSION['page_title'] = _($help_context = "Bank Account Deposit Entry"); handle_new_order(ST_BANKDEPOSIT); } page($_SESSION['page_title'], false, false, '', $js); diff --git a/gl/gl_budget.php b/gl/gl_budget.php index c1236d18..2fc74cb4 100644 --- a/gl/gl_budget.php +++ b/gl/gl_budget.php @@ -15,7 +15,7 @@ include($path_to_root . "/includes/session.inc"); add_js_file('budget.js'); -page(_("Budget Entry")); +page(_($help_context = "Budget Entry")); include($path_to_root . "/includes/ui.inc"); include($path_to_root . "/gl/includes/gl_db.inc"); diff --git a/gl/gl_journal.php b/gl/gl_journal.php index 9cfc9332..bd7595f7 100644 --- a/gl/gl_journal.php +++ b/gl/gl_journal.php @@ -31,9 +31,9 @@ if ($use_date_picker) if (isset($_GET['ModifyGL'])) { $_SESSION['page_title'] = sprintf(_("Modifying Journal Transaction # %d."), $_GET['trans_no']); - $help_page_title =_("Modifying Journal Transaction"); + $help_context = "Modifying Journal Transaction"; } else - $_SESSION['page_title'] = _("Journal Entry"); + $_SESSION['page_title'] = _($help_context = "Journal Entry"); page($_SESSION['page_title'], false, false,'', $js); //-------------------------------------------------------------------------------------------------- diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index 33112d70..b9dcf28e 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Bank Statement"), false, false, "", $js); +page(_($help_context = "Bank Statement"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php index 3c415566..62fb64a2 100644 --- a/gl/inquiry/gl_account_inquiry.php +++ b/gl/inquiry/gl_account_inquiry.php @@ -27,7 +27,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("General Ledger Account Inquiry"), false, false, '', $js); +page(_($help_context = "General Ledger Account Inquiry"), false, false, '', $js); //---------------------------------------------------------------------------------------------------- // Ajax updates diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php index 895a2703..50ff2e3d 100644 --- a/gl/inquiry/gl_trial_balance.php +++ b/gl/inquiry/gl_trial_balance.php @@ -24,7 +24,7 @@ $js = ""; if ($use_date_picker) $js = get_js_date_picker(); -page(_("Trial Balance"), false, false, "", $js); +page(_($help_context = "Trial Balance"), false, false, "", $js); //---------------------------------------------------------------------------------------------------- // Ajax updates diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php index 04092b75..9f551e01 100644 --- a/gl/inquiry/journal_inquiry.php +++ b/gl/inquiry/journal_inquiry.php @@ -24,7 +24,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Journal Inquiry"), false, false, "", $js); +page(_($help_context = "Journal Inquiry"), false, false, "", $js); //----------------------------------------------------------------------------------- // Ajax updates diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php index 13f61d5a..394963ab 100644 --- a/gl/inquiry/tax_inquiry.php +++ b/gl/inquiry/tax_inquiry.php @@ -27,7 +27,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Tax Inquiry"), false, false, '', $js); +page(_($help_context = "Tax Inquiry"), false, false, '', $js); //---------------------------------------------------------------------------------------------------- // Ajax updates diff --git a/gl/manage/bank_accounts.php b/gl/manage/bank_accounts.php index 83d425f8..ae1dc41e 100644 --- a/gl/manage/bank_accounts.php +++ b/gl/manage/bank_accounts.php @@ -13,7 +13,7 @@ $page_security = 'SA_BANKACCOUNT'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Bank Accounts")); +page(_($help_context = "Bank Accounts")); include($path_to_root . "/includes/ui.inc"); diff --git a/gl/manage/currencies.php b/gl/manage/currencies.php index bb83098a..9bf6a9cd 100644 --- a/gl/manage/currencies.php +++ b/gl/manage/currencies.php @@ -13,7 +13,7 @@ $page_security = 'SA_CURRENCY'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Currencies")); +page(_($help_context = "Currencies")); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php index 0127b40b..5bc3b252 100644 --- a/gl/manage/exchange_rates.php +++ b/gl/manage/exchange_rates.php @@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/banking.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Exchange Rates"), false, false, "", $js); +page(_($help_context = "Exchange Rates"), false, false, "", $js); simple_page_mode(false); diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php index 70faccdb..bc141c37 100644 --- a/gl/manage/gl_account_classes.php +++ b/gl/manage/gl_account_classes.php @@ -13,7 +13,7 @@ $page_security = 'SA_GLACCOUNTCLASS'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("GL Account Classes")); +page(_($help_context = "GL Account Classes")); include($path_to_root . "/gl/includes/gl_db.inc"); diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php index 27141d53..ac3b32cf 100644 --- a/gl/manage/gl_account_types.php +++ b/gl/manage/gl_account_types.php @@ -13,7 +13,7 @@ $page_security = 'SA_GLACCOUNTGROUP'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("GL Account Groups")); +page(_($help_context = "GL Account Groups")); include($path_to_root . "/gl/includes/gl_db.inc"); diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index b5b6e648..e9efad86 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -13,7 +13,7 @@ $page_security = 'SA_GLACCOUNT'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Chart of Accounts")); +page(_($help_context = "Chart of Accounts")); include($path_to_root . "/includes/ui.inc"); include($path_to_root . "/gl/includes/gl_db.inc"); diff --git a/gl/manage/gl_quick_entries.php b/gl/manage/gl_quick_entries.php index 5a8804cb..f1f49536 100644 --- a/gl/manage/gl_quick_entries.php +++ b/gl/manage/gl_quick_entries.php @@ -13,7 +13,7 @@ $page_security = 'SA_QUICKENTRY'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Quick Entries")); +page(_($help_context = "Quick Entries")); include($path_to_root . "/gl/includes/gl_db.inc"); diff --git a/gl/view/bank_transfer_view.php b/gl/view/bank_transfer_view.php index 8eaeb41c..b56a331c 100644 --- a/gl/view/bank_transfer_view.php +++ b/gl/view/bank_transfer_view.php @@ -14,7 +14,7 @@ $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Transfer"), true); +page(_($help_context = "View Bank Transfer"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php index 04232dd7..034d98cc 100644 --- a/gl/view/gl_deposit_view.php +++ b/gl/view/gl_deposit_view.php @@ -14,7 +14,7 @@ $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Deposit"), true); +page(_($help_context = "View Bank Deposit"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php index e71e3dff..582f2930 100644 --- a/gl/view/gl_payment_view.php +++ b/gl/view/gl_payment_view.php @@ -14,7 +14,7 @@ $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Payment"), true); +page(_($help_context = "View Bank Payment"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php index 64e585a5..3c749094 100644 --- a/gl/view/gl_trans_view.php +++ b/gl/view/gl_trans_view.php @@ -13,7 +13,7 @@ $page_security = 'SA_GLTRANSVIEW'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("General Ledger Transaction Details"), true); +page(_($help_context = "General Ledger Transaction Details"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/includes/page/header.inc b/includes/page/header.inc index 65003be4..bb8fbd31 100644 --- a/includes/page/header.inc +++ b/includes/page/header.inc @@ -9,31 +9,38 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -function help_url($title, $app) +/* + If no context is set current page/menu screen is selected. +*/ +function help_url($context=null) { - global $help_page_url, $help_base_url, $applications, $help_page_title; + global $help_base_url, $help_context, $old_style_help; - if (isset($help_page_url)) + $country = $_SESSION['language']->code; + $clean = 0; + + if ($context!=null) { - return $help_base_url.$help_page_url; + $help_page_url = $context; } - - $help_page_url = ''; - if (isset($help_page_title)) + elseif (isset($help_context)) { - $help_page_url = $help_page_title; - } - elseif ($title==_("Main Menu")) + $help_page_url = $help_context; + } else // main menu { - $help_page_url = access_string($_SESSION['App']->applications[$app]->name, true); - } - else - { - $help_page_url = $title; + $app = $_SESSION['sel_app']; + $help_page_url = $_SESSION['App']->applications[$app]->help_context; + $clean = 1; } - return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url))); + if (@$old_style_help) + $help_page_url = _($help_page_url); + + if ($clean) + $help_page_url = access_string($help_page_url, true); + + return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url))).'&lang='.$country; } function send_scripts() diff --git a/inventory/adjustments.php b/inventory/adjustments.php index 3de3713f..20ac09d1 100644 --- a/inventory/adjustments.php +++ b/inventory/adjustments.php @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Item Adjustments Note"), false, false, "", $js); +page(_($help_context = "Item Adjustments Note"), false, false, "", $js); //----------------------------------------------------------------------------------------------- diff --git a/inventory/cost_update.php b/inventory/cost_update.php index e268f360..1c05c3bb 100644 --- a/inventory/cost_update.php +++ b/inventory/cost_update.php @@ -23,7 +23,7 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("Inventory Item Cost Update"), false, false, "", $js); +page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js); //-------------------------------------------------------------------------------------- diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php index 75837a11..61388dd1 100644 --- a/inventory/inquiry/stock_movements.php +++ b/inventory/inquiry/stock_movements.php @@ -24,7 +24,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Inventory Item Movement"), false, false, "", $js); +page(_($help_context = "Inventory Item Movement"), false, false, "", $js); //------------------------------------------------------------------------------------------------ check_db_has_stock_items(_("There are no items defined in the system.")); diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php index cd468744..ee0e5871 100644 --- a/inventory/inquiry/stock_status.php +++ b/inventory/inquiry/stock_status.php @@ -15,9 +15,9 @@ include_once($path_to_root . "/includes/session.inc"); if (isset($_GET['stock_id'])){ $_POST['stock_id'] = $_GET['stock_id']; - page(_("Inventory Item Status"), true); + page(_($help_context = "Inventory Item Status"), true); } else { - page(_("Inventory Item Status")); + page(_($help_context = "Inventory Item Status")); } include_once($path_to_root . "/includes/date_functions.inc"); diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php index 233d034b..a12f56ff 100644 --- a/inventory/manage/item_categories.php +++ b/inventory/manage/item_categories.php @@ -13,7 +13,7 @@ $page_security = 'SA_ITEMCATEGORY'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Item Categories")); +page(_($help_context = "Item Categories")); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/manage/item_codes.php b/inventory/manage/item_codes.php index cde34f0f..af88a520 100644 --- a/inventory/manage/item_codes.php +++ b/inventory/manage/item_codes.php @@ -13,7 +13,7 @@ $page_security = 'SA_FORITEMCODE'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Foreign Item Codes")); +page(_($help_context = "Foreign Item Codes")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php index a17ac69f..9a23f645 100644 --- a/inventory/manage/item_units.php +++ b/inventory/manage/item_units.php @@ -13,7 +13,7 @@ $page_security = 'SA_UOM'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Units of Measure")); +page(_($help_context = "Units of Measure")); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 9356e0b1..0fadbe52 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -13,7 +13,7 @@ $page_security = 'SA_ITEM'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Items"), @$_REQUEST['popup']); +page(_($help_context = "Items"), @$_REQUEST['popup']); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/manage/locations.php b/inventory/manage/locations.php index d32d10a1..6dae2fa3 100644 --- a/inventory/manage/locations.php +++ b/inventory/manage/locations.php @@ -13,7 +13,7 @@ $page_security = 'SA_INVENTORYLOCATION'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Inventory Locations")); +page(_($help_context = "Inventory Locations")); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php index 60b8e83e..259f6dce 100644 --- a/inventory/manage/movement_types.php +++ b/inventory/manage/movement_types.php @@ -13,7 +13,7 @@ $page_security = 'SA_INVENTORYMOVETYPE'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Inventory Movement Types")); +page(_($help_context = "Inventory Movement Types")); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php index 09cb731a..30fcc48a 100644 --- a/inventory/manage/sales_kits.php +++ b/inventory/manage/sales_kits.php @@ -13,7 +13,7 @@ $page_security = 'SA_SALESKIT'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Sales Kits & Alias Codes")); +page(_($help_context = "Sales Kits & Alias Codes")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/prices.php b/inventory/prices.php index d6e75adc..70bec34e 100644 --- a/inventory/prices.php +++ b/inventory/prices.php @@ -13,7 +13,7 @@ $page_security = 'SA_SALESPRICE'; $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Inventory Item Sales prices")); +page(_($help_context = "Inventory Item Sales prices")); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_types_db.inc"); diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php index de9ed65e..1970481a 100644 --- a/inventory/purchasing_data.php +++ b/inventory/purchasing_data.php @@ -13,7 +13,7 @@ $page_security = 'SA_PURCHASEPRICING'; $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Supplier Purchasing Data")); +page(_($help_context = "Supplier Purchasing Data")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php index 7af7329e..49f5f5ca 100644 --- a/inventory/reorder_level.php +++ b/inventory/reorder_level.php @@ -13,7 +13,7 @@ $page_security = 'SA_REORDER'; $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Reorder Levels")); +page(_($help_context = "Reorder Levels")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/transfers.php b/inventory/transfers.php index e8e995a8..49e66e5e 100644 --- a/inventory/transfers.php +++ b/inventory/transfers.php @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Inventory Location Transfers"), false, false, "", $js); +page(_($help_context = "Inventory Location Transfers"), false, false, "", $js); //----------------------------------------------------------------------------------------------- diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php index 1db79269..6bc50764 100644 --- a/inventory/view/view_adjustment.php +++ b/inventory/view/view_adjustment.php @@ -14,7 +14,7 @@ $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Inventory Adjustment"), true); +page(_($help_context = "View Inventory Adjustment"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/inventory/view/view_transfer.php b/inventory/view/view_transfer.php index 85c0ae85..195f91bc 100644 --- a/inventory/view/view_transfer.php +++ b/inventory/view/view_transfer.php @@ -14,7 +14,7 @@ $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Inventory Transfer"), true); +page(_($help_context = "View Inventory Transfer"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/manufacturing/inquiry/bom_cost_inquiry.php b/manufacturing/inquiry/bom_cost_inquiry.php index 0552049d..9b311a7d 100644 --- a/manufacturing/inquiry/bom_cost_inquiry.php +++ b/manufacturing/inquiry/bom_cost_inquiry.php @@ -13,7 +13,7 @@ $page_security = 'SA_WORKORDERCOST'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Costed Bill Of Material Inquiry")); +page(_($help_context = "Costed Bill Of Material Inquiry")); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); diff --git a/manufacturing/inquiry/where_used_inquiry.php b/manufacturing/inquiry/where_used_inquiry.php index c10dc2a7..016c336f 100644 --- a/manufacturing/inquiry/where_used_inquiry.php +++ b/manufacturing/inquiry/where_used_inquiry.php @@ -14,7 +14,7 @@ $path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); -page(_("Inventory Item Where Used Inquiry")); +page(_($help_context = "Inventory Item Where Used Inquiry")); include($path_to_root . "/includes/ui.inc"); diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index fe373a1c..dc89783a 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -13,7 +13,7 @@ $page_security = 'SA_BOM'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Bill Of Materials")); +page(_($help_context = "Bill Of Materials")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php index 716bb818..03014572 100644 --- a/manufacturing/manage/work_centres.php +++ b/manufacturing/manage/work_centres.php @@ -13,7 +13,7 @@ $page_security = 'SA_WORKCENTRES'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Work Centres")); +page(_($help_context = "Work Centres")); include($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php index a088786c..3fdbf1df 100644 --- a/manufacturing/search_work_orders.php +++ b/manufacturing/search_work_orders.php @@ -23,12 +23,12 @@ if (isset($_GET['outstanding_only']) && ($_GET['outstanding_only'] == true)) { // curently outstanding simply means not closed $outstanding_only = 1; - page(_("Search Outstanding Work Orders"), false, false, "", $js); + page(_($help_context = "Search Outstanding Work Orders"), false, false, "", $js); } else { $outstanding_only = 0; - page(_("Search Work Orders"), false, false, "", $js); + page(_($help_context = "Search Work Orders"), false, false, "", $js); } //----------------------------------------------------------------------------------- // Ajax updates diff --git a/manufacturing/view/wo_issue_view.php b/manufacturing/view/wo_issue_view.php index 9f0a8d7e..d8cda6eb 100644 --- a/manufacturing/view/wo_issue_view.php +++ b/manufacturing/view/wo_issue_view.php @@ -16,7 +16,7 @@ include_once($path_to_root . "/includes/session.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Work Order Issue"), true, false, "", $js); +page(_($help_context = "View Work Order Issue"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); diff --git a/manufacturing/view/wo_production_view.php b/manufacturing/view/wo_production_view.php index ae486646..3017ac31 100644 --- a/manufacturing/view/wo_production_view.php +++ b/manufacturing/view/wo_production_view.php @@ -17,7 +17,7 @@ include_once($path_to_root . "/includes/session.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Work Order Production"), true, false, "", $js); +page(_($help_context = "View Work Order Production"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php index 62b3df66..61dfbf3c 100644 --- a/manufacturing/view/work_order_view.php +++ b/manufacturing/view/work_order_view.php @@ -23,7 +23,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("View Work Order"), true, false, "", $js); +page(_($help_context = "View Work Order"), true, false, "", $js); //------------------------------------------------------------------------------------------------- $woid = 0; diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php index c61f19bb..a5e03ecb 100644 --- a/manufacturing/work_order_add_finished.php +++ b/manufacturing/work_order_add_finished.php @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Produce or Unassemble Finished Items From Work Order"), false, false, "", $js); +page(_($help_context = "Produce or Unassemble Finished Items From Work Order"), false, false, "", $js); if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") { diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php index 7ce5e811..4e7f0537 100644 --- a/manufacturing/work_order_costs.php +++ b/manufacturing/work_order_costs.php @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Work Order Additional Costs"), false, false, "", $js); +page(_($help_context = "Work Order Additional Costs"), false, false, "", $js); if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") { diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index 7e06ea45..d6bea933 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Work Order Entry"), false, false, "", $js); +page(_($help_context = "Work Order Entry"), false, false, "", $js); check_db_has_manufacturable_items(_("There are no manufacturable items defined in the system.")); diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php index e0349bb8..1b129f35 100644 --- a/manufacturing/work_order_issue.php +++ b/manufacturing/work_order_issue.php @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Issue Items to Work Order"), false, false, "", $js); +page(_($help_context = "Issue Items to Work Order"), false, false, "", $js); //----------------------------------------------------------------------------------------------- diff --git a/manufacturing/work_order_release.php b/manufacturing/work_order_release.php index eee4ed95..0d58b749 100644 --- a/manufacturing/work_order_release.php +++ b/manufacturing/work_order_release.php @@ -24,7 +24,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Work Order Release to Manufacturing"), false, false, "", $js); +page(_($help_context = "Work Order Release to Manufacturing"), false, false, "", $js); if (isset($_GET["trans_no"])) { diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php index 1e9e418d..5f77c152 100644 --- a/purchasing/allocations/supplier_allocate.php +++ b/purchasing/allocations/supplier_allocate.php @@ -26,7 +26,7 @@ if ($use_popup_windows) add_js_file('allocate.js'); -page(_("Allocate Supplier Payment or Credit Note"), false, false, "", $js); +page(_($help_context = "Allocate Supplier Payment or Credit Note"), false, false, "", $js); //-------------------------------------------------------------------------------- diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index a3b04a53..a1456594 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -23,7 +23,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("Supplier Allocations"), false, false, "", $js); +page(_($help_context = "Supplier Allocations"), false, false, "", $js); //-------------------------------------------------------------------------------- diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php index a455e56c..b43a99ff 100644 --- a/purchasing/inquiry/po_search.php +++ b/purchasing/inquiry/po_search.php @@ -22,7 +22,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Search Outstanding Purchase Orders"), false, false, "", $js); +page(_($help_context = "Search Outstanding Purchase Orders"), false, false, "", $js); if (isset($_GET['order_number'])) { diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index a7672f99..1632f5b4 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -21,7 +21,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Search Purchase Orders"), false, false, "", $js); +page(_($help_context = "Search Purchase Orders"), false, false, "", $js); if (isset($_GET['order_number'])) { diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 2f80b49c..850dfc30 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -20,7 +20,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Allocation Inquiry"), false, false, "", $js); +page(_($help_context = "Supplier Allocation Inquiry"), false, false, "", $js); if (isset($_GET['supplier_id'])) { diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 3a785659..264b5518 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -21,7 +21,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Inquiry"), false, false, "", $js); +page(_($help_context = "Supplier Inquiry"), false, false, "", $js); if (isset($_GET['supplier_id'])){ $_POST['supplier_id'] = $_GET['supplier_id']; diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index bfed5d6c..0c94f251 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -13,7 +13,7 @@ $page_security = 'SA_SUPPLIER'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Suppliers"), @$_REQUEST['popup']); +page(_($help_context = "Suppliers"), @$_REQUEST['popup']); //include($path_to_root . "/includes/date_functions.inc"); diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index 2f903ba1..988c90fa 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -24,11 +24,11 @@ if ($use_date_picker) if (isset($_GET['ModifyOrderNumber'])) { - page(_("Modify Purchase Order #") . $_GET['ModifyOrderNumber'], false, false, "", $js); + page(_($help_context = "Modify Purchase Order #") . $_GET['ModifyOrderNumber'], false, false, "", $js); } else { - page(_("Purchase Order Entry"), false, false, "", $js); + page(_($help_context = "Purchase Order Entry"), false, false, "", $js); } //--------------------------------------------------------------------------------------------------- diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php index 1c6e6d62..bfb8371c 100644 --- a/purchasing/po_receive_items.php +++ b/purchasing/po_receive_items.php @@ -22,7 +22,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Receive Purchase Order Items"), false, false, "", $js); +page(_($help_context = "Receive Purchase Order Items"), false, false, "", $js); //--------------------------------------------------------------------------------------------------------------- diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index c20abbcd..1a8d63e9 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Credit Note"), false, false, "", $js); +page(_($help_context = "Supplier Credit Note"), false, false, "", $js); //---------------------------------------------------------------------------------------- diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index afa2df18..34406781 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Enter Supplier Invoice"), false, false, "", $js); +page(_($help_context = "Enter Supplier Invoice"), false, false, "", $js); //---------------------------------------------------------------------------------------- diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index ce217913..68ed1c8f 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -28,7 +28,7 @@ if ($use_date_picker) add_js_file('payalloc.js'); -page(_("Supplier Payment Entry"), false, false, "", $js); +page(_($help_context = "Supplier Payment Entry"), false, false, "", $js); if (isset($_GET['supplier_id'])) { diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php index 0a94ac8c..71b5d120 100644 --- a/purchasing/view/view_grn.php +++ b/purchasing/view/view_grn.php @@ -18,7 +18,7 @@ include($path_to_root . "/includes/session.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Purchase Order Delivery"), true, false, "", $js); +page(_($help_context = "View Purchase Order Delivery"), true, false, "", $js); include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php index 052103de..ce2df934 100644 --- a/purchasing/view/view_po.php +++ b/purchasing/view/view_po.php @@ -19,7 +19,7 @@ include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Purchase Order"), true, false, "", $js); +page(_($help_context = "View Purchase Order"), true, false, "", $js); if (!isset($_GET['trans_no'])) diff --git a/purchasing/view/view_supp_credit.php b/purchasing/view/view_supp_credit.php index 79e6e5b9..c0d921ec 100644 --- a/purchasing/view/view_supp_credit.php +++ b/purchasing/view/view_supp_credit.php @@ -20,7 +20,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Supplier Credit Note"), true, false, "", $js); +page(_($help_context = "View Supplier Credit Note"), true, false, "", $js); if (isset($_GET["trans_no"])) { diff --git a/purchasing/view/view_supp_invoice.php b/purchasing/view/view_supp_invoice.php index bbab14eb..ae97355f 100644 --- a/purchasing/view/view_supp_invoice.php +++ b/purchasing/view/view_supp_invoice.php @@ -20,7 +20,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Supplier Invoice"), true, false, "", $js); +page(_($help_context = "View Supplier Invoice"), true, false, "", $js); if (isset($_GET["trans_no"])) { diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php index 554b3445..34fa9576 100644 --- a/purchasing/view/view_supp_payment.php +++ b/purchasing/view/view_supp_payment.php @@ -19,7 +19,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Payment to Supplier"), true, false, "", $js); +page(_($help_context = "View Payment to Supplier"), true, false, "", $js); if (isset($_GET["trans_no"])) { diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 75beda95..8babc61a 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -20,7 +20,7 @@ include_once($path_to_root . "/reporting/includes/reports_classes.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Reports and Analysis"), false, false, "", $js); +page(_($help_context = "Reports and Analysis"), false, false, "", $js); $reports = new BoxReports; diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php index 6b0357e0..058605c6 100644 --- a/sales/allocations/customer_allocate.php +++ b/sales/allocations/customer_allocate.php @@ -25,7 +25,7 @@ if ($use_popup_windows) add_js_file('allocate.js'); -page(_("Allocate Customer Payment or Credit Note"), false, false, "", $js); +page(_($help_context = "Allocate Customer Payment or Credit Note"), false, false, "", $js); //-------------------------------------------------------------------------------- diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php index edccecfa..309bba50 100644 --- a/sales/allocations/customer_allocation_main.php +++ b/sales/allocations/customer_allocation_main.php @@ -19,7 +19,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("Customer Allocations"), false, false, "", $js); +page(_($help_context = "Customer Allocations"), false, false, "", $js); //-------------------------------------------------------------------------------- diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php index 492d8482..dafc08ac 100644 --- a/sales/create_recurrent_invoices.php +++ b/sales/create_recurrent_invoices.php @@ -21,7 +21,7 @@ $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 600); -page(_("Create and Print Recurrent Invoices"), false, false, "", $js); +page(_($help_context = "Create and Print Recurrent Invoices"), false, false, "", $js); function set_last_sent($id, $date) { diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index 5d2ebb8d..7723936c 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -34,12 +34,12 @@ if ($use_date_picker) { } if(isset($_GET['NewCredit'])) { - $_SESSION['page_title'] = _("Customer Credit Note"); + $_SESSION['page_title'] = _($help_context = "Customer Credit Note"); handle_new_credit(0); } elseif (isset($_GET['ModifyCredit'])) { $_SESSION['page_title'] = sprintf(_("Modifying Customer Credit Note #%d"), $_GET['ModifyCredit']); handle_new_credit($_GET['ModifyCredit']); - $help_page_title = _("Modifying Customer Credit Note"); + $help_context = "Modifying Customer Credit Note"; } page($_SESSION['page_title'],false, false, "", $js); diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index 5c62eba6..77ef7336 100644 --- a/sales/customer_credit_invoice.php +++ b/sales/customer_credit_invoice.php @@ -36,10 +36,10 @@ if ($use_date_picker) { if (isset($_GET['ModifyCredit'])) { $_SESSION['page_title'] = sprintf(_("Modifying Credit Invoice # %d."), $_GET['ModifyCredit']); - $help_page_title =_("Modifying Credit Invoice"); + $help_context = "Modifying Credit Invoice"; processing_start(); } elseif (isset($_GET['InvoiceNumber'])) { - $_SESSION['page_title'] = _("Credit all or part of an Invoice"); + $_SESSION['page_title'] = _($help_context = "Credit all or part of an Invoice"); processing_start(); } page($_SESSION['page_title'], false, false, "", $js); diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 26bd6eec..2049c49e 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -35,10 +35,10 @@ if ($use_date_picker) { if (isset($_GET['ModifyDelivery'])) { $_SESSION['page_title'] = sprintf(_("Modifying Delivery Note # %d."), $_GET['ModifyDelivery']); - $help_page_title = _("Modifying Delivery Note"); + $help_context = "Modifying Delivery Note"; processing_start(); } elseif (isset($_GET['OrderNumber'])) { - $_SESSION['page_title'] = _("Deliver Items for a Sales Order"); + $_SESSION['page_title'] = _($help_context = "Deliver Items for a Sales Order"); processing_start(); } diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index acf30137..d9196b37 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -35,11 +35,11 @@ if ($use_date_picker) { if (isset($_GET['ModifyInvoice'])) { $_SESSION['page_title'] = sprintf(_("Modifying Sales Invoice # %d.") ,$_GET['ModifyInvoice']); - $help_page_title = _("Modifying Sales Invoice"); + $help_context = "Modifying Sales Invoice"; } elseif (isset($_GET['DeliveryNumber'])) { - $_SESSION['page_title'] = _("Issue an Invoice for Delivery Note"); + $_SESSION['page_title'] = _($help_context = "Issue an Invoice for Delivery Note"); } elseif (isset($_GET['BatchInvoice'])) { - $_SESSION['page_title'] = _("Issue Batch Invoice for Delivery Notes"); + $_SESSION['page_title'] = _($help_context = "Issue Batch Invoice for Delivery Notes"); } page($_SESSION['page_title'], false, false, "", $js); diff --git a/sales/customer_payments.php b/sales/customer_payments.php index a01bd289..7170d4fd 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -29,7 +29,7 @@ if ($use_date_picker) { } add_js_file('payalloc.js'); -page(_("Customer Payment Entry"), false, false, "", $js); +page(_($help_context = "Customer Payment Entry"), false, false, "", $js); //---------------------------------------------------------------------------------------------- diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index badd4b18..bbf82460 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -22,7 +22,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Customer Allocation Inquiry"), false, false, "", $js); +page(_($help_context = "Customer Allocation Inquiry"), false, false, "", $js); if (isset($_GET['customer_id'])) { diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 9d397b94..b2764d46 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -23,7 +23,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Customer Transactions"), false, false, "", $js); +page(_($help_context = "Customer Transactions"), false, false, "", $js); if (isset($_GET['customer_id'])) diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index aaa3421f..e65602bf 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -26,12 +26,12 @@ if ($use_date_picker) if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true)) { $_POST['OutstandingOnly'] = true; - page(_("Search Not Invoiced Deliveries"), false, false, "", $js); + page(_($help_context = "Search Not Invoiced Deliveries"), false, false, "", $js); } else { $_POST['OutstandingOnly'] = false; - page(_("Search All Deliveries"), false, false, "", $js); + page(_($help_context = "Search All Deliveries"), false, false, "", $js); } if (isset($_GET['selected_customer'])) diff --git a/sales/manage/credit_status.php b/sales/manage/credit_status.php index 8bc3683c..aed0b1ff 100644 --- a/sales/manage/credit_status.php +++ b/sales/manage/credit_status.php @@ -13,7 +13,7 @@ $page_security = 'SA_CRSTATUS'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Credit Status")); +page(_($help_context = "Credit Status")); include($path_to_root . "/sales/includes/db/credit_status_db.inc"); diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php index 849ac557..6897178b 100644 --- a/sales/manage/customer_branches.php +++ b/sales/manage/customer_branches.php @@ -15,7 +15,7 @@ $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); -page(_("Customer Branches"), @$_REQUEST['popup']); +page(_($help_context = "Customer Branches"), @$_REQUEST['popup']); include($path_to_root . "/includes/ui.inc"); diff --git a/sales/manage/customers.php b/sales/manage/customers.php index 3b967e88..dd264683 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -13,7 +13,7 @@ $page_security = 'SA_CUSTOMER'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Customers"), @$_REQUEST['popup']); +page(_($help_context = "Customers"), @$_REQUEST['popup']); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/banking.inc"); diff --git a/sales/manage/recurrent_invoices.php b/sales/manage/recurrent_invoices.php index a1b0bdec..f646ff2a 100644 --- a/sales/manage/recurrent_invoices.php +++ b/sales/manage/recurrent_invoices.php @@ -20,7 +20,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Recurrent Invoices"), false, false, "", $js); +page(_($help_context = "Recurrent Invoices"), false, false, "", $js); simple_page_mode(true); diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php index 64f043fc..8bb0ffd1 100644 --- a/sales/manage/sales_areas.php +++ b/sales/manage/sales_areas.php @@ -13,7 +13,7 @@ $page_security = 'SA_SALESAREA'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Sales Areas")); +page(_($help_context = "Sales Areas")); include($path_to_root . "/includes/ui.inc"); diff --git a/sales/manage/sales_groups.php b/sales/manage/sales_groups.php index 0a922d4c..2ee95bad 100644 --- a/sales/manage/sales_groups.php +++ b/sales/manage/sales_groups.php @@ -13,7 +13,7 @@ $page_security = 'SA_SALESGROUP'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Sales Groups")); +page(_($help_context = "Sales Groups")); include($path_to_root . "/includes/ui.inc"); diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php index 30e4c556..1c398b61 100644 --- a/sales/manage/sales_people.php +++ b/sales/manage/sales_people.php @@ -13,7 +13,7 @@ $page_security = 'SA_SALESMAN'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Sales Persons")); +page(_($help_context = "Sales Persons")); include($path_to_root . "/includes/ui.inc"); diff --git a/sales/manage/sales_points.php b/sales/manage/sales_points.php index c76196e5..915911c3 100644 --- a/sales/manage/sales_points.php +++ b/sales/manage/sales_points.php @@ -13,7 +13,7 @@ $page_security = 'SA_POSSETUP'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("POS settings")); +page(_($help_context = "POS settings")); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/sales/includes/db/sales_points_db.inc"); diff --git a/sales/manage/sales_types.php b/sales/manage/sales_types.php index 4d9d1f08..7ebd7685 100644 --- a/sales/manage/sales_types.php +++ b/sales/manage/sales_types.php @@ -13,7 +13,7 @@ $page_security = 'SA_SALESTYPES'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Sales Types")); +page(_($help_context = "Sales Types")); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/sales/includes/db/sales_types_db.inc"); diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index cd9e48b2..3dcebf03 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -53,36 +53,36 @@ if ($use_date_picker) { if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { - $_SESSION['page_title'] = _("Direct Sales Delivery"); + $_SESSION['page_title'] = _($help_context = "Direct Sales Delivery"); create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']); } elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) { - $_SESSION['page_title'] = _("Direct Sales Invoice"); + $_SESSION['page_title'] = _($help_context = "Direct Sales Invoice"); create_cart(ST_SALESINVOICE, $_GET['NewInvoice']); } elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) { - $help_page_title = _('Modifying Sales Order'); + $help_context = 'Modifying Sales Order'; $_SESSION['page_title'] = sprintf( _("Modifying Sales Order # %d"), $_GET['ModifyOrderNumber']); create_cart(ST_SALESORDER, $_GET['ModifyOrderNumber']); } elseif (isset($_GET['ModifyQuotationNumber']) && is_numeric($_GET['ModifyQuotationNumber'])) { - $help_page_title = _('Modifying Sales Quotation'); + $help_context = 'Modifying Sales Quotation'; $_SESSION['page_title'] = sprintf( _("Modifying Sales Quotation # %d"), $_GET['ModifyQuotationNumber']); create_cart(ST_SALESQUOTE, $_GET['ModifyQuotationNumber']); } elseif (isset($_GET['NewOrder'])) { - $_SESSION['page_title'] = _("New Sales Order Entry"); + $_SESSION['page_title'] = _($help_context = "New Sales Order Entry"); create_cart(ST_SALESORDER, 0); } elseif (isset($_GET['NewQuotation'])) { - $_SESSION['page_title'] = _("New Sales Quotation Entry"); + $_SESSION['page_title'] = _($help_context = "New Sales Quotation Entry"); create_cart(ST_SALESQUOTE, 0); } elseif (isset($_GET['NewQuoteToSalesOrder'])) { - $_SESSION['page_title'] = _("Sales Order Entry"); + $_SESSION['page_title'] = _($help_context = "Sales Order Entry"); create_cart(ST_SALESQUOTE, $_GET['NewQuoteToSalesOrder']); } diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php index e1e51aa2..0ca3c7f9 100644 --- a/sales/view/view_credit.php +++ b/sales/view/view_credit.php @@ -21,7 +21,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Credit Note"), true, false, "", $js); +page(_($help_context = "View Credit Note"), true, false, "", $js); if (isset($_GET["trans_no"])) { diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php index dac9f7dd..a5a14813 100644 --- a/sales/view/view_dispatch.php +++ b/sales/view/view_dispatch.php @@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 600); -page(_("View Sales Dispatch"), true, false, "", $js); +page(_($help_context = "View Sales Dispatch"), true, false, "", $js); if (isset($_GET["trans_no"])) diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php index 6a13b1ae..c93a794c 100644 --- a/sales/view/view_invoice.php +++ b/sales/view/view_invoice.php @@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 600); -page(_("View Sales Invoice"), true, false, "", $js); +page(_($help_context = "View Sales Invoice"), true, false, "", $js); if (isset($_GET["trans_no"])) diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php index b2dd53ba..8153b3ff 100644 --- a/sales/view/view_receipt.php +++ b/sales/view/view_receipt.php @@ -21,7 +21,7 @@ $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 600); -page(_("View Customer Payment"), true, false, "", $js); +page(_($help_context = "View Customer Payment"), true, false, "", $js); if (isset($_GET["trans_no"])) { diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php index 8120332b..4529e1d4 100644 --- a/sales/view/view_sales_order.php +++ b/sales/view/view_sales_order.php @@ -25,12 +25,12 @@ if ($use_popup_windows) if ($_GET['trans_type'] == ST_SALESQUOTE) { - page(_("View Sales Quotation"), true, false, "", $js); + page(_($help_context = "View Sales Quotation"), true, false, "", $js); display_heading(sprintf(_("Sales Quotation #%d"),$_GET['trans_no'])); } else { - page(_("View Sales Order"), true, false, "", $js); + page(_($help_context = "View Sales Order"), true, false, "", $js); display_heading(sprintf(_("Sales Order #%d"),$_GET['trans_no'])); } diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php index e6c1b104..f1414efc 100644 --- a/taxes/item_tax_types.php +++ b/taxes/item_tax_types.php @@ -14,7 +14,7 @@ $path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Item Tax Types")); +page(_($help_context = "Item Tax Types")); include_once($path_to_root . "/taxes/db/item_tax_types_db.inc"); include_once($path_to_root . "/taxes/db/tax_types_db.inc"); diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php index ea61fd34..be683482 100644 --- a/taxes/tax_groups.php +++ b/taxes/tax_groups.php @@ -14,7 +14,7 @@ $path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Tax Groups")); +page(_($help_context = "Tax Groups")); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/taxes/tax_types.php b/taxes/tax_types.php index ca2f866f..c7669183 100644 --- a/taxes/tax_types.php +++ b/taxes/tax_types.php @@ -13,7 +13,7 @@ $page_security = 'SA_TAXRATES'; $path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Tax Types")); +page(_($help_context = "Tax Types")); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/taxes/db/tax_types_db.inc"); diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php index 415a5009..5c3f5310 100644 --- a/themes/aqua/renderer.php +++ b/themes/aqua/renderer.php @@ -13,7 +13,7 @@ { function wa_header() { - page(_("Main Menu"), false, true); + page(_($help_context = "Main Menu"), false, true); } function wa_footer() @@ -67,7 +67,7 @@ if ($help_base_url != null) { - echo "$himg" . _("Help") . "   "; + echo "$himg" . _("Help") . "   "; } echo "$img" . _("Logout") . "   "; echo ""; diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php index 178fb7e1..cd959edc 100644 --- a/themes/cool/renderer.php +++ b/themes/cool/renderer.php @@ -13,7 +13,7 @@ { function wa_header() { - page(_("Main Menu"), false, true); + page(_($help_context = "Main Menu"), false, true); } function wa_footer() @@ -67,7 +67,7 @@ if ($help_base_url != null) { - echo "$himg" . _("Help") . "   "; + echo "$himg" . _("Help") . "   "; } echo "$img" . _("Logout") . "   "; echo ""; diff --git a/themes/default/renderer.php b/themes/default/renderer.php index e7ec0c86..5ba820da 100644 --- a/themes/default/renderer.php +++ b/themes/default/renderer.php @@ -14,7 +14,7 @@ function wa_header() { // add_js_ufile("themes/default/renderer.js"); - page(_("Main Menu"), false, true); + page(_($help_context = "Main Menu"), false, true); } function wa_footer() @@ -68,7 +68,7 @@ if ($help_base_url != null) { - echo "$himg" . _("Help") . "   "; + echo "$himg" . _("Help") . "   "; } echo "$img" . _("Logout") . "   "; echo ""; -- 2.30.2