Merge lp:~openerp-dev/openobject-server/6.0-opw-6198-ira into lp:openobject-server/6.0

[Ila Rana(Open ERP)]

[Jay Vora (Serpent Consulting Services) (jayvora)]

Thanks for the fix Ila.

Before proceeding for the merge, should not we count the appearance of record rules if exists for address model?

Priyesh, can you please do a little test and replace the query by read() ?

Thanks.

review: Needs Information

[lp:~openerp-dev/openobject-server/6.0-opw-6198-ira]

3447. By Ila Rana(Open ERP) on 2011-06-22

[FIX] Base : Added active field in address view in order to let the user deactivate the address

[Ila Rana(Open ERP) (ira-openerp)]

Hello sir,

I have made changes as per your suggestion and replaced the query by ORM Methods.

Thanks,
Ila

review: Needs Resubmitting

[Priyesh (OpenERP) (pso-openerp)]

Hello Ila,

Code works fine as per requirements.

Thanks for the fix,
Priyesh

review: Approve

[Jay Vora (Serpent Consulting Services) (jayvora)]

Ila and Priyesh,

Thanks for the fix, this is a very good catch.

It would be good at the usability point of view if you put 'active' field on the top of the form OR in the new tab, but not under 'communication' tab.

Thanks once again.

review: Approve

[Christophe Simonis (OpenERP) (kangol)]

I know it's already merged in stable but this fix is broken.

In this case, the query doesn't bother me. On line 13 of the patch
>>> res = list(tuple(addr.values()) for addr in address_rec)
is completely false because the result of .values() is not guarantee to give the values in the same order for each dict. In this case, either you keep the query, either you use explicit fields via browse()

review: Needs Fixing

=== modified file 'bin/addons/base/res/partner/partner.py'
--- bin/addons/base/res/partner/partner.py	2011-01-17 15:17:57 +0000
+++ bin/addons/base/res/partner/partner.py	2011-06-22 05:31:04 +0000
@@ -222,8 +222,10 @@
         return True
 
     def address_get(self, cr, uid, ids, adr_pref=['default']):
-        cr.execute('select type,id from res_partner_address where partner_id IN %s',(tuple(ids),))
-        res = cr.fetchall()
+        address_obj = self.pool.get('res.partner.address')
+        address_ids = address_obj.search(cr, uid, [('partner_id', '=', ids)])
+        address_rec = address_obj.read(cr, uid, address_ids, ['type'])
+        res = list(tuple(addr.values()) for addr in address_rec)
         adr = dict(res)
         # get the id of the (first) default address if there is one,
         # otherwise get the id of the first address in the list

=== modified file 'bin/addons/base/res/partner/partner_view.xml'
--- bin/addons/base/res/partner/partner_view.xml	2011-04-26 11:14:58 +0000
+++ bin/addons/base/res/partner/partner_view.xml	2011-06-22 05:31:04 +0000
@@ -99,6 +99,7 @@
                         <field name="fax"/>
                         <field name="mobile"/>
                         <field name="email" widget="email"/>
+                        <field name="active"/>
                      </group>
                 </form>
             </field>