Merge lp:~elbati/openobject-italia/ref_l10n_it_withholding_tax into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1

[Lorenzo Battistini]

[lp:~elbati/openobject-italia/ref_l10n_it_withholding_tax]

191. By Lorenzo Battistini on 2012-07-26

[FIX] l10n_it_withholding_tax
comment

192. By Lorenzo Battistini on 2012-08-08

[add] 'net pay' to invoice

193. By Lorenzo Battistini on 2012-08-09

[ref] entire workflow

194. By Lorenzo Battistini on 2012-08-09

[imp] description

195. By Lorenzo Battistini on 2012-08-09

[FIX] dont reconciled what reconciled yet

196. By Lorenzo Battistini on 2012-08-09

[fix] descr

197. By Lorenzo Battistini on 2012-08-09

[FIX] version

=== modified file 'l10n_it_withholding_tax/__openerp__.py'
--- l10n_it_withholding_tax/__openerp__.py	2012-07-03 06:22:49 +0000
+++ l10n_it_withholding_tax/__openerp__.py	2012-08-09 13:32:07 +0000
@@ -23,20 +23,32 @@
 #
 ##############################################################################
 {
-    'name': "Italian Localisation - Ritenute d'acconto",
-    'version': '0.1',
+    'name': "Italian Localisation - Withholding tax",
+    'version': '0.2',
     'category': 'Localisation/Italy',
     'description': """
-    Modulo per le ritenute d'acconto sulle fatture fornitore
-    
+Ritenute d'acconto sulle fatture fornitore
+==========================================
+
+Per utilizzare il modulo bisogna configurare i campi associati alla company:
+ - Termine di pagamento della ritenuta
+ - 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.
+
+Requisiti
+---------
+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://wiki.openerp-italia.org/doku.php/area_utente/requisiti/ritenuta_d_acconto
 """,
     'author': 'OpenERP Italian Community',
     'website': 'http://www.openerp-italia.org',
     'license': 'AGPL-3',
-    "depends" : ['account_invoice_template'],
+    "depends" : ['account_invoice_template', 'account_voucher_cash_basis'],
     "init_xml" : [
         'account_view.xml',
         ],

=== modified file 'l10n_it_withholding_tax/account.py'
--- l10n_it_withholding_tax/account.py	2012-06-12 15:40:54 +0000
+++ l10n_it_withholding_tax/account.py	2012-08-09 13:32:07 +0000
@@ -25,51 +25,117 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
-class account_tax(osv.osv):
-    _inherit = 'account.tax'
+class res_company(osv.osv):
+    _inherit = 'res.company'
     _columns = {
-        'withholding_tax': fields.boolean('Withholding Tax'),
-        'withholding_payment_term_id': fields.many2one('account.payment.term', 'Withholding Payment Term'),
+        'withholding_payment_term_id': fields.many2one('account.payment.term', 'Withholding tax Payment 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"),
         }
-account_tax()
 
 class account_invoice(osv.osv):
+    
+    def _net_pay(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for invoice in self.browse(cr, uid, ids, context):
+            res[invoice.id] = invoice.amount_total - invoice.withholding_amount
+        return res
+
     _inherit = "account.invoice"
-    
-    def action_move_create(self, cr, uid, ids, context=None):
-        res = super(account_invoice, self).action_move_create(cr, uid, ids, context=context)
+
+    _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)]}),
+        'net_pay': fields.function(_net_pay, string="Net Pay"),
+        }
+
+class account_voucher(osv.osv):
+    _inherit = "account.voucher"
+    
+    _columns = {
+        'withholding_move_ids': fields.many2many('account.move', 'voucher_withholding_move_rel', 'voucher_id', 'move_id', 'Withholding Tax Entries', readonly=True),
+        }
+        
+    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:
+                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:
+                rec_ids.append(wh_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)
+        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')
-        for inv in self.browse(cr, uid, ids, context=context):
-            for move_line in inv.move_id.line_id:
-                if move_line.tax_code_id:
-                    tax_ids = tax_pool.search(cr, uid, [('tax_code_id', '=', move_line.tax_code_id.id)])
-                    is_withholding = False
-                    for tax in tax_pool.browse(cr, uid, tax_ids):
-                        if tax.withholding_tax:
-                            is_withholding = True
-                    if is_withholding:
-                        if len(tax_ids) > 1:
-                            raise osv.except_osv(_('Error'),
-                                _('Too many taxes associated to tax.code %s') % move_line.tax_code_id.name)
-                        if not tax_ids:
-                            raise osv.except_osv(_('Error'),
-                                _('No taxes associated to tax.code %s') % move_line.tax_code_id.name)
-                        tax = tax_pool.browse(cr, uid, tax_ids[0])
-                        if tax.withholding_tax and tax.withholding_payment_term_id:
-                            due_list = term_pool.compute(
-                                cr, uid, tax.withholding_payment_term_id.id, move_line.tax_amount,
-                                date_ref=inv.date_invoice, context=context)
-                            if len(due_list) > 1:
-                                raise osv.except_osv(_('Error'),
-                                    _('The payment term %s has too many due dates')
-                                    % tax.withholding_payment_term_id.name)
-                            if len(due_list) == 0:
-                                raise osv.except_osv(_('Error'),
-                                    _('The payment term %s does not have due dates')
-                                    % tax.withholding_payment_term_id.name)
-                            move_line.write({'date_maturity': due_list[0][0]})
+        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)
+            for inv_id in amounts_by_invoice:
+                invoice = inv_pool.browse(cr, uid, inv_id, context)
+                if invoice.withholding_amount:
+                    # only for supplier payments
+                    if voucher.type != 'payment':
+                        raise osv.except_osv(_('Error'), _('Can\'t handle withholding tax with voucher of type other than payment'))
+                    if not invoice.company_id.withholding_account_id:
+                        raise osv.except_osv(_('Error'), _('The company does not have an associated Withholding account') )
+                    if not invoice.company_id.withholding_payment_term_id:
+                        raise osv.except_osv(_('Error'), _('The company does not have an associated Withholding Payment Term') )
+                    if not invoice.company_id.withholding_journal_id:
+                        raise osv.except_osv(_('Error'), _('The company does not have an associated Withholding journal') )
+                    # 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)
+                    
+                    # compute the due date
+                    due_list = term_pool.compute(
+                        cr, uid, invoice.company_id.withholding_payment_term_id.id, new_line_amount,
+                        date_ref=invoice.date_invoice, context=context)
+                    if len(due_list) > 1:
+                        raise osv.except_osv(_('Error'),
+                            _('The payment term %s has too many due dates')
+                            % invoice.company_id.withholding_payment_term_id.name)
+                    if len(due_list) == 0:
+                        raise osv.except_osv(_('Error'),
+                            _('The payment term %s does not have due dates')
+                            % invoice.company_id.withholding_payment_term_id.name)
+                            
+                    new_move = {
+                        'journal_id': invoice.company_id.withholding_journal_id.id,
+                        'line_id': [
+                            (0,0,{
+                                'name': invoice.number,
+                                'account_id': invoice.account_id.id,
+                                'debit': new_line_amount,
+                                'credit': 0.0,
+                                }),
+                            (0,0,{
+                                'name': _('Payable withholding - ') + invoice.number,
+                                'account_id': invoice.company_id.withholding_account_id.id,
+                                'debit': 0.0,
+                                'credit': new_line_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)
+                    voucher.write({'withholding_move_ids': [(4, move_id)]})
         return res
 
-account_invoice()
+    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 = []
+            for move in voucher.withholding_move_ids:
+                move_pool.button_cancel(cr, uid, [move.id])
+                move_pool.unlink(cr, uid, [move.id])
+        return res

=== modified file 'l10n_it_withholding_tax/account_view.xml'
--- l10n_it_withholding_tax/account_view.xml	2012-02-17 14:03:46 +0000
+++ l10n_it_withholding_tax/account_view.xml	2012-08-09 13:32:07 +0000
@@ -2,17 +2,56 @@
 <openerp>
     <data>
 
-        <record id="view_tax_form" model="ir.ui.view">
-            <field name="name">account.tax.form</field>
-            <field name="model">account.tax</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_tax_form"></field>
-            <field name="arch" type="xml">
-                <field name="active" position="after">
-                    <field name="withholding_tax"/>
-                    <field name="withholding_payment_term_id" attrs="{'readonly':[('withholding_tax','=',False)]}"/>
-                </field>
-            </field>
-        </record>
+<!-- company -->
+
+        <record model="ir.ui.view" id="view_company_inherit_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="account.view_company_inherit_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="paypal_account" position="after">
+                    <separator colspan="4"></separator>
+                    <field name="withholding_payment_term_id"/>
+                    <field name="withholding_account_id"/>
+                    <field name="withholding_journal_id" />
+                    <separator colspan="4"></separator>
+                </field>
+            </field>
+        </record>
+        
+        <!-- invoice -->
+        
+        <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="type">form</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <field name="date_due" position="after">
+                    <field name="has_withholding"/>
+                </field>
+                <field name="amount_total" position="after">
+                    <field name="withholding_amount" attrs="{'invisible': [('has_withholding', '=', False)]}"/>
+                    <field name="net_pay" attrs="{'invisible': [('has_withholding', '=', False)]}"/>
+                </field>
+            </field>
+        </record>
+        
+        <!-- voucher -->
+        
+        <record id="view_vendor_payment_form_wh_move" model="ir.ui.view">
+            <field name="name">account.voucher.payment.form.wh.move</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
+            <field name="arch" type="xml">
+                <field name="move_ids" position="after">
+                    <separator string="Withholding tax entries" colspan="4"></separator>
+                    <field name="withholding_move_ids" colspan="4" nolabel="1"/>
+                </field>
+            </field>
+        </record>
+        
     </data>
 </openerp>