';
- print '' . $langs->trans("Total") . ' ';
+ print '' . $langs->trans("Total") . ' ';
for($i = 1; $i <= 12; $i ++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
if ($j > 12) $j-=12;
- print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
+ print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
}
- print '' . $langs->trans("Total") . ' ';
+ print '' . $langs->trans("Total") . ' ';
$sql = "SELECT '" . $langs->trans("TotalExpenseReport") . "' AS label,";
for($i = 1; $i <= 12; $i ++) {
@@ -331,9 +331,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
while ($row = $db->fetch_row($resql)) {
print '' . $row[0] . ' ';
for($i = 1; $i <= 12; $i ++) {
- print '' . price($row[$i]) . ' ';
+ print '' . price($row[$i]) . ' ';
}
- print '' . price($row[13]) . ' ';
+ print '' . price($row[13]) . ' ';
print ' ';
}
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index d8dd122150c..c617f984af3 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -319,7 +319,7 @@ if ($result) {
print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->comments);
print '';
- print '' . price($objp->total_ht) . ' ';
+ print '' . price($objp->total_ht) . ' ';
print '' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' ';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 8057c9809f2..6977d76845d 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -376,12 +376,12 @@ if ($result) {
print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->comments);
print '';
- print '';
+ print ' ';
print price($objp->price);
print ' ';
// Vat rate
- print '';
+ print ' ';
print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
print ' ';
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 3147339601c..fc5d4062b43 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -601,8 +601,8 @@ if (empty($action) || $action == 'view') {
print "" . $langs->trans("AccountAccounting") . " ";
print "" . $langs->trans("SubledgerAccount") . " ";
print "" . $langs->trans("LabelOperation") . " ";
- print "" . $langs->trans("Debit") . " ";
- print "" . $langs->trans("Credit") . " ";
+ print "" . $langs->trans("Debit") . " ";
+ print "" . $langs->trans("Credit") . " ";
print "\n";
$r = '';
@@ -644,8 +644,8 @@ if (empty($action) || $action == 'view') {
$userstatic->id = $tabuser[$key]['id'];
$userstatic->name = $tabuser[$key]['name'];
print "" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $accountingaccount->label . " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " ";
print "";
}
}
@@ -677,8 +677,8 @@ if (empty($action) || $action == 'view') {
else print $accountoshow;
print '';
print "" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("SubledgerAccount") . " ";
- print '' . ($mt < 0 ? - price(- $mt) : '') . " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? - price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
print "";
}
@@ -709,8 +709,8 @@ if (empty($action) || $action == 'view') {
print '';
print "" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
print " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " ";
print "";
}
}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 28d4916884f..37f1f9d9eae 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -788,8 +788,8 @@ if (empty($action) || $action == 'view') {
print "" . $langs->trans("AccountAccounting") . " ";
print "" . $langs->trans("SubledgerAccount") . " ";
print "" . $langs->trans("LabelOperation") . " ";
- print "" . $langs->trans("Debit") . " ";
- print "" . $langs->trans("Credit") . " ";
+ print "" . $langs->trans("Debit") . " ";
+ print "" . $langs->trans("Credit") . " ";
print "\n";
$r = '';
@@ -841,8 +841,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " ";
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
print "";
continue;
@@ -862,8 +862,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " ";
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
print "";
}
@@ -893,8 +893,8 @@ if (empty($action) || $action == 'view') {
else print $accountoshow;
print '';
print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount") . " ";
- print ''. ($mt < 0 ? price(- $mt) : '') . " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print ''. ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
print "";
//}
}
@@ -924,8 +924,8 @@ if (empty($action) || $action == 'view') {
$companystatic->id = $tabcompany[$key]['id'];
$companystatic->name = $tabcompany[$key]['name'];
print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $accountingaccount->label . " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " ";
print "";
//}
}
@@ -958,8 +958,8 @@ if (empty($action) || $action == 'view') {
print "";
print $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
print " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " ";
print "";
}
}
@@ -987,8 +987,8 @@ if (empty($action) || $action == 'view') {
print "";
print ' ';
print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart) ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
print "";
}
}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 243c9fb943c..09bc9a18e9a 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -725,8 +725,8 @@ if (empty($action) || $action == 'view') {
print "" . $langs->trans("AccountAccounting") . " ";
print "" . $langs->trans("SubledgerAccount") . " ";
print "" . $langs->trans("LabelOperation") . " ";
- print "" . $langs->trans("Debit") . " ";
- print "" . $langs->trans("Credit") . " ";
+ print "" . $langs->trans("Debit") . " ";
+ print "" . $langs->trans("Credit") . " ";
print "\n";
$r = '';
@@ -776,8 +776,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " ";
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
print "";
continue;
@@ -797,8 +797,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " ";
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
print "";
}
@@ -829,8 +829,8 @@ if (empty($action) || $action == 'view') {
else print $accountoshow;
print '';
print "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount") . " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " ";
print "";
//}
}
@@ -861,8 +861,8 @@ if (empty($action) || $action == 'view') {
$companystatic->id = $tabcompany[$key]['id'];
$companystatic->name = $tabcompany[$key]['name'];
print "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label . " ";
- print "" . ($mt < 0 ? price(- $mt) : '') . " ";
- print "" . ($mt >= 0 ? price($mt) : '') . " ";
+ print "" . ($mt < 0 ? price(- $mt) : '') . " ";
+ print "" . ($mt >= 0 ? price($mt) : '') . " ";
print "";
//}
}
@@ -895,8 +895,8 @@ if (empty($action) || $action == 'view') {
print '';
print "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
print " ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " ";
- print '' . ($mt >= 0 ? price($mt) : '') . " ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " ";
print "";
}
}
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 5e993d43834..d63f8ee52fa 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -155,13 +155,13 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '',
print '';
print '
';
print '' . $langs->trans("Account") . ' ';
-print '' . $langs->trans("Label") . ' ';
+print '' . $langs->trans("Label") . ' ';
for($i = 1; $i <= 12; $i ++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
if ($j > 12) $j-=12;
- print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
+ print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
}
-print '' . $langs->trans("Total") . ' ';
+print '' . $langs->trans("Total") . ' ';
$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') ." AS codecomptable,";
$sql .= " " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
@@ -203,10 +203,10 @@ if ($resql) {
else print $row[1];
print '';
for($i = 2; $i <= 12; $i ++) {
- print '' . price($row[$i]) . ' ';
+ print '' . price($row[$i]) . ' ';
}
- print '' . price($row[13]) . ' ';
- print '' . price($row[14]) . ' ';
+ print '' . price($row[13]) . ' ';
+ print '' . price($row[14]) . ' ';
print '';
}
$db->free($resql);
@@ -226,13 +226,13 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '',
print '';
print '
';
print '' . $langs->trans("Account") . ' ';
-print '' . $langs->trans("Label") . ' ';
+print '' . $langs->trans("Label") . ' ';
for($i = 1; $i <= 12; $i ++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
if ($j > 12) $j-=12;
- print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
+ print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
}
-print '' . $langs->trans("Total") . ' ';
+print '' . $langs->trans("Total") . ' ';
$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') ." AS codecomptable,";
$sql .= " " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
@@ -274,10 +274,10 @@ if ($resql) {
else print $row[1];
print '';
for($i = 2; $i <= 12; $i++) {
- print '' . price($row[$i]) . ' ';
+ print '' . price($row[$i]) . ' ';
}
- print '' . price($row[13]) . ' ';
- print '' . price($row[14]) . ' ';
+ print '' . price($row[13]) . ' ';
+ print '' . price($row[14]) . ' ';
print '';
}
$db->free($resql);
@@ -299,13 +299,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '';
print '
';
- print '' . $langs->trans("Total") . ' ';
+ print '' . $langs->trans("Total") . ' ';
for($i = 1; $i <= 12; $i ++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
if ($j > 12) $j-=12;
- print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
+ print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' ';
}
- print '' . $langs->trans("Total") . ' ';
+ print '' . $langs->trans("Total") . ' ';
$sql = "SELECT '" . $langs->trans("CAHTF") . "' AS label,";
for($i = 1; $i <= 12; $i ++) {
@@ -329,9 +329,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
while ($row = $db->fetch_row($resql)) {
print '' . $row[0] . ' ';
for($i = 1; $i <= 12; $i ++) {
- print '' . price($row[$i]) . ' ';
+ print '' . price($row[$i]) . ' ';
}
- print '' . price($row[13]) . ' ';
+ print '' . price($row[13]) . ' ';
print ' ';
}
$db->free($resql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 580cf4c407c..051562c656e 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -396,9 +396,9 @@ if ($result) {
print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
print '';
- print '' . price($objp->total_ht) . ' ';
+ print '' . price($objp->total_ht) . ' ';
- print '' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' ';
+ print '' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' ';
print '' . $langs->trans("Country".$objp->country_code) .' ('.$objp->country_code.') ';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 5ac90068ffb..4ca53d4bcab 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -491,7 +491,7 @@ if ($result) {
print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
print '';
- print '';
+ print ' ';
print price($objp->total_ht);
print ' ';
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index cb1fdfac816..bf14ff09fcd 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -198,7 +198,7 @@ if ($conf->facture->enabled)
}
else
{
- print '';
+ print ' ';
print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name"));
print ' ';
}
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 51aca179195..cad250a60d0 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -168,14 +168,14 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC))
print '';
print ''.$langs->trans("Parameter").' ';
- print ''.$langs->trans("Value").' ';
+ print ''.$langs->trans("Value").' ';
print " \n";
// Force Type
$adht = new AdherentType($db);
print '';
print $langs->trans("ForceMemberType");
- print ' ';
+ print ' ';
$listofval = array(-1 => $langs->trans("Undefined"));
$listofval += $adht->liste_array();
$forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1;
@@ -185,21 +185,21 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC))
// Amount
print ' ';
print $langs->trans("DefaultAmount");
- print ' ';
+ print ' ';
print ' ';
print " \n";
// Can edit
print '';
print $langs->trans("CanEditAmount");
- print ' ';
+ print ' ';
print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1);
print " \n";
// Jump to an online payment page
print '';
print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
- print ' ';
+ print ' ';
$listofval=array();
$listofval['-1']=$langs->trans('No');
$listofval['all']=$langs->trans('Yes').' ('.$langs->trans("VisitorCanChooseItsPaymentMode").')';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 3d1883eda0a..b3c40e0bfeb 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -203,7 +203,7 @@ if ($conf->use_javascript_ajax)
print $dolgraph->show($total?0:1);
print ' ';
- print ''.$langs->trans("Total").' ';
+ print ' '.$langs->trans("Total").' ';
print $SommeA+$SommeB+$SommeC+$SommeD;
print ' ';
print '
';
@@ -247,9 +247,9 @@ print '
';
print '
';
print '';
print ''.$langs->trans("Subscriptions").' ';
-print ''.$langs->trans("Number").' ';
-print ''.$langs->trans("AmountTotal").' ';
-print ''.$langs->trans("AmountAverage").' ';
+print ''.$langs->trans("Number").' ';
+print ''.$langs->trans("AmountTotal").' ';
+print ''.$langs->trans("AmountAverage").' ';
print " \n";
krsort($Total);
@@ -257,18 +257,18 @@ foreach ($Total as $key=>$value)
{
print '';
print "$key ";
- print "".$Number[$key]." ";
- print "".price($value)." ";
- print "".price(price2num($value/$Number[$key],'MT'))." ";
+ print "".$Number[$key]." ";
+ print "".price($value)." ";
+ print "".price(price2num($value/$Number[$key],'MT'))." ";
print " \n";
}
// Total
print '';
print ''.$langs->trans("Total").' ';
-print "".$numb." ";
-print ''.price($tot)." ";
-print "".price(price2num($numb>0?($tot/$numb):0,'MT'))." ";
+print "".$numb." ";
+print ''.price($tot)." ";
+print "".price(price2num($numb>0?($tot/$numb):0,'MT'))." ";
print " \n";
print "
";
print "
\n";
@@ -325,7 +325,7 @@ if ($resql)
print '
'.$staticmember->getNomUrl(1,32).' ';
print '
'.$statictype->getNomUrl(1,32).' ';
print '
'.dol_print_date($db->jdate($obj->datem),'dayhour').' ';
- print '
'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).' ';
+ print '
'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).' ';
print '';
$i++;
}
@@ -385,9 +385,9 @@ if ($resql)
print '
'.$subscriptionstatic->getNomUrl(1).' ';
print '
'.$staticmember->getNomUrl(1,32,'subscription').' ';
print '
'.get_date_range($db->jdate($obj->date_start),$db->jdate($obj->date_end)).' ';
- print '
'.price($obj->subscription).' ';
- //print '
'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).' ';
- print '
'.dol_print_date($db->jdate($obj->datem?$obj->datem:$obj->datec),'dayhour').' ';
+ print '
'.price($obj->subscription).' ';
+ //print '
'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).' ';
+ print '
'.dol_print_date($db->jdate($obj->datem?$obj->datem:$obj->datec),'dayhour').' ';
print '';
$i++;
}
@@ -406,28 +406,28 @@ print '
';
print '
';
print '';
print ''.$langs->trans("MembersTypes").' ';
-print ''.$langs->trans("MembersStatusToValid").' ';
-print ''.$langs->trans("MenuMembersNotUpToDate").' ';
-print ''.$langs->trans("MenuMembersUpToDate").' ';
-print ''.$langs->trans("MembersStatusResiliated").' ';
+print ''.$langs->trans("MembersStatusToValid").' ';
+print ''.$langs->trans("MenuMembersNotUpToDate").' ';
+print ''.$langs->trans("MenuMembersUpToDate").' ';
+print ''.$langs->trans("MembersStatusResiliated").' ';
print " \n";
foreach ($AdherentType as $key => $adhtype)
{
print '';
print ''.$adhtype->getNomUrl(1, dol_size(32)).' ';
- print ''.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).' ';
- print ''.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).' ';
- print ''.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).' ';
- print ''.(isset($MembersResiliated[$key]) && $MembersResiliated[$key]> 0 ?$MembersResiliated[$key]:'').' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).' ';
+ print ''.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).' ';
+ print ''.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).' ';
+ print ''.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).' ';
+ print ''.(isset($MembersResiliated[$key]) && $MembersResiliated[$key]> 0 ?$MembersResiliated[$key]:'').' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).' ';
print " \n";
}
print '';
print ''.$langs->trans("Total").' ';
-print ''.$SommeA.' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).' ';
-print ''.$SommeB.' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).' ';
-print ''.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).' ';
-print ''.$SommeD.' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).' ';
+print ''.$SommeA.' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).' ';
+print ''.$SommeB.' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).' ';
+print ''.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).' ';
+print ''.$SommeD.' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).' ';
print ' ';
print "
\n";
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d7b3f3304ff..8a8186fcd2b 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -870,7 +870,7 @@ if (isset($totalarray['pos']))
while ($i < $totalarray['nbfield'])
{
$i++;
- if (! empty($totalarray['pos'][$i])) print '
'.price($totalarray['val'][$totalarray['pos'][$i]]).' ';
+ if (! empty($totalarray['pos'][$i])) print '
'.price($totalarray['val'][$totalarray['pos'][$i]]).' ';
else
{
if ($i == 1)
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index defbde2dce2..cc40a5a4120 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -119,7 +119,7 @@ else
print '
';
print '';
print ''.$langs->trans("Nature").' ';
-print ''.$langs->trans("NbOfMembers").' ';
+print ''.$langs->trans("NbOfMembers").' ';
print ''.$langs->trans("LatestSubscriptionDate").' ';
print ' ';
@@ -132,7 +132,7 @@ foreach ($data as $val)
$year = $val['year'];
print '';
print ''.$memberstatic->getmorphylib($val['label']).' ';
- print ''.$val['nb'].' ';
+ print ''.$val['nb'].' ';
print ''.dol_print_date($val['lastdate'],'dayhour').' ';
print ' ';
$oldyear=$year;
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 2175569b7ce..8da764179a4 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -286,7 +286,7 @@ if ($mode)
print '';
print ''.$label.' ';
if ($label2) print ''.$label2.' ';
- print ''.$langs->trans("NbOfMembers").' ';
+ print ''.$langs->trans("NbOfMembers").' ';
print ''.$langs->trans("LastMemberDate").' ';
print ' ';
@@ -297,7 +297,7 @@ if ($mode)
print '';
print ''.$val['label'].' ';
if ($label2) print ''.$val['label2'].' ';
- print ''.$val['nb'].' ';
+ print ''.$val['nb'].' ';
print ''.dol_print_date($val['lastdate'],'dayhour').' ';
print ' ';
$oldyear=$year;
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index feebd776d94..e9866d20f1a 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -171,9 +171,9 @@ print '';
print '
';
print '';
print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("NbOfSubscriptions").' ';
-print ''.$langs->trans("AmountTotal").' ';
-print ''.$langs->trans("AmountAverage").' ';
+print ''.$langs->trans("NbOfSubscriptions").' ';
+print ''.$langs->trans("AmountTotal").' ';
+print ''.$langs->trans("AmountAverage").' ';
print ' ';
$oldyear=0;
@@ -189,9 +189,9 @@ foreach ($data as $val)
print $oldyear;
print '';
print '';
- print '0 ';
- print '0 ';
- print '0 ';
+ print '0 ';
+ print '0 ';
+ print '0 ';
print '';
}
print '';
@@ -200,9 +200,9 @@ foreach ($data as $val)
print $year;
//print '';
print '';
- print ''.$val['nb'].' ';
- print ''.price(price2num($val['total'],'MT'),1).' ';
- print ''.price(price2num($val['avg'],'MT'),1).' ';
+ print ''.$val['nb'].' ';
+ print ''.price(price2num($val['total'],'MT'),1).' ';
+ print ''.price(price2num($val['avg'],'MT'),1).' ';
print ' ';
$oldyear=$year;
}
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 29a1c97ca90..e476492fdfa 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -610,7 +610,7 @@ if ($rowid > 0)
print '';
if ($action != 'editlogin' && $user->rights->adherent->creer)
{
- print '';
+ print ' ';
if ($user->rights->user->user->creer)
{
print 'id.'">'.img_edit($langs->trans('SetLinkToUser'),1).' ';
@@ -695,10 +695,10 @@ if ($rowid > 0)
print ' '.$langs->trans("DateCreation").' ';
print ''.$langs->trans("DateStart").' ';
print ''.$langs->trans("DateEnd").' ';
- print ''.$langs->trans("Amount").' ';
+ print ''.$langs->trans("Amount").' ';
if (! empty($conf->banque->enabled))
{
- print ''.$langs->trans("Account").' ';
+ print ''.$langs->trans("Account").' ';
}
print "\n";
@@ -716,10 +716,10 @@ if ($rowid > 0)
print ''.dol_print_date($db->jdate($objp->datec),'dayhour')." \n";
print ''.dol_print_date($db->jdate($objp->dateh),'day')." \n";
print ''.dol_print_date($db->jdate($objp->datef),'day')." \n";
- print ''.price($objp->subscription).' ';
+ print ''.price($objp->subscription).' ';
if (! empty($conf->banque->enabled))
{
- print '';
+ print ' ';
if ($objp->bid)
{
$accountstatic->label=$objp->label;
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 336122c605e..b6e3afc8a19 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -541,7 +541,7 @@ while ($i < min($num, $limit))
// Price
if (! empty($arrayfields['d.amount']['checked']))
{
- print ' '.price($obj->subscription).' ';
+ print ''.price($obj->subscription).' ';
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='d.amount';
$totalarray['val']['d.amount'] += $obj->subscription;
@@ -591,7 +591,7 @@ if (isset($totalarray['pos']))
while ($i < $totalarray['nbfield'])
{
$i++;
- if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).' ';
+ if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).' ';
else
{
if ($i == 1)
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index eec61e3ba22..988dda8fce6 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -46,13 +46,13 @@ foreach($linkedObjectBlock as $key => $objectlink)
getNomUrl(1); ?>
dateh,'day'); ?>
- rights->adherent->lire) {
$total = $total + $objectlink->amount;
echo price($objectlink->amount);
} ?>
-
- id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
+
+ id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
'.yn($objp->subscription).'';
print ''.yn($objp->vote).' ';
if ($user->rights->adherent->configurer)
- print 'rowid.'">'.img_edit().' ';
+ print 'rowid.'">'.img_edit().' ';
else
- print ' ';
+ print ' ';
print "";
$i++;
}
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index d7ef0c4d62b..a7a11068256 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -266,7 +266,7 @@ print '';
print '';
print ''.$langs->trans("TreeMenuPersonalized").' ';
-print ' ';
@@ -326,7 +326,7 @@ if ($conf->use_javascript_ajax)
'position'=>$menu['position'],
'entry'=>''.
' '.$titre.' '.
- ' '.
+ ' '.
''.img_edit('default',0,'class="menuEdit" id="edit'.$menu['rowid'].'"').' '.
''.img_edit_add('default').' '.
''.img_delete('default').' '.
@@ -373,7 +373,7 @@ if ($conf->use_javascript_ajax)
print ' ';
print ''.$langs->trans("NotTopTreeMenuPersonalized").' ';
- print ' ';
+ print ' ';
print ' ';
print '';
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index addeb3793c6..c19c7075784 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -87,14 +87,14 @@ else
print ''.$langs->trans("TableName").' ';
print ''.$langs->trans("Type").' ';
print ''.$langs->trans("Format").' ';
- print ''.$langs->trans("NbOfRecord").' ';
- print 'Avg_row_length ';
- print 'Data_length ';
- print 'Max_Data_length ';
- print 'Index_length ';
- print 'Increment ';
- print 'Last check ';
- print 'Collation ';
+ print ''.$langs->trans("NbOfRecord").' ';
+ print 'Avg_row_length ';
+ print 'Data_length ';
+ print 'Max_Data_length ';
+ print 'Index_length ';
+ print 'Increment ';
+ print 'Last check ';
+ print 'Collation ';
print " \n";
$sql = "SHOW TABLE STATUS";
@@ -120,14 +120,14 @@ else
print ' ';
}
print ''.$obj->Row_format.' ';
- print ''.$obj->Rows.' ';
- print ''.$obj->Avg_row_length.' ';
- print ''.$obj->Data_length.' ';
- print ''.$obj->Max_data_length.' ';
- print ''.$obj->Index_length.' ';
- print ''.$obj->Auto_increment.' ';
- print ''.$obj->Check_time.' ';
- print ''.$obj->Collation.' ';
+ print ''.$obj->Rows.' ';
+ print ''.$obj->Avg_row_length.' ';
+ print ''.$obj->Data_length.' ';
+ print ''.$obj->Max_data_length.' ';
+ print ''.$obj->Index_length.' ';
+ print ''.$obj->Auto_increment.' ';
+ print ''.$obj->Check_time.' ';
+ print ''.$obj->Collation.' ';
print '';
$i++;
}
@@ -162,11 +162,11 @@ else
$row = $db->fetch_row($resql);
print '';
print ''.$row[0].' ';
- print ''.$row[1].' ';
- print ''.$row[2].' ';
- print ''.$row[3].' ';
- print ''.$row[4].' ';
- print ''.$row[5].' ';
+ print ''.$row[1].' ';
+ print ''.$row[2].' ';
+ print ''.$row[3].' ';
+ print ''.$row[4].' ';
+ print ''.$row[5].' ';
print ' ';
$i++;
}
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 85c3a8a1d94..f81053e1631 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -141,7 +141,7 @@ print ''.$langs->trans("SessionSavePath").' '.$langs->trans("SessionName").' '.session_name().' '."\n";
print ''.$langs->trans("SessionId").' '.session_id().' '."\n";
print ''.$langs->trans("CurrentSessionTimeOut").' (session.gc_maxlifetime) '.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
-print ' ';
+print ' ';
print ''."\n";
print ''."\n";
print ''."\n";
@@ -179,14 +179,14 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
print ' ';
print ''.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").' ';
print ''.$langs->trans("NbOfEntries").' ';
- print ''.$langs->trans("Address").' ';
+ print ''.$langs->trans("Address").' ';
print ' '."\n";
foreach($shmoparray as $key => $val)
{
print ''.$key.' ';
print ''.count($val).' ';
- print ''.dol_getshmopaddress($key).' ';
+ print ''.dol_getshmopaddress($key).' ';
print ' '."\n";
}
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index ba8307792fc..094212d817b 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -275,8 +275,8 @@ if (! $error && $xml)
$out.='' . $langs->trans("Filename") . ' ';
$out.='' . $langs->trans("ExpectedChecksum") . ' ';
$out.='' . $langs->trans("CurrentChecksum") . ' ';
- $out.='' . $langs->trans("Size") . ' ';
- $out.='' . $langs->trans("DateModification") . ' ';
+ $out.='' . $langs->trans("Size") . ' ';
+ $out.='' . $langs->trans("DateModification") . ' ';
$out.=''."\n";
$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
if (is_array($tmpfilelist2) && count($tmpfilelist2))
@@ -292,8 +292,8 @@ if (! $error && $xml)
$out.=''.$file['md5'].' ' . "\n";
$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
$totalsize += $size;
- $out.=''.dol_print_size($size).' ' . "\n";
- $out.=''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').' ' . "\n";
+ $out.=''.dol_print_size($size).' ' . "\n";
+ $out.=''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').' ' . "\n";
$out.="\n";
}
$out.='';
@@ -301,8 +301,8 @@ if (! $error && $xml)
$out.=''.$langs->trans("Total").' ' . "\n";
$out.=' ' . "\n";
$out.=' ' . "\n";
- $out.=''.dol_print_size($totalsize).' ' . "\n";
- $out.=' ' . "\n";
+ $out.=''.dol_print_size($totalsize).' ' . "\n";
+ $out.=' ' . "\n";
$out.=" \n";
}
else
@@ -325,8 +325,8 @@ if (! $error && $xml)
$out.='' . $langs->trans("Filename") . ' ';
$out.='' . $langs->trans("ExpectedChecksum") . ' ';
$out.='' . $langs->trans("CurrentChecksum") . ' ';
- $out.='' . $langs->trans("Size") . ' ';
- $out.='' . $langs->trans("DateModification") . ' ';
+ $out.='' . $langs->trans("Size") . ' ';
+ $out.='' . $langs->trans("DateModification") . ' ';
$out.=''."\n";
$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
if (is_array($tmpfilelist3) && count($tmpfilelist3))
@@ -347,8 +347,8 @@ if (! $error && $xml)
$out.=''.$file['md5'].' ' . "\n";
$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
$totalsize += $size;
- $out.=''.dol_print_size($size).' ' . "\n";
- $out.=''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').' ' . "\n";
+ $out.=''.dol_print_size($size).' ' . "\n";
+ $out.=''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').' ' . "\n";
$out.="\n";
}
$out.='';
@@ -356,8 +356,8 @@ if (! $error && $xml)
$out.=''.$langs->trans("Total").' ' . "\n";
$out.=' ' . "\n";
$out.=' ' . "\n";
- $out.=''.dol_print_size($totalsize).' ' . "\n";
- $out.=' ' . "\n";
+ $out.=''.dol_print_size($totalsize).' ' . "\n";
+ $out.=' ' . "\n";
$out.=" \n";
}
else
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index c6209cd7c34..0dc6b16b8e7 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -174,9 +174,9 @@ function create_script_table($list)
print '';
print ''.dol_trunc($script['file'],80,'left').' ';
print ''.dol_print_date($script['mtime'],'dayhour').' ';
- print ''.number_format($script['size'] / 1024, 2).'KB ';
- print ''.$script['reloads'].' ('.$script['usecount'].') ';
- print ''.$script['hits'].' ';
+ print ''.number_format($script['size'] / 1024, 2).'KB ';
+ print ''.$script['reloads'].' ('.$script['usecount'].') ';
+ print ''.$script['hits'].' ';
print ' ';
}
print '
';
@@ -204,8 +204,8 @@ function create_key_table($list)
print '';
print ''.dol_trunc($key['name'],80,'left').' ';
print ''.dol_print_date($key['created'],'dayhour').' ';
- print ''.number_format($key['size']/1024, 3).'KB ';
- print '';
+ print ' '.number_format($key['size']/1024, 3).'KB ';
+ print '';
if ($key['ttl'] == -1) {
print 'expired';
} elseif ($key['ttl'] == 0) {
@@ -232,37 +232,37 @@ print ' ';
print '';
print 'Caching enabled ';
-print ''.($info['cache']?'yes':'no').' ';
+print ''.($info['cache']?'yes':'no').' ';
print ' ';
print '';
print 'Optimizer enabled ';
-print ''.$info['optimizer']?'yes':'no'.' ';
+print ''.$info['optimizer']?'yes':'no'.' ';
print ' ';
print '';
print 'Memory usage ';
-print ''.number_format(100 * $info['memoryAllocated']/$info['memorySize'], 2).'%('.number_format($info['memoryAllocated'] / (1024*1024), 2).'MB / '.number_format($info['memorySize']/(1024*1024), 2).'MB) ';
+print ''.number_format(100 * $info['memoryAllocated']/$info['memorySize'], 2).'%('.number_format($info['memoryAllocated'] / (1024*1024), 2).'MB / '.number_format($info['memorySize']/(1024*1024), 2).'MB) ';
print ' ';
print '';
print 'Free memory in reserved cache ';
-print ''.number_format($info['memoryAvailable']/(1024*1024), 2).'MB ';
+print ''.number_format($info['memoryAvailable']/(1024*1024), 2).'MB ';
print ' ';
print '';
print 'Cached scripts ';
-print ''.$info['cachedScripts'].' ';
+print ''.$info['cachedScripts'].' ';
print ' ';
print '';
print 'Removed scripts ';
-print ''.$info['removedScripts'].' ';
+print ''.$info['removedScripts'].' ';
print ' ';
print '';
print 'Cached keys ';
-print ''.(isset($info['cachedKeys'])?$info['cachedKeys']:'').' ';
+print ''.(isset($info['cachedKeys'])?$info['cachedKeys']:'').' ';
print ' ';
print '
';
@@ -279,29 +279,29 @@ if (is_array($resCached) || is_array($resRemoved)) {
if (is_array($resCached)) {
print '';
print "Caching ";
- print ' ';
+ print ' ';
print " ";
print '';
print "Optimizer ";
- print ' ';
+ print ' ';
print " ";
}
if (is_array($resRemoved)) {
print '';
print "Clear cache ";
- print ' ';
+ print ' ';
print " ";
print '';
print "Clean cache ";
- print ' ';
+ print ' ';
print " ";
print '';
print "Purge cache ";
- print ' ';
+ print ' ';
print "
";
}
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index eedb22f0aa8..4558af0baae 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -313,7 +313,7 @@ if ($result)
print '';
// More informations
- print '
';
+ print ' ';
$htmltext=''.$langs->trans("UserAgent").' : '.($obj->user_agent?$obj->user_agent:$langs->trans("Unknown"));
print $form->textwithpicto('',$htmltext);
print ' ';