[Frontaccounting-cvs_updates] /hgrepo/f/fr/frontaccounting/frontaccounting: Cleanup setting of...
Brought to you by:
frontaccounting,
itronics
Menu
▾
▴
[Frontaccounting-cvs_updates] /hgrepo/f/fr/frontaccounting/frontaccounting: Cleanup setting of...
|
From: FrontAccounting <fro...@us...> - 2011-06-08 13:38:53
|
details: http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hgrepo/f/fr/frontaccounting/frontaccounting/rev/f6ac357759d2 changeset: 2813:f6ac357759d2 user: Joe Hunt <joe...@gm...> date: Wed Jun 08 15:38:02 2011 +0200 description: Cleanup setting of customers/suppliers bank account in forms diffstat: gl/includes/db/gl_db_bank_accounts.inc | 16 +--------------- gl/includes/ui/gl_bank_ui.inc | 40 +++++++++++++++++----------------------- purchasing/supplier_payment.php | 6 +++--- sales/customer_payments.php | 2 +- 4 files changed, 22 insertions(+), 42 deletions(-) diffs (140 lines): diff -r d1d8ff248c55 -r f6ac357759d2 gl/includes/db/gl_db_bank_accounts.inc --- a/gl/includes/db/gl_db_bank_accounts.inc Tue Jun 07 22:54:09 2011 +0200 +++ b/gl/includes/db/gl_db_bank_accounts.inc Wed Jun 08 15:38:02 2011 +0200 @@ -318,14 +318,7 @@ function get_default_customer_bank_account($cust_id) { - if ($cust_id == "") - { - $sql = "SELECT debtor_no FROM ".TB_PREF."debtors_master WHERE inactive=0 ORDER BY debtor_ref LIMIT 1"; - $result = db_query($sql, "could not retreive first customer"); - $row = db_fetch_row($result); - $cust_id = $row[0]; - } - $sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=$cust_id"; + $sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=".db_escape($cust_id); $result = db_query($sql, "could not retreive default customer currency code"); $row = db_fetch_row($result); $ba = get_default_bank_account($row[0]); @@ -334,13 +327,6 @@ function get_default_supplier_bank_account($supplier_id) { - if ($supplier_id == "") - { - $sql = "SELECT supplier_id FROM ".TB_PREF."suppliers WHERE inactive=0 ORDER BY supp_ref LIMIT 1"; - $result = db_query($sql, "could not retreive first supplier"); - $row = db_fetch_row($result); - $supplier_id = $row[0]; - } $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id); $result = db_query($sql, "could not retreive default supplier currency code"); $row = db_fetch_row($result); diff -r d1d8ff248c55 -r f6ac357759d2 gl/includes/ui/gl_bank_ui.inc --- a/gl/includes/ui/gl_bank_ui.inc Tue Jun 07 22:54:09 2011 +0200 +++ b/gl/includes/ui/gl_bank_ui.inc Wed Jun 08 15:38:02 2011 +0200 @@ -20,27 +20,10 @@ table_section(1); - if (list_updated('PayType') || list_updated('person_id')) - { - if (list_updated('PayType')) - { - $_POST['person_id'] = ""; - unset($_POST['bank_account']); - } - if ($_POST['PayType'] == PT_CUSTOMER || $_POST['PayType'] == PT_SUPPLIER) - { - if ($_POST['PayType'] == PT_CUSTOMER) - $_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']); - else - $_POST['bank_account'] = get_default_supplier_bank_account($_POST['person_id']); - } - } - bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true); - if ($payment) - bank_balance_row($_POST['bank_account']); - date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true); + ref_row(_("Reference:"), 'ref', ''); + table_section(2, "33%"); if (!isset($_POST['PayType'])) @@ -108,15 +91,26 @@ // break; } + table_section(3, "33%"); + + if (!list_updated('bank_account')) + { + if ($_POST['PayType'] == PT_CUSTOMER) + $_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']); + elseif ($_POST['PayType'] == PT_SUPPLIER) + $_POST['bank_account'] = get_default_supplier_bank_account($_POST['person_id']); + else + unset($_POST['bank_account']); + } + bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true); + if ($payment) + bank_balance_row($_POST['bank_account']); + $person_currency = payment_person_currency($_POST['PayType'], $_POST['person_id']); $bank_currency = get_bank_account_currency($_POST['bank_account']); exchange_rate_display($bank_currency, $person_currency, $_POST['date_']); - table_section(3, "33%"); - - ref_row(_("Reference:"), 'ref', ''); - end_outer_table(1); // outer table div_end(); diff -r d1d8ff248c55 -r f6ac357759d2 purchasing/supplier_payment.php --- a/purchasing/supplier_payment.php Tue Jun 07 22:54:09 2011 +0200 +++ b/purchasing/supplier_payment.php Wed Jun 08 15:38:02 2011 +0200 @@ -58,7 +58,6 @@ } if (list_updated('supplier_id') || list_updated('bank_account')) { - $_SESSION['alloc']->read(); $Ajax->activate('alloc_tbl'); } //---------------------------------------------------------------------------------------- @@ -302,9 +301,10 @@ end_outer_table(1); // outer table if ($bank_currency == $supplier_currency) { - div_start('alloc_tbl'); + div_start('alloc_tbl'); + $_SESSION['alloc']->read(); show_allocatable(false); - div_end(); + div_end(); } start_table(TABLESTYLE, "width=60%"); diff -r d1d8ff248c55 -r f6ac357759d2 sales/customer_payments.php --- a/sales/customer_payments.php Tue Jun 07 22:54:09 2011 +0200 +++ b/sales/customer_payments.php Wed Jun 08 15:38:02 2011 +0200 @@ -184,7 +184,6 @@ $Ajax->activate('_ex_rate'); } if (list_updated('customer_id') || list_updated('bank_account')) { - $_SESSION['alloc']->read(); $Ajax->activate('alloc_tbl'); } //---------------------------------------------------------------------------------------------- @@ -278,6 +277,7 @@ if ($cust_currency == $bank_currency) { div_start('alloc_tbl'); + $_SESSION['alloc']->read(); show_allocatable(false); div_end(); } |