DBR (OpenERP) [Fri, 22 Jun 2012 06:18:17 +0000 (11:48 +0530)]
[IMP]purchase: View imp for cpompute btn and total
bzr revid: dbr@tinyerp.com-
20120622061817-2kgmzi6i9rw6zu5x
DBR (OpenERP) [Fri, 22 Jun 2012 05:55:24 +0000 (11:25 +0530)]
[IMP] account, product:
account : Improve view for account_invoice_view.xml
account : Improve view for product_view.xml
product : Improve product category as well as uom view file
stock : Improve product inherited view
bzr revid: dbr@tinyerp.com-
20120622055524-j3erbqup81u72f6f
DBR (OpenERP) [Thu, 21 Jun 2012 13:29:32 +0000 (18:59 +0530)]
[Merge] with: lp:~openerp-commiter/openobject-addons/trunk-review-purchase-form-dbr-invoice-draft-view-hsa
bzr revid: dbr@tinyerp.com-
20120621132932-06nbutvvhm09zmhu
DBR (OpenERP) [Thu, 21 Jun 2012 12:43:28 +0000 (18:13 +0530)]
[IMP]account: Improve header for form view
bzr revid: dbr@tinyerp.com-
20120621124328-2fwjk7ap1cqvp8dg
Hardik [Thu, 21 Jun 2012 11:36:38 +0000 (17:06 +0530)]
[IMP]Purchase Invoice Control Based on Purchase Order Line Comma is remove
bzr revid: hsa@tinyerp.com-
20120621113638-ceunkw3zl7144pe2
DBR (OpenERP) [Thu, 21 Jun 2012 11:03:27 +0000 (16:33 +0530)]
[IMP] Purchase, stock:
Improve view of Receive Products and Incoming shipments
bzr revid: dbr@tinyerp.com-
20120621110327-w0jxyrunrjejt2qx
Hardik [Thu, 21 Jun 2012 10:13:12 +0000 (15:43 +0530)]
[IMP]Based On Draft Invoice : change o2m tree view in other info and payement tab
bzr revid: hsa@tinyerp.com-
20120621101312-qe1ocn494cz32xnz
Hardik [Thu, 21 Jun 2012 09:54:02 +0000 (15:24 +0530)]
[IMP]Based On Draft Invoice : change o2m in tree view
bzr revid: hsa@tinyerp.com-
20120621095402-n2snwud0xy27o1jh
Hardik [Thu, 21 Jun 2012 09:41:10 +0000 (15:11 +0530)]
[IMP]Based On Draft Invoice : change form view
bzr revid: hsa@tinyerp.com-
20120621094110-w0imsro09w5te5jv
DBR (OpenERP) [Thu, 21 Jun 2012 07:31:27 +0000 (13:01 +0530)]
[Merge]with: lp:~openerp-commiter/openobject-addons/trunk-review-purchase-form-dbr-po-line-hsa
bzr revid: dbr@tinyerp.com-
20120621073127-sziqeczmfk6cah4g
DBR (OpenERP) [Thu, 21 Jun 2012 07:25:51 +0000 (12:55 +0530)]
[REM]purchase: remove all changes for purchase_order_line_form2
bzr revid: dbr@tinyerp.com-
20120621072551-1baov2yznmoj1qyf
DBR (OpenERP) [Thu, 21 Jun 2012 07:15:16 +0000 (12:45 +0530)]
[IMP]Purchase: set space instead of tab and some minore changes
bzr revid: dbr@tinyerp.com-
20120621071516-wlhx0y6f8idkg0q2
DBR (OpenERP) [Thu, 21 Jun 2012 06:07:04 +0000 (11:37 +0530)]
[IMP]purchase: Remove Incoming Shipment from more
bzr revid: dbr@tinyerp.com-
20120621060704-driru0f03yd23u9v
Hardik [Thu, 21 Jun 2012 05:46:51 +0000 (11:16 +0530)]
[IMP]Purchase Quotations : Changes Child view
bzr revid: hsa@tinyerp.com-
20120621054651-wd2p078h3rf1491q
Hardik [Thu, 21 Jun 2012 05:29:02 +0000 (10:59 +0530)]
[Merge]with: lp:~openerp-dev/openobject-addons/trunk-review-purchase-form-dbr
bzr revid: hsa@tinyerp.com-
20120621052902-0lict5v0yt3qfekn
DBR (OpenERP) [Thu, 21 Jun 2012 04:54:40 +0000 (10:24 +0530)]
[Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-
20120621045440-6m3nhz5o0q39jpub
Antony Lesuisse [Wed, 20 Jun 2012 16:21:48 +0000 (18:21 +0200)]
[FIX] typo
bzr revid: al@openerp.com-
20120620162148-fkxz4fs9qd9iofee
Fabien Meghazi [Wed, 20 Jun 2012 15:30:25 +0000 (17:30 +0200)]
[MERGE] trunk-cssrefactor-fme
bzr revid: fme@openerp.com-
20120620153025-qzo6tybwd1rxjxlb
Fabien Meghazi [Wed, 20 Jun 2012 15:29:51 +0000 (17:29 +0200)]
[MERGE] trunk-cssrefactor-fme
bzr revid: fme@openerp.com-
20120620152951-z3dgkjm0iwnn56c0
Fabien Meghazi [Wed, 20 Jun 2012 15:16:25 +0000 (17:16 +0200)]
[MERGE] trunk
bzr revid: fme@openerp.com-
20120620151625-dc0zbi10tf2fzr6q
Fabien Meghazi [Wed, 20 Jun 2012 15:14:53 +0000 (17:14 +0200)]
[WIP] Replaced cropdown by dropdown
bzr revid: fme@openerp.com-
20120620151453-9g32rrbv3x0b1v8p
Fabien Meghazi [Wed, 20 Jun 2012 15:14:14 +0000 (17:14 +0200)]
[WIP] Replaced cropdown by dropdown
bzr revid: fme@openerp.com-
20120620151414-ks1buw6smpsb9bk3
Fabien Meghazi [Wed, 20 Jun 2012 15:08:51 +0000 (17:08 +0200)]
[MERGE] trunk
bzr revid: fme@openerp.com-
20120620150851-fi18faps8pp64obh
Fabien Meghazi [Wed, 20 Jun 2012 15:03:04 +0000 (17:03 +0200)]
[IMP] Move kanban dropdown offset to global dropdown handler
bzr revid: fme@openerp.com-
20120620150304-muf0js0nu0cjhzk0
Fabien Meghazi [Wed, 20 Jun 2012 14:59:02 +0000 (16:59 +0200)]
[REM] Desactivated global click for the moment
bzr revid: fme@openerp.com-
20120620145902-dibck9d678bhrby7
Fabien Meghazi [Wed, 20 Jun 2012 14:04:12 +0000 (16:04 +0200)]
[WIP] Kanban dropdown
bzr revid: fme@openerp.com-
20120620140412-4zu20em9qd5277py
Fabien Meghazi [Wed, 20 Jun 2012 13:59:31 +0000 (15:59 +0200)]
[WIP] Kanban dropdown
bzr revid: fme@openerp.com-
20120620135931-32of1kgyjb1otj12
Hardik [Wed, 20 Jun 2012 13:29:39 +0000 (18:59 +0530)]
[IMP]Purchase Order : Create Child View
bzr revid: hsa@tinyerp.com-
20120620132939-x4rt3h6f5ldv7ffu
DBR (OpenERP) [Wed, 20 Jun 2012 13:19:20 +0000 (18:49 +0530)]
[IMP]stock: Receive Products form view
add labels on fields Pack and Serial Number
bzr revid: dbr@tinyerp.com-
20120620131920-2sp9fbr85qvcs5i9
Raphael Collet [Wed, 20 Jun 2012 12:46:40 +0000 (14:46 +0200)]
[MERGE] trunk-first_10_clicks_sale-rco (various usability fixes related to sale)
bzr revid: rco@openerp.com-
20120620124640-97rql1cx611yqd8w
Raphael Collet [Wed, 20 Jun 2012 12:42:54 +0000 (14:42 +0200)]
[MERGE] trunk-first_10_clicks_sale-rco (various usability fixes related to sale)
bzr revid: rco@openerp.com-
20120620124254-y41nxgkyb6meddr9
DBR (OpenERP) [Wed, 20 Jun 2012 12:13:28 +0000 (17:43 +0530)]
[IMP]purchas: set Incomming Shipment button for purchase order only
bzr revid: dbr@tinyerp.com-
20120620121328-xv93qvdozyob4y92
Raphael Collet [Wed, 20 Jun 2012 12:02:18 +0000 (14:02 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120620120218-5jomfr69y9wet5me
Raphael Collet [Wed, 20 Jun 2012 12:00:16 +0000 (14:00 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120620120016-y6tav3i75p9fe1sj
Hardik [Wed, 20 Jun 2012 11:14:30 +0000 (16:44 +0530)]
[IMP]Purchase Order : Create Child View
bzr revid: hsa@tinyerp.com-
20120620111430-ge5jqw9t4rkqyrqx
Hardik [Wed, 20 Jun 2012 11:13:54 +0000 (16:43 +0530)]
[IMP]Purchase Order : Create Child View
bzr revid: hsa@tinyerp.com-
20120620111354-9liet880g7idfgzc
Hardik [Wed, 20 Jun 2012 11:07:12 +0000 (16:37 +0530)]
[IMP]Purchase Order : Create Child View
bzr revid: hsa@tinyerp.com-
20120620110712-n6b8w4orfaulmg6z
Hardik [Wed, 20 Jun 2012 11:02:07 +0000 (16:32 +0530)]
[IMP]Purchase Order : Create Child View
bzr revid: hsa@tinyerp.com-
20120620110207-wbvn3uvcdc9w0vn7
DBR (OpenERP) [Wed, 20 Jun 2012 10:35:43 +0000 (16:05 +0530)]
[IMP]purchas: set Incomming Shipment button
bzr revid: dbr@tinyerp.com-
20120620103543-61tgvau4eka1jh31
Fabien Meghazi [Wed, 20 Jun 2012 10:21:26 +0000 (12:21 +0200)]
[FIX] Sidebar dropdown
bzr revid: fme@openerp.com-
20120620102126-nax3dlhuj9ja2x2w
Raphael Collet [Wed, 20 Jun 2012 10:15:23 +0000 (12:15 +0200)]
[IMP] sale: highlight button 'Create Final Invoice' on sale order form
bzr revid: rco@openerp.com-
20120620101523-kin481zyf0cyxb6v
Hardik [Wed, 20 Jun 2012 10:06:14 +0000 (15:36 +0530)]
[IMP]Purchase Order line : Changes in form view
bzr revid: hsa@tinyerp.com-
20120620100614-6qcsz0zr86d1hfgy
Raphael Collet [Wed, 20 Jun 2012 09:58:12 +0000 (11:58 +0200)]
[FIX] name_get of res.partner and res.partner.category, to accept an int as ids
bzr revid: rco@openerp.com-
20120620095812-6kl28dcry2fx8op6
Raphael Collet [Wed, 20 Jun 2012 09:47:14 +0000 (11:47 +0200)]
[IMP] res_partner: reintroduce filters 'Customers' and 'Suppliers' in search form
bzr revid: rco@openerp.com-
20120620094714-jexi93e701ui4d8q
Antony Lesuisse [Wed, 20 Jun 2012 09:45:20 +0000 (11:45 +0200)]
[FIX] listview sass
bzr revid: al@openerp.com-
20120620094520-4051lhn04rpx3di1
Raphael Collet [Wed, 20 Jun 2012 09:45:08 +0000 (11:45 +0200)]
[IMP] stock: remove field date_expected from lines in delivery order form
bzr revid: rco@openerp.com-
20120620094508-z3w4vq3ustio1mko
DBR (OpenERP) [Wed, 20 Jun 2012 08:51:20 +0000 (14:21 +0530)]
[IMP]purchase: improve the purchase form view
bzr revid: dbr@tinyerp.com-
20120620085120-l19503yk32ea1kkc
Raphael Collet [Wed, 20 Jun 2012 08:22:05 +0000 (10:22 +0200)]
[IMP] sale: fix default search on related actions
bzr revid: rco@openerp.com-
20120620082205-u2ynzpr7wp6sgbaw
Raphael Collet [Wed, 20 Jun 2012 08:08:14 +0000 (10:08 +0200)]
[IMP] restyle buttons of some wizards
bzr revid: rco@openerp.com-
20120620080814-ynha15jlkyhrbyba
Raphael Collet [Wed, 20 Jun 2012 08:07:37 +0000 (10:07 +0200)]
[IMP] account: clean up wizard forms
bzr revid: rco@openerp.com-
20120620080737-vtl4mso2o32pm8ze
Raphael Collet [Wed, 20 Jun 2012 07:12:53 +0000 (09:12 +0200)]
[IMP] account: root menu is now 'Invoicing', and becomes 'Accounting' once module account_accountant is installed
bzr revid: rco@openerp.com-
20120620071253-qnrkuzr0u3v123x9
Stephane Wirtel [Wed, 20 Jun 2012 05:02:43 +0000 (07:02 +0200)]
[MERGE] The 'clean_form_view' branch with the new css styles
bzr revid: stw@openerp.com-
20120620050243-jgaka5ikqb92g2qa
Stephane Wirtel [Wed, 20 Jun 2012 05:02:20 +0000 (07:02 +0200)]
[MERGE] Merge the 'clean_form_view' branch with the new css styles
bzr revid: stw@openerp.com-
20120620050220-1rc5zov1lc5u4n9h
Fabien Meghazi [Tue, 19 Jun 2012 21:22:12 +0000 (23:22 +0200)]
[WIP] Update Menu [More...]
bzr revid: fme@openerp.com-
20120619212212-k2yl19h2x1oan1o6
Fabien Meghazi [Tue, 19 Jun 2012 20:56:11 +0000 (22:56 +0200)]
[WIP] Web shortcuts uses cropdown
bzr revid: fme@openerp.com-
20120619205611-2ar60dovmu2higln
Fabien Meghazi [Tue, 19 Jun 2012 20:55:30 +0000 (22:55 +0200)]
[WIP] UserMenu cropdown
bzr revid: fme@openerp.com-
20120619205530-t0uuaerrspja3084
Antony Lesuisse [Tue, 19 Jun 2012 16:18:42 +0000 (18:18 +0200)]
[FIX] no sheet header
bzr revid: al@openerp.com-
20120619161842-xf5xki44bb91njvy
Raphael Collet [Tue, 19 Jun 2012 14:57:28 +0000 (16:57 +0200)]
[IMP] account: remove unused field in account configuration
bzr revid: rco@openerp.com-
20120619145728-r4um4cdxx1gk11zx
Raphael Collet [Tue, 19 Jun 2012 14:38:09 +0000 (16:38 +0200)]
[IMP] account: clean up wizard.multi.charts.accounts
bzr revid: rco@openerp.com-
20120619143809-l61w89poos2r33db
Antony Lesuisse [Tue, 19 Jun 2012 14:26:51 +0000 (16:26 +0200)]
[MERGE] mit style
bzr revid: al@openerp.com-
20120619142651-pfdm9z6fg1knwlzu
Antony Lesuisse [Tue, 19 Jun 2012 14:21:09 +0000 (16:21 +0200)]
fix notebook in sheet
bzr revid: al@openerp.com-
20120619142109-9q269mjhus62ads6
Antony Lesuisse [Tue, 19 Jun 2012 14:07:24 +0000 (16:07 +0200)]
fix groups
bzr revid: al@openerp.com-
20120619140724-2k5pxakw99emft7y
Antony Lesuisse [Tue, 19 Jun 2012 13:57:54 +0000 (15:57 +0200)]
[MERGE] mit style
bzr revid: al@openerp.com-
20120619135754-y05aie9hd95bsrmw
Minh Tran [Tue, 19 Jun 2012 13:53:57 +0000 (15:53 +0200)]
fixed tabs flickering and margin
bzr revid: mit@openerp.com-
20120619135357-5wa1ywcvqh90086j
Antony Lesuisse [Tue, 19 Jun 2012 13:51:15 +0000 (15:51 +0200)]
fix tabs form cleanups
bzr revid: al@openerp.com-
20120619135115-2c559uf6lega2v6c
Antony Lesuisse [Tue, 19 Jun 2012 13:42:23 +0000 (15:42 +0200)]
[MERGE] trunk
bzr revid: al@openerp.com-
20120619132452-ogzgxllhwdoxb1me
bzr revid: al@openerp.com-
20120619134223-e08aib295f3wdbcs
Antony Lesuisse [Tue, 19 Jun 2012 13:42:02 +0000 (15:42 +0200)]
[IMP] sass form reorganisationa
bzr revid: al@openerp.com-
20120619134202-8ueuiytk6lrjrmm3
Fabien Meghazi [Tue, 19 Jun 2012 13:29:06 +0000 (15:29 +0200)]
[WIP] Changed oe_topbar_item
bzr revid: fme@openerp.com-
20120619132906-d218w8tgf6ovbm1o
Antony Lesuisse [Tue, 19 Jun 2012 13:23:58 +0000 (15:23 +0200)]
[IMP] sass form cleanups
bzr revid: al@openerp.com-
20120619132358-25it8p6mt79kf5bf
Fabien Meghazi [Tue, 19 Jun 2012 13:14:32 +0000 (15:14 +0200)]
[WIP] Changed oe_topbar_item
bzr revid: fme@openerp.com-
20120619131432-69tuwtw3dr0jhjo8
Antony Lesuisse [Tue, 19 Jun 2012 13:02:20 +0000 (15:02 +0200)]
[MERGE] mit style
bzr revid: al@openerp.com-
20120619130220-44vg6uae5po3hdxo
Antony Lesuisse [Tue, 19 Jun 2012 13:01:44 +0000 (15:01 +0200)]
[MERGE] trunk
bzr revid: al@openerp.com-
20120619130144-g5o2h09qbegc4ssh
Antony Lesuisse [Tue, 19 Jun 2012 12:57:47 +0000 (14:57 +0200)]
[MERGE] trunk
bzr revid: al@openerp.com-
20120619125747-2m71412mtqvxph4x
Minh Tran [Tue, 19 Jun 2012 12:52:33 +0000 (14:52 +0200)]
Adjustement to textarea
bzr revid: mit@openerp.com-
20120619125233-fz0qzbae7xc2eh9m
Antony Lesuisse [Tue, 19 Jun 2012 12:51:02 +0000 (14:51 +0200)]
[IMP] sass button styling
bzr revid: al@openerp.com-
20120619125102-xq1u5il44f81tlet
Xavier Morel [Tue, 19 Jun 2012 12:06:56 +0000 (14:06 +0200)]
[REM] broken inactive session cleanup
crummy code + "cleans up" (destroys) 6.1 sessions while they're being
used
bzr revid: xmo@openerp.com-
20120619120656-u3bbcbwmd6cftosk
Raphael Collet [Tue, 19 Jun 2012 12:00:34 +0000 (14:00 +0200)]
[IMP] account: clean up form 'Configure your Chart of Accounts'
bzr revid: rco@openerp.com-
20120619120034-viro7n40ezmcwr4v
Fabien Meghazi [Tue, 19 Jun 2012 09:32:49 +0000 (11:32 +0200)]
[FIX] Datetime fields get stuck on screen when clicked twice
lp bug: https://launchpad.net/bugs/987358 fixed
bzr revid: fme@openerp.com-
20120619093249-g6eexljq3bhyd037
Antony Lesuisse [Tue, 19 Jun 2012 09:30:11 +0000 (11:30 +0200)]
[IMP] more sass cleanup
bzr revid: al@openerp.com-
20120619093011-lwid3wsrko5xcukm
Fabien Meghazi [Tue, 19 Jun 2012 09:06:42 +0000 (11:06 +0200)]
[ADD] Add Cache-Control support in Binary Image and kanban view
bzr revid: fme@openerp.com-
20120619090642-o397qwkzanof1b04
Stephane Wirtel [Tue, 19 Jun 2012 08:57:32 +0000 (10:57 +0200)]
[MERGE] Upstream
bzr revid: stw@openerp.com-
20120619085732-k7oowvsx5fwdfi75
Stephane Wirtel [Tue, 19 Jun 2012 08:57:20 +0000 (10:57 +0200)]
[MERGE] Upstream
bzr revid: stw@openerp.com-
20120619085720-i5k34ugbo24gz4lp
Stephane Wirtel [Tue, 19 Jun 2012 08:56:18 +0000 (10:56 +0200)]
[REF] Change the CSS classes
bzr revid: stw@openerp.com-
20120619085618-agdxk4fdgy3of6gp
Stephane Wirtel [Tue, 19 Jun 2012 08:56:09 +0000 (10:56 +0200)]
[REF] Change the CSS classes
bzr revid: stw@openerp.com-
20120619085609-s5l0jpce8srcncdq
Antony Lesuisse [Tue, 19 Jun 2012 08:45:26 +0000 (10:45 +0200)]
[IMP] sass cleanup
bzr revid: al@openerp.com-
20120619084526-kif8cq0zdsti8jwy
Raphael Collet [Tue, 19 Jun 2012 08:38:30 +0000 (10:38 +0200)]
[IMP] base_setup: show hidden menus 'Companies', 'Users' and 'OpenERP Enterprise' in Settings
bzr revid: rco@openerp.com-
20120619083830-7qqhikd1qaes3bm9
Raphael Collet [Tue, 19 Jun 2012 08:37:32 +0000 (10:37 +0200)]
[IMP] Settings: hide menus 'Companies', 'Users' and 'OpenERP Enterprise' by restricting to group_no_one
bzr revid: rco@openerp.com-
20120619083732-fet0psn4wksbujbx
Raphael Collet [Tue, 19 Jun 2012 08:10:05 +0000 (10:10 +0200)]
[IMP] translations: rename 'Load an Official Translation' to 'Load a Translation'
bzr revid: rco@openerp.com-
20120619081005-uqx5e9add4k2ufvr
Raphael Collet [Tue, 19 Jun 2012 08:00:17 +0000 (10:00 +0200)]
[IMP] modules view: rename title to 'Install a Module'
bzr revid: rco@openerp.com-
20120619080017-4xw8vwx3sckzasni
Raphael Collet [Tue, 19 Jun 2012 07:56:57 +0000 (09:56 +0200)]
[IMP] modules kanban view: make icon non-clickable
bzr revid: rco@openerp.com-
20120619075657-wahos7ymsnnp3fnr
Fabien Pinckaers [Tue, 19 Jun 2012 05:25:11 +0000 (07:25 +0200)]
[IMP] layout task form view
bzr revid: fp@tinyerp.com-
20120619052511-z7p8myd020prwfs7
Fabien Pinckaers [Tue, 19 Jun 2012 05:20:35 +0000 (07:20 +0200)]
[IMP] task form view
bzr revid: fp@tinyerp.com-
20120619052035-9z4z0wgj7xoaj218
Launchpad Translations on behalf of openerp [Tue, 19 Jun 2012 04:54:37 +0000 (04:54 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120619045437-ggvt85jtkryegn8u
Launchpad Translations on behalf of openerp [Tue, 19 Jun 2012 04:54:05 +0000 (04:54 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120619045405-ph1rk1u128groesk
Stephane Wirtel [Mon, 18 Jun 2012 21:30:57 +0000 (23:30 +0200)]
[MERGE] lp:~openerp/openobject-addons/trunk-clean_form_view-stw
bzr revid: stw@openerp.com-
20120618213057-u21b63az5pqxafig
Stephane Wirtel [Mon, 18 Jun 2012 21:30:37 +0000 (23:30 +0200)]
[MERGE] lp:~openerp/openobject-server/trunk-clean_form_view-stw
bzr revid: stw@openerp.com-
20120618213037-kappigyv8pyncjcl
Fabien Pinckaers [Mon, 18 Jun 2012 20:18:12 +0000 (22:18 +0200)]
[IMP] white background color for ungrouped kanban
bzr revid: fp@tinyerp.com-
20120618201812-axqdrzq2a2wnwe6t
Stephane Wirtel [Mon, 18 Jun 2012 16:39:59 +0000 (18:39 +0200)]
[REF] Review and fix some views
bzr revid: stw@openerp.com-
20120618163959-84x74s1vpuhkmqo9
Stephane Wirtel [Mon, 18 Jun 2012 16:03:49 +0000 (18:03 +0200)]
[MERGE] Upstream
bzr revid: stw@openerp.com-
20120618160349-vwqtxdihrjc21qpz
Stephane Wirtel [Mon, 18 Jun 2012 16:02:30 +0000 (18:02 +0200)]
[MERGE] Upstream
bzr revid: stw@openerp.com-
20120618160230-u9ohqwbkikh8wqnm