Merge lp:~domsense/account-payment/adding_account_vat_on_payment_7 into lp:~account-payment-team/account-payment/7.0

[Lorenzo Battistini]

See 'account_voucher_cash_basis' description.

To activate the VAT on payment behaviour, this module adds a checkbox on
invoice form: 'Vat on payment'

Moreover, three things have to be configured:
 - On account object, Related account used for real registrations on a VAT on
    payment basis
 - On journal object, Related journal used for shadow registrations on a VAT on
    payment basis
 - On tax code object, Related tax code used for real registrations on a VAT on
    payment basis

Requirements:
https://docs.google.com/spreadsheet/ccc?key=0Aodwq17jxF4edDJaZ2dOQkVEN0hodEtfRmpVdlg2Vnc#gid=0
Howto:
http://planet.agilebg.com/en/2012/10/vat-on-payment-treatment-with-openerp/

I propose this now so we can discuss about the usefulness of this module.

I set it 'work in progress' also because YAML tests are missing.

[Davide Corio (enlightx-deactivatedaccount)]

there's a blocking typo here:

http://bazaar.launchpad.net/~domsense/account-payment/adding_account_vat_on_payment_7/view/head:/account_vat_on_payment/account.py#L45

s/vat_on_paymen/vat_on_payment

[Lorenzo Battistini (elbati)]

2013/11/27 Davide Corio <email address hidden>

> there's a blocking typo here:
>
>
> http://bazaar.launchpad.net/~domsense/account-payment/adding_account_vat_on_payment_7/view/head:/account_vat_on_payment/account.py#L45
>
> s/vat_on_paymen/vat_on_payment
>
>
Oops.
Fixed.
Thanks!

[Omar (Pexego) (omar7r)]

Could you take the time to bring this to the 7.0 community addons coding conventions. This includes:

* not using the shortcut imports (things in the openerp namespace need to be imported from openerp)
* using the from . import xxx for relative imports (typically in __init__.py files)
* using orm.Model and orm.TransientModel as base class rather than osv.osv and osv.osv_memory
* etc.

Thanks

review: Needs Fixing (code review)

[Nicola Malcontenti - Agile BG (hurrin1c0)]

Hi Omar,
Thanks for the segnalation,
we have done all the modify requested.

Greetings.
-N.

[Lorenzo Battistini (elbati)]

This now depends on
https://code.launchpad.net/~agilebg/account-payment/7.0-bug-1276077-elbati/+merge/204684

[Omar (Pexego) (omar7r)]

Thanks, LGTM

review: Approve (code review, no test)

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-payment. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

[Lorenzo Battistini (elbati)]

Moved to https://github.com/OCA/account-payment/pull/2

review: Disapprove

Unmerged revisions

115. By Lorenzo Battistini on 2014-06-03

[FIX] when selecting partner without fiscal position, do not overwrite invoice field

114. By Lorenzo Battistini on 2014-05-12

[FIX] [7.0] account_vat_on_payment - impossible to compute VAT based on invoice total in case of write-off

113. By Lorenzo Battistini on 2014-03-05

[FIX] missing fields

112. By Hurrinico on 2014-03-04

[FIX] PEP8 fixing

111. By Lorenzo Battistini on 2014-02-27

[IMP] handling fiscal positions

110. By Lorenzo Battistini on 2013-11-28

[FIX] typo

109. By Lorenzo Battistini on 2013-11-27

[fix] URL

108. By Lorenzo Battistini on 2013-11-27

[imp] other PEP8

107. By Lorenzo Battistini on 2013-11-27

[imp] other PEP8

106. By Lorenzo Battistini on 2013-11-27

[IMP] some PEP8

=== added directory 'account_vat_on_payment'
=== added file 'account_vat_on_payment/AUTHORS.txt'
--- account_vat_on_payment/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/AUTHORS.txt	2014-06-03 16:12:49 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'account_vat_on_payment/__init__.py'
--- account_vat_on_payment/__init__.py	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/__init__.py	2014-06-03 16:12:49 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################E
+from . import account
+from . import company
+from . import partner

