Merge lp:~openerp-dev/openobject-server/trunk-bug-726592-ysa into lp:openobject-server

[Yogesh (SerpentCS)]

[Naresh(OpenERP) (nch-openerp)]

hello

can you please create a separate merge proposal for 6.0 too because this bug affects it

Thanks

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Vo Minh Thu (thu)]

The line
  if hasattr(default_val, '_id'):
seems to assume that
  self._get_default()
could return a browse record. But I don't think this is the case.

review: Needs Fixing

[lp:~openerp-dev/openobject-server/trunk-bug-726592-ysa]

3451. By Yogesh (SerpentCS) on 2011-10-05

[MERGE] Merge wtih trunk server upto revision no 3722.

3452. By Yogesh (SerpentCS) on 2011-10-05

[FIX] fix problem of poperty filed. if property field have a default value then check the id.

[Yogesh (SerpentCS) (yogesh-serpentcs)]

Hello Sir,

I checked this issue. I found problem in if id_val is not default_val: condition. if property field type is m2o then this condition always true and new record create in ir.property object. if field type is m2o then self._get_default() return the browse record so id_val is simple int id and default_val is browse record so never match the default record. so in this situation check the default_val have _id attribute if yes then check and fetch id of that field like defult_val._id and check this with id_val if not match then create record of property object. if field type is not m2o then check simple condition like :- id_val != default_val.

If I missing some thing then correct me.

Thanks,

review: Needs Resubmitting

[lp:~openerp-dev/openobject-server/trunk-bug-726592-ysa]

3453. By Vo Minh Thu on 2011-10-05

[IMP] fields.property: be more explicit when testing if something is a browse_record.

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2011-10-05 13:55:49 +0000
+++ openerp/osv/fields.py	2011-10-05 15:53:25 +0000
@@ -41,6 +41,7 @@
 import xmlrpclib
 from psycopg2 import Binary
 
+import openerp
 import openerp.netsvc as netsvc
 import openerp.tools as tools
 from openerp.tools.translate import _
@@ -537,7 +538,7 @@
     _type = 'many2many'
 
     def __init__(self, obj, rel=None, id1=None, id2=None, string='unknown', limit=None, **args):
-        """ 
+        """
         """
         _column.__init__(self, string=string, **args)
         self._obj = obj
@@ -551,7 +552,7 @@
 
     def _sql_names(self, source_model):
         """Return the SQL names defining the structure of the m2m relationship table
-            
+
             :return: (m2m_table, local_col, dest_col) where m2m_table is the table name,
                      local_col is the name of the column holding the current model's FK, and
                      dest_col is the name of the column holding the destination model's FK, and
@@ -1227,7 +1228,14 @@
 
         default_val = self._get_default(obj, cr, uid, prop_name, context)
 
-        if id_val is not default_val:
+        property_create = False
+        if isinstance(default_val, openerp.osv.orm.browse_record):
+            if default_val.id != id_val:
+                property_create = True
+        elif default_val != id_val:
+            property_create = True
+
+        if property_create:
             def_id = self._field_get(cr, uid, obj._name, prop_name)
             company = obj.pool.get('res.company')
             cid = company._company_default_get(cr, uid, obj._name, def_id,