| ' . $langs->trans("Account") . ' | ';
print '' . $langs->trans("Label") . ' | ';
for($i = 1; $i <= 12; $i ++) {
- print '' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . ' | ';
+ print '' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . ' | ';
}
-print '' . $langs->trans("Total") . ' |
';
+print '';
print '| ' . $langs->trans("TotalVente") . ' | ';
for($i = 1; $i <= 12; $i ++) {
- print '' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . ' | ';
+ print '' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . ' | ';
}
-print '' . $langs->trans("Total") . ' |
';
+print '' . $langs->trans("Total") . ' | ';
$sql = "SELECT '" . $langs->trans("TotalVente") . "' AS total,";
for($i = 1; $i <= 12; $i ++) {
@@ -264,9 +264,9 @@ if (! empty($conf->margin->enabled)) {
print '';
print '| ' . $langs->trans("TotalMarge") . ' | ';
for($i = 1; $i <= 12; $i ++) {
- print '' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . ' | ';
+ print '' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . ' | ';
}
- print '' . $langs->trans("Total") . ' |
';
+ print '' . $langs->trans("Total") . ' | ';
$sql = "SELECT '" . $langs->trans("Vide") . "' AS marge,";
for($i = 1; $i <= 12; $i ++) {
@@ -291,9 +291,9 @@ if (! empty($conf->margin->enabled)) {
print '| ' . $row[0] . ' | ';
for($i = 1; $i <= 12; $i ++) {
- print '' . price($row[$i]) . ' | ';
+ print '' . price(price2num($row[$i])) . ' | ';
}
- print '' . price($row[13]) . ' | ';
+ print '' . price(price2num($row[13])) . ' | ';
print '
';
}
$db->free($resql);
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 136dd0985f4..31e4ea7ccff 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -87,6 +87,11 @@ if (! $user->rights->accounting->ventilation->dispatch)
$formventilation = new FormVentilation($db);
+
+/*
+ * Actions
+ */
+
// Purge search criteria
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
{
@@ -148,10 +153,6 @@ print '';
-/*
- * Action
- */
-
/*
* Customer Invoice lines
*/
@@ -251,7 +252,7 @@ if ($result) {
print '
' . $langs->trans("ChangeAccount") . '
';
print $formventilation->select_account($account_parent, 'account_parent', 1);
- print '
';
+ print '';
print '';
print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 0c1a4d1eb6b..7d2326b05e5 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -103,9 +103,12 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) {
$search_vat = '';
}
+
+
/*
* View
*/
+
llxHeader('', $langs->trans("Ventilation"));
print '