Merge lp:~enlightx-deactivatedaccount/openobject-italia/7.0_fix_1261357 into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

[Davide Corio]

In questo branch ho variato alcune cose riguardanti le personalizzazioni fatte al voucher per la gestione della ritenuta d'acconto.

Sul modulo ufficiali ci sono problemi quando l'importo del pagamento differisce dal netto a pagare riportato sulla fattura.

Con questa versione dovrebbe essere possibile usare il conto di storno sul voucher pagamento per registrare eventuali sbilanci (es: commissioni bancarie).

NB: penso che ciò che ho scritto possa essere semplificato, quindi attendo miglioramenti su questo branch

[Davide Corio (enlightx-deactivatedaccount)]

sul form del voucher ho aggiunto un campo che mostra l'ammontare di eventuale ritenuta.

possiamo comunque rimuoverlo dalla vista o renderlo visibile solo se > 0

[lp:~enlightx-deactivatedaccount/openobject-italia/7.0_fix_1261357]

231. By Davide Corio on 2013-12-17

[IMP] PEP8

232. By Davide Corio on 2013-12-17

[IMP] PEP8

233. By Davide Corio on 2013-12-17

[FIX] writeoff amount sign

234. By Davide Corio on 2013-12-17

[FIX] correct amount if not wht

235. By Davide Corio on 2013-12-17

[REM] wht amount from view

236. By Davide Corio on 2013-12-20

[FIX] cancel voucher if no writeoff

237. By Davide Corio on 2013-12-20

[FIX] broken get_wht_amount

[Lorenzo Battistini (elbati)]

Mi pare di capire che la registrazione di write-off venga scritta ogni volta che
voucher.amount != invoice.net_pay
( http://bazaar.launchpad.net/~enlightx/openobject-italia/7.0_fix_1261357/view/237/l10n_it_withholding_tax/account.py#L361 )
indipendentemente dal campo 'payment_option'.

Mi sembra sbagliato, infatti, se 'payment difference' viene lasciato su 'Keep Open' e si prova a pagare un importo diverso dal 'net pay', si ottiene

  File "/home/elbati/workspace/openerp/7.0/addons/account_voucher/account_voucher.py", line 936, in proforma_voucher
    self.action_move_line_create(cr, uid, ids, context=context)
  File "/home/elbati/workspace/openerp/7.0/server/openerp/addons/l10n_it_withholding_tax/account.py", line 385, in action_move_line_create
    cr, uid, wo_move, context=context)
  File "/home/elbati/workspace/openerp/7.0/addons/account/account.py", line 1438, in create
    result = super(account_move, self).create(cr, uid, vals, c)
  File "/home/elbati/workspace/openerp/7.0/server/openerp/osv/orm.py", line 4489, in create
    result += self._columns[field].set(cr, self, id_new, field, vals[field], user, rel_context) or []
  File "/home/elbati/workspace/openerp/7.0/server/openerp/osv/fields.py", line 559, in set
    id_new = obj.create(cr, user, act[2], context=context)
  File "/home/elbati/workspace/openerp/7.0/addons/account/account_move_line.py", line 1144, in create
    if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
  File "/home/elbati/workspace/openerp/7.0/server/openerp/osv/orm.py", line 3623, in read
    result = self._read_flat(cr, user, select, fields, context, load)
  File "/home/elbati/workspace/openerp/7.0/server/openerp/osv/orm.py", line 3675, in _read_flat
    cr.execute(query, [tuple(sub_ids)] + rule_params)
  File "/home/elbati/workspace/openerp/7.0/server/openerp/sql_db.py", line 161, in wrapper
    return f(self, *args, **kwargs)
  File "/home/elbati/workspace/openerp/7.0/server/openerp/sql_db.py", line 226, in execute
    res = self._obj.execute(query, params)
ProgrammingError: operator does not exist: integer = boolean
LINE 1: ...d FROM "account_account" WHERE account_account.id IN (false)...
                                                             ^
HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.

Credo che la creazione della registrazione di writeoff debba essere forzata solo nel caso 'reconcile payment balance'.

Inoltre, per la generazione della scrittura di write-off, magari si riescono a usare metodi del voucher tipo 'writeoff_move_line_get'?

review: Needs Fixing

[Davide Corio (enlightx-deactivatedaccount)]

Grazie Lorenzo per il feedback.
Provvedo ad apportare le migliorie

[lp:~enlightx-deactivatedaccount/openobject-italia/7.0_fix_1261357]

238. By Davide Corio on 2014-01-02

