diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php index b6b6ac4fc63..5bea8e1a616 100644 --- a/htdocs/product/canvas/default/product.default.class.php +++ b/htdocs/product/canvas/default/product.default.class.php @@ -69,6 +69,7 @@ class ProductDefault extends Product $sql.= " FROM ".MAIN_DB_PREFIX."c_field_list"; $sql.= " WHERE element = '".$this->list."'"; $sql.= " AND entity = ".$conf->entity; + $sql.= " ORDER BY rang ASC"; $resql = $this->db->query($sql); if ($resql) @@ -84,8 +85,8 @@ class ProductDefault extends Product $fieldlist["id"] = $obj->rowid; $fieldlist["name"] = $obj->name; - $fieldlist["alias"] = $obj->alias; - $fieldlist["title"] = $obj->title; + $fieldlist["alias"] = ($obj->alias?$obj->alias:$obj->name); + $fieldlist["title"] = $langs->trans($obj->title); $fieldlist["align"] = $obj->align; $fieldlist["search"] = $obj->search; $fieldlist["enabled"] = $obj->enabled; diff --git a/htdocs/product/canvas/default/templates/liste.tpl b/htdocs/product/canvas/default/templates/liste.tpl index ba7cf0163a3..76da3ad045e 100644 --- a/htdocs/product/canvas/default/templates/liste.tpl +++ b/htdocs/product/canvas/default/templates/liste.tpl @@ -33,41 +33,52 @@