Merge lp:~matt454357/openobject-addons/7.0-timesheet_timezone_fix into lp:openobject-addons/7.0
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~matt454357/openobject-addons/7.0-timesheet_timezone_fix | ||||
Merge into: | lp:openobject-addons/7.0 | ||||
Diff against target: |
140 lines (+50/-20) (has conflicts) 1 file modified
hr_timesheet_sheet/hr_timesheet_sheet.py (+50/-20) Text conflict in hr_timesheet_sheet/hr_timesheet_sheet.py |
||||
To merge this branch: | bzr merge lp:~matt454357/openobject-addons/7.0-timesheet_timezone_fix | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+219614@code.launchpad.net |
Description of the change
Issue 1: _default_
Issue 2: _get_hr_
Issue 3: View "hr_timesheet_
Unmerged revisions
- 9758. By Matt Taylor
-
[FIX] hr_timesheet_
sheet.py - shift dates to user time zone