From: Janusz Dobrowolski Date: Thu, 27 Mar 2008 10:49:25 +0000 (+0000) Subject: Javascript recalcAccount superseded by 'combo' class behaviour binding X-Git-Tag: v2.4.2~19^2~2137 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=dd1a21a371699b6f894d21c6950b668cda0f7b29;p=fa-stable.git Javascript recalcAccount superseded by 'combo' class behaviour binding --- diff --git a/gl/gl_deposit.php b/gl/gl_deposit.php index a4b5f173..a64a5b45 100644 --- a/gl/gl_deposit.php +++ b/gl/gl_deposit.php @@ -12,13 +12,13 @@ include_once($path_to_root . "/gl/includes/ui/gl_deposit_ui.inc"); include_once($path_to_root . "/gl/includes/gl_db.inc"); include_once($path_to_root . "/gl/includes/gl_ui.inc"); -$js = get_js_form_entry("CodeID2", "code_id", "amount"); +$js = ''; if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -$js .= get_js_set_focus('CodeID2'); -page(_("Bank Account Deposit Entry"), false, false, "setFocus()", $js); +set_focus('CodeID2'); +page(_("Bank Account Deposit Entry"), false, false, '', $js); //----------------------------------------------------------------------------------------------- diff --git a/gl/gl_payment.php b/gl/gl_payment.php index 69650682..24be2b43 100644 --- a/gl/gl_payment.php +++ b/gl/gl_payment.php @@ -12,13 +12,13 @@ include_once($path_to_root . "/gl/includes/ui/gl_payment_ui.inc"); include_once($path_to_root . "/gl/includes/gl_db.inc"); include_once($path_to_root . "/gl/includes/gl_ui.inc"); -$js = get_js_form_entry("CodeID2", "code_id", "amount"); +$js = ''; if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -$js .= get_js_set_focus('CodeID2'); -page(_("Bank Account Payment Entry"), false, false, "setFocus()", $js); +set_focus('CodeID2'); +page(_("Bank Account Payment Entry"), false, false, '', $js); //----------------------------------------------------------------------------------------------- diff --git a/gl/includes/ui/gl_deposit_ui.inc b/gl/includes/ui/gl_deposit_ui.inc index e1dece6b..c84b5ad3 100644 --- a/gl/includes/ui/gl_deposit_ui.inc +++ b/gl/includes/ui/gl_deposit_ui.inc @@ -203,8 +203,8 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['code_id'] = get_company_pref('default_assembly_act'); else $_POST['code_id'] = get_company_pref('default_inv_sales_act'); - text_cells(null, "CodeID2", $_POST['code_id'], 12, 10, "", "", "onkeyup='recalcAccounts();' onblur='return setAccount(0, false);'"); - gl_all_accounts_list_cells(null, 'code_id', $_POST['code_id'], true, false, "return setAccount(1, false)"); + text_cells(null, "CodeID2", $_POST['code_id'], 12, 10, "", "", "class='combo' rel='code_id'"); + gl_all_accounts_list_cells(null, 'code_id', $_POST['code_id'], true, false, "class='combo' rel='CodeID2'"); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc index 046430ca..9e3fec28 100644 --- a/gl/includes/ui/gl_journal_ui.inc +++ b/gl/includes/ui/gl_journal_ui.inc @@ -153,9 +153,9 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['CodeID2'] = ""; $_POST['code_id'] = ""; - text_cells(null, "CodeID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, false)'"); + text_cells(null, "CodeID2", "", 12, 10, "", "", "class='combo' rel='code_id'"); $skip_bank = ($_SESSION["wa_current_user"]->access != 2); - gl_all_accounts_list_cells(null, 'code_id', null, $skip_bank, false, "return setAccount(1, false)"); + gl_all_accounts_list_cells(null, 'code_id', null, $skip_bank, false, "class='combo' rel='CodeID2'"); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) diff --git a/gl/includes/ui/gl_payment_ui.inc b/gl/includes/ui/gl_payment_ui.inc index c355b92f..486862bd 100644 --- a/gl/includes/ui/gl_payment_ui.inc +++ b/gl/includes/ui/gl_payment_ui.inc @@ -205,8 +205,8 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['code_id'] = get_company_pref('default_assembly_act'); else $_POST['code_id'] = get_company_pref('default_cogs_act'); - text_cells(null, "CodeID2", $_POST['code_id'], 12, 10, "", "", "onkeyup='recalcAccounts()' onblur='return setAccount(0, false)'"); - gl_all_accounts_list_cells(null, 'code_id', $_POST['code_id'], true, false, "return setAccount(1, false)"); + text_cells(null, "CodeID2", $_POST['code_id'], 12, 10, "", "", "class='combo' rel='code_id'"); + gl_all_accounts_list_cells(null, 'code_id', $_POST['code_id'], true, false, "class='combo' rel='CodeID2'"); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 1bdac7e4..f5a77a20 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -303,8 +303,8 @@ function po_item_controls(&$order, $stock_id=null) } else { - text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'"); - stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, false, "onchange='return setAccount(1, true)'"); + text_cells(null, "StockID2", "", 12, 10, "", "", "class='combo' rel='stock_id' onblur='submit()'"); + stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, false, "class='combo' rel='StockID2'"); } $item_info = get_item_edit_info($_POST['stock_id']); $_POST['units'] = $item_info["units"]; diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index ea7ae862..57693a30 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -9,7 +9,7 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); -$js = get_js_form_entry("StockID2", "stock_id", "qty"); +$js = ''; if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc index 45ef3b4d..556ff8df 100644 --- a/sales/includes/ui/sales_credit_ui.inc +++ b/sales/includes/ui/sales_credit_ui.inc @@ -201,8 +201,8 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) } else { - text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if (event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'"); - stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'"); + text_cells(null, "StockID2", '', 12, 10, "", "", "class='combo' rel='stock_id' onblur='submit();'"); + stock_items_list_cells(null, 'stock_id', null, false, false, "class='combo' rel='StockID2'"); } $item_info = get_item_edit_info($_POST['stock_id']); diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 0e069ad8..428cc69a 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -334,8 +334,8 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) } else { - text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if (event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'"); - stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'"); + text_cells(null, "StockID2", '', 12, 10, "", "", "class='combo' rel='stock_id' onblur='submit();'"); + stock_items_list_cells(null, 'stock_id', null, false, false, "class='combo' rel='StockID2'"); } $item_info = get_item_edit_info($_POST['stock_id']); $_POST['units'] = $item_info["units"]; diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index fe40810d..0524212b 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -17,7 +17,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_types_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); -$js = get_js_form_entry("StockID2", "stock_id", "qty"); +$js = ''; if ($use_popup_windows) { $js .= get_js_open_window(900, 500); }