diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index e82d30bebc2..be784dbf5ad 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -1048,8 +1048,8 @@ class Mo extends CommonObject $statusType = 'status'.$status; if ($status == self::STATUS_VALIDATED) $statusType = 'status1'; if ($status == self::STATUS_INPROGRESS) $statusType = 'status3'; - if ($status == self::STATUS_PRODUCED) $statusType = 'status5'; - if ($status == self::STATUS_CANCELED) $statusType = 'status6'; + if ($status == self::STATUS_PRODUCED) $statusType = 'status6'; + if ($status == self::STATUS_CANCELED) $statusType = 'status5'; return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); } diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index d4fbd628a4d..4488342ab73 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -693,7 +693,7 @@ if ($conf->use_javascript_ajax) print ''; print ''; print $langs->trans("Total"); - print ' - '.$langs->trans("ExpectedWorkedHours").': '.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).''; + print ' - '.$langs->trans("ExpectedWorkedHours").': '.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).''; print ''; for ($idw = 0; $idw < 7; $idw++) @@ -810,7 +810,7 @@ if (count($tasksarray) > 0) print ' '; print $langs->trans("Total"); - print ' - '.$langs->trans("ExpectedWorkedHours").': '.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).''; + print ' - '.$langs->trans("ExpectedWorkedHours").': '.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).''; print ''; for ($idw = 0; $idw < 7; $idw++)