resolve conflicts in account.invoice object
resolve conflicts in account.invoice object

odoo-brazil/l10n-brazil-wip,thinkopensolutions/l10n-brazil,thinkopensolutions/l10n-brazil,odoo-brazil/l10n-brazil-wip