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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
--- bin/addons/msf_profile/i18n/es_MF.po	2017-09-28 14:05:02 +0000
+++ bin/addons/msf_profile/i18n/es_MF.po	2018-02-13 14:39:37 +0000
@@ -20461,11 +20461,6 @@
 msgid "If you have more than one shop reselling your company products, you can create and manage that from here. Whenever you will record a new quotation or sales order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales."
 msgstr "Si hay más de una tienda que vende los productos de su empresa, puede crearlas y administrarlas desde aquí. Cada vez que registre un nuevo presupuesto o pedido de venta, deberá vincularlo a la tienda correspondiente. La tienda también define el almacén desde el que se enviarán los productos para cada venta concreta."
 
-#. module: register_accounting
-#: field:wizard.cash.return,display_invoice:0
-msgid "Display Invoice"
-msgstr "Mostrar factura"
-
 #. modules: account, register_accounting
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,statement_id:0

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-02-13 08:37:02 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-02-13 14:39:37 +0000
@@ -36871,8 +36871,8 @@
 #. module: register_accounting
 #: code:addons/register_accounting/wizard/wizard_cash_return.py:826
 #, python-format
-msgid "Initial advance amount (%s) does not match the amount you justified (%s). First correct. Then press Compute button"
-msgstr "Initial advance amount (%s) does not match the amount you justified (%s). First correct. Then press Compute button"
+msgid "Advance amount (%s) does not match the amount you justified (%s). First correct. Then press Compute button."
+msgstr "Le montant de l'avance (%s) ne correspond pas avec le montant que vous avez justifié (%s). Veuillez d'abord corriger. Puis cliquez sur le bouton Calculer."
 
 #. modules: account, stock_override, supplier_catalogue, consumption_calculation, purchase_override, base, register_accounting, stock, analytic_distribution
 #: field:account.analytic.chart,from_date:0
@@ -64260,11 +64260,6 @@
 msgid "Fiscal Year to close"
 msgstr "Exercice comptable à Clôturer"
 
-#. module: register_accounting
-#: field:wizard.cash.return,display_invoice:0
-msgid "Display Invoice"
-msgstr "Afficher Facture"
-
 #. module: product
 #: field:product.template,type:0
 msgid "Product Type"

=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.py'
--- bin/addons/register_accounting/wizard/wizard_cash_return.py	2017-08-18 10:15:40 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.py	2018-02-13 14:39:37 +0000
@@ -295,8 +295,12 @@
     _name = "wizard.cash.return"
     _description = "A wizard that link some advance lines to some account move lines"
 
-    def changeline(self, cr, uid, ids, lines, returned_amount, date, reference, additional_amount, context=None):
+    def changeline(self, cr, uid, ids, lines, returned_amount, invoices, date, reference, additional_amount, context=None):
         total_amount = returned_amount or 0.0
+        # add the amount of invoice lines
+        for invoice in invoices:
+            if len(invoice) > 2:
+                total_amount += invoice[2].get('amount', 0.0)
         for line in lines:
             if line[0] == 1:
                 total_amount += line[2].get('amount',0)