=== added file 'account_vat_on_payment/__openerp__.py'
--- account_vat_on_payment/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/__openerp__.py	2014-06-03 16:12:49 +0000
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    "name": "VAT on payment",
+    "version": "2.0",
+    'category': 'Generic Modules/Accounting',
+    "depends": ["account_voucher_cash_basis"],
+    "author": "Agile Business Group",
+    "description": """
+See 'account_voucher_cash_basis' description.
+
+To activate the VAT on payment behaviour, this module adds a checkbox on
+invoice form: 'Vat on payment'
+
+Moreover, three things have to be configured:
+ - On account object, Related account used for real registrations on a VAT on
+    payment basis
+ - On journal object, Related journal used for shadow registrations on a VAT on
+    payment basis
+ - On tax code object, Related tax code used for real registrations on a VAT on
+    payment basis
+
+Requirements:
+https://docs.google.com/spreadsheet/ccc?key=0Aodwq17jxF4edDJaZ2dOQkVEN0hodEtfRmpVdlg2Vnc#gid=0
+Howto:
+http://planet.agilebg.com/en/2012/10/vat-on-payment-treatment-with-openerp/
+    """,
+    'website': 'http://www.agilebg.com',
+    'init_xml': [],
+    'update_xml': [
+        'account_view.xml',
+        'company_view.xml',
+        'partner_view.xml',
+        ],
+    'demo_xml': [],  # TODO YAML tests
+    'installable': True,
+    'active': False,
+}

