Merge pull request #56 from Tecnativa/9.0-mig-contract_payment_mode

[MIG][9.0] contract_payment_mode module

contract_payment_mode/README.rst

@@ -0,0 +1,67 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=====================
+Contract Payment Mode
+=====================
+
+This module allows to set a payment mode on contract for creating the invoices
+with this payment mode.
+
+Configuration
+=============
+
+Your user should be a Sales Manager or Accountant.
+
+Usage
+=====
+
+#. Go to *Sales > Sales > Contracts*.
+#. Create one.
+#. Select a partner to which invoice.
+#. If the partner has a payment mode, this payment mode is selected here.
+#. If not, or if you want another payment mode, you can change it in the
+   corresponding field.
+#. Click on **Generate recurring invoices automatically** checkbox.
+#. Add a product to invoice.
+#. If you create an invoice, new invoice will have the selected payment mode.
+
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/110/9.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/contract/issues>`_.
+In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Ángel Moya <angel.moya@domatix.com>
+* Antonio Espinosa <antonioea@antiun.com>
+* Vicent Cubells <vicent.cubells@tecnativa.com>
+
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.

contract_payment_mode/__init__.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from .hooks import post_init_hook

contract_payment_mode/__openerp__.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Domatix (<www.domatix.com>)
+# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa
+# Copyright 2017 Tecnativa - Vicent Cubells
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    'name': 'Contract Payment Mode',
+    'summary': 'Payment mode in contracts and their invoices',
+    'version': '9.0.1.0.0',
+    'author': 'Domatix, '
+              'Tecnativa, '
+              'Odoo Community Association (OCA)',
+    'website': 'http://www.domatix.com',
+    'depends': [
+        'contract',
+        'account_payment_partner'
+    ],
+    'category': 'Sales Management',
+    'license': 'AGPL-3',
+    'data': [
+        'views/contract_view.xml',
+    ],
+    'post_init_hook': 'post_init_hook',
+    'installable': True,
+    'auto_install': True,
+}

contract_payment_mode/hooks.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp import api, SUPERUSER_ID
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+def post_init_hook(cr, registry):
+    """Copy payment mode from partner to the new field at contract."""
+    with api.Environment.manage():
+        env = api.Environment(cr, SUPERUSER_ID, {})
+        m_contract = env['account.analytic.account']
+        contracts = m_contract.search([
+            ('payment_mode_id', '=', False),
+        ])
+        if contracts:
+            _logger.info('Setting payment mode: %d contracts' %
+                         len(contracts))
+        for contract in contracts:
+            payment_mode = contract.partner_id.customer_payment_mode_id
+            if payment_mode:
+                contract.payment_mode_id = payment_mode.id
+        _logger.info('Setting payment mode: Done')

contract_payment_mode/i18n/ca.po

@@ -0,0 +1,28 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-20 18:39+0000\n"
+"PO-Revision-Date: 2015-11-07 12:33+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Catalan (http://www.transifex.com/oca/OCA-contract-8-0/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""

contract_payment_mode/i18n/de.po

@@ -0,0 +1,29 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+# Rudolf Schnapka <rs@techno-flex.de>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-30 01:38+0000\n"
+"PO-Revision-Date: 2015-11-25 09:20+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
+"Language-Team: German (http://www.transifex.com/oca/OCA-contract-8-0/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Kostenstelle"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Zahlweise"

contract_payment_mode/i18n/el_GR.po

@@ -0,0 +1,28 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-07 03:42+0000\n"
+"PO-Revision-Date: 2015-11-07 12:33+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-contract-8-0/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Αναλυτικός Λογαριασμός"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""

contract_payment_mode/i18n/es.po

@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* contract_payment_mode
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-10-16 08:32+0000\n"
+"PO-Revision-Date: 2015-10-16 08:32+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Modo de pago"
+

contract_payment_mode/i18n/es_MX.po

@@ -0,0 +1,28 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-03 01:11+0000\n"
+"PO-Revision-Date: 2015-11-07 12:33+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/oca/OCA-contract-8-0/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""

contract_payment_mode/i18n/fi.po

@@ -0,0 +1,29 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+# Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-28 11:00+0000\n"
+"PO-Revision-Date: 2016-07-08 10:45+0000\n"
+"Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/oca/OCA-contract-8-0/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Maksutapa"

contract_payment_mode/i18n/fr.po

@@ -0,0 +1,29 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+# Christophe CHAUVET <christophe.chauvet@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-30 10:34+0000\n"
+"PO-Revision-Date: 2016-05-19 16:11+0000\n"
+"Last-Translator: Christophe CHAUVET <christophe.chauvet@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-contract-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Mode de paiement"

contract_payment_mode/i18n/pt_BR.po

@@ -0,0 +1,29 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+# danimaribeiro <danimaribeiro@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-08 01:39+0000\n"
+"PO-Revision-Date: 2016-03-05 18:19+0000\n"
+"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-contract-8-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Conta Analítica"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Modo de pagamento"

contract_payment_mode/i18n/sk_SK.po

@@ -0,0 +1,28 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-21 10:53+0000\n"
+"PO-Revision-Date: 2015-11-07 12:33+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/oca/OCA-contract-8-0/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytický účet"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""

contract_payment_mode/i18n/sl.po

@@ -0,0 +1,29 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_payment_mode
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: contract (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-13 18:42+0000\n"
+"PO-Revision-Date: 2015-11-08 05:37+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-contract-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: contract_payment_mode
+#: model:ir.model,name:contract_payment_mode.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: contract_payment_mode
+#: field:account.analytic.account,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Način plačila"

contract_payment_mode/models/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import contract

contract_payment_mode/models/contract.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from openerp import api, fields, models
+
+
+class AccountAnalyticAccount(models.Model):
+    _inherit = 'account.analytic.account'
+
+    payment_mode_id = fields.Many2one(
+        comodel_name='account.payment.mode',
+        string='Payment Mode',
+        domain=[('payment_type', '=', 'inbound')],
+    )
+
+    @api.onchange('partner_id')
+    def on_change_partner_id(self):
+        if self.partner_id.customer_payment_mode_id:
+            self.payment_mode_id = self.partner_id.customer_payment_mode_id.id
+
+    @api.model
+    def _prepare_invoice_data(self, contract):
+        invoice_vals = super(AccountAnalyticAccount, self)._prepare_invoice()
+        if contract.payment_mode_id:
+            invoice_vals['payment_mode_id'] = contract.payment_mode_id.id
+            invoice_vals['partner_bank_id'] = (
+                contract.partner_id.bank_ids[:1].id
+            )
+        return invoice_vals

contract_payment_mode/tests/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import test_contract_payment

contract_payment_mode/tests/test_contract_payment.py

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Antiun Ingenieria S.L. - Antonio Espinosa
+# Copyright 2017 Tecnativa - Vicent Cubells
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp.tests import common
+from ..hooks import post_init_hook
+
+
+class TestContractPaymentInit(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContractPaymentInit, cls).setUpClass()
+
+        cls.payment_method = cls.env.ref(
+            'account.account_payment_method_manual_in')
+        cls.payment_mode = cls.env.ref(
+            'account_payment_mode.payment_mode_inbound_ct1')
+        cls.partner = cls.env['res.partner'].create({
+            'name': 'Test contract partner',
+            'customer_payment_mode_id': cls.payment_mode,
+        })
+        cls.product = cls.env['product.product'].create({
+            'name': 'Custom Service',
+            'type': 'service',
+            'uom_id': cls.env.ref('product.product_uom_hour').id,
+            'uom_po_id': cls.env.ref('product.product_uom_hour').id,
+            'sale_ok': True,
+        })
+        cls.contract = cls.env['account.analytic.account'].create({
+            'name': 'Maintenance of Servers',
+        })
+
+    def _contract_payment_mode_id(self, contract_id):
+        contract = self.env['account.analytic.account'].search([
+            ('id', '=', contract_id),
+        ])
+        return contract.payment_mode_id.id
+
+    def test_post_init_hook(self):
+        contract = self.env['account.analytic.account'].create({
+            'name': 'Test contract',
+            'partner_id': self.partner.id,
+            'payment_mode_id': self.payment_mode.id,
+        })
+        self.assertEqual(self._contract_payment_mode_id(contract.id),
+                         self.payment_mode.id)
+
+        contract.payment_mode_id = False
+        self.assertEqual(self._contract_payment_mode_id(contract.id), False)
+
+        post_init_hook(self.cr, self.env)
+        self.assertEqual(self._contract_payment_mode_id(contract.id),
+                         self.payment_mode.id)
+
+    def test_contract_and_invoices(self):
+        self.contract.write({'partner_id': self.partner.id})
+        self.contract.on_change_partner_id()
+        self.assertEqual(self.contract.payment_mode_id,
+                         self.contract.partner_id.customer_payment_mode_id)
+        self.contract.write({
+            'recurring_invoices': True,
+            'recurring_interval': 1,
+            'recurring_invoice_line_ids': [(0, 0, {
+                'quantity': 2.0,
+                'price_unit': 200.0,
+                'name': 'Database Administration 25',
+                'product_id': self.product.id,
+                'uom_id': self.product.uom_id.id,
+            })]
+        })
+        res = self.contract._prepare_invoice_data(self.contract)
+        self.assertEqual(res.get('partner_id'), self.contract.partner_id.id)
+        self.assertEqual(res.get('payment_mode_id'),
+                         self.contract.payment_mode_id.id)
+        self.contract.recurring_create_invoice()
+        new_invoice = self.env['account.invoice'].search([
+            ('contract_id', '=', self.contract.id)
+        ])
+        self.assertEqual(len(new_invoice.ids), 1)
+        self.contract.recurring_create_invoice()
+        self.assertEqual(self.contract.payment_mode_id,
+                         new_invoice.payment_mode_id)

contract_payment_mode/views/contract_view.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="account_analytic_account_payment_form" model="ir.ui.view">
+        <field name="name">account.analytic.account.payment.form</field>
+        <field name="model">account.analytic.account</field>
+        <field name="inherit_id" ref="analytic.view_account_analytic_account_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="payment_mode_id" />
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Inherited Analytic Account list for contracts -->
+    <record id="view_account_analytic_account_payment_tree" model="ir.ui.view">
+        <field name="name">account.analytic.account.payment.list</field>
+        <field name="model">account.analytic.account</field>
+        <field name="inherit_id" ref="analytic.view_account_analytic_account_list" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="payment_mode_id" />
+            </field>
+        </field>
+    </record>
+
+    <!-- Analytic Account search view for contract -->
+    <record id="view_account_analytic_account_search" model="ir.ui.view">
+        <field name="name">account.analytic.account.search</field>
+        <field name="model">account.analytic.account</field>
+        <field name="inherit_id" ref="analytic.view_account_analytic_account_search" />
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="payment_mode_id" />
+            </field>
+        </field>
+    </record>
+
+</odoo>

oca_dependencies.txt

@@ -15,3 +15,4 @@
 # sale-workflow https://github.com/OCA/sale-workflow branchname
 
 account-invoicing
+bank-payment