From a56e552f04fd099810f2e3314d395b32b30cfe83 Mon Sep 17 00:00:00 2001
From: Patrick Tombez <patrick.tombez@camptocamp.com>
Date: Tue, 24 Jul 2018 11:01:18 +0200
Subject: [PATCH] [11.0][IMP] Remove useless button on invoice

Remove the button "Print ISR" on invoices to avoid confusion with Odoo base
implementation and rename the one from this module for user consistency
---
 README.md                                     |  2 ++
 l10n_ch_payment_slip/__manifest__.py          |  2 +-
 .../views/account_invoice.xml                 | 29 ++++++++++---------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 53a652e42..d66031192 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,8 @@ Multiple payment terms on invoices are supported.
 
 It will also allow you to do the import of V11 bank statement files and do an automatic reconciliation.
 
+(replaces core l10n_ch module for ISR)
+
 
 l10n_ch_base_bank
 -----------------
diff --git a/l10n_ch_payment_slip/__manifest__.py b/l10n_ch_payment_slip/__manifest__.py
index a5fe01a59..edf5c4c31 100644
--- a/l10n_ch_payment_slip/__manifest__.py
+++ b/l10n_ch_payment_slip/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {'name': 'Switzerland - ISR inpayment slip (PVR/BVR/ESR)',
  'summary': 'Print inpayment slip from your invoices',
- 'version': '11.0.1.0.0',
+ 'version': '10.0.1.1.1',
  'author': "Camptocamp,Odoo Community Association (OCA)",
  'category': 'Localization',
  'website': 'http://www.camptocamp.com',
diff --git a/l10n_ch_payment_slip/views/account_invoice.xml b/l10n_ch_payment_slip/views/account_invoice.xml
index 2d482a38f..dbdca8f8f 100644
--- a/l10n_ch_payment_slip/views/account_invoice.xml
+++ b/l10n_ch_payment_slip/views/account_invoice.xml
@@ -8,7 +8,7 @@
       <field name="domain">[('invoice_id', '=', active_id)]</field>
     </record>
 
-   <record model="ir.ui.view" id="invoice_form_add_isr_ref">
+    <record model="ir.ui.view" id="invoice_form_add_isr_ref">
       <field name="name">account.invoice.form.isr.ref</field>
       <field name="model">account.invoice</field>
       <field name="type">form</field>
@@ -16,25 +16,28 @@
       <field name="arch" type="xml">
         <xpath expr="//button[@name='invoice_print'][1]" position="after">
           <button type="object"
-            string="ISR"
-            name="print_isr"
-            attrs="{'invisible': ['|',('sent','=',True), ('state', '!=', 'open')]}"
-            class="oe_highlight"/>
+                  string="Print CH ISR"
+                  name="print_isr"
+                  attrs="{'invisible': ['|',('sent','=',True), ('state', '!=', 'open')]}"
+                  class="oe_highlight"/>
         </xpath>
         <xpath expr="//button[@name='invoice_print'][2]" position="after">
           <button type="object"
-            string="ISR"
-            name="print_isr"
-            attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
+                  string="Print CH ISR"
+                  name="print_isr"
+                  attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
+        </xpath>
+        <xpath expr="//button[@name='isr_print']" position="attributes">
+          <attribute name="invisible">1</attribute>
         </xpath>
         <field name="tax_line_ids" position="before">
           <group colspan="4">
             <field name="isr_reference" colspan="4"/>
             <button type="action"
-              string="Open Payment Slips"
-              groups="base.group_system"
-              name="%(l10n_ch_payment_slip.action_slip_all)d"
-              attrs="{'invisible': ['|', ('type', '!=', 'out_invoice'), ('isr_reference', '=', False)]}"/>
+                    string="Open Payment Slips"
+                    groups="base.group_system"
+                    name="%(l10n_ch_payment_slip.action_slip_all)d"
+                    attrs="{'invisible': ['|', ('type', '!=', 'out_invoice'), ('isr_reference', '=', False)]}"/>
           </group>
         </field>
       </field>
@@ -62,7 +65,7 @@
       <field name="model">l10n_ch.payment_slip</field>
       <field name="arch" type="xml">
         <tree string="Payment Slip">
-            <field name="reference"/>
+          <field name="reference"/>
         </tree>
       </field>
     </record>