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

[jftempo]

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2016-02-17 08:55:37 +0000
+++ bin/addons/account/invoice.py	2016-03-16 16:52:34 +0000
@@ -348,6 +348,9 @@
         if view_type == 'tree':
             doc = etree.XML(res['arch'])
             nodes = doc.xpath("//field[@name='partner_id']")
+            # (US-777) Remove the possibility to create new invoices through the "Advance Return" Wizard
+            if context.get('from_wizard') and context.get('from_wizard')['model'] == 'wizard.cash.return':
+                doc.set('hide_new_button', 'True')
             partner_string = _('Customer')
             if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
                 partner_string = _('Supplier')

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2016-01-25 11:23:45 +0000
+++ bin/addons/account_override/invoice.py	2016-03-16 16:52:34 +0000
@@ -668,7 +668,7 @@
         No longer fills the date automatically, but requires it to be set
         """
         # Some verifications
-        if not context:
+        if context is None:
             context = {}
         self._check_invoice_merged_lines(cr, uid, ids, context=context)
 
@@ -700,6 +700,19 @@
                     }
 
             wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_open', cr)
+
+        fw = context.get('from_wizard', False)
+        if fw:
+            # since US-777: go back to wizard in progress
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': fw['model'],
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_id': fw['res_id'],
+                'context': context,
+                'target': 'new',
+            }
         return True
 
     def action_reconcile_imported_invoice(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-03-11 16:18:26 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-03-16 16:52:34 +0000
@@ -55426,6 +55426,7 @@
 
 #. module: register_accounting
 #: code:addons/register_accounting/wizard/import_invoice_on_registers.py:125
+#: code:addons/register_accounting/wizard/wizard_cash_return.py:669
 #, python-format
 msgid "This invoice: %s %s has already been added. Please choose another invoice."
 msgstr "Cette facture: %s %s a déjà été ajoutée. Veuillez choisir une autre facture."

=== modified file 'bin/addons/register_accounting/wizard/invoice_date.py'
--- bin/addons/register_accounting/wizard/invoice_date.py	2014-03-07 11:05:37 +0000
+++ bin/addons/register_accounting/wizard/invoice_date.py	2016-03-16 16:52:34 +0000
@@ -51,6 +51,20 @@
 
             inv_obj.write(cr, uid, [wiz.invoice_id.id], values)
             wf_service.trg_validate(uid, 'account.invoice', wiz.invoice_id.id, 'invoice_open', cr)
+
+        fw = context and context.get('from_wizard', False) or False
+        if fw:
+            # since US-777: go back to wizard in progress
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': fw['model'],
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_id': fw['res_id'],
+                'context': context,
+                'target': 'new',
+            }
+
         return { 'type': 'ir.actions.act_window_close', }
 
 wizard_invoice_date()

=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.py'
--- bin/addons/register_accounting/wizard/wizard_cash_return.py	2015-05-29 11:50:18 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.py	2016-03-16 16:52:34 +0000
@@ -28,6 +28,7 @@
 import time
 from lxml import etree
 
+
 class account_bank_statement_line(osv.osv):
     _name = "account.bank.statement.line"
     _inherit = "account.bank.statement.line"
@@ -45,6 +46,7 @@
     A register line simulation containing some invoices.
     """
     _name = "wizard.invoice.line"
+
     _columns = {
         'document_date': fields.date(string='Document Date'),
         'reference': fields.char(string='Reference', size=64, required=False), # invoice.internal_number
@@ -58,6 +60,7 @@
 
 wizard_invoice_line()
 
+
 class wizard_advance_line(osv.osv_memory):
     """
     A register line simulation.
@@ -278,9 +281,9 @@
                 'context': context,
         }
 
-
 wizard_advance_line()
 
+
 class wizard_cash_return(osv.osv_memory):
     """
     A wizard to link some advance lines to some account_move_line according to some parameters :
@@ -323,7 +326,7 @@
             help="Add the invoices you want to link to the Cash Advance Return", required=False, readonly=True),
         'advance_line_ids': fields.one2many('wizard.advance.line', 'wizard_id', string="Advance Lines"),
         'total_amount': fields.float(string="Justified Amount", digits=(16,2), readonly=True),
-        'invoice_id': fields.many2one('account.invoice', string='Invoice', required=False),
+        'invoice_ids': fields.many2many('account.invoice', 'wizard_cash_return_invoice_rel', 'wizard_id', 'invoice_id', "Invoices"),
         'display_invoice': fields.boolean(string="Display Invoice"),
         'advance_st_line_id': fields.many2one('account.bank.statement.line', string='Advance Statement Line', required=True),
         'currency_id': fields.many2one('res.currency', string='Currency'),
@@ -364,7 +367,10 @@
 
     def create(self, cr, uid, values, context=None):
         w_id = super(wizard_cash_return, self).create(cr, uid, values, context=context)
-        if context and 'statement_line_id' in context:
+        if context is None:
+            context = {}
+
+        if 'statement_line_id' in context:
             """"
             UTP-482 if statment line of Operational Advance,
             is linked to a PO, automatically adding PO invoices
@@ -393,6 +399,11 @@
                             " Entering a 100% cash return (advance return amount = initial advance amount) you will be able to close this advance without linking it to an invoice."
                         values['comment'] = msg
                     self.write(cr, uid, [w_id], values, context=context)
+
+        context['from_wizard'] = {
+            'model': 'wizard.cash.return',
+            'res_id': w_id,
+        }
         return w_id
 
     def onchange_addl_amount(self, cr, uid, returned_amount, context=None):
@@ -601,20 +612,26 @@
             is linked to a PO, automatically adding PO invoices
             (force user to use invoices for this cash return)
             """
-            auto_add = True
             invoice_obj = self.pool.get('account.invoice')
