pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Purchase : conflict removed, thanks to Raphael

Browse Source 
bzr revid: jvo@tinyerp.com-20101028173125-afyv9hrt32iw23t8
This commit is contained in:
Jay (OpenERP)
2010-10-28 23:01:25 +05:30
parent db318ff94f
commit 3c07ea7582
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/purchase_view.xml
+1 -5
View File
@@ -147,11 +147,7 @@
<button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
<button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
<<<<<<< TREE
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
=======
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
>>>>>>> MERGE-SOURCE
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
</group>
</page>