7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
e3ecf7f4d4
[FIX] en_US typos - opw 606919
...
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
edf0f26d59
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319055226-bk4bs5tp612t236j
2014-03-19 05:52:26 +00:00
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
dd4813e360
[mrg]:lp:openobject-addons
...
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
2014-03-04 12:09:37 +05:30
79a0a10f93
[MERGE] [IMP] hr: broadcast the welcome message only for new employee coming
...
from the recruitment, not all created employees.
Before this merge, every created employee was broadcasted to all existing users
of the same company. However when creating a batch of employees, for example
when configuring an new openerp instance, this was creating a lot of noise
in the inboxes.
Now, only recruited employee have a welcome message.
bzr revid: tde@openerp.com-20140218162958-2rr967jh9zu2spwe
2014-02-18 17:29:58 +01:00
49351f6edb
[IMP] create new method to broadcast message to employess in hr.
...
bzr revid: tpa@tinyerp.com-20140212111238-3b3ddlwl3062fjef
2014-02-12 16:42:38 +05:30
6d17db2101
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140212104340-0vv22hxz3fdhy1dy
2014-02-12 16:13:40 +05:30
8b6bea01ed
[FIX] hr: demo data: removed color definition as this field is defind in hr_recruitment, not in hr
...
bzr revid: tde@openerp.com-20140211120551-y5e4oyb3lkalx6l8
2014-02-11 13:05:51 +01:00
610ebaef85
[CLEAN] hr: moved color field + an action in hr_recruitment, because they are used in this module + removed unnecessary code
...
bzr revid: tde@openerp.com-20140211120433-f34jsy7xjga1ultt
2014-02-11 13:04:33 +01:00
87f9c85330
[CLEAN] hr: cleaned job form view, removing unnecessary groups, also changed
...
displayed number of employees (display current number + expected, not the
contraty). Updated hr_recruitment accordingly.
bzr revid: tde@openerp.com-20140210171511-z5277t6ilnvnc48d
2014-02-10 18:15:11 +01:00
923028c4db
[CLEAN] hr: review and cleaning before merging
...
- hr.py: small cleaning of job code + method renaming + context propagation + compat-mode for
method renaming
- hr_view: job_id on employee form is no longer 'no_open', because otoherwise it is impossible
to see jobs. Removed simplified form for job. Better form for job, recruitmnet-related stuff
is invisible when job is 'open'.
bzr revid: tde@openerp.com-20140210161326-c9qqff69squehg9v
2014-02-10 17:13:26 +01:00
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
f94df0e389
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140210072100-p3ry9oq4eklwt9k0
2014-02-10 12:51:00 +05:30
181aee3c50
[IMP] as per TDE's suggetion dont move code of posting message in hr_recruitment just do it based on context key
...
bzr revid: tpa@tinyerp.com-20140205060500-v70n8oy9rm1dflwf
2014-02-05 11:35:00 +05:30
130dac62e8
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140205052603-296obc5otpu72fsu
2014-02-05 10:56:03 +05:30
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
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
c6da530f74
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140103124356-sjj04kuc628xid5k
2014-01-03 18:13:56 +05:30
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
3c319e5de8
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20131227053935-lw3bje9naq44g2nt
2013-12-27 11:09:35 +05:30
584a7b27f2
[IMP] improved code, remove unneccesary changes and convert application_count function field to one2many field.
...
bzr revid: tpa@tinyerp.com-20131224072224-b7gq9z4mqhyh7540
2013-12-24 12:52:24 +05:30
aae1585eb8
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20131224053704-43mqjcl7j0pwx85t
2013-12-24 11:07:04 +05:30
50d67b6461
[IMP] post welcome employee message only if employee created from applicant.
...
bzr revid: tpa@tinyerp.com-20131223102329-147mo4x9o1mc59lq
2013-12-23 15:53:29 +05:30
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
982549b31a
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20131126124206-gw02bnwnerl5dzrv
2013-11-26 18:12:06 +05:30
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
Antony Lesuisse
Fabien Meghazi
Richard Mathot (OpenERP)
Christophe Simonis
Anael Closson
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
Randhir Mayatra rma-openerp
Sunil Sharma (OpenERP)
Thibault Delavallée
Turkesh Patel (Open ERP)
Stephane Wirtel
Martin Trigaux
Christophe Matthieu
Fabien Pinckaers