diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 5a71d365ed1..97e7543a030 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1436,18 +1436,21 @@ class AccountLine extends CommonObject
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"),'account').$lienfin.' ');
$result.=$lien.$this->rowid.$lienfin;
+ if ($option == 'showall' || $option == 'showconciliated') $result.=' (';
if ($option == 'showall')
{
- $result.=' (';
$result.=$langs->trans("BankAccount").': ';
$accountstatic=new Account($this->db);
$accountstatic->id=$this->fk_account;
$accountstatic->label=$this->bank_account_label;
$result.=$accountstatic->getNomUrl(0).', ';
+ }
+ if ($option == 'showall' || $option == 'showconciliated')
+ {
$result.=$langs->trans("BankLineConciliated").': ';
$result.=yn($this->rappro);
- $result.=')';
}
+ if ($option == 'showall' || $option == 'showconciliated') $result.=')';
return $result;
}
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index cf7d70819fc..6d3d7157833 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -193,7 +193,7 @@ dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice"), 0, 'p
if ($action == 'delete')
{
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
-
+
}
/*
@@ -203,7 +203,7 @@ if ($action == 'valide')
{
$facid = $_GET['facid'];
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
-
+
}
@@ -230,7 +230,7 @@ print $form->editfieldval("Numero",'num_paiement',$object->numero,$object,$objec
print '';
// Amount
-print '
| '.$langs->trans('Amount').' | '.price($object->montant).' '.$langs->trans('Currency'.$conf->currency).' |
';
+print '| '.$langs->trans('Amount').' | '.price($object->montant,'',$langs,0,0,-1,$conf->currency).' |
';
// Note
print '| '.$form->editfieldkey("Note",'note',$object->note,$object,$user->rights->facture->paiement).' | ';
@@ -248,15 +248,25 @@ if (! empty($conf->banque->enabled))
print ' |
';
print '| '.$langs->trans('BankTransactionLine').' | ';
print '';
- print $bankline->getNomUrl(1,0,'showall');
+ print $bankline->getNomUrl(1,0,'showconciliated');
print ' | ';
print '
';
-
+
+ print '';
+ print '| '.$langs->trans('BankAccount').' | ';
+ print '';
+ $accountstatic=new Account($db);
+ $accountstatic->id=$bankline->fk_account;
+ $accountstatic->label=$bankline->bank_account_ref.' - '.$bankline->bank_account_label;
+ print $accountstatic->getNomUrl(0);
+ print ' | ';
+ print '
';
+
if($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
$bordereau = new RemiseCheque($db);
$bordereau->fetch($bankline->fk_bordereau);
-
+
print '';
print '| '.$langs->trans('CheckReceipt').' | ';
print '';
diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php
index de7bd129305..2c834bace60 100644
--- a/htdocs/fourn/paiement/fiche.php
+++ b/htdocs/fourn/paiement/fiche.php
@@ -195,7 +195,7 @@ if ($result > 0)
print ' |
';
// Amount
- print '| '.$langs->trans('Amount').' | '.price($object->montant).' '.$langs->trans('Currency'.$conf->currency).' |
';
+ print '| '.$langs->trans('Amount').' | '.price($object->montant,'',$langs,0,0,-1,$conf->currency).' |
';
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
@@ -218,9 +218,19 @@ if ($result > 0)
print '';
print '| '.$langs->trans('BankTransactionLine').' | ';
print '';
- print $bankline->getNomUrl(1,0,'showall');
+ print $bankline->getNomUrl(1,0,'showconciliated');
print ' | ';
print '
';
+
+ print '';
+ print '| '.$langs->trans('BankAccount').' | ';
+ print '';
+ $accountstatic=new Account($db);
+ $accountstatic->id=$bankline->fk_account;
+ $accountstatic->label=$bankline->bank_account_ref.' - '.$bankline->bank_account_label;
+ print $accountstatic->getNomUrl(0);
+ print ' | ';
+ print '
';
}
}