From 294d923ac23b31da7c96aac7f8d63ef9a3c867b3 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Fri, 18 Sep 2009 19:07:46 +0530
Subject: [PATCH] [FIX] Sale_delivery_report : Delivery order report should
take shipping address from picking itself
bzr revid: jvo@tinyerp.com-20090918133746-3oes2v0lb8je0rxs
---
.../sale_delivery_report/report/shipping.py | 54 +++++++++----------
.../sale_delivery_report/report/shipping.rml | 12 ++---
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/sale_delivery_report/report/shipping.py
index 9c7cc3a26f0..63aeba6c10c 100644
--- a/addons/sale_delivery_report/report/shipping.py
+++ b/addons/sale_delivery_report/report/shipping.py
@@ -30,35 +30,35 @@ class shipping(report_sxw.rml_parse):
super(shipping, self).__init__(cr, uid, name, context)
self.localcontext.update({
'time': time,
- 'get_address': self._get_address,
- 'get_address_ship':self._get_address_ship
+# '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
+# 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
# def _sum_total(self,data):
# print "======data=======",data
diff --git a/addons/sale_delivery_report/report/shipping.rml b/addons/sale_delivery_report/report/shipping.rml
index e9c26f0e6ae..c827cced55a 100644
--- a/addons/sale_delivery_report/report/shipping.rml
+++ b/addons/sale_delivery_report/report/shipping.rml
@@ -123,12 +123,12 @@
[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]
|
- [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.partner_id.name or '']]
- [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']]
- [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.street or '']]
- [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.zip or '']]
- [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.city or '']]
- [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.country_id and o.sale_id.partner_shipping_id.country_id.name or '']]
+ [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']]
+ [[ o.address_id and o.address_id.name or '']]
+ [[ o.address_id and o.address_id.street or '']]
+ [[ o.address_id and o.address_id.zip or '']]
+ [[ o.address_id and o.address_id.city or '']]
+ [[ o.address_id and o.address_id.country_id and o.address_id.country_id.name or '']]
|