Merge lp:~roberto-v/openobject-italia/7.0 into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

[Roberto Gianassi]

[lp:~roberto-v/openobject-italia/7.0]

235. By Roberto Gianassi on 2014-02-11

[IMP] Copyright fix.

236. By Roberto Gianassi on 2014-02-11

[IMP] PEP8 fixings.

237. By Roberto Gianassi on 2014-02-12

[FIX] Fixed a bug on XML record creation.

If a module (like fetchmail_invoice) containing a partner record to be
preinstalled through a data.xml file was installed after this one, a
bug occurred.
The bug shows because the record is created with the
default_has_withholding flag to empty and then validation fails.
To solve this, the create function for partners is changed to check for
the presence of that flag in the vals dictionary. If the flag is found,
we assume the creation happens through the UI and so normal checking goes
on. If the flag is not found, we assume the creation happens for an XML
record and so we add an arbitrary, but valid value for the flag.

238. By Roberto Gianassi on 2014-02-12

[FIX] Typo.

239. By Roberto Gianassi on 2014-02-14

[IMP] Changed default_has_withholding type to Boolean.

240. By Roberto Gianassi on 2014-02-14

[FIX] Bug fix to save record.

For unknown reasons, if a boolean value has the required field to True,
it is not possible to save the corresponding supplier record.
Removed the field to fix that.

241. By Roberto Gianassi on 2014-02-14

[FIX] When partner field is empty value is False.

The value passed to the onchange_partner_id for the partner is False
when the field is empty. In this case, it is not possible to use such a
value with the browse function or an error arises. Fixed that.

[Lorenzo Battistini (elbati)]

Following this MP
https://code.launchpad.net/~roberto-v/account-payment/adding_account_vat_on_payment_7/+merge/205723
maybe better if we use fiscal positions for withholding taxes too?

Thanks

review: Needs Information

[Roberto Gianassi (roberto-v)]

> Following this MP
> https://code.launchpad.net/~roberto-v/account-
> payment/adding_account_vat_on_payment_7/+merge/205723
> maybe better if we use fiscal positions for withholding taxes too?

Depends... :)

After discussing this in my shop, the reasoning is as follows:

- VAT on Payment gives a financial advantage, so it is always used where applicable by law; linking it to fiscal position seems the best bet, because it depends on law. After I set it to True, I have the best possible advantage. Only in rare cases, I will manually set it to False.

- Withholding Taxes is something you have to do with some parties, but it doesn't give any financial advantage; normally companies prefer to avoid it because it implies more accounting work; linking it to a supplier seems the best choice because you want to use it as little as possible. I don't see any advantages on linking it to fiscal position: it will quite always be False and you still have to set it manually to True on every supplier you need to.

However, if you have valid reasons to do it differently let me know and we may discuss a solution.

[Lorenzo Battistini (elbati)]

Ok, let's set it on partner.

line 87, _defaults is unnecessary

please apply PEP8 to the new code

review: Needs Fixing

[lp:~roberto-v/openobject-italia/7.0]

242. By Roberto Gianassi on 2014-02-27

[FIX] Fixed pep8 warnings on new code.

243. By Roberto Gianassi on 2014-02-27

[MERGE]

[Roberto Gianassi (roberto-v)]

Ok, fixed.

[Lorenzo Battistini (elbati)]

Please apply PEP8 to onchange_partner_id too

We would like to avoid introducing other not PEP8 code (there's enough ;-) )

[lp:~roberto-v/openobject-italia/7.0]

244. By Roberto Gianassi on 2014-02-28

[FIX] Missing pep8 fixes.

[Roberto Gianassi (roberto-v)]

Ok, fixed that, too.

Thank you!

[Lorenzo Battistini (elbati)]

review: Approve (code review)

[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

244. By Roberto Gianassi on 2014-02-28

[FIX] Missing pep8 fixes.

243. By Roberto Gianassi on 2014-02-27

[MERGE]

242. By Roberto Gianassi on 2014-02-27

[FIX] Fixed pep8 warnings on new code.

241. By Roberto Gianassi on 2014-02-14

[FIX] When partner field is empty value is False.

The value passed to the onchange_partner_id for the partner is False
when the field is empty. In this case, it is not possible to use such a
value with the browse function or an error arises. Fixed that.

240. By Roberto Gianassi on 2014-02-14

[FIX] Bug fix to save record.

For unknown reasons, if a boolean value has the required field to True,
it is not possible to save the corresponding supplier record.
Removed the field to fix that.

239. By Roberto Gianassi on 2014-02-14

[IMP] Changed default_has_withholding type to Boolean.

238. By Roberto Gianassi on 2014-02-12

[FIX] Typo.

237. By Roberto Gianassi on 2014-02-12

[FIX] Fixed a bug on XML record creation.

If a module (like fetchmail_invoice) containing a partner record to be
preinstalled through a data.xml file was installed after this one, a
bug occurred.
The bug shows because the record is created with the
default_has_withholding flag to empty and then validation fails.
To solve this, the create function for partners is changed to check for
the presence of that flag in the vals dictionary. If the flag is found,
we assume the creation happens through the UI and so normal checking goes
on. If the flag is not found, we assume the creation happens for an XML
record and so we add an arbitrary, but valid value for the flag.

236. By Roberto Gianassi on 2014-02-11

[IMP] PEP8 fixings.

235. By Roberto Gianassi on 2014-02-11

[IMP] Copyright fix.

=== 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-02-28 08:04:32 +0000
@@ -22,3 +22,4 @@
 ##############################################################################
 
 import account
+import partner

=== 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-02-28 08:04:32 +0000
@@ -48,7 +48,9 @@
     'license': 'AGPL-3',
     "depends" : ['account_voucher_cash_basis'],
     "data" : [
-        'account_view.xml',],
+        'account_view.xml',
+        'partner_view.xml',
+        ],
     "demo" : [
         'account_demo.xml',
         ],

=== 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-02-28 08:04:32 +0000
@@ -91,18 +91,42 @@
         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):
             res[invoice.id] = invoice.amount_total - invoice.withholding_amount
         return res
 
+    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 supplier is changed
+        partner_obj = self.pool.get("res.partner")
+        if partner_id:
+            for partner in partner_obj.browse(cr, uid, [partner_id]):
+                if partner.supplier:
+                    res['value']['has_withholding'] = \
+                        partner.default_has_withholding
+        return res
+
     _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"),
         }
 

=== added file 'l10n_it_withholding_tax/partner.py'
--- l10n_it_withholding_tax/partner.py	1970-01-01 00:00:00 +0000
+++ l10n_it_withholding_tax/partner.py	2014-02-28 08:04:32 +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 res_partner(orm.Model):
+    _inherit = 'res.partner'
+
+    _columns = {
+        'default_has_withholding': fields.boolean(
+            'WithHolding Tax Default Flag'),
+    }

=== added file 'l10n_it_withholding_tax/partner_view.xml'
--- l10n_it_withholding_tax/partner_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_it_withholding_tax/partner_view.xml	2014-02-28 08:04:32 +0000
@@ -0,0 +1,47 @@
+<?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">res.partner.vat.default.view</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+                <field name="property_account_position" position="after" version="7.0">
+                    <field name="default_has_withholding" class="oe_inline" attrs="{'invisible': [('supplier','!=',True)]}"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>