[FIX] Fixes incorrect merge 3e1d5be951fb8
authorMohammad Alhashash <alhashash@alhashash.net>
Thu, 6 Nov 2014 20:47:15 +0000 (22:47 +0200)
committerMohammad Alhashash <alhashash@alhashash.net>
Thu, 6 Nov 2014 20:56:02 +0000 (22:56 +0200)
commit670c6b4d14b737fa3d8e5d867b503e54fc1e1cb2
tree27a297240fd3781aab611eb9ddb8f2069ec267ce
parent4b07b1435a9a1bc71493e62cd91789c529c65aa3
[FIX] Fixes incorrect merge 3e1d5be951fb8

Merge conflict at account/account_invoice.py (commit ab797f0cd8)
was incorrectly resolved. As a result, cannot validate invoices with
tax line.
addons/account/account_invoice.py