Merge lp:~openerp-dev/openobject-addons/trunk-opw-577185-port-dhr into lp:openobject-addons

[Dharti Ratani(OpenERP)]

Hello,

[FIX] improve the code in sxw files_Passed the code of printing symbol in formatLang() method

I have changed the code in sxw files for printing symbol and passed the code in formatLang() function, because while using the option "Conversion Braces---> Field" in OpenOffice the report removes the spaces between the amount and symbol.

Stpes:
1). Open "Invoices" report in OpenOffice
2). Click on "Conversion Braces---> Fields", and click on send to server
3). Now print the report you will see the spaces are remove from field "Price, Total, Tax an Net Total"

Code is forward port from 6.1

Thanks
Dharti

[Fabien (Open ERP) (fp-tinyerp)]

unable to merge due to conflicts in binary files.

[Dharti Ratani(OpenERP) (dhr-openerp)]

Hello,

      Merged with latest trunk and resolved conflicts.

Thanks
Dharti

[Dharti Ratani(OpenERP) (dhr-openerp)]

review: Needs Resubmitting

Unmerged revisions

8288. By Dharti Ratani(OpenERP) on 2012-12-18

[MERGE]Merged with trunk

8287. By Dharti Ratani(OpenERP) on 2012-12-17

[MERGE]

8286. By Amit Dodiya on 2012-12-12

[FIX] (1) base report designer plugin removes the space from two attached string in report while using the option Conversion_Braces_to_fields (2) Improve the code in sxw files_Passed the code of printing symbol in formatLang() method

=== modified file 'account_analytic_plans/report/crossovered_analytic.sxw'
Binary files account_analytic_plans/report/crossovered_analytic.sxw	2011-01-14 00:11:01 +0000 and account_analytic_plans/report/crossovered_analytic.sxw	2012-12-18 06:45:55 +0000 differ
=== removed file 'base_report_designer/plugin/openerp_report_designer.zip'
Binary files base_report_designer/plugin/openerp_report_designer.zip	2012-11-21 09:56:09 +0000 and base_report_designer/plugin/openerp_report_designer.zip	1970-01-01 00:00:00 +0000 differ
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py	2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py	2012-12-18 06:45:55 +0000
@@ -270,7 +270,7 @@
                         if res[1]<>"Expression":
                             oInputList.Items=(u""+found.String,u""+found.String)
                         else:
-                            oInputList.Items=(u"?",u""+found.String)
+                            oInputList.Items=(u"?",u" "+found.String)
                         aReportSyntex.append([oInputList,res[1]])
                         text.insertTextContent(found,oInputList,False)
                         found.String =""

=== modified file 'hr_payroll/report/report_payslip_details.sxw'
Binary files hr_payroll/report/report_payslip_details.sxw	2012-11-29 22:26:45 +0000 and hr_payroll/report/report_payslip_details.sxw	2012-12-18 06:45:55 +0000 differ
=== modified file 'point_of_sale/report/all_closed_cashbox_of_the_day.sxw'
Binary files point_of_sale/report/all_closed_cashbox_of_the_day.sxw	2012-11-29 22:26:45 +0000 and point_of_sale/report/all_closed_cashbox_of_the_day.sxw	2012-12-18 06:45:55 +0000 differ
=== modified file 'point_of_sale/report/pos_details.sxw'
Binary files point_of_sale/report/pos_details.sxw	2012-11-29 22:26:45 +0000 and point_of_sale/report/pos_details.sxw	2012-12-18 06:45:55 +0000 differ
=== modified file 'purchase/report/order.sxw'
Binary files purchase/report/order.sxw	2012-11-29 22:26:45 +0000 and purchase/report/order.sxw	2012-12-18 06:45:55 +0000 differ
=== modified file 'sale/report/sale_order.sxw'
Binary files sale/report/sale_order.sxw	2012-12-09 17:56:41 +0000 and sale/report/sale_order.sxw	2012-12-18 06:45:55 +0000 differ