Merge lp:~dorian-kemps/unifield-server/US-5203 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5198
Proposed branch: lp:~dorian-kemps/unifield-server/US-5203
Merge into: lp:unifield-server
Diff against target: 23 lines (+1/-5)
1 file modified
bin/addons/delete_button/view/sale_view.xml (+1/-5)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-5203
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+360161@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 'bin/addons/delete_button/view/sale_view.xml'
2--- bin/addons/delete_button/view/sale_view.xml 2017-10-04 06:36:54 +0000
3+++ bin/addons/delete_button/view/sale_view.xml 2018-12-06 08:13:40 +0000
4@@ -32,10 +32,6 @@
5 <xpath expr="/tree" position="attributes">
6 <attribute name='hide_delete_button'>1</attribute>
7 </xpath>
8- <xpath expr="/tree/field[@name='state']" position="after">
9- <button name="delete_button" type="object" icon="gtk-del" string="Delete"
10- states = 'draft' confirm='Do you really want to delete selected record(s) ?'/>
11- </xpath>
12 </data>
13 </field>
14 </record>
15@@ -69,7 +65,7 @@
16 <attribute name='hide_delete_button'>1</attribute>
17 </xpath>
18 <xpath expr="/tree/field[@name='state']" position="after">
19- <button name="delete_button" type="object" icon="gtk-del" string="Delete"
20+ <button name="delete_button" type="object" icon="gtk-del" string="Delete"
21 states='draft' confirm='Do you really want to delete selected record(s) ?' />
22 </xpath>
23 </data>

Subscribers

People subscribed via source and target branches