bth-openerp [Tue, 27 Aug 2013 12:43:11 +0000 (18:13 +0530)]
[IMP]Improved css for header.
bzr revid: bth@tinyerp.com-
20130827124311-h5w7qvv6s8naxgcc
bth-openerp [Tue, 27 Aug 2013 11:23:18 +0000 (16:53 +0530)]
[IMP]Improved header,customized menu,added vertical divider class and html formating.
bzr revid: bth@tinyerp.com-
20130827112318-kzt0xt2u49zzgfy2
bth-openerp [Tue, 27 Aug 2013 10:31:11 +0000 (16:01 +0530)]
[IMP]Improved css for carousel.
bzr revid: bth@tinyerp.com-
20130827103111-fcu8blecqoirxr46
bth-openerp [Tue, 27 Aug 2013 09:22:51 +0000 (14:52 +0530)]
[IMP]Add faltly theme.
bzr revid: bth@tinyerp.com-
20130827092251-mtm953jhudkrccqm
bth-openerp [Tue, 27 Aug 2013 07:45:21 +0000 (13:15 +0530)]
[REM]Removed responsive css and flalty theme's css files of bootstrap 2 and added themes css of bootstrap 3.0.
bzr revid: bth@tinyerp.com-
20130827074521-xp62gk06irkhwrf7
bth-openerp [Tue, 27 Aug 2013 07:13:21 +0000 (12:43 +0530)]
[IMP]Mobile preview is fixed.
bzr revid: bth@tinyerp.com-
20130827071321-0v7xcyis249kyh72
bth-openerp [Tue, 27 Aug 2013 05:55:33 +0000 (11:25 +0530)]
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-
20130827055533-ybsdhedhetgclv6a
bth-openerp [Mon, 26 Aug 2013 13:47:29 +0000 (19:17 +0530)]
[IMP]IMproved code or class and navigation.
bzr revid: bth@tinyerp.com-
20130826134729-b0olyv7di2oq5xrk
bth-openerp [Mon, 26 Aug 2013 13:38:24 +0000 (19:08 +0530)]
[IMP]Migrated website_sale into bootstrap 3.0.
bzr revid: bth@tinyerp.com-
20130826133824-kj4ed1etmddcx9mo
Paramjit Singh Sahota [Mon, 26 Aug 2013 13:31:29 +0000 (19:01 +0530)]
[IMP] Imprved for Search box.
bzr revid: psa@tinyerp.com-
20130826133129-6l5576r39qcjj73i
Paramjit Singh Sahota [Mon, 26 Aug 2013 12:15:09 +0000 (17:45 +0530)]
[IMP]Improved the billing form
bzr revid: psa@tinyerp.com-
20130826121509-fds3sx1sw8p1eedg
Paramjit Singh Sahota [Mon, 26 Aug 2013 11:51:33 +0000 (17:21 +0530)]
[REVERT] Reverted the changes of index.html file of website_sale
bzr revid: psa@tinyerp.com-
20130826115133-f9n26296a9wilfdv
Paramjit Singh Sahota [Mon, 26 Aug 2013 11:14:37 +0000 (16:44 +0530)]
[IMP]Little Improved
bzr revid: psa@tinyerp.com-
20130826111437-640etfb9ypsipeyx
Paramjit Singh Sahota [Mon, 26 Aug 2013 11:05:31 +0000 (16:35 +0530)]
[IMP]Improved
bzr revid: psa@tinyerp.com-
20130826110531-mnqj1q62l6epxvws
Christophe Matthieu [Mon, 26 Aug 2013 10:16:15 +0000 (12:16 +0200)]
[FIX] website: catch and dispatch error for rendering
bzr revid: chm@openerp.com-
20130826101615-t1ouij4flhtdthxe
Frédéric van der Essen [Mon, 26 Aug 2013 10:01:26 +0000 (12:01 +0200)]
[IMP] website: missing commits for the snippet editor
bzr revid: fva@openerp.com-
20130826100126-j26u21dchvwjijnh
Paramjit Singh Sahota [Mon, 26 Aug 2013 09:35:29 +0000 (15:05 +0530)]
MERGED lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and resolved conflicts
bzr revid: psa@tinyerp.com-
20130826093529-3o64l5r3osuxm6i4
Frédéric van der Essen [Mon, 26 Aug 2013 09:29:05 +0000 (11:29 +0200)]
[MERGE] from upstream
bzr revid: fva@openerp.com-
20130826092905-jvrvnnskmwhv61le
Paramjit Singh Sahota [Mon, 26 Aug 2013 09:26:41 +0000 (14:56 +0530)]
Improved code.
bzr revid: psa@tinyerp.com-
20130826092641-mbirfw9t322wn9am
Frédéric van der Essen [Mon, 26 Aug 2013 09:18:19 +0000 (11:18 +0200)]
[MERGE] website: mutation snippets
bzr revid: fva@openerp.com-
20130826091819-z5nbw0jww7w7ydbl
Frédéric van der Essen [Mon, 26 Aug 2013 09:17:03 +0000 (11:17 +0200)]
[MERGE] from upstream
bzr revid: fva@openerp.com-
20130826091703-qmipfeith2arjyr8
Paramjit Singh Sahota [Mon, 26 Aug 2013 07:40:16 +0000 (13:10 +0530)]
[IMP] improved css for checkout form and others.
bzr revid: psa@tinyerp.com-
20130826074016-bejnsnij9ly9df93
bth-openerp [Mon, 26 Aug 2013 07:08:54 +0000 (12:38 +0530)]
[IMP]Migrated website_contract into bootstrap 3.0.
bzr revid: bth@tinyerp.com-
20130826070854-uin768rdyrdn0uxc
Paramjit Singh Sahota [Mon, 26 Aug 2013 06:19:42 +0000 (11:49 +0530)]
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth
bzr revid: psa@tinyerp.com-
20130826061942-dr9m4iv3jvtl77ib
Paramjit Singh Sahota [Mon, 26 Aug 2013 06:10:24 +0000 (11:40 +0530)]
[IMP]Improved label-default.
bzr revid: psa@tinyerp.com-
20130826061024-q5y4t2emq55rpr5f
bth-openerp [Mon, 26 Aug 2013 06:02:43 +0000 (11:32 +0530)]
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-
20130826060243-3yhxlioyv3bgkikd
bth-openerp [Mon, 26 Aug 2013 06:00:57 +0000 (11:30 +0530)]
[IMP]IMproved code for pager.
bzr revid: bth@tinyerp.com-
20130826060057-0r61yfh36319y45a
Paramjit Singh Sahota [Mon, 26 Aug 2013 05:44:41 +0000 (11:14 +0530)]
[IMP] Improved code for 'website_sale' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-
20130826054441-g0xl17kvhcnbw3ck
Paramjit Singh Sahota [Mon, 26 Aug 2013 05:30:30 +0000 (11:00 +0530)]
[IMP] Improved code of 'website_contract' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-
20130826053030-66aoebw4zidrdqsc
Paramjit Singh Sahota [Mon, 26 Aug 2013 04:51:31 +0000 (10:21 +0530)]
[MERGe] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and removed conflicts.
bzr revid: psa@tinyerp.com-
20130826045131-iuog4r9ijlilq3cv
Frédéric van der Essen [Fri, 23 Aug 2013 16:04:11 +0000 (18:04 +0200)]
[IMP] website: snippet resizing
bzr revid: fva@openerp.com-
20130823160411-xoxek62wwhi5w3by
Christophe Matthieu [Fri, 23 Aug 2013 14:41:33 +0000 (16:41 +0200)]
[FIX] website_sale: return to product after add to cart
bzr revid: chm@openerp.com-
20130823144133-6qkx8flsra72crb4
Christophe Matthieu [Fri, 23 Aug 2013 14:37:57 +0000 (16:37 +0200)]
[FIX] website_sale: set pricelist
bzr revid: chm@openerp.com-
20130823143757-81cc0pzajetu55m8
bth-openerp [Fri, 23 Aug 2013 13:57:42 +0000 (19:27 +0530)]
[IMP]Add label class.
bzr revid: bth@tinyerp.com-
20130823135742-fzekahsa02lofobg
bth-openerp [Fri, 23 Aug 2013 13:52:50 +0000 (19:22 +0530)]
[IMP]Migrated website_event into bootstrap 3.0.
bzr revid: bth@tinyerp.com-
20130823135250-t4mtewrmn3yyea9e
bth-openerp [Fri, 23 Aug 2013 13:47:47 +0000 (19:17 +0530)]
[IMP]Migrated website_crm into bootstrap 3.0.
bzr revid: bth@tinyerp.com-
20130823134747-dsgox69g78yuj2ld
Paramjit Singh Sahota [Fri, 23 Aug 2013 13:44:41 +0000 (19:14 +0530)]
[IMP] Improved code of 'website_contract' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-
20130823134441-024zi8tvgnuu7amu
bth-openerp [Fri, 23 Aug 2013 13:36:38 +0000 (19:06 +0530)]
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-
20130823133638-9mwes61mqvl546qz
Christophe Matthieu [Fri, 23 Aug 2013 13:36:04 +0000 (15:36 +0200)]
[WIP] website_contract: reference view
bzr revid: chm@openerp.com-
20130823133604-ujkiu67hrjtj4qtg
bth-openerp [Fri, 23 Aug 2013 13:28:29 +0000 (18:58 +0530)]
[IMP]Migrated website_hr into bootstrap 3.0.
bzr revid: bth@tinyerp.com-
20130823132829-399hwxt4gv4ad9j9
bth-openerp [Fri, 23 Aug 2013 13:21:38 +0000 (18:51 +0530)]
[IMP]Added class name.
bzr revid: bth@tinyerp.com-
20130823132138-tq40mj780juni8ky
bth-openerp [Fri, 23 Aug 2013 13:17:20 +0000 (18:47 +0530)]
[IMP]IMproved bootstrap 3 in website_hr module.
bzr revid: bth@tinyerp.com-
20130823131720-aueyal8plqv7ttky
Paramjit Singh Sahota [Fri, 23 Aug 2013 13:01:08 +0000 (18:31 +0530)]
[IMP] Improved code of 'website_crm' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-
20130823130108-j92k3izdr38nnyl0
bth-openerp [Fri, 23 Aug 2013 12:51:44 +0000 (18:21 +0530)]
[FIX]Fixed if statement.
bzr revid: bth@tinyerp.com-
20130823125144-zjhm5bnaw85bdtl0
bth-openerp [Fri, 23 Aug 2013 12:36:34 +0000 (18:06 +0530)]
[IMP]Improved bootstrap 3 in website_mail module.
bzr revid: bth@tinyerp.com-
20130823123634-ax6zm64ywzvp22e0
ajay javiya (OpenERP) [Fri, 23 Aug 2013 12:19:30 +0000 (17:49 +0530)]
[IMP]: migrate website_event module from bootstrap 2.x to 3.0
bzr revid: aja@tinyerp.com-
20130823121930-pryy1nq5nxels4u3
bth-openerp [Fri, 23 Aug 2013 12:12:05 +0000 (17:42 +0530)]
[IMP]Improved code for footer and icon.
bzr revid: bth@tinyerp.com-
20130823121205-e3tsaj5pkyhyyq3i
ajay javiya (OpenERP) [Fri, 23 Aug 2013 11:52:11 +0000 (17:22 +0530)]
[IMP]: migrate website_mail module from bootstrap 2.x to 3.0
bzr revid: aja@tinyerp.com-
20130823115211-6gcbq6h1upeeo50w
bth-openerp [Fri, 23 Aug 2013 10:50:54 +0000 (16:20 +0530)]
[IMP]As per bootstrap 3.0 added class and tags.
bzr revid: bth@tinyerp.com-
20130823105054-vgm8irxijayyfblg
Frédéric van der Essen [Fri, 23 Aug 2013 10:02:21 +0000 (12:02 +0200)]
[FIX] website: fix regression in carousel insertion:w
bzr revid: fva@openerp.com-
20130823100221-bm3jd0lzrv8929g7
Frédéric van der Essen [Fri, 23 Aug 2013 10:00:22 +0000 (12:00 +0200)]
[IMP] website: clean up client side templates
bzr revid: fva@openerp.com-
20130823100022-a2f0n4oc7f16glfd
Christophe Matthieu [Fri, 23 Aug 2013 09:40:17 +0000 (11:40 +0200)]
[IMP] website_sale: fix context value, get order line name insead of product name, wip payment
bzr revid: chm@openerp.com-
20130823094017-90m72xi2oif4qkuj
ddm [Fri, 23 Aug 2013 09:24:56 +0000 (11:24 +0200)]
CSS improvements
bzr revid: ddm@openerp.com-
20130823092456-7g783rh2g0irlp63
Frédéric van der Essen [Fri, 23 Aug 2013 09:16:47 +0000 (11:16 +0200)]
[IMP] website: merge snippet insert and mutation drag & drop code
bzr revid: fva@openerp.com-
20130823091647-uoatz0k1458idhf3
Frédéric van der Essen [Fri, 23 Aug 2013 09:07:57 +0000 (11:07 +0200)]
[IMP] website: cleanup drop zones css and sort out z-index issues
bzr revid: fva@openerp.com-
20130823090757-ffqvcselr1merggk
Frédéric van der Essen [Fri, 23 Aug 2013 08:38:43 +0000 (10:38 +0200)]
[MERGE] website: mutation snippets
bzr revid: fva@openerp.com-
20130823083843-bky4qugrnb8jnidm
Frédéric van der Essen [Fri, 23 Aug 2013 08:37:24 +0000 (10:37 +0200)]
[MERGE] from upstream
bzr revid: fva@openerp.com-
20130823083724-9jq4cjc1wea0b59q
Frédéric van der Essen [Fri, 23 Aug 2013 08:27:12 +0000 (10:27 +0200)]
[IMP] website: mutation snippets
bzr revid: fva@openerp.com-
20130823082712-sdcke0hy5yspszkb
bth-openerp [Fri, 23 Aug 2013 06:25:41 +0000 (11:55 +0530)]
[IMP]Added js and css of bootstrap 3.0 in website module.
bzr revid: bth@tinyerp.com-
20130823062541-nabdko619qkphdcz
ddm [Thu, 22 Aug 2013 20:04:07 +0000 (22:04 +0200)]
Fix variable name
bzr revid: ddm@openerp.com-
20130822200407-450rptud8peg4fp7
Christophe Matthieu [Thu, 22 Aug 2013 14:27:35 +0000 (16:27 +0200)]
[IMP] website_sale: add price for variation and price_list for reduction
bzr revid: chm@openerp.com-
20130822142735-n1aglt9wakj27dsb
ddm [Thu, 22 Aug 2013 13:36:21 +0000 (15:36 +0200)]
Clarify
bzr revid: ddm@openerp.com-
20130822133621-237gzh6wxisxnn00
ddm [Thu, 22 Aug 2013 12:40:13 +0000 (14:40 +0200)]
Disable editor on smartphones
<=767px according to bootstrap responsive classes
bzr revid: ddm@openerp.com-
20130822124013-br8ccw8hb26dr060
ddm [Thu, 22 Aug 2013 10:47:36 +0000 (12:47 +0200)]
Mobile preview (initial styling)
bzr revid: ddm@openerp.com-
20130822104736-5gt43278o83fvt9s
Fabien Meghazi [Thu, 22 Aug 2013 10:19:52 +0000 (12:19 +0200)]
[IMP] More precision for kanban column width
bzr revid: fme@openerp.com-
20130822101952-qhliw0umneujz4cf
Christophe Matthieu [Thu, 22 Aug 2013 09:30:49 +0000 (11:30 +0200)]
[IMP] website: kanban: remove default layout with thumbnail class
bzr revid: chm@openerp.com-
20130822093049-6kcj1eobj2sl2nn4
Christophe Matthieu [Thu, 22 Aug 2013 09:25:36 +0000 (11:25 +0200)]
[FIX] website: kanban pager position
bzr revid: chm@openerp.com-
20130822092536-lij12jeueg6bbo6v
Christophe Matthieu [Thu, 22 Aug 2013 09:24:16 +0000 (11:24 +0200)]
[FIX] website: kanban javascript
bzr revid: chm@openerp.com-
20130822092416-sfcygyz15oi7qygr
Christophe Matthieu [Thu, 22 Aug 2013 09:18:12 +0000 (11:18 +0200)]
[IMP] website: kanban view; script in js file, dynamique template
bzr revid: chm@openerp.com-
20130822091812-i71rjpxj1cprifbh
Christophe Matthieu [Thu, 22 Aug 2013 09:09:41 +0000 (11:09 +0200)]
[FIX] website_sale: pricelist code required
bzr revid: chm@openerp.com-
20130822090941-yrb7c95xw2y4d15r
ddm [Thu, 22 Aug 2013 08:58:25 +0000 (10:58 +0200)]
Mobile preview (initial commit)
bzr revid: ddm@openerp.com-
20130822085825-7mpsoi0nyujekg5f
Frédéric van der Essen [Wed, 21 Aug 2013 16:30:52 +0000 (18:30 +0200)]
[MERGE] website: further work on the snippet editor
bzr revid: fva@openerp.com-
20130821163052-8t7nqni7okn555mc
Frédéric van der Essen [Wed, 21 Aug 2013 16:30:02 +0000 (18:30 +0200)]
[MERGE] from upstream
bzr revid: fva@openerp.com-
20130821163002-y45g9l65xwrcxmsn
Frédéric van der Essen [Wed, 21 Aug 2013 16:25:34 +0000 (18:25 +0200)]
[IMP] website: basics of snippet system are now working and looking good
bzr revid: fva@openerp.com-
20130821162534-yr6nx292xoj2m2s2
Christophe Matthieu [Wed, 21 Aug 2013 16:06:32 +0000 (18:06 +0200)]
[IMP] website: create generic kanban view
bzr revid: chm@openerp.com-
20130821160632-tsl5v1l5cj10w92c
Fabien Meghazi [Wed, 21 Aug 2013 14:57:31 +0000 (16:57 +0200)]
[IMP] Improved string interpolation in templates
bzr revid: fme@openerp.com-
20130821145731-kkw9sxiv6oqz65qk
Xavier Morel [Wed, 21 Aug 2013 14:38:16 +0000 (16:38 +0200)]
[IMP] simplify ckeditor image and link dialogs
& add easy linking to existing site pages and attachments
bzr revid: xmo@openerp.com-
20130821143816-0hvp0m0eklh6ti1m
Xavier Morel [Wed, 21 Aug 2013 14:31:52 +0000 (16:31 +0200)]
[ADD] simplified link dialog + link to existing pages dropdown
TODO: better UI, create new page, correct selection when reopen dialog
bzr revid: xmo@openerp.com-
20130821143152-o3lawyupxcssuq2v
Fabien Meghazi [Wed, 21 Aug 2013 14:09:53 +0000 (16:09 +0200)]
[IMP] Improved template's t-foreach
You need to pull Rev#4980 of server/trunk-website-al
bzr revid: fme@openerp.com-
20130821140953-zb2hdglg1nvp2ckq
Xavier Morel [Wed, 21 Aug 2013 14:04:31 +0000 (16:04 +0200)]
[IMP] pager
bzr revid: xmo@openerp.com-
20130821140431-xwh2pk6xe880nz1q
Xavier Morel [Wed, 21 Aug 2013 13:59:31 +0000 (15:59 +0200)]
[REM] page flags on a bunch of templates which turn out not to be pages after all
bzr revid: xmo@openerp.com-
20130821135931-6ezsw089sju2eyga
Xavier Morel [Wed, 21 Aug 2013 13:59:17 +0000 (15:59 +0200)]
[ADD] pages listing method
bzr revid: xmo@openerp.com-
20130821135917-7uztqr3yy7hfzbal
Xavier Morel [Wed, 21 Aug 2013 12:13:58 +0000 (14:13 +0200)]
[IMP] mark a bunch of templates as pages, mark all new pages as pages on creation
bzr revid: xmo@openerp.com-
20130821121358-b6y5d1b8wgz8iyo0
Xavier Morel [Wed, 21 Aug 2013 09:45:50 +0000 (11:45 +0200)]
[IMP] simplify CKEditor's image dialog, implement very basic attachment picker
TODO: image picker which isn't just a crappy select, using widget type
html (?)
bzr revid: xmo@openerp.com-
20130821094550-u3k5aaqna7zyl8ek
Christophe Matthieu [Wed, 21 Aug 2013 08:52:46 +0000 (10:52 +0200)]
[IMP] website_project: display table of task by stage
bzr revid: chm@openerp.com-
20130821085246-721xkh5bji0vqi9q
Fabien Meghazi [Tue, 20 Aug 2013 21:34:50 +0000 (23:34 +0200)]
[IMP] website's framework setup and template loading
bzr revid: fme@openerp.com-
20130820213450-r71yyp42lw45plem
Fabien Meghazi [Tue, 20 Aug 2013 20:58:20 +0000 (22:58 +0200)]
[FIX] jshint
bzr revid: fme@openerp.com-
20130820205820-m24w4b4so10k4fql
Frédéric van der Essen [Tue, 20 Aug 2013 16:49:56 +0000 (18:49 +0200)]
[MERGE] website: working but ugly snippets
bzr revid: fva@openerp.com-
20130820164956-1zt9idbv6npqfkqn
Frédéric van der Essen [Tue, 20 Aug 2013 16:46:44 +0000 (18:46 +0200)]
[MERGE] from upstream
bzr revid: fva@openerp.com-
20130820164644-eg5z05o2e339qf67
Frédéric van der Essen [Tue, 20 Aug 2013 16:45:57 +0000 (18:45 +0200)]
[WIP] cms: snippets are ugly but working well
bzr revid: fva@openerp.com-
20130820164557-kjh87mrtv4tueln8
Christophe Matthieu [Tue, 20 Aug 2013 14:25:05 +0000 (16:25 +0200)]
[IMP]website_sale: add product variants, add suggested products, use product.template insead of product.product; website_contract: create/wip ; website_project : create/wip
bzr revid: chm@openerp.com-
20130820142505-uwrk3kfyw1yvr0h9
Christophe Matthieu [Tue, 20 Aug 2013 14:12:03 +0000 (16:12 +0200)]
[IMP] website_sale: use product.template insead of product.product
bzr revid: chm@openerp.com-
20130820141203-vkg93z9odh0rlf4d
Christophe Matthieu [Tue, 20 Aug 2013 08:04:11 +0000 (10:04 +0200)]
[IMP] website_contract: better check access rules
bzr revid: chm@openerp.com-
20130820080411-x5jjlcshwzmypfs4
Christophe Matthieu [Mon, 19 Aug 2013 15:24:36 +0000 (17:24 +0200)]
[IMP] website_contract: published
bzr revid: chm@openerp.com-
20130819152436-y0tlyxsbinskd61m
Christophe Matthieu [Mon, 19 Aug 2013 15:10:34 +0000 (17:10 +0200)]
[IMP] website_contract: published
bzr revid: chm@openerp.com-
20130819151034-o079dfazpo043kw2
Christophe Matthieu [Mon, 19 Aug 2013 14:45:34 +0000 (16:45 +0200)]
[IMP] website_contract: imp layout
bzr revid: chm@openerp.com-
20130819144534-oh9vi9b3pznnifgu
Christophe Matthieu [Mon, 19 Aug 2013 14:34:23 +0000 (16:34 +0200)]
[IMP] add new module website_contract
bzr revid: chm@openerp.com-
20130819143423-gjg6b11x41k3crse
Christophe Matthieu [Mon, 19 Aug 2013 14:28:12 +0000 (16:28 +0200)]
[IMP] add new module website_project
bzr revid: chm@openerp.com-
20130819142812-vvb9e5s2gzg94hwz
Frédéric van der Essen [Mon, 19 Aug 2013 14:21:08 +0000 (16:21 +0200)]
[MERGE] [WIP]: widgetification of snippets
bzr revid: fva@openerp.com-
20130819142108-q84m3764hpa2sic4
Frédéric van der Essen [Mon, 19 Aug 2013 14:11:08 +0000 (16:11 +0200)]
[MERGE] from trunk
bzr revid: fva@openerp.com-
20130819141108-s2vsjqdzzzlib4oi