From 345c64ffa12a7815180b3f26fda8cd13618a8dd3 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 7 Jun 2010 16:50:33 +0530 Subject: [PATCH] Task-919 : Merge the board of auction bzr revid: sbh@tinyerp.com-20100607112033-oa2z48ins2rclgnq --- addons/auction/__openerp__.py | 6 ++++-- addons/{board_auction => auction}/board_auction_demo.xml | 0 .../board_auction_manager_view.xml | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename addons/{board_auction => auction}/board_auction_demo.xml (100%) rename addons/{board_auction => auction}/board_auction_manager_view.xml (100%) diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py index cd27c60fdb7..8f0cdf7312b 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -57,9 +57,11 @@ 'auction_view.xml', 'auction_report.xml', - 'auction_wizard.xml' + 'auction_wizard.xml', + 'board_auction_manager_view.xml', + 'board_auction_view.xml', ], - 'demo_xml': ['auction_demo.xml'], + 'demo_xml': ['auction_demo.xml','board_auction_demo.xml'], 'installable': True, 'active': False, 'certificate': '0039333102717', diff --git a/addons/board_auction/board_auction_demo.xml b/addons/auction/board_auction_demo.xml similarity index 100% rename from addons/board_auction/board_auction_demo.xml rename to addons/auction/board_auction_demo.xml diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/auction/board_auction_manager_view.xml similarity index 100% rename from addons/board_auction/board_auction_manager_view.xml rename to addons/auction/board_auction_manager_view.xml