← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~camptocamp/account-financial-tools/draft_move_vre_resubmit into lp:account-financial-tools

 

Vincent Renaville@camptocamp has proposed merging lp:~camptocamp/account-financial-tools/draft_move_vre_resubmit into lp:account-financial-tools.

Requested reviews:
  Guewen Baconnier @ Camptocamp (gbaconnier-c2c)

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

display invoice cancel button when invoice is open, sale state is not used anymore + Fix change wrong tag Eval for group restriction on customer invoice view
-- 
https://code.launchpad.net/~camptocamp/account-financial-tools/draft_move_vre_resubmit/+merge/194673
Your team OpenERP Community Reviewer/Maintainer is subscribed to branch lp:account-financial-tools.
=== modified file 'account_default_draft_move/invoice_view.xml'
--- account_default_draft_move/invoice_view.xml	2013-03-26 09:47:53 +0000
+++ account_default_draft_move/invoice_view.xml	2013-11-11 11:57:54 +0000
@@ -2,13 +2,13 @@
   <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>
       <field name="arch" type="xml">
         <xpath expr="//button[@name='invoice_cancel']"  position="attributes">
-          <attribute name="groups" eval="account.group_account_invoice"/>
+          <attribute name="groups" ref="account.group_account_invoice"/>
         </xpath>
       </field>
     </record>
@@ -16,13 +16,13 @@
 
     <!-- restore cancel button for sale and 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>


Follow ups