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

[jftempo]

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2017-02-01 10:13:31 +0000
+++ bin/addons/account_override/account.py	2017-02-09 15:23:17 +0000
@@ -1027,10 +1027,28 @@
                     raise osv.except_osv(_('Warning'), _('You cannot post entries in a non-opened period: %s') % (m.period_id.name))
                 prev_currency_id = False
                 for ml in m.line_id:
+                    # Check that the currency and type of the (journal) third party is correct
+                    # in case of an "Internal Transfer" account
+                    type_for_reg = ml.account_id.type_for_register
+                    curr_aml = ml.currency_id
+                    partner_journal = ml.transfer_journal_id
+                    is_liquidity = partner_journal and partner_journal.type in ['cash', 'bank', 'cheque'] and partner_journal.currency
+                    if type_for_reg == 'transfer_same' and (not is_liquidity or partner_journal.currency.id != curr_aml.id):
+                        raise osv.except_osv(_('Warning'),
+                                             _('Account: %s - %s. The Third Party must be a liquidity journal with the same '
+                                               'currency as the booking one.') % (ml.account_id.code, ml.account_id.name))
+                    elif type_for_reg == 'transfer' and (not is_liquidity or partner_journal.currency.id == curr_aml.id):
+                        raise osv.except_osv(_('Warning'),
+                                             _('Account: %s - %s. The Third Party must be a liquidity journal with a currency '
+                                               'different from the booking one.') % (ml.account_id.code, ml.account_id.name))
+                    if is_liquidity and m.journal_id and m.journal_id.id == partner_journal.id:
+                        raise osv.except_osv(_('Warning'),
+                                             _('Account: %s - %s. The journal used for the internal transfer must be different from the '
+                                               'Journal Entry Journal.') % (ml.account_id.code, ml.account_id.name))
                     if not prev_currency_id:
-                        prev_currency_id = ml.currency_id.id
+                        prev_currency_id = curr_aml.id
                         continue
-                    if ml.currency_id.id != prev_currency_id:
+                    if curr_aml.id != prev_currency_id:
                         raise osv.except_osv(_('Warning'), _('You cannot have two different currencies for the same Journal Entry!'))
         return super(account_move, self).button_validate(cr, uid, ids, context=context)
 

=== modified file 'bin/addons/finance/account_view.xml'
--- bin/addons/finance/account_view.xml	2017-01-17 13:31:02 +0000
+++ bin/addons/finance/account_view.xml	2017-02-09 15:23:17 +0000
@@ -100,6 +100,7 @@
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
                                         <field name="name"/>
                                         <field name="reference"/>
+                                        <field name="partner_type_mandatory" invisible="1"/>
                                         <field name="account_id" domain="[('restricted_area', '=', 'account_move_lines')]"/>
                                         <field name="partner_id" invisible="1"/>
                                         <field name="debit_currency" sum="Total Booking Debit" string="Book. Debit"/>

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2016-11-17 09:34:23 +0000
+++ bin/addons/msf_doc_import/account.py	2017-02-09 15:23:17 +0000
@@ -462,8 +462,11 @@
                     if not partner_needs:
                         errors.append(_('Line %s. No info about given account: %s') % (current_line_num, account.code,))
                         continue
-                    # Check result
+                    # Check partner type compatibility regarding the Account "Type for specific treatment"
                     partner_options = partner_needs['value']['partner_type']['options']
+                    partner_type_mandatory = 'partner_type_mandatory' in partner_needs['value'] and \
+                                             partner_needs['value']['partner_type_mandatory'] or False
+                    type_for_reg = account.type_for_register
                     if r_partner and ('res.partner', 'Partner') not in partner_options:
                         errors.append(_('Line %s. You cannot use a partner for the given account: %s.') % (current_line_num, account.code))
                         continue
@@ -472,6 +475,23 @@
                         continue
                     if r_journal and ('account.journal', 'Journal') not in partner_options:
                         errors.append(_('Line %s. You cannot use a journal for the given account: %s.') % (current_line_num, account.code))
+                    if partner_type_mandatory and not r_partner and not r_employee and not r_journal:
+                        errors.append(_('Line %s. A Third Party is mandatory for the given account: %s.') % (current_line_num, account.code))
+                    # Check that the currency and type of the (journal) third party is correct
+                    # in case of an "Internal Transfer" account
+                    partner_journal = r_journal and aj_obj.browse(cr, uid, r_journal, fields_to_fetch=['currency', 'type'], context=context)
+                    is_liquidity = partner_journal and partner_journal.type in ['cash', 'bank', 'cheque'] and partner_journal.currency
+                    if type_for_reg == 'transfer_same' and (not is_liquidity or partner_journal.currency.id != r_currency):
+                        errors.append(_('Line %s. The Third Party must be a liquidity journal with the same currency '
+                                        'as the booking one for the given account: %s.') % (current_line_num, account.code))
+                    if type_for_reg == 'transfer' and (not is_liquidity or partner_journal.currency.id == r_currency):
+                        errors.append(_('Line %s. The Third Party must be a liquidity journal with a currency '
+                                        'different from the booking one for the given account: %s.') % (current_line_num, account.code))
+                    if is_liquidity and file_journal_id == partner_journal.id:
+                        raise osv.except_osv(_('Warning'),
+                                             _('Line %s. The journal used for the internal transfer must be different from the '
+                                               'Journal Entry Journal for the given account: %s.') % (current_line_num, account.code))
+
                     line_res = self.pool.get('msf.doc.import.accounting.lines').create(cr, uid, vals, context)
                     if not line_res:
                         errors.append(_('Line %s. A problem occured for line registration. Please contact an Administrator.') % (current_line_num,))

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-01-31 16:17:06 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-02-09 15:23:17 +0000
@@ -76099,8 +76099,53 @@
 #, python-format
 msgid "A line was added to the %s %s to re-source the canceled line."
 msgstr "Une ligne a été ajoutée a la %s %s pour 're-sourcer' la ligne annulée."
