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

[jftempo]

=== modified file 'bin/addons/analytic_override/analytic_line.py'
--- bin/addons/analytic_override/analytic_line.py	2018-02-05 16:01:14 +0000
+++ bin/addons/analytic_override/analytic_line.py	2018-02-22 14:29:23 +0000
@@ -153,6 +153,8 @@
             context = {}
         if not 'account_id' in vals:
             raise osv.except_osv(_('Error'), _('No account_id found in given values!'))
+        if context.get('skip_ad_date_check', False):
+            return True
 
         account_obj = self.pool.get('account.analytic.account')
 

=== modified file 'bin/addons/register_accounting/account_direct_invoice_wizard.py'
--- bin/addons/register_accounting/account_direct_invoice_wizard.py	2018-01-16 16:06:47 +0000
+++ bin/addons/register_accounting/account_direct_invoice_wizard.py	2018-02-22 14:29:23 +0000
@@ -183,6 +183,9 @@
         """
         Take information from wizard in order to create an invoice, invoice lines and to post a register line that permit to reconcile the invoice.
         """
+        if context is None:
+            context = {}
+
         self.check_analytic_distribution(cr, uid, ids)
 
         # Prepare some value
@@ -264,7 +267,9 @@
         vals_copy = vals.copy()
         # invoice lines are processed just after
         vals_copy.pop('invoice_line')
+        context.update({'skip_ad_date_check': True})
         inv_obj.write(cr, uid, [inv_id], vals_copy, context)
+        del context['skip_ad_date_check']
 
         # get line id list
         invl_id_list = [x.id for x in wiz_obj.browse(cr, uid, ids,