Merge lp:~openerp-dev/openobject-addons/6.1-opw-576076-bth into lp:openobject-addons/6.1

[Bhumi Thakkar (Open ERP)]

Hello,

     Add to dashboard filter not translated when language is changed.

1. Create new database select english language.
2. Laod an official translation, language for ex: dutch.
3. Select language Dutch from setting => user.
4. Sales => Sale => Lead => From filter select Add to dashboard.
5. Click on menu sale.

Observed: 'Added action is in dutch and existed actions are in english. when click on reset then actions are in current language. If i changed language than also new created actions are not translated it is in from which language is created. It will not translated.'
Expected: 'Added action and existed actions should displayed in current language and when reset at that time should also displayed in current language and when changed the language at that time should displayed in changed language.'

when select add to dashboard from filter existed actions and new created actions are stored with context which contains current language in ir.ui.view.custom model and when retrieve records from that model have translate in current language and parsing xml architecture than return.
Same as doing in fields_view_get from server side for while calling in board.py file in fields_view_get for ir.ui.view model for that it is done and return architecture in current language and parsed. But then after browse record from ir.ui.view.custom model and return arch but not return in current language and also architecture is not parsed.

Thanks.

[lp:~openerp-dev/openobject-addons/6.1-opw-576076-bth]

6882. By Bhumi Thakkar (Open ERP) on 2012-07-11

[FIX] Remove unnecessary code.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-576076-port-cha/+merge/138910 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6882. By Bhumi Thakkar (Open ERP) on 2012-07-11

[FIX] Remove unnecessary code.

6881. By Bhumi Thakkar (Open ERP) on 2012-07-09

[FIX] Add Translation and xml parsing for ir.ui.view.custom model.

=== modified file 'board/board.py'
--- board/board.py	2012-02-08 01:27:26 +0000
+++ board/board.py	2012-07-11 10:14:38 +0000
@@ -22,6 +22,7 @@
 from osv import fields, osv
 import time
 import tools
+from lxml import etree
 
 class board_board(osv.osv):
     """
@@ -119,19 +120,29 @@
         res = {}
         res = super(board_board, self).fields_view_get(cr, user, view_id, view_type,\
                                  context, toolbar=toolbar, submenu=submenu)
-
         vids = self.pool.get('ir.ui.view.custom').search(cr, user,\
                      [('user_id', '=', user), ('ref_id' ,'=', view_id)])
+        def encode(s):
+            if isinstance(s, unicode):
+                return s.encode('utf8')
+            return s
+
         if vids:
             view_id = vids[0]
             arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id, context=context)
+
+            fields = self.fields_get(cr, user, None, context)
+            xarch = etree.fromstring(encode(arch.arch))
+            fields_def = self.__view_look_dom(cr, user, xarch, view_id, False, fields, context=context)
+            arch = etree.tostring(xarch, encoding="utf-8").replace('\t', '')
             res['custom_view_id'] = view_id
-            res['arch'] = arch.arch
-        res['arch'] = self._arch_preprocessing(cr, user, res['arch'], context=context)
+            res['arch'] = arch
+        else:
+            res['arch'] = self._arch_preprocessing(cr, user, res['arch'], context=context)
+
         res['toolbar'] = {'print': [], 'action': [], 'relate': []}
         return res
 
-
     def _arch_preprocessing(self, cr, user, arch, context=None):
         from lxml import etree
         def remove_unauthorized_children(node):
@@ -150,8 +161,62 @@
         archnode = etree.fromstring(encode(arch))
         return etree.tostring(remove_unauthorized_children(archnode),pretty_print=True)
 
-
-
+    def __view_look_dom(self, cr, user, node, view_id, in_tree_view, model_fields, context=None):
+        """ Return the description of the fields in the node.
+
+        In a normal call to this method, node is a complete view architecture
+        but it is actually possible to give some sub-node (this is used so
+        that the method can call itself recursively).
+
+        Originally, the field descriptions are drawn from the node itself.
+        But there is now some code calling fields_get() in order to merge some
+        of those information in the architecture.
+
+        """
+        if context is None:
+            context = {}
+        result = False
+        fields = {}
+        children = True
+
+        if node.tag in ('form', 'tree'):
+            result = self.view_header_get(cr, user, False, node.tag, context)
+            if result:
+                node.set('string', result)
+            in_tree_view = node.tag == 'tree'
+
+        # translate view
+        if 'lang' in context:
+            if node.get('string') and not result:
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('string'))
+                if trans == node.get('string') and ('base_model_name' in context):
+                    # If translation is same as source, perhaps we'd have more luck with the alternative model name
+                    # (in case we are in a mixed situation, such as an inherited view where parent_view.model != model
+                    trans = self.pool.get('ir.translation')._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string'))
+                if trans:
+                    node.set('string', trans)
+            if node.get('confirm'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('confirm'))
+                if trans:
+                    node.set('confirm', trans)
+            if node.get('sum'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum'))
+                if trans:
+                    node.set('sum', trans)
+            if node.get('avg'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('avg'))
+                if trans:
+                    node.set('avg', trans)
+            if node.get('help'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('help'))
+                if trans:
+                    node.set('help', trans)
+
+        for f in node:
+            if children or (node.tag == 'field' and f.tag in ('filter','separator')):
+                fields.update(self.__view_look_dom(cr, user, f, view_id, in_tree_view, model_fields, context))
+
+        return fields
 
     _columns = {
         'name': fields.char('Dashboard', size=64, required=True),