diff options
| author | Jay (OpenERP) <jvo@tinyerp.com> | 2010-10-28 23:01:25 +0530 |
|---|---|---|
| committer | Jay (OpenERP) <jvo@tinyerp.com> | 2010-10-28 23:01:25 +0530 |
| commit | 3c07ea7582c253d0fd2d312fcd8a41d3e8ac47a3 (patch) | |
| tree | 405cce00134e8a550fbf0a19fa501713958b8690 | |
| parent | db318ff94f6ffc250a48d1dd8cc89f2ab71e9704 (diff) | |
[FIX] Purchase : conflict removed, thanks to Raphael
bzr revid: jvo@tinyerp.com-20101028173125-afyv9hrt32iw23t8
| -rw-r--r-- | addons/purchase/purchase_view.xml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 96f19c8d711..caa6790b537 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -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> |