diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 22f2c1b7113..d9dfb2f5c17 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3281,7 +3281,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
}
@@ -3291,7 +3291,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7');
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
}
@@ -3301,7 +3301,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
}
@@ -3311,7 +3311,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidatedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
if ($statut==self::STATUS_ACCEPTED) return ''.$langs->trans('StatusOrderSentShort').$billedtext.' '.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7');
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut4');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDeliveredShort').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index c8dd329bb61..b7a465145b8 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2885,7 +2885,7 @@ elseif (! empty($object->id))
print "| ".$langs->trans("Delivery")." | \n";
$liv = array();
$liv[''] = ' ';
- $liv['tot'] = $langs->trans("TotalWoman");
+ $liv['tot'] = $langs->trans("CompleteOrNoMoreReceptionExpected");
$liv['par'] = $langs->trans("PartialWoman");
$liv['nev'] = $langs->trans("NeverReceived");
$liv['can'] = $langs->trans("Canceled");
diff --git a/htdocs/theme/eldy/img/statut0.png b/htdocs/theme/eldy/img/statut0.png
index d11252783a4..f5fce354236 100644
Binary files a/htdocs/theme/eldy/img/statut0.png and b/htdocs/theme/eldy/img/statut0.png differ
diff --git a/htdocs/theme/eldy/img/statut0_40x40.png b/htdocs/theme/eldy/img/statut0_40x40.png
new file mode 100644
index 00000000000..591aac8e9de
Binary files /dev/null and b/htdocs/theme/eldy/img/statut0_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut1.png b/htdocs/theme/eldy/img/statut1.png
index 88f3b3c53a0..87b09403e68 100644
Binary files a/htdocs/theme/eldy/img/statut1.png and b/htdocs/theme/eldy/img/statut1.png differ
diff --git a/htdocs/theme/eldy/img/statut1_40x40.png b/htdocs/theme/eldy/img/statut1_40x40.png
new file mode 100644
index 00000000000..6def06ceaff
Binary files /dev/null and b/htdocs/theme/eldy/img/statut1_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut2.png b/htdocs/theme/eldy/img/statut2.png
deleted file mode 100644
index ad5a7084474..00000000000
Binary files a/htdocs/theme/eldy/img/statut2.png and /dev/null differ
diff --git a/htdocs/theme/eldy/img/statut3.png b/htdocs/theme/eldy/img/statut3.png
index e7515796683..bf4f7b8e854 100644
Binary files a/htdocs/theme/eldy/img/statut3.png and b/htdocs/theme/eldy/img/statut3.png differ
diff --git a/htdocs/theme/eldy/img/statut3_40x40.png b/htdocs/theme/eldy/img/statut3_40x40.png
new file mode 100644
index 00000000000..f71ef4eb962
Binary files /dev/null and b/htdocs/theme/eldy/img/statut3_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut4.png b/htdocs/theme/eldy/img/statut4.png
index 6dc05edeba7..7a680ad2b2d 100644
Binary files a/htdocs/theme/eldy/img/statut4.png and b/htdocs/theme/eldy/img/statut4.png differ
diff --git a/htdocs/theme/eldy/img/statut4_40x40.png b/htdocs/theme/eldy/img/statut4_40x40.png
new file mode 100644
index 00000000000..2da24b66484
Binary files /dev/null and b/htdocs/theme/eldy/img/statut4_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut5.png b/htdocs/theme/eldy/img/statut5.png
index 53264a0515d..98bb941a0e5 100644
Binary files a/htdocs/theme/eldy/img/statut5.png and b/htdocs/theme/eldy/img/statut5.png differ
diff --git a/htdocs/theme/eldy/img/statut5_40x40.png b/htdocs/theme/eldy/img/statut5_40x40.png
new file mode 100644
index 00000000000..7cac0ad23ee
Binary files /dev/null and b/htdocs/theme/eldy/img/statut5_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut6.png b/htdocs/theme/eldy/img/statut6.png
index c76ab86fe60..fe93f1a0bcc 100644
Binary files a/htdocs/theme/eldy/img/statut6.png and b/htdocs/theme/eldy/img/statut6.png differ
diff --git a/htdocs/theme/eldy/img/statut6_40x40.png b/htdocs/theme/eldy/img/statut6_40x40.png
new file mode 100644
index 00000000000..0b847c322e2
Binary files /dev/null and b/htdocs/theme/eldy/img/statut6_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut7.png b/htdocs/theme/eldy/img/statut7.png
index 8871a45519f..77476349d6d 100644
Binary files a/htdocs/theme/eldy/img/statut7.png and b/htdocs/theme/eldy/img/statut7.png differ
diff --git a/htdocs/theme/eldy/img/statut7_40x40.png b/htdocs/theme/eldy/img/statut7_40x40.png
new file mode 100644
index 00000000000..48314ccb183
Binary files /dev/null and b/htdocs/theme/eldy/img/statut7_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut8.png b/htdocs/theme/eldy/img/statut8.png
index c24d4a9dac2..2627aab8710 100644
Binary files a/htdocs/theme/eldy/img/statut8.png and b/htdocs/theme/eldy/img/statut8.png differ
diff --git a/htdocs/theme/eldy/img/statut8_40x40.png b/htdocs/theme/eldy/img/statut8_40x40.png
new file mode 100644
index 00000000000..0546ac2c773
Binary files /dev/null and b/htdocs/theme/eldy/img/statut8_40x40.png differ
diff --git a/htdocs/theme/eldy/img/statut9.png b/htdocs/theme/eldy/img/statut9.png
index 9aa2ae34620..e5304dd791b 100644
Binary files a/htdocs/theme/eldy/img/statut9.png and b/htdocs/theme/eldy/img/statut9.png differ
diff --git a/htdocs/theme/eldy/img/statut9_40x40.png b/htdocs/theme/eldy/img/statut9_40x40.png
new file mode 100644
index 00000000000..445eac35387
Binary files /dev/null and b/htdocs/theme/eldy/img/statut9_40x40.png differ
diff --git a/htdocs/theme/md/img/statut0.png b/htdocs/theme/md/img/statut0.png
index d11252783a4..f5fce354236 100644
Binary files a/htdocs/theme/md/img/statut0.png and b/htdocs/theme/md/img/statut0.png differ
diff --git a/htdocs/theme/md/img/statut0_40x40.png b/htdocs/theme/md/img/statut0_40x40.png
new file mode 100644
index 00000000000..591aac8e9de
Binary files /dev/null and b/htdocs/theme/md/img/statut0_40x40.png differ
diff --git a/htdocs/theme/md/img/statut1.png b/htdocs/theme/md/img/statut1.png
index 558439d282e..87b09403e68 100644
Binary files a/htdocs/theme/md/img/statut1.png and b/htdocs/theme/md/img/statut1.png differ
diff --git a/htdocs/theme/md/img/statut1_40x40.png b/htdocs/theme/md/img/statut1_40x40.png
new file mode 100644
index 00000000000..6def06ceaff
Binary files /dev/null and b/htdocs/theme/md/img/statut1_40x40.png differ
diff --git a/htdocs/theme/md/img/statut3.png b/htdocs/theme/md/img/statut3.png
index e7515796683..bf4f7b8e854 100644
Binary files a/htdocs/theme/md/img/statut3.png and b/htdocs/theme/md/img/statut3.png differ
diff --git a/htdocs/theme/md/img/statut3_40x40.png b/htdocs/theme/md/img/statut3_40x40.png
new file mode 100644
index 00000000000..f71ef4eb962
Binary files /dev/null and b/htdocs/theme/md/img/statut3_40x40.png differ
diff --git a/htdocs/theme/md/img/statut4.png b/htdocs/theme/md/img/statut4.png
index 6ec1ba55961..7a680ad2b2d 100644
Binary files a/htdocs/theme/md/img/statut4.png and b/htdocs/theme/md/img/statut4.png differ
diff --git a/htdocs/theme/md/img/statut4_40x40.png b/htdocs/theme/md/img/statut4_40x40.png
new file mode 100644
index 00000000000..2da24b66484
Binary files /dev/null and b/htdocs/theme/md/img/statut4_40x40.png differ
diff --git a/htdocs/theme/md/img/statut5.png b/htdocs/theme/md/img/statut5.png
index 53264a0515d..98bb941a0e5 100644
Binary files a/htdocs/theme/md/img/statut5.png and b/htdocs/theme/md/img/statut5.png differ
diff --git a/htdocs/theme/md/img/statut5_40x40.png b/htdocs/theme/md/img/statut5_40x40.png
new file mode 100644
index 00000000000..7cac0ad23ee
Binary files /dev/null and b/htdocs/theme/md/img/statut5_40x40.png differ
diff --git a/htdocs/theme/md/img/statut6.png b/htdocs/theme/md/img/statut6.png
index b964afff603..fe93f1a0bcc 100644
Binary files a/htdocs/theme/md/img/statut6.png and b/htdocs/theme/md/img/statut6.png differ
diff --git a/htdocs/theme/md/img/statut6_40x40.png b/htdocs/theme/md/img/statut6_40x40.png
new file mode 100644
index 00000000000..0b847c322e2
Binary files /dev/null and b/htdocs/theme/md/img/statut6_40x40.png differ
diff --git a/htdocs/theme/md/img/statut7.png b/htdocs/theme/md/img/statut7.png
index 8871a45519f..77476349d6d 100644
Binary files a/htdocs/theme/md/img/statut7.png and b/htdocs/theme/md/img/statut7.png differ
diff --git a/htdocs/theme/md/img/statut7_40x40.png b/htdocs/theme/md/img/statut7_40x40.png
new file mode 100644
index 00000000000..48314ccb183
Binary files /dev/null and b/htdocs/theme/md/img/statut7_40x40.png differ
diff --git a/htdocs/theme/md/img/statut8.png b/htdocs/theme/md/img/statut8.png
index c24d4a9dac2..2627aab8710 100644
Binary files a/htdocs/theme/md/img/statut8.png and b/htdocs/theme/md/img/statut8.png differ
diff --git a/htdocs/theme/md/img/statut8_40x40.png b/htdocs/theme/md/img/statut8_40x40.png
new file mode 100644
index 00000000000..0546ac2c773
Binary files /dev/null and b/htdocs/theme/md/img/statut8_40x40.png differ
diff --git a/htdocs/theme/md/img/statut9.png b/htdocs/theme/md/img/statut9.png
index 94b6dabf265..e5304dd791b 100644
Binary files a/htdocs/theme/md/img/statut9.png and b/htdocs/theme/md/img/statut9.png differ
diff --git a/htdocs/theme/md/img/statut9_40x40.png b/htdocs/theme/md/img/statut9_40x40.png
new file mode 100644
index 00000000000..445eac35387
Binary files /dev/null and b/htdocs/theme/md/img/statut9_40x40.png differ
|