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

[FIX] mrp_repair: Repair order Quotation/Order report error corrected. 

bzr revid: uco@tinyerp.com-20100920092410-v6othao2y8tofyn3
This commit is contained in:
uco (Open ERP) 2010-09-20 14:54:10 +05:30
parent 95d4cfd7f5
commit 8ba31fc711
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp_repair/report/order.py
View File

@ -48,7 +48,7 @@ class order(report_sxw.rml_parse):
res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
adr_id = addresses and addresses[type] or False
return adr_id and res_partner_address.read(self.cr, self.uid, [adr_id])[0] or False
return adr_id and res_partner_address.read(self.cr, self.uid, [adr_id])[0] or {}
report_sxw.report_sxw('report.repair.order','mrp.repair','addons/mrp_repair/report/order.rml',parser=order)

14
addons/mrp_repair/report/order.rml
View File

@ -175,7 +175,7 @@
<para style="P3">
<font color="white"> </font>
</para>
<para style="P13">Invoice address</para>
<para style="P13">Invoice address :</para>
<para style="P3">[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
<para style="P3">[[ o.partner_invoice_id.street ]]</para>
<para style="P3">[[ o.partner_invoice_id.street2 or removeParentNode('para') ]]</para>
@ -189,12 +189,12 @@
</para>
</td>
<td>
<para style="P3">[[ o.partner_id.name ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street2'] or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]][[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
<para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default')['state_id'] and adr_get(o.partner_id, 'default')['state_id'][1]) or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
<para style="P3">[[ o.partner_id.name or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street','') or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street2','') or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('zip','') or removeParentNode('para') ]][[ o.partner_id and adr_get(o.partner_id, 'default').get('city','') or removeParentNode('para') ]]</para>
<para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default').get('state_id','') and adr_get(o.partner_id, 'default').get('state_id',[])[1]) or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('country_id','') and adr_get(o.partner_id, 'default').get('country_id',[])[1] or removeParentNode('para') ]]</para>
<para style="P3">
<font color="white"> </font>
</para>