Merge lp:~openerp-dev/openobject-server/trunk-opw-577295-port-rma into lp:openobject-server

[Randhir Mayatra (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.
Code is forward port from 6.1

Thnks
-RMA

[lp:~openerp-dev/openobject-server/trunk-opw-577295-port-rma]

4644. By <Graeme Gellatly> on 2012-12-06

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

Unmerged revisions

4644. By <Graeme Gellatly> on 2012-12-06

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

4643. By <Graeme Gellatly> on 2012-12-06

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

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-12-05 08:28:40 +0000
+++ openerp/osv/orm.py	2012-12-06 10:07:28 +0000
@@ -4295,10 +4295,11 @@
         upd_todo = []
         unknown_fields = []
         for v in vals.keys():
-            if v in self._inherit_fields and v not in self._columns:
+            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]