diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 11d2b3acd35..ab905f745de 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -394,7 +394,7 @@ print '
';
print ' ';
print '';
print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $search_status, 1);
-print ' ';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -505,11 +505,11 @@ if ($num > 0)
if(!empty($obj->dateend)) {print dol_print_date($db->jdate($obj->dateend), 'dayhour');}
print '';
- print '';
+ print ' ';
if (!empty($obj->maxrun)) {print $obj->maxrun;}
print ' ';
- print '';
+ print ' ';
if (!empty($obj->nbrun)) {print $obj->nbrun;} else {print '0';}
print ' ';
@@ -554,11 +554,11 @@ if ($num > 0)
print '';
// Status
- print '';
+ print ' ';
print $object->getLibStatut(3);
print ' ';
- print '';
+ print ' ';
$backtourl = urlencode($_SERVER["PHP_SELF"].'?'.$param.($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:''));
if ($user->rights->cron->create)
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 951c2586346..a5e296ae1e6 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -137,10 +137,10 @@ print ' ';
print '";
//print $langs->trans("ECMSectionManualDesc");
@@ -162,7 +162,7 @@ foreach($sectionauto as $sectioncur)
print " ".$sectioncur['label'].': ';
print '';
print ' ';
print ' ';
@@ -173,7 +173,7 @@ foreach($sectionauto as $sectioncur)
//if ($butshown % 2 == 1)
// print ' ';
-print ' ';
+print ' ';
print "";
//print $langs->trans("ECMSectionAutoDesc");
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index a08ad27de74..613efa62c70 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1892,9 +1892,9 @@ else
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 ' ';
print '';
@@ -1948,12 +1948,12 @@ else
$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
}
- print '';
+ print ' ';
if ($bankaccountstatic->id)
print $bankaccountstatic->getNomUrl(1, 'transactions');
print ' ';
}
- print ''.price($objp->amount)." ";
+ print ''.price($objp->amount)." ";
print ' ';
print "";
$totalpaid += $objp->amount;
@@ -1975,10 +1975,10 @@ else
{
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
- print ''.$langs->trans("AlreadyPaid").': '.price($totalpaid).' ';
- print ''.$langs->trans("AmountExpected").': '.price($object->total_ttc).' ';
+ print ''.$langs->trans("AlreadyPaid").': '.price($totalpaid).' ';
+ print ''.$langs->trans("AmountExpected").': '.price($object->total_ttc).' ';
- print ''.$langs->trans("RemainderToPay").': ';
+ print ''.$langs->trans("RemainderToPay").': ';
print ''.price($resteapayeraffiche).' ';
$db->free($resql);
@@ -2014,26 +2014,26 @@ else
$i = 0;$total = 0;
print '';
- print ''.$langs->trans('LineNb').' ';
- //print ''.$langs->trans('Piece').' ';
- print ''.$langs->trans('Date').' ';
+ print ''.$langs->trans('LineNb').' ';
+ //print ''.$langs->trans('Piece').' ';
+ print ''.$langs->trans('Date').' ';
if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' ';
if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''.$langs->trans('CarCategory').' ';
- print ''.$langs->trans('Type').' ';
- print ''.$langs->trans('Description').' ';
- print ''.$langs->trans('VAT').' ';
- print ''.$langs->trans('PriceUHT').' ';
- print ''.$langs->trans('PriceUTTC').' ';
- print ''.$langs->trans('Qty').' ';
+ print ''.$langs->trans('Type').' ';
+ print ''.$langs->trans('Description').' ';
+ print ''.$langs->trans('VAT').' ';
+ print ''.$langs->trans('PriceUHT').' ';
+ print ''.$langs->trans('PriceUTTC').' ';
+ print ''.$langs->trans('Qty').' ';
if ($action != 'editline')
{
- print ''.$langs->trans('AmountHT').' ';
- print ''.$langs->trans('AmountTTC').' ';
+ print ''.$langs->trans('AmountHT').' ';
+ print ''.$langs->trans('AmountTTC').' ';
}
// Ajout des boutons de modification/suppression
if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
{
- print ' ';
+ print ' ';
}
print ' ';
@@ -2045,16 +2045,16 @@ else
{
print '';
- print '';
+ print ' ';
print $numline;
print ' ';
- /*print '';
+ /*print ' ';
print img_picto($langs->trans("Document"), "object_generic");
print ' '.$piece_comptable.' ';
print ' ';*/
- print ''.dol_print_date($db->jdate($line->date), 'day').' ';
+ print ''.dol_print_date($db->jdate($line->date), 'day').' ';
if (! empty($conf->projet->enabled))
{
print '';
@@ -2076,10 +2076,10 @@ else
$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
print $labeltype;
print ' ';
- print ''.dol_escape_htmltag($line->comments).' ';
- print ''.vatrate($line->vatrate, true).' ';
+ print ''.dol_escape_htmltag($line->comments).' ';
+ print ''.vatrate($line->vatrate, true).' ';
// Unit price HT
- print '';
+ print ' ';
if (! empty($line->value_unit_ht))
{
print price($line->value_unit_ht);
@@ -2092,20 +2092,20 @@ else
}
print ' ';
- print ''.price($line->value_unit).' ';
+ print ''.price($line->value_unit).' ';
- print ''.dol_escape_htmltag($line->qty).' ';
+ print ''.dol_escape_htmltag($line->qty).' ';
if ($action != 'editline')
{
- print ''.price($line->total_ht).' ';
- print ''.price($line->total_ttc).' ';
+ print ''.price($line->total_ht).' ';
+ print ''.price($line->total_ttc).' ';
}
// Ajout des boutons de modification/suppression
if (($object->fk_statut < ExpenseReport::STATUS_VALIDATED || $object->fk_statut == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer)
{
- print '';
+ print ' ';
print 'id.'&action=editline&rowid='.$line->rowid.'#'.$line->rowid.'">';
print img_edit();
@@ -2158,32 +2158,32 @@ else
print ' ';
// VAT
- print '';
+ print ' ';
print $form->load_tva('vatrate', (isset($_POST["vatrate"])?$_POST["vatrate"]:$line->vatrate), $mysoc, '', 0, 0, '', false, 1);
print ' ';
// Unit price
- print '';
+ print ' ';
print ' ';
print ' ';
// Unit price with tax
- print '';
+ print ' ';
print ' ';
print ' ';
// Quantity
- print '';
+ print ' ';
print ' ';
print ' ';
if ($action != 'editline')
{
- print ''.$langs->trans('AmountHT').' ';
- print ''.$langs->trans('AmountTTC').' ';
+ print ''.$langs->trans('AmountHT').' ';
+ print ''.$langs->trans('AmountTTC').' ';
}
- print '';
+ print ' ';
print ' ';
print ' ';
print ' ';
@@ -2354,15 +2354,15 @@ else
print ' ';
print ' ';
- print ''.$langs->trans('Date').' ';
+ print ''.$langs->trans('Date').' ';
if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' ';
if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''.$langs->trans('CarCategory').' ';
- print ''.$langs->trans('Type').' ';
+ print ''.$langs->trans('Type').' ';
print ''.$langs->trans('Description').' ';
- print ''.$langs->trans('VAT').' ';
- print ''.$langs->trans('PriceUHT').' ';
- print ''.$langs->trans('PriceUTTC').' ';
- print ''.$langs->trans('Qty').' ';
+ print ''.$langs->trans('VAT').' ';
+ print ''.$langs->trans('PriceUHT').' ';
+ print ''.$langs->trans('PriceUTTC').' ';
+ print ''.$langs->trans('Qty').' ';
print ' ';
print ' ';
@@ -2372,7 +2372,7 @@ else
print ' ';
// Select date
- print '';
+ print ' ';
print $form->selectDate($date?$date:-1, 'date', 0, 0, 0, '', 1, 1);
print ' ';
@@ -2393,7 +2393,7 @@ else
}
// Select type
- print '';
+ print ' ';
select_type_fees_id($fk_c_type_fees, 'fk_c_type_fees', 1);
print ' ';
@@ -2403,34 +2403,34 @@ else
print '';
// Select VAT
- print '';
+ print ' ';
$defaultvat=-1;
if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false, 1);
print ' ';
// Unit price net
- print '';
+ print ' ';
print ' ';
print ' ';
// Unit price with tax
- print '';
+ print ' ';
print ' ';
print ' ';
// Quantity
- print '';
+ print ' ';
print ' '; // We must be able to enter decimal qty
print ' ';
if ($action != 'editline')
{
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
}
- print ' ';
+ print ' ';
print '';
} // Fin si c'est payé/validé
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index fd073e28fba..0bc5c533f9e 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -856,12 +856,12 @@ class ExpenseReport extends CommonObject
print '';
print ''.$objp->ref_num.' ';
- print ''.dol_print_date($objp->date, 'day').' ';
+ print ''.dol_print_date($objp->date, 'day').' ';
print ''.$author->getNomUrl(1).' ';
print ''.$objp->comments.' ';
- print ''.price($objp->total_ht).' ';
- print ''.price($objp->total_ttc).' ';
- print '';
+ print ' '.price($objp->total_ht).' ';
+ print ''.price($objp->total_ttc).' ';
+ print '';
switch($objp->fk_c_expensereport_status) {
case 4:
@@ -895,8 +895,8 @@ class ExpenseReport extends CommonObject
}
print ' '.$langs->trans("Number").': '.$i.' ';
- print ''.$langs->trans("TotalHT").' : '.price($total_HT).' ';
- print ''.$langs->trans("TotalTTC").' : '.price($total_TTC).' ';
+ print ''.$langs->trans("TotalHT").' : '.price($total_HT).' ';
+ print ''.$langs->trans("TotalTTC").' : '.price($total_TTC).' ';
print ' ';
print ' ';
}
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index bfe5bc59126..f7d4e2a8405 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -122,7 +122,7 @@ foreach ($listoftype as $code => $label)
if ($conf->use_javascript_ajax)
{
- print '';
+ print ' ';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$dolgraph = new DolGraph();
@@ -139,7 +139,7 @@ if ($conf->use_javascript_ajax)
print ' ';
print ''.$langs->trans("Total").' ';
-print ''.price($totalsum, 1, $langs, 0, 0, 0, $conf->currency).' ';
+print ''.price($totalsum, 1, $langs, 0, 0, 0, $conf->currency).' ';
print ' ';
print '';
@@ -183,9 +183,9 @@ if ($result)
print '';
print '';
print ''.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).' ';
- print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("DateModificationShort").' ';
+ print ''.$langs->trans("AmountHT").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("DateModificationShort").' ';
print ' ';
print ' ';
if ($num)
@@ -208,10 +208,10 @@ if ($result)
print '';
print ''.$expensereportstatic->getNomUrl(1).' ';
print ''.$userstatic->getNomUrl(-1).' ';
- print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
- print ''.dol_print_date($db->jdate($obj->dm), 'day').' ';
- print '';
+ print ' '.price($obj->total_ht).' ';
+ print ''.price($obj->total_ttc).' ';
+ print ''.dol_print_date($db->jdate($obj->dm), 'day').' ';
+ print '';
//print $obj->libelle;
print $expensereportstatic->LibStatut($obj->fk_status, 3);
print ' ';
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index c59b6d70e0f..c221baf7d65 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -556,16 +556,16 @@ if ($resql)
// Amount with no tax
if (! empty($arrayfields['d.total_ht']['checked']))
{
- print ' ';
+ print ' ';
}
if (! empty($arrayfields['d.total_vat']['checked']))
{
- print ' ';
+ print ' ';
}
// Amount with all taxes
if (! empty($arrayfields['d.total_ttc']['checked']))
{
- print ' ';
+ print ' ';
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -589,12 +589,12 @@ if ($resql)
// Status
if (! empty($arrayfields['d.fk_statut']['checked']))
{
- print '';
+ print ' ';
select_expensereport_statut($search_status, 'search_status', 1, 1);
print ' ';
}
// Action column
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -670,7 +670,7 @@ if ($resql)
print '';
}
print '';
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->expensereport->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -696,28 +696,28 @@ if ($resql)
}
// Start date
if (! empty($arrayfields['d.date_debut']['checked'])) {
- print ' '.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').' ';
+ print ''.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').' ';
if (! $i) $totalarray['nbfield']++;
}
// End date
if (! empty($arrayfields['d.date_fin']['checked'])) {
- print ''.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').' ';
+ print ''.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').' ';
if (! $i) $totalarray['nbfield']++;
}
// Date validation
if (! empty($arrayfields['d.date_valid']['checked'])) {
- print ''.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').' ';
+ print ''.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').' ';
if (! $i) $totalarray['nbfield']++;
}
// Date approval
if (! empty($arrayfields['d.date_approve']['checked'])) {
- print ''.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').' ';
+ print ''.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').' ';
if (! $i) $totalarray['nbfield']++;
}
// Amount HT
if (! empty($arrayfields['d.total_ht']['checked']))
{
- print ''.price($obj->total_ht)." \n";
+ print ''.price($obj->total_ht)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
$totalarray['totalht'] += $obj->total_ht;
@@ -725,7 +725,7 @@ if ($resql)
// Amount VAT
if (! empty($arrayfields['d.total_vat']['checked']))
{
- print ''.price($obj->total_tva)." \n";
+ print ''.price($obj->total_tva)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
$totalarray['totalvat'] += $obj->total_tva;
@@ -733,7 +733,7 @@ if ($resql)
// Amount TTC
if (! empty($arrayfields['d.total_ttc']['checked']))
{
- print ''.price($obj->total_ttc)." \n";
+ print ''.price($obj->total_ttc)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
@@ -748,7 +748,7 @@ if ($resql)
// Date creation
if (! empty($arrayfields['d.date_create']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_create), 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -756,7 +756,7 @@ if ($resql)
// Date modification
if (! empty($arrayfields['d.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -764,11 +764,11 @@ if ($resql)
// Status
if (! empty($arrayfields['d.fk_statut']['checked']))
{
- print ''.$expensereportstatic->getLibStatut(5).' ';
+ print ''.$expensereportstatic->getLibStatut(5).' ';
if (! $i) $totalarray['nbfield']++;
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
@@ -808,9 +808,9 @@ if ($resql)
if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
else print ''.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
- elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
- elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
+ elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
+ elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
+ elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
else print ' ';
}
print ' ';
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 83de49358bc..73da11f4619 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -229,10 +229,10 @@ if ($resql)
print '';
print ''.$langs->trans('ExpenseReport').' ';
- print ''.$langs->trans('ExpectedToPay').' ';
- print ''.$langs->trans('PayedByThisPayment').' ';
- print ''.$langs->trans('RemainderToPay').' ';
- print ''.$langs->trans('Status').' ';
+ print ''.$langs->trans('ExpectedToPay').' ';
+ print ''.$langs->trans('PayedByThisPayment').' ';
+ print ''.$langs->trans('RemainderToPay').' ';
+ print ''.$langs->trans('Status').' ';
print " \n";
if ($num > 0)
@@ -252,16 +252,16 @@ if ($resql)
print "\n";
// Expected to pay
- print ''.price($objp->total_ttc).' ';
+ print ''.price($objp->total_ttc).' ';
// Amount paid
- print ''.price($objp->amount).' ';
+ print ''.price($objp->amount).' ';
// Remain to pay
- print ''.price($remaintopay).' ';
+ print ''.price($remaintopay).' ';
// Status
- print ''.$expensereport->getLibStatut(4, $objp->amount).' ';
+ print ''.$expensereport->getLibStatut(4, $objp->amount).' ';
print "\n";
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index cda372317ab..d95edae6450 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -289,10 +289,10 @@ if ($action == 'create' || empty($action))
print '';
print '';
- print ''.$langs->trans("Amount").' ';
- print ''.$langs->trans("AlreadyPaid").' ';
- print ''.$langs->trans("RemainderToPay").' ';
- print ''.$langs->trans("Amount").' ';
+ print ''.$langs->trans("Amount").' ';
+ print ''.$langs->trans("AlreadyPaid").' ';
+ print ''.$langs->trans("RemainderToPay").' ';
+ print ''.$langs->trans("Amount").' ';
print " \n";
$total=0;
@@ -304,10 +304,10 @@ if ($action == 'create' || empty($action))
print '';
- print ''.price($objp->total_ttc)." ";
- print ''.price($sumpaid)." ";
- print ''.price($objp->total_ttc - $sumpaid)." ";
- print '';
+ print ' '.price($objp->total_ttc)." ";
+ print ''.price($sumpaid)." ";
+ print ''.price($objp->total_ttc - $sumpaid)." ";
+ print '';
if ($sumpaid < $objp->total_ttc)
{
$namef = "amount_".$objp->id;
@@ -335,11 +335,11 @@ if ($action == 'create' || empty($action))
{
// Print total
print ' ';
- print ''.$langs->trans("Total").': ';
- print "".price($total_ttc)." ";
- print "".price($totalrecu)." ";
- print "".price($total_ttc - $totalrecu)." ";
- print ' ';
+ print ''.$langs->trans("Total").': ';
+ print ''.price($total_ttc).' ';
+ print ''.price($totalrecu).' ';
+ print ''.price($total_ttc - $totalrecu).' ';
+ print ' ';
print " \n";
}
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index eb269d4f5f8..8980238c07b 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -242,7 +242,7 @@ if (! in_array($year, $arrayyears)) $arrayyears[$year]=$year;
arsort($arrayyears);
print $form->selectarray('year', $arrayyears, $year, 0);
print '';
-print ' ';
+print ' ';
print '
';
print '';
print ' ';
@@ -250,10 +250,10 @@ print ' ';
print '';
print '
';
print '';
-print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("Number").' ';
-print ''.$langs->trans("AmountTotal").' ';
-print ''.$langs->trans("AmountAverage").' ';
+print ''.$langs->trans("Year").' ';
+print ''.$langs->trans("Number").' ';
+print ''.$langs->trans("AmountTotal").' ';
+print ''.$langs->trans("AmountAverage").' ';
print ' ';
$oldyear=0;
@@ -265,19 +265,19 @@ foreach ($data as $val)
$oldyear--;
print '';
- print ''.$oldyear.' ';
- print '0 ';
- print '0 ';
- print '0 ';
+ print ''.$oldyear.' ';
+ print '0 ';
+ print '0 ';
+ print '0 ';
print ' ';
}
print '';
- print ''.$year.' ';
- print ''.$val['nb'].' ';
- print ''.price(price2num($val['total'], 'MT'), 1).' ';
- print ''.price(price2num($val['avg'], 'MT'), 1).' ';
+ print ''.$year.' ';
+ print ''.$val['nb'].' ';
+ print ''.price(price2num($val['total'], 'MT'), 1).' ';
+ print ''.price(price2num($val['avg'], 'MT'), 1).' ';
print ' ';
$oldyear=$year;
}
@@ -289,7 +289,7 @@ print '';
// Show graphs
-print '