Merge lp:~camptocamp/openerp-humanitarian-ngo/change-button-to-send-email-in-draftpo into lp:openerp-humanitarian-ngo/purchase-wkfl

Proposed by Romain Deheele - Camptocamp
Status: Merged
Merged at revision: 78
Proposed branch: lp:~camptocamp/openerp-humanitarian-ngo/change-button-to-send-email-in-draftpo
Merge into: lp:openerp-humanitarian-ngo/purchase-wkfl
Diff against target: 14 lines (+2/-2)
1 file modified
purchase_extended/view/purchase_order.xml (+2/-2)
To merge this branch: bzr merge lp:~camptocamp/openerp-humanitarian-ngo/change-button-to-send-email-in-draftpo
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp Approve
Leonardo Pistone code review Approve
Review via email: mp+207675@code.launchpad.net

Description of the change

Hi,

It changes the button visible in draftpo state.
At this state, users prefer to have the possibility to send email with RFQ template instead of PO template (the purchase is still not approved)

Regards,

Romain

To post a comment you must log in.
Revision history for this message
Leonardo Pistone (lepistone) wrote :

Romain,

it looks like the two button have the same string. Maybe we could change a bit one of the two?

thanks!

review: Needs Fixing (code review)
79. By Romain Deheele - Camptocamp

[FIX] change button name with "Send Draft PO by Email" to avoid confusion

Revision history for this message
Romain Deheele - Camptocamp (romaindeheele) wrote :

Good idea,
I've just changed it to avoid confusion.

Romain

Revision history for this message
Leonardo Pistone (lepistone) wrote :

thanks!

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

Cheers

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase_extended/view/purchase_order.xml'
2--- purchase_extended/view/purchase_order.xml 2014-02-10 13:16:22 +0000
3+++ purchase_extended/view/purchase_order.xml 2014-02-21 15:43:37 +0000
4@@ -25,8 +25,8 @@
5 <attribute name="states">cancel,draftpo</attribute>
6 <attribute name="string">Reset to Draft RFQ</attribute>
7 </xpath>
8- <xpath expr="//button[@string='Send PO by Email']" position="attributes">
9- <attribute name="states">draftpo,approved</attribute>
10+ <xpath expr="//button[@string='Send PO by Email']" position="after">
11+ <button name="wkf_send_rfq" states="draftpo" string="Send Draft PO by Email" type="object" context="{'send_rfq':True}"/>
12 </xpath>
13 <xpath expr="//button[@name='bid_received']" position="attributes">
14 <attribute name="string">Bid Encoded</attribute>

Subscribers

People subscribed via source and target branches