Merge lp:~openerp-dev/openobject-server/trunk-missing-default-values-pza into lp:openobject-server

[Pooja Zankhariya(OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-missing-default-values-pza]

5021. By Pooja Zankhariya(OpenERP) on 2014-01-10

[IMP]Misc

5022. By Pooja Zankhariya(OpenERP) on 2014-01-10

[IMP]Improved code

5023. By Pooja Zankhariya(OpenERP) on 2014-01-13

[IMP]Unused import

5024. By Pooja Zankhariya(OpenERP) on 2014-01-22

[MISC]Misc Imp

5025. By Pooja Zankhariya(OpenERP) on 2014-01-31

[MERGE]Sync with Trunk

Unmerged revisions

5025. By Pooja Zankhariya(OpenERP) on 2014-01-31

[MERGE]Sync with Trunk

5024. By Pooja Zankhariya(OpenERP) on 2014-01-22

[MISC]Misc Imp

5023. By Pooja Zankhariya(OpenERP) on 2014-01-13

[IMP]Unused import

5022. By Pooja Zankhariya(OpenERP) on 2014-01-10

[IMP]Improved code

5021. By Pooja Zankhariya(OpenERP) on 2014-01-10

[IMP]Misc

5020. By Pooja Zankhariya(OpenERP) on 2014-01-10

[IMP]Under dev- temporary working.

5019. By Pooja Zankhariya(OpenERP) on 2014-01-10

[MERGE]Merge with Trunk

5018. By Pooja Zankhariya(OpenERP) on 2014-01-09

[IMP]Under dev

5017. By Pooja Zankhariya(OpenERP) on 2014-01-01

[IMP]Changes on 1-jan

5016. By Pooja Zankhariya(OpenERP) on 2014-01-01

[IMP]Under Dev

=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py	2014-01-29 17:29:49 +0000
+++ openerp/addons/base/ir/ir_model.py	2014-01-31 06:08:51 +0000
@@ -34,6 +34,11 @@
 from openerp.tools import config
 from openerp.tools.translate import _
 from openerp.osv.orm import except_orm, browse_record
+import re
+import inspect
+from openerp.tools import misc
+from lxml import etree
+from openerp.tools.yaml_import import *
 
 _logger = logging.getLogger(__name__)
 
@@ -948,7 +953,102 @@
         self.clear_caches()
         return super(ir_model_data,self).unlink(cr, uid, ids, context=context)
 
-    def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
+    ##Temporary Added - _get_id also exists
+    def get_id(self, cr, uid, xml_id, module):
+        if xml_id is False or xml_id is None:
+            return False
+        elif isinstance(xml_id, types.IntType):
+            id = xml_id
+        elif isinstance(xml_id, (list,tuple)):
+            id = xml_id[-1]
+        else:
+            if '.' in xml_id:
+                module, checked_xml_id = xml_id.split('.', 1)
+            else:
+                checked_xml_id = xml_id
+            try:
+                _, id = self.pool['ir.model.data'].get_object_reference(cr, uid, module, checked_xml_id)
+            except ValueError:
+                raise ValueError("""%s not found when processing.""" % (checked_xml_id))
+
+        return id
+
+    def _eval_field(self, cr, SUPERUSER_ID, module, model, field_name, expression, view_info=False, parent={}, default=True):
+        if field_name in model._columns:
+            column = model._columns[field_name]
+        elif field_name in model._inherit_fields:
+            column = model._inherit_fields[field_name][2]
+        else:
+            raise KeyError("Object '%s' does not contain field '%s'" % (model, field_name))
+#        if is_ref(expression):
+#            elements = self.process_ref(expression, column)
+#            if column._type in ("many2many", "one2many"):
+#                value = [(6, 0, elements)]
+#            else: # many2one
+#                if isinstance(elements, (list,tuple)):
+#                    value = self._get_first_result(elements)
+#                else:
+#                    value = elements
+        if column._type == "many2one":
+            value = self.get_id(cr, SUPERUSER_ID, expression, module)
+        elif column._type == "one2many":
+            other_model = self.get_model(column._obj)
+            value = [(0, 0, self._create_record(other_model, fields, view_info, parent, default=default)) for fields in expression]
+        elif column._type == "many2many":
+            ids = [self.get_id(cr, SUPERUSER_ID, xml_id, module) for xml_id in expression]
+            value = [(6, 0, ids)]
+        elif column._type == "date" and isinstance(expression, basestring):
+            # enforce ISO format for string date values, to be locale-agnostic during tests
+            time.strptime(expression, misc.DEFAULT_SERVER_DATE_FORMAT)
+            value = expression
+        elif column._type == "datetime" and isinstance(expression, basestring):
+            # enforce ISO format for string datetime values, to be locale-agnostic during tests
+            time.strptime(expression, misc.DEFAULT_SERVER_DATETIME_FORMAT)
+            value = expression
+        else: # scalar field
+            #if is_eval(expression):
+            #    value = self.process_eval(expression)
+            #else:
+                value = expression
+            # raise YamlImportException('Unsupported column "%s" or value %s:%s' % (field_name, type(expression), expression))
+        return value
+
+    def _update(self, cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
+
+        def process_val(key, val):
+            if fg[key]['type'] == 'many2one':
+                if type(val) in (tuple,list):
+                    val = val[0]
+            elif fg[key]['type'] == 'one2many':
+                if val and isinstance(val, (list,tuple)) and isinstance(val[0], dict):
+                    # we want to return only the fields that aren't readonly
+                    # For that, we need to first get the right tree view to consider for the field `key´
+                    one2many_tree_view = _get_right_one2many_view(fg, key, 'tree')
+                    arch = etree.fromstring(one2many_tree_view['arch'].encode('utf-8'))
+                    for rec in val:
+                        # make a copy for the iteration, as we will alter `rec´
+                        rec_copy = rec.copy()
+                        for field_key in rec_copy:
+                            # if field is missing in view or has a readonly modifier, drop it
+                            field_elem = arch.xpath("//field[@name='%s']" % field_key)
+                            if field_elem and (field_elem[0].get('modifiers', '{}').find('"readonly": true') >= 0):
+                                # TODO: currently we only support if readonly is True in the modifiers. Some improvement may be done in 
+                                # order to support also modifiers that look like {"readonly": [["state", "not in", ["draft", "confirm"]]]}
+                                del rec[field_key]
+                    # now that unwanted values have been removed from val, we can encapsulate it in a tuple as returned value
+                    val = map(lambda x: (0,0,x), val)
+            elif fg[key]['type'] == 'many2many':
+                if val and isinstance(val,(list,tuple)) and isinstance(val[0], (int,long)):
+                    val = [(6,0,val)]
+
+            # we want to return only the fields that aren't readonly
+            if el.get('modifiers', '{}').find('"readonly": true') >= 0:
+                # TODO: currently we only support if readonly is True in the modifiers. Some improvement may be done in 
+                # order to support also modifiers that look like {"readonly": [["state", "not in", ["draft", "confirm"]]]}
+                return False
+
+            return val
+
         model_obj = self.pool[model]
         if not context:
             context = {}
@@ -960,6 +1060,95 @@
         if (not xml_id) and (not self.doinit):
             return False
         action_id = False
+
+        view_info = self.pool[model].fields_view_get(cr, SUPERUSER_ID, False, 'form', context)
+        if view_info:
+            arch = etree.fromstring(view_info['arch'].decode('utf-8'))
+            view = arch if len(arch) else False
+        else:
+            view = False
+        ###To find default
+        try:
+            self.pool['ir.model.data']._get_id(cr, SUPERUSER_ID, module, xml_id)
+            default = False
+        except ValueError:
+            default = True
+        fields = values or {}
+        if view is not False:
+            fg = view_info['fields']
+            # gather the default values on the object. (Can't use `fields´ as parameter instead of {} because we may
+            # have references like `base.main_company´ in the yaml file and it's not compatible with the function)
+            defaults = default and self._add_missing_default_values(cr, SUPERUSER_ID, {}, context=context) or {}
+            # copy the default values in record_dict, only if they are in the view (because that's what the client does)
+            # the other default values will be added later on by the create().
+            record_dict = dict([(key, val) for key, val in defaults.items() if key in fg])
+
+            # Process all on_change calls
+            nodes = [view]
+            while nodes:
+                el = nodes.pop(0)
+                if el.tag =='field':
+
+#                    if not el.attrib.get('on_change', False):
+#                        continue
+#                    match = re.match("([a-z_1-9A-Z]+)\((.*)\)", el.attrib['on_change'])
+#                    assert match, "Unable to parse the on_change '%s'!" % (el.attrib['on_change'],)
+
+                    field_name = el.attrib['name']
+                    assert field_name in fg, "The field '%s' is defined in the form view but not on the object '%s'!" % (field_name, model._name)
+                    if field_name in fields:
+                        one2many_form_view = None
+                        if (view is not False) and (fg[field_name]['type']=='one2many'):
+                            # for one2many fields, we want to eval them using the inline form view defined on the parent
+                            one2many_form_view = _get_right_one2many_view(fg, field_name, 'form')
+                        field_value = self._eval_field(cr, uid, module, self.pool[model], field_name, fields[field_name], one2many_form_view or view_info, parent=record_dict, default=default)
+
+                        #call process_val to not update record_dict if values were given for readonly fields
+                        val = process_val(field_name, field_value)
+                        if val:
+                            record_dict[field_name] = val
+                        #if (field_name in defaults) and defaults[field_name] == field_value:
+                        #    print '*** You can remove these lines:', field_name, field_value
+
+                    #if field_name has a default value or a value is given in the yaml file, we must call its on_change()
+                    elif field_name not in defaults:
+                        continue
+
+                    if not el.attrib.get('on_change', False):
+                        continue
+                    match = re.match("([a-z_1-9A-Z]+)\((.*)\)", el.attrib['on_change'])
+                    assert match, "Unable to parse the on_change '%s'!" % (el.attrib['on_change'],)
+#####nedd to test whether needed or not
+                    # creating the context
+                    class parent2(object):
+                        def __init__(self, d):
+                            self.d = d
+                        def __getattr__(self, name):
+                            return self.d.get(name, False)
+
+                    parent=record_dict#Same done above
+                    ctx = record_dict.copy()
+                    ctx['context'] = context
+                    ctx['uid'] = SUPERUSER_ID
+                    ctx['parent'] = parent2(parent)
+                    for a in fg:
+                        if a not in ctx:
+                            ctx[a] = process_val(a, defaults.get(a, False))
+
+#                    # Evaluation args
+                    args = map(lambda x: eval(x, ctx), match.group(2).split(','))#[36]
+                    result = getattr(self.pool[model], match.group(1))(cr, SUPERUSER_ID, [], *args)#{'value': {'bom_id': False, 'routing_id': False, 'product_uom': 2}}
+                    for key, val in (result or {}).get('value', {}).items():
+                        assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist either on the object '%s', either in the view '%s' used for the creation" % (key, match.group(1), model._name, view_info['name'])
+                        if key not in fields:
+                            # do not shadow values explicitly set in yaml.
+                            record_dict[key] = process_val(key, val)
+                else:
+                    nodes = list(el) + nodes
+        else:
+            record_dict = {}
+        values.update(record_dict)
+
         if xml_id:
             cr.execute('''SELECT imd.id, imd.res_id, md.id, imd.model, imd.noupdate
                           FROM ir_model_data imd LEFT JOIN %s md ON (imd.res_id = md.id)