@@ -308,7 +312,7 @@
 
     def _get_ok_with_confirm(self, cr, uid, ids, fieldname, args, context=None):
         """UFTP-24 display confirm message at wizard validation when linked
-        to a PO and no invoices selected (or advance lines added)"""
+        to a PO and no invoices selected"""
         res = {}
         if not ids:
             return res
@@ -316,8 +320,7 @@
             ids = [ids]
         fields = ['advance_linked_po_auto_invoice', 'invoice_line_ids', 'advance_line_ids']
         for r in self.read(cr, uid, ids, fields, context=context):
-            res[r['id']] = r['advance_linked_po_auto_invoice'] and \
-                (not r['invoice_line_ids'] or r['advance_line_ids'])
+            res[r['id']] = r['advance_linked_po_auto_invoice'] and not r['invoice_line_ids']
         return res
 
     _columns = {
@@ -329,7 +332,6 @@
         '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_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'),
         'date': fields.date(string='Date for advance return', required=True),
@@ -343,7 +345,6 @@
 
     _defaults = {
         'initial_amount': lambda self, cr, uid, c=None: c.get('amount', False),
-        'display_invoice': False, # this permits to show only advance lines tree. Then add an invoice make the invoice tree to be displayed
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'advance_linked_po_auto_invoice': False,
     }
@@ -413,7 +414,7 @@
             return {'value': {'returned_amount': 0}}
         return {}
 
-    def onchange_returned_amount(self, cr, uid, ids, amount=0.0, invoices=None, advances=None, display_invoice=None, initial_amount=0.0, advance_linked_po_auto_invoice=False, additional_amount=0.0, context=None):
+    def onchange_returned_amount(self, cr, uid, ids, amount=0.0, invoices=None, advances=None, initial_amount=0.0, advance_linked_po_auto_invoice=False, additional_amount=0.0, context=None):
         """
         When the returned amount change, it update the "Justified amount" (total_amount)
         """
@@ -432,14 +433,10 @@
             return {'value': values}
         if amount:
             total_amount = amount + 0.0
-            if display_invoice:
-                if invoices:
-                    for invoice in invoices:
-                        total_amount += invoice[2].get('amount', 0.0)
-            else:
-                if advances:
-                    for advance in advances:
-                        total_amount += advance[2].get('amount', 0.0)
+            for invoice in invoices:
+                total_amount += invoice[2].get('amount', 0.0)
+            for advance in advances:
+                total_amount += advance[2].get('amount', 0.0)
             values.update({'total_amount': total_amount})
         # clear the additional amount if returned amount is updated
         if additional_amount <> 0:
@@ -631,6 +628,9 @@
 
         new_lines = []
         total = wizard.returned_amount or 0.  # reuse current amount when adding new line
+        # add the amount of advance lines
+        for adv_line in wizard.advance_line_ids:
+            total += adv_line.amount or 0.0
         added_invoice_ids = [
             wil.invoice_id.id for wil in wizard.invoice_line_ids ]
         for invoice in invoices:
@@ -672,8 +672,6 @@
 
         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
@@ -701,18 +699,7 @@
         but we show a confirm message at wizard validation
         """
 
-        display_invoice = False
-
-        """
-        UTP-482: operation advance linked to a PO, force display_invoice
-        if wizard.advance_linked_po_auto_invoice:
-            display_invoice = True
-        else:
-            display_invoice = False
-        """
-
         vals = {
-            'display_invoice': display_invoice,
             'invoice_ids': [(6, 0, [])] ,  # reset invoices picker
             'invoice_line_ids': [(5, )],  # reset to import invoices
         }
@@ -748,7 +735,6 @@
         wizard = self.browse(cr, uid, ids[0], context=context)
         total = 0.0
         total += wizard.returned_amount
-        # Do computation for invoice lines only if display_invoice is True
         advance_settled_100_cash_return = self._is_advance_settled_100_cash_return(wizard)
         if not advance_settled_100_cash_return:
             """
@@ -759,13 +745,12 @@
             '1 exception: if advance is settled through 100% cash return,
             no need to link the advance return with an invoice'
             """