=== added file 'account_vat_on_payment/account.py'
--- account_vat_on_payment/account.py	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/account.py	2014-06-03 16:12:49 +0000
@@ -0,0 +1,433 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from tools.translate import _
+
+
+class account_voucher(orm.Model):
+    _inherit = "account.voucher"
+
+    _columns = {
+        'shadow_move_id': fields.many2one(
+            'account.move', 'Shadow Entry', readonly=True),
+        }
+
+    def is_vat_on_payment(self, voucher):
+        vat_on_p = 0
+        valid_lines = 0
+        if voucher.type in ('payment', 'receipt'):
+            for line in voucher.line_ids:
+                if line.amount:
+                    valid_lines += 1
+                    if (
+                        line.move_line_id and line.move_line_id.invoice
+                        and line.move_line_id.invoice.vat_on_payment
+                    ):
+                        vat_on_p += 1
+            if vat_on_p and vat_on_p != valid_lines:
+                raise osv.except_osv(
+                    _('Error'),
+                    _("""Can't handle VAT on payment if not every invoice
+                    is on a VAT on payment treatment"""))
+        return vat_on_p
+
+    def action_move_line_create(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        inv_pool = self.pool.get('account.invoice')
+        journal_pool = self.pool.get('account.journal')
+        move_line_pool = self.pool.get('account.move.line')
+        move_pool = self.pool.get('account.move')
+        currency_obj = self.pool.get('res.currency')
+        res = False
+        for voucher in self.browse(cr, uid, ids, context):
+            entry_posted = voucher.journal_id.entry_posted
+            # disable the 'skip draft state' option because "mixed" entry
+            # (shadow + real) won't pass validation. Anyway every entry will be
+            # posted later (if 'entry_posted' is enabled)
+            if entry_posted:
+                journal_pool.write(
+                    cr, uid, voucher.journal_id.id, {'entry_posted': False})
+            res = super(account_voucher, self).action_move_line_create(
+                cr, uid, [voucher.id], context)
+            # because 'move_id' has been updated by 'action_move_line_create'
+            voucher.refresh()
+            if entry_posted:
+                journal_pool.write(
+                    cr, uid, voucher.journal_id.id, {'entry_posted': True})
+            if self.is_vat_on_payment(voucher):
+                if not voucher.journal_id.vat_on_payment_related_journal_id:
+                    raise osv.except_osv(
+                        _('Error'),
+                        _("""We are on a VAT on payment treatment
+                        but journal %s does not have a related shadow
+                        journal""")
+                        % voucher.journal_id.name)
+                lines_to_create = []
+                amounts_by_invoice = super(
+                    account_voucher, self
+                    ).allocated_amounts_grouped_by_invoice(
+                    cr, uid, voucher, context)
+                for inv_id in amounts_by_invoice:
+                    invoice = inv_pool.browse(cr, uid, inv_id, context)
+                    for inv_move_line in invoice.move_id.line_id:
+                        if (
+                            inv_move_line.account_id.type != 'receivable'
+                            and inv_move_line.account_id.type != 'payable'
+                        ):
+                            # compute the VAT or base line proportionally to
+                            # the paid amount
+                            if (
+                                voucher.exclude_write_off
+                                and voucher.payment_option == 'with_writeoff'
+                            ):
+                                # avoid including write-off if set in voucher.
+                                # That means: use the invoice's total
+                                # (as we are in 'full reconcile' case)
+                                allocated_amount = amounts_by_invoice[
+                                    invoice.id
+                                    ]['allocated']
+                            else:
+                                allocated_amount = (
+                                    amounts_by_invoice[invoice.id]['allocated']
+                                    +
+                                    amounts_by_invoice[invoice.id]['write-off']
+                                    )
+                            new_line_amount = currency_obj.round(
+                                cr, uid, voucher.company_id.currency_id,
+                                (
+                                    allocated_amount
+                                    /
+                                    amounts_by_invoice[invoice.id]['total']
+                                )
+                                *
+                                (inv_move_line.credit or inv_move_line.debit)
+                                )
+                            new_line_amount_curr = False
+                            if (
+                                amounts_by_invoice[invoice.id].get(
+                                    'allocated_currency')
+                                and amounts_by_invoice[invoice.id].get(
+                                    'foreign_currency_id')
+                            ):
+                                for_curr = currency_obj.browse(
+                                    cr, uid,
+                                    amounts_by_invoice[invoice.id][
+                                        'foreign_currency_id'],
+                                    context=context)
+                                if (
+                                    voucher.exclude_write_off
+                                    and
+                                    voucher.payment_option == 'with_writeoff'
+                                ):
+                                    # again
+                                    # avoid including write-off if set in
+                                    # voucher.
+                                    allocated_amount = amounts_by_invoice[
+                                        invoice.id]['allocated_currency']
+                                else:
+                                    allocated_amount = (
+                                        amounts_by_invoice[invoice.id][
+                                            'allocated_currency']
+                                        +
+                                        amounts_by_invoice[invoice.id][
+                                            'currency-write-off']
+                                        )
+                                new_line_amount_curr = currency_obj.round(
+                                    cr, uid, for_curr,
+                                    (
+                                        allocated_amount
+                                        /
+                                        amounts_by_invoice[
+                                            invoice.id
+                                        ]['total_currency']
+                                    )
+                                    *
+                                    (inv_move_line.amount_currency)
+                                    )
+
+                            if not inv_move_line.real_account_id:
+                                raise osv.except_osv(
+                                    _('Error'),
+                                    _("""We are on a VAT on payment treatment
+                                    but move line %s does not have a related
+                                    real account""")
+                                    % inv_move_line.name)
+
+                            # prepare the real move line
+                            vals = {
+                                'name': inv_move_line.name,
+                                'account_id': inv_move_line.real_account_id.id,
+                                'credit': (
+                                    inv_move_line.credit
+                                    and new_line_amount or 0.0),
+                                'debit': (
+                                    inv_move_line.debit
+                                    and new_line_amount or 0.0),
+                                'type': 'real',
+                                'partner_id': (
+                                    inv_move_line.partner_id
+                                    and inv_move_line.partner_id.id or False)
+                                }
+                            if new_line_amount_curr:
+                                vals['amount_currency'] = new_line_amount_curr
+                                vals['currency_id'] = for_curr.id
+                            if inv_move_line.tax_code_id:
+                                if not inv_move_line.real_tax_code_id:
+                                    raise osv.except_osv(
+                                        _('Error'),
+                                        _("""We are on a VAT on payment
+                                        treatment but move line %s does not
+                                        have a related real tax code""")
+                                        % inv_move_line.name
+                                    )
+                                vals[
+                                    'tax_code_id'
+                                    ] = inv_move_line.real_tax_code_id.id
+                                if inv_move_line.tax_amount < 0:
+                                    vals['tax_amount'] = -new_line_amount
+                                else:
+                                    vals['tax_amount'] = new_line_amount
+                            lines_to_create.append(vals)
+
+                            # prepare the shadow move line
+                            vals = {
+                                'name': inv_move_line.name,
+                                'account_id': inv_move_line.account_id.id,
+                                'credit': (
+                                    inv_move_line.debit
+                                    and new_line_amount or 0.0),
+                                'debit': (
+                                    inv_move_line.credit
+                                    and new_line_amount or 0.0),
+                                'type': 'shadow',
+                                'partner_id': (
+                                    inv_move_line.partner_id
+                                    and inv_move_line.partner_id.id or False)
+                                }
+                            if inv_move_line.tax_code_id:
+                                vals[
+                                    'tax_code_id'
+                                    ] = inv_move_line.tax_code_id.id
+                                if inv_move_line.tax_amount < 0:
+                                    vals['tax_amount'] = new_line_amount
+                                else:
+                                    vals['tax_amount'] = -new_line_amount
+                            lines_to_create.append(vals)
+
+                context['journal_id'] = (
+                    voucher.journal_id.vat_on_payment_related_journal_id.id)
+                context['period_id'] = voucher.move_id.period_id.id
+                shadow_move_id = move_pool.create(cr, uid, {
+                    'journal_id': (
+                        voucher.journal_id.vat_on_payment_related_journal_id.id
+                        ),
+                    'period_id': voucher.move_id.period_id.id,
+                    'date': voucher.move_id.date,
+                    }, context)
+
+                # move the payment move lines to shadow entry
+                for line in voucher.move_ids:
+                    if line.account_id.type != 'liquidity':
+                        # If the line is related to write-off and user doesn't
+                        # want to compute the tax including write-off,
+                        # write-off move line must stay on the real move
+                        if not (
+                            voucher.exclude_write_off
+                            and voucher.payment_option == 'with_writeoff'
+                            and line.account_id.id
+                                == voucher.writeoff_acc_id.id
+                        ):
+                            line.write({
+                                'move_id': shadow_move_id,
+                                }, update_check=False)
+                        # this will allow user to see the real entry from
+                        # invoice payment tab
+                        if (
+                            line.account_id.type == 'receivable'
+                            or line.account_id.type == 'payable'
+                        ):
+                            line.write({
+                                'real_payment_move_id': voucher.move_id.id,
+                                })
+
+                for line_to_create in lines_to_create:
+                    if line_to_create['type'] == 'real':
+                        line_to_create['move_id'] = voucher.move_id.id
+                    elif line_to_create['type'] == 'shadow':
+                        line_to_create['move_id'] = shadow_move_id
+                    del line_to_create['type']
+
+                    move_line_pool.create(cr, uid, line_to_create, context)
+
+                voucher.write({'shadow_move_id': shadow_move_id})
+
+                super(account_voucher, self).balance_move(
+                    cr, uid, shadow_move_id, context)
+                super(account_voucher, self).balance_move(
+                    cr, uid, voucher.move_id.id, context)
+
+        return res
+
+    def cancel_voucher(self, cr, uid, ids, context=None):
+        res = super(account_voucher, self).cancel_voucher(
+            cr, uid, ids, context)
+        reconcile_pool = self.pool.get('account.move.reconcile')
+        move_pool = self.pool.get('account.move')
+        for voucher in self.browse(cr, uid, ids, context=context):
+            recs = []
+            if voucher.shadow_move_id:
+                for line in voucher.shadow_move_id.line_id:
+                    if line.reconcile_id:
+                        recs += [line.reconcile_id.id]
+                    if line.reconcile_partial_id:
+                        recs += [line.reconcile_partial_id.id]
+
+                reconcile_pool.unlink(cr, uid, recs)
+
+                if voucher.shadow_move_id:
+                    move_pool.button_cancel(
+                        cr, uid, [voucher.shadow_move_id.id])
+                    move_pool.unlink(cr, uid, [voucher.shadow_move_id.id])
+        return res
+
+
+class account_invoice(orm.Model):
+
+    def _get_vat_on_payment(self, cr, uid, context=None):
+        return self.pool.get('res.users').browse(
+            cr, uid, uid, context).company_id.vat_on_payment
+
+    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
+        """
+        Use shadow accounts for journal entry to be generated, according to
+        account and tax code related records
+        """
+        move_lines = super(account_invoice, self).finalize_invoice_move_lines(
+            cr, uid, invoice_browse, move_lines)
+        acc_pool = self.pool.get('account.account')
+        tax_code_pool = self.pool.get('account.tax.code')
+        new_move_lines = []
+        for line_tup in move_lines:
+            if invoice_browse.vat_on_payment:
+                if line_tup[2].get('account_id', False):
+                    account = acc_pool.browse(
+                        cr, uid, line_tup[2]['account_id'])
+                    if (
+                        account.type != 'receivable'
+                        and account.type != 'payable'
+                    ):
+                        if not account.vat_on_payment_related_account_id:
+                            raise osv.except_osv(
+                                _('Error'),
+                                _('''The invoice is \'VAT on payment\' but
+                                account %s does not have a related shadow
+                                account''')
+                                % account.name)
+                        line_tup[2]['real_account_id'] = line_tup[
+                            2]['account_id']
+                        line_tup[2]['account_id'] = (
+                            account.vat_on_payment_related_account_id.id)
+                if line_tup[2].get('tax_code_id', False):
+                    tax_code = tax_code_pool.browse(
+                        cr, uid, line_tup[2]['tax_code_id'])
+                    if not tax_code.vat_on_payment_related_tax_code_id:
+                        raise osv.except_osv(
+                            _('Error'),
+                            _('''The invoice is \'VAT on payment\' but
+                            tax code %s does not have a related shadow
+                            tax code''')
+                            % tax_code.name)
+                    line_tup[2]['real_tax_code_id'] = line_tup[
+                        2]['tax_code_id']
+                    line_tup[2]['tax_code_id'] = (
+                        tax_code.vat_on_payment_related_tax_code_id.id)
+            new_move_lines.append(line_tup)
+        return new_move_lines
+
+    def onchange_partner_id(
+            self, cr, uid, ids, type, partner_id, date_invoice=False,
+            payment_term=False, partner_bank_id=False, company_id=False):
+        res = super(account_invoice, self).onchange_partner_id(
+            cr, uid, ids, type, partner_id, date_invoice, payment_term,
+            partner_bank_id, company_id)
+        # default value for VAT on Payment is changed every time the
+        # customer/supplier is changed
+        partner_obj = self.pool.get("res.partner")
+        if partner_id:
+            p = partner_obj.browse(cr, uid, partner_id)
+            if p.property_account_position:
+                res['value'][
+                    'vat_on_payment'
+                    ] = p.property_account_position.default_has_vat_on_payment
+        return res
+
+    _inherit = "account.invoice"
+    _columns = {
+        'vat_on_payment': fields.boolean('Vat on payment'),
+        }
+    _defaults = {
+        'vat_on_payment': _get_vat_on_payment,
+        }
+
+
+class account_move_line(orm.Model):
+    _inherit = "account.move.line"
+    _columns = {
+        'real_payment_move_id': fields.many2one(
+            'account.move', 'Real payment entry'),
+        'real_account_id': fields.many2one('account.account', 'Real account'),
+        'real_tax_code_id': fields.many2one(
+            'account.tax.code', 'Real tax code'),
+        }
+
+
+class account_account(orm.Model):
+    _inherit = "account.account"
+    _columns = {
+        'vat_on_payment_related_account_id': fields.many2one(
+            'account.account', 'Shadow Account for VAT on payment',
+            help='''Related account used for real registrations on a
+            VAT on payment basis. Set the shadow account here'''),
+        }
+
+
+class account_tax_code(orm.Model):
+    _inherit = "account.tax.code"
+    _columns = {
+        'vat_on_payment_related_tax_code_id': fields.many2one(
+            'account.tax.code', 'Shadow Tax code for VAT on payment',
+            help='''Related tax code used for real registrations on a
+            VAT on payment basis. Set the shadow tax code here'''),
+        }
+
+
+class account_journal(orm.Model):
+    _inherit = "account.journal"
+    _columns = {
+        'vat_on_payment_related_journal_id': fields.many2one(
+            'account.journal', 'Shadow Journal for VAT on payment',
+            help='''Related journal used for shadow registrations on a
+            VAT on payment basis. Set the shadow journal here'''),
+        }

=== added file 'account_vat_on_payment/account_view.xml'
--- account_vat_on_payment/account_view.xml	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/account_view.xml	2014-06-03 16:12:49 +0000
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!--    account     -->
+
+        <record id="view_account_form" model="ir.ui.view">
+            <field name="name">account.account.form</field>
+            <field name="model">account.account</field>
+            <field name="inherit_id" ref="account.view_account_form"/>
+            <field name="arch" type="xml">
+                  <field position="after" name="child_consol_ids">
+                      <field name="vat_on_payment_related_account_id"/>
+                    </field>
+            </field>
+        </record>
+
+<!--    tax code     -->
+
+        <record id="view_tax_code_form" model="ir.ui.view">
+            <field name="name">account.tax.code.form</field>
+            <field name="model">account.tax.code</field>
+            <field name="inherit_id" ref="account.view_tax_code_form"/>
+            <field name="arch" type="xml">
+                  <field position="after" name="company_id">
+                      <field name="vat_on_payment_related_tax_code_id"/>
+                    </field>
+            </field>
+        </record>
+
+<!--    journal     -->
+
+        <record id="view_account_journal_form" model="ir.ui.view">
+            <field name="name">account.journal.form</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+                <field name="group_invoice_lines" position="after">
+                    <field name="vat_on_payment_related_journal_id"/>
+                </field>
+            </field>
+        </record>
+
+<!--    invoice     -->
+
+     <record id="invoice_form" model="ir.ui.view">
+            <field name="name">account.invoice.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <field name="payment_term" position="after">
+                    <field name="vat_on_payment"/>
+                </field>
+            </field>
+        </record>
+     <record id="invoice_supplier_form" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <field name="date_due" position="after">
+                    <field name="vat_on_payment"/>
+                </field>
+            </field>
+        </record>
+        
+        <!-- move line -->
+        
+        <record id="view_move_line_form" model="ir.ui.view">
+            <field name="name">account.move.line.form</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_move_line_form"/>
+            <field name="arch" type="xml">
+                <field name="reconcile_partial_id" position="after">
+                    <field name="real_payment_move_id" />
+                </field>
+            </field>
+        </record>
+        
+        <!-- voucher -->
+        
+        <record id="view_vendor_receipt_form_shadow_move" model="ir.ui.view">
+            <field name="name">account.voucher.receipt.form.shadow.move</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+                <field name="move_ids" position="after">
+                    <field name="shadow_move_id" />
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_vendor_payment_form_shadow_move" model="ir.ui.view">
+            <field name="name">account.voucher.payment.form.shadow.move</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
+            <field name="arch" type="xml">
+                <field name="move_ids" position="after">
+                    <field name="shadow_move_id" />
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'account_vat_on_payment/company.py'
--- account_vat_on_payment/company.py	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/company.py	2014-06-03 16:12:49 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from tools.translate import _
+
+
+class res_company(orm.Model):
+    _inherit = "res.company"
+    _columns = {
+        'vat_on_payment': fields.boolean('VAT on payment treatment'),
+        }
+
+
+class account_config_settings(orm.TransientModel):
+    _inherit = 'account.config.settings'
+    _columns = {
+        'vat_on_payment': fields.related(
+            'company_id', 'vat_on_payment',
+            type='boolean',
+            string="VAT on payment treatment"),
+    }

=== added file 'account_vat_on_payment/company_view.xml'
--- account_vat_on_payment/company_view.xml	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/company_view.xml	2014-06-03 16:12:49 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!--    account     -->
+
+        <record id="view_account_settings_currency_xchange_form" model="ir.ui.view">
+            <field name="name">view_account_settings_currency_xchange_form</field>
+            <field name="model">account.config.settings</field>
+            <field name="inherit_id" ref="account_voucher_cash_basis.view_account_config_settings"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/group[5]/div" position="inside">
+                    <div>
+                        <field name="vat_on_payment" class="oe_inline"/>
+                        <label for="vat_on_payment"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'account_vat_on_payment/i18n'
=== added file 'account_vat_on_payment/partner.py'
--- account_vat_on_payment/partner.py	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/partner.py	2014-06-03 16:12:49 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#    Copyright (C) 2014 Develer srl (<http://www.develer.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from openerp.osv import fields, orm
+from openerp.tools.translate import _
+
+
+class account_fiscal_position(orm.Model):
+    _inherit = 'account.fiscal.position'
+
+    _columns = {
+        'default_has_vat_on_payment': fields.boolean(
+            'VAT on Payment Default Flag'),
+    }

=== added file 'account_vat_on_payment/partner_view.xml'
--- account_vat_on_payment/partner_view.xml	1970-01-01 00:00:00 +0000
+++ account_vat_on_payment/partner_view.xml	2014-06-03 16:12:49 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<!--
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#    Copyright (C) 2014 Develer srl (<http://www.develer.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+-->
+
+
+<openerp>
+    <data>
+
+        <!-- res.partner customizations -->
+
+        <record id="view_partner_form" model="ir.ui.view">
+            <field name="name">account.fiscal.position.vat.default.view</field>
+            <field name="model">account.fiscal.position</field>
+            <field name="inherit_id" ref="account.view_account_position_form"/>
+            <field name="arch" type="xml">
+                <field name="active" position="after" version="7.0">
+                    <field name="default_has_vat_on_payment" class="oe_inline"/>
+                </field>
+            </field>
+        </record>
+
+
+    </data>
+</openerp>