From 6306f5660ff184b3f05cbfa2fd17a64b13bc6f85 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 4 Aug 2010 11:52:18 +0530
Subject: [PATCH] [REF] delivery: Removed unnecessary commented code and
 spaces.

bzr revid: uco@tinyerp.com-20100804062218-bl8nzwwu49402wih
---
 addons/delivery/report/shipping.py | 45 ++----------------------------
 addons/delivery/sale.py            |  4 ---
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/addons/delivery/report/shipping.py b/addons/delivery/report/shipping.py
index 3fc36256326..6d3b3598987 100644
--- a/addons/delivery/report/shipping.py
+++ b/addons/delivery/report/shipping.py
@@ -22,55 +22,14 @@
 import time
 
 from report import report_sxw
-from osv import osv
-import pooler
 
 class shipping(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(shipping, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-#            'get_address': self._get_address,
-#            'get_address_ship':self._get_address_ship
         })
 
-#    def _get_address(self,data):
-#
-#         self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_invoice_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \
-#                         "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \
-#                         "where sp.origin=so.name " \
-#                         "and so.partner_id=rp.id " \
-#                         "and so.partner_invoice_id=rpa.id  " \
-#                         "and rpa.country_id=rc.id " \
-#                         "and sp.id=%s", (data.id,))
-#
-#         add=self.cr.dictfetchall()
-#         return add
-#
-#    def _get_address_ship(self,data):
-#
-#         self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_shipping_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \
-#                         "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \
-#                         "where sp.origin=so.name " \
-#                         "and so.partner_id=rp.id " \
-#                         "and so.partner_shipping_id=rpa.id  " \
-#                         "and rpa.country_id=rc.id " \
-#                         "and sp.id=%s", (data.id,))
-#
-#         ship=self.cr.dictfetchall()
-#         return ship
+report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/delivery/report/shipping.rml',parser=shipping)
 
-#    def _sum_total(self,data):
-#        print "======data=======",data
-
-#        self.cr.execute("SELECT sum(pt.list_price*sm.product_qty) FROM stock_picking as sp "\
-#                        "LEFT JOIN  stock_move sm ON (sp.id = sm.picking_id) "\
-#                        "LEFT JOIN  product_product pp ON (sm.product_id = pp.id) "\
-#                        "LEFT JOIN  product_template pt ON (pp.product_tmpl_id = pt.id) "\
-#                        "WHERE sm.picking_id = %s", (data['id'],))
-#        sum_total = self.cr.fetchone()[0] or 0.00
-#        return True
-
-report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale_delivery_report/report/shipping.rml',parser=shipping)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 0133a263960..ee9295eb5d4 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -47,9 +47,5 @@ class sale_order(osv.osv):
         return result
 sale_order()
 
-
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: