diff --git a/contract_journal/README.rst b/contract_journal/README.rst new file mode 100644 index 00000000..9ab4ce91 --- /dev/null +++ b/contract_journal/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 Invoice Journal +======================== + +This module allows to set a sales account journal for creating the invoices on it. + +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_journal/__init__.py b/contract_journal/__init__.py new file mode 100644 index 00000000..a0fdc10f --- /dev/null +++ b/contract_journal/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/contract_journal/__openerp__.py b/contract_journal/__openerp__.py new file mode 100644 index 00000000..6efc32df --- /dev/null +++ b/contract_journal/__openerp__.py @@ -0,0 +1,38 @@ +# -*- 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 Invoice Journal', + 'summary': 'Invoice Journal 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'], + 'category': 'Sales Management', + 'license': 'AGPL-3', + 'data': [ + 'views/contract_view.xml', + ], + 'test': ['test/contract_journal.yml'], + 'installable': True, + 'auto_install': False, +} diff --git a/contract_journal/i18n/es.po b/contract_journal/i18n/es.po new file mode 100644 index 00000000..6cc3ec5c --- /dev/null +++ b/contract_journal/i18n/es.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_journal +# angel , 2015. +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-06-12 12:20+0000\n" +"PO-Revision-Date: 2015-06-22 11:43+0100\n" +"Last-Translator: angel \n" +"Language-Team: Domatix\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" + +#. module: contract_journal +#: model:ir.model,name:contract_journal.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: contract_journal +#: field:account.analytic.account,journal_id:0 +msgid "Journal" +msgstr "Diario" diff --git a/contract_journal/models/__init__.py b/contract_journal/models/__init__.py new file mode 100644 index 00000000..b82ea877 --- /dev/null +++ b/contract_journal/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import contract diff --git a/contract_journal/models/contract.py b/contract_journal/models/contract.py new file mode 100644 index 00000000..c272e143 --- /dev/null +++ b/contract_journal/models/contract.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +from openerp import models, fields, api + + +class AccountAnalyticAccount(models.Model): + _inherit = 'account.analytic.account' + + @api.model + def _default_journal(self): + company_id = self.env.context.get( + 'company_id', self.env.user.company_id.id) + domain = [ + ('type', '=', 'sale'), + ('company_id', '=', company_id)] + return self.env['account.journal'].search(domain, limit=1) + + journal_id = fields.Many2one( + 'account.journal', + string='Journal', + default=_default_journal, + domain="[('type', '=', 'sale'),('company_id', '=', company_id)]") + + @api.model + def _prepare_invoice_data(self, contract): + invoice_vals = super(AccountAnalyticAccount, self).\ + _prepare_invoice_data( + contract) + if contract.journal_id: + invoice_vals['journal_id'] = contract.journal_id.id + return invoice_vals diff --git a/contract_journal/test/contract_journal.yml b/contract_journal/test/contract_journal.yml new file mode 100644 index 00000000..da616482 --- /dev/null +++ b/contract_journal/test/contract_journal.yml @@ -0,0 +1,84 @@ +- + In order to test contract invoice journal create a contract with sale invoice journal +- + !record {model: account.analytic.account, id: contract_sale_journal}: + name: Maintenance of Servers + company_id: base.main_company + partner_id: base.main_partner + journal_id: account.sales_journal + 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 create a new custom journal +- + !record {model: account.journal, id: custom_journal}: + name: Custom Sales Journal + code: CSAJ + type: sale + sequence_id: account.sequence_sale_journal + default_credit_account_id: account.a_sale + default_debit_account_id: account.a_sale + analytic_journal_id: account.analytic_journal_sale + user_id: base.user_root +- + Create a contract with custom invoice journal +- + !record {model: account.analytic.account, id: contract_custom_journal}: + name: Maintenance of Servers + company_id: base.main_company + partner_id: base.main_partner + journal_id: contract_journal.custom_journal + 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 sale contract +- + !python {model: account.analytic.account}: | + aid = ref('contract_journal.contract_sale_journal') + contract = self.browse(cr, uid, aid,context=context) + assert contract.journal_id.id == ref('account.sales_journal'), "Sale Invoice Journal is not correct in contract" +- + I test the custom contract +- + !python {model: account.analytic.account}: | + aid = ref('contract_journal.contract_custom_journal') + contract = self.browse(cr, uid, aid,context=context) + assert contract.journal_id.id == ref('contract_journal.custom_journal'), "Custom Invoice Journal 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 sale journal contract +- + !python {model: account.invoice}: | + aid = ref('contract_journal.contract_sale_journal') + ids = self.search(cr, uid, [('invoice_line.account_analytic_id','=',aid)], context=context) + assert len(ids)>=1, 'No invoice created for the sale journal contract' + for invoice in self.browse(cr, uid, ids,context=context): + assert invoice.journal_id.id == ref('account.sales_journal'), "Sale Invoice Journal is not correct in invoice" +- + I test the generated invoice for custom journal contract +- + !python {model: account.invoice}: | + aid = ref('contract_journal.contract_custom_journal') + ids = self.search(cr, uid, [('invoice_line.account_analytic_id','=',aid)], context=context) + assert len(ids)>=1, 'No invoice created for the custom journal contract' + for invoice in self.browse(cr, uid, ids,context=context): + assert invoice.journal_id.id == ref('contract_journal.custom_journal'), "Custom Invoice Journal is not correct in invoice" + \ No newline at end of file diff --git a/contract_journal/views/contract_view.xml b/contract_journal/views/contract_view.xml new file mode 100644 index 00000000..ae46720d --- /dev/null +++ b/contract_journal/views/contract_view.xml @@ -0,0 +1,42 @@ + + + + + + account.analytic.account.journal.form + account.analytic.account + + + + + + + + + + + account.analytic.account.journal.list + account.analytic.account + + + + + + + + + + + account.analytic.account.journal.search + account.analytic.account + + + + + + + + + + \ No newline at end of file