[MERGE] OPW 579210: sale_margin/sale_layout: fix incompatibilities when both modules...
authorXavier ALT <xal@openerp.com>
Wed, 2 Jan 2013 11:50:01 +0000 (12:50 +0100)
committerXavier ALT <xal@openerp.com>
Wed, 2 Jan 2013 11:50:01 +0000 (12:50 +0100)
commitc7fadc4451f44e4a897275dbac83796d73b53e2d
tree196c73f064aa963e71d9822af76b3f0d9920a6d9
parent60cfaf6dcd11cacc6ae4e881b7a9ad29723c4432
parent83ce82876a75f1a67fa9abf46231f13c2ded4227
[MERGE] OPW 579210: sale_margin/sale_layout: fix incompatibilities when both modules are installed

bzr revid: xal@openerp.com-20130102115001-c241nzm0ak949wv8
addons/sale/sale_view.xml