Frédéric van der Essen [Wed, 23 May 2012 13:00:11 +0000 (15:00 +0200)]
[IMP] proxy upgraded to new JsonRPC API
bzr revid: fva@openerp.com-
20120523130011-mhso33xqk9aau5kc
Frédéric van der Essen [Wed, 23 May 2012 12:47:54 +0000 (14:47 +0200)]
[IMP] point_of_sale: orderlines are correctly merged
bzr revid: fva@openerp.com-
20120523124754-lxzbqmzx2r9tn11p
Frédéric van der Essen [Tue, 22 May 2012 14:59:56 +0000 (16:59 +0200)]
[IMP] point_of_sale: orderlines are correctly merged
bzr revid: fva@openerp.com-
20120522145956-t0d3xnzx8f8mz15s
Frédéric van der Essen [Tue, 22 May 2012 12:53:32 +0000 (14:53 +0200)]
[FIX] point_of_sale: retrieve bank_statements associated to current session only
bzr revid: fva@openerp.com-
20120522125332-t6epspfeqxknjypo
Frédéric van der Essen [Tue, 22 May 2012 10:32:25 +0000 (12:32 +0200)]
[FIX] point_of_sale: payment screen widget now works ok
bzr revid: fva@openerp.com-
20120522103225-n4r03smsocyv0rrn
Frédéric van der Essen [Tue, 22 May 2012 09:31:37 +0000 (11:31 +0200)]
[MERGE] trunk
bzr revid: fva@openerp.com-
20120522093137-eqaen4t49ukcmj6f
Fabien Pinckaers [Tue, 22 May 2012 09:14:45 +0000 (11:14 +0200)]
[IMP] removed icons from topbar
bzr revid: fp@tinyerp.com-
20120522091445-mpiknieg2v8sd31f
Fabien Pinckaers [Tue, 22 May 2012 08:50:37 +0000 (10:50 +0200)]
[IMP] merged topbar status widgets
bzr revid: fp@tinyerp.com-
20120522085037-oktkq3td2hg9lvzr
Frédéric van der Essen [Mon, 21 May 2012 16:57:21 +0000 (18:57 +0200)]
[IMP] point_of_sale: cleaned paypad, put pos_widget in all PosWidget childrens
bzr revid: fva@openerp.com-
20120521165721-vi81vnj0fpu30rrj
Fabien Pinckaers [Mon, 21 May 2012 16:07:45 +0000 (18:07 +0200)]
[FIX] fixing default_context
bzr revid: fp@tinyerp.com-
20120521160745-4bir71koyn0vqgww
Antony Lesuisse [Mon, 21 May 2012 15:35:30 +0000 (17:35 +0200)]
[IMP] Widget.$ shortcut
bzr revid: al@openerp.com-
20120521153530-g3anzkkkhs75psk5
Antonin Bourguignon [Mon, 21 May 2012 14:38:13 +0000 (16:38 +0200)]
[IMP] view.rng: allow @groups for <label> element
bzr revid: abo@openerp.com-
20120521143813-2p9fflonbt38ftat
Fabien Pinckaers [Mon, 21 May 2012 14:25:13 +0000 (16:25 +0200)]
[IMP] improvement in burndown chart computation for companies not using the planned/remaining hours
bzr revid: fp@tinyerp.com-
20120521142513-8hnu35e2nbkh8f5d
Frédéric van der Essen [Mon, 21 May 2012 14:09:01 +0000 (16:09 +0200)]
[IMP] point_of_sale: some cleaning in pos_models.js
bzr revid: fva@openerp.com-
20120521140901-q5ofbhar04qqnrsq
Fabien Pinckaers [Mon, 21 May 2012 13:58:56 +0000 (15:58 +0200)]
[IMP] Removing context_XXX_id for default searches; replaced by save as default search in the new search widget
bzr revid: fp@tinyerp.com-
20120521135856-hc0kzrpgrxozpq9r
Christophe Simonis [Mon, 21 May 2012 13:55:56 +0000 (15:55 +0200)]
[FIX] correct default values from yaml import
bzr revid: chs@openerp.com-
20120521135556-xa1jifioz3boxhqt
Fabien Meghazi [Mon, 21 May 2012 13:09:14 +0000 (15:09 +0200)]
[IMP] Project Kanban: jslint and code indentation
bzr revid: fme@openerp.com-
20120521130914-c2iijoifs763am83
Fabien Meghazi [Mon, 21 May 2012 11:53:56 +0000 (13:53 +0200)]
[IMP] Improved some form views. Use oe_form_bottom class instead of oe_form_sheet_width
bzr revid: fme@openerp.com-
20120521115356-c8a854lifxongy95
Fabien Meghazi [Mon, 21 May 2012 11:50:59 +0000 (13:50 +0200)]
[ADD] Added oe_form_bottom class
bzr revid: fme@openerp.com-
20120521115059-ouw03odyc3bhpbls
Fabien Meghazi [Mon, 21 May 2012 11:47:27 +0000 (13:47 +0200)]
[IMP] Merge previous fp's base.css changes in base.sass
bzr revid: fme@openerp.com-
20120521114727-ou14pali2255am6w
Fabien Meghazi [Mon, 21 May 2012 11:40:38 +0000 (13:40 +0200)]
[ADD] QWeb2: added 'void' reserved keyword
bzr revid: fme@openerp.com-
20120521114038-tz48ac3cgg8zjmti
Amit Patel (OpenERP) [Mon, 21 May 2012 10:27:44 +0000 (15:57 +0530)]
[IMP]:account_vouchar:improved domain for attrs.
bzr revid: apa@tinyerp.com-
20120521102744-6ygc243zu22gy81y
niv-openerp [Mon, 21 May 2012 10:02:04 +0000 (12:02 +0200)]
[imp] modified rng of kanban view to add quick_create/create flags
bzr revid: nicolas.vanhoren@openerp.com-
20120521100204-maa76010h4ugz6oz
niv-openerp [Mon, 21 May 2012 10:00:44 +0000 (12:00 +0200)]
[imp] added possibility to customize quick_create/create flags in kanban view
bzr revid: nicolas.vanhoren@openerp.com-
20120521100044-skfs70f437x714av
niv-openerp [Mon, 21 May 2012 09:59:41 +0000 (11:59 +0200)]
[imp] implemented quick_create_enabled an create_enabled
bzr revid: nicolas.vanhoren@openerp.com-
20120521095941-qukymjtik97s5d1h
Amit Patel (OpenERP) [Mon, 21 May 2012 09:23:29 +0000 (14:53 +0530)]
[IMP]:base_calendar:set statusbar at top
bzr revid: apa@tinyerp.com-
20120521092329-usq1wbnmjlpkg5nf
Frédéric van der Essen [Mon, 21 May 2012 09:20:23 +0000 (11:20 +0200)]
[MERGE] trunk
bzr revid: fva@openerp.com-
20120521092023-qcis495ngwsudw43
Frédéric van der Essen [Mon, 21 May 2012 09:14:42 +0000 (11:14 +0200)]
[FIX] point_of_sale: starting to revert cashregister removal
bzr revid: fva@openerp.com-
20120521091442-m7nizf0dv60ehy9k
niv-openerp [Mon, 21 May 2012 09:05:54 +0000 (11:05 +0200)]
[merge]
bzr revid: nicolas.vanhoren@openerp.com-
20120521090554-bggmrf1rczlcxw9k
Amit Patel (OpenERP) [Mon, 21 May 2012 08:40:52 +0000 (14:10 +0530)]
[IMP]:account_voucher:set statusbar at top and also improved code with indentation.
bzr revid: apa@tinyerp.com-
20120521084052-aexwrj0zuxjkhrk3
Olivier Dony [Mon, 21 May 2012 07:38:51 +0000 (09:38 +0200)]
[FIX] fields: remove leftover print statement from r.4160
bzr revid: odo@openerp.com-
20120521073851-0e9k8ujhexysg95v
Amit Patel (OpenERP) [Mon, 21 May 2012 06:27:54 +0000 (11:57 +0530)]
[MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-
20120521062754-iduqobnqn0ro8p8l
Launchpad Translations on behalf of openerp [Sun, 20 May 2012 04:38:30 +0000 (04:38 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120520043830-uip2ma1eorsxtcgj
Fabien Pinckaers [Sat, 19 May 2012 09:44:37 +0000 (11:44 +0200)]
[IMP] reviewed Technical menu in config
bzr revid: fp@openerp.com-
20120519094437-dzq1grg1p35bvude
Fabien Pinckaers [Sat, 19 May 2012 09:40:44 +0000 (11:40 +0200)]
[IMP] color of text area
bzr revid: fp@openerp.com-
20120519094044-15bv6mukl3i8s1et
Fabien Pinckaers [Sat, 19 May 2012 09:31:37 +0000 (11:31 +0200)]
[IMP] improved empty lists for projects
bzr revid: fp@openerp.com-
20120519093137-uccmyn3xlctsfqce
Fabien Pinckaers [Sat, 19 May 2012 09:31:06 +0000 (11:31 +0200)]
[IMP] improved empty lists for projects
bzr revid: fp@openerp.com-
20120519093106-k16lro4b8k1zj6jy
Fabien Pinckaers [Sat, 19 May 2012 09:28:56 +0000 (11:28 +0200)]
[IMP] improved empty lists for projects
bzr revid: fp@openerp.com-
20120519092856-rnjr4ns5tiijjb05
Fabien Pinckaers [Sat, 19 May 2012 09:28:25 +0000 (11:28 +0200)]
[IMP] improved CSS of empty lists
bzr revid: fp@openerp.com-
20120519092825-kdvof375nllou04k
Fabien Pinckaers [Sat, 19 May 2012 08:33:50 +0000 (10:33 +0200)]
[IMP] removed administration dashboard, and reporting menu when nothing is installed
bzr revid: fp@openerp.com-
20120519083350-f0h24wnonf4ke2cg
Fabien Pinckaers [Sat, 19 May 2012 08:33:17 +0000 (10:33 +0200)]
[IMP] remove unused CSS
bzr revid: fp@openerp.com-
20120519083317-mcaybu82n2snhjgs
Fabien Pinckaers [Sat, 19 May 2012 08:15:55 +0000 (10:15 +0200)]
[IMP] improved kanban view of modules
bzr revid: fp@openerp.com-
20120519081555-02cq6tfby6o49dhy
Fabien Pinckaers [Sat, 19 May 2012 08:14:33 +0000 (10:14 +0200)]
[IMP] kanban view of modules
bzr revid: fp@openerp.com-
20120519081433-ijliji6bvnaemzee
Fabien Pinckaers [Sat, 19 May 2012 08:14:08 +0000 (10:14 +0200)]
[IMP] improved kanban view of modules
bzr revid: fp@openerp.com-
20120519081408-vugv7qgzsqtlssj0
Fabien Pinckaers [Sat, 19 May 2012 07:28:14 +0000 (09:28 +0200)]
[IMP] renamed Wall into news feed
bzr revid: fp@openerp.com-
20120519072814-iwa17z64rmrfrpzz
Fabien Pinckaers [Sat, 19 May 2012 06:37:47 +0000 (08:37 +0200)]
remove_old_addons
bzr revid: fp@openerp.com-
20120519063747-ao9qk6dhny23rfby
Launchpad Translations on behalf of openerp [Sat, 19 May 2012 05:21:16 +0000 (05:21 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120519052116-yxc981z0y3gidbsf
Fabien Pinckaers [Fri, 18 May 2012 16:43:13 +0000 (18:43 +0200)]
[REM] removed HTML_view module
bzr revid: fp@tinyerp.com-
20120518164313-9l2b57g3lpa0nogc
Olivier Dony [Fri, 18 May 2012 16:00:56 +0000 (18:00 +0200)]
[MERGE] orm: model-level @groups attribute for access control, part 1
bzr revid: odo@openerp.com-
20120518160056-qp9rhb97vlxs34ts
Olivier Dony [Fri, 18 May 2012 14:36:25 +0000 (16:36 +0200)]
[IMP] orm: support model-level @groups attribute for access restriction
This is a partial implementation with no support for
restricting read/write access via RPC. This first
part only covers the removal of the restricted fields
from the client-side view, i.e. in the results of
fields_view_get() and fields_get().
The second part will come later and will cover the
real low-level access control.
bzr revid: odo@openerp.com-
20120518143625-ps9db62vzrc2pylh
Olivier Dony [Fri, 18 May 2012 10:07:06 +0000 (12:07 +0200)]
[MERGE] ir.filters: unassigned filters are now global
Both clients will be adapted very soon to properly
handle the new global filters
bzr revid: odo@openerp.com-
20120518100706-n5o94okkf119grky
Olivier Dony [Fri, 18 May 2012 08:49:26 +0000 (10:49 +0200)]
[MERGE] Sync with latest trunk
bzr revid: odo@openerp.com-
20120518084926-dplc49g38krv7dsn
Launchpad Translations on behalf of openerp [Fri, 18 May 2012 04:40:26 +0000 (04:40 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120517043702-3k4asqkfmh2j0eca
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120518044026-ms6s6v52bntmiayu
Amit Patel (OpenERP) [Thu, 17 May 2012 10:15:17 +0000 (15:45 +0530)]
[MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-
20120517101517-npk57s14kgxlk7in
Launchpad Translations on behalf of openerp [Thu, 17 May 2012 04:49:03 +0000 (04:49 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120517044903-l2y14q0vq4xywmil
Fabien Meghazi [Wed, 16 May 2012 16:47:25 +0000 (18:47 +0200)]
[IMP] Improved sale order form view subtotal look
bzr revid: fme@openerp.com-
20120516164725-kcw2e2x0asjlmfha
Fabien Meghazi [Wed, 16 May 2012 16:38:01 +0000 (18:38 +0200)]
[ADD] Added class for subtotals in form views
bzr revid: fme@openerp.com-
20120516163801-fih3sspmpk5vrv9m
Quentin (OpenERP) [Wed, 16 May 2012 16:32:47 +0000 (18:32 +0200)]
[MERGE] merged a branch with fixes on l10n_fr. Courtesy from Akretion and Camptocamp
bzr revid: qdp-launchpad@openerp.com-
20120516163247-7o6cnwjq6but09um
Olivier Dony [Wed, 16 May 2012 16:31:22 +0000 (18:31 +0200)]
[IMP] ir.filters: default user_id = uid ; comment about cryptic code
(Some minor updates after XMO's review)
bzr revid: odo@openerp.com-
20120516163122-jsb3n2eo2i253o00
Quentin (OpenERP) [Wed, 16 May 2012 16:01:15 +0000 (18:01 +0200)]
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-
20120516160115-ufgnhjj8x8hb5mm7
niv-openerp [Wed, 16 May 2012 14:52:31 +0000 (16:52 +0200)]
[fix] rollback of previous fix regarding list view buttons and replacement with another fix
bzr revid: nicolas.vanhoren@openerp.com-
20120516145231-joteecabrzclkr2j
Quentin (OpenERP) [Wed, 16 May 2012 14:52:06 +0000 (16:52 +0200)]
[MERGE] added the l10n_fr_hr_payroll module that defines the payroll rules for France. Courtesy from Yannick Buron (synerpgy).
bzr revid: qdp-launchpad@openerp.com-
20120516145206-mivqx1vmna7idhmi
niv-openerp [Wed, 16 May 2012 14:37:23 +0000 (16:37 +0200)]
[imp] improvements in kanban view + improvements of o2m
bzr revid: nicolas.vanhoren@openerp.com-
20120516143723-nuzb87wduv3nn0m5
Quentin (OpenERP) [Wed, 16 May 2012 14:26:05 +0000 (16:26 +0200)]
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-
20120516142605-6xvtateqpsmz74rx
Quentin (OpenERP) [Wed, 16 May 2012 14:19:18 +0000 (16:19 +0200)]
[FIX] l10n_fr_hr_payroll: fixed typo in the company form view
bzr revid: qdp-launchpad@openerp.com-
20120516141918-d06gycr35043ion7
Quentin (OpenERP) [Wed, 16 May 2012 14:16:21 +0000 (16:16 +0200)]
[FIX] l10n_fr_hr_payroll: fixed typo in the report
bzr revid: qdp-launchpad@openerp.com-
20120516141621-kuy4n80do3d1k9qm
niv-openerp [Wed, 16 May 2012 14:13:28 +0000 (16:13 +0200)]
[imp] cleaned dialogs a little
bzr revid: nicolas.vanhoren@openerp.com-
20120516141328-dbak0bw3wa098zwv
niv-openerp [Wed, 16 May 2012 14:07:09 +0000 (16:07 +0200)]
[merge]
bzr revid: nicolas.vanhoren@openerp.com-
20120516140709-ue531n9e8wtny2l4
niv-openerp [Wed, 16 May 2012 14:06:22 +0000 (16:06 +0200)]
[imp] added documentation
bzr revid: nicolas.vanhoren@openerp.com-
20120516140622-q7a7xu9gufotx2f2
Quentin (OpenERP) [Wed, 16 May 2012 14:03:01 +0000 (16:03 +0200)]
[IMP] l10n_fr_hr_payroll: few fixes/code enhancement
bzr revid: qdp-launchpad@openerp.com-
20120516140301-p65l3gk3dt1q9ire
niv-openerp [Wed, 16 May 2012 14:01:19 +0000 (16:01 +0200)]
[imp] made FormOpenPopup in creation mode
bzr revid: nicolas.vanhoren@openerp.com-
20120516140119-e8n7y7uqqn9a2bho
Fabien Meghazi [Wed, 16 May 2012 13:18:04 +0000 (15:18 +0200)]
[FIX] Fixed buttons padding
bzr revid: fme@openerp.com-
20120516131804-ui3iok3qsyprqy0h
Alexis de Lattre [Wed, 16 May 2012 13:09:11 +0000 (15:09 +0200)]
Update code field, for to be coherent with others.
bzr revid: alexis@via.ecp.fr-
20120516130911-jkr22le0nzvj2mid
niv-openerp [Wed, 16 May 2012 13:05:10 +0000 (15:05 +0200)]
[fix] small problem with o2m
bzr revid: nicolas.vanhoren@openerp.com-
20120516130510-fdgu46p1fe8zqu2e
Frédéric van der Essen [Wed, 16 May 2012 13:01:42 +0000 (15:01 +0200)]
[FIX] Forgot to add pos_basewidget.js
bzr revid: fva@openerp.com-
20120516130142-5u23uerr5s8y7ydq
niv-openerp [Wed, 16 May 2012 13:01:42 +0000 (15:01 +0200)]
[imp] improved AbstractFormPopup
bzr revid: nicolas.vanhoren@openerp.com-
20120516130142-quyvtv0s35uvbuug
Fabien Meghazi [Wed, 16 May 2012 12:50:32 +0000 (14:50 +0200)]
[REM] Removed autolayout css class
bzr revid: fme@openerp.com-
20120516125032-t1wnomvppdbobuhv
niv-openerp [Wed, 16 May 2012 11:58:56 +0000 (13:58 +0200)]
[imp] created AbstractFormPopup
bzr revid: nicolas.vanhoren@openerp.com-
20120516115856-p0tjpkfewq1y8ez8
Fabien Meghazi [Wed, 16 May 2012 11:25:34 +0000 (13:25 +0200)]
[IMP] Opportunities form view: add a clear element in case actions buttons are all hidden
bzr revid: fme@openerp.com-
20120516112534-suwavwiiohusvq3a
Fabien Meghazi [Wed, 16 May 2012 11:18:41 +0000 (13:18 +0200)]
[IMP] Labels in bold
bzr revid: fme@openerp.com-
20120516111841-85xn2ghpbm15gjsr
Fabien Meghazi [Wed, 16 May 2012 11:16:59 +0000 (13:16 +0200)]
[IMP] Opportunities form view: use <div> for buttons, highlight first action button in topbar
bzr revid: fme@openerp.com-
20120516111659-zlc768ymthbyedjr
niv-openerp [Wed, 16 May 2012 10:52:51 +0000 (12:52 +0200)]
[imp] implemented switch_view in o2m view manager and used it in kanban view
bzr revid: nicolas.vanhoren@openerp.com-
20120516105251-rebt18lj9bwndydw
niv-openerp [Wed, 16 May 2012 10:16:34 +0000 (12:16 +0200)]
[imp] small modif to view manager for future refactoring
bzr revid: nicolas.vanhoren@openerp.com-
20120516101634-bjne7hl4twvrfoy3
niv-openerp [Wed, 16 May 2012 09:24:19 +0000 (11:24 +0200)]
[merge]
bzr revid: nicolas.vanhoren@openerp.com-
20120516092419-t3ndbvgwpxtmslmu
Launchpad Translations on behalf of openerp [Wed, 16 May 2012 05:10:16 +0000 (05:10 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120516045107-v494g863893yktqz
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120516051016-e707dlnmnhgrraoo
Launchpad Translations on behalf of openerp [Wed, 16 May 2012 04:50:22 +0000 (04:50 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120516045022-5gencrjii0g9z33w
Antony Lesuisse [Tue, 15 May 2012 15:34:23 +0000 (17:34 +0200)]
[FIX] #menu_id loading, move client_actions registry
bzr revid: al@openerp.com-
20120515153423-bj6vgiuwq26cyq5o
Antony Lesuisse [Tue, 15 May 2012 15:17:56 +0000 (17:17 +0200)]
[IMP] allow #menu_id=<id> in url for client action reload
bzr revid: al@openerp.com-
20120515151756-cifgi1a3iugbc08l
Raphael Collet [Tue, 15 May 2012 14:46:30 +0000 (16:46 +0200)]
[MERGE] trunk-v62_config (improve and complete new config wizards)
bzr revid: rco@openerp.com-
20120515144630-j6qltq8e2t7grxj2
Raphael Collet [Tue, 15 May 2012 14:27:54 +0000 (16:27 +0200)]
[MERGE] trunk-v62_config (new config settings)
bzr revid: rco@openerp.com-
20120515142754-inmaclzdqqvh6tu0
Raphael Collet [Tue, 15 May 2012 14:12:23 +0000 (16:12 +0200)]
[IMP] module: simplify code to reload client
bzr revid: rco@openerp.com-
20120515141223-hflk9cd3acs4pbc0
niv-openerp [Tue, 15 May 2012 14:10:02 +0000 (16:10 +0200)]
[fix] create button invisible in m2m
bzr revid: nicolas.vanhoren@openerp.com-
20120515141002-coccv7acdndnu3bg
Antony Lesuisse [Tue, 15 May 2012 14:10:15 +0000 (16:10 +0200)]
[MERGE] reload client action
bzr revid: al@openerp.com-
20120515141015-vass9xrvbzp2xl8k
Raphael Collet [Tue, 15 May 2012 14:07:56 +0000 (16:07 +0200)]
[IMP] module: use client action 'reload' when returning from module installation
bzr revid: rco@openerp.com-
20120515140756-vhw0aw71fbv0p08b
Raphael Collet [Tue, 15 May 2012 13:35:23 +0000 (15:35 +0200)]
[IMP] client action 'reload': optionally open a given menu_id
bzr revid: rco@openerp.com-
20120515133523-78amsdjhtbzr6akj
Raphael Collet [Tue, 15 May 2012 12:10:16 +0000 (14:10 +0200)]
[IMP] res.config.settings: rename client action 'reload_all' into 'reload'
bzr revid: rco@openerp.com-
20120515121016-tnmltjsgdqnw91cq
Raphael Collet [Tue, 15 May 2012 12:09:40 +0000 (14:09 +0200)]
[IMP] rename client action 'reload_all' into 'reload'
bzr revid: rco@openerp.com-
20120515120940-cmxvhk63j06judoq
Quentin (OpenERP) [Tue, 15 May 2012 11:32:30 +0000 (13:32 +0200)]
[MERGE] merged the branch with split of deliveries/receptions (second attempt)
bzr revid: qdp-launchpad@openerp.com-
20120515113230-75y0zg9h5goouh83
Quentin (OpenERP) [Tue, 15 May 2012 10:57:29 +0000 (12:57 +0200)]
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-
20120515105729-6vywpfya0ztukqph
Frédéric van der Essen [Tue, 15 May 2012 09:27:29 +0000 (11:27 +0200)]
[MERGE] trunk
bzr revid: fva@openerp.com-
20120515092729-6km4pmgay1wpdjyg