mirror of
https://github.com/OCA/account-financial-tools.git
synced 2025-02-02 12:47:26 +02:00
Merge pull request #26 from acsone/7.0-imp-account-journal-period-close-ape
[IMP] account_journal_period_close: Better modularity and naming convention
This commit is contained in:
@@ -52,7 +52,7 @@ a given period, while leaving the miscellaneous journal open.
|
|||||||
From a technical standpoint, the module leverages the
|
From a technical standpoint, the module leverages the
|
||||||
account.journal.period model that is present in Odoo core.
|
account.journal.period model that is present in Odoo core.
|
||||||
""",
|
""",
|
||||||
"data": ['view/account_view.xml'],
|
"data": ['view/account_period_view.xml'],
|
||||||
"demo": [],
|
"demo": [],
|
||||||
"test": [],
|
"test": [],
|
||||||
"licence": "AGPL-3",
|
"licence": "AGPL-3",
|
||||||
|
|||||||
@@ -26,4 +26,5 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
from . import account
|
from . import account_journal_period
|
||||||
|
from . import account_period
|
||||||
|
|||||||
@@ -31,15 +31,7 @@ from openerp.osv import orm, fields
|
|||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
|
|
||||||
|
|
||||||
class account_period(orm.Model):
|
class AccountJournalPeriod(orm.Model):
|
||||||
_inherit = 'account.period'
|
|
||||||
_columns = {
|
|
||||||
'journal_period_ids': fields.one2many('account.journal.period',
|
|
||||||
'period_id', 'Journal states'),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class account_journal_period(orm.Model):
|
|
||||||
_inherit = 'account.journal.period'
|
_inherit = 'account.journal.period'
|
||||||
_order = "type,name"
|
_order = "type,name"
|
||||||
_columns = {
|
_columns = {
|
||||||
@@ -80,7 +72,7 @@ class account_journal_period(orm.Model):
|
|||||||
.browse(cr, uid, values['period_id'], context=context)
|
.browse(cr, uid, values['period_id'], context=context)
|
||||||
values.update({'name': (journal.code or journal.name)+':' +
|
values.update({'name': (journal.code or journal.name)+':' +
|
||||||
(period.name or '')}),
|
(period.name or '')}),
|
||||||
return super(account_journal_period, self).create(cr,
|
return super(AccountJournalPeriod, self).create(cr,
|
||||||
uid,
|
uid,
|
||||||
values,
|
values,
|
||||||
context=context)
|
context=context)
|
||||||
38
account_journal_period_close/model/account_period.py
Normal file
38
account_journal_period_close/model/account_period.py
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Authors: Adrien Peiffer
|
||||||
|
# Copyright (c) 2014 Acsone SA/NV (http://www.acsone.eu)
|
||||||
|
# All Rights Reserved
|
||||||
|
#
|
||||||
|
# WARNING: This program as such is intended to be used by professional
|
||||||
|
# programmers who take the whole responsibility of assessing all potential
|
||||||
|
# consequences resulting from its eventual inadequacies and bugs.
|
||||||
|
# End users who are looking for a ready-to-use solution with commercial
|
||||||
|
# guarantees and support are strongly advised to contact a Free Software
|
||||||
|
# Service Company.
|
||||||
|
#
|
||||||
|
# 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/>.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
from openerp.osv import orm, fields
|
||||||
|
|
||||||
|
|
||||||
|
class AccountPeriod(orm.Model):
|
||||||
|
_inherit = 'account.period'
|
||||||
|
_columns = {
|
||||||
|
'journal_period_ids': fields.one2many('account.journal.period',
|
||||||
|
'period_id', 'Journal states'),
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user