diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 0bb6c3ed09e..e9b73831979 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -27,6 +27,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.'/compta/sociales/class/paymentsocialcontribution.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -181,7 +182,8 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
if (!$dateech)
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldReqrequire_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+uired", $langs->transnoentities("Date")), null, 'errors');
$action = 'edit';
} elseif (!$dateperiod)
{
@@ -610,14 +612,22 @@ if ($id > 0)
print '
'.$langs->trans("Amount").' | ';
print '';
+ $paymentsocialcontributiontmp = new PaymentSocialContribution($db);
+
if ($num > 0)
{
while ($i < $num)
{
$objp = $db->fetch_object($resql);
+ $paymentsocialcontributiontmp->id = $objp->rowid;
+ $paymentsocialcontributiontmp->ref = $objp->rowid;
+ $paymentsocialcontributiontmp->datep = $db->jdate($objp->dp);
+
print '| ';
- print ''.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.' | ';
+ print $paymentsocialcontributiontmp->getNomUrl(1);
+ print '';
+
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_payment." | \n";
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 6f3074262a2..79e99c87c4c 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -694,7 +694,7 @@ class PaymentSocialContribution extends CommonObject
}
$label .= '
'.$langs->trans('Label').': '.$labeltoshow;
}
- if ($this->date) $label .= '
'.$langs->trans('Date').': '.dol_print_date($this->date, 'day');
+ if ($this->datep) $label .= '
'.$langs->trans('Date').': '.dol_print_date($this->datep, 'day');
if (!empty($this->id)) {
$link = '';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6d9a439964d..434942b0f5c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1783,6 +1783,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
// Add if object was dispatched "into accountancy"
if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
{
+ // Note: For 'chargesociales', 'salaries'... this is the payments that are dispatched (so element = 'bank')
if (method_exists($object, 'getVentilExportCompta'))
{
$accounted = $object->getVentilExportCompta();
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 7a5b430a532..8d5cbd3c2cc 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2461,7 +2461,7 @@ class ExpenseReport extends CommonObject
}
/**
- * Return if an expensereport was dispatched into bookkeeping
+ * Return if object was dispatched into bookkeeping
*
* @return int <0 if KO, 0=no, 1=yes
*/