Commit Graph

317 Commits

Author SHA1 Message Date
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02: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
Christophe Simonis 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
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
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Christophe Simonis da00eab39a [FIX] l10n_in_hr_payroll: use xmlid instead of name searching salary rule categories (they may have been renamed, forbidding upgrade)
bzr revid: chs@openerp.com-20131120100623-ip33s4upffu1a52h
2013-11-20 11:06:23 +01:00
Launchpad Translations on behalf of openerp 08abc4345a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054140-gta82n1b3iww6qy5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031051733-nnutbi7hidixsxsb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102055746-d0emb2aocq3sq1d1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103052149-y4usleohxatdgczx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105052928-1izkptj5zusflrvb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108054204-hrtuxxze2u1ivvez
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110055420-zl5ang9w8lbcvt9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111051738-smtttsszytn06ld4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054158-7ewd3oxiyxg8s4zw
2013-11-12 05:41:58 +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 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Fabien Meghazi f58b15af48 [IMP] Remove deprecated manifest keys
bzr revid: fme@openerp.com-20130909110330-kl71n1km00gew1oo
2013-09-09 13:03:30 +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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Amit Bhavsar (Open ERP) b190137aa6 [Imp] improve view for Payslips Batches and Payment Advices.
bzr revid: amb@tinyerp.com-20130628104052-s9we23nm5gt2z5ht
2013-06-28 16:10:52 +05:30
Amit Bhavsar (Open ERP) 87443c86e0 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130628102353-3cdcw34d2e2x9c8c
2013-06-28 15:53:53 +05:30
Antony Lesuisse fc70550ca2 [IMP] move html module description and icon
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
Amit Bhavsar (Open ERP) ae5bc2790d [hr] Improve code and tooltip space.
bzr revid: amb@tinyerp.com-20130627070942-439q75pndgotligf
2013-06-27 12:39:42 +05:30
Amit Bhavsar (Open ERP) 34f15e56d9 [HR] Improve view,title,tooltip and code.
bzr revid: amb@tinyerp.com-20130626121617-17i92ua5yty8htwu
2013-06-26 17:46:17 +05:30
Launchpad Translations on behalf of openerp 9102c2c512 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130625051442-1chu4wdtgur1nub1
2013-06-25 05:14:42 +00:00
Launchpad Translations on behalf of openerp fc8ca396d6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130625055814-0xhzq55bhk2yalpd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130626061855-up0d9p61pblz40xa
bzr revid: launchpad_translations_on_behalf_of_openerp-20130625055818-kmfgjvq2jfrhd3zr
bzr revid: launchpad_translations_on_behalf_of_openerp-20130626061858-aacxz9wf3f2e4b0v
2013-06-26 06:18:58 +00:00
Christophe Matthieu 9d9e3d2ef8 [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
Amit Bhavsar (Open ERP) 24848a8dcc [MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
2013-05-28 14:49:41 +05:30
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Martin Trigaux c8c298c83c [IMP] clean permissions and shebang in files
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
2013-05-14 12:31:13 +02:00
ggh-openerp 3b73e2b2a4 [IMP]Removed space before Exclamation marks [!]
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00:00
Vo Minh Thu 9b0ced610f [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130322134958-jhe6m0222jq7wo41
2013-03-22 14:49:58 +01:00
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Quentin (OpenERP) d0f5b28bd0 [MERGE] merge with main trunk branch to get last translations from launchpad
bzr revid: qdp-launchpad@openerp.com-20130315103116-lxj96usw3ipd11z5
2013-03-15 11:31:16 +01:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Olivier Dony cd0714b78d [FIX] all: change confusing labels on Cancel buttons in form views
lp bug: https://launchpad.net/bugs/1103426 fixed

bzr revid: odo@openerp.com-20130225133804-k7012p8p81e6g8vg
2013-02-25 14:38:04 +01:00
Vo Minh Thu 5029451905 [IMP] report yml test: use openerp.report.render_report() instead of LocalService().create().
bzr revid: vmt@openerp.com-20130222133511-y07w3etca8onb73x
2013-02-22 14:35:11 +01:00
Vo Minh Thu 713ff5c65d [FIX] use openerp namespace.
bzr revid: vmt@openerp.com-20130219084255-m8kxcsejob64hh72
2013-02-19 09:42:55 +01:00
Raphael Collet 5f855a1ddb [MERGE] from trunk
bzr revid: rco@openerp.com-20130213083519-3nbg40h5em0gfeu3
2013-02-13 09:35:19 +01:00
Vo Minh Thu 02a114fe3b [FIX] import openerp.{netsvc,tools} instead of {netsvc,tools} in YML tests.
bzr revid: vmt@openerp.com-20130209062929-g85yauw92vj9wqpb
2013-02-09 07:29:29 +01:00
Launchpad Translations on behalf of openerp 81a9933636 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207045357-zi501udzkv6jgk72
bzr revid: launchpad_translations_on_behalf_of_openerp-20130208043624-wlpf8azwrbwi930l
2013-02-08 04:36:24 +00:00
Launchpad Translations on behalf of openerp b64db1c007 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054227-fy00xo21liqcoqz8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054231-c558abx56zwr0mg2
2013-02-07 05:42:31 +00:00
Launchpad Translations on behalf of openerp 996746634f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130205052331-pkjgm8c2lnxld0x6
2013-02-05 05:23:31 +00:00
Ajay Chauhan (OpenERP) 82ecabb0f5 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20130201130659-buvkd7lq4xp5nu1d
2013-02-01 18:36:59 +05:30
Ajay Chauhan (OpenERP) d43fa72736 [FIX] l10n_in_hr_payroll: removed unused imports.
bzr revid: cha@tinyerp.com-20130131093901-423rr2g3h5ke0vpb
2013-01-31 15:09:01 +05:30
Launchpad Translations on behalf of openerp b390a5697c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126050355-xxot322zn826zr96
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127043627-b85ckledrtpdd73m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128051345-a31wsrx74u1w228d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129052015-doewhw7byebeeijs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130130043841-h15p02at1d6o2clr
2013-01-30 04:38:41 +00:00
Launchpad Translations on behalf of openerp 39951ce27c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130125060526-1sardheh24y8unc0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126053740-34a73mqkdg04j9s4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127051008-60htke4mkwclnqfk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128055849-swluxyrhgvpbmrg2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129061824-peffot06nnwkgdkp
2013-01-29 06:18:24 +00:00
Vo Minh Thu 752649aa77 [IMP] l10n_in_hr_payroll: use the new signal_xxx methods instead of trg_validate.
bzr revid: vmt@openerp.com-20130128152916-kt23l68420hkg49y
2013-01-28 16:29:16 +01:00
Launchpad Translations on behalf of openerp 7a49719d46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +00:00
Launchpad Translations on behalf of openerp 7212971359 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222062604-dkriii8eozvsup5y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044904-96hdn6ba6yrv4f9j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226044702-qvjpmsxaacy1cg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050621-bg925wq3m04p2g71
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050125-ezgc0pyinpf7cjpa
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044027-9ufahl14z8fnhu6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044603-wg53ihk00q2059zn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044748-vijpm6xa5a4wkx8s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044725-gnjicg5umjgca6x4
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227052240-6m8i7kropwavbcnh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228051144-leldhj31i0soxbew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050213-cxzd31aqqltp6q2x
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230052006-x87nblyyoe179wg8
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044049-m31tcl22nog279qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044622-7p5h1mf14m4tlue5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102043722-j7bk1uojgtgsz7u1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044815-xswvowa7jeizv4jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044801-0v8fmmv0jl7itv9b
2013-01-04 04:48:01 +00:00
Launchpad Translations on behalf of openerp fca02afad3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101051924-2q3t0sbo83ti3ooe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102052612-z5wooakbv4fnww9x
2013-01-02 05:26:12 +00:00
Launchpad Translations on behalf of openerp 5c360f7327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
2012-12-26 04:39:38 +00:00