550910a8f6
[MERGE] forward port of branch 7.0 up to a87d60f
2015-02-16 18:26:45 +01:00
34d4508535
[FIX] hr_payroll: nicer error message for some bad rule definitions
...
For example avoids a crash with:
TypeError: can't multiply sequence by non-int of type 'float'
when setting the quantity field of a salary rule to `1,0`
instead of `1.0`.
Fixes #5154
Closes #5155
2015-02-12 12:23:02 +01:00
d0cd92bb9f
[I18N] Sync updated 7.0 translations from Launchpad
2015-01-07 17:57:28 +01:00
85d2b45aaa
[I18N] Update 7.0 translations with latest changes on Launchpad
...
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
2014-08-14 03:38:58 +02:00
96c36e895c
[I18N] Update all 7.0 translation templates with latest terms and annotations
...
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
1f878f152a
[MERGE] forward port of branch 7.0 up to 680f955
2014-07-22 13:39:15 +02:00
ed58bcf26b
[FIX] hr_timesheet: missing '&' in domain clause
...
To search the contracts for payroll, the domain is constructed with three clauses. Each of these clauses needs to start with a '&' to make sure they are correctly combined with the OR clause'
2014-07-18 10:56:56 +02:00
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
c7565cd540
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
2014-04-24 06:32:49 +00:00
7b93809fb4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140417065316-5cle12k1npy96t4m
2014-04-17 06:53:16 +00:00
001a034e58
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +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
db6fb31870
[MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
...
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +02:00
5fb77bd6c5
[IMP] hr_payroll: ensure localdict is not shared between contracts
...
bzr revid: mat@openerp.com-20140402082954-05zzk1k3ued4go5a
2014-04-02 10:29:54 +02:00
09600a9969
[FIX]hr_payroll : initialize result_rate in localdict to avoid next execution problem
...
bzr revid: pna@tinyerp.com-20140331050122-kqfw152vcippdl52
2014-03-31 10:31:22 +05:30
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
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
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
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
c2794d0e85
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
2014-01-13 05:59:13 +00: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
2488f78e6d
[FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-20140102124143-m1qv8koovjcl8mah)
...
bzr revid: tde@openerp.com-20140102133028-xhvkzstqy5t8dquh
2014-01-02 14:30:28 +01:00
1508c5dd00
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
...
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
4c0c6bbc76
[FIX] hr_payroll: skip missing structures in get_all_structures for hr.contracts (eg: if structure is deleted afterward) (opw #602411 )
...
bzr revid: mat@openerp.com-20131223124413-k0st3i54zou2bga8
2013-12-23 13:44:13 +01:00
2c9ef5b3d5
[FIX] hr_payroll: put a check for the structure used in the contract. When any structure
...
is already assigned into contract and that is deleted, it will affet the Payslips which were already created and will have [False] value.
bzr revid: rha@tinyerp.com-20131223101841-6fbwfm90gn7sj17m
2013-12-23 15:48:41 +05:30
931f52f0f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131221061900-mrdvau1f6w722vsn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131222055708-jg10h0irjyde2qii
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054746-koli3yft4vt25ld4
2013-12-23 05:47:46 +00:00
a092227c6e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00
03e9e188c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131205061031-0rg3zuhu9bm4ygcx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131206062420-e5igkn86w68za9sv
2013-12-06 06:24:20 +00:00
000c38816d
[MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
...
the import / export process
Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead
bzr revid: tde@openerp.com-20131125093741-hx9hpj85xqfalvqw
2013-11-25 10:37:41 +01: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
17fe569269
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119052725-2fcjekn5ouumctna
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120052525-2pwf2q3wdcrbqics
2013-11-20 05:25:25 +00:00
6f10f3ae24
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116054548-3p5ym1d6w40ctn2i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117052157-8zpcgl9vc9s80s5c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118052246-2yk6opkjie1zcpw1
2013-11-18 05:22:46 +00:00
523b10fe44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119055635-19g4i058ihed0ivz
2013-11-19 05:56:35 +00:00
2160342cea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00: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
4cb9834833
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +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
1a6eb52a32
[MERGE] [IMP] hr_payroll: improved demo data and yml tests demo data
...
bzr revid: tde@openerp.com-20130904141110-svlfpvl3ddu12al7
2013-09-04 16:11:10 +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
18961cfdf5
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130829050254-xwt0261q0hdtrwun
2013-08-29 10:32:54 +05:30
8c5c877948
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130828053808-8isassv2181er8jt
2013-08-28 05:38:08 +00: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
0d01453f81
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130813110637-nwi1lao9wegqz5ro
2013-08-13 16:36:37 +05:30
028d62c391
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130812121219-4opfk262kgmakvsb
2013-08-12 17:42:19 +05:30
c46331a3ca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055508-7yza7v2jdny1gear
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806050509-v64stuiemu934s7t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130809053600-ssuy8yhd6ve9cse6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053806-gx2uwr6zoit4zow2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050026-l3omk3m8v7f34dnu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053803-dm8ugwnibrznai0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050015-lmxdgm6fks2fyzoe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130812050650-ta4kndyaxthut4tv
2013-08-12 05:06:50 +00:00
205be82943
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130725054417-yilro7a52nwsb91r
2013-07-25 05:44:17 +00:00
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
Denis Ledoux
Christophe Combelles
Olivier Dony
Martin Trigaux
TheCloneMaster
Launchpad Translations on behalf of openerp
Christophe Simonis
Pinakin Nayi (OpenERP)
Stephane Wirtel
Thibault Delavallée
Denis Ledoux
Rifakat
Amit Bhavsar (Open ERP)