[FIX] bypass if without_writeoff

239. By Davide Corio on 2014-01-02

[IMP] use writeoff_move_line_get

[Davide Corio (enlightx-deactivatedaccount)]

dovrei aver applicato i due fix consigliati.
il problema problema era reale, infatti mi è capitato dopo poco.

per il secondo consiglio, penso sia stato utile usare la funzione apposita siccome si occupa di fare conversioni di valuta, scrive conti analitici, etc etc.

[Lorenzo Battistini (elbati)]

Ho lanciato i test automatici e sono andati a buon fine.

L'ideale sarebbe avere anche dei test automatici che coprono il caso d'uso descritto in questo bug.

(devo ancora fare la review visiva della nuova versione)

[Lorenzo Battistini (elbati)]

This project is now hosted on https://github.com/OCA/l10n-italy. 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

Unmerged revisions

239. By Davide Corio on 2014-01-02

[IMP] use writeoff_move_line_get

238. By Davide Corio on 2014-01-02

[FIX] bypass if without_writeoff

237. By Davide Corio on 2013-12-20

[FIX] broken get_wht_amount

236. By Davide Corio on 2013-12-20

[FIX] cancel voucher if no writeoff

235. By Davide Corio on 2013-12-17

[REM] wht amount from view

234. By Davide Corio on 2013-12-17

[FIX] correct amount if not wht

233. By Davide Corio on 2013-12-17

[FIX] writeoff amount sign

232. By Davide Corio on 2013-12-17

[IMP] PEP8

231. By Davide Corio on 2013-12-17

[IMP] PEP8

230. By Davide Corio on 2013-12-17

[IMP] write-off + wht on voucher

=== modified file 'l10n_it_withholding_tax/__init__.py'
--- l10n_it_withholding_tax/__init__.py	2013-04-17 10:18:29 +0000
+++ l10n_it_withholding_tax/__init__.py	2014-01-02 17:27:30 +0000
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
 #    Copyright (C) 2012-2013 Associazione OpenERP Italia
-#    (<http://www.openerp-italia.org>). 
+#    (<http://www.openerp-italia.org>).
 #
 #    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
+#    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,

=== modified file 'l10n_it_withholding_tax/__openerp__.py'
--- l10n_it_withholding_tax/__openerp__.py	2013-04-17 14:19:03 +0000
+++ l10n_it_withholding_tax/__openerp__.py	2014-01-02 17:27:30 +0000
@@ -33,28 +33,26 @@
  - Conto di debito per le ritenute da versare
  - Sezionale che conterrà le registrazioni legate alla ritenuta
 
-Durante la compilazione di una fattura fornitore con ritenuta d'acconto, l'utente dovrà specificare l'importo della ritenuta.
+Durante la compilazione di una fattura fornitore con ritenuta d'acconto,
+l'utente dovrà specificare l'importo della ritenuta.
 
 Requisiti
 ---------
-http://wiki.openerp-italia.org/doku.php/area_utente/requisiti/ritenuta_d_acconto
+http://wiki.openerp-italia.org/doku.php/area_utente/requisiti/\
+ritenuta_d_acconto
 
 Howto
 -----
