Commit Graph

1331 Commits

Author SHA1 Message Date
Gery Debongnie 104110de33 [FIX] code cleanup (addon hr_payroll)
remove try/except/pass in _count_detail_payslip and in _payslip_count, improves these methods and remove the now useless field payslip_ids

bzr revid: ged@openerp.com-20140507135826-xlo5gn7iq612lonp
2014-05-07 15:58:26 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Launchpad Translations on behalf of openerp 5b3fcaa293 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424060156-3rq751eej5io1y4c
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424060216-3ssubkaumaln393r
2014-04-24 06:02:16 +00:00
Richard Mathot (OpenERP) 71560225a9 [MERGE] from trunk
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Gery Debongnie 0c24df7074 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
Christophe Simonis 8c19dab413 [FIX] hr*: must depend on "report" module
bzr revid: chs@openerp.com-20140416170152-v8gzd8jfqts88vdb
2014-04-16 19:01:52 +02:00
Simon Lejeune babfb0f78d [IMP] hr* reports converted to qweb
bzr revid: sle@openerp.com-20140415191911-0rttsd7ayk6exm6u
2014-04-15 21:19:11 +02:00
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Gery Debongnie 8135812d34 [FIX] moves the field definitions of models hr.job and hr.employee that should have been in submodules to their correct place (in hr_something) to avoid dependencies problems (addons hr, hr_*)
bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
2014-04-15 12:54:19 +02:00
Rakesh Sindhav (OpenERP) f081a5e441 [IMP]account,purchse,warehouse,sale: view improvement in addons modules
bzr revid: rsi@tinyerp.com-20140411131842-9zppvrs2szqa4o47
2014-04-11 18:48:42 +05:30
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Christophe Simonis 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
Martin Trigaux 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
Pinakin Nayi (OpenERP) 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
Launchpad Translations on behalf of openerp 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
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Yogesh Parekh (OpenERP) 3897de56b7 [IMP]: Convert buttons into stat buttons in hr modules
bzr revid: ypa@tinyerp.com-20140326120056-qqauj7pmhf0uxhuj
2014-03-26 17:30:56 +05:30
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Launchpad Translations on behalf of openerp c4a80fb837 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209061940-1k5bgmpbfdd62e2y
2014-02-09 06:19:40 +00:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Launchpad Translations on behalf of openerp 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
Stephane Wirtel 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
Thibault Delavallée 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
Denis Ledoux 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
Martin Trigaux 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
Rifakat 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Thibault Delavallée 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 523b10fe44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119055635-19g4i058ihed0ivz
2013-11-19 05:56:35 +00:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 4cb9834833 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Thibault Delavallée 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
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Amit Bhavsar (Open ERP) 18961cfdf5 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130829050254-xwt0261q0hdtrwun
2013-08-29 10:32:54 +05:30
Launchpad Translations on behalf of openerp 8c5c877948 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130828053808-8isassv2181er8jt
2013-08-28 05:38:08 +00:00