Commit Graph
1783 Commits
Author SHA1 Message Date
Christophe Matthieu fd2821086f [MERGE] sync with trunk
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Fabien Pinckaers 1129cc5d39 [FIX] HR Recruitment, numbers
bzr revid: fp@openerp.com-20131116095814-xk9wu0mqhxrh847c
2013-11-16 10:58:14 +01:00
Fabien Pinckaers 46072d92ef [REVERT] partially reverted wrong change
bzr revid: fp@openerp.com-20131111224509-xxpw3qltvib53rhj
2013-11-11 23:45:09 +01:00
Fabien Pinckaers 43af25742e [IMP] some fixes in HR: #employees -> integer not float, forecasted employees is fixed and 'in recruitment' is computed so that it is still correct after doing a new recruitment
bzr revid: fp@openerp.com-20131111203209-cpoqpwsvepkl1elx
2013-11-11 21:32:09 +01:00
Thibault Delavallée 5bb4fa2b43 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
Olivier Dony 5add0d31f3 [IMP] hr.employee: default search should includes work emails (useful e.g. for trigrams)
bzr revid: odo@openerp.com-20131023162807-qjw68383a7612op6
2013-10-23 18:28:07 +02:00
Olivier Dony b1c221e9c4 [FIX] hr: notification about new employee joining should only be sent to employees (base.group_user)
In the future we should directly use the
`Whole Company` mail.group, but this does
not work well enough now, as recipients
will not be able to directly go to the
employee record (e.g. to follow her)

bzr revid: odo@openerp.com-20131023155340-z2e78xo3vb7yq008
2013-10-23 17:53:40 +02:00
Denis Ledoux f2e561afec [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 8960 rev-id: dle@openerp.com-20131018125818-1k168nlo2ferj25w
bzr revid: dle@openerp.com-20131018131007-etdut0wpjqhnexz2
2013-10-18 15:10:07 +02:00
Denis Ledoux a7e05f1af4 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp.com-20131018124037-v3501acvv4fh1077
bzr revid: dle@openerp.com-20131018125818-1k168nlo2ferj25w
2013-10-18 14:58:18 +02:00
Denis Ledoux 1a555475cc [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr
bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
2013-10-18 14:12:36 +02:00
Thibault Delavallée aa34259629 [FIX] hr: fixed priorities of kanban views. Employees see the
kanban view defined for portal users because of priorities all equal to 16.
Now employees see the correct kanban view defined in HR, portal users see
the portal kanban view defined in portal_hr_employees.

bzr revid: tde@openerp.com-20131016092106-pqtjp7tyw27or3ow
2013-10-16 11:21:06 +02:00
Launchpad Translations on behalf of openerp 566af6033f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Launchpad Translations on behalf of openerp 2779496635 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054822-v57c9imyteomp381
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054909-1nmq8z3sk3ao5j0m
2013-10-09 05:49:09 +00:00
Thibault Delavallée dd2dd19b23 [MERGE] Sync with trunk until revision 8934
bzr revid: tde@openerp.com-20131007081153-qx4ybltaxbuy3thp
2013-10-07 10:11:53 +02:00
Antony Lesuisse 4c84a49afe [REM] shortcuts, deprecated by browser bookmarks
bzr revid: al@openerp.com-20131006131225-jguvkys2ngwsd6er
2013-10-06 15:12:25 +02:00
Thibault Delavallée 94887c5cb8 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
2013-10-04 10:50:39 +02:00
Martin Trigaux 11308f37dd [FIX] test: avoid getting error when trying to send an email to the newly created user (email replaced by login)
bzr revid: mat@openerp.com-20131003143234-8tu732aa4rmycoif
2013-10-03 16:32:34 +02:00
Thibault Delavallée 6e042ea147 [CLEAN] website_hr_recruitment: some cleaning in python
Moved write_date column from website_hr_recruitment to hr, because it could be usefull
to have this column directly existing in the model. Other website-related columns remains
in the website module.

Also moved python file into a new models directory; also renamed the file. Please use
correct file name instead of finding a loosely-related file name.

bzr revid: tde@openerp.com-20131003121414-2xd4nab2znfabdjj
2013-10-03 14:14:14 +02:00
Thibault Delavallée 9f0b4bc8c4 [CLEAN] website_hr_recruitment: cleaned indentation in demo file and manifest
Please check your indentation before committing NEW files... it introduces false commits
only to re-indent the content. This should have been done before merging into this branch.

Also cleaned manifest. No need to add dependecies towards already-dependent modules.

bzr revid: tde@openerp.com-20131003113152-667phpsjfxdj7zod
2013-10-03 13:31:52 +02:00
Thibault Delavallée 607de396ba [MERGE] Sync with trunk, until revision 8927
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
bth-openerp 4eb30c8485 [IMP]Added demo data for CEO.
bzr revid: bth@tinyerp.com-20130926113726-xj0h1s735zkdmh91
2013-09-26 17:07:26 +05:30
bth-openerp 78101abec8 [IMP]Add demo data.
bzr revid: bth@tinyerp.com-20130924124809-r83vfpz47g2vkmlq
2013-09-24 18:18:09 +05:30
Launchpad Translations on behalf of openerp fa502fd9bd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130924063729-1k9xlx0630vx6is5
2013-09-24 06:37:29 +00:00
bth-openerp 33d4043db7 [IMP]Improved pager and demo data.
bzr revid: bth@tinyerp.com-20130920133436-chpevvov0ibsufgc
2013-09-20 19:04:36 +05:30
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
bth-openerp beaf87c631 [IMP]Added pager with 5 records, in apply form set alignment,editable description and requirements, lorem ipsum added in job position records for description and requirements field.
bzr revid: bth@tinyerp.com-20130919121003-su51cmrlwwjtrd9l
2013-09-19 17:40:03 +05:30
Martin Trigaux ab7d8c4ccf [MERGE] refactoring of tests to be executed as normal users instead of administrator, fixed some security rules
bzr revid: mat@openerp.com-20130912085812-xvmjoa5fjis0l2ws
2013-09-12 10:58:12 +02:00
Launchpad Translations on behalf of openerp a71caa14d6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130911051954-5q0wh820h5himluq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912071731-lxe3j09ejij11oty
2013-09-12 07:17:31 +00: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
Martin Trigaux c48504fdba [MERGE] sync with trunk (state -> stage removed some test)
bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k
2013-09-11 13:07:55 +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
Launchpad Translations on behalf of openerp dc07d21f86 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053459-k3vf5zjfz0sjn6t6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051935-7croxf3zpoo1cvwk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053520-dpq7ulxrh0e06fd4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051953-hv03d787cy2sc9l4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051959-4r4bun8nvl6neyi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130826051253-70i5qzbp5ttpsmb7
2013-08-26 05:12:53 +00:00
Thibault Delavallée 56196aba4a [MERGE] [IMP] hr: demo data improvement
bzr revid: tde@openerp.com-20130821130758-ypk2jyxlgg3kw1uf
2013-08-21 15:07:58 +02:00
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00
Paramjit Singh Sahota 77ae52d07a [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130813111207-jf55m8flkb0kqvyo
2013-08-13 16:42:07 +05:30
Amit Bhavsar (Open ERP) 028d62c391 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130812121219-4opfk262kgmakvsb
2013-08-12 17:42:19 +05:30
Launchpad Translations on behalf of openerp 8938503a39 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806050505-b7g4j329y0heazos
bzr revid: launchpad_translations_on_behalf_of_openerp-20130807050317-4fh5uqmr02dou5ei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130808045927-gmb38spqpaa9lgoa
2013-08-08 04:59:27 +00:00
Launchpad Translations on behalf of openerp bb90e51a78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130803061336-i8noij4hjz9nxoow
bzr revid: launchpad_translations_on_behalf_of_openerp-20130804053709-rxcnnh17adwk94b4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130805063055-v6y7lrx7lcoemmk0
2013-08-05 06:30:55 +00:00
Thibault Delavallée e0e3d98557 [IMP] mail: refactored check_mail_message_access
bzr revid: tde@openerp.com-20130723144507-bwwegheqofs7x1ox
2013-07-23 16:45:07 +02:00
Launchpad Translations on behalf of openerp 08bf51a608 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130719063647-ajybj58frejzmzi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062338-fgevfrm113ns9ohh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055949-auzq29nv6b2f3o10
2013-07-22 05:59:49 +00:00
Amit Bhavsar (Open ERP) 9ce89b12a9 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130717051958-qpl3u5aoo15au5c2
2013-07-17 10:49:58 +05:30
Christophe Simonis df8d972057 [IMP] */static/description/index.html: link to /start include app name
bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek
2013-07-15 18:25:04 +02:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Paramjit Singh Sahota dd086effd0 [MERGE] Sync with lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130702050754-6w50y566l1ws9zq4
2013-07-02 10:37:54 +05:30
Amit Bhavsar (Open ERP) 98f39f9d22 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130701111430-t5qp9hm97rkmjpsp
2013-07-01 16:44:30 +05:30
sgo@tinyerp.com daec1fa011 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130701090959-ddkktnp3asn6qqj1
2013-07-01 14:39:59 +05:30
Amit Bhavsar (Open ERP) 87443c86e0 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130628102353-3cdcw34d2e2x9c8c
2013-06-28 15:53:53 +05:30
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
Paramjit Singh Sahota a5a676ced9 [MERGE] Sync with lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130628051607-zi0xzbmhe6kly35t
2013-06-28 10:46:07 +05:30