Merge lp:~openerp-dev/openobject-addons/trunk-opw-577041-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

   Issues:
    --> The report "Attendance Per Week" in Employee form contains some static string comes from xsl file is not translated
     Code is forward port from 6.1

Thanks
Mayur

Unmerged revisions

7952. By Mayur Maheshwari(OpenERP) on 2012-11-05

[FIX]hr_attendance : The labels in xsl file is not translated in other language while generating the report of attendace_by_week of employee

7951. By Launchpad Translations on behalf of openerp on 2012-11-04

Launchpad automatic translations update.

7950. By Fabien (Open ERP) on 2012-11-03

[MERGE] fix multi-company for pos

7949. By Fabien (Open ERP) on 2012-11-03

[FIX] bug pos

7948. By Fabien (Open ERP) on 2012-11-03

[FIX] POS close session without cash register

7947. By Fabien (Open ERP) on 2012-11-03

[MERGE] trunk

7946. By Fabien (Open ERP) on 2012-11-03

[FIX] POS

=== modified file 'hr_attendance/report/timesheet.py'
--- hr_attendance/report/timesheet.py	2012-11-02 09:05:24 +0000
+++ hr_attendance/report/timesheet.py	2012-11-05 10:00:15 +0000
@@ -41,6 +41,7 @@
 
     def create_xml(self, cr, uid, ids, datas, context=None):
         obj_emp = pooler.get_pool(cr.dbname).get('hr.employee')
+        res_lang_obj = pooler.get_pool(cr.dbname).get('res.lang')
 
         emp_ids = datas['active_ids']
         start_date = datetime.strptime(datas['form']['init_date'], '%Y-%m-%d')
@@ -99,7 +100,10 @@
                             ldt = dt
 
                 # Week xml representation
-                week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % (n_monday - relativedelta(days=1)).strftime('%Y-%m-%d')]
+                user_lang_code = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context).context_lang
+                lang_id = res_lang_obj.search(cr, uid, [('code', '=', user_lang_code)])
+                lang_dict = res_lang_obj.read(cr, uid, lang_id, ['date_format'])[0]
+                week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime(lang_dict.get('date_format')), '<weekend>%s</weekend>' % n_monday.strftime(lang_dict.get('date_format'))]
                 for idx in range(7):
                     week_repr.append('<%s>' % num2day[idx])
                     if idx in week_wh:
 
=== modified file 'hr_attendance/report/timesheet.xsl'
--- hr_attendance/report/timesheet.xsl	2012-11-02 06:39:33 +0000
+++ hr_attendance/report/timesheet.xsl	2012-11-05 10:00:15 +0000
@@ -60,25 +60,25 @@
     <xsl:template match="user">
         <spacer length="1cm" />
         <para style="emp">
-            <b>Employee: </b>
+            <b t="1">Employee: </b>
             <i><xsl:value-of select="name" /></i>
         </para>
         <spacer length="0.5cm" />
         <xsl:for-each select="week">
             <blockTable colWidths="8cm,2cm,2cm,2cm,2cm,2cm,2cm,2cm,2cm" style="week">
                 <tr>
-                    <td>From <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
-                    <td>Mon</td>
-                    <td>Tue</td>
-                    <td>Wed</td>
-                    <td>Thu</td>
-                    <td>Fri</td>
-                    <td>Sat</td>
-                    <td>Sun</td>
-                    <td>Total</td>
+                    <td t="1">From <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
+                    <td t="1">Mon</td>
+                    <td t="1">Tue</td>
+                    <td t="1">Wed</td>
+                    <td t="1">Thu</td>
+                    <td t="1">Fri</td>
+                    <td t="1">Sat</td>
+                    <td t="1">Sun</td>
+                    <td t="1">Total</td>
                 </tr>
                 <tr>
-                    <td>Worked hours</td>
+                    <td t="1">Worked hours</td>
                     <td>
                         <xsl:choose>
                             <xsl:when test="Monday/workhours">