e4fdd85424
[FIX] hr,mail: correct remove of suggestions.
2014-11-06 17:41:44 +01:00
a9d2b65da5
[MERGE] Fwd-port 7.0 up to 783b9e1
2014-07-11 11:51:06 +02:00
117a26babe
[FIX] hr: call hr_employee super's when unlinking
...
Also fixes some weird inheritance bugs in upper versions
2014-07-11 11:41:17 +02:00
3c0292645f
[MERGE] Forward-port of 7.0 bugfixes up to 63ea0df73f
2014-06-16 17:37:10 +02:00
f9fc9fdf1c
[FIX] hr: working and home adresses should not be customers by default, only 'normal' adresses.
2014-06-13 09:07:28 +02:00
e95545dcf0
[FIX] hr: typo in a field definition
2014-06-12 17:32:32 +02:00
30f43daa3b
[MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826
2014-05-27 16:50:02 +02:00
4c36ee0b59
Restore missed images during bzr to git transition
2014-05-23 10:11:25 +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
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
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
8364a0faab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140418072154-969nr7hzpppvd0mw
2014-04-18 07:21:54 +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
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
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
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
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
faf6d33bc0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
2014-02-13 06:47:42 +00:00
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
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
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
e0951d6e18
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00: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
d23b68540b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131218055330-dvkrpp97rqo7gcf2
2013-12-18 05:53:30 +00: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
379dc8bf98
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
1fedbc18f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00: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
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
b1f8f3dfd2
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060235-8k2oxuc94x45jjoc
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060308-lb2sgcxbv804pafr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062541-ouuae0dl331ekjcb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054520-eypowk6g8qatvq7n
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054421-95x86930ezm0p33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063904-5igv5f7tgwlaipvv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060313-x4c5bx498gyrkhqr
2013-11-22 06:03:13 +00:00
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Christophe Simonis
Olivier Dony
Richard Mathot
Denis Ledoux
Thibault Delavallée
Martin Trigaux
Christophe Simonis
Amit Vora
Anael Closson
Launchpad Translations on behalf of openerp
Amit Vora (OpenERP)
Antony Lesuisse
Stephane Wirtel
Christophe Matthieu