Merge lp:~openerp-dev/openobject-addons/trunk-bug-1193539-Chandni into lp:openobject-addons

[Chandni Machchhar(OpenERP)]

Hello,

 I have fix the problem of printing date format in user language preference in payslip pdf.

Thanks,
Chandni

[Atul Patel(OpenERP) (atp-openerp)]

review: Approve

Unmerged revisions

8793. By Chandni Machchhar(OpenERP) on 2013-07-02

[FIX] Date Format printed no payslip pdf in not given in user language preference.

=== modified file 'hr_payroll/report/report_payslip.rml'
--- hr_payroll/report/report_payslip.rml	2012-11-29 22:26:45 +0000
+++ hr_payroll/report/report_payslip.rml	2013-07-02 05:21:30 +0000
@@ -242,7 +242,7 @@
           <para style="P15">Date From</para>
         </td>
         <td>
-          <para style="P4">[[ o.date_from or '']]</para>
+          <para style="P4">[[ formatLang(o.date_from, date=True) or '']]</para>
         </td>
         <td>
           <para style="terp_default_Bold_8">
@@ -250,7 +250,7 @@
           </para>
         </td>
         <td>
-          <para style="P4">[[ o.date_to or '' ]]</para>
+          <para style="P4">[[ formatLang(o.date_to, date=True) or '' ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'hr_payroll/report/report_payslip.sxw'
Binary files hr_payroll/report/report_payslip.sxw	2012-11-29 22:26:45 +0000 and hr_payroll/report/report_payslip.sxw	2013-07-02 05:21:30 +0000 differ
=== modified file 'l10n_in_hr_payroll/report/report_payslip_details.rml'
--- l10n_in_hr_payroll/report/report_payslip_details.rml	2012-10-02 14:45:47 +0000
+++ l10n_in_hr_payroll/report/report_payslip_details.rml	2013-07-02 05:21:30 +0000
@@ -278,7 +278,7 @@
           <para style="P16">Date From</para>
         </td>
         <td>
-          <para style="P5">[[ o.date_from or '']]</para>
+          <para style="P5">[[ formatLang(o.date_from, date=True) or '']]</para>
         </td>
         <td>
           <para style="terp_default_Bold_8">
@@ -286,7 +286,7 @@
           </para>
         </td>
         <td>
-          <para style="P5">[[ o.date_to or '' ]]</para>
+          <para style="P5">[[ formatLang(o.date_to, date=True) or '' ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'l10n_in_hr_payroll/report/report_payslip_details.sxw'
Binary files l10n_in_hr_payroll/report/report_payslip_details.sxw	2012-10-02 14:45:47 +0000 and l10n_in_hr_payroll/report/report_payslip_details.sxw	2013-07-02 05:21:30 +0000 differ