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

[jftempo]

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2017-01-02 08:59:17 +0000
+++ bin/addons/account/invoice.py	2017-02-01 13:16:26 +0000
@@ -1213,7 +1213,7 @@
             return False
         return data
 
-    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
+    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None, document_date=None):
         invoices = self.read(cr, uid, ids, self._hook_fields_for_refund(cr, uid))
         obj_invoice_line = self.pool.get('account.invoice.line')
         obj_invoice_tax = self.pool.get('account.invoice.tax')
@@ -1257,6 +1257,10 @@
                 invoice.update({
                     'period_id': period_id,
                 })
+            if document_date:
+                invoice.update({
+                    'document_date': document_date,
+                })
             if description:
                 invoice.update({
                     'name': description,
 
=== modified file 'bin/addons/analytic_distribution/invoice.py'
--- bin/addons/analytic_distribution/invoice.py	2017-01-17 13:31:02 +0000
+++ bin/addons/analytic_distribution/invoice.py	2017-02-01 13:16:26 +0000
@@ -156,10 +156,7 @@
                 raise osv.except_osv(_('Error'), _("Posting date for the refund is before the invoice's posting date!"))
             if document_date and document_date < inv.document_date:
                 raise osv.except_osv(_('Error'), _("Document date for the refund is before the invoice's document date!"))
-        new_ids = super(account_invoice, self).refund(cr, uid, ids, date, period_id, description, journal_id)
-        # add document date
-        if document_date:
-            self.write(cr, uid, new_ids, {'document_date': document_date})
+        new_ids = super(account_invoice, self).refund(cr, uid, ids, date, period_id, description, journal_id, document_date)
         return new_ids
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):