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 |
|
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 |
|
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
|
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
|
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 |
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 |
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 |
|
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
|
58907da3ee
|
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116051828-hd2t5q9ysbk5wm3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119052609-764otsas6xg8r8a2
|
2014-01-19 05:26:09 +00:00 |
|
Gery Debongnie
|
00c6d55ac9
|
[MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
|
2014-01-16 15:43:26 +01:00 |
Thibault Delavallée
|
9cf78e93cc
|
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
|
2014-01-16 11:39:10 +01:00 |
|
jke-openerp
|
46b0c7aa00
|
[REF] Rename model crm.meeting into calendar.event
Remove 2 unsused field from calendar.event model (dir,sequence)
bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
|
2014-01-15 10:38:05 +01:00 |
|
jke-openerp
|
0072915549
|
[MERGE] Merge with trunk
bzr revid: jke@openerp.com-20140114135240-c7r0ma18f1ls2yae
|
2014-01-14 14:52:40 +01:00 |
Stephane Wirtel
|
0aadcf42c9
|
[FIX] hr_holidays: Reverse previous patch with the warning
bzr revid: stw@openerp.com-20140114114559-ri5ts0vgv2vmyfth
|
2014-01-14 12:45:59 +01:00 |
|
jke-openerp
|
facb8547db
|
[MERGE] Merge with trunk
bzr revid: jke@openerp.com-20140113193830-igvzvf8gsic5okm8
|
2014-01-13 20:38:30 +01:00 |
|
jke-openerp
|
5626a5a391
|
[REF] Removing the quick create overriding for hr_holiday - that was a test/sample not used
bzr revid: jke@openerp.com-20140113174701-nmvtarylf19d63nx
|
2014-01-13 18:47:01 +01:00 |
|
Stephane Wirtel
|
e091efecb8
|
[FIX] hr_holidays: Use osv.except_osv instead exceptions.Warning, because
Warning does not inherit from osv.except_osv and this exception is not catched
by the system.
bzr revid: stw@openerp.com-20140113162727-5au3iimfz4d1mszw
|
2014-01-13 17:27:27 +01:00 |
|
Thibault Delavallée
|
49c0b7a820
|
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
|
2014-01-06 14:57:00 +01:00 |
|
jke-openerp
|
ecca2f99c3
|
[Merge] Merge With Trunk
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
|
2014-01-06 09:20:30 +01:00 |
|
Gery Debongnie
|
9dfb5de2f8
|
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
|
2013-12-26 14:26:25 +01:00 |
|
Gery Debongnie
|
bb5a2662c8
|
[IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_holidays)
bzr revid: ged@openerp.com-20131224102813-l818l4lp6ml5164i
|
2013-12-24 11:28:13 +01:00 |
|
Thibault Delavallée
|
1aa92dbc46
|
[FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958)
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
|
2013-12-20 17:55:19 +01:00 |
|
Denis Ledoux
|
1508c5dd00
|
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
|
2013-12-24 12:24:07 +01:00 |