From e06795b3f1d03d2aabc7cfd790b1fd104d89a70f Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 7 Jun 2010 16:36:30 +0530 Subject: [PATCH] Task-919 : Merge the board of sale,purchase,document bzr revid: sbh@tinyerp.com-20100607110630-3uszeemgepx76cus --- addons/document/__openerp__.py | 7 ++++--- .../{board_document => document}/board_document_demo.xml | 0 .../{board_document => document}/board_document_view.xml | 0 addons/purchase/__openerp__.py | 1 + .../{board_purchase => purchase}/board_purchase_view.xml | 0 addons/sale/__openerp__.py | 5 +++-- addons/{board_sale => sale}/board_sale_demo.xml | 0 addons/{board_sale => sale}/board_sale_view.xml | 0 8 files changed, 8 insertions(+), 5 deletions(-) rename addons/{board_document => document}/board_document_demo.xml (100%) rename addons/{board_document => document}/board_document_view.xml (100%) rename addons/{board_purchase => purchase}/board_purchase_view.xml (100%) rename addons/{board_sale => sale}/board_sale_demo.xml (100%) rename addons/{board_sale => sale}/board_sale_view.xml (100%) diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index ac227827d11..1a8a6e32e48 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -36,16 +36,17 @@ """, 'author': 'Tiny', 'website': 'http://www.openerp.com', - 'depends': ['base', 'process'], + 'depends': ['base', 'process','board'], 'init_xml': [], 'update_xml': [ 'document_view.xml', 'document_data.xml', 'security/document_security.xml', 'security/ir.model.access.csv', - 'report/document_report_view.xml' + 'report/document_report_view.xml', + 'board_document_view.xml', ], - 'demo_xml': [ 'document_demo.xml',], + 'demo_xml': [ 'document_demo.xml','board_document_demo.xml'], 'test': [ 'test/document_test.yml', ], diff --git a/addons/board_document/board_document_demo.xml b/addons/document/board_document_demo.xml similarity index 100% rename from addons/board_document/board_document_demo.xml rename to addons/document/board_document_demo.xml diff --git a/addons/board_document/board_document_view.xml b/addons/document/board_document_view.xml similarity index 100% rename from addons/board_document/board_document_view.xml rename to addons/document/board_document_view.xml diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 46d7c3296b9..21019ff0bd5 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -50,6 +50,7 @@ 'partner_view.xml', 'process/purchase_process.xml', 'report/purchase_report_view.xml', + 'board_purchase_view.xml', ], 'test': [ 'test/purchase_from_order.yml', diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml similarity index 100% rename from addons/board_purchase/board_purchase_view.xml rename to addons/purchase/board_purchase_view.xml diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 651945752a7..3815d5e009f 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -42,7 +42,7 @@ """, 'author': 'Tiny', 'website': 'http://www.openerp.com', - 'depends': ['product', 'stock', 'mrp_procurement', 'process'], + 'depends': ['product', 'stock', 'mrp_procurement', 'process','board'], 'init_xml': [], 'update_xml': [ 'wizard/sale_make_invoice_advance.xml', @@ -58,9 +58,10 @@ 'report/sale_report_view.xml', 'sale_report.xml', 'stock_view.xml', + 'board_sale_view.xml', # 'process/sale_process.xml', ], - 'demo_xml': ['sale_demo.xml'], + 'demo_xml': ['sale_demo.xml','board_sale_demo.xml'], 'test': [ 'test/shipping_manual_sale_order.yml', 'test/prepaid_sale_order.yml', diff --git a/addons/board_sale/board_sale_demo.xml b/addons/sale/board_sale_demo.xml similarity index 100% rename from addons/board_sale/board_sale_demo.xml rename to addons/sale/board_sale_demo.xml diff --git a/addons/board_sale/board_sale_view.xml b/addons/sale/board_sale_view.xml similarity index 100% rename from addons/board_sale/board_sale_view.xml rename to addons/sale/board_sale_view.xml