[MERGE]: Merge with latest trunk-addons and resolved conflicts
authorRucha (Open ERP) <rpa@tinyerp.com>
Mon, 26 Dec 2011 11:26:05 +0000 (16:56 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Mon, 26 Dec 2011 11:26:05 +0000 (16:56 +0530)
commit82dd48691ba5ea5c6062d68763c3be2e81fc750a
treee1d147f74edcf248f837cd27a2db5fd4a6bc92f7
parent04bdda2a295cae1222702b029fdaf61684142816
parent01555b28a9fdf8ce1d0c17039d9d4af260010671
[MERGE]: Merge with latest trunk-addons and resolved conflicts

bzr revid: rpa@tinyerp.com-20111226112605-zxbl07jkzjtpyktw
addons/account/account.py