-            if wizard.display_invoice:
-                for move_line in wizard.invoice_line_ids:
-                    total += move_line.amount
-            # else do computation for advance lines only
-            else:
-                for st_line in wizard.advance_line_ids:
-                    total+= st_line.amount
+            # add the amount of invoice lines to the total
+            for move_line in wizard.invoice_line_ids:
+                total += move_line.amount
+            # add the amount of advance lines to the total
+            for st_line in wizard.advance_line_ids:
+                total += st_line.amount
         res.update({'total_amount': total})
         self.write(cr, uid, ids, res, context=context)
         return {
@@ -821,7 +806,8 @@
         self.verify_date(cr, uid, ids, context=context)
         # retrieve some values
         if abs(wizard.initial_amount + wizard.additional_amount -  wizard.total_amount) > 10**-3:
-            raise osv.except_osv(_('Warning'), _('Initial advance amount (%s) does not match the amount you justified (%s). First correct. Then press Compute button') % (wizard.initial_amount, wizard.total_amount))
+            adv_amount = (wizard.initial_amount or 0.0) + (wizard.additional_amount or 0.0)
+            raise osv.except_osv(_('Warning'), _('Advance amount (%s) does not match the amount you justified (%s). First correct. Then press Compute button.') % (adv_amount, wizard.total_amount or 0.0))
 
         # determine the advance return reference (for the advance closing entry and advance expense lines/SI lines)
         if wizard.reference:
@@ -875,55 +861,53 @@
             self.create_move_line(cr, uid, ids, wizard.date, wizard.date, adv_closing_name, journal, register, False, wizard.advance_st_line_id.employee_id.id, return_acc_id, \
                                   wizard.returned_amount, 0.0, adv_return_ref, move_id, False, context=context)
 
-        if wizard.display_invoice:
-            # make treatment for invoice lines
-            # create invoice lines
-            inv_move_line_ids = []
-            for invoice in wizard.invoice_line_ids:
-                inv_name = "Invoice" + " " + invoice.invoice_id.internal_number
-                inv_doc_date = invoice.invoice_id.document_date
-                partner_id = invoice.partner_id.id
-                debit = invoice.amount
-                credit = 0.0
-                account_id = invoice.account_id.id
-                inv_id = self.create_move_line(cr, uid, ids, wizard.date, inv_doc_date, inv_name, journal, register, partner_id, False, account_id, \
-                                               debit, credit, adv_return_ref, move_id, False, context=context)
-                inv_move_line_ids.append((inv_id, invoice.invoice_id.id))
-        else:
-            # make treatment for advance lines
-            # Prepare a list of advances that have a supplier and then demand generating some moves
-            advances_with_supplier = {}
-            # create move line from advance line
-            adv_move_line_ids = []
-            for advance in wizard.advance_line_ids:
-                # Case where line equals 0
-                if advance.amount == 0.0:
-                    continue
-                adv_date = advance.document_date
-                adv_name = advance.description
-                partner_id = False
-                line_employee_id = False
-                partner = advance.partner_type
-                if partner:
-                    if partner._name == 'res.partner':
-                        partner_id = partner.id
-                        if partner_id in advances_with_supplier:
-                            advances_with_supplier[partner_id].append(advance.id)
-                        else:
-                            advances_with_supplier[partner_id] = [advance.id]
-                    elif partner._name == 'hr.employee':
-                        line_employee_id = partner.id
-                debit = abs(advance.amount)
-                credit = 0.0
-                account_id = advance.account_id.id
-                # Analytic distribution for this line
-                distrib_id = (advance.analytic_distribution_id and advance.analytic_distribution_id.id) or \
-                    (advance.wizard_id.analytic_distribution_id and advance.wizard_id.analytic_distribution_id.id) or False
-                # other infos
-                line_ref = advance.reference or adv_return_ref
-                adv_id = self.create_move_line(cr, uid, ids, wizard.date, adv_date, adv_name, journal, register, partner_id, line_employee_id, account_id, \
-                                               debit, credit, line_ref, move_id, distrib_id, context=context)
-                adv_move_line_ids.append(adv_id)
+        # make treatment for invoice lines
+        # create invoice lines
+        inv_move_line_ids = []
+        for invoice in wizard.invoice_line_ids:
+            inv_name = "Invoice" + " " + invoice.invoice_id.internal_number
+            inv_doc_date = invoice.invoice_id.document_date
+            partner_id = invoice.partner_id.id
+            debit = invoice.amount
+            credit = 0.0
+            account_id = invoice.account_id.id
+            inv_id = self.create_move_line(cr, uid, ids, wizard.date, inv_doc_date, inv_name, journal, register, partner_id, False, account_id, \
+                                           debit, credit, adv_return_ref, move_id, False, context=context)
+            inv_move_line_ids.append((inv_id, invoice.invoice_id.id))
+        # make treatment for advance lines
+        # Prepare a list of advances that have a supplier and then demand generating some moves
+        advances_with_supplier = {}
+        # create move line from advance line
+        adv_move_line_ids = []
+        for advance in wizard.advance_line_ids:
+            # Case where line equals 0
+            if advance.amount == 0.0:
+                continue
+            adv_date = advance.document_date
+            adv_name = advance.description
+            partner_id = False
+            line_employee_id = False
+            partner = advance.partner_type
+            if partner:
+                if partner._name == 'res.partner':
+                    partner_id = partner.id
+                    if partner_id in advances_with_supplier:
+                        advances_with_supplier[partner_id].append(advance.id)
+                    else:
+                        advances_with_supplier[partner_id] = [advance.id]
+                elif partner._name == 'hr.employee':
+                    line_employee_id = partner.id
+            debit = abs(advance.amount)
+            credit = 0.0
+            account_id = advance.account_id.id
+            # Analytic distribution for this line
+            distrib_id = (advance.analytic_distribution_id and advance.analytic_distribution_id.id) or \
+                (advance.wizard_id.analytic_distribution_id and advance.wizard_id.analytic_distribution_id.id) or False
+            # other infos
+            line_ref = advance.reference or adv_return_ref
+            adv_id = self.create_move_line(cr, uid, ids, wizard.date, adv_date, adv_name, journal, register, partner_id, line_employee_id, account_id, \
+                                           debit, credit, line_ref, move_id, distrib_id, context=context)
+            adv_move_line_ids.append(adv_id)
 
         # create the advance closing line
         adv_closing_acc_id = wizard.advance_st_line_id.account_id.id
@@ -946,72 +930,72 @@
         # create the statement line for the invoices
         absl_obj = self.pool.get('account.bank.statement.line')
         curr_date = wizard.date
-        if wizard.display_invoice:
-            for inv_move_line_data in inv_move_line_ids:
-                self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, inv_move_line_data[0], invoice_id=inv_move_line_data[1], context=context)
-                # search the invoice move line that come from invoice
-                invoice_move_id = self.pool.get('account.invoice').read(cr, uid, inv_move_line_data[1], ['move_id'], context=context).get('move_id', None)
-                inv_move_line_account_id = move_line_obj.read(cr, uid, inv_move_line_data[0], ['account_id'], context=context).get('account_id', None)
-                if invoice_move_id and inv_move_line_account_id:
-                    ml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice_move_id[0]), ('account_id', '=', inv_move_line_account_id[0])], context=context)
-                if not ml_ids or len(ml_ids) > 1:
-                    raise osv.except_osv(_('Error'), _('An error occurred on invoice reconciliation: Invoice line not found.'))
-                # reconcile invoice line (from cash return) with specified invoice line (from invoice)
-                move_line_obj.reconcile_partial(cr, uid, [ml_ids[0], inv_move_line_data[0]])
-        else:
-            for adv_move_line_id in adv_move_line_ids:
-                self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, adv_move_line_id, context=context)
-            # Have you filled in the supplier field ? If yes let's go for creating some moves for them !
-            if advances_with_supplier:
-                wiz_adv_line_obj = self.pool.get('wizard.advance.line')
-                supp_move_ids = []  # to store the ids of the account moves created
-                # Browse suppliers
-                for supplier_id in advances_with_supplier:
-                    total = 0.0
-                    # Calculate the total amount for the selected supplier
-                    for s_id in advances_with_supplier[supplier_id]:
-                        data = wiz_adv_line_obj.read(cr, uid, s_id, ['amount'], context=context)
-                        if 'amount' in data:
-                            total += data.get('amount')
-                    # create the move with 2 move lines for the supplier
-                    if total > 0:
-                        # prepare the move
-                        supp_move_info = wiz_adv_line_obj.read(cr, uid, advances_with_supplier[supplier_id][0], ['description', 'document_date'], context=context)
-                        supp_move_name = supp_move_info.get('description', "/")
-                        supp_move_date = supp_move_info.get('document_date', curr_date)
-                        supp_move_vals = {
-                            'journal_id': journal.id,
-                            'period_id': period_id,
-                            'date': wizard.date,
-                            'document_date': wizard.date,
-                            #'name': supp_move_name, ## Deleted in UF-1959. Was asked since UTP-330 and UF-1542.
-                            'partner_id': supplier_id,
-                        }
-                        # search account_id of the supplier
-                        account_id = self.pool.get('res.partner').read(cr, uid, supplier_id, ['property_account_payable'], context=context)
-                        if 'property_account_payable' in account_id and account_id.get('property_account_payable', False):
-                            account_id = account_id.get('property_account_payable')[0]
-                        else:
-                            raise osv.except_osv(_('Warning'), _('One supplier seems not to have a payable account. \
-                            Please contact an accountant administrator to resolve this problem.'))
-                        # Create the move
-                        supp_move_id = move_obj.create(cr, uid, supp_move_vals, context=context)
-                        supp_move_ids.append(supp_move_id)
-                        # Create move_lines
-                        supp_move_line_debit_id = self.create_move_line(cr, uid, ids, wizard.date, supp_move_date, supp_move_name, journal, register, supplier_id, False, \
-                                                                        account_id, total, 0.0, adv_return_ref, supp_move_id, False, context=context)
-                        supp_move_line_credit_id = self.create_move_line(cr, uid, ids, wizard.date, supp_move_date, supp_move_name, journal, register, supplier_id, False, \
-                                                                         account_id, 0.0, total, adv_return_ref, supp_move_id, False, context=context)
-                        # We hard post the move
-                        move_obj.post(cr, uid, [supp_move_id], context=context)
-                        # Verify that the posting has succeed
-                        if supp_move_id == False:
-                            raise osv.except_osv(_('Error'), _('An error has occurred: The journal entries cannot be posted.'))
-                        # Do reconciliation
-                        move_line_obj.reconcile_partial(cr, uid, [supp_move_line_debit_id, supp_move_line_credit_id])
-                # Update the statement line with the partner move ids ("Payable entries")
-                if 'statement_line_id' in context:
-                    absl_obj.write(cr, uid, context['statement_line_id'], {'partner_move_ids': [(6, 0, supp_move_ids)]}, context)
+        # handle invoice lines
+        for inv_move_line_data in inv_move_line_ids:
+            self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, inv_move_line_data[0], invoice_id=inv_move_line_data[1], context=context)
+            # search the invoice move line that come from invoice
+            invoice_move_id = self.pool.get('account.invoice').read(cr, uid, inv_move_line_data[1], ['move_id'], context=context).get('move_id', None)
+            inv_move_line_account_id = move_line_obj.read(cr, uid, inv_move_line_data[0], ['account_id'], context=context).get('account_id', None)
+            if invoice_move_id and inv_move_line_account_id:
+                ml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice_move_id[0]), ('account_id', '=', inv_move_line_account_id[0])], context=context)
+            if not ml_ids or len(ml_ids) > 1:
+                raise osv.except_osv(_('Error'), _('An error occurred on invoice reconciliation: Invoice line not found.'))
+            # reconcile invoice line (from cash return) with specified invoice line (from invoice)
+            move_line_obj.reconcile_partial(cr, uid, [ml_ids[0], inv_move_line_data[0]])
+        # handle advance lines
+        for adv_move_line_id in adv_move_line_ids:
+            self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, adv_move_line_id, context=context)
+        # Have you filled in the supplier field ? If yes let's go for creating some moves for them !
+        if advances_with_supplier:
+            wiz_adv_line_obj = self.pool.get('wizard.advance.line')
+            supp_move_ids = []  # to store the ids of the account moves created
+            # Browse suppliers
+            for supplier_id in advances_with_supplier:
+                total = 0.0
+                # Calculate the total amount for the selected supplier
+                for s_id in advances_with_supplier[supplier_id]:
+                    data = wiz_adv_line_obj.read(cr, uid, s_id, ['amount'], context=context)
+                    if 'amount' in data:
+                        total += data.get('amount')
+                # create the move with 2 move lines for the supplier
+                if total > 0:
+                    # prepare the move
+                    supp_move_info = wiz_adv_line_obj.read(cr, uid, advances_with_supplier[supplier_id][0], ['description', 'document_date'], context=context)
+                    supp_move_name = supp_move_info.get('description', "/")
+                    supp_move_date = supp_move_info.get('document_date', curr_date)
+                    supp_move_vals = {
+                        'journal_id': journal.id,
+                        'period_id': period_id,
+                        'date': wizard.date,
+                        'document_date': wizard.date,
+                        #'name': supp_move_name, ## Deleted in UF-1959. Was asked since UTP-330 and UF-1542.
+                        'partner_id': supplier_id,
+                    }
+                    # search account_id of the supplier
+                    account_id = self.pool.get('res.partner').read(cr, uid, supplier_id, ['property_account_payable'], context=context)
+                    if 'property_account_payable' in account_id and account_id.get('property_account_payable', False):
+                        account_id = account_id.get('property_account_payable')[0]
+                    else:
+                        raise osv.except_osv(_('Warning'), _('One supplier seems not to have a payable account. \
+                        Please contact an accountant administrator to resolve this problem.'))
+                    # Create the move
+                    supp_move_id = move_obj.create(cr, uid, supp_move_vals, context=context)
+                    supp_move_ids.append(supp_move_id)
+                    # Create move_lines
+                    supp_move_line_debit_id = self.create_move_line(cr, uid, ids, wizard.date, supp_move_date, supp_move_name, journal, register, supplier_id, False, \
+                                                                    account_id, total, 0.0, adv_return_ref, supp_move_id, False, context=context)
+                    supp_move_line_credit_id = self.create_move_line(cr, uid, ids, wizard.date, supp_move_date, supp_move_name, journal, register, supplier_id, False, \
+                                                                     account_id, 0.0, total, adv_return_ref, supp_move_id, False, context=context)
+                    # We hard post the move
+                    move_obj.post(cr, uid, [supp_move_id], context=context)
+                    # Verify that the posting has succeed
+                    if supp_move_id == False:
+                        raise osv.except_osv(_('Error'), _('An error has occurred: The journal entries cannot be posted.'))
+                    # Do reconciliation
+                    move_line_obj.reconcile_partial(cr, uid, [supp_move_line_debit_id, supp_move_line_credit_id])
+            # Update the statement line with the partner move ids ("Payable entries")
+            if 'statement_line_id' in context:
+                absl_obj.write(cr, uid, context['statement_line_id'], {'partner_move_ids': [(6, 0, supp_move_ids)]}, context)
         # reconcile advance and advance return lines
         original_move_id = wizard.advance_st_line_id.move_ids[0]
         criteria = [('statement_id', '=', wizard.advance_st_line_id.statement_id.id), ('account_id', '=', adv_closing_acc_id), ('move_id', '=', original_move_id.id)]

