Merge lp:~dorian-kemps/unifield-server/US-1531 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2017-10-20 09:43:54 +0000
+++ bin/addons/account/invoice.py	2018-01-12 08:49:32 +0000
@@ -425,7 +425,11 @@
     def get_log_context(self, cr, uid, context=None):
         if context is None:
             context = {}
-        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
+        is_intermission = context.get('is_intermission', False)
+        if is_intermission:
+            res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_override', 'view_intermission_form')
+        else:
+            res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
         view_id = res and res[1] or False
         context.update({'view_id': view_id})
         return context
@@ -437,10 +441,14 @@
             res = super(account_invoice, self).create(cr, uid, vals, context)
             for inv_id, name in self.name_get(cr, uid, [res], context=context):
                 ctx = context.copy()
+                if 'is_intermission' in vals:
+                    ctx.update({'is_intermission': vals['is_intermission']})
                 if vals.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
                     ctx = self.get_log_context(cr, uid, context=ctx)
                 if 'type' in vals:
                     ctx.update({'type': vals['type']})
+                if '_terp_view_name' in ctx:
+                    del ctx['_terp_view_name']
                 message = _("Invoice '%s' is waiting for validation.") % name
                 self.log(cr, uid, inv_id, message, context=ctx)
             return res
 
=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2017-10-27 15:15:11 +0000
+++ bin/addons/account_override/invoice.py	2018-01-12 08:49:32 +0000
@@ -698,9 +698,13 @@
                 local_ctx.update(el[2])
         # UF-1112: Give all customer invoices a name as "Stock Transfer Voucher".
         if not message_changed and self.read(cr, uid, inv_id, ['type']).get('type', False) == 'out_invoice':
-            message = re.sub(pattern, 'Stock Transfer Voucher', message, 1)
+            if local_ctx.get('is_intermission', False):
+                message = re.sub(pattern, 'Intermission Voucher', message, 1)
+                local_ctx.update(intermission_ctx)
+            else:
+                message = re.sub(pattern, 'Stock Transfer Voucher', message, 1)
+                local_ctx.update(customer_ctx)
 
-            local_ctx.update(customer_ctx)
         # UF-1307: for supplier invoice log (from the incoming shipment), the context was not
         # filled with all the information; this leaded to having a "Sale" journal in the supplier
         # invoice if it was saved after coming from this link. Here's the fix.