Unifield Server

Merge lp:~julie-w/unifield-server/US-4753 into lp:unifield-server

  1. US-4753
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5035
Proposed branch: lp:~julie-w/unifield-server/US-4753
Merge into: lp:unifield-server
Diff against target: 44 lines (+16/-1)
2 files modified
bin/addons/msf_partner/partner.py (+13/-0)
bin/addons/res_currency_tables/res_currency.py (+3/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4753
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+351879@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_partner/partner.py'
2--- bin/addons/msf_partner/partner.py 2018-06-08 14:22:21 +0000
3+++ bin/addons/msf_partner/partner.py 2018-07-31 15:04:52 +0000
4@@ -352,6 +352,7 @@
5 Check if the deleted partner is not a system one
6 """
7 data_obj = self.pool.get('ir.model.data')
8+ property_obj = self.pool.get('ir.property')
9
10 partner_data_id = [
11 'supplier_tbd',
12@@ -380,6 +381,18 @@
13
14 address_obj.unlink(cr, uid, address_ids, context)
15
16+ # delete the related fields.properties
17+ property_fields = ['property_account_receivable', 'property_account_payable', 'property_product_pricelist',
18+ 'property_product_pricelist_purchase', 'property_stock_supplier',
19+ 'property_stock_customer', 'property_account_position', 'property_payment_term']
20+ res_ids = []
21+ for partner_id in ids:
22+ res_id = 'res.partner,%s' % partner_id
23+ res_ids.append(res_id)
24+ property_domain = [('name', 'in', property_fields), ('res_id', 'in', res_ids)]
25+ property_ids = property_obj.search(cr, uid, property_domain, order='NO_ORDER', context=context)
26+ property_obj.unlink(cr, uid, property_ids, context=context)
27+
28 mdids = ir_model_data_obj.search(cr, 1, [('model', '=', 'res.partner'), ('res_id', 'in', ids)])
29 ir_model_data_obj.unlink(cr, uid, mdids, context)
30 return res
31
32=== modified file 'bin/addons/res_currency_tables/res_currency.py'
33--- bin/addons/res_currency_tables/res_currency.py 2018-01-09 11:24:45 +0000
34+++ bin/addons/res_currency_tables/res_currency.py 2018-07-31 15:04:52 +0000
35@@ -237,7 +237,9 @@
36 ('name', '=', 'property_product_pricelist_purchase'),
37 ('value_reference', 'in', value_reference)], order='NO_ORDER', context=context)
38 for prop in property_obj.browse(cr, uid, property_ids, fields_to_fetch=['res_id'], context=context):
39- if prop.res_id and prop.res_id._table_name == 'res.partner' and prop.res_id.active:
40+ # ensure that the partner referenced in ir_property exists before checking if he is active
41+ if prop.res_id and prop.res_id._table_name == 'res.partner' and hasattr(prop.res_id, 'active') and \
42+ getattr(prop.res_id, 'active') or False:
43 raise osv.except_osv(_('Currency currently used!'), _('The currency you want to %s is used '
44 'in at least one active partner form.') % keyword)
45

Subscribers

People subscribed via source and target branches