-            invoice = invoice_obj.browse(cr, uid, context['po_op_advance_auto_add_invoice_id'], context)
+            invoice_rec = invoice_obj.browse(cr, uid,
+                context['po_op_advance_auto_add_invoice_id'], context)
             del context['po_op_advance_auto_add_invoice_id']
-            if not invoice:
+            if not invoice_rec:
                 return
+            auto_add = True
+            invoices = [ invoice_rec, ]
         else:
             # default behaviour
+            if not wizard.invoice_ids:
+                return False
             auto_add = False
-            invoice = wizard.invoice_id
-        to_write = {}
+            invoices = wizard.invoice_ids
+
         new_lines = []
-        total = 0.0
-        if invoice:
+        total = wizard.returned_amount or 0.  # reuse current amount when adding new line
+        added_invoice_ids = [
+            wil.invoice_id.id for wil in wizard.invoice_line_ids ]
+        for invoice in invoices:
             # Verify that the invoice is in the same currency as those of the register
             inv_currency = invoice.currency_id.id
             if wizard.advance_st_line_id and wizard.advance_st_line_id.statement_id \
@@ -624,18 +641,10 @@
                 st_currency = False
             if st_currency and st_currency != inv_currency:
                 raise osv.except_osv(_('Error'), _('The choosen invoice is not in the same currency as those of the register.'))
-            # Make a list of invoices that have already been added in this wizard
-            if wizard.invoice_line_ids:
-                added_invoices = [x['invoice_id']['id'] for x in wizard.invoice_line_ids]
-            else:
-                added_invoices = []
+
             # Do operations only if our invoice is not in our list
-            if invoice.id not in added_invoices:
-                # Retrieve some variables
-                move_line_obj = self.pool.get('account.move.line')
-                account_id = invoice.account_id.id
+            if invoice.id not in added_invoice_ids:
                 # recompute the total_amount
-                total = wizard.returned_amount or 0
                 if wizard.invoice_line_ids:
                     for line in wizard.invoice_line_ids:
                         total += line.amount
@@ -644,21 +653,30 @@
                 partner_id = invoice.partner_id.id or False
                 account_id = invoice.account_id.id or False
                 date = invoice.document_date or False
-                new_lines.append((0, 0, {'document_date': date, 'reference': reference, 'communication': communication, 'partner_id': partner_id, \
-                        'account_id': account_id, 'amount': invoice.residual, 'invoice_id': invoice.id}))
+                line_vals = {
+                    'document_date': date,
+                    'reference': reference,
+                    'communication': communication,
+                    'partner_id': partner_id,
+                    'account_id': account_id,
+                    'amount': invoice.residual,
+                    'invoice_id': invoice.id,
+                }
+                new_lines.append((0, 0, line_vals))
                 # Add amount to total_amount
                 total += invoice.residual
-            # Change display_invoice to True in order to show invoice lines
-            if new_lines:
-                to_write['display_invoice'] = True
-                # Add lines to elements to be written
-                to_write['invoice_line_ids'] = new_lines
-                # Add total_amount to elements to be written
-                to_write['total_amount'] = total
-                # Delete content of invoice_id field
-                to_write['invoice_id'] = False
-                # write changes in the wizard
-                self.write(cr, uid, ids, to_write, context=context)
+            else:
+                raise osv.except_osv(_('Warning'), _('This invoice: %s %s has already been added. Please choose another invoice.')%(invoice.internal_number or '', invoice.residual))
+
+        if new_lines:
+            vals = {
+                # Change display_invoice to True in order to show invoice lines
+                'display_invoice': True,
+                'invoice_line_ids': new_lines,
+                'total_amount': total,
+                'invoice_ids': [ (6, 0, []), ] ,  # reset invoices picker
+            }
+            self.write(cr, uid, ids, vals, context=context)
 
         if not auto_add:
             return {
@@ -693,10 +711,16 @@
             display_invoice = False
         """
 
-        # Delete links to invoice_line_ids and inform wizard of that
-        self.write(cr, uid, ids, {'display_invoice': display_invoice, 'invoice_line_ids': [(5,)]}, context=context)
+        vals = {
+            'display_invoice': display_invoice,
+            'invoice_ids': [ (6, 0, []), ] ,  # reset invoices picker
+            'invoice_line_ids': [ (5, ), ],  # reset to import invoices
+        }
+        self.write(cr, uid, ids, vals, context=context)
+
         # Update total amount
         self.compute_total_amount(cr, uid, ids, context=context)
+
         return {
             'type': 'ir.actions.act_window',
             'res_model': 'wizard.cash.return',

=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.xml'
--- bin/addons/register_accounting/wizard/wizard_cash_return.xml	2014-10-07 07:50:37 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.xml	2016-03-16 16:52:34 +0000
@@ -29,9 +29,11 @@
                         <field name="analytic_distribution_id" invisible="1"/>
                     </group>
                     <group colspan="4">
-                        <field name='invoice_id' nolabel="1" domain="[('type', '=', 'in_invoice'), ('state', '=', 'open'), 
-                            ('currency_id', '=', currency_id)]"/>
-                        <button string='Add invoice' name='action_add_invoice' type='object' icon='gtk-add' />
+                        <field name='invoice_ids' nolabel="1"
+                           domain="[('type', '=', 'in_invoice'), ('state', '=', 'open'), ('currency_id', '=', currency_id)]"
+                           context="{ 'type': 'in_invoice', 'journal_type': 'purchase' }"
+                        />
+                        <button string='Add invoice(s)' name='action_add_invoice' type='object' icon='gtk-add' />
                     </group>
                     <newline />
                     <field name='invoice_line_ids' attrs="{'invisible':[('display_invoice', '!=', True)]}" nolabel="1" colspan="4" />