From 289f46977bdbba7b4ae31c9527ee60478a65da4c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Mon, 8 Sep 2014 21:19:05 +0200
Subject: [PATCH] List financial journals into admin

---
 htdocs/accountancy/admin/journaux.php | 65 ++++++++++++++-------------
 htdocs/langs/en_US/accountancy.lang   |  4 +-
 htdocs/langs/es_ES/accountancy.lang   |  4 +-
 htdocs/langs/fr_FR/accountancy.lang   |  4 +-
 4 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php
index 49938781ace..f9aea2242c5 100644
--- a/htdocs/accountancy/admin/journaux.php
+++ b/htdocs/accountancy/admin/journaux.php
@@ -102,7 +102,7 @@ foreach ( $list as $key ) {
 	
 	// Param
 	$label = $langs->trans($key);
-	print '<td><label for="' . $key . '">' . $label . '</label></td>';
+	print '<td width="50%"><label for="' . $key . '">' . $label . '</label></td>';
 	
 	// Value
 	print '<td>';
@@ -117,44 +117,49 @@ print '<br /><div style="text-align:center"><input type="submit" class="button"
 
 print '<br />';
 
-// Bank account
-$sql  = "SELECT ba.rowid, ba.ref , ba.label, ba.bank , ba.account_number, ba.code_journal ";
-$sql .= " FROM ".MAIN_DB_PREFIX."lx_bank_account as ba";
-$sql .= " WHERE ba.clos = 0" ;
-$sql .= " ORDER BY label";
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="3">' . $langs->trans('JournalFinancial') . '</td>';
+print "</tr>\n";
 
-dol_syslog('accountancy/admin/journaux.php:: $sql='.$sql);
+// Bank account
+$sql = "SELECT rowid, label, accountancy_journal";
+$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+$sql.= " WHERE entity = ".$conf->entity;
+$sql.= " AND clos = 0";
+$sql.= " ORDER BY label";
 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
+	$numr = $db->num_rows($resql);
 	$i = 0;
 
+	if ($numr > 0)
+				
+	while ($i < $numr)
+	{
+		$objp = $db->fetch_object($resql);
+		
+		$var = ! $var;
+	
+		print '<tr ' . $bc[$var] . ' class="value">';
+		
+		// Param
+		print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal") . ' - ' . $objp->label . '</label></td>';
+	
+		// Value
+		print '<td>';
+		print '<input type="text" size="20" id="' . $objp->rowid . '" name="' . $objp->label . '" value="' . $objp->accountancy_journal . '" disabled>';
+		print '</td></tr>';
+
+		$i++;
+	}
 }
+else dol_print_error($db);
+$db->free($resql);
 
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="3">' . $langs->trans('JournauxTresorerie') . '</td>';
-print "</tr>\n";
-
-$form2 = new Form($db);
-
-$account = new Account($db);
-foreach ( $resql as $key ) {
-	$var = ! $var;
-	
-	print '<tr ' . $bc[$var] . ' class="value">';
-	
-	// Param
-	$label = $langs->trans($key);
-	print '<td><label for="' . $key . '">' . $label . '</label></td>';
-	
-	// Value
-	print '<td>';
-	print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
-	print '</td></tr>';
-}
+print "</table>\n";
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 3d06c7f28b6..6745b56daf1 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -11,10 +11,8 @@ MenuTools=Tools
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
+JournalFinancial=Financial journals
 Exports=Exports
-About=About
-Contributors=Contributors
-Investors=Investors
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
 Modelcsv_normal=Classic export
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 8c83a64fd84..afcb8456a5d 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -13,10 +13,8 @@ Export=Exportación
 
 ConfigAccountingExpert=Configuración del módulo contable
 Journaux=Diarios
+JournalFinancial=Diarios
 Exports=Exportaciones
-About=acerca de
-Contributors=Colaboradores
-Investors=Inversores
 Modelcsv=Plantilla de Exportación
 Selectmodelcsv=Seleccione una plantilla de exportación
 Modelcsv_normal=Exportación clásica
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 227915195eb..72c7475fd1d 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -11,10 +11,8 @@ MenuTools=Outils
 
 ConfigAccountingExpert=Configuration du module comptabilité expert
 Journaux=Journaux
+JournalFinancial=Journaux de trésorerie
 Exports=Exports
-About=A propos
-Contributors=Contributeurs
-Investors=Investisseurs
 Modelcsv=Modèle d'export
 Selectmodelcsv=Sélectionnez un modèle d'export
 Modelcsv_normal=Export classique