lp:~camptocamp/hr-timesheet/7.0-port-hr_timesheet_holidays

Branch merges

Propose for merging

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

Alexandre Fayolle - camptocamp: Approve (code review, no test) on 2014-04-17

Joël Grand-Guillaume @ camptocamp: Approve (code review, no tests) on 2013-11-15

Stefan Rijnhart (Opener): Approve (code review) on 2013-11-11

Maxime Chambreuil (http://www.savoirfairelinux.com): Needs Fixing on 2013-06-22

Nicolas Bessi - Camptocamp: Pending (credentials) requested 2013-07-23

Diff: 807 lines (+303/-307)

9 files modified

hr_timesheet_holidays/__init__.py (+16/-24)
hr_timesheet_holidays/__openerp__.py (+61/-46)
hr_timesheet_holidays/company.py (+21/-35)
hr_timesheet_holidays/company_view.xml (+15/-15)
hr_timesheet_holidays/hr_holidays.py (+21/-34)
hr_timesheet_holidays/hr_holidays_view.xml (+31/-33)
hr_timesheet_holidays/wizard/__init__.py (+16/-24)
hr_timesheet_holidays/wizard/holidays_import.py (+88/-61)
hr_timesheet_holidays/wizard/holidays_import_view.xml (+34/-35)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1235564: fails to import holidays into timesheet

Undecided

In Progress

Link a bug report

Related blueprints

53. By Yannick Vaucher @ Camptocamp on 2013-12-06

[IMP] __openerp__.py

52. By Yannick Vaucher @ Camptocamp on 2013-07-23

[IMP] hr_timesheet_holidays - make conversion from UTC to consider the timezone of employee when he enter his attendances

51. By Yannick Vaucher @ Camptocamp on 2013-07-23

[IMP] hr_timesheet_holidays - use date and datetime format constant to format times

50. By Yannick Vaucher @ Camptocamp on 2013-07-23

[IMP] hr_timesheet_holidays - use full import path for translation tool

49. By Yannick Vaucher @ Camptocamp on 2013-07-23

[IMP] hr_timesheet_holidays - reorder imports

48. By Yannick Vaucher @ Camptocamp on 2013-07-23

[IMP] hr_timehseet_holidays - remove +x right on files

47. By Yannick Vaucher @ Camptocamp on 2013-05-13

[IMP] use full path for import of osv

46. By Yannick Vaucher @ Camptocamp on 2013-05-02

[IMP] hr_timesheet_holidays - retab xml files

45. By Yannick Vaucher @ Camptocamp on 2013-05-02

[IMP] hr_timesheet_holidays - update license

44. By Yannick Vaucher @ Camptocamp on 2013-05-02

[IMP] hr_timesheet_holidays - use orm.Model and orm.TransientModel insetead of aliases osv and osv_memory