Merge lp:~openerp-dev/openobject-addons/6.1-opw-577041-ado into lp:openobject-addons/6.1
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-addons/6.1-opw-577041-ado |
Merge into: | lp:openobject-addons/6.1 |
Diff against target: |
158 lines (+78/-14) 4 files modified
hr_attendance/i18n/hr_attendance.pot (+59/-0) hr_attendance/report/timesheet.py (+6/-2) hr_attendance/report/timesheet.xsl (+12/-12) hr_attendance/wizard/hr_attendance_byweek.py (+1/-0) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-577041-ado |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Dony (Odoo) | Pending | ||
Naresh(OpenERP) | Pending | ||
Review via email: mp+116427@code.launchpad.net |
Description of the change
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
Unmerged revisions
- 6914. By Amit Dodiya<email address hidden>
-
[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
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