ec36a494fe
[FIX] do not expose posix only config options on windows
...
bzr revid: chs@openerp.com-20140306115214-8wrfivy4runpzoar
2014-03-06 12:52:14 +01:00
8fec899f9b
[FIX] move appsdirs to tools
...
bzr revid: al@openerp.com-20140227163259-asal833qjv3gylit
2014-02-27 17:32:59 +01:00
38d1ca1ff2
[MERGE] trunk
...
bzr revid: al@openerp.com-20140227161819-p9chmskfifo0rygs
2014-02-27 17:18:19 +01:00
65db3c635e
[MERGE] forward port of branch saas-2 up to revid 5014 mat@openerp.com-20140220145701-6y7s1roj88q7ys13
...
bzr revid: chs@openerp.com-20140220160548-0rhulha4cml6t08v
2014-02-20 17:05:48 +01:00
c83247c38b
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev.5012 revid:mat@openerp.com-20140219134943-60ssztc01cxdtk09
...
bzr revid: mat@openerp.com-20140219140617-na0q47yaloblb67i
2014-02-19 15:06:17 +01:00
e635ebe6c1
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5238 revid:launchpad_translations_on_behalf_of_openerp-20140219053940-dvi4g7ajttoj6h9k
...
bzr revid: mat@openerp.com-20140219134943-60ssztc01cxdtk09
2014-02-19 14:49:43 +01:00
3ef93918a8
[FIX] Increased allowed virtual memory per worker
...
bzr revid: openerp-sle@openerp-sle.home-20140212225240-nhu8dj68z84rm9u5
2014-02-12 23:52:40 +01:00
94b3b0d6f6
[FIX] image tools: do not crop an image when resizing it, use reduce the size instead and add transparency background (opw 593992)
...
bzr revid: mat@openerp.com-20140212155104-zc6hhkzqw6711e9m
2014-02-12 16:51:04 +01:00
1b2c0f74dc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5229 revid:launchpad_translations_on_behalf_of_openerp-20140211064034-ghuxxk02n715othj
...
bzr revid: dle@openerp.com-20140211163902-ya86jr7lwlj1mkk9
2014-02-11 17:39:02 +01:00
e328c0a40e
[FIX] html_sanitize: partial backport of trunk revision 5047.
...
Unescape elements that have been wrongly escaped.
Some elements (eg: 'href' tag in links) are sanitised in templates which prevents the execution of mako templates.
lp bug: https://launchpad.net/bugs/1273251 fixed
bzr revid: mat@openerp.com-20140210144023-9sp8cqn07ta5o64y
2014-02-10 15:40:23 +01:00
002ac937c1
add python --test-file support
...
bzr revid: al@openerp.com-20140209014636-2fbl15q8wrubmiup
2014-02-09 02:46:36 +01:00
82372e6a02
move tests
...
move test modules
remove xml test
add phantomjs test
readd remove uninstall test (currently disabled because of cr.commit)
bzr revid: al@openerp.com-20140209003745-ehrx8ikwkmusa644
2014-02-09 01:37:45 +01:00
4a5b4a8c3f
[IMP] sale_eval break continue raise control flow opcodes
...
bzr revid: al@openerp.com-20140206124019-07in9p9capmznlo2
2014-02-06 13:40:19 +01:00
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
ec45bc96f9
[IMP] safe_eval add int float range, rename public user
...
bzr revid: al@openerp.com-20140130034238-qlgbu41d7mg9ns6i
2014-01-30 04:42:38 +01:00
eb091de615
[FIX] yaml import: not all views have a name
...
bzr revid: chs@openerp.com-20140127180230-eybz2dlc7qdjy1yh
2014-01-27 19:02:30 +01:00
2bcf4cca79
[FIX] tools: mail: support \[ and \] in tmeplates
...
bzr revid: tde@openerp.com-20140123152842-21b3gsey1mxt4v37
2014-01-23 16:28:42 +01:00
69af79ff3d
[FIX] tools: mail: fixed last commit, now simply using replace
...
bzr revid: tde@openerp.com-20140123141435-jstfcaemjplbn7b1
2014-01-23 15:14:35 +01:00
5f1ec49ecd
[FIX] tools: mail: when cleaning, unescape mako specific symbols.
...
Indeed those are escaped when contained inside an href or mailto element
of a tag, leading to mako not rendering the element.
bzr revid: tde@openerp.com-20140123125137-4u4i88f1ajybg5f2
2014-01-23 13:51:37 +01:00
5528b9b2d8
[FIX] sprurious error in log during javascript unit tests
...
During some tests, the runner performs sequences of DUPLICATE and DROP
on databases. Each DUPLICATE is followed by some operations then a
DROP.
Problem is, after a DROP the next DUPLICATE RPC query will attempt a
connection to the just-dropped database, openerp.sql_db will log an
OperationalError ("Connection to the database failed" since the db it
tries to connect to was removed) then the HTTP dispatcher will just
switch to "nodb" and continue on its merry way.
Mute the sql_db logger while attempting to fetch the ir.http object.
Also assert that the logger name is a string in mute_logger, as
`mute_logger(openerp.sql_db)` is syntactically valid, but will not do
anything.
bzr revid: xmo@openerp.com-20140123115413-ax5patcomdfp3ue3
2014-01-23 12:54:13 +01:00
a45b2c6b90
merge upstream
...
bzr revid: chs@openerp.com-20140117092206-ha47ryhjc4ph50nl
2014-01-17 10:22:06 +01:00
c76a3aba8f
[CLEAN] ir_qweb: simplified and cleaned QWebcontext implementation
...
- now using openerp.tools.safe_eval, instead of a custom eval with custom builtins
- removed undefined_handler, hardcoded to a lambda function that returns None for
a missing attribute
tools.safe_eval: added a parameter locals_builtins. This allows to copy the builtins
in the locals. This hack is due to the fact that the locals always returns None, allowing
to simplify templates. Otherwise we would have to test the existence of each variable
before actually using it.
However as the locals always return None for every key, the globals are never checked.
Copying the builtins inside the local allows to have a complete locals, but sligtly
break the globals/locals separation.
To be reviewed and approved.
bzr revid: tde@openerp.com-20140116182750-1rnw8iljt5a9gb4u
2014-01-16 19:27:50 +01:00
c48f11041b
[IMP] chmod data-dir
...
bzr revid: chs@openerp.com-20140116164406-p2gtb2uziwhchp68
2014-01-16 17:44:06 +01:00
db10e1d3a5
[FIX] http: store sessions in data-dir
...
bzr revid: chs@openerp.com-20140116164142-ikcw82lyfopoj46k
2014-01-16 17:41:42 +01:00
a73c02075a
[FIX] ensure data-dir (and subdirs) exists
...
bzr revid: chs@openerp.com-20140116100243-ltp6yunvm1bnvn5q
2014-01-16 11:02:43 +01:00
ab5c23079a
[MERGE] Sync with trunk, solved conflicts.
...
bzr revid: tde@openerp.com-20140116091716-zk1n5ots94i65io5
2014-01-16 10:17:16 +01:00
0771ca2692
[MERGE] forward port of branch saas-2 up to revid 5002 dle@openerp.com-20140114173613-ruxye1m7fxtcjfim
...
bzr revid: chs@openerp.com-20140115205357-arptzm69logz3osm
2014-01-15 21:53:57 +01:00
5269664102
[FIX] correct uses of addons_path
...
bzr revid: chs@openerp.com-20140115180313-pqcrfmstci2w21y8
2014-01-15 19:03:13 +01:00
5d87753ef2
[ADD] new cli argument: -D/--data-dir
...
bzr revid: chs@openerp.com-20140115171323-eiy2h61qi098n0q3
2014-01-15 18:13:23 +01:00
c63ffed24d
[IMP] tools: mail: the cleaner, by parsing and serializing the html content,
...
encapsulatse the whole content inside a div. This means that html fields are
not editor-clean after being sanitized, because a div has been inserted as root
element. Removing this element allows to have snippets that can be dragged,
dropped, or to insert new snippets inside edited html content in html fields.
[IMP] tools: tests: mail: updated a test accordingly
bzr revid: tde@openerp.com-20140115142709-e4951b4nc06sfxf0
2014-01-15 15:27:09 +01:00
2c4600f242
[IMP] [READD] [IMP] tools: mail: have a strict mode for html_sanitizer (not default) with
...
options before website: without frames, with safe attributes only.
We will have to find a way to use the strict mode when parsing incoming
emails, but not when sending or storing openerp content.
Currently the not strict mode is the default one, to avoid side-effects with
the website.
bzr revid: tde@openerp.com-20140115141319-g15zl1kqrp8sgoa3
2014-01-15 15:13:19 +01:00
7a819ca8d0
[FIX] tools.email_split: improve email extraction using stdlib + extra tests
...
The original code was having issues telling apart
names containing emails from the actual email.
This patch is inspired by Etienne Hirt's patch
on bug 1165531 for OpenERP 6.1.
This will also help solve bug 1199386, if we can
centralize all email parsing through this helper.
lp bug: https://launchpad.net/bugs/1199386 fixed
lp bug: https://launchpad.net/bugs/1165531 fixed
bzr revid: odo@openerp.com-20140114154426-usu6intv5139egd3
2014-01-14 16:44:26 +01:00
fe0af74eab
[REV] Reverted last commit.
...
bzr revid: tde@openerp.com-20140113165423-8nu3838d4yj3h3j4
2014-01-13 17:54:23 +01:00
94357739bc
[IMP] tools: mail: have a strict mode for html_sanitizer (not default) with
...
options before website: without frames, with safe attributes only.
We will have to find a way to use the strict mode when parsing incoming
emails, but not when sending or storing openerp content.
Currently the not strict mode is the default one, to avoid side-effects with
the website.
bzr revid: tde@openerp.com-20140113085701-f2bzu94cq1z3tl10
2014-01-13 09:57:01 +01:00
89f71281a7
[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-20140109154338-0spjbo109pxh75pp
2014-01-09 16:43:38 +01:00
05aab83eb1
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9743 revid:qdp-launchpad@openerp.com-20140108160719-9i8xhrat49cn9l5e
...
bzr revid: chs@openerp.com-20140107141524-xzz39a2ym66swr0t
bzr revid: chs@openerp.com-20140107172248-zic9mqg0rigy2czb
bzr revid: chs@openerp.com-20140108160418-ph17jgy5hlejj9hr
bzr revid: dle@openerp.com-20140108171400-8r0fwv3wi36w2im0
2014-01-08 18:14:00 +01:00
6aa79d8cb3
[IMP] attempt to improve yaml test message in order to make its errors somewhat less cryptic
...
and make it easier to understand why it's whining.
bzr revid: xmo@openerp.com-20140108133722-9ac9l3w7wij0pl1i
2014-01-08 14:37:22 +01:00
7a72d858cb
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140103151324-jk0u8vmrxxomy5vx
2014-01-03 16:13:24 +01:00
79f716c70f
[MERGE] forward port of latest saas-2 until rev 4996 dle@openerp.com-20131218123130-vlejjv7r2klkzoj0
...
bzr revid: mat@openerp.com-20131218160041-58x5kij4v7earagu
2013-12-18 17:00:41 +01:00
4986d636b4
[FIX] translation: force clearing of cached translated term after a successfull `trans_load_data`
...
When re-loading a translation (with 'Overwrite Existing Terms') we need to
empty the translation cache to ensure overwritten terms get their new values.
bzr revid: xal@openerp.com-20131217145738-9oy2fjhbc46yzonq
2013-12-17 15:57:38 +01:00
a859a53e72
[FIX] ir.model.data#_update() should honor the noupdate flag
...
In `init` mode, a record can still be filled with multiple record
nodes with the first node being in a data@noupdate="1" and the other
nodes without @noupdate attribute but this won't be the case anymore in
`update` mode
bzr revid: fme@openerp.com-20131216144304-2e8b9xvoks2fvlj9
2013-12-16 15:43:04 +01:00
f9e986ecea
[IMP] allow frames in blogs (video, ...
...
bzr revid: fp@tinyerp.com-20131214211309-i2kk3cb60hnp1urz
2013-12-14 22:13:09 +01:00
65a5ce8a92
[IMP] HMTL5 main element
...
bzr revid: fp@tinyerp.com-20131213214157-8ow63hpaii6hdvxl
2013-12-13 22:41:57 +01:00
630e9ad64c
[FIX] Don't remove data-... attributes like data-snippet-id
...
bzr revid: fp@tinyerp.com-20131209185406-newaf16v532l146p
2013-12-09 19:54:06 +01:00
20be322c45
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
...
bzr revid: chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: dle@openerp.com-20131204150643-is3y0b9n8enh3yql
bzr revid: chs@openerp.com-20131206152726-pirikn7v8pev90ic
bzr revid: dle@openerp.com-20131206162437-b9niay99mirk44qm
bzr revid: tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v
bzr revid: dle@openerp.com-20131209155721-589zihxx8jmvlpvp
2013-12-09 16:57:21 +01:00
0216a53a0f
[FIX] convert: better error message when failed to load csv file (module name already in path, no need to append)
...
bzr revid: mat@openerp.com-20131204155244-sy223fbt0tmpeqw1
2013-12-04 16:52:44 +01:00
767aaeb8cc
[FIX] Wrong error message when data cannot be loaded at module loading
...
bzr revid: cto@openerp.com-20131203092433-uu1brp5csqvvd8yh
2013-12-03 10:24:33 +01:00
8460122209
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150856-fzrfcoa8pmsjutau
2013-12-02 16:08:56 +01:00
Christophe Simonis
Antony Lesuisse
Martin Trigaux
openerp-sle
Denis Ledoux
Thibault Delavallée
Xavier Morel
Olivier Dony
Stephane Wirtel
Xavier ALT
Fabien Meghazi
Fabien Pinckaers
Cecile Tonglet
Christophe Matthieu