[MERGE] merged with main addons
authorBharat (OpenERP) <bde@tinyerp.com>
Thu, 15 Sep 2011 12:03:03 +0000 (17:33 +0530)
committerBharat (OpenERP) <bde@tinyerp.com>
Thu, 15 Sep 2011 12:03:03 +0000 (17:33 +0530)
commit3611c379654b12c739bad2c249836bc92baec592
tree66f3f19da6c185ae7cddf699eae20a0a85a80e07
parent8de161c2436861158c63aa072b1bd344834e7d76
[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915120303-cwl491qebv0lwhgx
addons/sale_layout/sale_layout.py
addons/sale_layout/sale_layout_view.xml
addons/sale_margin/sale_margin.py