Browse Source
[MIG] contract_journal: Migrate to v9
[MIG] contract_journal: Migrate to v9
* Bump versions * Update readme template * Rename view and use odoo tags * Remove deprecated yml * Add tests * Update invoice vals generate for v9 modulepull/46/head
Dave Lasley
8 years ago
No known key found for this signature in database
GPG Key ID: 7DDBA4BA81B934CF
10 changed files with 145 additions and 191 deletions
-
15contract_journal/README.rst
-
34contract_journal/__openerp__.py
-
3contract_journal/models/__init__.py
-
32contract_journal/models/account_analytic_account.py
-
30contract_journal/models/contract.py
-
84contract_journal/test/contract_journal.yml
-
4contract_journal/tests/__init__.py
-
52contract_journal/tests/test_contract_journal.py
-
40contract_journal/views/contract.xml
-
42contract_journal/views/contract_view.xml
@ -1,38 +1,20 @@ |
|||
# -*- coding: utf-8 -*- |
|||
|
|||
############################################################################### |
|||
# |
|||
# OpenERP, Open Source Management Solution |
|||
# Copyright (C) 2015 Domatix (<www.domatix.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/>. |
|||
# |
|||
############################################################################### |
|||
# Copyright 2015 Domatix |
|||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
|||
|
|||
{ |
|||
'name': 'Contract Invoice Journal', |
|||
'summary': 'Invoice Journal in contracts and their invoices', |
|||
'version': '8.0.1.0.0', |
|||
'author': 'Domatix, Odoo Community Association (OCA)', |
|||
'version': '9.0.1.0.0', |
|||
'author': 'Domatix, ' |
|||
'LasLabs, ' |
|||
'Odoo Community Association (OCA)', |
|||
'website': 'http://www.domatix.com', |
|||
'depends': ['account_analytic_analysis'], |
|||
'depends': ['contract'], |
|||
'category': 'Sales Management', |
|||
'license': 'AGPL-3', |
|||
'data': [ |
|||
'views/contract_view.xml', |
|||
'views/contract.xml', |
|||
], |
|||
'test': ['test/contract_journal.yml'], |
|||
'installable': True, |
|||
'auto_install': False, |
|||
} |
|||
@ -1,2 +1,3 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from . import contract |
|||
|
|||
from . import account_analytic_account |
|||
@ -0,0 +1,32 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Copyright 2015 Domatix |
|||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
|||
|
|||
from openerp import api, fields, models |
|||
|
|||
|
|||
class AccountAnalyticAccount(models.Model): |
|||
_inherit = 'account.analytic.account' |
|||
|
|||
@api.model |
|||
def _default_journal_id(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=lambda s: s._default_journal_id(), |
|||
domain="[('type', '=', 'sale'), ('company_id', '=', company_id)]", |
|||
) |
|||
|
|||
@api.multi |
|||
def _prepare_invoice(self): |
|||
invoice_vals = super(AccountAnalyticAccount, self)._prepare_invoice() |
|||
if self.journal_id: |
|||
invoice_vals['journal_id'] = self.journal_id.id |
|||
return invoice_vals |
|||
@ -1,30 +0,0 @@ |
|||
# -*- 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 |
|||
@ -1,84 +0,0 @@ |
|||
- |
|||
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" |
|||
|
|||
@ -0,0 +1,4 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
|||
|
|||
from . import test_contract_journal |
|||
@ -0,0 +1,52 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Copyright 2016 LasLabs Inc. |
|||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
|||
|
|||
from openerp.tests import common |
|||
|
|||
|
|||
class TestContractJournal(common.TransactionCase): |
|||
|
|||
def setUp(self): |
|||
super(TestContractJournal, self).setUp() |
|||
self.partner = self.env.ref('base.res_partner_2') |
|||
self.product = self.env.ref('product.product_product_2') |
|||
self.journal = self.env['account.journal'].search(limit=1) |
|||
self.product.description_sale = 'Test description sale' |
|||
self.contract = self.env['account.analytic.account'].create({ |
|||
'name': 'Test Contract', |
|||
'partner_id': self.partner.id, |
|||
'pricelist_id': self.partner.property_product_pricelist.id, |
|||
'recurring_invoices': True, |
|||
'date_start': '2016-02-15', |
|||
'recurring_next_date': '2016-02-29', |
|||
'journal_id': self.journal.id, |
|||
}) |
|||
|
|||
def test_prepare_invoice(self): |
|||
""" It should inject the journal into invoice vals """ |
|||
res = self.contract._prepare_invoice() |
|||
self.assertEqual(res['journal_id'], self.journal.id) |
|||
|
|||
def test_default_journal_company(self): |
|||
""" It should return journal of correct company """ |
|||
res = self.env['acount.analytic.account']._default_journal_id() |
|||
self.assertEqual(res.company_id, self.env.user.company_id) |
|||
|
|||
def test_default_journal_type(self): |
|||
""" It should return journal of correct type """ |
|||
res = self.env['acount.analytic.account']._default_journal_id() |
|||
self.assertEqual(res.type, 'sale') |
|||
|
|||
def test_default_journal_context(self): |
|||
""" It should return journal for correct company context """ |
|||
company = self.env['res.company'].create({'name': 'Test Inc.'}) |
|||
self.journal.write({ |
|||
'company_id': company.id, |
|||
'type': 'sale', |
|||
}) |
|||
Account = self.env['acount.analytic.account'].with_context( |
|||
company_id=company.id, |
|||
) |
|||
res = Account._default_journal_id() |
|||
self.assertEqual(res, self.journal) |
|||
@ -0,0 +1,40 @@ |
|||
<?xml version="1.0"?> |
|||
<odoo> |
|||
|
|||
<record id="account_analytic_account_journal_form" model="ir.ui.view"> |
|||
<field name="name">account.analytic.account.journal.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='template_id']" position="before"> |
|||
<field name="journal_id" /> |
|||
</xpath> |
|||
</field> |
|||
</record> |
|||
|
|||
<!-- Inherited Analytic Account list for contracts --> |
|||
<record id="view_account_analytic_account_journal_tree" model="ir.ui.view"> |
|||
<field name="name">account.analytic.account.journal.list</field> |
|||
<field name="model">account.analytic.account</field> |
|||
<field name="inherit_id" ref="account.view_account_analytic_account_list" /> |
|||
<field name="arch" type="xml"> |
|||
<field name="partner_id" position="before"> |
|||
<field name="journal_id" groups="account.group_account_user" /> |
|||
</field> |
|||
</field> |
|||
</record> |
|||
|
|||
<!-- Analytic Account search view for contract --> |
|||
<record id="view_account_analytic_account_journal_search" model="ir.ui.view"> |
|||
<field name="name">account.analytic.account.journal.search</field> |
|||
<field name="model">account.analytic.account</field> |
|||
<field name="inherit_id" |
|||
ref="account_analytic_analysis.view_account_analytic_account_overdue_search" /> |
|||
<field name="arch" type="xml"> |
|||
<field name="name" position="before"> |
|||
<field name="journal_id" /> |
|||
</field> |
|||
</field> |
|||
</record> |
|||
|
|||
</odoo> |
|||
@ -1,42 +0,0 @@ |
|||
<?xml version="1.0"?> |
|||
<openerp> |
|||
<data> |
|||
|
|||
<record id="account_analytic_account_journal_form" model="ir.ui.view"> |
|||
<field name="name">account.analytic.account.journal.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='template_id']" position="before"> |
|||
<field name="journal_id" /> |
|||
</xpath> |
|||
</field> |
|||
</record> |
|||
|
|||
<!-- Inherited Analytic Account list for contracts --> |
|||
<record id="view_account_analytic_account_journal_tree" model="ir.ui.view"> |
|||
<field name="name">account.analytic.account.journal.list</field> |
|||
<field name="model">account.analytic.account</field> |
|||
<field name="inherit_id" ref="account.view_account_analytic_account_list" /> |
|||
<field name="arch" type="xml"> |
|||
<field name="partner_id" position="before"> |
|||
<field name="journal_id" groups="account.group_account_user" /> |
|||
</field> |
|||
</field> |
|||
</record> |
|||
|
|||
<!-- Analytic Account search view for contract --> |
|||
<record id="view_account_analytic_account_journal_search" model="ir.ui.view"> |
|||
<field name="name">account.analytic.account.journal.search</field> |
|||
<field name="model">account.analytic.account</field> |
|||
<field name="inherit_id" |
|||
ref="account_analytic_analysis.view_account_analytic_account_overdue_search" /> |
|||
<field name="arch" type="xml"> |
|||
<field name="name" position="before"> |
|||
<field name="journal_id" /> |
|||
</field> |
|||
</field> |
|||
</record> |
|||
|
|||
</data> |
|||
</openerp> |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue