033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
da020d326d
[IMP] hr.department cleanup
...
- Consolidate multiple hr.departement definition into hr.py file
- Remove ulgy department_users_get() domain hack on act_window
- Add the jobs_ids inverse relationship from departement to jobs
bzr revid: al@openerp.com-20140129002913-5qgq10jy9u3xn74e
2014-01-29 01:29:13 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
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
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
5e7fdb5bcc
[MERGE] [IMP] hr: changed some pictures of employees in demo data to avoid copyright issues
...
bzr revid: tde@openerp.com-20140102125858-b2r3mntmj5uu15nl
2014-01-02 13:58:58 +01:00
67e479e96e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
b421d76cdd
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131220144635-qq4vmp1ciw3e5xlw
2013-12-20 15:46:35 +01:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
322e0b9cae
[FIX] hr: posting on the user should not fail when it is
...
not linked to anh employee. In that case, fall back on the previous
behavior that is posting on the partner.
bzr revid: tde@openerp.com-20131217084728-myk234abi9gqwkuq
2013-12-17 09:47:28 +01:00
0a0be4f86c
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131212093234-11xachvlsou862q4
2013-12-12 10:32:34 +01:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
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
1129cc5d39
[FIX] HR Recruitment, numbers
...
bzr revid: fp@openerp.com-20131116095814-xk9wu0mqhxrh847c
2013-11-16 10:58:14 +01:00
46072d92ef
[REVERT] partially reverted wrong change
...
bzr revid: fp@openerp.com-20131111224509-xxpw3qltvib53rhj
2013-11-11 23:45:09 +01:00
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
5bb4fa2b43
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
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
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
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
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
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
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
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
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
dd2dd19b23
[MERGE] Sync with trunk until revision 8934
...
bzr revid: tde@openerp.com-20131007081153-qx4ybltaxbuy3thp
2013-10-07 10:11:53 +02:00
4c84a49afe
[REM] shortcuts, deprecated by browser bookmarks
...
bzr revid: al@openerp.com-20131006131225-jguvkys2ngwsd6er
2013-10-06 15:12:25 +02:00
94887c5cb8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
2013-10-04 10:50:39 +02:00
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
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
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
20b13f39f9
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131002144704-yaccnyj2tzqwhpv1
2013-10-02 16:47:04 +02:00
607de396ba
[MERGE] Sync with trunk, until revision 8927
...
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
4eb30c8485
[IMP]Added demo data for CEO.
...
bzr revid: bth@tinyerp.com-20130926113726-xj0h1s735zkdmh91
2013-09-26 17:07:26 +05:30
78101abec8
[IMP]Add demo data.
...
bzr revid: bth@tinyerp.com-20130924124809-r83vfpz47g2vkmlq
2013-09-24 18:18:09 +05:30
fa502fd9bd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130924063729-1k9xlx0630vx6is5
2013-09-24 06:37:29 +00:00
33d4043db7
[IMP]Improved pager and demo data.
...
bzr revid: bth@tinyerp.com-20130920133436-chpevvov0ibsufgc
2013-09-20 19:04:36 +05:30
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
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
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
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
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
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
cb8f9c5a0d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
465fe64e05
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20130902155912-owcuzj2e4orkpaqr
2013-09-02 17:59:12 +02:00
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
55024350df
[MERGE] Merged with main branch
...
bzr revid: mansi.mk.179@gmail.com-20130822114606-0wi2fnxc7j4hfdwj
2013-08-22 17:16:06 +05:30
56196aba4a
[MERGE] [IMP] hr: demo data improvement
...
bzr revid: tde@openerp.com-20130821130758-ypk2jyxlgg3kw1uf
2013-08-21 15:07:58 +02:00
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
Antony Lesuisse
Launchpad Translations on behalf of openerp
Thibault Delavallée
Stephane Wirtel
Martin Trigaux
Christophe Matthieu
Christophe Simonis
Fabien Pinckaers
Olivier Dony
Denis Ledoux
bth-openerp
Mansi Kariya (OpenERP Trainee)