+<<<<<<< TREE
 
 #. modules: sale, msf_printed_documents
 #: report:msf.consumption_report:0
 msgid "Source Location :"
 msgstr "Source Location :"
+=======
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:478
+#, python-format
+msgid "Line %s. A Third Party is mandatory for the given account: %s."
+msgstr "Ligne %s. Un Tiers est obligatoire pour le compte donné : %s."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:488
+#, python-format
+msgid "Line %s. The Third Party must be a liquidity journal with a currency different from the booking one for the given account: %s."
+msgstr "Ligne %s. Le Tiers doit être un journal de trésorerie avec une devise différente de la devise d'enregistrement pour le compte donné : %s."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:485
+#, python-format
+msgid "Line %s. The Third Party must be a liquidity journal with the same currency as the booking one for the given account: %s."
+msgstr "Ligne %s. Le Tiers doit être un journal de trésorerie avec la même devise que la devise d'enregistrement pour le compte donné : %s."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:492
+#, python-format
+msgid "Line %s. The journal used for the internal transfer must be different from the Journal Entry Journal for the given account: %s."
+msgstr "Ligne %s. Le journal utilisé pour le transfert interne doit être différent du journal de l'écriture comptable pour le compte donné : %s."
+
+#. module: account_override
+#: code:addons/account_override/account.py:1035
+#, python-format
+msgid "Account: %s - %s. The Third Party must be a liquidity journal with a currency different from the booking one."
+msgstr "Compte: %s - %s. Le Tiers doit être un journal de trésorerie avec une devise différente de la devise d'enregistrement."
+
+#. module: account_override
+#: code:addons/account_override/account.py:1031
+#, python-format
+msgid "Account: %s - %s. The Third Party must be a liquidity journal with the same currency as the booking one."
+msgstr "Compte: %s - %s. Le Tiers doit être un journal de trésorerie avec la même devise que la devise d'enregistrement."
+
+#. module: account_override
+#: code:addons/account_override/account.py:1039
+#, python-format
+msgid "Account: %s - %s. The journal used for the internal transfer must be different from the Journal Entry Journal."
+msgstr "Compte: %s - %s. Le journal utilisé pour le transfert interne doit être différent du journal de l'écriture comptable."
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2017-01-31 16:17:06 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2017-02-09 15:23:17 +0000
@@ -2835,7 +2835,7 @@
                 third_type = [('hr.employee', 'Employee')]
                 third_required = True
                 third_selection = 'hr.employee,0'
-            elif a['type_for_register'] == 'down_payment':
+            elif a['type_for_register'] in ['down_payment', 'payroll']:
                 third_type = [('res.partner', 'Partner')]
                 third_required = True
                 third_selection = 'res.partner,0'

=== modified file 'bin/addons/register_accounting/account_move_line.py'
--- bin/addons/register_accounting/account_move_line.py	2016-11-17 08:46:41 +0000
+++ bin/addons/register_accounting/account_move_line.py	2017-02-09 15:23:17 +0000
@@ -300,11 +300,14 @@
                 third_type = [('account.journal', 'Journal')]
                 third_required = True
                 third_selection = 'account.journal,0'
-
             elif acc_type == 'advance':
                 third_type = [('hr.employee', 'Employee')]
                 third_required = True
                 third_selection = 'hr.employee,0'
+            elif acc_type in ['down_payment', 'payroll']:
+                third_type = [('res.partner', 'Partner')]
+                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/account_view.xml'
--- bin/addons/register_accounting/account_view.xml	2017-01-23 15:59:58 +0000
+++ bin/addons/register_accounting/account_view.xml	2017-02-09 15:23:17 +0000
@@ -943,7 +943,10 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form//tree//field[@name='partner_id']" position="after">
-                        <field name="partner_type" context="{'journal_fake_name': True, 'search_default_active': True}"/>
+                        <field name="partner_type"
+                               attrs="{'required': [('partner_type_mandatory', '=', True)]}"
+                               domain="[('filter_for_third_party', '=', account_id)]"
+                               context="{'journal_fake_name': True, 'search_default_active': True, 'curr': parent.manual_currency_id, 'journal': parent.journal_id}"/>
                     </xpath>
                     <xpath expr="/form//tree//field[@name='account_id']" position="replace">
                         <field name="account_id" on_change="onchange_account_id(account_id, partner_type)" domain="[('restricted_area', '=', 'account_move_lines')]"/>