openerp-community-reviewer team mailing list archive

["Matthieu Dietrich @ camptocamp" <matthieu.dietrich@xxxxxxxxxxxxxx>]

Matthieu Dietrich @ camptocamp has proposed merging lp:~camptocamp/account-financial-tools/draft_move_mdh_resubmit into lp:account-financial-tools.

Requested reviews:
  Account Core Editors (account-core-editors)

For more details, see:
https://code.launchpad.net/~camptocamp/account-financial-tools/draft_move_mdh_resubmit/+merge/199150

Re-submission of lp:~camptocamp/account-financial-tools/draft_move_vre_resubmit.
-- 
https://code.launchpad.net/~camptocamp/account-financial-tools/draft_move_mdh_resubmit/+merge/199150
Your team Account Core Editors is requested to review the proposed merge of lp:~camptocamp/account-financial-tools/draft_move_mdh_resubmit into lp:account-financial-tools.

=== modified file 'account_default_draft_move/invoice_view.xml'
--- account_default_draft_move/invoice_view.xml	2013-11-25 15:07:54 +0000
+++ account_default_draft_move/invoice_view.xml	2013-12-16 16:18:11 +0000
@@ -2,7 +2,7 @@
   <data>
 
     <record id="invoice_form_customer_group_invoice" model="ir.ui.view">
-      <field name="name">Show Cancel invoice button</field>
+      <field name="name">Show Cancel invoice button customer</field>
       <field name="model">account.invoice</field>
       <field name="inherit_id" ref="account.invoice_form" />
       <field name="type">form</field>
@@ -14,15 +14,15 @@
     </record>
 
 
-    <!-- restore cancel button for sale and open state -->
+    <!-- restore cancel button for open state -->
     <record id="invoice_form_supplier_group_invoice" model="ir.ui.view">
-      <field name="name">Show Cancel invoice button</field>
+      <field name="name">Show Cancel invoice button supplier</field>
       <field name="model">account.invoice</field>
       <field name="inherit_id" ref="account.invoice_supplier_form" />
       <field name="type">form</field>
       <field name="arch" type="xml">
         <xpath expr="//button[@name='invoice_cancel']" position="after">
-          <button name="invoice_cancel" states="sale,open" string="Cancel Invoice" groups="account.group_account_invoice"/>
+          <button name="invoice_cancel" states="open" string="Cancel Invoice" groups="account.group_account_invoice"/>
         </xpath>
       </field>
     </record>