From 4224ea6c568a9037fdf26714bfa0a409a610c52d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 18 Oct 2017 19:09:29 +0200
Subject: [PATCH 1/4] Fix use conf instead of global var

---
 htdocs/accountancy/admin/defaultaccounts.php | 2 +-
 htdocs/accountancy/admin/index.php           | 2 +-
 htdocs/admin/compta.php                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index ce99bd6296c..cf3235a5670 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -77,7 +77,7 @@ $list_account = array (
  * Actions
  */
 
-$accounting_mode = defined('ACCOUNTING_MODE') ? ACCOUNTING_MODE : 'RECETTES-DEPENSES';
+$accounting_mode = $conf->global->ACCOUNTING_MODE;
 
 
 if (GETPOST('change_chart'))
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index b6aceb52ad4..09d8f474275 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -61,7 +61,7 @@ $list = array (
  * Actions
  */
 
-$accounting_mode = defined('ACCOUNTING_MODE') ? ACCOUNTING_MODE : 'RECETTES-DEPENSES';
+$accounting_mode = $conf->global->ACCOUNTING_MODE;
 
 if ($action == 'update') {
 	$error = 0;
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 70bf15d03f3..c9f7ef49912 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -54,7 +54,7 @@ $list = array(
  * Actions
  */
 
-$accounting_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES';
+$accounting_mode = $conf->global->ACCOUNTING_MODE;
 
 if ($action == 'update')
 {

From f4db4373ea90fdf40906203baab50a3278e12a3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Oct 2017 02:20:29 +0200
Subject: [PATCH 2/4] Update defaultaccounts.php

---
 htdocs/accountancy/admin/defaultaccounts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index cf3235a5670..c4b31c0f169 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -77,7 +77,7 @@ $list_account = array (
  * Actions
  */
 
-$accounting_mode = $conf->global->ACCOUNTING_MODE;
+$accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
 
 
 if (GETPOST('change_chart'))

From 210fb5206c4e266f5f955c73c0ead2edf9a79554 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Oct 2017 02:21:04 +0200
Subject: [PATCH 3/4] Update index.php

---
 htdocs/accountancy/admin/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 09d8f474275..191fe7a9a8f 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -61,7 +61,7 @@ $list = array (
  * Actions
  */
 
-$accounting_mode = $conf->global->ACCOUNTING_MODE;
+$accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
 
 if ($action == 'update') {
 	$error = 0;

From 4c58e4f98a1e9906d0927b06867cc4d6585a5cc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Oct 2017 02:21:34 +0200
Subject: [PATCH 4/4] Update compta.php

---
 htdocs/admin/compta.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index c9f7ef49912..c0ae0c59279 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -54,7 +54,7 @@ $list = array(
  * Actions
  */
 
-$accounting_mode = $conf->global->ACCOUNTING_MODE;
+$accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
 
 if ($action == 'update')
 {