diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index c6b5eb46515..e3f26b1ccd7 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -924,7 +924,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire); $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire); } - // Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("StatusSupplierOrderBilled"), 2, $user->rights->fournisseur->commande->lire); + // Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire); $newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index ddaa74e2525..64c7ca73b7b 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -648,7 +648,6 @@ class CommandeFournisseur extends CommonOrder $this->statuts[5] = 'StatusSupplierOrderReceivedAll'; $this->statuts[6] = 'StatusSupplierOrderCanceled'; // Approved->Canceled $this->statuts[7] = 'StatusSupplierOrderCanceled'; // Process running->canceled - //$this->statuts[8] = 'StatusSupplierOrderBilled'; // Everything is finished, order received totally and bill received $this->statuts[9] = 'StatusSupplierOrderRefused'; // List of language codes for status diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 6a99b7e5a6b..3197cc12bca 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -37,7 +37,6 @@ StatusOrderDeliveredShort=Delivered StatusOrderToBillShort=Delivered StatusOrderApprovedShort=Approved StatusOrderRefusedShort=Refused -StatusOrderBilledShort=Billed StatusOrderToProcessShort=To process StatusOrderReceivedPartiallyShort=Partially received StatusOrderReceivedAllShort=Products received @@ -50,7 +49,6 @@ StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderApproved=Approved StatusOrderRefused=Refused -StatusOrderBilled=Billed StatusOrderReceivedPartially=Partially received StatusOrderReceivedAll=All products received ShippingExist=A shipment exists @@ -170,7 +168,6 @@ StatusSupplierOrderDeliveredShort=Delivered StatusSupplierOrderToBillShort=Delivered StatusSupplierOrderApprovedShort=Approved StatusSupplierOrderRefusedShort=Refused -StatusSupplierOrderBilledShort=Billed StatusSupplierOrderToProcessShort=To process StatusSupplierOrderReceivedPartiallyShort=Partially received StatusSupplierOrderReceivedAllShort=Products received @@ -183,6 +180,5 @@ StatusSupplierOrderProcessed=Processed StatusSupplierOrderToBill=Delivered StatusSupplierOrderApproved=Approved StatusSupplierOrderRefused=Refused -StatusSupplierOrderBilled=Billed StatusSupplierOrderReceivedPartially=Partially received StatusSupplierOrderReceivedAll=All products received \ No newline at end of file