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

[jftempo]

=== modified file 'bin/addons/account/wizard/account_invoice_refund.py'
--- bin/addons/account/wizard/account_invoice_refund.py	2018-02-26 16:49:46 +0000
+++ bin/addons/account/wizard/account_invoice_refund.py	2018-05-16 09:13:31 +0000
@@ -139,7 +139,9 @@
             description = False
             company = res_users_obj.browse(cr, uid, uid, context=context).company_id
             journal_id = form.get('journal_id', False)
-            for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
+            # in case of a DI refund from a register line use the dir_invoice_id in context
+            invoice_ids = context.get('dir_invoice_id') and [context['dir_invoice_id']] or context.get('active_ids')
+            for inv in inv_obj.browse(cr, uid, invoice_ids, context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if mode in ('cancel', 'modify') and inv_obj.has_one_line_reconciled(cr, uid, [inv.id], context=context):

=== modified file 'bin/addons/account/wizard/account_invoice_refund_view.xml'
--- bin/addons/account/wizard/account_invoice_refund_view.xml	2018-02-23 14:35:29 +0000
+++ bin/addons/account/wizard/account_invoice_refund_view.xml	2018-05-16 09:13:31 +0000
@@ -11,7 +11,7 @@
                     <separator string="Refund Invoice Options" colspan="4"/>
                     <group colspan="4" >
                          <field name="description"/>
-                         <field name="journal_id"/>
+                         <field name="journal_id" required="1"/>
                          <field name="date" required="1"/>
                          <field name="period"/>
                          <field name="filter_refund"/>

=== modified file 'bin/addons/analytic_distribution/account_invoice_refund.py'
--- bin/addons/analytic_distribution/account_invoice_refund.py	2018-03-02 13:21:56 +0000
+++ bin/addons/analytic_distribution/account_invoice_refund.py	2018-05-16 09:13:31 +0000
@@ -40,7 +40,8 @@
         if context is None:
             context = {}
         args = [('type', '=', 'sale_refund')]
-        doc_to_refund_id = context.get('active_ids') and context['active_ids'][0]
+        # in case of a DI refund from a register line use the dir_invoice_id in context
+        doc_to_refund_id = context.get('dir_invoice_id', False) or (context.get('active_ids') and context['active_ids'][0])
         if doc_to_refund_id:
             source_type = obj_inv.read(cr, uid, doc_to_refund_id, ['type'], context=context)['type']
             if source_type in ('in_invoice', 'in_refund'):
@@ -51,10 +52,12 @@
         return journal and journal[0] or False
 
     def _get_document_date(self, cr, uid, context=None):
-        active_ids = context.get('active_ids', [])
-        if active_ids:
+        if context is None:
+            context = {}
+        invoice_id = context.get('dir_invoice_id') or (context.get('active_ids') and context['active_ids'][0])
+        if invoice_id:
             invoice_module = self.pool.get('account.invoice')
-            doc_date = invoice_module.read(cr, uid, active_ids[0], ['document_date'],
+            doc_date = invoice_module.read(cr, uid, invoice_id, ['document_date'],
                                            context=context)['document_date']
             return doc_date
         return time.strftime('%Y-%m-%d')
@@ -143,7 +146,7 @@
     def compute_refund(self, cr, uid, ids, mode='refund', context=None):
         if mode == 'modify' or mode == 'cancel':
             invoice_obj = self.pool.get('account.invoice')
-            inv_ids = context.get('active_ids', [])
+            inv_ids = context.get('dir_invoice_id') and [context['dir_invoice_id']] or context.get('active_ids', [])
             invoices = invoice_obj.browse(cr, uid, inv_ids, context=context)
             for invoice in invoices:
                 if invoice.imported_state == 'partial':

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2018-03-16 11:02:37 +0000
+++ bin/addons/base/rng/view.rng	2018-05-16 09:13:31 +0000
@@ -576,6 +576,7 @@
             <rng:optional><rng:attribute name="colspan"/></rng:optional>
             <rng:optional><rng:attribute name="target"/></rng:optional>
             <rng:optional><rng:attribute name="readonly"/></rng:optional>
+            <rng:optional><rng:attribute name="force_editable"/></rng:optional>
             <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:optional><rng:attribute name="confirm"/></rng:optional>
             <rng:optional><rng:attribute name="help"/></rng:optional>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-04-27 09:58:55 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-05-16 09:13:31 +0000
@@ -12168,6 +12168,7 @@
 #: view:account.invoice.report:0
 #: report:account.invoice2:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
+#: view:account.direct.invoice.wizard:0
 #: view:account.invoice:0
 #: view:account.invoice:0
 #: view:account.invoice.refund:0

=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
--- bin/addons/register_accounting/account_invoice_view.xml	2018-03-02 13:21:56 +0000
+++ bin/addons/register_accounting/account_invoice_view.xml	2018-05-16 09:13:31 +0000
@@ -104,7 +104,7 @@
                 <separator string="Refund Invoice Options" colspan="4"/>
                 <group colspan="4" >
                     <field name="description"/>
-                    <field name="journal_id" widget='selection'/>
+                    <field name="journal_id" widget='selection' required="1"/>
                     <field name="document_date"/>
                     <field name="date" required="1"/>
                     <field name="filter_refund" readonly="1" />

=== modified file 'bin/addons/register_accounting/wizard/account_direct_invoice_wizard_view.xml'
--- bin/addons/register_accounting/wizard/account_direct_invoice_wizard_view.xml	2018-02-13 15:48:51 +0000
+++ bin/addons/register_accounting/wizard/account_direct_invoice_wizard_view.xml	2018-05-16 09:13:31 +0000
@@ -88,6 +88,11 @@
                                 <group col="6" colspan="4">
                                     <button name="invoice_reset_wizard" string="Reset Invoice" icon="gtk-cancel" type="object" attrs="{'invisible':['|', ('partner_id','=',False), ('date_invoice','=',False)]}"/>
                                     <button name="invoice_create_wizard" string="Validate" icon="terp-camera_test" type="object"/>
+                                    <field name="original_invoice_id" invisible="1"/>
+                                    <button name="%(action_direct_invoice_refund)d" type='action' string='Refund'
+                                            states='open,paid' icon="gtk-execute" colspan="2"
+                                            context="{'dir_invoice_id': original_invoice_id}"
+                                            force_editable="1"/>
                                 </group>
                             </group>
                         </page>