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

[jftempo]

=== modified file 'bin/addons/account_corrections/wizard/journal_items_corrections.py'
--- bin/addons/account_corrections/wizard/journal_items_corrections.py	2018-02-21 16:51:38 +0000
+++ bin/addons/account_corrections/wizard/journal_items_corrections.py	2018-07-09 08:36:01 +0000
@@ -350,9 +350,12 @@
             elif acc_type == 'advance' and not aml.employee_id:
                 raise osv.except_osv(_('Warning'), _('The account "%s - %s" is only compatible '
                                                      'with an Employee Third Party.') % (account.code, account.name))
-            elif acc_type in ['down_payment', 'payroll'] and not aml.partner_id:
+            elif acc_type == 'down_payment' and not aml.partner_id:
                 raise osv.except_osv(_('Warning'), _('The account "%s - %s" is only compatible '
                                                      'with a Partner Third Party.') % (account.code, account.name))
+            elif acc_type == 'payroll' and not aml.partner_id and not aml.employee_id:
+                raise osv.except_osv(_('Warning'), _('The account "%s - %s" is only compatible '
+                                                     'with a Partner or an Employee Third Party.') % (account.code, account.name))
         else:
             # Check the compatibility with the Allowed Partner Types
             # (according to US-1307 this check is done only when the account has no "Type For Specific Treatment")
 
=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2018-04-03 10:18:51 +0000
+++ bin/addons/account_override/account.py	2018-07-09 08:36:01 +0000
@@ -643,8 +643,9 @@
             acc_type = acc_id.type_for_register
             transfer_not_ok = acc_type in ['transfer', 'transfer_same'] and (not journal_id or partner_id or employee_id)
             advance_not_ok = acc_type == 'advance' and (not employee_id or journal_id or partner_id)
-            dp_payroll_not_ok = acc_type in ['down_payment', 'payroll'] and (not partner_id or journal_id or employee_id)
-            if transfer_not_ok or advance_not_ok or dp_payroll_not_ok:
+            dp_not_ok = acc_type == 'down_payment' and (not partner_id or journal_id or employee_id)
+            payroll_not_ok = acc_type == 'payroll' and ((not partner_id and not employee_id) or journal_id)
+            if transfer_not_ok or advance_not_ok or dp_not_ok or payroll_not_ok:
                 not_compatible_ids.append(acc_id.id)
         if not_compatible_ids:
             self._display_account_partner_compatibility_error(cr, uid, not_compatible_ids, context, type_for_specific_treatment=True)
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-06-15 12:30:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-07-09 08:36:01 +0000
@@ -101265,3 +101265,8 @@
 msgid "Not Invoice"
 msgstr "Pas de Facture"
 
+#. module: account_corrections
+#: code:addons/account_corrections/wizard/journal_items_corrections.py:357
+#, python-format
+msgid "The account \"%s - %s\" is only compatible with a Partner or an Employee Third Party."
+msgstr "Le compte \"%s - %s\" n'est compatible qu'avec un Tiers de type Partenaire ou Employé."
 
=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2018-06-11 13:34:07 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2018-07-09 08:36:01 +0000
@@ -2983,10 +2983,14 @@
                 third_type = [('hr.employee', 'Employee')]
                 third_required = True
                 third_selection = 'hr.employee,0'
-            elif a['type_for_register'] in ['down_payment', 'payroll']:
+            elif a['type_for_register'] == 'down_payment':
                 third_type = [('res.partner', 'Partner')]
                 third_required = True
                 third_selection = 'res.partner,0'
+            elif a['type_for_register'] == 'payroll':
+                third_type = [('res.partner', 'Partner'), ('hr.employee', 'Employee')]
+                third_required = True
+                third_selection = 'res.partner,0'
         return {'value': {'partner_type_mandatory': third_required, 'partner_type': {'options': third_type, 'selection': third_selection}}}
 
     def onchange_partner_type(self, cr, uid, ids, partner_type=None, amount_in=None, amount_out=None, context=None):
 
=== modified file 'bin/addons/register_accounting/account_move_line.py'
--- bin/addons/register_accounting/account_move_line.py	2017-12-05 17:00:38 +0000
+++ bin/addons/register_accounting/account_move_line.py	2018-07-09 08:36:01 +0000
@@ -359,10 +359,14 @@
                 third_type = [('hr.employee', 'Employee')]
                 third_required = True
                 third_selection = 'hr.employee,0'
-            elif acc_type in ['down_payment', 'payroll']:
+            elif acc_type == 'down_payment':
                 third_type = [('res.partner', 'Partner')]
                 third_required = True
                 third_selection = 'res.partner,0'
+            elif acc_type == 'payroll':
+                third_type = [('res.partner', 'Partner'), ('hr.employee', 'Employee')]
+                third_required = True
+                third_selection = 'res.partner,0'
         val.update({'partner_type_mandatory': third_required, 'partner_type': {'options': third_type, 'selection': third_selection}})
         return {'value': val}
 
 
=== modified file 'bin/addons/register_accounting/wizard/wizard_register_import.py'
--- bin/addons/register_accounting/wizard/wizard_register_import.py	2018-03-08 17:25:31 +0000
+++ bin/addons/register_accounting/wizard/wizard_register_import.py	2018-07-09 08:36:01 +0000
@@ -484,10 +484,18 @@
                                         if tp_journal.currency.id != register_currency:
                                             errors.append(_('Line %s. A Transfer Same Journal must have the same currency as the register.') % (current_line_num,))
                                             continue
-                            # Type DP or payroll ==> PARTNER required
-                            elif type_for_register in ['down_payment', 'payroll']:
+                            # Type DP ==> PARTNER required
+                            elif type_for_register == 'down_payment':
                                 tp_ids = partner_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
                                 partner_type = 'partner'
+                            # Type payroll ==> PARTNER or EMPLOYEE required
+                            elif type_for_register == 'payroll':
+                                tp_ids = partner_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                                if tp_ids:
+                                    partner_type = 'partner'
+                                else:
+                                    tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                                    partner_type = 'employee'
                         # Any type for Spec. Treatment listed above ==> EMPTY partner NOT allowed
                         if not tp_ids:
                             errors.append(