';
@@ -462,14 +470,14 @@ foreach ($accounts as $key=>$type)
// Ref
if (! empty($arrayfields['b.ref']['checked']))
{
- print '| '.$acc->getNomUrl(1).' | ';
+ print ''.$obj->getNomUrl(1).' | ';
if (! $i) $totalarray['nbfield']++;
}
// Label
if (! empty($arrayfields['b.label']['checked']))
{
- print ''.$acc->label.' | ';
+ print ''.$obj->label.' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -477,7 +485,7 @@ foreach ($accounts as $key=>$type)
if (! empty($arrayfields['accountype']['checked']))
{
print '';
- print $acc->type_lib[$acc->type];
+ print $obj->type_lib[$obj->type];
print ' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -485,7 +493,7 @@ foreach ($accounts as $key=>$type)
// Number
if (! empty($arrayfields['b.number']['checked']))
{
- print ''.$acc->number.' | ';
+ print ''.$obj->number.' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -496,12 +504,12 @@ foreach ($accounts as $key=>$type)
if (! empty($conf->accounting->enabled))
{
$accountingaccount = new AccountingAccount($db);
- $accountingaccount->fetch('',$acc->account_number);
+ $accountingaccount->fetch('',$obj->account_number);
print $accountingaccount->getNomUrl(0,1,1,'',1);
}
else
{
- print $acc->account_number;
+ print $obj->account_number;
}
print '';
if (! $i) $totalarray['nbfield']++;
@@ -514,7 +522,7 @@ foreach ($accounts as $key=>$type)
if (! empty($conf->accounting->enabled))
{
$accountingjournal = new AccountingJournal($db);
- $accountingjournal->fetch($acc->fk_accountancy_journal);
+ $accountingjournal->fetch($obj->fk_accountancy_journal);
print $accountingjournal->getNomUrl(0,1,1,'',1);
}
else
@@ -525,15 +533,24 @@ foreach ($accounts as $key=>$type)
if (! $i) $totalarray['nbfield']++;
}
+ // Currency
+ if (! empty($arrayfields['b.currency_code']['checked']))
+ {
+ print '';
+ print $obj->currency_code;
+ print ' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+
// Transactions to reconcile
if (! empty($arrayfields['toreconcile']['checked']))
{
print '';
- if ($acc->rappro)
+ if ($obj->rappro)
{
- $result=$acc->load_board($user,$acc->id);
+ $result=$obj->load_board($user,$obj->id);
if ($result<0) {
- setEventMessages($acc->error, $acc->errors, 'errors');
+ setEventMessages($obj->error, $obj->errors, 'errors');
} else {
print $result->nbtodo;
if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')';
@@ -570,7 +587,7 @@ foreach ($accounts as $key=>$type)
if (! empty($arrayfields['b.datec']['checked']))
{
print ' | ';
- print dol_print_date($acc->date_creation, 'dayhour');
+ print dol_print_date($obj->date_creation, 'dayhour');
print ' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -578,7 +595,7 @@ foreach ($accounts as $key=>$type)
if (! empty($arrayfields['b.tms']['checked']))
{
print '';
- print dol_print_date($acc->date_update, 'dayhour');
+ print dol_print_date($obj->date_update, 'dayhour');
print ' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -586,7 +603,7 @@ foreach ($accounts as $key=>$type)
// Status
if (! empty($arrayfields['b.clos']['checked']))
{
- print ''.$acc->getLibStatut(5).' | ';
+ print ''.$obj->getLibStatut(5).' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -594,7 +611,7 @@ foreach ($accounts as $key=>$type)
if (! empty($arrayfields['balance']['checked']))
{
print '';
- print ''.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).'';
+ print ''.price($solde, 0, $langs, 0, 0, -1, $obj->currency_code).'';
print ' | ';
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalbalancefield']=$totalarray['nbfield'];
@@ -614,7 +631,7 @@ foreach ($accounts as $key=>$type)
print '
';
- $total[$acc->currency_code] += $solde;
+ $total[$obj->currency_code] += $solde;
$i++;
}
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 1f3ca1cde8e..7696427b059 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -30,8 +30,7 @@ require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-$langs->load("banks");
-$langs->load("categories");
+$langs->loadLangs(array("banks", "categories", "multicurrency"));
if (! $user->rights->banque->transfer)
accessforbidden();
@@ -44,14 +43,14 @@ $error = 0;
* Actions
*/
-if ($action == 'add_confirm')
+if ($action == 'add')
{
$langs->load("errors");
$dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
$label = GETPOST('label','alpha');
$amount= GETPOST('amount');
- $amount_to= GETPOST('amount_to');
+ $amountto= GETPOST('amountto');
if (! $label)
{
@@ -83,7 +82,17 @@ if ($action == 'add_confirm')
$accountto=new Account($db);
$accountto->fetch(GETPOST('account_to','int'));
- if ($accountto->id != $accountfrom->id)
+ if ($accountto->currency_code == $accountfrom->currency_code) {
+ $amountto=$amount;
+ } else {
+ if (! $amountto)
+ {
+ $error++;
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AmountTo")), null, 'errors');
+ }
+ }
+
+ if (($accountto->id != $accountfrom->id) && empty($error))
{
$db->begin();
@@ -103,8 +112,7 @@ if ($action == 'add_confirm')
if (! $error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, -1*price2num($amount), '', '', $user);
if (! ($bank_line_id_from > 0)) $error++;
- if ((! $error) && ($accountto->currency_code == $accountfrom->currency_code)) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amount), '', '', $user);
- if ((! $error) && ($accountto->currency_code != $accountfrom->currency_code)) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amount_to), '', '', $user);
+ if (! $error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amountto), '', '', $user);
if (! ($bank_line_id_to > 0)) $error++;
if (! $error) $result=$accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/ligne.php?rowid=', '(banktransfert)', 'banktransfert');
@@ -114,7 +122,7 @@ if ($action == 'add_confirm')
if (! $error)
{
- $mesgs = $langs->trans("TransferFromToDone","