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
=== modified file 'bin/addons/base/report/corporate_sxw_header.xml'
--- bin/addons/base/report/corporate_sxw_header.xml 2009-01-29 22:22:23 +0000
+++ bin/addons/base/report/corporate_sxw_header.xml 2011-09-30 07:23:23 +0000
@@ -196,14 +196,27 @@
196 <table:table-column table:style-name="Table2.A"/>196 <table:table-column table:style-name="Table2.A"/>
197 <table:table-column table:style-name="Table2.B"/>197 <table:table-column table:style-name="Table2.B"/>
198 <table:table-row>198 <table:table-row>
199 <table:table-cell table:style-name="Table2.A1" table:value-type="string">199 <table:table-cell table:style-name="Table2.A1" table:value-type="string">
200 <text:p text:style-name="P1">[[ company.partner_id.name ]]</text:p>200 <text:p text:style-name="P2"></text:p>
201 </table:table-cell>201 </table:table-cell>
202 <table:table-cell table:style-name="Table2.A1" table:value-type="string">202 <table:table-cell table:style-name="Table2.A1" table:value-type="string">
203 <text:p text:style-name="P2">[[ company.rml_header1 ]]</text:p>203 <text:p text:style-name="P2">[[ company.rml_header1 ]]</text:p>
204 </table:table-cell>204 </table:table-cell>
205 </table:table-row>205 </table:table-row>
206 </table:table>206 </table:table>
207
208 <table:table table:name="Table3" table:style-name="Table3">
209 <table:table-column table:style-name="Table3.AA"/>
210 <table:table-column table:style-name="Table3.BB"/>
211 <table:table-row>
212 <table:table-cell table:style-name="Table3.AA" table:value-type="string">
213 <text:p text:style-name="P4">[[ company.partner_id.name ]]</text:p>
214 </table:table-cell>
215 <table:table-cell table:style-name="Table3.AA" table:value-type="string">
216 <text:p text:style-name="P5"></text:p>
217 </table:table-cell>
218 </table:table-row>
219 </table:table>
207 <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].street ]]</text:p>220 <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].street ]]</text:p>
208 <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>221 <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>
209 <table:table table:name="Table3" table:style-name="Table3">222 <table:table table:name="Table3" table:style-name="Table3">