b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
1953aa442f
[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
...
bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
2014-05-07 17:33:48 +02:00
fab9da65d9
[MERGE] [FIX] hr: when duplicating an employee or user, do not duplicate the reference to other employees (opw 607313)
...
bzr revid: mat@openerp.com-20140505101313-5y72gs2xpgokhxl1
2014-05-05 12:13:13 +02:00
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
c6732c1ba9
[MRG] merge with main barnch
...
bzr revid: avo@tinyerp.com-20140423054749-ubsch2zyr0e0617l
bzr revid: avo@tinyerp.com-20140425115239-w1j8zg1dp0ibzn0a
2014-04-25 17:22:39 +05:30
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
89fd1bede4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
8364a0faab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140418072154-969nr7hzpppvd0mw
2014-04-18 07:21:54 +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
0811d29337
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140409070627-o5ns6nniq2dc1lme
2014-04-09 07:06:27 +00:00
7dc732af6c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140408070758-jpj1hkcbia6f8630
2014-04-08 07:07:58 +00:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
bb8560f779
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140405061904-60l019fp9qbl890t
bzr revid: launchpad_translations_on_behalf_of_openerp-20140406065319-1cr9ypow2w870fbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140407065316-8z3pm4a79uff45z5
2014-04-07 06:53:16 +00:00
8f174e13bd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
2014-04-04 07:07:59 +00:00
4612b417af
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
2014-04-03 06:02:13 +00:00
16ce262c33
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
598cf8d9b3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk
2014-03-28 06:44:40 +00:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
6472e4155a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00:00
2fa6706037
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
1f3c4f852f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
2014-03-20 06:19:44 +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
b201dc79b7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +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
da4cf6d55c
[FIX] override copy method to avoid duplicate child ids
...
lp bug: https://launchpad.net/bugs/1256437 fixed
bzr revid: voraamitr@gmail.com-20140226061623-255kguaytkex9a8m
2014-02-26 11:46:23 +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
faf6d33bc0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
2014-02-13 06:47:42 +00: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
ffabcd257c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
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
2bebb9cd4d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
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
Christophe Simonis
Martin Trigaux
Antony Lesuisse
Fabien Meghazi
Richard Mathot (OpenERP)
Amit Vora
Anael Closson
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
Randhir Mayatra rma-openerp
Sunil Sharma (OpenERP)
Amit Vora (OpenERP)
Thibault Delavallée
Turkesh Patel (Open ERP)