pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] res.partner: rename commercial_id to commercial_partner_id + make function field inheritable

Browse Source 
The name `commercial_partner_id` better reflects its
purpose and the fact that it is a FK to a partner.


An extra indirection through a lambda function was
also added to the definition of the function field
to make it possible to override it in other modules
(otherwise the function is passed by copy directly
and cannot be inherited later)

bzr revid: odo@openerp.com-20130418144533-owupfwn6h83q432x
This commit is contained in:
Olivier Dony
2013-04-18 16:45:33 +02:00
parent 06cd0a1c7f
commit dfbe68e69d
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/res/res_partner.py
+10 -7
View File
@@ -195,7 +195,7 @@ class res_partner(osv.osv, format_address):
result[obj.id] = obj.image != False
return result
def _commercial_id_compute(self, cr, uid, ids, name, args, context=None):
def _commercial_partner_compute(self, cr, uid, ids, name, args, context=None):
""" Returns the partner that is considered the commercial
entity of this partner. The commercial entity holds the master data
for all commercial fields (see :py:meth:`~_commercial_fields`) """
@@ -207,6 +207,9 @@ class res_partner(osv.osv, format_address):
result[partner.id] = current_partner.id
return result
# indirection to avoid passing a copy of the overridable method when declaring the function field
_commercial_partner_id = lambda self, *args, **kwargs: self._commercial_partner_compute(*args, **kwargs)
_order = "name"
_columns = {
'name': fields.char('Name', size=128, required=True, select=True),
@@ -280,7 +283,7 @@ class res_partner(osv.osv, format_address):
'contact_address': fields.function(_address_display, type='char', string='Complete Address'),
# technical field used for managing commercial fields
'commercial_id': fields.function(_commercial_id_compute, type='many2one', relation='res.partner', string='Commercial Entity')
'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity')
}
def _default_category(self, cr, uid, context=None):
@@ -416,16 +419,16 @@ class res_partner(osv.osv, format_address):
def _commercial_sync_from_company(self, cr, uid, partner, context=None):
""" Handle sync of commercial fields when a new parent commercial entity is set,
as if they were related fields """
if partner.commercial_id != partner:
if partner.commercial_partner_id != partner:
commercial_fields = self._commercial_fields(cr, uid, context=context)
sync_vals = self._update_fields_values(cr, uid, partner.commercial_id,
sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
commercial_fields, context=context)
return self.write(cr, uid, partner.id, sync_vals, context=context)
def _commercial_sync_to_children(self, cr, uid, partner, context=None):
""" Handle sync of commercial fields to descendants """
commercial_fields = self._commercial_fields(cr, uid, context=context)
sync_vals = self._update_fields_values(cr, uid, partner.commercial_id,
sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
commercial_fields, context=context)
sync_children = [c for c in partner.child_ids if not c.is_company]
for child in sync_children:
@@ -451,7 +454,7 @@ class res_partner(osv.osv, format_address):
# 2. To DOWNSTREAM: sync children
if partner.child_ids:
# 2a. Commercial Fields: sync if commercial entity
if partner.commercial_id == partner:
if partner.commercial_partner_id == partner:
self._commercial_sync_to_children(cr, uid, partner, context=context)
# 2b. Address fields: sync if address changed
address_fields = self._address_fields(cr, uid, context=context)
@@ -493,7 +496,7 @@ class res_partner(osv.osv, format_address):
return {'type': 'ir.actions.act_window',
'res_model': 'res.partner',
'view_mode': 'form',
'res_id': partner.commercial_id.id,
'res_id': partner.commercial_partner_id.id,
'target': 'new',
'flags': {'form': {'action_buttons': True}}}
openerp/addons/base/tests/test_base.py
+2 -2
View File
@@ -219,7 +219,7 @@ class test_base(common.TransactionCase):
for p in (p0, p1, p11, p2):
p.refresh()
self.assertEquals(p.commercial_id, sunhelm, 'Incorrect commercial entity resolution')
self.assertEquals(p.commercial_partner_id, sunhelm, 'Incorrect commercial entity resolution')
self.assertEquals(p.vat, sunhelm.vat, 'Commercial fields must be automatically synced')
sunhelmvat = 'BE0123456789'
sunhelm.write({'vat': sunhelmvat})
@@ -240,7 +240,7 @@ class test_base(common.TransactionCase):
name='Sunhelm Subsidiary'))
p1.refresh()
self.assertEquals(p1.vat, p1vat, 'Setting is_company should stop auto-sync of commercial fields')
self.assertEquals(p1.commercial_id, p1, 'Incorrect commercial entity resolution after setting is_company')
self.assertEquals(p1.commercial_partner_id, p1, 'Incorrect commercial entity resolution after setting is_company')
# writing on parent should not touch child commercial entities
sunhelmvat2 = 'BE0112233445'