Merge lp:~openerp-dev/openobject-addons/trunk-opw-577041-port-mma into lp:openobject-addons
Proposed by
Mayur Maheshwari(OpenERP)
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-opw-577041-port-mma |
Merge into: | lp:openobject-addons |
Diff against target: |
64 lines (+16/-12) 2 files modified
hr_attendance/report/timesheet.py (+5/-1) hr_attendance/report/timesheet.xsl (+11/-11) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-opw-577041-port-mma |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+132856@code.launchpad.net |
Description of the change
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
To post a comment you must log in.
Unmerged revisions
- 7952. By Mayur Maheshwari(OpenERP)
-
[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
-
Launchpad automatic translations update.
- 7950. By Fabien (Open ERP)
-
[MERGE] fix multi-company for pos
- 7949. By Fabien (Open ERP)
-
[FIX] bug pos
- 7948. By Fabien (Open ERP)
-
[FIX] POS close session without cash register
- 7947. By Fabien (Open ERP)
-
[MERGE] trunk
- 7946. By Fabien (Open ERP)
-
[FIX] POS