lp:~openerp-dev/openobject-addons/saas-3-hr-leave-count-correct-mba

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~openerp/openobject-addons/saas-3

Thibault Delavallée (OpenERP): Pending requested 2014-03-12

Diff: 146 lines (+64/-36)

1 file modified

hr_holidays/hr_holidays.py (+64/-36)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9298. By Darshan Kalola(OpenERP) on 2014-05-08

[MERGE]sync with lp:~openerp/openobject-addons/saas-3.

9297. By Mahendra Barad(OpenERP) on 2014-03-13

[Merge]with saas-3

9296. By Mahendra Barad(OpenERP) on 2014-03-11

[FIX]legal leave count for different employee

9295. By jke-openerp on 2014-03-11

[TYPO] Typo in calendar template

9294. By Christophe Matthieu (OpenERP) on 2014-03-10

[FIX] website_sale: grid view remove rowspan if colspan=4

9293. By Christophe Simonis (OpenERP) on 2014-03-10

[FIX] point_of_sale: use correct method to redirect to login page

9292. By Christophe Matthieu (OpenERP) on 2014-03-10

[FIX] website_sale: resize big image if size 1x1 for loading faster; (don't use image_medium who break some layout customisation like 'image full'

9291. By Denis Ledoux (OpenERP) on 2014-03-10

[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:<email address hidden>

9290. By jke-openerp on 2014-03-10

[IMP] Add condition in calendar_event to avoid to send email to oneself

9289. By Denis Ledoux (OpenERP) on 2014-03-10

[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9142 revid:<email address hidden>