=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.xml'
--- bin/addons/register_accounting/wizard/wizard_cash_return.xml	2017-07-03 14:27:01 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.xml	2018-02-13 14:39:37 +0000
@@ -11,7 +11,7 @@
                     <field name="initial_amount"/>
                     <field name="additional_amount" on_change="onchange_addl_amount(returned_amount)"/>
                     <field name='returned_amount'
-                        on_change="onchange_returned_amount(returned_amount, invoice_line_ids, advance_line_ids, display_invoice, initial_amount, advance_linked_po_auto_invoice, additional_amount)"/>
+                        on_change="onchange_returned_amount(returned_amount, invoice_line_ids, advance_line_ids, initial_amount, advance_linked_po_auto_invoice, additional_amount)"/>
                     <newline />
                     <field name='date'/>
                     <field name='reference' />
@@ -35,14 +35,14 @@
                         <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" />
+                    <field name='invoice_line_ids' nolabel="1" colspan="4" />
                     <newline />
                     <group colspan="4">
                         <label colspan="3"/>
-                        <button string="Clean invoices" name="clean_invoices" type="object" icon="gtk-clear" attrs="{'invisible':[('display_invoice', '!=', True)]}" />
+                        <button string="Clean invoices" name="clean_invoices" type="object" icon="gtk-clear" />
                     </group>
                     <newline />
-                    <field name='advance_line_ids' attrs="{'invisible':[('display_invoice', '=', True)]}" nolabel="1" colspan="4" on_change="changeline(advance_line_ids, returned_amount, date, reference, additional_amount)"/>
+                    <field name='advance_line_ids' nolabel="1" colspan="4" on_change="changeline(advance_line_ids, returned_amount, invoice_line_ids, date, reference, additional_amount)"/>
                     <newline />
                     <field name="total_amount"/>
                     <newline />
@@ -55,7 +55,6 @@
                             attrs="{'invisible': [('ok_with_confirm', '=', False)]}" />
                     </group>
                     <field name='currency_id' invisible="1" />
-                    <field name='display_invoice' invisible="1"/>
                     <field name="advance_linked_po_auto_invoice" invisible="1" />
                     <field name="ok_with_confirm" invisible="1" />
                     <field name="comment" colspan="4" nolabel="1" readonly="1" attrs="{'invisible':[('advance_linked_po_auto_invoice', '=', False)]}" />