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

[jftempo]

=== modified file 'bin/addons/account/wizard/account_subscription_generate.py'
--- bin/addons/account/wizard/account_subscription_generate.py	2016-08-31 15:23:13 +0000
+++ bin/addons/account/wizard/account_subscription_generate.py	2018-10-10 07:25:21 +0000
@@ -38,6 +38,7 @@
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         sub_line_obj = self.pool.get('account.subscription.line')
+        account_obj = self.pool.get('account.account')
         moves_created=[]
         for data in  self.read(cr, uid, ids, context=context):
             cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
@@ -54,6 +55,11 @@
                     credit = 0.0
                     debit = 0.0
                     for line in acc_model_lines:
+                        # Check account/Third Party compatibility
+                        account_id = line.account_id.id
+                        partner_id = line.partner_id and line.partner_id.id or False
+                        account_obj.check_type_for_specific_treatment(cr, uid, [account_id], partner_id=partner_id, context=context)
+                        account_obj.is_allowed_for_thirdparty(cr, uid, [account_id], partner_id=partner_id, raise_it=True, context=context)
                         credit += line.credit or 0.0
                         debit += line.debit or 0.0
                     if abs(debit - credit) > 10 ** -4:

=== modified file 'bin/addons/account_subscription/account_model.py'
--- bin/addons/account_subscription/account_model.py	2017-11-21 17:07:56 +0000
+++ bin/addons/account_subscription/account_model.py	2018-10-10 07:25:21 +0000
@@ -137,11 +137,33 @@
     }
 
     def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        account_obj = self.pool.get('account.account')
         model = self.pool.get('account.model').browse(cr, uid, vals['model_id'], context=context)
         # just add the next line
         vals['sequence'] = len(model.lines_id) + 1
+        # Check account/Third Party compatibility
+        if vals.get('account_id', False) and 'partner_id' in vals:
+            account_obj.check_type_for_specific_treatment(cr, uid, [vals['account_id']],
+                                                          partner_id=vals.get('partner_id', False), context=context)
+            account_obj.is_allowed_for_thirdparty(cr, uid, [vals['account_id']], partner_id=vals.get('partner_id', False),
+                                                  raise_it=True, context=context)
         return super(account_model_line, self).create(cr, uid, vals, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        account_obj = self.pool.get('account.account')
+        res = super(account_model_line, self).write(cr, uid, ids, vals, context=context)
+        # Check account/Third Party compatibility
+        for line in self.browse(cr, uid, ids, fields_to_fetch=['account_id', 'partner_id'], context=context):
+            account_id = line.account_id.id
+            partner_id = line.partner_id and line.partner_id.id or False
+            account_obj.check_type_for_specific_treatment(cr, uid, account_id, partner_id=partner_id, context=context)
+            account_obj.is_allowed_for_thirdparty(cr, uid, account_id, partner_id=partner_id, raise_it=True, context=context)
+        return res
+
     def button_analytic_distribution(self, cr, uid, ids, context=None):
         """
         Launch analytic distribution wizard on an invoice line