Merge lp:~openerp-dev/openobject-addons/trunk-opw-576776-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

The webdav connection doesn’t read the default language of the user who is logged in. It always shows the names in English. That's wrong.

For example:
1. Set language as Dutch for the user.
2. Connect with webdav by giving path dav://hostname:port/webdav with Dutch user and open the database folder.
3. Go to Documents/Products which shows the product names in English which should be in Dutch(user's language).

This fixes the issue.
Code is forward port from 6.1

Thanks
Mayur

=== modified file 'document/nodes.py'
--- document/nodes.py	2012-10-25 13:09:30 +0000
+++ document/nodes.py	2012-11-01 12:09:21 +0000
@@ -823,6 +823,7 @@
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
+        ctx.update(self.context.extra_ctx)
         where = []
         if self.domain:
             app = safe_eval(self.domain, ctx)

=== modified file 'document_webdav/document_webdav.py'
--- document_webdav/document_webdav.py	2012-10-02 10:29:15 +0000
+++ document_webdav/document_webdav.py	2012-11-01 12:09:21 +0000
@@ -51,9 +51,10 @@
         # that might be not worth preparing.
         nctx.extra_ctx['webdav_path'] = '/'+config.get_misc('webdav','vdir','webdav')
         usr_obj = self.pool.get('res.users')
-        res = usr_obj.read(cr, uid, uid, ['login'])
+        res = usr_obj.read(cr, uid, uid, ['login','context_lang'])
         if res:
             nctx.extra_ctx['username'] = res['login']
+            nctx.extra_ctx['lang'] = res['context_lang']
         # TODO group
         return