[MERGE]merge and resolve conflicts
authorSanjay Gohel (OpenERP) <sgo@tinyerp.com>
Tue, 29 Oct 2013 13:33:47 +0000 (19:03 +0530)
committerSanjay Gohel (OpenERP) <sgo@tinyerp.com>
Tue, 29 Oct 2013 13:33:47 +0000 (19:03 +0530)
commiteb1a56cd91b9f36bed54c458e88cdb51ac913d97
treeed9064b34f0ebd1b9ec23bb90b1af2a556245d25
parent328ec9ceacfca0fddc9e23cc201a31c746b40225
parent34564de66de6c3fa343a044d87e6a140f970a4f6
[MERGE]merge and resolve conflicts

bzr revid: sgo@tinyerp.com-20131029133347-b22zkm0hgg3y9an3
addons/account/account.py
addons/account/account_invoice_view.xml
addons/account/account_view.xml
addons/account_voucher/account_voucher_view.xml
addons/analytic/analytic.py