[IMP] Sale: Remove unused file board_sale_demo.xml and improve code

bzr revid: mra@mra-laptop-20100818090616-4b9tbenwb71nmol1

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index d432774..bf2ef46 100644 (file)
--- 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 (file)
index c891818..0000000
--- a/addons/sale/board_sale_demo.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-    </data>
-</openerp>
\ No newline at end of file

diff --git a/addons/sale/report/sale_order.py b/addons/sale/report/sale_order.py
index 5dbe271..cc1d89f 100644 (file)
--- 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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 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 d4a89f8..21a3779 100644 (file)
--- 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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 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 5e5005d..8a500a9 100644 (file)
--- a/addons/sale/sale_sequence.xml
+++ b/addons/sale/sale_sequence.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <!-- Sequences for sale.order -->
         <record id="seq_type_sale_order" model="ir.sequence.type">
             <field name="name">Sale Order</field>
             <field name="code">sale.order</field>
         </record>
+
         <record id="seq_sale_order" model="ir.sequence">
             <field name="name">Sale Order</field>
             <field name="code">sale.order</field>
             <field name="prefix">SO</field>
             <field name="padding">3</field>
         </record>
+
     </data>
 </openerp>