lp:~openerp-dev/openobject-addons/trunk-bug-1223230-ssh

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2014-01-21

Diff: 27 lines (+5/-1)

2 files modified

hr_attendance/hr_attendance.py (+4/-0)
hr_attendance/test/attendance_process.yml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1223230: It is possible to import attendances for same day at same time as previous data otherwise not

Low

Fix Committed

Link a bug report

Related blueprints

9060. By Sunil Sharma(OpenERP) on 2014-01-21

[imp]:improve yml test case

9059. By Sunil Sharma(OpenERP) on 2014-01-21

[FIX]:hr_attendance:It is Impossible to same day at same time as more then one sign_in or sign_out

9058. By Christophe Simonis (OpenERP) on 2014-01-20

[IMP] calendar: tell orm to rename old select1 column

9057. By Christophe Simonis (OpenERP) on 2014-01-20

[FIX] edi: /edi/import_edi_url route is a json route

9056. By Raphael Collet (OpenERP) on 2014-01-20

[FIX] calendar: function field of type 'selection' must be given a selection parameter

9055. By Raphael Collet (OpenERP) on 2014-01-20

[FIX] calendar: type of related field should be 'integer', not 'int'

9054. By Launchpad Translations on behalf of openerp on 2014-01-19

Launchpad automatic translations update.

9053. By Launchpad Translations on behalf of openerp on 2014-01-16

Launchpad automatic translations update.

9052. By Christophe Simonis (OpenERP) on 2014-01-15

[MERGE] forward port of branch saas-2 up to revid 9092 <email address hidden>

9051. By jke-openerp on 2014-01-15

[MERGE] Merge with trunk-ren-crmmeeting

This commit replace all occurences of "crm.meeting" into "calendar.event" and "crm_meeting" into "calendar_event".
It remove 2 fields unused from calendar.event model and from the tests.
Add oe_update_date in exclude field, to allow the update of recurrence if field(s) updated are only in this exclu list