odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Sale_delivery_report : Delivery order report should take shipping address from picking itself 

bzr revid: jvo@tinyerp.com-20090918133746-3oes2v0lb8je0rxs
This commit is contained in:
VRA(OpenERP) 2009-09-18 19:07:46 +05:30 committed by Jay (Open ERP)
parent 48b9c6e333
commit 294d923ac2
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
addons/sale_delivery_report/report/shipping.py
View File

@ -30,35 +30,35 @@ class shipping(report_sxw.rml_parse):
super(shipping, self).__init__(cr, uid, name, context) super(shipping, self).__init__(cr, uid, name, context)
self.localcontext.update({ self.localcontext.update({
'time': time, 'time': time,
'get_address': self._get_address, # 'get_address': self._get_address,
'get_address_ship':self._get_address_ship # 'get_address_ship':self._get_address_ship
}) })
def _get_address(self,data): # 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 " \ # 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 " \ # "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 " \ # "where sp.origin=so.name " \
"and so.partner_id=rp.id " \ # "and so.partner_id=rp.id " \
"and so.partner_invoice_id=rpa.id " \ # "and so.partner_invoice_id=rpa.id " \
"and rpa.country_id=rc.id " \ # "and rpa.country_id=rc.id " \
"and sp.id=%s", (data.id,)) # "and sp.id=%s", (data.id,))
#
add=self.cr.dictfetchall() # add=self.cr.dictfetchall()
return add # return add
#
def _get_address_ship(self,data): # 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 " \ # 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 " \ # "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 " \ # "where sp.origin=so.name " \
"and so.partner_id=rp.id " \ # "and so.partner_id=rp.id " \
"and so.partner_shipping_id=rpa.id " \ # "and so.partner_shipping_id=rpa.id " \
"and rpa.country_id=rc.id " \ # "and rpa.country_id=rc.id " \
"and sp.id=%s", (data.id,)) # "and sp.id=%s", (data.id,))
#
ship=self.cr.dictfetchall() # ship=self.cr.dictfetchall()
return ship # return ship
# def _sum_total(self,data): # def _sum_total(self,data):
# print "======data=======",data # print "======data=======",data

12
addons/sale_delivery_report/report/shipping.rml
View File

@ -123,12 +123,12 @@
<para style="terp_default_9">[[ 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 '']]</para> <para style="terp_default_9">[[ 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 '']]</para>
</td> </td>
<td> <td>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.partner_id.name or '']]</para> <para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']]</para> <para style="terp_default_9">[[ o.address_id and o.address_id.name or '']]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.street or '']]</para> <para style="terp_default_9">[[ o.address_id and o.address_id.street or '']]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.zip or '']]</para> <para style="terp_default_9">[[ o.address_id and o.address_id.zip or '']]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.city or '']]</para> <para style="terp_default_9">[[ o.address_id and o.address_id.city or '']]</para>
<para style="terp_default_9">[[ 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 '']]</para> <para style="terp_default_9">[[ o.address_id and o.address_id.country_id and o.address_id.country_id.name or '']]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>