Thibault Delavallée
438c6683d7
[MERGE] Sync with main website branch
...
bzr revid: tde@openerp.com-20130923135558-rlz33deoydy35gfs
2013-09-23 15:55:58 +02:00
Xavier Morel
5051c85a9b
[IMP] RTE support
...
bzr revid: xmo@openerp.com-20130923120632-3wv5r5y3936famhk
2013-09-23 14:06:32 +02:00
Thibault Delavallée
be966b02c7
[IMP] tools: mail: improved html_email_clean
...
- 'read more' links are now in the last container, not after, allowing to have read more
links embedded inside shortened paragraphs
- added expand_options dict allowing to customize the read more
bzr revid: tde@openerp.com-20130923112939-0ab4idlzqpug00xz
2013-09-23 13:29:39 +02:00
Xavier Morel
be59c06403
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20130923111950-uk163cp891zl021h
2013-09-23 13:19:50 +02:00
Fabien Pinckaers
6188a2af5b
[IMP] YourCompany
...
bzr revid: fp@openerp.com-20130922193636-3iz72tu6c12j5x5l
2013-09-22 21:36:36 +02:00
Fabien Pinckaers
704639cc7c
[IMP] revert
...
bzr revid: fp@openerp.com-20130922172851-j9jrcjcyc5kmtlik
2013-09-22 19:28:51 +02:00
Fabien Pinckaers
29326cd993
[IMP] Add file='...' on <field> tags + [FIX] forced noupdate
...
bzr revid: fp@openerp.com-20130922093113-80p3pig45qbm7lsn
2013-09-22 11:31:13 +02:00
Xavier Morel
724bbffc88
[FIX] Partially revert xmo@openerp.com-20130812074509-yopeb4pxtsads4d9
...
Change attempted to simplify branding distribution, but based node
branding on final view. To be able to rewrite, node branding must be
based on source views positions before applying inheritance.
Reintroduce manual generation of xpath in distribute_branding as
ElementTree.getpath() can't handle it.
Note: why isn't branding distribution performed during initial views
reading (e.g. inherit_branding)? Surely that would obviate the need
for special casing and manually creating paths no?
bzr revid: xmo@openerp.com-20130919130847-3t8zfpv9m9pcibg0
2013-09-19 15:08:47 +02:00
Xavier Morel
4b89b246a8
[FIX] distribute branding on t-if, t-for and t-att
...
bzr revid: xmo@openerp.com-20130917163708-u61ol5yqr3nrd9mu
2013-09-17 18:37:08 +02:00
Xavier Morel
47fac4836b
[IMP] avoid using Element.attrib when unnecessary
...
bzr revid: xmo@openerp.com-20130917154505-4kf77rqjrg1bncvk
2013-09-17 17:45:05 +02:00
Xavier Morel
8159503eb1
[FIX] ensure we distribute branding only over actual element, not over e.g. comments
...
bzr revid: xmo@openerp.com-20130917154414-zdbv7861e9p6mdgi
2013-09-17 17:44:14 +02:00
Xavier Morel
779667d690
[IMP] add assertion to prevent <td t-field> which breaks RTE widgets
...
bzr revid: xmo@openerp.com-20130917113022-idty6l0cwuox3s59
2013-09-17 13:30:22 +02:00
Xavier Morel
5e66ecaf55
[FIX] serializer uses nodeName, not tagName. Set that
...
bzr revid: xmo@openerp.com-20130917112718-rnbxcoq584rt08qp
2013-09-17 13:27:18 +02:00
Xavier Morel
f4520d3f86
[FIX] mapping type is integer not int
...
bzr revid: xmo@openerp.com-20130913132131-bs8auaq7bvz64dbf
2013-09-13 15:21:31 +02:00
Xavier Morel
cbb5bf3c56
[MERGE] from parent
...
bzr revid: xmo@openerp.com-20130912141037-xqu3qpcyjph4xltu
2013-09-12 16:10:37 +02:00
Xavier Morel
b84c7c6ebc
[FIX] avoid <t t-field=...> yielding just text without markup
...
bzr revid: xmo@openerp.com-20130912140532-qejpqr037x99qrln
2013-09-12 16:05:32 +02:00
Xavier Morel
cc187b884b
[IMP] re-enable XML check on view arch
...
bzr revid: xmo@openerp.com-20130912124334-skafqdt0hxna7frx
2013-09-12 14:43:34 +02:00
Xavier Morel
5bd3396023
[TEMP] embed original expression in output to reverse correctly
...
bzr revid: xmo@openerp.com-20130910143345-es9vbvxlfq5sra6h
2013-09-10 16:33:45 +02:00
Xavier Morel
59734d3e34
[FIX] no need to use types for builtins (also fixes broken import, oops)
...
bzr revid: xmo@openerp.com-20130910134402-1fj37o3pxtb4hrau
2013-09-10 15:44:02 +02:00
Xavier Morel
85a3d8eaeb
[FIX] moved view.save to website, forgot to move tests
...
bzr revid: xmo@openerp.com-20130910132638-2v4ilmi5uuboazt9
2013-09-10 15:26:38 +02:00
Xavier Morel
420a65cdad
[IMP] remove unneeded import, cases redundancy
...
bzr revid: xmo@openerp.com-20130910125015-75tjdv1eopipwk4m
2013-09-10 14:50:15 +02:00
Xavier Morel
21ae2e059a
[REM] noop
...
bzr revid: xmo@openerp.com-20130910124731-dx2hygjm6ixkw81j
2013-09-10 14:47:31 +02:00
Xavier Morel
8bb10bdf67
[FIX] incorrect conversion of some fields transmogrification in template tag
...
bzr revid: xmo@openerp.com-20130910103526-r9q98zirvmiylr69
2013-09-10 12:35:26 +02:00
Xavier Morel
bb14116785
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20130909095042-zf9p1qybf4f2b7gu
2013-09-09 11:50:42 +02:00
Xavier Morel
a61e7b5efa
[REM] view.save, move to website module where it belongs
...
bzr revid: xmo@openerp.com-20130906130905-86ul9efvjt6wo1j2
2013-09-06 15:09:05 +02:00
Xavier Morel
4f6af7f857
[REM] page attribute on views, doesn't belong in server
...
bzr revid: xmo@openerp.com-20130906091108-gk2biyqyi2xaekxl
2013-09-06 11:11:08 +02:00
Xavier Morel
3d42f63246
[IMP] remove unused imports
...
bzr revid: xmo@openerp.com-20130906091013-4smmete74hc9kpj1
2013-09-06 11:10:13 +02:00
Xavier Morel
367f8dcf83
[FIX] some models rename fields parameter to read, revert passing it by name to positionally
...
bzr revid: xmo@openerp.com-20130904105318-ib5gwejlplozo12d
2013-09-04 12:53:18 +02:00
ddm
a7d956cf93
Fix
...
bzr revid: ddm@openerp.com-20130830144040-u7ae70fmw545ej7n
2013-08-30 16:40:40 +02:00
Christophe Matthieu
7155455ddf
[FIX] qweb: remove argument form t-att-argument if the content value is empty, None or False
...
bzr revid: chm@openerp.com-20130829132641-r4u6os0xw8ol424d
2013-08-29 15:26:41 +02:00
Xavier Morel
e692f8b2be
[FIX] Logger.getChild(suffix) — New in version 2.7.
...
bzr revid: xmo@openerp.com-20130829101715-vn8zn7cxntdgtleg
2013-08-29 12:17:15 +02:00
Christophe Matthieu
c36bfe173e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130828161130-641xsmbr8xm53xjx
2013-08-28 18:11:30 +02:00
Fabien Pinckaers
53824ea842
[MERGE] forward port fix from trunk for access rights on /shop
...
bzr revid: fp@tinyerp.com-20130828095443-pxll7f4cx8g20flm
2013-08-28 11:54:43 +02:00
ccbb4335ec
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130828050349-f8ozlg2e354f87ge
2013-08-28 05:03:49 +00:00
niv-openerp
00d3d9a4b6
[FIX] im: multiple bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826135135-93tmyi6a1fpju8vy
2013-08-26 15:51:35 +02:00
niv-openerp
05a1a5ffe6
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130826131051-c7aatnvew9q52iw6
2013-08-26 15:10:51 +02:00
niv-openerp
5e8315730b
Solved a few bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826125254-smlkkh5m3n36cklw
2013-08-26 14:52:54 +02:00
niv-openerp
8ee25f9856
Refactored to avoid user duplication problem
...
bzr revid: nicolas.vanhoren@openerp.com-20130826123947-alcsov647beqge0c
2013-08-26 14:39:47 +02:00
niv-openerp
7bce27c528
Now uses im.user's images
...
bzr revid: nicolas.vanhoren@openerp.com-20130826085212-od9oxv6h4jtkd6nf
2013-08-26 10:52:12 +02:00
niv-openerp
8f33049f2f
Changed user field to user_id and added unique constraint
...
bzr revid: nicolas.vanhoren@openerp.com-20130826084554-221ts80q8c5jvqv1
2013-08-26 10:45:54 +02:00
7294b0ebfa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824050400-vvklljkx8p2e77no
2013-08-24 05:04:00 +00:00
Christophe Simonis
f751ce30b7
[FIX] project: correct migrate_to_alias call
...
bzr revid: chs@openerp.com-20130823161810-417zchlc06mbzcb8
2013-08-23 18:18:10 +02:00
Christophe Simonis
5343c48c5f
[MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
...
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
Christophe Simonis
b86eee378e
[MERGE] forward port of branch saas-1 up to revid 3743 chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
...
bzr revid: chs@openerp.com-20130823145527-fz58kta3qpup4sb2
2013-08-23 16:55:27 +02:00
Christophe Simonis
993bff902e
[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
...
bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88
2013-11-15 11:49:09 +01:00
Christophe Simonis
1e4b2695d5
[MERGE][FIX] web: fix race condition in BufferedDataset.
...
Backport of saas-2 commit 3867 nicolas.vanhoren@openerp.com-20131107112017-7omd01ocvnbzx9m6
lp bug: https://launchpad.net/bugs/1248531 fixed
bzr revid: chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
2013-11-14 15:26:39 +01:00
Thibault Delavallée
ebe580f481
[FIX] portal: mail_message override: do not check access rules for SUPERUSER_ID
...
bzr revid: tde@openerp.com-20131114123346-dbnrkh6nadl774qe
2013-11-14 13:33:46 +01:00
Christophe Simonis
079bf31706
[FIX] account_payment: avoid using non-stored function field in domains.
...
Backport of following commits from trunk branch:
8962 qdp-launchpad@openerp.com-20131030164925-c66d7jfx0x3546kt
8974 qdp-launchpad@openerp.com-20131113100713-tvl30z5oqym22jqj
bzr revid: chs@openerp.com-20131114111802-a7rp2slqyigvconz
2013-11-14 12:18:02 +01:00
Christophe Simonis
e5ca5a170c
[FIX] web: list views: bubble up failed deferreds.
...
[FIX] web: list view group: always call post_render method
lp bug: https://launchpad.net/bugs/1248531 fixed
bzr revid: chs@openerp.com-20131114110847-nn382fc60s7u7wp1
2013-11-14 12:08:47 +01:00
Denis Ledoux
e5f75b67c0
[FIX]portal_claim: change of record rule for portal group for object portal.claim, to change behaviour: portal users can now create claims in the portal, read their claims, but cant edit or delete them. They can post messages in the chatter if they want to add something
...
bzr revid: dle@openerp.com-20131114095907-ge8f97r6kxnv06fx
2013-11-14 10:59:07 +01:00
Thibault Delavallée