'."\n";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 8b466d655b3..a2384158926 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -383,16 +383,6 @@ if ($resql)
$moreforfilter='';
- // If the user can view thirdparties other than his'
- if ($user->rights->societe->client->voir || $socid)
- {
- $langs->load("commercial");
- $moreforfilter.='
';
- $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
- $moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
- $moreforfilter.='
';
- }
-
// If the user can view user other than himself
$moreforfilter.='
';
$moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ': ';
@@ -411,6 +401,16 @@ if ($resql)
$moreforfilter.='
';
}
+ // If the user can view thirdparties other than his'
+ if ($user->rights->societe->client->voir || $socid)
+ {
+ $langs->load("commercial");
+ $moreforfilter.='
';
+ $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
+ $moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+ $moreforfilter.='
';
+ }
+
if (! empty($moreforfilter))
{
print '
';
@@ -586,7 +586,9 @@ if ($resql)
print ''."\n";
- $i = 0;
+ $i=0;
+ $var=true;
+ $totalarray=array();
while ($i < min($num,$limit))
{
$obj = $db->fetch_object($resql);
@@ -612,6 +614,7 @@ if ($resql)
print $projectstatic->getNomUrl(1);
if ($projectstatic->hasDelay()) print img_warning($langs->trans('Late'));
print '';
+ if (! $i) $totalarray['nbfield']++;
}
// Title
if (! empty($arrayfields['p.title']['checked']))
@@ -619,6 +622,7 @@ if ($resql)
print '
';
print dol_trunc($obj->title,80);
print ' ';
+ if (! $i) $totalarray['nbfield']++;
}
// Company
if (! empty($arrayfields['s.nom']['checked']))
@@ -635,6 +639,7 @@ if ($resql)
print ' ';
}
print '';
+ if (! $i) $totalarray['nbfield']++;
}
// Sales Representatives
if (! empty($arrayfields['commercial']['checked']))
@@ -676,6 +681,7 @@ if ($resql)
print ' ';
}
print '';
+ if (! $i) $totalarray['nbfield']++;
}
// Date start
if (! empty($arrayfields['p.dateo']['checked']))
@@ -683,13 +689,15 @@ if ($resql)
print '';
print dol_print_date($db->jdate($obj->date_start),'day');
print ' ';
- }
+ if (! $i) $totalarray['nbfield']++;
+ }
// Date end
if (! empty($arrayfields['p.datee']['checked']))
{
print '';
print dol_print_date($db->jdate($obj->date_end),'day');
print ' ';
+ if (! $i) $totalarray['nbfield']++;
}
// Visibility
if (! empty($arrayfields['p.public']['checked']))
@@ -698,31 +706,46 @@ if ($resql)
if ($obj->public) print $langs->trans('SharedProject');
else print $langs->trans('PrivateProject');
print '';
+ if (! $i) $totalarray['nbfield']++;
}
// Amount
if (! empty($arrayfields['p.opp_amount']['checked']))
{
print '';
- if ($obj->opp_status_code) print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+ if ($obj->opp_status_code)
+ {
+ print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+ $totalarray['totalopp'] += $obj->opp_amount;
+ }
print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totaloppfield']=$totalarray['nbfield'];
}
if (! empty($arrayfields['p.fk_opp_status']['checked']))
{
print '';
if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code);
print ' ';
- }
+ if (! $i) $totalarray['nbfield']++;
+ }
if (! empty($arrayfields['p.opp_percent']['checked']))
{
print '';
if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
print ' ';
- }
+ if (! $i) $totalarray['nbfield']++;
+ }
if (! empty($arrayfields['p.budget_amount']['checked']))
{
print '';
- if ($obj->budget_amount != '') print price($obj->budget_amount, 1, '', 1, -1, -1);
+ if ($obj->budget_amount != '')
+ {
+ print price($obj->budget_amount, 1, '', 1, -1, -1);
+ $totalarray['totalbudget'] += $obj->budget_amount;
+ }
print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalbudgetfield']=$totalarray['nbfield'];
}
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -740,6 +763,7 @@ if ($resql)
print '';
}
}
+ if (! $i) $totalarray['nbfield']++;
}
// Fields from hook
$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
@@ -751,6 +775,7 @@ if ($resql)
print '';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
print ' ';
+ if (! $i) $totalarray['nbfield']++;
}
// Date modification
if (! empty($arrayfields['p.tms']['checked']))
@@ -758,16 +783,26 @@ if ($resql)
print '';
print dol_print_date($db->jdate($obj->date_update), 'dayhour');
print ' ';
+ if (! $i) $totalarray['nbfield']++;
}
// Status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
$projectstatic->statut = $obj->fk_statut;
print ''.$projectstatic->getLibStatut(5).' ';
+ if (! $i) $totalarray['nbfield']++;
}
- // Action column
- 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;
+ if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
+
print "\n";
}
@@ -775,6 +810,27 @@ if ($resql)
$i++;
}
+
+ // Show total line
+ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield']))
+ {
+ print '';
+ $i=0;
+ while ($i < $totalarray['nbfield'])
+ {
+ $i++;
+ if ($i == 1)
+ {
+ if ($num < $limit) print ''.$langs->trans("Total").' ';
+ else print ''.$langs->trans("Totalforthispage").' ';
+ }
+ elseif ($totalarray['totaloppfield'] == $i) print ''.price($totalarray['totalopp']).' ';
+ elseif ($totalarray['totalbudgetfield'] == $i) print ''.price($totalarray['totalbudget']).' ';
+ else print ' ';
+ }
+
$db->free($resql);
$parameters=array('sql' => $sql);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f32685f6eeb..bf5a0e66085 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2773,6 +2773,9 @@ tr.liste_titre_topborder td {
.liste_titre td a.notasortlink {
color: rgb();
}
+.liste_titre td a.notasortlink:hover {
+ background: transparent;
+}
tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
{
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index fb0a8d972b2..4c790b20d44 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2638,6 +2638,9 @@ tr.liste_titre_topborder td {
.liste_titre td a.notasortlink {
color: rgb();
}
+.liste_titre td a.notasortlink:hover {
+ background: transparent;
+}
div.liste_titre {
padding-left: 3px;
}