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

[jftempo]

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2019-10-30 16:33:21 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2020-02-04 10:20:44 +0000
@@ -1796,7 +1796,7 @@
         """
         If the statement line...
             - is being hardposted
-            - has a Partner Third Party
+            - has a Partner Third Party being neither Intermission nor Intersection
             - is booked on an income or expense account
         ... this method creates automated entries on partner payable or receivable account (JI), adds them to the
         regline JE, and returns a list of their ids that will have to be reconciled once the JE will be posted.
@@ -1806,8 +1806,8 @@
         if not st_line:
             return False
         automated_entries_ids = []
-        if posttype == 'hard' and st_line.partner_id and st_line.account_id.user_type.code in ('expense', 'income') and \
-                st_line.direct_invoice is False:
+        if posttype == 'hard' and st_line.partner_id and st_line.partner_id.partner_type not in ('intermission', 'section') and \
+                st_line.account_id.user_type.code in ('expense', 'income') and st_line.direct_invoice is False:
             # Prepare some elements
             move_line_obj = self.pool.get('account.move.line')
             current_date = time.strftime('%Y-%m-%d')
 
=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.py'
--- bin/addons/register_accounting/wizard/wizard_cash_return.py	2020-01-21 17:24:12 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.py	2020-02-04 10:20:44 +0000
@@ -926,7 +926,8 @@
             if partner:
                 if partner._name == 'res.partner':
                     partner_id = partner.id
-                    advances_with_supplier.setdefault(adv_move, []).append(advance)
+                    if partner.partner_type not in ('intermission', 'section'):
+                        advances_with_supplier.setdefault(adv_move, []).append(advance)
                 elif partner._name == 'hr.employee':
                     line_employee_id = partner.id
             debit = abs(advance.amount)
@@ -945,7 +946,8 @@
                                            account_id, debit, credit, adv_return_ref, adv_move, distrib_id, context=context)
             adv_move_data.append((adv_move, adv_id))
 
-        # if advance lines have a Partner Third Party: create Payable Entries and add them to the advance closing JE
+        # if advance lines have a Partner Third Party being neither Intermission nor Intersection:
+        # create Payable Entries and add them to the advance closing JE
         to_reconcile = {}  # per advance line
         payable_lines = []
         for adv_move in advances_with_supplier: