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/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++;
}