-http://planet.domsense.com/2012/06/come-registrare-in-openerp-le-fatture-fornitore-con-ritenuta-dacconto/
+http://planet.domsense.com/2012/06/come-registrare-in-openerp-le-fatture-\
+fornitore-con-ritenuta-dacconto/
 """,
     'author': 'OpenERP Italian Community',
     'website': 'http://www.openerp-italia.org',
     'license': 'AGPL-3',
-    "depends" : ['account_voucher_cash_basis'],
-    "data" : [
-        'account_view.xml',],
-    "demo" : [
-        'account_demo.xml',
-        ],
-    'test' : [
-        'test/purchase_payment.yml',
-        ],
+    "depends": ['account_voucher_cash_basis'],
+    "data": ['account_view.xml'],
+    "demo": ['account_demo.xml'],
+    'test': ['test/purchase_payment.yml'],
     "active": False,
     "installable": True
 }

=== modified file 'l10n_it_withholding_tax/account.py'
--- l10n_it_withholding_tax/account.py	2013-05-09 14:30:36 +0000
+++ l10n_it_withholding_tax/account.py	2014-01-02 17:27:30 +0000
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
 #    Copyright (C) 2012-2013 Associazione OpenERP Italia
-#    (<http://www.openerp-italia.org>). 
+#    (<http://www.openerp-italia.org>).
 #
 #    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
+#    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,
@@ -25,20 +25,31 @@
 from openerp.tools.translate import _
 import decimal_precision as dp
 
+
 class res_company(orm.Model):
     _inherit = 'res.company'
     _columns = {
-        'withholding_payment_term_id': fields.many2one('account.payment.term',
+        'withholding_payment_term_id': fields.many2one(
+            'account.payment.term',
             'Withholding tax Payment Term',
-            help="The withholding tax will have to be paid within this term"),
-        'withholding_account_id': fields.many2one('account.account','Withholding account',
+            help="The withholding tax will have to be paid within this term"
+            ),
+        'withholding_account_id': fields.many2one(
+            'account.account', 'Withholding account',
             help='Payable account used for amount due to tax authority',
-            domain=[('type', '=', 'payable')]),
-        'withholding_journal_id': fields.many2one('account.journal','Withholding journal',
-            help="Journal used for registration of witholding amounts to be paid"),
-        'authority_partner_id': fields.many2one('res.partner', 'Tax Authority Partner'),
+            domain=[('type', '=', 'payable')]
+            ),
+        'withholding_journal_id': fields.many2one(
+            'account.journal', 'Withholding journal',
+            help="Journal used for registration of witholding amounts to be\
+            paid"
+            ),
+        'authority_partner_id': fields.many2one(
+            'res.partner', 'Tax Authority Partner'
+            ),
         }
-    
+
+
 class account_config_settings(orm.TransientModel):
     _inherit = 'account.config.settings'
     _columns = {
@@ -59,39 +70,54 @@
             type='many2one',
             relation="account.journal",
             string="Withholding journal",
-            help='Journal used for registration of witholding amounts to be paid'),
+            help='Journal used for registration of witholding amounts to be\
+            paid'),
         'authority_partner_id': fields.related(
             'company_id', 'authority_partner_id',
             type='many2one',
             relation="res.partner",
             string="Tax Authority Partner"),
     }
-    
+
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
-        res = super(account_config_settings, self).onchange_company_id(cr, uid, ids, company_id, context=context)
+        res = super(account_config_settings, self).onchange_company_id(
+            cr, uid, ids, company_id, context=context
+            )
         if company_id:
-            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+            company = self.pool.get('res.company').browse(
+                cr, uid, company_id, context=context
+                )
             res['value'].update({
-                'withholding_payment_term_id': (company.withholding_payment_term_id
-                    and company.withholding_payment_term_id.id or False), 
-                'withholding_account_id': (company.withholding_account_id
-                    and company.withholding_account_id.id or False),
-                'withholding_journal_id': (company.withholding_journal_id
-                    and company.withholding_journal_id.id or False),
-                'authority_partner_id': (company.authority_partner_id
-                    and company.authority_partner_id.id or False),
+                'withholding_payment_term_id': (
+                    company.withholding_payment_term_id
+                    and company.withholding_payment_term_id.id or False
+                    ),
+                'withholding_account_id': (
+                    company.withholding_account_id
+                    and company.withholding_account_id.id or False
+                    ),
+                'withholding_journal_id': (
+                    company.withholding_journal_id
+                    and company.withholding_journal_id.id or False
+                    ),
+                'authority_partner_id': (
+                    company.authority_partner_id
+                    and company.authority_partner_id.id or False
+                    ),
                 })
-        else: 
-            res['value'].update({
-                'withholding_payment_term_id': False, 
-                'withholding_account_id': False,
-                'withholding_journal_id': False,
-                'authority_partner_id': False,
+        else:
+            res['value'].update(
+                {
+                    'withholding_payment_term_id': False,
+                    'withholding_account_id': False,
+                    'withholding_journal_id': False,
+                    'authority_partner_id': False,
                 })
         return res
 
+
 class account_invoice(orm.Model):
-    
+
     def _net_pay(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for invoice in self.browse(cr, uid, ids, context):
@@ -101,104 +127,281 @@
     _inherit = "account.invoice"
 
     _columns = {
-        'withholding_amount': fields.float('Withholding amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
-        'has_withholding': fields.boolean('With withholding tax', readonly=True, states={'draft':[('readonly',False)]}),
+        'withholding_amount': fields.float(
+            'Withholding amount', digits_compute=dp.get_precision('Account'),
+            readonly=True, states={'draft': [('readonly', False)]}
+            ),
+        'has_withholding': fields.boolean(
+            'With withholding tax', readonly=True,
+            states={'draft': [('readonly', False)]}
+            ),
         'net_pay': fields.function(_net_pay, string="Net Pay"),
         }
 
+
 class account_voucher(orm.Model):
     _inherit = "account.voucher"
-    
+
+    def _get_wht_amount(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        invoice_obj = self.pool.get('account.invoice')
+        wht_amount = 0
+        for voucher in self.browse(cr, uid, ids, context):
+            for line in voucher.line_ids:
+                move = line.move_line_id.move_id
+                if move:
+                    move_id = line.move_line_id.move_id.id
+                    invoice_id = invoice_obj.search(
+                        cr, uid, [('move_id', '=', move_id)]
+                    )
+                    if invoice_id:
+                        wht_amount += invoice_obj.browse(
+                            cr, uid, invoice_id[0]
+                            ).withholding_amount
+            res[voucher.id] = wht_amount
+        return res
+
+    def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        currency_obj = self.pool.get('res.currency')
+        res = {}
+        debit = credit = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            amount_unreconciled = 0.0
+            sign = voucher.type == 'payment' and -1 or 1
+            for l in voucher.line_dr_ids:
+                debit += l.amount
+                amount_unreconciled += l.amount_unreconciled
+            for l in voucher.line_cr_ids:
+                credit += l.amount
+            currency = voucher.currency_id or voucher.company_id.currency_id
+            if voucher.withholding_amount:
+                wo_amount = currency_obj.round(
+                    cr, uid, currency,
+                    (amount_unreconciled - voucher.amount -
+                        voucher.withholding_amount)
+                    )
+                res[voucher.id] = sign * wo_amount
+            else:
+                res[voucher.id] = currency_obj.round(
+                    cr, uid, currency,
+                    voucher.amount - sign * (credit - debit))
+        return res
+
     _columns = {
-        'withholding_move_ids': fields.many2many('account.move', 'voucher_withholding_move_rel', 'voucher_id', 'move_id', 'Withholding Tax Entries', readonly=True),
+        'withholding_move_ids': fields.many2many(
+            'account.move', 'voucher_withholding_move_rel', 'voucher_id',
+            'move_id', 'Withholding Tax Entries', readonly=True
+            ),
+        'writeoff_move_id': fields.many2one(
+            'account.move', 'Write-off move', readonly=True
+            ),
+        'withholding_amount': fields.function(
+            _get_wht_amount, type="float", method=True,
+            string='Withholding amount'
+            ),
+        'writeoff_amount': fields.function(
+            _get_writeoff_amount, string='Difference Amount', type='float',
+            readonly=True, help="Computed as the difference between the\
+            amount stated in the voucher and the sum of allocation on\
+            the voucher lines."
+            ),
         }
-        
-    def reconcile_withholding_move(self, cr, uid, invoice, wh_move, context=None):
-        line_pool=self.pool.get('account.move.line')
+
+    def reconcile_withholding_move(
+            self, cr, uid, invoice, wh_move, context=None):
+        line_pool = self.pool.get('account.move.line')
         rec_ids = []
         for inv_move_line in invoice.move_id.line_id:
-            if inv_move_line.account_id.type == 'payable' and not inv_move_line.reconcile_id:
+            if (inv_move_line.account_id.type == 'payable' and not
+                    inv_move_line.reconcile_id):
                 rec_ids.append(inv_move_line.id)
         for wh_line in wh_move.line_id:
-            if wh_line.account_id.type == 'payable' and invoice.company_id.withholding_account_id and invoice.company_id.withholding_account_id.id != wh_line.account_id.id and not wh_line.reconcile_id:
+            if (wh_line.account_id.type == 'payable' and
+                    invoice.company_id.withholding_account_id and
+                    invoice.company_id.withholding_account_id.id !=
+                    wh_line.account_id.id and not wh_line.reconcile_id):
                 rec_ids.append(wh_line.id)
-        return line_pool.reconcile_partial(cr, uid, rec_ids, type='auto', context=context)
-    
+        return line_pool.reconcile_partial(
+            cr, uid, rec_ids, type='auto', context=context
+            )
+
+    def reconcile_writeoff_move(self, cr, uid, invoice, wo_move, context=None):
+        line_pool = self.pool.get('account.move.line')
+        rec_ids = []
+        for inv_move_line in invoice.move_id.line_id:
+            if (inv_move_line.account_id.type == 'payable' and not
+                    inv_move_line.reconcile_id):
+                rec_ids.append(inv_move_line.id)
+        for wo_line in wo_move.line_id:
+            if (wo_line.account_id.type == 'payable' and not
+                    wo_line.reconcile_id):
+                rec_ids.append(wo_line.id)
+        return line_pool.reconcile_partial(
+            cr, uid, rec_ids, type='auto', context=context
+            )
+
     def action_move_line_create(self, cr, uid, ids, context=None):
-        res = super(account_voucher,self).action_move_line_create(cr, uid, ids, context)
+        res = super(account_voucher, self).action_move_line_create(
+            cr, uid, ids, context
+            )
         inv_pool = self.pool.get('account.invoice')
         move_pool = self.pool.get('account.move')
-        tax_pool = self.pool.get('account.tax')
-        curr_pool = self.pool.get('res.currency')
         term_pool = self.pool.get('account.payment.term')
         priod_obj = self.pool.get('account.period')
         for voucher in self.browse(cr, uid, ids, context):
-            amounts_by_invoice = super(account_voucher,self).allocated_amounts_grouped_by_invoice(cr, uid,voucher, context)
+            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)
-                if invoice.withholding_amount:
+                if not invoice.withholding_amount:
+                    return res
+                else:
                     # only for supplier payments
                     if voucher.type != 'payment':
-                        raise orm.except_orm(_('Error'), _('Can\'t handle withholding tax with voucher of type other than payment'))
+                        raise orm.except_orm(
+                            _('Error'),
+                            _('Can\'t handle withholding tax with voucher of\
+                                type other than payment')
+                            )
                     if not invoice.company_id.withholding_account_id:
-                        raise orm.except_orm(_('Error'), _('The company does not have an associated Withholding account') )
+                        raise orm.except_orm(
+                            _('Error'),
+                            _('The company does not have an associated\
+                                Withholding account')
+                            )
                     if not invoice.company_id.withholding_payment_term_id:
-                        raise orm.except_orm(_('Error'), _('The company does not have an associated Withholding Payment Term') )
+                        raise orm.except_orm(
+                            _('Error'),
+                            _('The company does not have an associated\
+                                Withholding Payment Term')
+                            )
                     if not invoice.company_id.withholding_journal_id:
-                        raise orm.except_orm(_('Error'), _('The company does not have an associated Withholding journal') )
+                        raise orm.except_orm(
+                            _('Error'),
+                            _('The company does not have an associated\
+                                Withholding journal')
+                            )
                     if not invoice.company_id.authority_partner_id:
-                        raise orm.except_orm(_('Error'), _('The company does not have an associated Tax Authority partner') )
+                        raise orm.except_orm(
+                            _('Error'),
+                            _('The company does not have an associated Tax\
+                                Authority partner')
+                            )
                     # compute the new amount proportionally to paid amount
-                    new_line_amount = curr_pool.round(cr, uid, voucher.company_id.currency_id, ((amounts_by_invoice[invoice.id]['allocated'] + amounts_by_invoice[invoice.id]['write-off']) / invoice.net_pay) * invoice.withholding_amount)
-                    
+                    wht_amount = invoice.withholding_amount
                     # compute the due date
                     due_list = term_pool.compute(
-                        cr, uid, invoice.company_id.withholding_payment_term_id.id, new_line_amount,
-                        date_ref=voucher.date or invoice.date_invoice, context=context)
+                        cr, uid,
+                        invoice.company_id.withholding_payment_term_id.id,
+                        wht_amount,
+                        date_ref=voucher.date or invoice.date_invoice,
+                        context=context
+                        )
+
+                    company = invoice.company_id
+                    payment_term = company.withholding_payment_term_id
+                    wht_acc_id = company.withholding_account_id.id
+
                     if len(due_list) > 1:
-                        raise orm.except_orm(_('Error'),
+                        raise orm.except_orm(
+                            _('Error'),
                             _('The payment term %s has too many due dates')
-                            % invoice.company_id.withholding_payment_term_id.name)
+                            % payment_term.name)
                     if len(due_list) == 0:
-                        raise orm.except_orm(_('Error'),
+                        raise orm.except_orm(
+                            _('Error'),
                             _('The payment term %s does not have due dates')
-                            % invoice.company_id.withholding_payment_term_id.name)
-                            
-                    period_ids = priod_obj.find(cr, uid, dt=voucher.date, context=context)
+                            % payment_term.name)
+
+                    period_ids = priod_obj.find(
+                        cr, uid, dt=voucher.date, context=context
+                        )
+
                     new_move = {
-                        'journal_id': invoice.company_id.withholding_journal_id.id,
+                        'journal_id': company.withholding_journal_id.id,
                         'period_id': period_ids and period_ids[0] or False,
                         'date': voucher.date,
                         'line_id': [
-                            (0,0,{
+                            (0, 0, {
                                 'name': invoice.number,
                                 'account_id': invoice.account_id.id,
                                 'partner_id': invoice.partner_id.id,
-                                'debit': new_line_amount,
-                                'credit': 0.0,
+                                'debit': wht_amount, 'credit': 0.0
                                 }),
-                            (0,0,{
-                                'name': _('Payable withholding - ') + invoice.number,
-                                'account_id': invoice.company_id.withholding_account_id.id,
-                                'partner_id': invoice.company_id.authority_partner_id.id,
-                                'debit': 0.0,
-                                'credit': new_line_amount,
-                                'date_maturity': due_list[0][0],
+                            (0, 0, {
+                                'name': _('Payable withholding - ') +
+                                invoice.number,
+                                'account_id': wht_acc_id,
+                                'partner_id': company.authority_partner_id.id,
+                                'debit': 0.0, 'credit': wht_amount,
+                                'date_maturity': due_list[0][0]
                                 }),
                             ]
                         }
-                    move_id = self.pool.get('account.move').create(cr, uid, new_move, context=context)
-                    self.reconcile_withholding_move(cr, uid, invoice, move_pool.browse(cr, uid, move_id, context), context)
+                    move_id = self.pool.get('account.move').create(
+                        cr, uid, new_move, context=context
+                        )
+                    self.reconcile_withholding_move(
+                        cr, uid, invoice, move_pool.browse(
+                            cr, uid, move_id, context
+                            ), context
+                        )
                     voucher.write({'withholding_move_ids': [(4, move_id)]})
+                    amount_unreconciled = 0.0
+                    for dr_line in voucher.line_dr_ids:
+                        amount_unreconciled += dr_line.amount_unreconciled
+                    wo_amount = (
+                        amount_unreconciled - voucher.amount -
+                        voucher.withholding_amount
+                        )
+                    if (voucher.payment_option == 'with_writeoff' and
+                            voucher.amount != invoice.net_pay):
+
+                        wo_line = self.writeoff_move_line_get(
+                            cr, uid, voucher.id, wo_amount, move_id,
+                            voucher.comment, company.currency_id.id,
+                            voucher.currency_id.id, context)
+
+                        wo_move = {
+                            'journal_id': voucher.journal_id.id,
+                            'period_id': period_ids and period_ids[0] or False,
+                            'date': voucher.date,
+                            'line_id': [
+                                (0, 0, {
+                                    'name': invoice.number,
+                                    'account_id': invoice.account_id.id,
+                                    'partner_id': invoice.partner_id.id,
+                                    'debit': wo_amount,
+                                    'credit': 0.0,
+                                    }),
+                                (0, 0, wo_line),
+                                ]
+                            }
+                        wo_move_id = move_pool.create(
+                            cr, uid, wo_move, context=context)
+                        self.reconcile_writeoff_move(
+                            cr, uid, invoice, move_pool.browse(
+                                cr, uid, wo_move_id, context
+                                ), context
+                            )
+                        voucher.write({'writeoff_move_id': wo_move_id})
         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')
+        res = super(account_voucher, self).cancel_voucher(
+            cr, uid, ids, context
+            )
         move_pool = self.pool.get('account.move')
         for voucher in self.browse(cr, uid, ids, context=context):
-            recs = []
             for move in voucher.withholding_move_ids:
                 move_pool.button_cancel(cr, uid, [move.id])
                 move_pool.unlink(cr, uid, [move.id])
+            if voucher.writeoff_move_id:
+                move_pool.button_cancel(cr, uid, [voucher.writeoff_move_id.id])
+                move_pool.unlink(cr, uid, [voucher.writeoff_move_id.id])
         return res

=== modified file 'l10n_it_withholding_tax/account_view.xml'
--- l10n_it_withholding_tax/account_view.xml	2013-04-17 12:47:39 +0000
+++ l10n_it_withholding_tax/account_view.xml	2014-01-02 17:27:30 +0000
@@ -63,6 +63,8 @@
                 <field name="move_ids" position="after">
                     <separator string="Withholding tax entries" colspan="4"></separator>
                     <field name="withholding_move_ids" colspan="4" nolabel="1"/>
+                    <separator string="Write-off entries" colspan="4"></separator>
+                    <field name="writeoff_move_id" colspan="4" nolabel="1"/>
                 </field>
             </field>
         </record>