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

[jftempo]

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2018-06-08 14:22:21 +0000
+++ bin/addons/msf_partner/partner.py	2018-07-31 15:04:52 +0000
@@ -352,6 +352,7 @@
         Check if the deleted partner is not a system one
         """
         data_obj = self.pool.get('ir.model.data')
+        property_obj = self.pool.get('ir.property')
 
         partner_data_id = [
             'supplier_tbd',
@@ -380,6 +381,18 @@
 
         address_obj.unlink(cr, uid, address_ids, context)
 
+        # delete the related fields.properties
+        property_fields = ['property_account_receivable', 'property_account_payable', 'property_product_pricelist',
+                           'property_product_pricelist_purchase', 'property_stock_supplier',
+                           'property_stock_customer', 'property_account_position', 'property_payment_term']
+        res_ids = []
+        for partner_id in ids:
+            res_id = 'res.partner,%s' % partner_id
+            res_ids.append(res_id)
+        property_domain = [('name', 'in', property_fields), ('res_id', 'in', res_ids)]
+        property_ids = property_obj.search(cr, uid, property_domain, order='NO_ORDER', context=context)
+        property_obj.unlink(cr, uid, property_ids, context=context)
+
         mdids = ir_model_data_obj.search(cr, 1, [('model', '=', 'res.partner'), ('res_id', 'in', ids)])
         ir_model_data_obj.unlink(cr, uid, mdids, context)
         return res
 
=== modified file 'bin/addons/res_currency_tables/res_currency.py'
--- bin/addons/res_currency_tables/res_currency.py	2018-01-09 11:24:45 +0000
+++ bin/addons/res_currency_tables/res_currency.py	2018-07-31 15:04:52 +0000
@@ -237,7 +237,9 @@
                                                          ('name', '=', 'property_product_pricelist_purchase'),
                                                          ('value_reference', 'in', value_reference)], order='NO_ORDER', context=context)
             for prop in property_obj.browse(cr, uid, property_ids, fields_to_fetch=['res_id'], context=context):
-                if prop.res_id and prop.res_id._table_name == 'res.partner' and prop.res_id.active:
+                # ensure that the partner referenced in ir_property exists before checking if he is active
+                if prop.res_id and prop.res_id._table_name == 'res.partner' and hasattr(prop.res_id, 'active') and \
+                        getattr(prop.res_id, 'active') or False:
                     raise osv.except_osv(_('Currency currently used!'), _('The currency you want to %s is used '
                                                                           'in at least one active partner form.') % keyword)