Merge pull request #1124 from odoo-dev/master-wmsstaging4-jco
authorqdp-odoo <qdp@openerp.com>
Thu, 17 Jul 2014 16:18:16 +0000 (18:18 +0200)
committerqdp-odoo <qdp@openerp.com>
Thu, 17 Jul 2014 16:18:16 +0000 (18:18 +0200)
commitd35d47165ede4860e040d616cc09a899855e0e6f
tree72732e1b4e78aa612aa628743cd40ffe69865685
parentb1f1596aef5e8968d22abb63f9e7bf8da72b009b
parent5f21eeb1d28f9da79914b64a53f68d05988684f8
Merge pull request #1124 from odoo-dev/master-wmsstaging4-jco

fixes related to WMS, product variants and templates... from Josse
addons/account/account_view.xml
addons/calendar/calendar.py
addons/sale/sale.py