Martin Trigaux
4f5cc00420
Forward-port of latest saas-4, up to revision 5211 (revid fme@openerp.com-20140509164408-rtml4brrhpiv4zz9)
2014-05-12 10:05:23 +02:00
Fabien Pinckaers
bcbd263214
[IMP] Adding fields
...
bzr revid: fp@tinyerp.com-20140511074755-5b3iy2b1xk7cjxmf
2014-05-11 09:47:55 +02:00
Fabien Meghazi
f506fc45a3
[MOV] ir.ui.view#write() forced noupdate moved in `website` (RTE only)
...
bzr revid: fme@openerp.com-20140509141106-vbokuh0prptxavvg
2014-05-09 16:11:06 +02:00
Jitendra Prajapati
9b15769a71
[MERGE] [IMP] Misc view improvements using better name_get / name_search.
...
bzr revid: tde@openerp.com-20140509094920-94z2i7hfao3xxu4n
2014-05-09 11:49:20 +02:00
Launchpad Translations on behalf of openerp
12a1a6d09a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140509064656-2k19o4v4ozt4yvg3
2014-05-09 06:46:56 +00:00
Fabien Meghazi
522dec2fcd
[IMP] assets bundle: allow to filter on type of assets
...
bzr revid: fme@openerp.com-20140508115157-ngtf46vasmygvt7n
2014-05-08 13:51:57 +02:00
Fabien Meghazi
e9572c56b3
[IMP] monodb selects first database if only one match. Even if db-filter was not provided
...
bzr revid: fme@openerp.com-20140508083921-pu2zte8fq69wvo8o
2014-05-08 10:39:21 +02:00
Fabien Meghazi
cf87afbe0a
[FIX] configuration file dbfilter's option has no effect
...
lp bug: https://launchpad.net/bugs/940439 fixed
bzr revid: fme@openerp.com-20140508075025-yszqmzie1z4n7l4j
2014-05-08 09:50:25 +02:00
Jitendra Prajapati (OpenERP)
49a7338b00
[IMP]improve code: call super method instead of manual search
...
bzr revid: jpr@tinyerp.com-20140508052730-5oztw3um6h42osvd
2014-05-08 10:57:30 +05:30
Olivier Dony
4a248b029a
[MERGE] I18N: make fr_CA one of the default installation languages, courtesy of Maxime Chambreuil (SavoirFaireLinux)
...
bzr revid: odo@openerp.com-20140507123155-blwh7uvmltajkmf5
2014-05-07 14:31:55 +02:00
Fabien Meghazi
cea5591742
[FIX] runbot color
...
bzr revid: fme@openerp.com-20140507074310-bt0r1vt6rsgy9wqe
2014-05-07 09:43:10 +02:00
Fabien Meghazi
15380fd5d2
[ADD] modules global rendering variable
...
This is temporary
bzr revid: fme@openerp.com-20140506163204-u63n3wv1yv6yohd3
2014-05-06 18:32:04 +02:00
Mantavya Gajjar
b712f38fb8
[IMP]: improve code
...
bzr revid: mga@tinyerp.com-20140506122206-o1oj4zihrq3b2t0u
2014-05-06 17:52:06 +05:30
Denis Ledoux
fbbefe43c0
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 5122 revid:dle@openerp.com-20140506121627-4oyw4zl4o6azy73w
...
bzr revid: dle@openerp.com-20140506121755-15gj3h43oqof6xx9
2014-05-06 14:17:55 +02:00
Denis Ledoux
b882dd7109
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5294 revid:odo@openerp.com-20140505074636-bl2y5pst4pfmpz3u
...
bzr revid: dle@openerp.com-20140506121627-4oyw4zl4o6azy73w
2014-05-06 14:16:27 +02:00
Jitendra Prajapati (OpenERP)
e418d2b2f6
[IMP]override name_search method
...
bzr revid: jpr@tinyerp.com-20140506102333-c8nrun01dxgjel22
2014-05-06 15:53:33 +05:30
Jitendra Prajapati (OpenERP)
394a525e22
[IMP]override name_search method
...
bzr revid: jpr@tinyerp.com-20140506100853-80b45nx286hw1gfh
2014-05-06 15:38:53 +05:30
Jitendra Prajapati (OpenERP)
41ca72726c
[IMP]ir_property: remove override name_get method
...
bzr revid: jpr@tinyerp.com-20140506084138-icrmht6081fjlrbb
2014-05-06 14:11:38 +05:30
Jitendra Prajapati (OpenERP)
8a0befcc4c
[IMP]base_module_immediate_install.xml: remove the change in spacing
...
bzr revid: jpr@tinyerp.com-20140506084026-sxcy2smsisdrjoo2
2014-05-06 14:10:26 +05:30
Jitendra Prajapati (OpenERP)
d480454ed1
[IMP]ir_config_parameter.py: use _rec_name.
...
bzr revid: jpr@tinyerp.com-20140506083931-j8352t1rqfhvpgz0
2014-05-06 14:09:31 +05:30
Jitendra Prajapati (OpenERP)
d5e9847b0d
[IMP]remove unnecessary check on ids
...
bzr revid: jpr@tinyerp.com-20140506083630-i1o5flr7p8apgrym
2014-05-06 14:06:30 +05:30
Launchpad Translations on behalf of openerp
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
Fabien Meghazi
540b753bf8
[ADD] Support for ir.attachments in assets bundles
...
bzr revid: fme@openerp.com-20140505160953-yk6688ey7eoz5579
2014-05-05 18:09:53 +02:00
Thibault Delavallée
272b71b2a0
[MERGE] [FIX] res_partner: fixed bad display of address in form view in IE9.
...
lp bug: https://launchpad.net/bugs/1293523 fixed
bzr revid: tde@openerp.com-20140505145031-xgvti78aqspr5170
2014-05-05 16:50:31 +02:00
Fabien Meghazi
45d64640f8
[REV] defer
...
bzr revid: fme@openerp.com-20140505131012-owp0qucjbnesp4ee
2014-05-05 15:10:12 +02:00
Martin Trigaux
5e406734ab
[FIX] module: do not crash in case of not found module
...
bzr revid: mat@openerp.com-20140505121840-f84u36mng3p1gstn
2014-05-05 14:18:40 +02:00
Fabien Meghazi
33ad1076e9
[TRY] defer
...
bzr revid: fme@openerp.com-20140505121036-044ecvq8s3d669b2
2014-05-05 14:10:36 +02:00
Jitendra Prajapati (OpenERP)
1bb22f2ddd
[MERGE]with main branch
...
bzr revid: jpr@tinyerp.com-20140505095333-v514kj2dz0advdf8
2014-05-05 15:23:33 +05:30
Olivier Dony
188930bb01
[FIX] convert: gracefully ignore missing XML IDs when processing <delete> tags + warn in log
...
bzr revid: odo@openerp.com-20140505074636-bl2y5pst4pfmpz3u
2014-05-05 09:46:36 +02:00
Launchpad Translations on behalf of openerp
f426972e37
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
2014-05-04 06:27:21 +00:00
Antony Lesuisse
434c3c455e
[FIX] free chs who was stuck in a 2010 spacetime continuum
...
bzr revid: al@openerp.com-20140501214501-dnt6qjxvqa8tm58o
2014-05-01 23:45:01 +02:00
Antony Lesuisse
6c950dc970
[FIX] ir_qweb revert async script attribute
...
bzr revid: al@openerp.com-20140501212023-x9r57i05nrr0g29f
2014-05-01 23:20:23 +02:00
Antony Lesuisse
e6532d91ba
[FIX] ir_qweb set js assets to async
...
bzr revid: al@openerp.com-20140501205153-ko00g1vyyrmc21k8
2014-05-01 22:51:53 +02:00
Antony Lesuisse
8c6cbebc0e
[IMP] ir_qweb improve css minify
...
bzr revid: al@openerp.com-20140501190544-egvc85ctdxs69cmr
2014-05-01 21:05:44 +02:00
Antony Lesuisse
8d04c66dc3
[IMP] cleanups, move tests, remove deprecated model instantiation
...
bzr revid: al@openerp.com-20140501184217-pgi1gzbdpysdybog
2014-05-01 20:42:17 +02:00
Antony Lesuisse
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
Antony Lesuisse
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
Fabien Meghazi
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
Fabien Meghazi
a1b46eb0d2
[FIX] Disable inherit_branding for t-call-assets
...
bzr revid: fme@openerp.com-20140430081042-f77suergc85qemnn
2014-04-30 10:10:42 +02:00
Fabien Meghazi
677de74fef
[REM] @filename from WebAsset constructor
...
bzr revid: fme@openerp.com-20140430073537-lk4i126urhfkjdtz
2014-04-30 09:35:37 +02:00
Antony Lesuisse
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
Kersten Jeremy
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
Randhir Mayatra (OpenERP)
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
Fabien Meghazi
db9448f8d2
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429142601-5pgb4l701c0deg58
2014-04-29 16:26:01 +02:00
Richard Mathot (OpenERP)
c7e68feca8
[FIX] Dirty revert
...
bzr revid: rim@openerp.com-20140429135200-m6sx0gx0ga2qrk4g
2014-04-29 15:52:00 +02:00
Fabien Meghazi
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
Vidhin Mehta (OpenERP)
e8cf1cfb36
[IMP]
...
bzr revid: vme@tinyerp.com-20140429122209-djy2py9bswt602to
2014-04-29 17:52:09 +05:30
Vidhin Mehta (OpenERP)
b93ca4f5fe
[IMP]indent
...
bzr revid: vme@tinyerp.com-20140429121650-n5resq8mwbxkjpcs
2014-04-29 17:46:50 +05:30
Vidhin Mehta (OpenERP)
32674d563d
[IMP]add action_id
...
bzr revid: vme@tinyerp.com-20140429121349-ikq6iz1wswme7btn
2014-04-29 17:43:49 +05:30
Richard Mathot (OpenERP)
f3b5913842
[IMP] res_group: more explicit constraint error message
...
bzr revid: rim@openerp.com-20140429071125-avjggwlmlozv7hz5
2014-04-29 09:11:25 +02:00