diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py index 8e1da80d257..ebc12a1089e 100644 --- a/addons/sale/__init__.py +++ b/addons/sale/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -27,8 +27,6 @@ import sale import stock import product import mrp -import sale_report - import wizard import report diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py index 70d9f084afb..51ddf03fe55 100644 --- a/addons/sale/__terp__.py +++ b/addons/sale/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -52,11 +52,10 @@ 'sale_data.xml', 'sale_wizard.xml', 'sale_view.xml', - 'sale_report_view.xml', + 'report/sale_report_view.xml', 'sale_report.xml', 'sale_wizard.xml', 'stock_view.xml', - 'report_sale_view.xml', 'process/sale_process.xml', ], 'demo_xml': ['sale_demo.xml'], diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py index 60b6a2999fc..fb04b328a57 100644 --- a/addons/sale/report/__init__.py +++ b/addons/sale/report/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,10 +15,11 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## import sale_prepare_allot import order +import sale_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/sale_report.py b/addons/sale/report/sale_report.py similarity index 100% rename from addons/sale/sale_report.py rename to addons/sale/report/sale_report.py diff --git a/addons/sale/sale_report_view.xml b/addons/sale/report/sale_report_view.xml similarity index 100% rename from addons/sale/sale_report_view.xml rename to addons/sale/report/sale_report_view.xml diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml deleted file mode 100644 index 30816750035..00000000000 --- a/addons/sale/report_sale_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -