diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index da69298763e..643dc943a48 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -160,7 +160,25 @@ if ($object->id > 0) if ($object->methode_commande) { - print ''.$langs->trans("Method").''.$object->methode_commande.''; + $sql = "SELECT rowid, code, libelle"; + $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method'; + $sql.= " WHERE active=1 AND rowid = ".$db->escape($object->methode_commande_id); + + $resql = $db->query($sql); + + if ($resql && $db->num_rows($resql)) + { + $obj = $db->fetch_object($resql); + + // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut + $methode_commande = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->libelle!='-'?$obj->libelle:'')); + } + else + { + dol_print_error($db); + } + + print ''.$langs->trans("Method").''.$methode_commande.''; } } diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index 2ba34ecc885..b4eb7a08241 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -109,7 +109,25 @@ if ($id > 0 || ! empty($ref)) if ($commande->methode_commande) { - print ''.$langs->trans("Method").''.$commande->methode_commande.''; + $sql = "SELECT rowid, code, libelle"; + $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method'; + $sql.= " WHERE active=1 AND rowid = ".$db->escape($commande->methode_commande_id); + + $resql = $db->query($sql); + + if ($resql && $db->num_rows($resql)) + { + $obj = $db->fetch_object($resql); + + // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut + $methode_commande = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->libelle!='-'?$obj->libelle:'')); + } + else + { + dol_print_error($db); + } + + print ''.$langs->trans("Method").''.$methode_commande.''; } } diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index d3e61d40999..4e7ba219d98 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -130,7 +130,25 @@ if ($id > 0 || ! empty($ref)) if ($object->methode_commande) { - print ''.$langs->trans("Method").''.$object->methode_commande.''; + $sql = "SELECT rowid, code, libelle"; + $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method'; + $sql.= " WHERE active=1 AND rowid = ".$db->escape($object->methode_commande_id); + + $resql = $db->query($sql); + + if ($resql && $db->num_rows($resql)) + { + $obj = $db->fetch_object($resql); + + // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut + $methode_commande = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->libelle!='-'?$obj->libelle:'')); + } + else + { + dol_print_error($db); + } + + print ''.$langs->trans("Method").''.$methode_commande.''; } }