Merge lp:~openerp-dev/openobject-server/trunk-missing_default_value-jpr into lp:openobject-server

[Jitendra Prajapati(OpenERP)]

Hello,

   the default uom missing value is set on onchange of product in inventory and mrp, when import csv file.

Thanks

[lp:~openerp-dev/openobject-server/trunk-missing_default_value-jpr]

5157. By Jitendra Prajapati(OpenERP) on 2014-05-05

[MERGE]with main branch

5158. By Jitendra Prajapati(OpenERP) on 2014-05-09

[MERGE]sync main branch

Unmerged revisions

5158. By Jitendra Prajapati(OpenERP) on 2014-05-09

[MERGE]sync main branch

5157. By Jitendra Prajapati(OpenERP) on 2014-05-05

[MERGE]with main branch

5156. By Jitendra Prajapati(OpenERP) on 2014-04-25

[MERGE]with main branch

5155. By Jitendra Prajapati(OpenERP) on 2014-04-24

[MERGE]with main branch

5154. By Jitendra Prajapati(OpenERP) on 2014-04-17

[MERGE]with main branch

5153. By Jitendra Prajapati(OpenERP) on 2014-04-16

[MERGE]with main branch

5152. By Jitendra Prajapati(OpenERP) on 2014-03-28

[IMP]the default uom missing value is set on onchange of product in inventory and mrp

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2014-04-16 14:34:31 +0000
+++ openerp/osv/orm.py	2014-05-09 05:04:58 +0000
@@ -1344,7 +1344,7 @@
             self._parent_store_compute(cr)
         return position, 0, 0, 0
 
-    def load(self, cr, uid, fields, data, context=None):
+    def load(self, cr, uid, fields, data, csv=False, context=None):
         """
         Attempts to load the data matrix, and returns a list of ids (or
         ``False`` if there was an error and no id could be generated) and a
@@ -1388,6 +1388,12 @@
                         u"Unknown database error: '%s'" % e))
                 break
             try:
+                if csv:
+                    cur_obj = self.pool.get(self._name)
+                    view_info = self.fields_view_get(cr, uid, False, 'form', context)
+                    interpreter =  tools.YamlInterpreter(cr, current_module, xid, mode, filename=None)
+                    record_dict = interpreter._create_record(cur_obj, record, view_info, csv=csv)
+                    record.update(record_dict)
                 ids.append(ModelData._update(cr, uid, self._name,
                      current_module, record, mode=mode, xml_id=xid,
                      noupdate=noupdate, res_id=id, context=context))
@@ -2135,7 +2141,10 @@
                     or (dv in self._inherit_fields and self._inherit_fields[dv][2]._type == 'one2many')) \
                         and isinstance(defaults[dv], (list, tuple)) and defaults[dv] and isinstance(defaults[dv][0], dict):
                     defaults[dv] = [(0, 0, x) for x in defaults[dv]]
-            defaults.update(values)
+            if isinstance(values,(tuple)):
+                defaults.update(values[2])
+            else:
+                defaults.update(values)
             values = defaults
         return values
 

=== modified file 'openerp/tools/yaml_import.py'
--- openerp/tools/yaml_import.py	2014-02-09 00:37:45 +0000
+++ openerp/tools/yaml_import.py	2014-05-09 05:04:58 +0000
@@ -152,6 +152,8 @@
         #    raise YamlImportException("The xml_id should be a non empty string.")
         elif isinstance(xml_id, types.IntType):
             id = xml_id
+        elif isinstance(xml_id, (list,tuple)):
+            id = xml_id[-1]
         elif xml_id in self.id_map:
             id = self.id_map[xml_id]
         else:
@@ -327,7 +329,7 @@
             if config.get('import_partial'):
                 self.cr.commit()
 
-    def _create_record(self, model, fields, view_info=None, parent={}, default=True):
+    def _create_record(self, model, fields, view_info=None, parent={}, default=True, csv=False):
         """This function processes the !record tag in yalm files. It simulates the record creation through an xml
             view (either specified on the !record tag or the default one for this object), including the calls to
             on_change() functions, and sending only values for fields that aren't set as readonly.
@@ -390,7 +392,13 @@
             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 model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
+            if csv:#if field_name has not a default value or a value is not given in the csv file.
+                if isinstance(fields,(tuple)) and fields[2]:
+                    defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, fields, context=self.context) or {}
+                else:
+                    defaults = {}
+            else:
+                defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.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().
@@ -409,7 +417,7 @@
                             # 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(model, field_name, fields[field_name], one2many_form_view or view_info, parent=record_dict, default=default)
+                        field_value = self._eval_field(model, field_name, fields[field_name], one2many_form_view or view_info, parent=record_dict, default=default, csv=csv)
 
                         #call process_val to not update record_dict if values were given for readonly fields
                         val = process_val(field_name, field_value)
@@ -455,17 +463,29 @@
                             ))
                         if key not in fields:
                             # do not shadow values explicitly set in yaml.
-                            record_dict[key] = process_val(key, val)
+                            # if field value are given in import_csv file.
+                            if csv and ctx[key] > val:
+                                record_dict[key] = process_val(key, ctx[key])
+                            else:
+                                record_dict[key] = process_val(key, val)
                 else:
                     nodes = list(el) + nodes
         else:
             record_dict = {}
 
-        for field_name, expression in fields.items():
-            if field_name in record_dict:
-                continue
-            field_value = self._eval_field(model, field_name, expression, default=False)
-            record_dict[field_name] = field_value
+        if isinstance(fields,(tuple)):
+            if fields[2]:
+                for field_name, expression in fields[2].items():
+                    if field_name in record_dict:
+                        continue
+                    field_value = self._eval_field(model, field_name, expression, default=False, csv=csv)
+                    record_dict[field_name] = field_value
+        else:
+            for field_name, expression in fields.items():
+                if field_name in record_dict:
+                    continue
+                field_value = self._eval_field(model, field_name, expression, default=False)
+                record_dict[field_name] = field_value
         return record_dict
 
     def process_ref(self, node, column=None):
@@ -494,7 +514,7 @@
     def process_eval(self, node):
         return eval(node.expression, self.eval_context)
 
-    def _eval_field(self, model, field_name, expression, view_info=False, parent={}, default=True):
+    def _eval_field(self, model, field_name, expression, view_info=False, parent={}, default=True, csv=False):
         # TODO this should be refactored as something like model.get_field() in bin/osv
         if field_name in model._columns:
             column = model._columns[field_name]
@@ -515,10 +535,19 @@
             value = self.get_id(expression)
         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]
+            if expression is not False:
+                value = [(0, 0, self._create_record(other_model, fields, view_info, parent, default=default, csv=csv)) for fields in expression]
+            else:
+                value = expression
         elif column._type == "many2many":
-            ids = [self.get_id(xml_id) for xml_id in expression]
-            value = [(6, 0, ids)]
+            if expression is not False:
+                ids = [self.get_id(xml_id) for xml_id in expression]
+                if ids and type(ids[0]) is list:
+                    value = [(6, 0, ids[0])]
+                else:
+                    value = [(6, 0, ids)]
+            else:
+                value = expression
         elif column._type == "date" and is_string(expression):
             # enforce ISO format for string date values, to be locale-agnostic during tests
             time.strptime(expression, misc.DEFAULT_SERVER_DATE_FORMAT)