[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 04:51:41 +0000 (10:21 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 04:51:41 +0000 (10:21 +0530)
commit0c608550064c82b49fb4b16795d2fae4d60a3453
tree0d58177f167b9987c981d0a83fcfb0bb0086d0c6
parentc8f02f8003145aff3c0e3fa3f6378ba65802962e
parent41a69ec95df4a039fb95241522fe996a103e142b
[MERGE]

bzr revid: apa@tinyerp.com-20120430045141-mr0r598jvumg7e05
addons/sale/sale.py
addons/sale/sale_view.xml