diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index bc0727889a6..fe29e133edc 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -537,7 +537,7 @@ if ($id > 0)
print $langs->trans('PaymentMode');
print '';
if ($action != 'editmode')
- print '
id . '">' . img_edit($langs->trans('SetMode'), 1) . ' ';
+ print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . ' ';
print '';
print '';
if ($action == 'editmode') {
@@ -555,7 +555,7 @@ if ($id > 0)
print $langs->trans('BankAccount');
print ' ';
if ($action != 'editbankaccount' && $user->rights->tax->charges->creer)
- print ' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
+ print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' ';
print '';
print '';
if ($action == 'editbankaccount') {
@@ -608,9 +608,9 @@ if ($id > 0)
print ' '.$langs->trans("Date").' ';
print ''.$langs->trans("Type").' ';
if (! empty($conf->banque->enabled)) {
- print '' . $langs->trans('BankAccount') . ' ';
+ print '' . $langs->trans('BankAccount') . ' ';
}
- print ''.$langs->trans("Amount").' ';
+ print ''.$langs->trans("Amount").' ';
print '';
if ($num > 0)
@@ -639,12 +639,12 @@ if ($id > 0)
$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
}
- print '';
+ print ' ';
if ($bankaccountstatic->id)
print $bankaccountstatic->getNomUrl(1, 'transactions');
print ' ';
}
- print ''.price($objp->amount)." \n";
+ print ''.price($objp->amount)." \n";
print "";
$totalpaye += $objp->amount;
$i++;
@@ -658,14 +658,14 @@ if ($id > 0)
print '';
}
- 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';
- print ''.$langs->trans("RemainderToPay")." : ";
- print ''.price($resteapayer)." \n";
+ print ''.$langs->trans("RemainderToPay")." : ";
+ print ''.price($resteapayer)." \n";
print "";
$db->free($resql);
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 847cb431a6b..8a8cc1f61b8 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -203,17 +203,17 @@ if ($resql)
// Period end date
print ' ';
// Amount
- print '';
+ print ' ';
print ' ';
print ' ';
print ' ';
// Status
- print '';
+ print ' ';
$liststatus=array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
print $form->selectarray('search_status', $liststatus, $search_status, 1);
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -221,12 +221,12 @@ if ($resql)
print '';
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "id", "", $param, "", $sortfield, $sortorder);
- print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "cs.libelle", "", $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, 'align="left"', $sortfield, $sortorder);
+ print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "cs.libelle", "", $param, 'class="left"', $sortfield, $sortorder);
+ print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "periode", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("DateDue", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cs.paye", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cs.paye", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
print " \n";
@@ -267,7 +267,7 @@ if ($resql)
print '';
// Amount
- print ''.price($obj->amount).' ';
+ print ''.price($obj->amount).' ';
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->amount;
@@ -275,7 +275,7 @@ if ($resql)
// Due date
print ''.dol_print_date($db->jdate($obj->date_ech), 'day').' ';
- print ''.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).' ';
+ print ''.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).' ';
print ' ';
@@ -292,7 +292,7 @@ if ($resql)
print ' ';
print ' ';
print ' ';
- print ''.price($totalarray['totalttc']).' ';
+ print ''.price($totalarray['totalttc']).' ';
print ' ';
print ' ';
print ' ';
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 9b2bb9552a8..384601ca989 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -122,8 +122,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print_liste_field_titre("LabelContrib", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("TypeContrib", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
- print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+ print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print "\n";
$sql = "SELECT c.id, c.libelle as lib,";
@@ -187,9 +187,9 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
if (empty($date)) $date=$obj->date_ech;
print ''.dol_print_date($date, 'day').' ';
// Expected to pay
- print ''.price($obj->total).' ';
+ print ''.price($obj->total).' ';
// Paid
- print '';
+ print ' ';
if ($obj->totalpaye) print price($obj->totalpaye);
print ' ';
print '';
@@ -200,11 +200,11 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$i++;
}
print ''.$langs->trans("Total").' ';
- print ' '; // A total here has no sense
+ print ' '; // A total here has no sense
print ' ';
print ' ';
print ' ';
- print ''.price($totalpaye)." ";
+ print ''.price($totalpaye)." ";
print " ";
}
else
@@ -246,10 +246,10 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '';
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print " \n";
while ($i < $num)
@@ -263,7 +263,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print "".$obj->label." \n";
- print ''.price($obj->amount)." ";
+ print ''.price($obj->amount)." ";
// Ref payment
$tva_static->id=$obj->rowid;
@@ -271,16 +271,16 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print ''.$tva_static->getNomUrl(1)." \n";
print ''.dol_print_date($db->jdate($obj->dm), 'day')." \n";
- print ''.price($obj->amount)." ";
+ print ''.price($obj->amount)." ";
print "\n";
$i++;
}
print ''.$langs->trans("Total").' ';
- print ''.price($total).' ';
+ print ''.price($total).' ';
print ' ';
print ' ';
- print ''.price($total)." ";
+ print ''.price($total)." ";
print " ";
print "";
@@ -347,10 +347,10 @@ while($j<$numlt)
print '';
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print " \n";
while ($i < $num)
@@ -364,7 +364,7 @@ while($j<$numlt)
print "".$obj->label." \n";
- print ''.price($obj->amount)." ";
+ print ''.price($obj->amount)." ";
// Ref payment
$tva_static->id=$obj->rowid;
@@ -372,16 +372,16 @@ while($j<$numlt)
print ''.$tva_static->getNomUrl(1)." \n";
print ''.dol_print_date($db->jdate($obj->dp), 'day')." \n";
- print ''.price($obj->amount)." ";
+ print ''.price($obj->amount)." ";
print "\n";
$i++;
}
- print ''.$langs->trans("Total").' ';
- print ''.price($total)." ";
+ print ''.$langs->trans("Total").' ';
+ print ''.price($total)." ";
print ' ';
print ' ';
- print ''.price($total)." ";
+ print ''.price($total)." ";
print " ";
print "";
@@ -428,10 +428,10 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
print '';
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "s.dateep", "", $param, 'width="140px"', $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "s.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
print " \n";
while ($i < $num)
@@ -446,7 +446,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
print "".$obj->label." \n";
- print ''.($obj->salary?price($obj->salary):'')." ";
+ print ''.($obj->salary?price($obj->salary):'')." ";
// Ref payment
$sal_static->id=$obj->rowid;
@@ -454,16 +454,16 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
print ''.$sal_static->getNomUrl(1)." \n";
print ''.dol_print_date($db->jdate($obj->datep), 'day')." \n";
- print ''.price($obj->amount)." ";
+ print ''.price($obj->amount)." ";
print "\n";
$i++;
}
print ''.$langs->trans("Total").' ';
- print ' '; // A total here has no sense
+ print ' '; // A total here has no sense
print ' ';
print ' ';
- print ''.price($total)." ";
+ print ''.price($total)." ";
print " ";
print "";