unifield-wm

Merge lp:~unifield-team/unifield-wm/us-701 into lp:unifield-wm

  1. us-701
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2707
Proposed branch: lp:~unifield-team/unifield-wm/us-701
Merge into: lp:unifield-wm
Diff against target: 11 lines (+1/-1)
1 file modified
purchase_override/purchase_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-701
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283062@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase_override/purchase_view.xml'
2--- purchase_override/purchase_view.xml 2015-04-09 12:56:14 +0000
3+++ purchase_override/purchase_view.xml 2016-01-19 10:37:16 +0000
4@@ -152,7 +152,7 @@
5 <field name="order_state_purchase_order_line" invisible="True" />
6 <button string="Split line" icon="terp-stock_effects-object-colorize" name="open_split_wizard" type="object"
7 attrs="{'invisible': ['|', ('rfq_ok', '=', True), ('order_state_purchase_order_line', 'not in', ('draft', 'wait', 'confirmed'))]}" />
8- <button string="Delete" icon="gtk-del" type="object" name="ask_unlink"
9+ <button string="Delete" icon="gtk-del" type="object" name="ask_unlink" confirm="You requested to cancel a line in the PO. Do you want to proceed?"
10 attrs="{'invisible': ['|', ('tender_line_id', '!=', False), ('order_state_purchase_order_line', 'not in', ('rfq_sent', 'draft', 'wait', 'confirmed'))]}" />
11 </xpath>
12

Subscribers

People subscribed via source and target branches