Merge lp:~openerp-dev/openobject-server/trunk-opw-576781-port-kbh into lp:openobject-server

[Khushboo Bhatt(openerp)]

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.

Code is forward port from 6.1

Thanks,
khushboo.

[lp:~openerp-dev/openobject-server/trunk-opw-576781-port-kbh]

4644. By Khushboo Bhatt(openerp) on 2012-12-06

[FIX]indentation problem

4645. By Khushboo Bhatt(openerp) on 2012-12-06

[FIX]indentation problem

Unmerged revisions

4645. By Khushboo Bhatt(openerp) on 2012-12-06

[FIX]indentation problem

4644. By Khushboo Bhatt(openerp) on 2012-12-06

[FIX]indentation problem

4643. By ado on 2012-12-06

[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 file not from database

=== 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-12-06 10:43:21 +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_footer ]]</text:p>
+                        <text:p text:style-name="P7">[[ company.rml_footer_readonly ]]</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-03-30 04:57:52 +0000
+++ openerp/report/report_sxw.py	2012-12-06 10:43:21 +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: