From 7d524b490c505e5f39a0182f0ac2fd918327deff Mon Sep 17 00:00:00 2001 From: AngelMoya-Domatix Date: Wed, 14 Oct 2015 11:18:05 +0200 Subject: [PATCH] [ADD] contract_payment_mode module --- contract_payment_mode/README.rst | 52 +++++++++++++++++++ contract_payment_mode/__init__.py | 2 + contract_payment_mode/__openerp__.py | 40 ++++++++++++++ .../i18n/contract_payment_mode.pot | 27 ++++++++++ contract_payment_mode/i18n/es.po | 27 ++++++++++ contract_payment_mode/models/__init__.py | 2 + contract_payment_mode/models/contract.py | 33 ++++++++++++ .../test/contract_payment_mode.yml | 49 +++++++++++++++++ contract_payment_mode/views/contract_view.xml | 42 +++++++++++++++ oca_dependencies.txt | 16 +----- 10 files changed, 275 insertions(+), 15 deletions(-) create mode 100644 contract_payment_mode/README.rst create mode 100644 contract_payment_mode/__init__.py create mode 100644 contract_payment_mode/__openerp__.py create mode 100644 contract_payment_mode/i18n/contract_payment_mode.pot create mode 100644 contract_payment_mode/i18n/es.po create mode 100644 contract_payment_mode/models/__init__.py create mode 100644 contract_payment_mode/models/contract.py create mode 100644 contract_payment_mode/test/contract_payment_mode.yml create mode 100644 contract_payment_mode/views/contract_view.xml diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst new file mode 100644 index 00000000..5d4ee46c --- /dev/null +++ b/contract_payment_mode/README.rst @@ -0,0 +1,52 @@ +.. 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. + +Usage +===== + +.. 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/8.0 + +For further information, please visit: + +* https://www.odoo.com/forum/help-1 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + +Credits +======= + +Contributors +------------ + +* Ángel Moya + + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://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 http://odoo-community.org. diff --git a/contract_payment_mode/__init__.py b/contract_payment_mode/__init__.py new file mode 100644 index 00000000..a0fdc10f --- /dev/null +++ b/contract_payment_mode/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/contract_payment_mode/__openerp__.py b/contract_payment_mode/__openerp__.py new file mode 100644 index 00000000..1eee7c8b --- /dev/null +++ b/contract_payment_mode/__openerp__.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- + +############################################################################### +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2015 Domatix (). +# +# 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 . +# +############################################################################### + +{ + 'name': 'Contract Payment Mode', + 'summary': 'Payment mode in contracts and their invoices', + 'version': '8.0.1.0.0', + 'author': 'Domatix, Odoo Community Association (OCA)', + 'website': 'http://www.domatix.com', + 'depends': [ + 'account_analytic_analysis', + 'account_payment_partner'], + 'category': 'Sales Management', + 'license': 'AGPL-3', + 'data': [ + 'views/contract_view.xml', + ], + 'test': ['test/contract_payment_mode.yml'], + 'installable': True, + 'auto_install': True, +} diff --git a/contract_payment_mode/i18n/contract_payment_mode.pot b/contract_payment_mode/i18n/contract_payment_mode.pot new file mode 100644 index 00000000..e366d91d --- /dev/null +++ b/contract_payment_mode/i18n/contract_payment_mode.pot @@ -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 "" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + diff --git a/contract_payment_mode/i18n/es.po b/contract_payment_mode/i18n/es.po new file mode 100644 index 00000000..de6fc59a --- /dev/null +++ b/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" + diff --git a/contract_payment_mode/models/__init__.py b/contract_payment_mode/models/__init__.py new file mode 100644 index 00000000..b82ea877 --- /dev/null +++ b/contract_payment_mode/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import contract diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py new file mode 100644 index 00000000..8d1b31a5 --- /dev/null +++ b/contract_payment_mode/models/contract.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +from openerp import models, fields, api + + +class AccountAnalyticAccount(models.Model): + _inherit = 'account.analytic.account' + + payment_mode_id = fields.Many2one( + 'payment.mode', + string='Payment Mode', + domain="[('type', '=', 'sale')]") + + @api.multi + def on_change_partner_id(self, partner_id, name): + res = super(AccountAnalyticAccount, self).on_change_partner_id( + partner_id, + name) + partner = self.env['res.partner'].browse(partner_id) + if partner and partner.customer_payment_mode: + res['value']['payment_mode_id'] = partner.customer_payment_mode.id + return res + + @api.model + def _prepare_invoice_data(self, contract): + invoice_vals = super(AccountAnalyticAccount, self).\ + _prepare_invoice_data( + contract) + if contract.payment_mode_id: + invoice_vals['payment_mode_id'] = contract.payment_mode_id.id + invoice_vals['partner_bank_id'] = \ + contract.payment_mode_id.bank_id.id + + return invoice_vals diff --git a/contract_payment_mode/test/contract_payment_mode.yml b/contract_payment_mode/test/contract_payment_mode.yml new file mode 100644 index 00000000..465b2446 --- /dev/null +++ b/contract_payment_mode/test/contract_payment_mode.yml @@ -0,0 +1,49 @@ +- + In order to test payment mode in contract, I create a contract with custom payment mode. + Then, I generate Invoices from contract and test this payment mode. + First create custom payment mode. +- + !record {model: payment.mode, id: custom_payment_mode}: + name: Custom Payment Mode + journal: account.bank_journal + bank_id: account_payment.partner_bank_1 + company_id: base.main_company + type: account_banking_payment_export.manual_bank_tranfer +- + I create a contract with custom payment mode +- + !record {model: account.analytic.account, id: contract_custom_payment}: + name: Maintenance of Servers + company_id: base.main_company + partner_id: base.main_partner + payment_mode_id: custom_payment_mode + type: contract + recurring_invoices : 1 + recurring_interval : 1 + recurring_invoice_line_ids: + - quantity: 2.0 + price_unit: 100.0 + name: Database Administration 25 + product_id: product.product_product_consultant + uom_id: product.product_uom_hour +- + I test the payment mode in contract +- + !python {model: account.analytic.account}: | + aid = ref('contract_payment_mode.contract_custom_payment') + contract = self.browse(cr, uid, aid,context=context) + assert contract.payment_mode_id.id == ref('contract_payment_mode.custom_payment_mode'), "Payment Mode is not correct in contract" +- + I generate all invoices from contracts having recurring invoicing +- + !python {model: account.analytic.account}: | + self.recurring_create_invoice(cr, uid, []) +- + I test the generated invoice for custom payment contract +- + !python {model: account.invoice}: | + aid = ref('contract_payment_mode.contract_custom_payment') + ids = self.search(cr, uid, [('invoice_line.account_analytic_id','=',aid)], context=context) + assert len(ids)>=1, 'No invoice created for the custom paymetn mode contract' + for invoice in self.browse(cr, uid, ids,context=context): + assert invoice.payment_mode_id.id == ref('contract_payment_mode.custom_payment_mode'), "Payment Mode is not correct in invoice" diff --git a/contract_payment_mode/views/contract_view.xml b/contract_payment_mode/views/contract_view.xml new file mode 100644 index 00000000..4f488e45 --- /dev/null +++ b/contract_payment_mode/views/contract_view.xml @@ -0,0 +1,42 @@ + + + + + + account.analytic.account.payment.form + account.analytic.account + + + + + + + + + + + account.analytic.account.payment.list + account.analytic.account + + + + + + + + + + + account.analytic.account.payment.search + account.analytic.account + + + + + + + + + + \ No newline at end of file diff --git a/oca_dependencies.txt b/oca_dependencies.txt index ac0117d1..34f82ae9 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1,15 +1 @@ -# List the OCA project dependencies, one per line -# Add a repository url and branch if you need a forked version -# -# Examples -# ======== -# -# To depend on the standard version of sale-workflow, use: -# sale-workflow -# -# To explicitely give the URL of a fork, and still use the version specified in -# .travis.yml, use: -# sale-workflow https://github.com/OCA/sale-workflow -# -# To provide both the URL and a branch, use: -# sale-workflow https://github.com/OCA/sale-workflow branchname +bank-payment