From 71e404723bcf4296ce379226985a6334bfff1c33 Mon Sep 17 00:00:00 2001 From: Angel Moya Date: Thu, 15 Sep 2016 15:24:12 +0200 Subject: [PATCH] ADD contract_partner module --- contract_partner/README.rst | 58 +++++++++++++++++++++ contract_partner/__init__.py | 2 + contract_partner/__openerp__.py | 39 ++++++++++++++ contract_partner/i18n/contract_partners.pot | 39 ++++++++++++++ contract_partner/i18n/es.po | 40 ++++++++++++++ contract_partner/models/__init__.py | 3 ++ contract_partner/models/contract.py | 24 +++++++++ contract_partner/models/invoice.py | 14 +++++ contract_partner/test/contract_partner.yml | 41 +++++++++++++++ contract_partner/views/contract_view.xml | 37 +++++++++++++ contract_partner/views/invoice_view.xml | 24 +++++++++ 11 files changed, 321 insertions(+) create mode 100644 contract_partner/README.rst create mode 100644 contract_partner/__init__.py create mode 100644 contract_partner/__openerp__.py create mode 100644 contract_partner/i18n/contract_partners.pot create mode 100644 contract_partner/i18n/es.po create mode 100644 contract_partner/models/__init__.py create mode 100644 contract_partner/models/contract.py create mode 100644 contract_partner/models/invoice.py create mode 100644 contract_partner/test/contract_partner.yml create mode 100644 contract_partner/views/contract_view.xml create mode 100644 contract_partner/views/invoice_view.xml diff --git a/contract_partner/README.rst b/contract_partner/README.rst new file mode 100644 index 00000000..9c10b4b2 --- /dev/null +++ b/contract_partner/README.rst @@ -0,0 +1,58 @@ +.. 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 Partner +================ + +This module was written to extend the functionality of contracts to support set contact and service location in contract. + +* "contact" is the person or address where to send the invoices. If empty the "Customer" will be used. +* "service" is where the service is rendered (site, location, address) + +Contact and service location will be copied from contracts to invoices. + + +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_partner/__init__.py b/contract_partner/__init__.py new file mode 100644 index 00000000..a0fdc10f --- /dev/null +++ b/contract_partner/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/contract_partner/__openerp__.py b/contract_partner/__openerp__.py new file mode 100644 index 00000000..dcb39ad8 --- /dev/null +++ b/contract_partner/__openerp__.py @@ -0,0 +1,39 @@ +# -*- 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 Partner', + 'summary': 'Partners for service and contact in contracts', + 'version': '8.0.1.0.0', + 'author': 'Domatix, Odoo Community Association (OCA)', + 'website': 'http://www.domatix.com', + 'depends': ['account_analytic_analysis'], + 'category': 'Sales Management', + 'license': 'AGPL-3', + 'data': [ + 'views/contract_view.xml', + 'views/invoice_view.xml' + ], + 'test': ['test/contract_partner.yml'], + 'installable': True, + 'application': False, + 'auto_install': False, +} diff --git a/contract_partner/i18n/contract_partners.pot b/contract_partner/i18n/contract_partners.pot new file mode 100644 index 00000000..e9473ab2 --- /dev/null +++ b/contract_partner/i18n/contract_partners.pot @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_partners +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-10-02 15:36+0000\n" +"PO-Revision-Date: 2015-10-02 15:36+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_partners +#: model:ir.model,name:contract_partners.model_account_analytic_account +msgid "Analytic Account" +msgstr "" + +#. module: contract_partners +#: field:account.analytic.account,contact_partner_id:0 +#: field:account.invoice,contact_partner_id:0 +msgid "Contact Address" +msgstr "" + +#. module: contract_partners +#: model:ir.model,name:contract_partners.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: contract_partners +#: field:account.analytic.account,service_partner_id:0 +#: field:account.invoice,service_partner_id:0 +msgid "Service Address" +msgstr "" + diff --git a/contract_partner/i18n/es.po b/contract_partner/i18n/es.po new file mode 100644 index 00000000..cfaff7ab --- /dev/null +++ b/contract_partner/i18n/es.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_partners +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-10-02 15:38+0000\n" +"PO-Revision-Date: 2015-10-02 17:40+0100\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"Language: es\n" +"X-Generator: Poedit 1.7.5\n" + +#. module: contract_partners +#: model:ir.model,name:contract_partners.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: contract_partners +#: field:account.analytic.account,contact_partner_id:0 +#: field:account.invoice,contact_partner_id:0 +msgid "Contact Address" +msgstr "Dirección de contacto" + +#. module: contract_partners +#: model:ir.model,name:contract_partners.model_account_invoice +msgid "Invoice" +msgstr "Factura" + +#. module: contract_partners +#: field:account.analytic.account,service_partner_id:0 +#: field:account.invoice,service_partner_id:0 +msgid "Service Address" +msgstr "Direccion de envio" diff --git a/contract_partner/models/__init__.py b/contract_partner/models/__init__.py new file mode 100644 index 00000000..27ee6307 --- /dev/null +++ b/contract_partner/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +from . import contract +from . import invoice diff --git a/contract_partner/models/contract.py b/contract_partner/models/contract.py new file mode 100644 index 00000000..16f142a7 --- /dev/null +++ b/contract_partner/models/contract.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from openerp import models, fields, api + + +class AccountAnalyticAccount(models.Model): + _inherit = 'account.analytic.account' + + service_partner_id = fields.Many2one( + 'res.partner', + string="Service Location") + + contact_partner_id = fields.Many2one( + 'res.partner', + string="Contact") + + @api.model + def _prepare_invoice_data(self, contract): + invoice_vals = super(AccountAnalyticAccount, self).\ + _prepare_invoice_data(contract) + if contract.service_partner_id: + invoice_vals['service_partner_id'] = contract.service_partner_id.id + if contract.contact_partner_id: + invoice_vals['contact_partner_id'] = contract.contact_partner_id.id + return invoice_vals diff --git a/contract_partner/models/invoice.py b/contract_partner/models/invoice.py new file mode 100644 index 00000000..4ab31ee9 --- /dev/null +++ b/contract_partner/models/invoice.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +from openerp import models, fields + + +class AccountInvoice(models.Model): + _inherit = 'account.invoice' + + service_partner_id = fields.Many2one( + 'res.partner', + string="Service Address") + + contact_partner_id = fields.Many2one( + 'res.partner', + string="Contact Address") diff --git a/contract_partner/test/contract_partner.yml b/contract_partner/test/contract_partner.yml new file mode 100644 index 00000000..a654783e --- /dev/null +++ b/contract_partner/test/contract_partner.yml @@ -0,0 +1,41 @@ +- + In order to test contract invoice partners create a contract with partners +- + !record {model: account.analytic.account, id: contract_partner}: + name: Maintenance of Servers + company_id: base.main_company + partner_id: base.main_partner + service_partner_id: base.res_partner_2 + contact_partner_id: base.res_partner_address_4 + 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 partner contract +- + !python {model: account.analytic.account}: | + aid = ref('contract_partner.contract_partner') + contract = self.browse(cr, uid, aid,context=context) + assert contract.service_partner_id.id == ref('base.res_partner_2'), "Service partner is not correct in contract" + assert contract.contact_partner_id.id == ref('base.res_partner_address_4'), "Contact partner 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 partner contract +- + !python {model: account.invoice}: | + aid = ref('contract_partner.contract_partner') + ids = self.search(cr, uid, [('invoice_line.account_analytic_id','=',aid)], context=context) + assert len(ids)>=1, 'No invoice created for the contract' + for invoice in self.browse(cr, uid, ids,context=context): + assert invoice.service_partner_id.id == ref('base.res_partner_2'), "Service partner is not correct in invoice" + assert invoice.contact_partner_id.id == ref('base.res_partner_address_4'), "Contact partner is not correct in invoice" diff --git a/contract_partner/views/contract_view.xml b/contract_partner/views/contract_view.xml new file mode 100644 index 00000000..42c42e04 --- /dev/null +++ b/contract_partner/views/contract_view.xml @@ -0,0 +1,37 @@ + + + + + + account.analytic.account.partner.form + account.analytic.account + + + + + + + + + + + + account.analytic.account.partner.list + account.analytic.account + + + + + + + + + + + diff --git a/contract_partner/views/invoice_view.xml b/contract_partner/views/invoice_view.xml new file mode 100644 index 00000000..d59debf9 --- /dev/null +++ b/contract_partner/views/invoice_view.xml @@ -0,0 +1,24 @@ + + + + + + account.invoice.contract.partner.form + account.invoice + + + + + + + + + + +