From 66313f584b88b0c3500b37a66bc3f016c7686f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 2 Mar 2016 10:45:40 +0100
Subject: [PATCH] Removed deprecated usage of Account::account_currency_code
 and started using Account::canBeReconciliated

---
 htdocs/commande/class/commande.class.php   | 4 ----
 htdocs/compta/bank/account.php             | 4 ++--
 htdocs/compta/bank/card.php                | 6 +++---
 htdocs/compta/bank/class/account.class.php | 7 +++++++
 htdocs/compta/bank/releve.php              | 3 +--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8f8edcf15a3..c1f16d850cc 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -140,10 +140,6 @@ class Commande extends CommonOrder
 	 */
 	var $lines = array();
 
-    // Pour board
-    var $nbtodo;
-    var $nbtodolate;
-
 	// Multicurrency
 	var $fk_multicurrency;
 	var $multicurrency_code;
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 0973ece78d3..80bf481e859 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -397,7 +397,7 @@ if ($id > 0 || ! empty($ref))
             }
         }
 
-		if ($object->type != 2 && $object->rappro) 
+		if ($object->canBeConciliated())
 		{ 
 			// If not cash account and can be reconciliate
 			if ($user->rights->banque->consolidate) 
@@ -529,7 +529,7 @@ if ($id > 0 || ! empty($ref))
 	print '<td align="right">'.$langs->trans("Credit").'</td>';
 	print '<td align="right" width="80">'.$langs->trans("BankBalance").'</td>';
 	print '<td align="center" width="60">';
-	if ($object->type != 2 && $object->rappro) print $langs->trans("AccountStatementShort");
+	if ($object->canBeConciliated()) print $langs->trans("AccountStatementShort");
 	else print '&nbsp;';
 	print '</td></tr>';
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index cccf16f0467..ad704e050a7 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -292,7 +292,7 @@ if ($action == 'create')
 	// Currency
 	print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
 	print '<td colspan="3">';
-	$selectedcode=$account->account_currency_code;
+	$selectedcode=$account->currency_code;
 	if (! $selectedcode) $selectedcode=$conf->currency;
 	print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
 	//print $langs->trans("Currency".$conf->currency);
@@ -583,7 +583,7 @@ else
 		// Currency
 		print '<tr><td>'.$langs->trans("Currency").'</td>';
 		print '<td colspan="3">';
-		$selectedcode=$account->account_currency_code;
+		$selectedcode=$account->currency_code;
 		if (! $selectedcode) $selectedcode=$conf->currency;
 		print $langs->trans("Currency".$selectedcode);
 		print '</td></tr>';
@@ -851,7 +851,7 @@ else
 		print '<input type="hidden" value="'.$account->currency_code.'">';
 		print '</td>';
 		print '<td colspan="3">';
-		$selectedcode=$account->account_currency_code;
+		$selectedcode=$account->currency_code;
 		if (! $selectedcode) $selectedcode=$conf->currency;
 		print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
 		//print $langs->trans("Currency".$conf->currency);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index a5e108a2c96..74142ca6c0d 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -154,6 +154,13 @@ class Account extends CommonObject
      */
     public $currency_code;
 
+    /**
+     * Currency code
+     * @var string
+     * @deprecated Use currency_code instead
+     */
+    public $account_currency_code;
+
     /**
      * Authorized minimum balance
      * @var float
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 43587cfa6a0..4b4b9d4707b 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -144,8 +144,7 @@ if (empty($num))
 
 		print '<div class="tabsAction">';
 		
-		if ($object->type != 2 && $object->rappro) 
-		{ 
+		if ($object->canBeConciliated()) {
 			// If not cash account and can be reconciliate
 			if ($user->rights->banque->consolidate) 
 			{