Amit Dodiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/6.1-opw-576781-ado into
lp:openobject-server/6.1.
Requested reviews:
Olivier Dony (OpenERP) (odo-openerp)
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.1-opw-576781-ado/+merge/118478
Hello
"[FIX](1) Reprort extension is not changing after changing the report type from
report action (2) while opening the report with report type odt the report will
take the hard coded header and footer from corporate_odt_header file"
Steps :
(1). Reprort extension is not changing after changing the report type from
report action
1.1) Goto : Settings/Customization/Low Level Objects/Actions/Reports, change
the report type to odt and try to generate the report.
Report is generated but with extension .sxw it should created with .odt
(2) While opening the report with report type odt the report will take the hard
coded header and footer from corporate_odt_header file"
2.1) After applying the fix of "report_sxw.py" try to open the report with
report type odt the report will take the hard coded header and footer from
corporate_odt_header file, it should take from companies header and footer.
Changes in corporate_odt_header solved the issue.
Regards,
Amit Dodiya
--
https://code.launchpad.net/~openerp-dev/openobject-server/6.1-opw-576781-ado/+merge/118478
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/6.1-opw-576781-ado.
=== modified file 'openerp/addons/base/report/corporate_odt_header.xml'
--- openerp/addons/base/report/corporate_odt_header.xml 2009-01-29 22:22:23 +0000
+++ openerp/addons/base/report/corporate_odt_header.xml 2012-08-07 06:18:35 +0000
@@ -198,16 +198,16 @@
<table:table-column table:style-name="Table2.A"/>
<table:table-column table:style-name="Table2.B"/>
<table:table-row>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
- <text:p text:style-name="P1">Tiny sprl</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
- <text:p text:style-name="P2"/>
- </table:table-cell>
+ <table:table-cell table:style-name="Table2.A1" table:value-type="string">
+ <text:p text:style-name="P1">[[ company.partner_id.name ]]</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="Table2.A1" table:value-type="string">
+ <text:p text:style-name="P2">[[ company.rml_header1 ]]</text:p>
+ </table:table-cell>
</table:table-row>
</table:table>
- <text:p text:style-name="P3"/>
- <text:p text:style-name="P3">- </text:p>
+ <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].street ]]</text:p>
+ <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>
<table:table table:name="Table3" table:style-name="Table3">
<table:table-column table:style-name="Table3.A"/>
<table:table-column table:style-name="Table3.B"/>
@@ -216,7 +216,7 @@
<text:p text:style-name="P4">Phone :</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table3.A1" office:value-type="string">
- <text:p text:style-name="P5"/>
+ <text:p text:style-name="P5">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -224,7 +224,7 @@
<text:p text:style-name="P4">Mail :</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table3.A2" office:value-type="string">
- <text:p text:style-name="P5"/>
+ <text:p text:style-name="P5">[[ company.partner_id.address and company.partner_id.address[0].email ]]</text:p>
</table:table-cell>
</table:table-row>
</table:table>
@@ -235,9 +235,9 @@
<table:table-column table:style-name="Table1.A"/>
<table:table-row>
<table:table-cell table:style-name="Table1.A1" office:value-type="string">
- <text:p text:style-name="P7"/>
- <text:p text:style-name="P7"/>
- <text:p text:style-name="P7">Contact : Administrator</text:p>
+ <text:p text:style-name="P7">[[ company.rml_footer1 ]]</text:p>
+ <text:p text:style-name="P7">[[ company.rml_footer2 ]]</text:p>
+ <text:p text:style-name="P7">Contact : [[ user.name ]]</text:p>
</table:table-cell>
</table:table-row>
</table:table>
=== modified file 'openerp/report/report_sxw.py'
--- openerp/report/report_sxw.py 2012-02-15 14:47:27 +0000
+++ openerp/report/report_sxw.py 2012-08-07 06:18:35 +0000
@@ -644,7 +644,7 @@
sxw_z.close()
final_op = sxw_io.getvalue()
sxw_io.close()
- return (final_op, mime_type)
+ return (final_op, report_type)
def create_single_html2html(self, cr, uid, ids, data, report_xml, context=None):
if not context:
_______________________________________________
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
