[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-accou...
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 28 Jun 2012 06:51:18 +0000 (12:21 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 28 Jun 2012 06:51:18 +0000 (12:21 +0530)
commitf9f053a9fb6ae8524a0065ffa0f6a0aaab4fb121
tree77618673bda29db50853988ac8583ccec9236eef
parent87a3a39cb492dbf92a533ba1d30a357a3cce5054
parent6b7047c9c4880802d56065f5bf4ff426dc43b331
[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-account-assets-bde

bzr revid: atp@tinyerp.com-20120628065118-fthpld3kkwphdb0t
addons/account_asset/account_asset.py
addons/account_asset/account_asset_view.xml