Commit Graph

890 Commits

Author SHA1 Message Date
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
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +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 52615b9d12 [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon hr_evaluation)
bzr revid: ged@openerp.com-20140102105455-1v3ututqhersh0hp
2014-01-02 11:54:55 +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 48196bcad5 [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_evaluation)
bzr revid: ged@openerp.com-20131224102758-nrt1i8kv6y1bpl21
2013-12-24 11:27:58 +01:00
jke-openerp eeb4e9629f [TYPO] Replace base_calendar to calendar in csv security
bzr revid: jke@openerp.com-20131219160620-kcjrqv0uald99qqe
2013-12-19 17:06:20 +01:00
jke-openerp dd285d23af [TYPO] Rename base_calendar into calendar
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
Martin Trigaux 0a0be4f86c [MERGE] sync with trunk
bzr revid: mat@openerp.com-20131212093234-11xachvlsou862q4
2013-12-12 10:32:34 +01:00
Launchpad Translations on behalf of openerp 17fe569269 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119052725-2fcjekn5ouumctna
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120052525-2pwf2q3wdcrbqics
2013-11-20 05:25:25 +00:00
Launchpad Translations on behalf of openerp 6f10f3ae24 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116054548-3p5ym1d6w40ctn2i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117052157-8zpcgl9vc9s80s5c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118052246-2yk6opkjie1zcpw1
2013-11-18 05:22:46 +00:00
Martin Trigaux 20b13f39f9 [MERGE] sync with trunk
bzr revid: mat@openerp.com-20131002144704-yaccnyj2tzqwhpv1
2013-10-02 16:47:04 +02:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Martin Trigaux f3e00b8c17 [MERGE] sync with trunk
bzr revid: mat@openerp.com-20130702095014-boktf79ocopibi0t
2013-07-02 11:50:14 +02:00
Antony Lesuisse fc70550ca2 [IMP] move html module description and icon
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
Martin Trigaux ad78a1b6aa [MERGE] sync with latest trunk
bzr revid: mat@openerp.com-20130621075406-d9syftu04k8iytcz
2013-06-21 09:54:06 +02:00
Thibault Delavallée 48071be570 [MERGE] Merged branch holding addons-30 misc improvement. FP-style merge for testing purpose.
bzr revid: tde@openerp.com-20130613105923-xt7rvj0n3n3egvzj
2013-06-13 12:59:23 +02:00
Martin Trigaux aae3a5dd27 [MERGE] latest sync
bzr revid: mat@openerp.com-20130606114122-vkho79a8wm3grwv7
2013-06-06 13:41:22 +02:00
Xavier Morel 7a2d912964 [REM] bunch of nonsensical @model + @ref
bzr revid: xmo@openerp.com-20130429124333-p1h11fpy04y3sljy
2013-04-29 14:43:33 +02:00
Martin Trigaux 2dbfe49d73 [MERGE] Latest trunk
bzr revid: mat@openerp.com-20130418080838-itvi6nxxzddk3dqo
2013-04-18 10:08:38 +02:00
Vishmita Jadeja (openerp) e078eeeebe [Merge]Merge lp:openobject-addons
bzr revid: vja@tinyerp.com-20130418074044-xlxquhnls1tccv5g
2013-04-18 13:10:44 +05:30
Martin Trigaux 0b0c24a636 [REF] moving to only hr_gamification module
bzr revid: mat@openerp.com-20130416124558-p40tkw8mgr4e7v04
2013-04-16 14:45:58 +02:00
Martin Trigaux 0222ae2a21 [IMP] better data
bzr revid: mat@openerp.com-20130415155014-y6bdafhnmb5g7kqj
2013-04-15 17:50:14 +02:00
Martin Trigaux d02eed5d36 [IMP] compute with python for goals
bzr revid: mat@openerp.com-20130415145743-mme15smubk14dvg4
2013-04-15 16:57:43 +02:00
Martin Trigaux 7b8b0ed467 [IMP] adding features
bzr revid: mat@openerp.com-20130415140401-qzg3f0lz2i9b6kki
2013-04-15 16:04:01 +02:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Martin Trigaux c7edf72350 [IMP] gamification officer rules
bzr revid: mat@openerp.com-20130412092603-aotk0y53snjz9c9i
2013-04-12 11:26:03 +02:00
Martin Trigaux 28761467fc [IMP] better UI
bzr revid: mat@openerp.com-20130411151132-vsk2cnff5uhqmzas
2013-04-11 17:11:32 +02:00
Martin Trigaux f70b0017f6 [IMP] fixing and UI
bzr revid: mat@openerp.com-20130410101454-nkt8mbt8qb13zrge
2013-04-10 12:14:54 +02:00
Martin Trigaux 1a5ae7f32e [IMP] better UI
bzr revid: mat@openerp.com-20130408141132-or43mhdl8d5ds7xb
2013-04-08 16:11:32 +02:00
Martin Trigaux 32b523c1d6 [IMP] better UI
bzr revid: mat@openerp.com-20130408131729-lhlv0mhss502j9m1
2013-04-08 15:17:29 +02:00
Martin Trigaux 8c07975c91 [IMP] security rules
bzr revid: mat@openerp.com-20130408101940-syg67y7nx3hw12gg
2013-04-08 12:19:40 +02:00
Launchpad Translations on behalf of openerp 086b844df5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330052753-vptpgl8jh0zxx2zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331052801-af1yzruwutw4ce3b
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401050658-9x864eerp9tph8ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403052653-u7naqcrqgxv41q33
2013-04-03 05:26:53 +00:00
Martin Trigaux 3d0919c129 [MERGE] Latest trunk
bzr revid: mat@openerp.com-20130402072223-5ppqigavgtrpfv6n
2013-04-02 09:22:23 +02:00
Martin Trigaux e20bd7b0b9 [MERGE] Latest trunk
bzr revid: mat@openerp.com-20130329080505-1hoab0tsa6y6x827
2013-03-29 09:05:05 +01:00
Vo Minh Thu 9b0ced610f [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130322134958-jhe6m0222jq7wo41
2013-03-22 14:49:58 +01:00
Martin Trigaux dd3a7966bd [FIX] hr manager can see related goal menu
bzr revid: mat@openerp.com-20130320084540-ik7vl3irshbyo5bk
2013-03-20 09:45:40 +01:00
Martin Trigaux 4f723dba7f [IMP] menu and group by
bzr revid: mat@openerp.com-20130318150007-egx399cn4nybu7s8
2013-03-18 16:00:07 +01:00
Martin Trigaux 2027261af8 [MERGE] Latest trunk
bzr revid: mat@openerp.com-20130318085216-ylvrelq6q6mjm0qd
2013-03-18 09:52:16 +01:00
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Quentin (OpenERP) d0f5b28bd0 [MERGE] merge with main trunk branch to get last translations from launchpad
bzr revid: qdp-launchpad@openerp.com-20130315103116-lxj96usw3ipd11z5
2013-03-15 11:31:16 +01:00
Martin Trigaux 8b6cdd23a3 [MERGE] Latest trunk
bzr revid: mat@openerp.com-20130315093059-i9iaaplp1erf4ac3
2013-03-15 10:30:59 +01:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Martin Trigaux 95c244d35a [ADD] gamification: security rules
bzr revid: mat@openerp.com-20130313095154-b5wi1ohu0wo6hz5w
2013-03-13 10:51:54 +01:00
Launchpad Translations on behalf of openerp c5319f47f7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053740-hrhdafa05mp0s6cd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051349-azaf8kb3hdi6ux85
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054204-8yc0hga0v6pkk36x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053843-8x3181swnc2x0rim
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051523-z6034cfpv1qbztzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054303-38ti3nq1h5jfbasa
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053849-8eqsc9sjxknzfha8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051527-tajzx0x6p7mzpg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054307-qgl6ao1a06b9an3a
2013-03-11 05:43:07 +00:00
Launchpad Translations on behalf of openerp cc87ba5db7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308052354-6aerviht20qnfh26
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060553-lujyj3qxhqljssu0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060749-69tgopwkctb0v5ei
2013-03-08 06:07:49 +00:00