500fea28b7
[MERGE] forward port of branch saas-2 up to revid 5007 chs@openerp.com-20140206110220-myn57cryam1y4k9v
...
bzr revid: chs@openerp.com-20140206110423-qe4h5ip2dg6dm7ph
2014-02-06 12:04:23 +01:00
a69f789b41
[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7
...
bzr revid: dle@openerp.com-20140205105045-j95kduyjiq83e57z
bzr revid: dle@openerp.com-20140114173613-ruxye1m7fxtcjfim
bzr revid: dle@openerp.com-20140116161158-u95vcs3os4tk2zob
bzr revid: dle@openerp.com-20140121172737-gzawfi3ssg7xifef
bzr revid: chs@openerp.com-20140129094554-c3abc8x3qz9mpszr
bzr revid: chs@openerp.com-20140129140159-9vwkpr078shoonum
bzr revid: chs@openerp.com-20140206110220-myn57cryam1y4k9v
2014-02-06 12:02:20 +01:00
c234d8547d
[FIX] _(): avoid useless warning where translating string without a cursor
...
bzr revid: chs@openerp.com-20140206105141-7e8bv8ordqqsswh7
2014-02-06 11:51:41 +01:00
7950914c69
[IMP] ir_fields: no need to sanitize the _str_to_html as it is already done in the _symbol_set of html fields. This avoids doing twice the sanitization.
...
bzr revid: mat@openerp.com-20140206094628-umx2rfb9rcim7v82
2014-02-06 10:46:28 +01:00
909ff6e368
[MERGE] [FIX] ir_fields: allow convertion from string to html using sanitize function
...
This is required to be able to import csv file containing html fields
lp bug: https://launchpad.net/bugs/1093800 fixed
bzr revid: mat@openerp.com-20140206084708-j63kpkr9apd3j01j
2014-02-06 09:47:08 +01: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
0d22b87f3a
[FIX] Fix bug of positionning on res_partner form
...
bzr revid: jke@openerp.com-20140203163052-01m78wwe38974cf5
2014-02-03 17:30:52 +01:00
5f10bec1a0
[IMP] better assert message and cleaning
...
bzr revid: mat@openerp.com-20140203134051-lgwo4v0rdntgxyor
2014-02-03 14:40:51 +01:00
6ea8851fd0
[ADD] test read_group on a column of _inherits model and group on right field
...
bzr revid: mat@openerp.com-20140203133331-mujvv812zd971ci2
2014-02-03 14:33:31 +01:00
cafa5e7854
[FIX] orm: read_group aggregates values on all columns instead of only the one of the parent model
...
bzr revid: mat@openerp.com-20140203123311-38rwp7tfyc08flid
2014-02-03 13:33:11 +01:00
15813479f5
[FIX]Fixed the issue of html field import fails, because of no converter found for str to html.
...
bzr revid: msh@openerp.com-20140203120525-ui117od6lpksm1bq
2014-02-03 17:35:25 +05:30
0aa0bbd539
[FIX] add warning when dbfilter logs out current session
...
bzr revid: xmo@openerp.com-20140203115633-es2o542ywg85d46i
2014-02-03 12:56:33 +01:00
2a297c3b2f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065247-b0hmat9ikp0cj2sx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202055930-0e8qd9refwne4999
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055525-2z3nfmfb0t7lpqpf
2014-02-03 05:55:25 +00:00
46cbf22efb
[FIX] allow to use "dbname" as keyword in routes
...
bzr revid: chs@openerp.com-20140131163139-89lfordriamw9i1w
2014-01-31 17:31:39 +01:00
e846c499e8
[REL] version: 7.~saas-3
...
bzr revid: odo@openerp.com-20140131122313-zaet2jih5dg76qu6
2014-01-31 13:23:13 +01:00
fa61a1e5a7
[REV] Bring back QWebException, rename QWebException#inner to 'cause'
...
bzr revid: fme@openerp.com-20140131113515-ahcix3h6uzzdz8ix
2014-01-31 12:35:15 +01:00
3fac414239
[FIX] CORS routing should use new routing api
...
bzr revid: fme@openerp.com-20140131104840-e0557qke365ym2x4
2014-01-31 11:48:40 +01:00
f119c818c7
[REV] never change exceptions types
...
bzr revid: al@openerp.com-20140131010802-5zh9m5jc1ajnp5wj
2014-01-31 02:08:02 +01:00
d6c1346e12
[MERGE] trunk-website-al
...
bzr revid: al@openerp.com-20140131005207-mn7t6tar8cywe9hz
2014-01-31 01:52:07 +01:00
849125efd2
[FIX] removing test that commits and small fix
...
bzr revid: fp@tinyerp.com-20140131002701-4eaggu8tszph4vl5
2014-01-31 01:27:01 +01:00
6be5db45b0
[IMP] QWeb exceptions shall not shadow original exceptions
...
bzr revid: fme@openerp.com-20140130211708-5i9lpi4ddn7a2xbe
2014-01-30 22:17:08 +01:00
9cc89156cc
[REM] outdated disable_db
...
bzr revid: fme@openerp.com-20140130210612-su04ki3zlv043bvz
2014-01-30 22:06:12 +01:00
4b70011c12
[FIX] ir_ui_view#read_template() bring back old behavious, raises ValueError if xmlid not found
...
bzr revid: fme@openerp.com-20140130210154-llo2tjl323k0yxyr
2014-01-30 22:01:54 +01:00
171408280c
[FIX] res.partner: properly (re)compute display_name and commercial_partner_id on inactive partners
...
bzr revid: odo@openerp.com-20140130192848-orv1glg2j26wdpml
2014-01-30 20:28:48 +01:00
7a0262a4d5
[FIX] allow "none" route to be accessible when logged in
...
bzr revid: chs@openerp.com-20140130162626-z83x9e6ekdfqku0a
2014-01-30 17:26:26 +01:00
83bd83dc63
[REVERT] revert commit 5210 chs@openerp.com-20140130150628-qqbno0nu8mp27b9u: bring back magic
...
bzr revid: chs@openerp.com-20140130162041-63wbcsq1udxw529f
2014-01-30 17:20:41 +01:00
7e6be99a63
[IMP] res.partner: more selective child_of _search() hack
...
Makes the conditions for disabling the `active` test
on res.partner.search() more selective, to avoid
triggering it when we are not actually searching for
the children of specific parents.
(Broke base tests now that data includes an deactivated
partner)
bzr revid: odo@openerp.com-20140130162419-09tit4cyef570aze
2014-01-30 17:24:19 +01:00
e98a1a8f64
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140130155158-zwddmty5a79mcn90
2014-01-30 16:51:58 +01:00
02313ae739
[IMP] improves the formatting of the dates returned by read_group in orm.py (for ex, January -> January 2014 or W4 -> W4 2014)
...
bzr revid: ged@openerp.com-20140130155117-ldsq4tjat96ustd8
2014-01-30 16:51:17 +01:00
c3c0705203
[FIX] ir.ui.view: fix tests after refactoring of ir.ui.view/qweb view processing
...
bzr revid: odo@openerp.com-20140130154354-6xg4mx31to4dg0ql
2014-01-30 16:43:54 +01:00
5908a45e47
[FIX] ir.ui.view: better error message upon missing model for non-qweb views, misc cleanup
...
bzr revid: odo@openerp.com-20140130154349-rnwjz0bgxp6vdxwu
2014-01-30 16:43:49 +01:00
79dc0235cd
[IMP] orm: log underlying exception at DEBUG level when a constraint check raises
...
bzr revid: odo@openerp.com-20140130154100-rdr1n5u1aiz9cbk3
2014-01-30 16:41:00 +01:00
0428c00e2f
[FIX] browse_record.__str__: avoid crashing when ID is None
...
bzr revid: odo@openerp.com-20140130153955-naxbrcz5pv17z4rq
2014-01-30 16:39:55 +01:00
30513f498c
[FIX] modules.loading: clear caches after test rollback, to avoid stale caches
...
bzr revid: odo@openerp.com-20140130153835-i5wb7nr0cwl3kjee
2014-01-30 16:38:35 +01:00
ff0e5318f6
[ADD] Support cors for pos demo
...
bzr revid: fme@openerp.com-20140130151425-tkcv5cvx04og0neu
2014-01-30 16:14:25 +01:00
4ab91a958d
[FIX] http: allow auth="none" routes to works without being logged in when in monodb.
...
bzr revid: chs@openerp.com-20140130150628-qqbno0nu8mp27b9u
2014-01-30 16:06:28 +01:00
e9e2c5d587
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140130135015-y0uxsdjb6631iqoo
2014-01-30 14:50:15 +01:00
51cabd2c69
[FIX] correct retro-compatibility with 7.0 route()
...
bzr revid: chs@openerp.com-20140130125827-j1xzt4qowg1ew3zf
2014-01-30 13:58:27 +01:00
5322b98647
[FIX] request.func not available on favicon.ico requests
...
bzr revid: fme@openerp.com-20140130133343-gbo353c41dphy1hj
2014-01-30 14:33:43 +01:00
53098c666c
[MERGE] trunk's CORS support (merge with changes)
...
bzr revid: chs@openerp.com-20140130120448-tj9pu30o7dj74zid
bzr revid: fme@openerp.com-20140130125425-j1yn6p4lr7lincr3
2014-01-30 13:54:25 +01:00
b63b03abd0
[IMP] better handling of methods for CORS
...
bzr revid: fme@openerp.com-20140130122654-2p481p5hwn033mi7
2014-01-30 13:26:54 +01:00
9cce88ab6a
[ADD] Cross-Origin Resource Sharing support as http.route() argument
...
bzr revid: fme@openerp.com-20140130121745-zjuuves1yhydydpx
2014-01-30 13:17:45 +01:00
5bb31b70d8
[FIX] ir.ui.view: one2many to ir.model.data needs domain otherwise it matches entries from other models
...
bzr revid: odo@openerp.com-20140130120109-0z6kpzv5t155haog
2014-01-30 13:01:09 +01:00
20fc20a3f2
[IMP] http allow auth=none without db outside of web
...
bzr revid: al@openerp.com-20140130114535-0keldqr1eln8swm8
2014-01-30 12:45:35 +01:00
c231d9760a
[FIX] ir.ui.view: restore extended validation of view arch, let exceptions bubble up to constraint checker, cleanup+translate error messages
...
Raising an exception in a _constraint will now be
properly considered as a failed constraint, and the
user will see a warning popup with the exception
message. Therefore it makes sense to translate the
error as well, at least the not-too-technical part
bzr revid: odo@openerp.com-20140130100716-qcbwy7ecnxj17718
2014-01-30 11:07:16 +01:00
57ec7d6c03
[IMP] orm: when a _constraint check raises, catch it and combine its message with the constraint message for the user-friendly popup
...
Plus minor cleanup
bzr revid: odo@openerp.com-20140130094337-7g8ez92viwmbzbft
2014-01-30 10:43:37 +01:00
7a01d4a93f
[IMP] public_user: make parent partner inactive too
...
bzr revid: odo@openerp.com-20140130093109-x2legxl31mi5c8m6
2014-01-30 10:31:09 +01:00
4b746826b2
[IMP] res.partner: unused imports
...
bzr revid: odo@openerp.com-20140130093012-ytrx2i2xoc23npfg
2014-01-30 10:30:12 +01:00
1daa7db8b0
[REM] Removed disabled_db=True from ir_http's auth="none"
...
[MOV] ensure_db() helper from http module to web module
Since we removed auth="admin" in favor of auth="none" with explicit superuser id usage,
the disable_db clause in auth_none() has only sense for the /web and /web/login routes.
The web module is an exception because it's routes are registered for the nodb dispatching.
This is why the ensure_db() helper is moved to web client and will take care of the
web's auth="none" routes that needs a db to work with
bzr revid: fme@openerp.com-20140130092152-h6elwf2yerhd9xey
2014-01-30 10:21:52 +01:00
279c5e67ec
[FIX] Check if session.db is legit before dispatching
...
bzr revid: fme@openerp.com-20140130085224-ac0w90ap9u4nmzen
2014-01-30 09:52:24 +01:00
Christophe Simonis
Martin Trigaux
Launchpad Translations on behalf of openerp
jke-openerp
Mohammed Shekha (OpenERP)
Xavier Morel
Olivier Dony
Fabien Meghazi
Antony Lesuisse
Fabien Pinckaers
Gery Debongnie