lp:~laetitia-gangloff/hr-timesheet/update_with_rev_9235

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hr-core-editors/hr-timesheet/7.0 at revision 48

Guewen Baconnier @ Camptocamp: Approve (code review, no test) on 2013-07-22

Stéphane Bidoul (Acsone) (community): Approve on 2013-07-16

Diff: 12 lines (+1/-1)

1 file modified

hr_timesheet_task/static/src/js/timesheet.js (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

46. By Laetitia Gangloff (Acsone) on 2013-07-03

hr_timesheet_task : update timesheet.js with update of the revision 9235 / compute amount field for timesheets

45. By Yannick Vaucher @ Camptocamp on 2013-06-22

[MERGE]

44. By Lorenzo Battistini on 2013-06-21

[MERGE] Add hr_attendance_analysis

43. By Nhomar - Vauxoo on 2013-06-19

[MERGE]
From the author comments.
- Add a module to sort timesheet lines by date and account name instead of the dummy id sorting.

- Change default date for manually entering attendances to last date instead of now.

- Redefines constraint on attendances to check only the sheet the attendance belongs to.

42. By Laetitia Gangloff (Acsone) on 2013-05-13

[IMP] timesheet_task: add constraint to check if task belongs to project
[IMP] hr_timesheet_task: update account domain with ('state','=','open')
 instead of ('state','<>','close')

------------ This line and the following will be ignored --------------

modified:
  hr_timesheet_task/hr_analytic_timesheet_view.xml
  hr_timesheet_task/static/src/js/timesheet.js
  timesheet_task/project_task.py
  timesheet_task/project_task_view.xml
pending merges:
  Laetitia Gangloff 2013-05-13 timesheet_task: remove unused variable proj...
    Laetitia Gangloff 2013-04-24 timesheet_task: reset user column invis...
    Laetitia Gangloff 2013-04-10 hr_timesheet_task: update account domai...
    Laetitia Gangloff 2013-04-10 timesheet_task: add constraint to check...
    Laetitia Gangloff 2013-04-10 timesheet_task: add user column in task...

41. By Laetitia Gangloff (Acsone) on 2013-04-10

[MIGR] timesheet_task: migration V7

40. By Joël Grand-Guillaume @ camptocamp on 2012-12-21

[MRG] [MIGR] migration of hr_timesheet_reminder to OpenERP v7

39. By Joël Grand-Guillaume @ camptocamp on 2012-12-21

[MRG] [MIGR] migration of hr_timesheet_print to OpenERP 7.0

38. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[MIGR] set installable to False on all the modules, the flag has to be reactivated when the modules are migrated

37. By Stéphane Bidoul (Acsone) on 2012-10-26

timesheet_task: enforce consistency in timesheets when changing a task's project
(lp:c2c-addons/6.1 rev 117.1.1)