From 5553c7a92d40638d92b7ec6494bcec62c36d0aee Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 15 Jun 2010 13:44:20 +0000 Subject: [PATCH] Qual: Standing Orders setup. Uniformize code Trad: Standing Orders setup. translation notifications setup --- htdocs/admin/prelevement.php | 71 +++++++++-------------------- htdocs/langs/ca_ES/withdrawals.lang | 6 ++- htdocs/langs/en_US/withdrawals.lang | 6 ++- htdocs/langs/es_ES/withdrawals.lang | 6 ++- htdocs/langs/fr_FR/withdrawals.lang | 6 ++- 5 files changed, 41 insertions(+), 54 deletions(-) diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 9d685676af4..c8e6c4d156b 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -32,7 +32,6 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); $langs->load("admin"); $langs->load("withdrawals"); -$langs->load("banks"); $langs->load("bills"); // Security check @@ -84,54 +83,37 @@ print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup'); print '
'; print ''; - print ''; print ''; print ''; print ''; - print ''; print "\n"; - print ''; - print ''; - -print ''; - +print ''; +print ''; print ''; - print ''; - -print ''; - +print ''; +print ''; print ''; - print ''; - -print ''; - +print ''; +print ''; print ''; - print ''; - -print ''; - +print ''; +print ''; print ''; print ''; - -print ''; - +print ''; +print ''; print ''; print ''; - print ''; - -print '<'; - +print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("CurrentValue").'
'.$langs->trans("NumeroNationalEmetter").''; print ''; -print ''.PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR.'
'.$conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR.'
'.$langs->trans("Name").''; print ''; -print ''.PRELEVEMENT_RAISON_SOCIALE.'
'.$conf->global->PRELEVEMENT_RAISON_SOCIALE.'
'.$langs->trans("BankCode").''; print ''; -print ''.PRELEVEMENT_CODE_BANQUE.'
'.$conf->global->PRELEVEMENT_CODE_BANQUE.'
'.$langs->trans("DeskCode").''; print ''; -print ''.PRELEVEMENT_CODE_GUICHET.'
'.$conf->global->PRELEVEMENT_CODE_GUICHET.'
'.$langs->trans("AccountNumber").''; print ''; -print ''.PRELEVEMENT_NUMERO_COMPTE.'
'.$conf->global->PRELEVEMENT_NUMERO_COMPTE.'
'.$langs->trans("ResponsibleUser").''; print ''; @@ -155,9 +137,9 @@ if ($db->query($sql)) } print ''; -if (defined("PRELEVEMENT_USER") && PRELEVEMENT_USER > 0) + +if (defined("PRELEVEMENT_USER") && $conf->global->PRELEVEMENT_USER > 0) { $cuser = new User($db); $cuser->fetch(PRELEVEMENT_USER); @@ -165,20 +147,15 @@ if (defined("PRELEVEMENT_USER") && PRELEVEMENT_USER > 0) } else { - print PRELEVEMENT_USER; + print $conf->global->PRELEVEMENT_USER; } print '
'; - print '
'; - print '
'; - /* * Notifications * TODO Use notification module instead @@ -191,18 +168,16 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION) print '
'; print ''; - print ''; print ''; print ''; print ''; - print ''; print "\n"; - print ''; - print ''; - print ''; } - $sql = "SELECT u.name, u.firstname"; $sql.= ", pn.action, pn.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; @@ -243,6 +214,7 @@ $sql.= " WHERE u.rowid = pn.fk_user"; $sql.= " AND u.entity IN (0,".$conf->entity.")"; $resql = $db->query($sql); + if ($resql) { $num = $db->num_rows($resql); @@ -251,10 +223,9 @@ if ($resql) while ($i < $num) { $obj = $db->fetch_object($resql); - $var=!$var; + print ""; - print ''; print ''; @@ -270,8 +241,8 @@ if ($resql) } $db->free($resql); } -print '
'.$langs->trans("User").''.$langs->trans("Value").''.$langs->trans("Action").'
'; print ''; print ''; print '
'.$obj->firstname." ".$obj->name.''.$obj->action.'
'; +print ''; print '
'; $db->close(); diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index 56a3ca68da7..bc3064379d5 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -62,4 +62,8 @@ StatusMotif8=Altre motiu CreateAll=Domiciliar totes CreateGuichet=Només oficina CreateBanque=Només banc -OrderWaiting=A l'espera de procés \ No newline at end of file +OrderWaiting=A l'espera de procés +NotifyTransmision=Enviament de domiciliació +NotifyEmision=Emisió de domiciliació +NotifyCredit=Abonament de domiciliació +NumeroNationalEmetter=Número Nacional del Emissor \ No newline at end of file diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 78afbdcc76b..a8b3b71d083 100755 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -62,4 +62,8 @@ StatusMotif8=Other reason CreateAll=Withdraw all CreateGuichet=Only office CreateBanque=Only bank -OrderWaiting=Waiting for treatment \ No newline at end of file +OrderWaiting=Waiting for treatment +NotifyTransmision=Withdrawal Transmission +NotifyEmision=Withdrawal Emission +NotifyCredit=Withdrawal Credit +NumeroNationalEmetter=National Transmitter Number \ No newline at end of file diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang index f3b9eb74420..52ffd6c0b59 100644 --- a/htdocs/langs/es_ES/withdrawals.lang +++ b/htdocs/langs/es_ES/withdrawals.lang @@ -62,4 +62,8 @@ StatusMotif8=Otro motivo CreateAll=Domiciliar todas CreateGuichet=Sólo oficina CreateBanque=Sólo banco -OrderWaiting=En espera de proceso \ No newline at end of file +OrderWaiting=En espera de proceso +NotifyTransmision=Envío de domiciliación +NotifyEmision=Emisión de domiciliación +NotifyCredit=Abono de domiciliación +NumeroNationalEmetter=Número Nacional del Emisor \ No newline at end of file diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index d8be84ac389..26ea7582e6e 100755 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -62,4 +62,8 @@ StatusMotif8=Autre motif CreateAll=Prélever tout CreateGuichet=Seulement guichet CreateBanque=Seulement banque -OrderWaiting=En attente de traitement \ No newline at end of file +OrderWaiting=En attente de traitement +NotifyTransmision=Transmission du bon +NotifyEmision=Emission du bon +NotifyCredit=Credit du bon +NumeroNationalEmetter= Numero National Emetter \ No newline at end of file