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

[IMP] report_intrastat report are impoved removed address_invoice_id and address_contact_id 

bzr revid: jam@tinyerp.com-20120307111156-d3q9bonwwolutvmp
This commit is contained in:
Jigar Amin - OpenERP 2012-03-07 16:41:56 +05:30
parent e6eb4f31ad
commit 8c2d2ec9a2
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/report_intrastat/report/invoice.rml
View File

@ -142,12 +142,12 @@
</td>
<td>
<para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
<para style="terp_default_8">[[ o.address_invoice_id and display_address(o.address_invoice_id) ]] </para>
<para style="terp_default_8">[[ o.partner_id and display_address(o.partner_id) ]] </para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
<para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
<para style="terp_default_8">Tel. : [[ (o.partner_id and o.partner_id.phone) or removeParentNode('para') ]]</para>
<para style="terp_default_8">Fax : [[ (o.partner_id and o.partner_id.fax) or removeParentNode('para') ]]</para>
<para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
@ -184,7 +184,7 @@
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
<para style="terp_default_Centre_9">[[ (o.partner_id and o.partner_id.ref) or ' ' ]]</para>
</td>
</tr>
</blockTable>
@ -398,4 +398,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>

5
addons/report_intrastat/report_intrastat.py
View File

@ -112,10 +112,9 @@ class report_intrastat(osv.osv):
left join product_uom uom on uom.id=inv_line.uos_id
left join product_uom puom on puom.id = pt.uom_id
left join report_intrastat_code intrastat on pt.intrastat_id = intrastat.id
left join (res_partner_address inv_address
left join (res_partner inv_address
left join res_country inv_country on (inv_country.id = inv_address.country_id))
on (inv_address.id = inv.address_invoice_id)
on (inv_address.id = inv.partner_id)
where
inv.state in ('open','paid')
and inv_line.product_id is not null

3
addons/report_intrastat/test/report_intrastat_report.yml
View File

@ -4,13 +4,12 @@
!record {model: account.invoice, id: test_invoice_1}:
currency_id: base.EUR
company_id: base.main_company
address_invoice_id: base.res_partner_address_tang
partner_id: base.res_partner_address_tang
partner_id: base.res_partner_asus
state: draft
type: out_invoice
account_id: account.a_recv
name: Test invoice 1
address_contact_id: base.res_partner_address_tang
-
In order to test the PDF reports defined using report_intrastat module, we print a Intrastat Report
-