From ba350580c1a5db4ebfd0bc1a7264fcf63a6d84fb Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 18 Aug 2010 14:36:16 +0530 Subject: [PATCH] [IMP] Sale: Remove unused file board_sale_demo.xml and improve code bzr revid: mra@mra-laptop-20100818090616-4b9tbenwb71nmol1 --- addons/sale/__openerp__.py | 2 +- addons/sale/board_sale_demo.xml | 6 ------ addons/sale/report/sale_order.py | 9 +++++---- addons/sale/report/sale_prepare_allot.py | 13 +++++++------ addons/sale/sale_sequence.xml | 3 +++ 5 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 addons/sale/board_sale_demo.xml diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index d432774c390..bf2ef46f0f9 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -67,7 +67,7 @@ 'board_sale_view.xml', 'process/sale_process.xml', ], - 'demo_xml': ['sale_demo.xml','board_sale_demo.xml'], + 'demo_xml': ['sale_demo.xml'], 'test': [ 'test/data_test.yml', 'test/manual_order_policy.yml', diff --git a/addons/sale/board_sale_demo.xml b/addons/sale/board_sale_demo.xml deleted file mode 100644 index c8918187258..00000000000 --- a/addons/sale/board_sale_demo.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/sale/report/sale_order.py b/addons/sale/report/sale_order.py index 5dbe271697c..cc1d89f9ed7 100644 --- a/addons/sale/report/sale_order.py +++ b/addons/sale/report/sale_order.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,20 +15,21 @@ # 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 time + from report import report_sxw -from osv import osv class order(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): + def __init__(self, cr, uid, name, context=None): super(order, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) + report_sxw.report_sxw('report.sale.order','sale.order','addons/sale/report/sale_order.rml',parser=order) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/report/sale_prepare_allot.py b/addons/sale/report/sale_prepare_allot.py index d4a89f876bc..21a37797a73 100644 --- a/addons/sale/report/sale_prepare_allot.py +++ b/addons/sale/report/sale_prepare_allot.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,20 +15,22 @@ # 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 time + from report import report_sxw class sale_prepare(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): + + def __init__(self, cr, uid, name, context=None): super(sale_prepare, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'allotment': self._allotment, }) - + def _allotment(self, object): allotments = {} for line in object.order_line: @@ -42,5 +44,4 @@ class sale_prepare(report_sxw.rml_parse): report_sxw.report_sxw('report.sale.order.prepare.allot', 'sale.order', 'addons/sale/report/sale_prepare_allot.rml',parser=sale_prepare) -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml index 5e5005d3b1b..8a500a9395c 100644 --- a/addons/sale/sale_sequence.xml +++ b/addons/sale/sale_sequence.xml @@ -1,16 +1,19 @@ + Sale Order sale.order + Sale Order sale.order SO 3 +