From 9cad437d5cb167081c6b2da3c3c1bebfbe70da0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Oct 2016 16:20:08 +0200
Subject: [PATCH] Fix list in chart of account

---
 htdocs/accountancy/admin/account.php    | 21 +++++++++++----------
 htdocs/core/menus/standard/eldy.lib.php |  2 +-
 htdocs/langs/en_US/accountancy.lang     |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 872f279ccc2..95ba62de0c5 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -175,17 +175,18 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
 }	
 
 $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
-$result = $db->query($sql);
+$resql = $db->query($sql);
 
-if ($result) {
-	$num = $db->num_rows($result);
+if ($resql) {
+    
+	$num = $db->num_rows($resql);
 	
     $params='';
 	if ($search_account != "") $params.= '&amp;search_account='.urlencode($search_account);
@@ -209,14 +210,14 @@ if ($result) {
     $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_system";
     $sql .= " WHERE active = 1";
     dol_syslog('accountancy/admin/index.php:: $sql=' . $sql);
-    $resql = $db->query($sql);
+    $resqlchart = $db->query($sql);
     $var = true;
-    if ($resql) {
-        $num = $db->num_rows($resql);
+    if ($resqlchart) {
+        $numbis = $db->num_rows($resqlchart);
         $i = 0;
-        while ( $i < $num ) {
+        while ( $i < $numbis ) {
             $var = ! $var;
-            $row = $db->fetch_row($resql);
+            $row = $db->fetch_row($resqlchart);
     
             print '<option value="' . $row[0] . '"';
             print $pcgver == $row[0] ? ' selected' : '';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 551b8ac1e5f..8b1187bb2fd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -946,7 +946,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 2);
 				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 3);
 				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 2);
-				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy", $langs->trans("ProductsBinding"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 2);
+				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 2);
 				
 				// Binding
 				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 8966dd2055b..1283e454e1b 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -46,6 +46,7 @@ AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
 MenuDefaultAccounts=Default accounts
+MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-- 
GitLab