Jigar Amin (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-report_intrastat-jam
into lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-report_intrastat-jam/+merge/96329
cleaned report_intrastat for invoice and contact address and
res_aprtner_address model
Kindly review this.
thank You
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-report_intrastat-jam/+merge/96329
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'report_intrastat/report/invoice.rml'
--- report_intrastat/report/invoice.rml 2011-12-22 15:17:58 +0000
+++ report_intrastat/report/invoice.rml 2012-03-07 11:13:21 +0000
@@ -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>
\ No newline at end of file
+</document>
=== modified file 'report_intrastat/report/invoice.sxw'
Binary files report_intrastat/report/invoice.sxw 2011-01-14 00:11:01 +0000 and report_intrastat/report/invoice.sxw 2012-03-07 11:13:21 +0000 differ
=== modified file 'report_intrastat/report_intrastat.py'
--- report_intrastat/report_intrastat.py 2011-12-19 16:54:40 +0000
+++ report_intrastat/report_intrastat.py 2012-03-07 11:13:21 +0000
@@ -112,10 +112,9 @@
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
=== modified file 'report_intrastat/test/report_intrastat_report.yml'
--- report_intrastat/test/report_intrastat_report.yml 2011-01-14 00:11:01 +0000
+++ report_intrastat/test/report_intrastat_report.yml 2012-03-07 11:13:21 +0000
@@ -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
-
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
