lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: label of input method not translated.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-12 02:07:50 +02:00
parent ac2ff5c604
commit c30f13a03d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.6.2 compared to 3.6.1 ***** ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice
- Fix: bug 1588 : relative discount - Fix: bug 1588 : relative discount
- Fix: label of input method not tranlated.
***** ChangeLog for 3.6.1 compared to 3.6.* ***** ***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users: For users:

15
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2016,7 +2016,8 @@ class CommandeFournisseur extends CommonOrder
} }
/** /**
* Returns the translated input method * Returns the translated input method of object (defined if $this->methode_commande_id > 0).
* This function make a sql request to get translation. No cache yet, try to not use it inside a loop.
* *
* @return string * @return string
*/ */
@ -2026,21 +2027,19 @@ class CommandeFournisseur extends CommonOrder
if ($this->methode_commande_id > 0) if ($this->methode_commande_id > 0)
{ {
$sql = "SELECT rowid, code, libelle"; $sql = "SELECT rowid, code, libelle as label";
$sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method'; $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method';
$sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id); $sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
$query = $db->query($sql); $query = $db->query($sql);
if ($query && $db->num_rows($query)) if ($query && $db->num_rows($query))
{ {
$result = $db->fetch_object($query); $obj = $db->fetch_object($query);
$string = $langs->trans($result->code); $string = $langs->trans($obj->code);
if ($string == $obj->code)
if ($string == $result->code)
{ {
$string = $obj->libelle != '-' ? $obj->libelle : ''; $string = $obj->label != '-' ? $obj->label : '';
} }
return $string; return $string;