Merge lp:~camptocamp/openerp-product-attributes/6.1-fix-1259215-quickcreate-lep into lp:~product-core-editors/openerp-product-attributes/6.1

[Leonardo Pistone]

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi Leonardo,

Thanks for the contrib !

I think on line 15, context is a kwarg, then could you correct that to context=context ?

Thanks, otherwise LGTM.

Regards,

Joël

review: Approve (code review, no tests)

[lp:~camptocamp/openerp-product-attributes/6.1-fix-1259215-quickcreate-lep]

197. By Leonardo Pistone on 2013-12-12

[imp] context -> context=context

[Leonardo Pistone (lepistone)]

Thanks for the review Joël. I fixed the context=context.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM thanks for the fix

review: Approve (code review, no tests)

=== modified file 'base_custom_attributes/custom_attributes.py'
--- base_custom_attributes/custom_attributes.py	2013-12-11 14:53:28 +0000
+++ base_custom_attributes/custom_attributes.py	2013-12-12 15:35:23 +0000
@@ -245,21 +245,33 @@
                  "but not in the database"),
         }
 
+    def name_create(self, cr, uid, name, context=None):
+        if context is None:
+            context = {}
+        rec_id = self.create(cr, uid, {
+            'field_description': name,
+            'name': 'x_{0}'.format(name),
+        }, context=context)
+        return self.name_get(cr, uid, [rec_id], context=context)[0]
+
     def create(self, cr, uid, vals, context=None):
         if vals.get('relation_model_id'):
             relation = self.pool.get('ir.model').read(
                 cr, uid, [vals.get('relation_model_id')], ['model'])[0]['model']
         else:
             relation = 'attribute.option'
-        if vals['attribute_type'] == 'select':
+        if vals.get('attribute_type') == 'select':
             vals['ttype'] = 'many2one'
             vals['relation'] = relation
-        elif vals['attribute_type'] == 'multiselect':
+        elif vals.get('attribute_type') == 'multiselect':
             vals['ttype'] = 'many2many'
             vals['relation'] = relation
             vals['serialized'] = True
         else:
-            vals['ttype'] = vals['attribute_type']
+            vals['ttype'] = (
+                vals.get('attribute_type')
+                or self._defaults.get('attribute_type')
+            )
 
         if vals.get('serialized'):
             field_obj = self.pool.get('ir.model.fields')
@@ -322,7 +334,8 @@
         return None
 
     _defaults = {
-        'model_id': _get_default_model
+        'model_id': _get_default_model,
+        'attribute_type': 'char',
     }