';
$max = 5;
/*
- * Last modified orders
+ * Lattest modified orders
*/
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
@@ -272,7 +277,6 @@ if ($resql)
if ($num)
{
$i = 0;
- $var = true;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
@@ -320,6 +324,7 @@ if ($resql)
}
else dol_print_error($db);
+$max = 10;
/*
* Orders to process
@@ -335,7 +340,7 @@ if (!empty($conf->commande->enabled))
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE c.fk_soc = s.rowid";
$sql .= " AND c.entity IN (".getEntity('commande').")";
- $sql .= " AND c.fk_statut = 1";
+ $sql .= " AND c.fk_statut = ".Commande::STATUS_VALIDATED;
if ($socid) $sql .= " AND c.fk_soc = ".$socid;
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
$sql .= " ORDER BY c.rowid DESC";
@@ -344,16 +349,16 @@ if (!empty($conf->commande->enabled))
if ($resql)
{
$num = $db->num_rows($resql);
+
print '
';
print '
';
print '';
- print '| '.$langs->trans("OrdersToProcess").' '.$num.' |
';
+ print ''.$langs->trans("OrdersToProcess").' '.$num.' | ';
if ($num)
{
$i = 0;
- $var = true;
- while ($i < $num)
+ while ($i < $num && $i < $max)
{
$obj = $db->fetch_object($resql);
print '';
@@ -395,6 +400,9 @@ if (!empty($conf->commande->enabled))
print '
';
$i++;
}
+ if ($i < $num) {
+ print '| '.$langs->trans("More").'... | | |
';
+ }
}
print "
";
@@ -403,7 +411,7 @@ if (!empty($conf->commande->enabled))
}
/*
- * Orders thar are in a shipping process
+ * Orders that are in process
*/
if (!empty($conf->commande->enabled))
{
@@ -416,7 +424,7 @@ if (!empty($conf->commande->enabled))
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE c.fk_soc = s.rowid";
$sql .= " AND c.entity IN (".getEntity('commande').")";
- $sql .= " AND c.fk_statut = 2 ";
+ $sql .= " AND c.fk_statut = ".Commande::STATUS_ACCEPTED;
if ($socid) $sql .= " AND c.fk_soc = ".$socid;
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
$sql .= " ORDER BY c.rowid DESC";
@@ -429,13 +437,12 @@ if (!empty($conf->commande->enabled))
print '
';
print '
';
print '';
- print '| '.$langs->trans("OnProcessOrders").' '.$num.' |
';
+ print ''.$langs->trans("OnProcessOrders").' '.$num.' | ';
if ($num)
{
$i = 0;
- $var = true;
- while ($i < $num)
+ while ($i < $num && $i < $max)
{
$obj = $db->fetch_object($resql);
print '';
@@ -477,6 +484,9 @@ if (!empty($conf->commande->enabled))
print '
';
$i++;
}
+ if ($i < $num) {
+ print '| '.$langs->trans("More").'... | | |
';
+ }
}
print "
";
}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ef9ee7f2cd7..a8af4262d58 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -830,7 +830,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
{
- print '
'."\n";
+ print '
'."\n";
print '| ';
print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
if ($projectstatic->title)
@@ -1449,7 +1449,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
}
- print ' |
'."\n";
+ print '
'."\n";
print '| ';
print $projectstatic->getNomUrl(1, '', 0, ''.$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
@@ -1797,7 +1797,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
{
- print ' |
'."\n";
+ print '
'."\n";
print '| ';
print $projectstatic->getNomUrl(1, '', 0, ''.$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 2489104eb34..3ae9866d73f 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -606,8 +606,8 @@ if (!empty($arrayfields['t.progress']['checked']))
/*print ' | '.$langs->trans("TimeSpent").' | ';
if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' | ';
else print ''.$langs->trans("TimeSpentByUser").' | ';*/
-print ''.$langs->trans("TimeSpent").' ('.$langs->trans("Everybody").') | ';
-print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ' ('.dol_trunc($usertoprocess->firstname, 10).')' : '').' | ';
+print ''.$langs->trans("TimeSpent").' '.$langs->trans("Everybody").' | ';
+print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ' '.dol_trunc($usertoprocess->firstname, 10).'' : '').' | ';
print ''.$langs->trans("HourStart").'';
// By default, we can edit only tasks we are assigned to
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index b5d4bcc633d..7f337818c1d 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -500,8 +500,8 @@ print ' | '.$langs->trans("ProgressDeclared").
/*print ' | '.$langs->trans("TimeSpent").' | ';
if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' | ';
else print ''.$langs->trans("TimeSpentByUser").' | ';*/
-print ''.$langs->trans("TimeSpent").' ('.$langs->trans("Everybody").') | ';
-print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ' ('.dol_trunc($usertoprocess->firstname, 10).')' : '').' | ';
+print ''.$langs->trans("TimeSpent").' '.$langs->trans("Everybody").' | ';
+print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ' '.dol_trunc($usertoprocess->firstname, 10).'' : '').' | ';
foreach ($TWeek as $week_number)
{
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 7a153d41631..8b8ba5d7295 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -660,8 +660,8 @@ if (!empty($arrayfields['t.progress']['checked']))
/*print ''.$langs->trans("TimeSpent").' | ';
if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' | ';
else print ''.$langs->trans("TimeSpentByUser").' | ';*/
-print ''.$langs->trans("TimeSpent").' ('.$langs->trans("Everybody").') | ';
-print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ' ('.dol_trunc($usertoprocess->firstname, 10).')' : '').' | ';
+print ''.$langs->trans("TimeSpent").' '.$langs->trans("Everybody").' | ';
+print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ' '.dol_trunc($usertoprocess->firstname, 10).'' : '').' | ';
for ($idw = 0; $idw < 7; $idw++)
{
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 5067a4935bc..133f0c1c0a6 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1557,7 +1557,7 @@ if ($action == 'create')
print '
';
print '
';
if ($action == 'editdate_livraison') {
- print ' |