From 0cb5220d4db0c0684f765f26e9e04b288d41c220 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Mon, 7 Jul 2014 20:54:41 +0200 Subject: [PATCH] Use english for the function name --- htdocs/comm/propal.php | 4 ++-- htdocs/commande/fiche.php | 4 ++-- htdocs/compta/facture.php | 4 ++-- htdocs/core/class/html.form.class.php | 12 ++++-------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 994894f2b4c..7ce92a5b569 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1987,9 +1987,9 @@ if ($action == 'create') { print ''; print ''; if ($action == 'editbankaccount') { - $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); } else { - $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); } print ''; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 58fede8e275..19948e3c1b7 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -2143,9 +2143,9 @@ if ($action == 'create' && $user->rights->commande->creer) { print ''; print ''; if ($action == 'editbankaccount') { - $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); } else { - $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); } print ''; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index b01b6c5dfaa..29a25760886 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3192,11 +3192,11 @@ if ($action == 'create') print ''; if ($action == 'editbankaccount') { - $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); } else { - $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); } print ""; print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cdc7294c302..d1b338176a4 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2489,11 +2489,10 @@ class Form * @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries. * @return void */ - function form_select_comptes($page, $selected='', $htmlname='fk_account', $addempty=0) + function formSelectAccount($page, $selected='', $htmlname='fk_account', $addempty=0) { global $langs; - if ($htmlname != "none") - { + if ($htmlname != "none") { print '
'; print ''; print ''; @@ -2503,11 +2502,8 @@ class Form print ''; print ''; print '
'; - } - else - { - if ($selected) - { + } else { + if ($selected) { require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php'; $bankstatic=new Account($this->db); $bankstatic->fetch($selected);