From d7507187e9323198289d948731f2948b555d2fee Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 20 Nov 2008 11:46:02 +0530 Subject: [PATCH 1/2] Address prob solve in delivery order-vir bzr revid: patelamit2003@gmail.com-20081120061602-utel7rylud8ag5wt --- addons/sale/report/shipping.py | 40 ++++++++++++++++++++++++++++----- addons/sale/report/shipping.rml | 24 +++++++++++--------- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/addons/sale/report/shipping.py b/addons/sale/report/shipping.py index 6a8db87cbfe..0fa1ed6158a 100644 --- a/addons/sale/report/shipping.py +++ b/addons/sale/report/shipping.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -30,17 +30,45 @@ class shipping(report_sxw.rml_parse): super(shipping, self).__init__(cr, uid, name, context) self.localcontext.update({ 'time': time, -# 'sum_total': self._sum_total, + '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=%d "%(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=%d "%(data.id)) + + ship=self.cr.dictfetchall() + return ship + # def _sum_total(self,data): -# print "======data=======",data['id'] +# 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 = %d "%(data['id'])) # sum_total = self.cr.fetchone()[0] or 0.00 -# return sum_total +# return True -report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale/report/shipping.rml',parser=shipping) +report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale/report/shipping.rml',parser=shipping) \ No newline at end of file diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index eb33a84c022..8d0c82141ae 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -117,19 +117,21 @@ - Invoiced to - [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]] - [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.street or '']] - [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.zip or '']] - [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.city or '' ]] - [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.country_id and o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']] + Invoiced To + [[ repeatIn(get_address(o),'add') ]] + [[ add['name2'] ]] + [[ add['street'] ]] + [[ add['city'] ]] + [[ add['country'] ]] + - [[ 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 '']] + Shipping To + [[ repeatIn(get_address_ship(o),'ship') ]] + [[ ship['name2'] ]] + [[ ship['street'] ]] + [[ ship['city'] ]] + [[ ship['country'] ]] From 792c8ee37a2c88de2a4a62158864448147c9a645 Mon Sep 17 00:00:00 2001 From: qdp Date: Thu, 20 Nov 2008 09:51:22 +0100 Subject: [PATCH 2/2] *improved view of 'entries encoding by line': added domain parent_id = False on account_tax_id bzr revid: qdp@tinyerp.com-20081120085122-esfmvo7k8xvf40mg --- addons/account/account_move_line.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 46d18515df4..dea6a4afb95 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -624,6 +624,8 @@ class account_move_line(osv.osv): attrs.append('sum="Total debit"') elif field.field=='credit': attrs.append('sum="Total credit"') + elif field.field=='account_tax_id': + attrs.append('domain="[(\'parent_id\',\'=\',False)]"') elif field.field=='account_id' and journal.id: attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'<>\',\'view\'), (\'type\',\'<>\',\'closed\')]"') if field.readonly: