Commit Graph

209 Commits

Author SHA1 Message Date
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
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01: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 3e5619e305 [REM] remove select2 module. lib added to web module
bzr revid: chs@openerp.com-20140123151923-ls6esc482k3f2cdy
2014-01-23 16:19:23 +01:00
Christophe Matthieu fd2821086f [MERGE] sync with trunk
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +01:00
Denis Ledoux 702b9c2e1b [FIX]base_import: if the error message was an except_orm or an access denied error, the error message was not displayed, only a red div without anything in it.
bzr revid: dle@openerp.com-20131128163613-e20nbr3yqvhvx4bv
2013-11-28 17:36:13 +01: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
ima-openerp beea089c21 [IMP]improved css of base_import module for dd, label and p tags.
bzr revid: ima@tinyerp.com-20131119115840-o8evs0ap85xf7ybp
2013-11-19 17:28:40 +05:30
ima-openerp 3bf3bc3895 [IMP]improved css for base_import, mass_mailing and idea module.
bzr revid: ima@tinyerp.com-20131118121605-1rn0z4hojxblngbu
2013-11-18 17:46:05 +05:30
Xavier Morel 6562ab4d76 [IMP] move select2 to its own module
bzr revid: xmo@openerp.com-20131113145727-3p2fh8bprj7k09xe
2013-11-13 15:57:27 +01:00
Denis Ledoux 0cf57bdee2 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8800 rev-id: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
bzr revid: chs@openerp.com-20131031142325-vo84hk5co2e2phg0
bzr revid: dle@openerp.com-20131031143133-wfus2hag57e73by2
bzr revid: dle@openerp.com-20131031162928-8gpom1ralccy07uc
2013-10-31 17:29:28 +01:00
Olivier Dony 465c241338 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9567 rev-id: odo@openerp.com-20131105103011-vkix07lsb6q3y9fd
bzr revid: dle@openerp.com-20131031142609-jinks18n2ju7usm4
bzr revid: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
bzr revid: odo@openerp.com-20131105122634-joau6mg9jqpvbauz
2013-11-05 13:26:34 +01:00
Denis Ledoux 959b0bc720 [FIX]base_import: context was not considered while importing. Thus, default value (for instance) was not set, and that leaded to inconsistencies (Like importing supplier invoices was actually creating customer invoices
lp bug: https://launchpad.net/bugs/1086424 fixed

bzr revid: dle@openerp.com-20131031135605-ffj3tid9prw2mv8z
2013-10-31 14:56:05 +01:00
Launchpad Translations on behalf of openerp 40c309024c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
Antony Lesuisse e5ad3700cb [IMP] convert controllers to the new route api
bzr revid: al@openerp.com-20131027174813-ghwl3p6w7ebr20s9
2013-10-27 18:48:13 +01:00
Antony Lesuisse d5b4cd627c more controller conversion to new route api
bzr revid: al@openerp.com-20131027173143-tfxc7e7vqn7re6wb
2013-10-27 18:31:43 +01:00
Launchpad Translations on behalf of openerp 2f3c517054 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026060436-zq7lmz0wyaf2or7c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131022044413-i5f1hxr3y23buz38
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023043450-hbi0snv6o0qpl0ne
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026054646-gklydoly8cq62jbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027055002-ldfxtxmdm5wpc65b
2013-10-27 05:50:02 +00:00
Launchpad Translations on behalf of openerp 8bc457816f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
2013-10-25 06:01:00 +00:00
Christophe Simonis 17c661328b [FIX] base_import: use @route decorator to ensure user is logged into session
bzr revid: chs@openerp.com-20131015163444-v09924ah0wpe74be
2013-10-15 18:34:44 +02:00
Xavier Morel e0493cd6d4 [FIX] handling of single-line files sent for preview
bzr revid: xmo@openerp.com-20131015100313-sdgqx1t43922kgq8
2013-10-15 12:03:13 +02:00
Xavier Morel f2feffe5e2 [FIX] backwards-compatible controller decorator not backwards-compatible at all, replace with @route
bzr revid: xmo@openerp.com-20131015095331-r2xm2198zrwax0c7
2013-10-15 11:53:31 +02: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 2779496635 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054822-v57c9imyteomp381
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054909-1nmq8z3sk3ao5j0m
2013-10-09 05:49:09 +00:00
Launchpad Translations on behalf of openerp 23620b2e54 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054843-vx0nogr2rpf5amw4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055416-ubjv2v9mogsb49f3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061626-2rcumswg0tc4e10e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055451-072mn28h3ew4cwfp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061658-4svrcqcw04av1e5w
2013-09-27 06:16: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
Antony Lesuisse 6da5da7aa0 [FIX] activate import by default
bzr revid: al@openerp.com-20130906143719-rl1vqf06p6f3o2na
2013-09-06 16:37:19 +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 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
Launchpad Translations on behalf of openerp bb90e51a78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130803061336-i8noij4hjz9nxoow
bzr revid: launchpad_translations_on_behalf_of_openerp-20130804053709-rxcnnh17adwk94b4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130805063055-v6y7lrx7lcoemmk0
2013-08-05 06:30:55 +00:00
Launchpad Translations on behalf of openerp bea114f93a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045806-pkwhfwt808zjajg9
2013-07-30 04:58:06 +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
Launchpad Translations on behalf of openerp 3e269d1572 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
2013-06-20 06:35:09 +00:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
Martin Trigaux 79e283090a [MERGE] base_import: better FAQ
bzr revid: mat@openerp.com-20130604152059-batvt7x6zvvwbipr
2013-06-04 17:20:59 +02:00
Launchpad Translations on behalf of openerp c40b3825d7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130525062725-xjoymmi42b2z1kk4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130526053952-a661pgpl7pd7n4vd
2013-05-26 05:39:52 +00:00
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 182118eb8c [MERGE] kill the executable bit on things that are clearly not executables or scripts
bzr revid: mat@openerp.com-20130508144521-bkvms15maji1ykpb
2013-05-08 16:45:21 +02:00
Launchpad Translations on behalf of openerp 6b04a532b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423060902-2j8xouki50aemi14
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061017-5os2p9ztugb6jjph
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061019-n2660taj1o9os75c
2013-04-23 06:10:19 +00:00
Launchpad Translations on behalf of openerp 6a2da1c2f7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053215-jdbdrur8vk4zu5tc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130420064852-b6bt9syb79h1x16m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053233-g4dbsfidsqrs301v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053237-8jhzy2qe55bb766x
2013-04-21 05:32:37 +00:00
Launchpad Translations on behalf of openerp dcd398d33e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130418060603-ondw9hx00c1rmh33
2013-04-18 06:06:03 +00:00
Launchpad Translations on behalf of openerp c13ceba6b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060536-q07q8ed9v8ldi2kv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055031-dgknuaf8a4dhgt16
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063110-rtd3r7hxe54yb8eq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414054933-k6o13mitp3dl62xq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060648-klbxmc1afr5jq4vb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060533-fq4nwi1i6h39y7pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063146-745583mwivnzgjqj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055028-v2dnk713g9ydbvpo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060722-gvarcrrppfcq777a
2013-04-15 06:07:22 +00:00
Launchpad Translations on behalf of openerp eb3ffc52ed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130406063640-151b9f95w2tgiifb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130407060111-hobhqctome9qtz6c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130408062055-hzgkrbw8lvkfphxe
2013-04-08 06:20:55 +00:00
dle@openerp.com a27dd438a7 [REVERT]base_import: revert of last change, because break tests and needs review
bzr revid: dle@openerp.com-20130405182351-0qfqd5klz9g25n9m
2013-04-05 20:23:51 +02:00
dle@openerp.com 5819cefd4b [FIX]base_import: get_fields now displays database id of the current model imported in normal fields
bzr revid: dle@openerp.com-20130405175827-58ahjgprju2gf4p9
2013-04-05 19:58:27 +02:00
Launchpad Translations on behalf of openerp 086b844df5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330052753-vptpgl8jh0zxx2zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331052801-af1yzruwutw4ce3b
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401050658-9x864eerp9tph8ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403052653-u7naqcrqgxv41q33
2013-04-03 05:26:53 +00:00