[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 12 Nov 2012 04:23:09 +0000 (09:53 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 12 Nov 2012 04:23:09 +0000 (09:53 +0530)
bzr revid: fka@tinyerp.com-20121112042309-fbmhu0hjmwcj52tg

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

Simple merge
Simple merge