lp:~openerp-dev/openobject-addons/trunk-hr-leave-count-correct-dka

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-05-08

Diff: 145 lines (+63/-36)

1 file modified

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

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

[MERGE]sync with trunk.

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

[CLEAN]remove variable which is used only once.

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

[MERGE]with lp:~openerp-dev/openobject-addons/saas-3-hr-leave-count-correct-mba.

9426. By Launchpad Translations on behalf of openerp on 2014-05-08

Launchpad automatic translations update.

9425. By Quentin (OpenERP) <email address hidden> on 2014-05-07

[REV] partial revert of revision 9408 <email address hidden> where we wrongly beleive than stock depends on crm_claim... :( That code will probably be back _in the right module_

9424. By Fabien Meghazi (OpenERP) on 2014-05-07

[REM] completetly removed website#preprocess_request()

9423. By Christophe Simonis (OpenERP) on 2014-05-07

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

9422. By Fabien Meghazi (OpenERP) on 2014-05-07

[REM] QWeb does not self close empty divs anymore

See web Rev#4011

9421. By Antony Lesuisse (OpenERP) on 2014-05-07

[MERGE] trunk-websit-al-refactor by chm
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request

9420. By Géry Debongnie on 2014-05-07

Large cleanups in addons

The code I merged in my branch stat buttons was sadly not up to our
standing... This branch improves the situation by removing harmful
try/excpet/pass statements, by using search_count when appropriate, by
removing unused one2many fields and by correcting some bugs