Account - Invoicing

Merge lp:~camptocamp/account-invoicing/7.0-update-invoice-view-mdh into lp:~account-core-editors/account-invoicing/7.0

  1. 7.0-update-invoice-view-mdh
  2. Merge into 7.0
Proposed by Matthieu Dietrich @ camptocamp
Status: Merged
Approved by: Holger Brunn (Therp)
Approved revision: 20
Merged at revision: 35
Proposed branch: lp:~camptocamp/account-invoicing/7.0-update-invoice-view-mdh
Merge into: lp:~account-core-editors/account-invoicing/7.0
Diff against target: 13 lines (+2/-1)
1 file modified
invoice_validation_wkfl/invoice_view.xml (+2/-1)
To merge this branch: bzr merge lp:~camptocamp/account-invoicing/7.0-update-invoice-view-mdh
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Nicolas Bessi - Camptocamp (community) code review, no test Approve
Pedro Manuel Baeza Needs Information
Joël Grand-Guillaume @ camptocamp code review, no tests Approve
Review via email: mp+196835@code.launchpad.net

Commit message

[FIX] update invoice form view to be conforming of the addons' one

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM, Thanks for the fix

review: Approve (code review, no tests)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Hi, Matthieu,

Thanks for the MP. At first instance, I don't understand why the view has been overwriten entirely. Can you please tell me?

Regards.

review: Needs Information
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

Hello,

Pedro I do not get the meaning of your question.
Do you mean why they replace the whole header tag?

else for the current MP it looks good to me

Regards Nicolas

review: Approve (code review, no test)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Yeah, that is! It's not something explicit of this MP, but I have detected checking it.

Regards.

Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'invoice_validation_wkfl/invoice_view.xml'
2--- invoice_validation_wkfl/invoice_view.xml 2013-05-02 14:29:00 +0000
3+++ invoice_validation_wkfl/invoice_view.xml 2013-11-27 09:10:08 +0000
4@@ -37,7 +37,8 @@
5 <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_user"/>
6 <button name="invoice_proforma2" states="to_send" string="PRO-FORMA" icon="terp-gtk-media-pause" />
7 <button name="invoice_open" states="to_send,proforma2" string="Validate" icon="gtk-go-forward"/>
8- <button name="%(account.account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
9+ <button name="invoice_print" string="Print" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
10+ <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
11 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
12 </header>
13 </xpath>

Subscribers

People subscribed via source and target branches