[MERGE]sync with parent
authorsgo@tinyerp.com <>
Mon, 10 Jun 2013 05:00:15 +0000 (10:30 +0530)
committersgo@tinyerp.com <>
Mon, 10 Jun 2013 05:00:15 +0000 (10:30 +0530)
commitfea1eaf1d65c97743e2d4188c8ae5dc5fc581e2b
treef07db151ab633b6ddcb0012d281ceac2746c916a
parentd3c7f6becffc7830f8f4c26b6cef7842d4a8ac4a
parent70f16ce73b0dab305b9e7d63a74416cbcb0448da
[MERGE]sync with parent

bzr revid: sgo@tinyerp.com-20130610050015-cuk6adbhzsmaas8s
addons/account/account.py
addons/account/account_invoice_view.xml
addons/account/account_view.xml
addons/analytic/analytic.py