From e0da56bcd0bedd2e10683e23f87cfd68916413a0 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 26 Dec 2015 05:56:14 +0100
Subject: [PATCH] Accountancy Add a list to select accounting account on
 donation admin

---
 htdocs/core/modules/modDon.class.php |  2 +-
 htdocs/don/admin/donation.php        | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 237c6b19014..c62b46db06b 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -107,7 +107,7 @@ class modDon  extends DolibarrModules
 		$r++;
 		$this->const[$r][0] = "DONATION_ACCOUNTINGACCOUNT";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "7581";
+		$this->const[$r][2] = "758";
 		$this->const[$r][3] = 'Compte comptable de remise des versements ou dons';
 		$this->const[$r][4] = 0;
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 4719bd6855a..d699a9fc7a6 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -25,10 +25,11 @@
  *		\brief      Page to setup the donation module
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/donation.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 $langs->load("admin");
 $langs->load("donations");
@@ -198,6 +199,7 @@ else if ($action == 'setart885') {
 
 $dir = "../../core/modules/dons/";
 $form=new Form($db);
+if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
 
 llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -228,9 +230,16 @@ print '<tr '.$bc[$var].'>';
 
 print '<td width="50%">';
 $label = $langs->trans("AccountAccounting");
-print '<label for="'.$langs->trans("AccountAccounting").'">' . $label . '</label></td>';
+print '<label for="DONATION_ACCOUNTINGACCOUNT">' . $label . '</label></td>';
 print '<td>';
-print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="' . $conf->global->DONATION_ACCOUNTINGACCOUNT . '">';
+if (! empty($conf->accounting->enabled))
+{
+	print $formaccountancy->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
+}
+else
+{
+	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="' . $conf->global->DONATION_ACCOUNTINGACCOUNT . '">';
+}
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";