diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 3918983894e..d2617d55429 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -38,6 +38,7 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture-rec.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
@@ -3815,18 +3816,21 @@ else if ($id > 0 || ! empty($ref))
if ($num > 0) {
while ($i < $num) {
$objp = $db->fetch_object($result);
- print '
| ';
+
$paymentstatic->id = $objp->rowid;
$paymentstatic->datepaye = $db->jdate($objp->dp);
$paymentstatic->ref = $objp->ref;
$paymentstatic->num_paiement = $objp->num_paiement;
$paymentstatic->payment_code = $objp->payment_code;
+
+ print ' |
| ';
print $paymentstatic->getNomUrl(1);
print ' | ';
print '' . dol_print_date($db->jdate($objp->dp), 'day') . ' | ';
$label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label;
print '' . $label . ' ' . $objp->num_paiement . ' | ';
- if (! empty($conf->banque->enabled)) {
+ if (! empty($conf->banque->enabled))
+ {
$bankaccountstatic->id = $objp->baid;
$bankaccountstatic->ref = $objp->baref;
$bankaccountstatic->label = $objp->baref;
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 1634ec4bf5f..13a2d29aff9 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -25,6 +25,7 @@
*/
require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
@@ -33,6 +34,9 @@ if (! empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
+if (! empty($conf->accounting->enabled)) {
+ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+}
$langs->load("compta");
$langs->load("bills");
@@ -281,6 +285,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
$form = new Form($db);
$formsocialcontrib = new FormSocialContrib($db);
+$bankaccountstatic = new Account($db);
if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
$title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Card");
@@ -293,8 +298,6 @@ if ($action == 'create')
{
print load_fiche_titre($langs->trans("NewSocialContribution"));
- $var=false;
-
print '
';
- $var=true;
if ($num > 0)
{
while ($i < $num)
{
$objp = $db->fetch_object($resql);
- print "| ";
+ print ' |
| ';
print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.' | ';
print ''.dol_print_date($db->jdate($objp->dp),'day')." | \n";
$labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
print "".$labeltype.' '.$objp->num_paiement." | \n";
+ if (! empty($conf->banque->enabled))
+ {
+ $bankaccountstatic->id = $objp->baid;
+ $bankaccountstatic->ref = $objp->baref;
+ $bankaccountstatic->label = $objp->baref;
+ $bankaccountstatic->number = $objp->banumber;
+
+ if (! empty($conf->accounting->enabled)) {
+ $bankaccountstatic->account_number = $objp->account_number;
+
+ $accountingjournal = new AccountingJournal($db);
+ $accountingjournal->fetch($objp->fk_accountancy_journal);
+ $bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+ }
+
+ print '';
+ if ($bankaccountstatic->id)
+ print $bankaccountstatic->getNomUrl(1, 'transactions');
+ print ' | ';
+ }
print ''.price($objp->amount)." | \n";
print "
";
$totalpaye += $objp->amount;
@@ -624,17 +657,15 @@ if ($id > 0)
print '| '.$langs->trans("None").' | | | |
';
}
- //if ($object->status == ChargeSociales::STATUS_DRAFT)
- //{
- print "| ".$langs->trans("AlreadyPaid")." : | ".price($totalpaye)." |
\n";
- print "| ".$langs->trans("AmountExpected")." : | ".price($object->amount)." |
\n";
+ print '| '.$langs->trans("AlreadyPaid")." : | ".price($totalpaye)." |
\n";
+ print '| '.$langs->trans("AmountExpected")." : | ".price($object->amount)." |
\n";
- $resteapayer = $object->amount - $totalpaye;
- $cssforamountpaymentcomplete = 'amountpaymentcomplete';
+ $resteapayer = $object->amount - $totalpaye;
+ $cssforamountpaymentcomplete = 'amountpaymentcomplete';
+
+ print '| '.$langs->trans("RemainderToPay")." : | ";
+ print ''.price($resteapayer)." |
\n";
- print "| ".$langs->trans("RemainderToPay")." : | ";
- print ''.price($resteapayer)." |
\n";
- //}
print "";
$db->free($resql);
}