diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py index 9c15ced9ed..55b4fcce5d 100644 --- a/trytond/model/modelview.py +++ b/trytond/model/modelview.py @@ -131,7 +131,7 @@ class ModelView(Model): cursor.execute('SELECT arch, field_childs, id, type, ' \ 'inherit, model ' \ 'FROM ir_ui_view ' \ - 'WHERE model = %s AND type = %s' \ + 'WHERE model = %s AND type = %s ' \ 'ORDER BY inherit DESC, priority ASC, id ASC', (self._name, view_type)) sql_res = cursor.fetchone() diff --git a/trytond/webdav/fr_FR.csv b/trytond/webdav/fr_FR.csv index 065c88430b..b0b52c0f8c 100644 --- a/trytond/webdav/fr_FR.csv +++ b/trytond/webdav/fr_FR.csv @@ -17,7 +17,7 @@ field,"webdav.collection,parent",0,Parent,Parent,0 field,"webdav.collection,rec_name",0,Name,Nom,0 model,"ir.action,name",act_collection_form,Collections,Collections,0 model,"ir.action,name",act_collection_tree,Collections,Collections,0 -model,"ir.ui.menu,name",menu_collection_form,New Collection,Editer les collections,0 +model,"ir.ui.menu,name",menu_collection_form,New Collection,Nouvelle collection,0 model,"ir.ui.menu,name",menu_collection_tree,Collections,Collections,0 model,"ir.ui.menu,name",menu_webdav,WebDAV,WebDAV,0 model,"webdav.collection,name",0,Collection,Collection,0