Merge lp:~openerp-dev/openobject-server/6.0-opw-577295-han into lp:openobject-server/6.0

[Hardik Ansodariya (OpenERP)]

Hello,

Fixed the issue of field when it refine in inherited object and save the record it was not allow to save when parent field is required.

e.g
when redefine required field in product_product that's already defined in product_template. As example
redefined standard_price in product_product.

Add this field on the form view, restart server and install or update module with this code
and create a new product, when save the record it generates the error.

Kindly review it.

Thanks

[Christophe CHAUVET (christophe-chauvet)]

Hi

I've test on my customer instance and it works correctly

Regards,

review: Approve

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

3634. By Hardik Ansodariya (OpenERP) on 2012-08-22

[FIX] orm/create: issue with inherited field when put in child and parent is required (Maintanance case: 577295)

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2012-06-19 08:29:38 +0000
+++ bin/osv/orm.py	2012-08-22 05:59:20 +0000
@@ -3607,7 +3607,8 @@
             if v in self._inherit_fields:
                 (table, col, col_detail, original_parent) = self._inherit_fields[v]
                 tocreate[table][v] = vals[v]
-                del vals[v]
+                if v not in self._columns:
+                    del vals[v]
             else:
                 if (v not in self._inherit_fields) and (v not in self._columns):
                     del vals[v]