odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
88,748 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

1698 Commits

Author SHA1 Message Date
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Martin Trigaux 583fe74ba2 Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6) 2014-05-14 10:37:54 +02:00
Martin Trigaux 8ea4f581ed Forward-port of latest 7.0, up to rev. 10046 (rev-id: launchpad_translations_on_behalf_of_openerp-20140514062049-vjclnuxlkbto0tsj) 2014-05-14 10:04:16 +02:00
Martin Trigaux c636fb9dd9 [FIX] hr_holidays: better display of leave counter (opw 605016) 
The number of leave requests left is based on the employee_id key in the context, when displaying the status of an hr.holidays we don't have the information in the name_get of the hr.holidays.status.
The fallback on the number of employees is done with the uid but we can not rely on it as well as the name_get on m2o field is done with superuser_id.

bzr revid: mat@openerp.com-20140508124946-ttyr84iajg9q6l0y
 2014-05-08 14:49:46 +02:00
Gery Debongnie cc041c516a [FIX] code cleanup (addon hr_holidays) 
improves th _leaves_count method, and remove an useless one2many field
(leaves_ids)

bzr revid: ged@openerp.com-20140507083556-rqm5sllj8fc3qfev
 2014-05-07 10:35:56 +02:00
Kersten Jeremy 868f54780e [MERGE] Merge with trunk-cal-V8-jke. - Change field datetime into date or datetime according to that event type is in all day or not... 
bzr revid: jke@openerp.com-20140505162422-k332rm7j21af5ore
 2014-05-05 18:24:22 +02:00
Kersten Jeremy 6d00292064 [REF] Replace temp name by real name 
bzr revid: jke@openerp.com-20140505154246-8vahdzf60oiksm62
 2014-05-05 17:42:46 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
 2014-05-02 15:07:53 +02:00
Kersten Jeremy ed6bc9f198 [MERGE] Merge with trunk 
bzr revid: jke@openerp.com-20140502123149-4g7d7xh07i5z9dct
 2014-05-02 14:31:49 +02:00
Kersten Jeremy d9c3c175bd [REF] Calendar refactoring - Manage allday in date field and not datetime. 
bzr revid: jke@openerp.com-20140430093613-3tdn2tfiwshcahbz
 2014-04-30 11:36:13 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream 
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
 2014-04-29 17:41:04 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk 
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
 2014-04-29 14:44:52 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
 2014-04-29 10:19:37 +02:00
Launchpad Translations on behalf of openerp fdfcb6bf47 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
 2014-04-29 06:41:21 +00:00
Fabien Meghazi 98302fca76 [REM] Removed globs from manifest in order to automate bundlification 
bzr revid: fme@openerp.com-20140424122621-1smlpr1r7izuw369
 2014-04-24 14:26:21 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00:00
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
 2014-04-17 18:53:29 +05:30
Gery Debongnie f57b767361 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
 2014-04-15 17:01:46 +02:00
Gery Debongnie 8135812d34 [FIX] moves the field definitions of models hr.job and hr.employee that should have been in submodules to their correct place (in hr_something) to avoid dependencies problems (addons hr, hr_*) 
bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
 2014-04-15 12:54:19 +02:00
Randhir Mayatra rma-openerp c399e1daaf [MERGE] merge with latest trunk and resolve conflicts 
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
 2014-04-14 16:31:49 +05:30
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch 
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
 2014-04-10 16:51:31 +02:00
Launchpad Translations on behalf of openerp 0811d29337 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140409070627-o5ns6nniq2dc1lme
 2014-04-09 07:06:27 +00:00
Randhir Mayatra rma-openerp 9dbaa58694 [MERGE] merge with latest trunk 
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
 2014-04-07 15:54:40 +05:30
Launchpad Translations on behalf of openerp 1d965535b0 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140405053045-3cts3jqyeqsu0x57
 2014-04-05 05:30:45 +00:00
Launchpad Translations on behalf of openerp 8f174e13bd Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
 2014-04-04 07:07:59 +00:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
 2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Yogesh Parekh (OpenERP) 3897de56b7 [IMP]: Convert buttons into stat buttons in hr modules 
bzr revid: ypa@tinyerp.com-20140326120056-qqauj7pmhf0uxhuj
 2014-03-26 17:30:56 +05:30
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6 
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
 2014-03-11 15:52:05 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
 2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
 2014-03-04 07:52:38 +00:00
Sunil Sharma (OpenERP) dd4813e360 [mrg]:lp:openobject-addons 
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
 2014-03-04 12:09:37 +05:30
Kersten Jeremy f87524a257 [FIX] Set event from hr_holiday with a class confidential by default. 
bzr revid: jke@openerp.com-20140225213121-hyz46xpsiqtao18o
 2014-02-25 22:31:21 +01:00
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
 2014-02-17 06:03:28 +00:00
Denis Ledoux 6185dbf5a2 [FIX]hr_hodlidays: date_from and date_to are required only if leave request, not if leave alloc 
bzr revid: dle@openerp.com-20140211154827-d1529gkf30e57wz5
 2014-02-11 16:48:27 +01:00
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts. 
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
 2014-02-10 14:18:03 +05:30
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
 2014-02-04 06:48:35 +00:00
Olivier Dony 74ce50fe6e [FIX] hr.holidays test: adapt assertRaises due to constraint validation change in server 
See revision odo@openerp.com-20140130094337-7g8ez92viwmbzbft in server

bzr revid: odo@openerp.com-20140130182351-m8mwjz4pbglm8af7
 2014-01-30 19:23:51 +01:00
Sunil Sharma (OpenERP) a267d86b29 [rem,imp]:hr:remove hr dashboard and improve hr view 
bzr revid: sunilsharma.sharma07@gmail.com-20140130064923-35tvo8q3sy4n09vx
 2014-01-30 12:19:23 +05:30
Antony Lesuisse 033c38c304 [MERGE] trunk 
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
 2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v 
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
 2014-01-28 18:58:35 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
 2014-01-28 06:41:39 +00:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates 
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
 2014-01-27 17:09:46 +01:00
Gery Debongnie 9cd84a5834 [IMP] replace the Leaves analysis views in reporting by the new pivot graph view (addon hr_holidays) 
bzr revid: ged@openerp.com-20140127103408-8a1fi88gdhl2sud5
 2014-01-27 11:34:08 +01:00
Launchpad Translations on behalf of openerp 805d3757e9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
 2014-01-23 05:57:32 +00:00
Launchpad Translations on behalf of openerp d5bc07f898 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
 2014-01-22 06:13:35 +00:00
Gery Debongnie 2bdf3039d0 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140121142943-tuqsdpf6wax7fuqv
 2014-01-21 15:29:43 +01:00
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
 2014-01-21 06:20:40 +00:00
Launchpad Translations on behalf of openerp 28d79433c3 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
 2014-01-20 05:59:55 +00:00