← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~camptocamp/account-invoicing/7.0-update-invoice-view-mdh into lp:account-invoicing

 

Matthieu Dietrich @ camptocamp has proposed merging lp:~camptocamp/account-invoicing/7.0-update-invoice-view-mdh into lp:account-invoicing.

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

For more details, see:
https://code.launchpad.net/~camptocamp/account-invoicing/7.0-update-invoice-view-mdh/+merge/196835

Back in May 2012, the official account.invoice.form was modified by OpenERP. The button "Print Invoice" was replaced by 2 others, with different attributes and methods. Another module changes attributes for those, and it didn't work if invoice_validation_wkfl was installed.
-- 
https://code.launchpad.net/~camptocamp/account-invoicing/7.0-update-invoice-view-mdh/+merge/196835
Your team Account Core Editors is requested to review the proposed merge of lp:~camptocamp/account-invoicing/7.0-update-invoice-view-mdh into lp:account-invoicing.
=== modified file 'invoice_validation_wkfl/invoice_view.xml'
--- invoice_validation_wkfl/invoice_view.xml	2013-05-02 14:29:00 +0000
+++ invoice_validation_wkfl/invoice_view.xml	2013-11-27 09:10:08 +0000
@@ -37,7 +37,8 @@
             <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_user"/>
             <button name="invoice_proforma2" states="to_send" string="PRO-FORMA" icon="terp-gtk-media-pause" />
             <button name="invoice_open" states="to_send,proforma2" string="Validate" icon="gtk-go-forward"/>
-            <button name="%(account.account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
+            <button name="invoice_print" string="Print" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+            <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
           </header>
         </xpath>


Follow ups