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

[jftempo]

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2017-02-24 13:33:33 +0000
+++ bin/addons/account_override/invoice.py	2017-04-27 08:13:33 +0000
@@ -124,6 +124,17 @@
         ]
         return dom1+[('is_debit_note', '=', False)]
 
+    def _get_int_journal_for_current_instance(self, cr, uid, context=None):
+        """
+        Returns the id of the Intermission journal of the current instance if it exists, else returns False.
+        """
+        if context is None:
+            context = {}
+        journal_obj = self.pool.get('account.journal')
+        int_journal_domain = [('type', '=', 'intermission'), ('is_current_instance', '=', True)]
+        int_journal_id = journal_obj.search(cr, uid, int_journal_domain, order='NO_ORDER', limit=1, context=context)
+        return int_journal_id and int_journal_id[0] or False
+
     def _get_fake_m2o_id(self, cr, uid, ids, field_name=None, arg=None, context=None):
         """
         Get many2one field content
@@ -138,11 +149,9 @@
                     if user[0].company_id.intermission_default_counterpart:
                         res[i.id] = user[0].company_id.intermission_default_counterpart.id
                 elif name == 'journal_id':
-                    int_journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'intermission')], context=context)
+                    int_journal_id = self._get_int_journal_for_current_instance(cr, uid, context)
                     if int_journal_id:
-                        if isinstance(int_journal_id, (int, long)):
-                            int_journal_id = [int_journal_id]
-                        res[i.id] = int_journal_id[0]
+                        res[i.id] = int_journal_id
                 elif name == 'currency_id':
                     user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
                     if user[0].company_id.currency_id:
@@ -466,11 +475,9 @@
                     else:
                         raise osv.except_osv("Error","Company Intermission Counterpart Account must be set")
                 # 'INT' intermission journal
-                int_journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'intermission')], context=context)
+                int_journal_id = self._get_int_journal_for_current_instance(cr, uid, context)
                 if int_journal_id:
-                    if isinstance(int_journal_id, (int, long)):
-                        int_journal_id = [int_journal_id]
-                    defaults['fake_journal_id'] = int_journal_id[0]
+                    defaults['fake_journal_id'] = int_journal_id
                     defaults['journal_id'] = defaults['fake_journal_id']
         return defaults
 
@@ -691,6 +698,17 @@
                     if inv_line.partner_id != inv.partner_id:
                         raise osv.except_osv(_('Warning'),
                                              _('All the imported lines must have the same partner as the Debit Note.'))
+            # the journal used for Intermission Vouchers must be the INT journal of the current instance
+            is_iv = context and context.get('type') in ['in_invoice', 'out_invoice'] and not context.get('is_debit_note') \
+                        and not context.get('is_inkind_donation') and context.get('is_intermission')
+            if is_iv:
+                int_journal_id = self._get_int_journal_for_current_instance(cr, uid, context)
+                # update the IV if the INT journal exists but isn't used in the IV (= journal created after the IV creation)
+                if int_journal_id:
+                    if not inv.journal_id or inv.journal_id.id != int_journal_id:
+                        self.write(cr, uid, inv.id, {'journal_id': int_journal_id}, context=context)
+                else:
+                    raise osv.except_osv(_('Warning'), _('No Intermission journal found for the current instance.'))
             if not inv.date_invoice and not inv.document_date:
                 values.update({'date': curr_date, 'document_date': curr_date, 'state': 'date'})
             elif not inv.date_invoice:

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-04-19 14:11:12 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-04-27 08:13:33 +0000
@@ -98376,3 +98376,9 @@
 #, python-format
 msgid "The date format was not correct. The expected date should be > 01/01/1900 in this format DD/MM/YYYY."
 msgstr "Format de date incorrect. La date attendue doit être > 01/01/1900 dans ce format JJ/MM/AAAA."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:713
+#, python-format
+msgid "No Intermission journal found for the current instance."
+msgstr "Pas de journal Intermission trouvé pour l'instance actuelle."