Merge lp:~openerp-dev/openobject-addons/6.1-opw-577041-ado into lp:openobject-addons/6.1

[Amit Dodiya (OpenERP)]

Hello,

[FIX] (1) The labels in xsl file is not translated in other language while generating the report of attendace_by_week of employee (2) Attendace per week report is generated blank in web_client due to empty ids passed in create_xml method"

Issues:
1). The report "Attendance Per Week" in Employee form contains some static string comes from xsl file is not translated
2). The report "Attendance Per Week" is generated blank while printing with Web-client.
Stpes:
1). Install hr_attendance module with dutch Language
2). Goto : Human Resources/Human Resources/Employees , Print "Attendance Per Week" report with Web-client and test the above issuess

Regards,
Amit Dodiya

[lp:~openerp-dev/openobject-addons/6.1-opw-577041-ado]

6914. By Amit Dodiya<email address hidden> on 2012-07-25

[FIX] (1) The labels in xsl file is not translated in other language while generating the report of attendace_by_week of employee (1) Attendace per week report is generated blank in web_client due to empty ids passed in create_xml method

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-577041-port-mma/+merge/132856 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6914. By Amit Dodiya<email address hidden> on 2012-07-25

[FIX] (1) The labels in xsl file is not translated in other language while generating the report of attendace_by_week of employee (1) Attendace per week report is generated blank in web_client due to empty ids passed in create_xml method

=== modified file 'hr_attendance/i18n/hr_attendance.pot'
--- hr_attendance/i18n/hr_attendance.pot	2012-02-08 01:08:30 +0000
+++ hr_attendance/i18n/hr_attendance.pot	2012-07-25 04:56:20 +0000
@@ -532,3 +532,62 @@
 msgid "hr.sign.in.out.ask"
 msgstr ""
 
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Name:"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Mon"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Tue"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Wed"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Thu"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Fri"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Sat"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Sun"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Tot"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Week:"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "Worked hours"
+msgstr ""
+
+#. module: hr_attendance
+#: xsl:hr.attendance.allweeks:0
+msgid "from "
+msgstr ""

=== modified file 'hr_attendance/report/timesheet.py'
--- hr_attendance/report/timesheet.py	2011-04-27 13:08:52 +0000
+++ hr_attendance/report/timesheet.py	2012-07-25 04:56:20 +0000
@@ -38,6 +38,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')
 
         start_date = datetime.strptime(datas['form']['init_date'], '%Y-%m-%d')
         end_date = datetime.strptime(datas['form']['end_date'], '%Y-%m-%d')
@@ -49,7 +50,7 @@
 
         user_xml = []
 
-        for employee_id in ids:
+        for employee_id in datas['active_ids']:
             emp = obj_emp.read(cr, uid, [employee_id], ['id', 'name'])[0]
             monday, n_monday = first_monday, first_monday + one_week
             stop, week_xml = False, []
@@ -88,7 +89,10 @@
                             ldt = dt
 
                 # Week xml representation
-                week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.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	2011-01-14 00:11:01 +0000
+++ hr_attendance/report/timesheet.xsl	2012-07-25 04:56:20 +0000
@@ -41,30 +41,30 @@
 
     <xsl:template match="user">
         <para>
-            <b>Name:</b>
+            <b t="1">Name:</b>
             <i><xsl:value-of select="name" /></i>
         </para>
         <blockTable colWidths="4cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm" style="week">
             <tr>
                 <td></td>
-                <td>Mon</td>
-                <td>Tue</td>
-                <td>Wed</td>
-                <td>Thu</td>
-                <td>Fri</td>
-                <td>Sat</td>
-                <td>Sun</td>
-                <td>Tot</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">Tot</td>
             </tr>
             <xsl:for-each select="week">
                 <tr></tr>
                 <tr>
-                    <td>Week:</td>
+                    <td t="1">Week:</td>
                     <td></td>
-                    <td>from <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
+                    <td t="1">from <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
                 </tr>
                 <tr>
-                    <td>Worked hours</td>
+                    <td t="1">Worked hours</td>
                     <td>
                         <xsl:choose>
                             <xsl:when test="Monday/workhours">

=== modified file 'hr_attendance/wizard/hr_attendance_byweek.py'
--- hr_attendance/wizard/hr_attendance_byweek.py	2011-01-14 00:11:01 +0000
+++ hr_attendance/wizard/hr_attendance_byweek.py	2012-07-25 04:56:20 +0000
@@ -38,6 +38,7 @@
         datas = {
              'ids': [],
              'model': 'hr.employee',
+             'active_ids': context['active_ids'],
              'form': self.read(cr, uid, ids)[0]
         }
         return {