Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.0-opw-17657-ado into lp:openobject-server/6.0

  1. 6.0-opw-17657-ado
  2. Merge into 6.0
Proposed by Amit Dodiya (OpenERP)
Status: Merged
Merged at revision: 3505
Proposed branch: lp:~openerp-dev/openobject-server/6.0-opw-17657-ado
Merge into: lp:openobject-server/6.0
Diff against target: 33 lines (+15/-2)
1 file modified
bin/addons/base/report/corporate_sxw_header.xml (+15/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-opw-17657-ado
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) Pending
Review via email: mp+77651@code.launchpad.net

Description of the change

Hello,

"[FIX]: Report output is not the same PDF vs. OpenOffice case:(17657)".

I have changed the code in corporate_sxw_header.xml file because while sending the report to the server in OpenOffice type the Output is different than pdf report.

Thanks,
Amit

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/report/corporate_sxw_header.xml'
2--- bin/addons/base/report/corporate_sxw_header.xml 2009-01-29 22:22:23 +0000
3+++ bin/addons/base/report/corporate_sxw_header.xml 2011-09-30 07:23:23 +0000
4@@ -196,14 +196,27 @@
5 <table:table-column table:style-name="Table2.A"/>
6 <table:table-column table:style-name="Table2.B"/>
7 <table:table-row>
8- <table:table-cell table:style-name="Table2.A1" table:value-type="string">
9- <text:p text:style-name="P1">[[ company.partner_id.name ]]</text:p>
10+ <table:table-cell table:style-name="Table2.A1" table:value-type="string">
11+ <text:p text:style-name="P2"></text:p>
12 </table:table-cell>
13 <table:table-cell table:style-name="Table2.A1" table:value-type="string">
14 <text:p text:style-name="P2">[[ company.rml_header1 ]]</text:p>
15 </table:table-cell>
16 </table:table-row>
17 </table:table>
18+
19+ <table:table table:name="Table3" table:style-name="Table3">
20+ <table:table-column table:style-name="Table3.AA"/>
21+ <table:table-column table:style-name="Table3.BB"/>
22+ <table:table-row>
23+ <table:table-cell table:style-name="Table3.AA" table:value-type="string">
24+ <text:p text:style-name="P4">[[ company.partner_id.name ]]</text:p>
25+ </table:table-cell>
26+ <table:table-cell table:style-name="Table3.AA" table:value-type="string">
27+ <text:p text:style-name="P5"></text:p>
28+ </table:table-cell>
29+ </table:table-row>
30+ </table:table>
31 <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].street ]]</text:p>
32 <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</text:p>
33 <table:table table:name="Table3" table:style-name="Table3">