Commit Graph

802 Commits

Author SHA1 Message Date
Fabien Pinckaers 81b28ae22d [IMP] read more new line
bzr revid: fp@tinyerp.com-20130930075727-uoxqbloao2mbyw6t
2013-09-30 09:57:27 +02:00
Fabien Pinckaers 4b5d3e4a40 [IMP] priority on views
bzr revid: fp@openerp.com-20130929085000-p2pcmkdubqw1lfbj
2013-09-29 10:50:00 +02:00
Xavier Morel f652a2b5eb [FIX] ban more stuff
bzr revid: xmo@openerp.com-20130927124523-kssjn9rug2vozuwc
2013-09-27 14:45:23 +02:00
Xavier Morel 0b90087828 [IMP] field regularity
Make @file a more generic data source, add base64 type for b64 encoding

bzr revid: xmo@openerp.com-20130927121325-mbjm4612qkaa0z0x
2013-09-27 14:13:25 +02:00
Xavier Morel 47c6314c44 [FIX] force-encode unicode stuff
bzr revid: xmo@openerp.com-20130927121012-28qllo0i3g62c7jw
2013-09-27 14:10:12 +02:00
Xavier Morel 9194f3eb78 [FIX] cgi removal
bzr revid: xmo@openerp.com-20130927120503-9ubf7vgrt38xjywc
2013-09-27 14:05:03 +02:00
Xavier Morel c741c0eeb1 [IMP] reimplement t-field using new converters
bzr revid: xmo@openerp.com-20130926145126-21hlubvs39a0z68j
2013-09-26 16:51:26 +02:00
Xavier Morel 2837c1dc27 [ADD] composition function utility
bzr revid: xmo@openerp.com-20130925145205-vumu9cgr5kob0900
2013-09-25 16:52:05 +02:00
Xavier Morel c36bd85c27 [REM] automagic tag creation in t-field rendering
bzr revid: xmo@openerp.com-20130925121028-s1i1628vt7rtopzn
2013-09-25 14:10:28 +02:00
Fabien Meghazi 581dad9316 [ADD] qweb @t-action
bzr revid: fme@openerp.com-20130926145342-ncl8ahoof6y6grj4
2013-09-26 16:53:42 +02:00
Fabien Meghazi ef800c1109 [ADD] data-oe-translate
bzr revid: fme@openerp.com-20130926092656-2ohyho3t01fiw9us
2013-09-26 11:26:56 +02:00
Fabien Meghazi e01f97e8f7 [MERGE] upstream
bzr revid: fme@openerp.com-20130925085305-wbmdcm75i6o1qm30
2013-09-25 10:53:05 +02:00
Fabien Meghazi 56ca9e9105 [ADD] Qweb: added t-href and t-src using url_for
bzr revid: fme@openerp.com-20130924084620-dpnpwpehok7r863b
2013-09-24 10:46:20 +02:00
Thibault Delavallée 470179bf80 [ADD] wrapper node for more field types
bzr revid: tde@openerp.com-20130923143416-hmxdll0gi0w0un2j
2013-09-23 16:34:16 +02:00
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
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 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
Christophe Simonis fd9a9577df [MERGE] forward port of branch saas-1 up to revid 4908 dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: chs@openerp.com-20130918171816-cxxt3c9ktcq4a8oz
2013-09-18 19:18:16 +02:00
Olivier Dony 8ac110c4dd [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
2013-10-11 15:44:33 +02:00
Stefan Rijnhart 7de17a9358 [FIX] Keep backwards compatibility with Babel 0.9.6
bzr revid: stefan@therp.nl-20130918074505-59q1fs3ixlev1ein
2013-09-18 09:45:05 +02:00
Stefan Rijnhart a9b8936a4d [RVT] Undo previous fix
bzr revid: stefan@therp.nl-20130918074407-ae6yu2f001vxl0le
2013-09-18 09:44:07 +02:00
Stefan Rijnhart b224b40fac [FIX] Restore compatibility with Babel > 0.9.6
lp bug: https://launchpad.net/bugs/1226576 fixed

bzr revid: stefan@therp.nl-20130917122312-r6s7dgzdsfil7xyg
2013-09-17 14:23:12 +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
Thibault Delavallée 8583ced4cc [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130910151742-rgmc2jwx6zyg38lp
bzr revid: tde@openerp.com-20130912073916-1ph4x7cw6oovdafl
bzr revid: tde@openerp.com-20130916092207-5rqco7ua9tbd1cvh
2013-09-16 11:22:07 +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 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 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 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
Christophe Simonis 4327e09a55 [MERGE] forward port of branch saas-1 up to revid 4903 dle@openerp.com-20130909170248-a4t5y6qd5ikkhhac
bzr revid: chs@openerp.com-20130910121230-xcr2yj6rpbo83wy0
2013-09-10 14:12:30 +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
Antony Lesuisse 2a6d0299d9 revert to use a separate executable for gevent, add --dev option
bzr revid: al@openerp.com-20130909200825-sm5c3invmg7tt70j
2013-09-09 22:08:25 +02:00
Antony Lesuisse dfb9d317f2 [MERGE] data file loading refactoring, ready for code autoreload
bzr revid: al@openerp.com-20130909105523-jkffhy5gr34k25hr
2013-09-09 12:55:23 +02:00
Xavier Morel bb14116785 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130909095042-zf9p1qybf4f2b7gu
2013-09-09 11:50:42 +02:00
Thibault Delavallée 43dc750917 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130826085405-04kpm11rfz9m6zgk
bzr revid: tde@openerp.com-20130902142029-8u7esi4j51g8xguj
bzr revid: tde@openerp.com-20130906081619-m84142whjfs2zbdg
bzr revid: tde@openerp.com-20130909093131-rnj42h1tu7s5akt2
2013-09-09 11:31:31 +02:00
Xavier Morel 945376a066 [FIX] no Logger.getChild in Python 2.6
bzr revid: xmo@openerp.com-20130906135331-zt3uzoeupvlba513
2013-09-06 15:53:31 +02:00
ddm a7d956cf93 Fix
bzr revid: ddm@openerp.com-20130830144040-u7ae70fmw545ej7n
2013-08-30 16:40:40 +02:00
Christophe Simonis b5f38f8b7d [FIX] html_sanitize: allow new semantic HTML5 tags
bzr revid: chs@openerp.com-20130830093253-o6lcg432wrt63ftt
2013-08-30 11:32:53 +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 Meghazi 7781e1df23 [IMP] QWeb: allow t-call to use dynamic template name using string interpolation
bzr revid: fme@openerp.com-20130821153507-qlh3aaytsouupx1m
2013-08-21 17:35:07 +02:00
Xavier Morel 516c81b4fc [MERGE] flag indicating whether a view template is or is not a page
Used to list all existing CMS pages from the RTE's link dialog

bzr revid: xmo@openerp.com-20130821143404-r8hnemydlvg3cjvs
2013-08-21 16:34:04 +02:00
Fabien Meghazi 83d5da0a1d [FIX] QWeb: foreach does not correctly handle @t-as
bzr revid: fme@openerp.com-20130821140910-bara9ykq4j8lix0t
2013-08-21 16:09:10 +02:00
Xavier Morel d8bf3892f3 [ADD] page attribute to views
This can be used to distinguish template views expected to be
available as web pages, and thus directly linkable. By opposition to
non-web views and template sections (reusables).

bzr revid: xmo@openerp.com-20130821121206-ebxsxrmyogcv7pnv
2013-08-21 14:12:06 +02:00
Christophe Simonis 208b697239 [MERGE] forward port of branch saas-1 up to revid 4899 chs@openerp.com-20130821094758-1ae0d1ml5obufzxv
bzr revid: odo@openerp.com-20130820160346-qcdy4kavgm5cb9t6
bzr revid: chs@openerp.com-20130821103139-zqqbrt8dq6iixrny
2013-08-21 12:31:39 +02:00
Christophe Simonis 8179683143 [IMP] html_sanitize:
- add option to reraise catched exceptions
 - only keep safe attributes (style is considered safe) (depending of lxml version)
 - remove forms tags

bzr revid: chs@openerp.com-20130821094758-1ae0d1ml5obufzxv
2013-08-21 11:47:58 +02:00
Fabien Meghazi 4a4169ba75 [FIX] QWeb: omit non elements when searching for template declaration
bzr revid: fme@openerp.com-20130821094535-9gnpix2wu5zmncnc
2013-08-21 11:45:35 +02:00
Olivier Dony fbd0758cb5 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5054 rev-id: odo@openerp.com-20130820091157-e5brwlxuhujf8rrd
bzr revid: chs@openerp.com-20130724085026-525l9apggc9yzx0h
bzr revid: odo@openerp.com-20130730140644-1xih0as5jsks4pub
bzr revid: dle@openerp.com-20130801130723-khgwjkglgsdn34fj
bzr revid: odo@openerp.com-20130820091638-jpbcmh653bpa29em
2013-08-20 11:16:38 +02:00
Christophe Matthieu 346b9c2102 [IMP] qweb: catch orm,osv exception and return it
bzr revid: chm@openerp.com-20130814151018-i5m97i14cu71hisd
2013-08-14 17:10:18 +02:00
Fabien Meghazi 40c80e2ce4 [ADD] Added repr() and t-debug to QWeb
bzr revid: fme@openerp.com-20130813140809-qr12j6cy5ix4glsp
2013-08-13 16:08:09 +02:00
Christophe Matthieu ff304bd424 [IMP] qweb: add the current error traceback into the qweb traceback, if they are an error of expression evaluation
bzr revid: chm@openerp.com-20130813084543-0d7qvwdrija43g71
2013-08-13 10:45:43 +02:00
Xavier Morel 212f088aea [MERGE] from trunk-website-al
bzr revid: xmo@openerp.com-20130812075650-sv5v98kuuifaog2z
2013-08-12 09:56:50 +02:00
Xavier Morel fc2d751eb3 [IMP] dict.get's default is None, remove pointless explicit defaults
bzr revid: xmo@openerp.com-20130812075044-8d4nc5dscarbu1vj
2013-08-12 09:50:44 +02:00
Fabien Meghazi bf9bb35039 [ADD] Qweb __stack__ and __caller__ in QWeb rendering context
bzr revid: fme@openerp.com-20130812105211-r2ct4wjf2hj8gbeu
2013-08-12 12:52:11 +02:00
Xavier Morel fcdbfe364d [IMP] dict.get's default is None, remove pointless explicit defaults
bzr revid: xmo@openerp.com-20130812075044-ko8hozdnz2b5c3vk
2013-08-12 09:50:44 +02:00
Fabien Pinckaers e59fe5ff90 [FIX] keep t as template name for templates
bzr revid: fp@openerp.com-20130810203756-votwz009a3m3bf2b
2013-08-10 22:37:56 +02:00
Fabien Pinckaers 97760d0af3 [FIX] typo
bzr revid: fp@tinyerp.com-20130810141307-zopo49miu378pyf4
2013-08-10 16:13:07 +02:00
Fabien Pinckaers ddd75c0b23 [FIX] typo
bzr revid: fp@tinyerp.com-20130810133924-462pnkxctqnim36j
2013-08-10 15:39:24 +02:00
Fabien Pinckaers 0adaae13fb [IMP] Allows to put a name on views
bzr revid: fp@tinyerp.com-20130810133805-f1bzaaet7s1c8g9b
2013-08-10 15:38:05 +02:00
Fabien Pinckaers 14e555d920 [IMP] support for inherit_option_id, <template> for inherited views
bzr revid: fp@tinyerp.com-20130810132449-tckikyrtqcawnzor
2013-08-10 15:24:49 +02:00
Xavier Morel 2a2398eaf9 [IMP] lxml doc recommends using .get/.set/.keys/.values/.items for attributes manipulation where possible
bzr revid: xmo@openerp.com-20130809135141-114l6262wdts0i43
2013-08-09 15:51:41 +02:00
Xavier Morel 45d5d2f0e1 [IMP] tpl_id should already be a string
bzr revid: xmo@openerp.com-20130809134746-3mgio3vaedt93l3u
2013-08-09 15:47:46 +02:00
Xavier Morel 493bfc9374 [FIX] omagerd don't completely misuse lxml in retarded ways
bzr revid: xmo@openerp.com-20130809134524-wldxjgda13sl21fa
2013-08-09 15:45:24 +02:00
Xavier Morel 2e7dab82cb [IMP] don't use dict.get when not handling None result anyway
bzr revid: xmo@openerp.com-20130809134444-ijl0u4glzuufylby
2013-08-09 15:44:44 +02:00
Fabien Meghazi cc3ef85dd7 [WIP] eval globals - will check safe_eval later
bzr revid: fme@openerp.com-20130808223938-5sp7vrnejmxtg7j6
2013-08-09 00:39:38 +02:00
Fabien Meghazi a467b2d0ef [IMP] Qweb, use undefined handler
bzr revid: fme@openerp.com-20130808182218-3a9vb97gx49alyzz
2013-08-08 20:22:18 +02:00
Fabien Meghazi 2d4452c2da [FIX] QWeb expression evaluation + undefined variable management WIP
bzr revid: fme@openerp.com-20130808181138-klb1hs9cfsvzrle4
2013-08-08 20:11:38 +02:00
Thibault Delavallée e3175e482f [TESTS] tools: mail: added some tests + some cleaning in tests
bzr revid: tde@openerp.com-20130808132258-01sv0w1hrgtdyogq
2013-08-08 15:22:58 +02:00
Thibault Delavallée 577f56497b [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130808083426-46cvo5e1g3x8nvgs
2013-08-08 10:34:26 +02:00
Fabien Meghazi 83055fb904 [IMP] pynazilint
bzr revid: fme@openerp.com-20130808080742-do371111f1rmq3n0
2013-08-08 10:07:42 +02:00
Fabien Meghazi 89a6d2744c [FIX] make QWeb usable in standalone mode
bzr revid: fme@openerp.com-20130807133939-3c2jxg5btjj8d2rq
2013-08-07 15:39:39 +02:00
Christophe Matthieu 2e88574a57 [IMP] res.partner: add us country for demo data
bzr revid: chm@openerp.com-20130807090054-5sa1vst28w9exenw
2013-08-07 11:00:54 +02:00
Thibault Delavallée d1e7ad9be6 [IMP] tools: added a regex for bounce email addresses
bzr revid: tde@openerp.com-20130806151018-0uom07dbr8b7ycb3
2013-08-06 17:10:18 +02:00
Fabien Meghazi 1b40e9265f [FIX] Replace views string interpolation by manual replacement.
No need to double % in views anymore

bzr revid: fme@openerp.com-20130806113626-t7y3v1trtfdtitar
2013-08-06 13:36:26 +02:00
Christophe Matthieu 81ae0babf2 [FIX] qweb: many2one field = False
bzr revid: chm@openerp.com-20130806091554-dpjl4ienh21c14zi
2013-08-06 11:15:54 +02:00
Christophe Matthieu bf44e33c87 [FIX] qweb: access right for name_get on many2one field
bzr revid: chm@openerp.com-20130806090704-4igjnhsuwi59hkpm
2013-08-06 11:07:04 +02:00
Christophe Matthieu 3f90f2c5e5 [IMP] qweb: clean code
bzr revid: chm@openerp.com-20130805154542-l7dovsfikqk4l32y
2013-08-05 17:45:42 +02:00
Frédéric van der Essen bd81cfd1f2 [FIX] only self-close void elements
bzr revid: fva@openerp.com-20130805130605-8decmjyplrstszgp
2013-08-05 15:06:05 +02:00
Christophe Matthieu 343ff62c8c [FIX] qweb: div autoclose
bzr revid: chm@openerp.com-20130805124236-59j42sm6ararml1t
2013-08-05 14:42:36 +02:00
Christophe Matthieu d535b45810 [MERGE] from website-al
bzr revid: chm@openerp.com-20130805083938-xquerxe417mmvh73
2013-08-05 10:39:38 +02:00
Fabien Pinckaers f8a71e4a87 [FIX] eval t-field
bzr revid: fp@openerp.com-20130804202720-4bxsshh2ykzkjo7a
2013-08-04 22:27:20 +02:00
Fabien Pinckaers 9c0cf69509 [IMP] changed t-field syntax from <div t-record=record t-field='field'/> to <div t-field='record.field'/>
bzr revid: fp@openerp.com-20130804202331-plkhcfry1zg880rx
2013-08-04 22:23:31 +02:00
Christophe Matthieu 17b6f1be30 [FIX] qweb.py: encode in utf8 for special char and ascii code
bzr revid: chm@openerp.com-20130802040222-ew2aaxaogli86n6s
2013-08-02 06:02:22 +02:00
Christophe Matthieu ad6efa7735 [FIX] qweb.py: render_tag_field
bzr revid: chm@openerp.com-20130731102140-uk1tg9p092sqymzp
2013-07-31 12:21:40 +02:00
Christophe Matthieu 443129ca7a [IMP] qweb: fix for many2one with None value
bzr revid: chm@openerp.com-20130730150905-9qh0y5geug9uz2v9
2013-07-30 17:09:05 +02:00
Christophe Matthieu 27b69126d2 [MERGE] from trunk
bzr revid: chm@openerp.com-20130726141834-9nroj7wi4fjhd5s4
2013-07-26 16:18:34 +02:00
Xavier Morel 1cb4b63da8 [IMP] add field type to QWeb t-record output
bzr revid: xmo@openerp.com-20130726133505-n2ekzhk2dkbdvvdj
2013-07-26 15:35:05 +02:00
Thibault Delavallée f737eb63d0 [IMP] ir_actions_server: added doc + comments + recursion check
orm: added _check_m2my_recursion, to check loops in many2many recursive fields
tools: removed sms_send

bzr revid: tde@openerp.com-20130725104914-dutxfon3odp8z167
2013-07-25 12:49:14 +02:00
Fabien Meghazi 31cd39e0df [FIX] templates: Set tagname for qweb
bzr revid: fme@openerp.com-20130722105938-49hcqq8ip5xsid8h
2013-07-22 12:59:38 +02:00
Fabien Meghazi cb56924437 [ADD] xml data <template> helper
bzr revid: fme@openerp.com-20130722101210-idtrfwva7e903oq8
2013-07-22 12:12:10 +02:00
Thibault Delavallée 4f7afae100 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130717074450-puhtirdoqswf55pl
2013-07-17 09:44:50 +02:00
Christophe Simonis 58a4677f46 [FIX] qweb: t-field must search all_columns
bzr revid: chs@openerp.com-20130702204949-nqzhz226d24fvthx
2013-07-02 22:49:49 +02:00
Antony Lesuisse dbe58b7dde qweb t-field
bzr revid: al@openerp.com-20130702164805-df3a03szrrx114r1
2013-07-02 18:48:05 +02:00
Christophe Matthieu f34b894b22 [FIX] qweb.py: t-set t-value
bzr revid: chm@openerp.com-20130702120018-w9llyk8indqyywmo
2013-07-02 14:00:18 +02:00
Martin Trigaux e372cbbce4 add t-field and t-record in rendering
bzr revid: mat@openerp.com-20130701155541-20plkar9a89qosij
2013-07-01 17:55:41 +02:00
Antony Lesuisse df01c096ec branding temp fix for comment in xml
main company demo data

bzr revid: al@openerp.com-20130701002424-ojr6yzlr9m0xv6vi
2013-07-01 02:24:24 +02:00
Antony Lesuisse 05c9b607f8 fix rng validation, fields_view_get, qweb t-esc t-raw default
bzr revid: al@openerp.com-20130630213515-go5qr2dmo0xlazvr
2013-06-30 23:35:15 +02:00
Christophe Simonis a0d05319e4 [FIX] qweb: flake8
bzr revid: chs@openerp.com-20130627150807-1xy7kr9g2xlsnqf2
2013-06-27 17:08:07 +02:00
Christophe Simonis 0982851153 [FIX] qweb: make code works
bzr revid: chs@openerp.com-20130627142022-fg0brlf5mjrpaulb
2013-06-27 16:20:22 +02:00
Antony Lesuisse a93bc8bdb0 qweb templates
bzr revid: al@openerp.com-20130627091329-t3hjytf3gt0dmkvo
2013-06-27 11:13:29 +02:00
Christophe Simonis f169169377 [FIX] view validation tests
bzr revid: chs@openerp.com-20130625170118-dab54jupbexmqoq5
2013-06-25 19:01:18 +02:00
Antony Lesuisse eaf7f87ba2 [MERGE] fix view_validate to match rng
bzr revid: al@openerp.com-20130624170243-o9qjfo2s4obvqaea
2013-06-24 19:02:43 +02:00
Antony Lesuisse 9a8ff60da0 file based openerp views
bzr revid: al@openerp.com-20130620221648-kj53t7vdopfab0c2
2013-06-21 00:16:48 +02:00
Antony Lesuisse 4f76c69b76 [MERGE] trunk
bzr revid: al@openerp.com-20130620151512-p5ysov21an6ogbtv
2013-06-20 17:15:12 +02:00
Vo Minh Thu 43ff43383e [MERGE] lang: added Amharic (Ethiopia) language.
The corresponding web branch was merged in january.

bzr revid: vmt@openerp.com-20130702141733-mpk2163pclupwwqs
2013-07-02 16:17:33 +02:00
Christophe Simonis a61e7cb0c8 [MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf
bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
2013-06-13 19:39:00 +02:00
Christophe Simonis 6f170ec732 [MERGE] forward port of branch 7.0 up to revid 5006 chs@openerp.com-20130612151912-m19okjsdkjo12qnt
bzr revid: chs@openerp.com-20130612152826-j9sj42ten9mic8s0
2013-06-12 17:28:26 +02:00
Christophe Simonis e383386a79 [FIX] correct stripping of arguments when _reexec() OpenERP
bzr revid: chs@openerp.com-20130612151912-m19okjsdkjo12qnt
2013-06-12 17:19:12 +02:00
Vo Minh Thu dea9c95ab7 [MERGE] tools.convert: allow to use relativedelta in XML files.
bzr revid: vmt@openerp.com-20130603111716-lrgu1hxxz96escqa
2013-06-03 13:17:16 +02:00
Thibault Delavallée d2acb63af6 [FORWARD] Forward-port of saas-1 branch until revision 4875
bzr revid: tde@openerp.com-20130522082935-rzzbc3p625rkmcdy
2013-05-22 10:29:35 +02:00
Olivier Dony dc37c9ffcf [FIX] tools.safe_eval: inconsistent indentation
bzr revid: odo@openerp.com-20130507084919-zovnqiv0axc3ikr3
2013-05-07 10:49:19 +02:00
Christophe Simonis a6f724c919 [IMP] parse_version: ignore saas~ componants
bzr revid: chs@openerp.com-20130430142037-zuxzk8vy9td89pv1
2013-04-30 16:20:37 +02:00
Xavier Morel 2e8c9a48e1 [IMP] move testing of xml conversion alongside test data to ensure tests only run if module on addons_path/loaded
bzr revid: xmo@openerp.com-20130429122317-yzv4prie9hc7f7l6
2013-04-29 14:23:17 +02:00
Xavier Morel 45bb6ec7f1 [ADD] file field type in xml_convert, tests
bzr revid: xmo@openerp.com-20130429112459-ol1ayn2z34j32r54
2013-04-29 13:24:59 +02:00
Christophe Simonis 46b06bedf7 [IMP] convert: allow to have <act_window> tags with attribute multi="False" set
bzr revid: chs@openerp.com-20130426164022-nf9eldyge783b5r1
2013-04-26 18:40:22 +02:00
Thibault Delavallée ccbb8e09a6 [REF] html_email_clean: refactored the algorithm to clean it, specifically about truncature. Now add classes to node when not removing them, to be managed by the web client.
bzr revid: tde@openerp.com-20130425104301-e7mv9o4pcjx6k2cn
2013-04-25 12:43:01 +02:00
Thibault Delavallée 78ac31e260 [IMP] html_email_clean: now handles maximum character number truncature.
bzr revid: tde@openerp.com-20130423153727-tv0neudvlalaepu2
2013-04-23 17:37:27 +02:00
Thibault Delavallée f97bd8bd63 [REF] html_email_clean: refactoring of the algorithm, now better taking into account hotmail / msoffice emails. Added tests.
bzr revid: tde@openerp.com-20130423144903-he22jz9zs6nc6dsd
2013-04-23 16:49:03 +02:00
Christophe Matthieu 33ae814ff6 [IMP] tools convert: allow to use relative delta in xml file
bzr revid: chm@openerp.com-20130418151827-coda7ldtjd7hw7to
2013-04-18 17:18:27 +02:00
Raphael Collet 05851d21ba [MERGE] from trunk
bzr revid: rco@openerp.com-20130411073017-x6e4h8xbvmy3ofdw
2013-04-11 09:30:17 +02:00
Vo Minh Thu 307ca374d6 [MERGE] forward merge 7.0 until revision 4919.
bzr revid: vmt@openerp.com-20130404130704-24vsmczw34cssytd
2013-04-04 15:07:04 +02:00
Christophe Matthieu 600f03b294 [FIX] html2plaintext: bug 1159782
bzr revid: chm@openerp.com-20130329154130-56wjtfrj41eatxl6
2013-03-29 16:41:30 +01:00
Raphael Collet 09be864f1d [IMP] replace all tests like 'registry.get(X)' by 'X in registry' where X is non static
bzr revid: rco@openerp.com-20130329140723-dnrl02saky570xg0
2013-03-29 15:07:23 +01:00
Vo Minh Thu c3aae0abdb [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130328095006-o01omst9g0uhm0iz
2013-03-28 10:50:06 +01:00
Vo Minh Thu 34e8deeb4e [REM] common: removed login_message() which is not used.
bzr revid: vmt@openerp.com-20130328093018-c4s19buicwwol8y2
2013-03-28 10:30:18 +01:00
Vo Minh Thu 4ed7ec95b7 [MERGE] removed LocalService("workflow"), Logger class, and TEST log level.
bzr revid: vmt@openerp.com-20130327170639-uamgg7shlmtxgpxv
2013-03-27 18:06:39 +01:00
Vo Minh Thu d6ea526e36 [MERGE] openerp.pooler is deprecated.
bzr revid: vmt@openerp.com-20130327164045-ziw4lj50owdvmfbw
2013-03-27 17:40:45 +01:00
Xavier Morel 39ddcfd94d [REM] broken functions (missing import, removed packages)
Also remove extract_zip_file, only used by broken functions

bzr revid: xmo@openerp.com-20130327162307-zcbbpjojo8lrwnj0
2013-03-27 17:23:07 +01:00
Vo Minh Thu 23d672dfc3 [MERGE] reports: make it possible to use only XML declaration, even with custom parsers.
This makes report registration more uniform, and report rendering be possible
through the ORM (and thus the model service, instead of the report service).

To register a report, always use the database, i.e. a <report> tag within an
XML file. The custom parser, if any, will be specified in the database.
Previously specify a custom parser, the report was declared in Python.

Each model exposes a print_report() method, which will take the report name (as
many report can be defined on a single model) in argument.

bzr revid: vmt@openerp.com-20130327161129-6e7jz7l3lx7z1t18
2013-03-27 17:11:29 +01:00
Vo Minh Thu 4613a97c01 [REF] trolls.convert: missed an opportunity to reuse a beautiful association list.
bzr revid: vmt@openerp.com-20130327155917-xaepclhoazgw51ef
2013-03-27 16:59:17 +01:00
Xavier Morel 461973b4c9 [IMP] usage of python in convert_csv
* the reduce is equivalent to any
* apply De Morgan law
* misc.ustr is a function, can just pass it directly to map

bzr revid: xmo@openerp.com-20130327155424-dfbo915tl8qhsvqu
2013-03-27 16:54:24 +01:00
Vo Minh Thu ce58e16138 [REF] yaml_import: removed nested import openerp.
bzr revid: vmt@openerp.com-20130327154425-uu1fa01tdhrjt8kn
2013-03-27 16:44:25 +01:00
Vo Minh Thu 7b8f4fe5ee [REF] tests: use the openerp.tests namespace for test-related logging.
bzr revid: vmt@openerp.com-20130327153843-u62ftp74qv01u1ww
2013-03-27 16:38:43 +01:00
Vo Minh Thu 1e7e2ca753 [REF] no longer use openerp.pooler.
Either use openerp.modules.registry.RegistryManager when the full
new() signature is needed, or use openerp.registry().

Replaced also some pool.get() with pool[] because KeyErrors
are better than AttributeErrors on None.

bzr revid: vmt@openerp.com-20130327111014-2i0hlvpy5y5ku7hm
2013-03-27 12:10:14 +01:00
Vo Minh Thu a4fbd26541 [REF]: use openerp.workflow instead of LocalService("workflow").
bzr revid: vmt@openerp.com-20130326162040-kkq46wrur3pgn6eh
2013-03-26 17:20:40 +01:00
Vo Minh Thu c313b4073a [REF] logging: removed pseudo log-level TEST.
When --test-enable is used, it is expected that test output is visible,
thus using log-level INFO is natural.

On the down side you lose the nice blue hint that tests did actually
run when --log-level test was given.

bzr revid: vmt@openerp.com-20130326155844-83e2tcqokvblr0ln
2013-03-26 16:58:44 +01:00
Vo Minh Thu 385491f46e [IMP] yaml_import: add openerp in the evaluation context.
bzr revid: vmt@openerp.com-20130325144833-aos5t6x5bc8vi0ss
2013-03-25 15:48:33 +01:00
Vo Minh Thu 1683fc7abd [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130322135152-1hdlptwj1qqqfz4z
2013-03-22 14:51:52 +01:00
Vo Minh Thu a51b6912bd [FIX] safe_eval: better exception handling:
- the re-raising of exceptions ignored the "legal" exceptions
(the one used to early abort RPC calls and generate pop-ups)
- re-raising the exception was attempting to re-use the original
exception type but it does not always take only one argument
so it was breaking.

lp bug: https://launchpad.net/bugs/1146256 fixed

bzr revid: vmt@openerp.com-20130320132238-qzo3jptww59ndlch
2013-03-20 14:22:38 +01:00
Ravi Gohil (OpenERP) bdde088d08 [FIX] re-importing the translation from a file(.csv, .xml) updates the terms in ir_translation table but does not update it in cache memory, need a server restart to take those change effect in interface. (Maintenance Case: 587178)
bzr revid: rgo@tinyerp.com-20130318133338-djkx3ykbkitvbzeb
2013-03-18 19:03:38 +05:30
Cedric Snauwaert f05aff8ac9 [FIX]tools/mail: fix regex when sanitizing html containing mail address
bzr revid: csn@openerp.com-20130308104850-02nfuaxdr91bo0nx
2013-03-08 11:48:50 +01:00
Olivier Dony 527ef066dd [REVERT] tools.translate: undo rev 4874 refactoring and renaming `trans_parse_view`, was meant for trunk
rev 4874 = rev-id xmo@openerp.com-20130306095720-3277aw0rq9pzpsw4

bzr revid: odo@openerp.com-20130307164558-alvl7hcov2uhqxbw
2013-03-07 17:45:58 +01:00
Christophe Simonis ab2dd715de [FIX] module loading: allow addons path entries to have substring of others.
i.e. having ./addons/ and ./addons2/ is now possible

bzr revid: chm@openerp.com-20130307131104-ju2n7zm7yvced68h
2013-03-07 14:11:04 +01:00
Xavier Morel 7e7a8b44a9 [IMP] deduplicate trans_parse_view code, rename for clarity
also correctly handle all translatable attributes in a <attribute name=...> extension tag

bzr revid: xmo@openerp.com-20130306095720-3277aw0rq9pzpsw4
2013-03-06 10:57:20 +01:00
Chris Biersbach 61eb94fb58 [MERGE] OPW 585261: translations: corrects extraction of translation for placeholders
bzr revid: cbi@openerp.com-20130305091225-kkpeb6i8yohce5if
2013-03-05 10:12:25 +01:00
Antony Lesuisse acb17855f9 [IMP] logrotation is now disabled by default
bzr revid: al@openerp.com-20130228011811-1700jfnavo37dyqr
2013-02-28 02:18:11 +01:00
Vo Minh Thu dee8cc8e50 [MERGE] Better exception handling in tools.convert:
- The exception is not logged in tools.convert. It is loggeg by the netsv layer anyway.
- The exception is re-raised instead, but with the full traceback available.
- A fix in openerp.service.db where the cr is closed twice.

bzr revid: vmt@openerp.com-20130226100243-mpns1k9odz69gpax
2013-02-26 11:02:43 +01:00
Vo Minh Thu eb7bc74c51 [MERGE] safe_eval: do not log reported exception, instead re-raise them with a complete stacktrace and the evaluated expression.
bzr revid: vmt@openerp.com-20130226100130-hxwgfvwlvvcox5mr
2013-02-26 11:01:30 +01:00
Vo Minh Thu d43dba744c safe_eval: re-raise the same exception type when completing it.
bzr revid: vmt@openerp.com-20130226094446-7c2dw5c5eou0lg8r
2013-02-26 10:44:46 +01:00
Vo Minh Thu b71457e258 [FIX] tools.convert: use tools.ustr() instead of str() on exceptions.
bzr revid: vmt@openerp.com-20130225164028-d48k5yheuoph1vm3
2013-02-25 17:40:28 +01:00
Vo Minh Thu c62780673c [FIX] tools.safe_eval: we want to see the expr which fail to eval(), so report it in the exception.
bzr revid: vmt@openerp.com-20130225163525-3g9qw1g3hkyyxf1j
2013-02-25 17:35:25 +01:00
Vo Minh Thu ef127fddc7 [IMP] netsvc: removed unused import.
bzr revid: vmt@openerp.com-20130222145250-qd9v52tu2xt8jyb2
2013-02-22 15:52:50 +01:00
Vo Minh Thu 729d969fd9 [IMP] report: use openerp.report.render_report() instead of LocalService().create().
bzr revid: vmt@openerp.com-20130222124801-zhhbw2bgghhf6rg6
2013-02-22 13:48:01 +01:00
Vo Minh Thu 0cb53890df [IMP] report: reports with custom parsers can be declared in XML files.
bzr revid: vmt@openerp.com-20130222093428-f1isxxqlbaj7uhuo
2013-02-22 10:34:28 +01:00
Skrillex de03f4d670 [REM] netrpc: KILL EVERYBODY
bzr revid: vmt@openerp.com-20130221121825-dvpacxajwztslukj
2013-02-21 13:18:25 +01:00
Antony Lesuisse d19777aa1d [FIX] tools image thumbnailing jpg into png
bzr revid: al@openerp.com-20130220222612-g0j6d2a7az0u53hi
2013-02-20 23:26:12 +01:00
Vo Minh Thu 0de24bf983 [IMP] safe_eval: do not log exceptions, when re-raising a new exception, make the stacktrace complete.
bzr revid: vmt@openerp.com-20130220102259-avee8fx2a1kpdog3
2013-02-20 11:22:59 +01:00
Vo Minh Thu df7c209164 [FIX] Better exception handling in tools.convert:
- The exception is not logged in tools.convert. It is loggeg by the netsv layer anyway.
- The exception is re-raised instead, but with the full traceback available.
- A fix in openerp.service.db where the cr is closed twice.

bzr revid: vmt@openerp.com-20130219163047-3q766awd66wkzsn7
2013-02-19 17:30:47 +01:00
Dhruti Shastri c0e0110f42 [translation] : placeholders are missed out for Translation (Case:585261)
bzr revid: dhs@tinyerp.com-20130219095601-ncsy6tnfns1xz4ls
2013-02-19 15:26:01 +05:30
Dhruti Shastri 01eb26c35a [translation] : placeholders are missed out for Translation (Case:585261)
bzr revid: dhs@tinyerp.com-20130219084856-ab44isuegq7w31wo
2013-02-19 14:18:56 +05:30
niv-openerp b5209cbf56 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130215122500-p69xawqym93jauks
2013-02-15 13:25:00 +01:00
Raphael Collet e76befd6c6 [MERGE] trunk-service-thu (remove the class openerp.netsvc.ExportService)
bzr revid: rco@openerp.com-20130212154230-y54s2rbetllwnh4q
2013-02-12 16:42:30 +01:00
Vo Minh Thu 9f9c9585a1 [REF] Removed support for __terp__.py files and `terp` root elements in XML files.
bzr revid: vmt@openerp.com-20130212152328-flpn1tbz75lhi2m2
2013-02-12 16:23:28 +01:00
Vo Minh Thu c99c4091ce [REM] Deleted .apidoc lines.
They were probably used by some tools. How sad.

bzr revid: vmt@openerp.com-20130212142410-zqdjd8jw3gtvxab0
2013-02-12 15:24:10 +01:00
Vo Minh Thu 69fefde965 [IMP] The open openerp namespace is removed.
bzr revid: vmt@openerp.com-20130209060246-o7qs51c2uc0kecjo
2013-02-09 07:02:46 +01:00
Vo Minh Thu f0e4a9b01e [REF] tools.translate: removed dead code (wizard service do not exist anymore).
bzr revid: vmt@openerp.com-20130201112001-9db40vy8rhef6wj4
2013-02-01 12:20:01 +01:00
niv-openerp 7010e8543e Merge Thu branch
bzr revid: nicolas.vanhoren@openerp.com-20130129150525-bcbh9b5jp8l2yath
2013-01-29 16:05:25 +01:00
niv-openerp 613775dd41 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130128105556-cxifj7m5zpay4bmv
2013-01-28 11:55:56 +01:00
Vo Minh Thu ed0a292f5d [IMP] gevent: no longer a command-line flag (always used in multi-process, never otherwise)
The internal flag is in openerp.__init__ (as the multi_process flag).

bzr revid: vmt@openerp.com-20130118152511-57u4gxyolz0hd4y8
2013-01-18 16:25:11 +01:00
Vo Minh Thu a4120a879a [IMP] long polling: disable the watchdog for the WorkerLongPolling, added command-line option for its port.
bzr revid: vmt@openerp.com-20130117103057-12ez48kj48pntb1g
2013-01-17 11:30:57 +01:00
Xavier Morel 3ee58b2a23 [IMP] don't reimplement randint manually
bzr revid: xmo@openerp.com-20130116143556-qlagrw7qhpuk8fuy
2013-01-16 15:35:56 +01:00
Xavier Morel bffe30c15b [IMP] Use StringIO rather than io.BytesIO, avoid deprecated operator
Rest of OpenERP code uses StringIO, consistency is probably a good
idea there: if it needs to be fixed for p3 compatibility it can be
fixed everywhere, existing io.BytesIO calls may be missed or
ill-interpreted.

bzr revid: xmo@openerp.com-20130116104637-o1qyx38jjppg6oqr
2013-01-16 11:46:37 +01:00
Thibault Delavallée 229af47ec9 [MERGE] Foward-port server 7.0 until 4787.
bzr revid: tde@openerp.com-20130115100405-rc75cueauugdsu39
bzr revid: tde@openerp.com-20130115141905-90mzlbai3vwwi84a
2013-01-15 15:19:05 +01:00
Olivier Dony 4eac510461 [FIX] ir.mail_server: properly handle the --smtp-ssl command-line option + map it to STARTTLS as a safer default
bzr revid: odo@openerp.com-20130115124058-81kgv0cy9jp96ln4
2013-01-15 13:40:58 +01:00
Olivier Dony 3ad16170f3 [MERGE] tools.translate: fix extraction of translation terms from mako source files, courtesy of Niels Huylebroeck (Agaplan)
bzr revid: odo@openerp.com-20130114112831-87gmdtqzaa55zssf
2013-01-14 12:28:31 +01:00
niv-openerp d211ac7798 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130114102410-m60y4kh8o69u00hc
2013-01-14 11:24:10 +01:00
niv-openerp 4db73a4c7c merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130108090624-cubi563m34f1j6ab
2013-01-08 10:06:24 +01:00
Niels Huylebroeck 9db9138056 [FIX] When extracting strings from mako reports we specify a correcter method for string extraction.
lp bug: https://launchpad.net/bugs/1096138 fixed

bzr revid: nh@agaplan.eu-20130104171631-p72mjfkfsvm2tdr8
2013-01-04 18:16:31 +01:00
Vo Minh Thu 013efb71cb [MERGE] Forward port of 7.0 until rev. 4767.
bzr revid: vmt@openerp.com-20130104093343-xtbw4tphmlupahuv
2013-01-04 10:33:43 +01:00
Christophe Matthieu 21c5425d89 [IMP] mail_sanitize: simplification of the regular expression
bzr revid: chm@openerp.com-20130102162544-jfwdfqx2ruf0x1q2
2013-01-02 17:25:44 +01:00
Christophe Matthieu a4e7fa97f4 [IMP] mail sanitize: add special email address for escape in the sanitizer
bzr revid: chm@openerp.com-20130102090040-yh0vdv8b3mtwoebh
2013-01-02 10:00:40 +01:00
Christophe Matthieu 71a92f46e4 [FIX] tools: html_sanitize
bzr revid: chm@openerp.com-20121231154451-0guqjid92rfndghp
2012-12-31 16:44:51 +01:00
Antony Lesuisse 2e01a395db [FIX] workers memory limits better help
bzr revid: al@openerp.com-20121229132216-zfk4ipw4p6mbgxnj
2012-12-29 14:22:16 +01:00
Frédéric van der Essen 0eac2ff48e [MERGE] from upstream
bzr revid: fva@openerp.com-20121228122804-c4t1z7x0zy2nyif0
2012-12-28 13:28:04 +01:00
Fabien Pinckaers a74d50d220 [IMP] support for lxml <2.3.1
bzr revid: fp@tinyerp.com-20121227163324-uloesoeixirmdtka
2012-12-27 17:33:24 +01:00
Thibault Delavallée 1c7b1b53d4 [IMP] sanitizer: improved logger message if crashed during sanitize.
bzr revid: tde@openerp.com-20121227092614-0ihi5sw5uuyboahk
2012-12-27 10:26:14 +01:00
Michael Telahun Makonnen 9faf27da5e Enable loading of Amharic (Ethiopia) language.
bzr revid: mmakonnen@gmail.com-20121227075200-junjlo2sj4vxk87h
2012-12-27 10:52:00 +03:00
Thibault Delavallée be5118c704 [DOC] Added some comments. Updated failure message. Added a logging message when not capable of parsing.
bzr revid: tde@openerp.com-20121226164354-tjquf1zdyr90tl5e
2012-12-26 17:43:54 +01:00
Thibault Delavallée d7185be38c [IMP] html_sanitize: now uses the builtin cleaner of lxml.html. We also allows style attribute; the cleaner ensures no javascript or malicious code goes through those attributes. Updated and added tests for the sanitizer, especially about malicious code, and EDI-like html code.
bzr revid: tde@openerp.com-20121226162505-8rq060p375z1k9il
2012-12-26 17:25:05 +01:00
Christophe Matthieu db028dc09a [MERGE] tools mail: Return the initial variable if is false or if is not an instance of basestring. Remove encoding attribute in html tags.
bzr revid: chm@openerp.com-20121221083527-py3wr2syz5d8igv8
2012-12-21 09:35:27 +01:00
Frédéric van der Essen faa67b8411 [FIX] tools: email regexp was too restrictive
bzr revid: fva@openerp.com-20121220160542-hiuu3drh4fa6j8v5
2012-12-20 17:05:42 +01:00
Antony Lesuisse 7d5dbda805 [MERGE] apps by chs
bzr revid: al@openerp.com-20121220144322-ign0s0u0rbufhedi
2012-12-20 15:43:22 +01:00
dle@openerp.com 355dac7356 [FIX]Kanban view js not loaded when db created through command line
bzr revid: dle@openerp.com-20121220101511-679v8e6ijsbaxj0y
2012-12-20 11:15:11 +01:00
Antony Lesuisse 565853b732 [MERGE] trunk
bzr revid: al@openerp.com-20121219030106-i59u10tml3baqvun
bzr revid: al@openerp.com-20121219150107-8l92w2bi510yem45
2012-12-19 16:01:07 +01:00