[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 9 Nov 2012 04:43:37 +0000 (10:13 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 9 Nov 2012 04:43:37 +0000 (10:13 +0530)
bzr revid: fka@tinyerp.com-20121108124535-sbv49f5mk4hz2tgi
bzr revid: fka@tinyerp.com-20121109044337-95db5zx4hlngqnof

1  2 
addons/account/account_move_line.py
addons/account/account_view.xml

Simple merge
Simple merge