15380fd5d2
[ADD] modules global rendering variable
...
This is temporary
bzr revid: fme@openerp.com-20140506163204-u63n3wv1yv6yohd3
2014-05-06 18:32:04 +02:00
2b67c9c77b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506061338-jwpj0jxfcnakph24
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506061359-p8lxp23aopeb6mwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506063612-leryt792evbx9hsy
2014-05-06 06:36:12 +00:00
540b753bf8
[ADD] Support for ir.attachments in assets bundles
...
bzr revid: fme@openerp.com-20140505160953-yk6688ey7eoz5579
2014-05-05 18:09:53 +02:00
45d64640f8
[REV] defer
...
bzr revid: fme@openerp.com-20140505131012-owp0qucjbnesp4ee
2014-05-05 15:10:12 +02:00
33ad1076e9
[TRY] defer
...
bzr revid: fme@openerp.com-20140505121036-044ecvq8s3d669b2
2014-05-05 14:10:36 +02:00
6c950dc970
[FIX] ir_qweb revert async script attribute
...
bzr revid: al@openerp.com-20140501212023-x9r57i05nrr0g29f
2014-05-01 23:20:23 +02:00
e6532d91ba
[FIX] ir_qweb set js assets to async
...
bzr revid: al@openerp.com-20140501205153-ko00g1vyyrmc21k8
2014-05-01 22:51:53 +02:00
8c6cbebc0e
[IMP] ir_qweb improve css minify
...
bzr revid: al@openerp.com-20140501190544-egvc85ctdxs69cmr
2014-05-01 21:05:44 +02:00
8d04c66dc3
[IMP] cleanups, move tests, remove deprecated model instantiation
...
bzr revid: al@openerp.com-20140501184217-pgi1gzbdpysdybog
2014-05-01 20:42:17 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
739793cdcd
[FIX] tests race condition in phanthomjs tests
...
A deadlock occurs when
- phantomjs_test1 is executedd, enter_test_mode is activated
- console.log('ok') is issued, sigterm is sent to phantomjs_test1 process
- phantomjs_test1 is finished and leave_test_mode restores the registrymanager lock
- phantomjs_test1 process, just before dying, makes a last http request phantomjs_test1_last_request
- phantomjs_test1_last_request thread will wait for the registrymanager lock, when all tests will be completed
- phantomjs_test2 is run, enter_test_mode is activated
- phantomjs_test2 is reach its end and _wait_remaining_requests is called
- phantomjs_test2 _wait_remaining_requests hangs forever waiting for phantomjs_test1_last_request
bzr revid: al@openerp.com-20140501150641-ua0b7pntesgm3n5p
2014-05-01 17:06:41 +02:00
8c20eeef6a
[MERGE] Web assets moved from manifests to ir.ui.view bundles
...
bzr revid: fme@openerp.com-20140430151137-c4ue5ko0vdyvoijt
2014-04-30 17:11:37 +02:00
a1b46eb0d2
[FIX] Disable inherit_branding for t-call-assets
...
bzr revid: fme@openerp.com-20140430081042-f77suergc85qemnn
2014-04-30 10:10:42 +02:00
677de74fef
[REM] @filename from WebAsset constructor
...
bzr revid: fme@openerp.com-20140430073537-lk4i126urhfkjdtz
2014-04-30 09:35:37 +02:00
c9873fb0b4
[FIX] http Internal Server Error when switching branches
...
When the source code doesnt match ir.models of the current session database,
openerp is unable to build a registry, we now clear the session instead of
issuing an http 500 error.
bzr revid: al@openerp.com-20140429232213-omao31x6fdxwg2ov
2014-04-30 01:22:13 +02:00
525b47510d
[IMP] allow to pass an avatar_filter in calendar view. this field allow the user to customize the sidebar pictures with another picture that the event.
...
bzr revid: jke@openerp.com-20140429150233-us6e51xl3o4ixzsi
2014-04-29 17:02:33 +02:00
27bd093089
[MERGE][REM] Configurable menu action for users -- was broken (server part)
...
This commit requires r3995 of web branch
bzr revid: rim@openerp.com-20140429144026-4zgv8ahb5er3rl83
2014-04-29 16:40:26 +02:00
db9448f8d2
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429142601-5pgb4l701c0deg58
2014-04-29 16:26:01 +02:00
c7e68feca8
[FIX] Dirty revert
...
bzr revid: rim@openerp.com-20140429135200-m6sx0gx0ga2qrk4g
2014-04-29 15:52:00 +02:00
2248056167
[FIX] routing_type meta info was populated too late in routing_map()
...
Could not call methods outside of an http request context
bzr revid: fme@openerp.com-20140429130916-7zuyzhf2ebcrlbhn
2014-04-29 15:09:16 +02:00
e8cf1cfb36
[IMP]
...
bzr revid: vme@tinyerp.com-20140429122209-djy2py9bswt602to
2014-04-29 17:52:09 +05:30
b93ca4f5fe
[IMP]indent
...
bzr revid: vme@tinyerp.com-20140429121650-n5resq8mwbxkjpcs
2014-04-29 17:46:50 +05:30
32674d563d
[IMP]add action_id
...
bzr revid: vme@tinyerp.com-20140429121349-ikq6iz1wswme7btn
2014-04-29 17:43:49 +05:30
5d13ad7ee8
[REM] query additional params for bundles
...
`translatable` has been removed from assets templates, no need for this anymore
bzr revid: fme@openerp.com-20140428124431-3b5rvyejjosftpq3
2014-04-28 14:44:31 +02:00
42d7f69af9
[IMP] base: add arch in searchable fields for model ir.ui.view (opw 607201)
...
bzr revid: mat@openerp.com-20140428121910-00wqenzg9adl2ukb
2014-04-28 14:19:10 +02:00
9462bec025
[FIX] Restore missing field arch in ir_ui_view search view - opw 607201
...
bzr revid: acl@openerp.com-20140428100319-52oband82ysw3tus
2014-04-28 12:03:19 +02:00
b2fc19045b
[FIX] release.py: correct version number (wrongly forward-ported from saas-4)
...
lp bug: https://launchpad.net/bugs/1278411 fixed
bzr revid: chs@openerp.com-20140428093924-2aq3zomkbxv31iu0
2014-04-28 11:39:24 +02:00
ee613ec6cd
[IMP] remove useless table/column creations in base.sql. Let the ORM do it job.
...
[FIX] force creation of workflow used columns.
bzr revid: chs@openerp.com-20140425162828-e85aut02ua8c53nv
2014-04-25 18:28:28 +02:00
4b3212c076
[IMP] better exception handling in case of missing asset
...
bzr revid: fme@openerp.com-20140425132804-e0dbsl5t2sod7kv5
2014-04-25 15:28:04 +02:00
75408134f9
[REM] Removed js and css manifest keys from base
...
bzr revid: fme@openerp.com-20140424165659-qzhryvgp8vmo1ssd
2014-04-24 18:56:59 +02:00
cebd89c148
[FIX] QWeb contact widget: fixed double escaping: only the address part needs to be escaped as it is shown in a t-raw (other parts are shown in t-esc).
...
bzr revid: sle@openerp.com-20140424144329-vj51bt0y269f1pwo
2014-04-24 16:43:29 +02:00
be43d5bdfd
[FIX] http: set back the gen_session_id controller, because still used by openframework.js of web branch
...
Related to revision 5124 revid:al@openerp.com-20140316141311-m0xqh386ax952va1
bzr revid: dle@openerp.com-20140424135507-5130yyy5brpfqd5f
2014-04-24 15:55:07 +02:00
c16780df83
[MERGE] forward port of branch saas-3 up to revid 5120 chs@openerp.com-20140424125338-26k5atvtqwmmfv4e
...
bzr revid: chs@openerp.com-20140424131405-4oannh1102x42m8b
2014-04-24 15:14:05 +02:00
e59aecca94
[MERGE] forward port of branch 7.0 up to revid 5288 mat@openerp.com-20140423150215-578nzug1glccvpwy
...
bzr revid: chs@openerp.com-20140424125338-26k5atvtqwmmfv4e
2014-04-24 14:53:38 +02:00
2ce61258ad
[FIX] Importing dateutil.relativedelta.relativedelta
...
bzr revid: stw@openerp.com-20140424092828-j8l6j1re9sa94m85
2014-04-24 11:28:28 +02:00
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
40bbf7b14d
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140424050500-dpi783nqij6ovg0j
2014-04-24 10:35:00 +05:30
56d2df71d3
[FIX] ir.ui.view missing time libraries in qweb rendering context
...
bzr revid: al@openerp.com-20140423162827-zw1fjysgkshgamwa
2014-04-23 18:28:27 +02:00
825848ba12
[MERGE] saas-4
...
bzr revid: sle@openerp.com-20140423160802-2kngtsa0zgkkegqx
2014-04-23 18:08:02 +02:00
91bf583b1c
[FIX] amount_to_text: make sure accented string is in unicode
...
bzr revid: mat@openerp.com-20140423150215-578nzug1glccvpwy
2014-04-23 17:02:15 +02:00
156225f9ea
[IMP] do not fail if cannot delete the pidfile. It may have a race-condition when in multi-workers.
...
bzr revid: chs@openerp.com-20140423150117-nyt16snzwvey2vz4
2014-04-23 17:01:17 +02:00
981f683f0f
[FIX] ir.ui.view: when post-validating views of a module, only validate updated views (left out old views that will be deleted at the end of the update)
...
bzr revid: chs@openerp.com-20140423145639-whfipjobbxgfzqvx
2014-04-23 16:56:39 +02:00
e3d7d2d7f5
[FIX] res_company view: improve usability of report configuration by hiding the rml fields without technical features
...
bzr revid: sle@openerp.com-20140423132635-ew4i2yu8xfxa1qls
2014-04-23 15:26:35 +02:00
901bb47235
[MERGE] [IMP] mail sanitizer: do not remove comments in html body when cleaning (and do not remove too many content) (opw 605315)
...
bzr revid: mat@openerp.com-20140423131919-q3vbw12tokglwdsq
2014-04-23 15:19:19 +02:00
8370d3f60e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123808-q58dtl8a0bb2ymlf
2014-04-23 14:38:08 +02:00
700763f2da
[MERGE][IMP] More explicit error message in res_currency
...
bzr revid: rim@openerp.com-20140423074037-igw9je00rcfgfzia
2014-04-23 09:40:37 +02:00
22df13f4fd
[FIX] res_currency: Removing unnecessary 'browse'
...
bzr revid: rim@openerp.com-20140423073511-kkjkt0a0baxz3466
2014-04-23 09:35:11 +02:00
c6189d91a0
[FIX] base: in partner search view, use operator=child_of instead of filter_domain with a child_of domain
...
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name
bzr revid: dle@openerp.com-20140422150736-o2t3eank6yqttlel
2014-04-22 17:07:36 +02:00
618fbde36f
[MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
...
bzr revid: chs@openerp.com-20140422144651-840zze7p5549k88s
bzr revid: chs@openerp.com-20140422144933-0su8g7pgrcloijco
2014-04-22 16:49:33 +02:00
f4a37244ca
[ADD] query to assets bundle html
...
bzr revid: fme@openerp.com-20140422134613-8652pfbrdso1qoqd
2014-04-22 15:46:13 +02:00
Fabien Meghazi
Launchpad Translations on behalf of openerp
Antony Lesuisse
Kersten Jeremy
Randhir Mayatra (OpenERP)
Richard Mathot (OpenERP)
Vidhin Mehta (OpenERP)
Martin Trigaux
Anael Closson
Christophe Simonis
Simon Lejeune
Denis Ledoux
Stephane Wirtel