Remove account journal type

issue7451
review42171002
This commit is contained in:
Sergi Almacellas Abellana committed 2018-05-30 14:12:08 +02:00
1 parent ba7a13fa53
commit b287760e6a
6 files changed
+11 -101

No files matched your search

+2
View File
@@ -1,3 +1,5 @@
* Remove journal type
Version 4.8.0 - 2018-04-23
* Bug fixes (see mercurial logs for details)
* Use tax code line for tax reporting
-1
View File
@@ -42,7 +42,6 @@ def register():
Configuration,
ConfigurationDefaultAccount,
Period,
JournalType,
Journal,
JournalSequence,
JournalAccount,
+9 -18
View File
@@ -16,7 +16,7 @@ from trytond.tools.multivalue import migrate_property
from trytond.modules.company.model import (
CompanyMultiValueMixin, CompanyValueMixin)
__all__ = ['JournalType', 'Journal', 'JournalSequence', 'JournalAccount',
__all__ = ['Journal', 'JournalSequence', 'JournalAccount',
'JournalCashContext',
'JournalPeriod']
@@ -26,29 +26,20 @@ STATES = {
DEPENDS = ['state']
class JournalType(ModelSQL, ModelView):
'Journal Type'
__name__ = 'account.journal.type'
name = fields.Char('Name', size=None, required=True, translate=True)
code = fields.Char('Code', size=None, required=True)
@classmethod
def __setup__(cls):
super(JournalType, cls).__setup__()
t = cls.__table__()
cls._sql_constraints += [
('code_uniq', Unique(t, t.code), 'The code must be unique.'),
]
cls._order.insert(0, ('code', 'ASC'))
class Journal(
DeactivableMixin, ModelSQL, ModelView, CompanyMultiValueMixin):
'Journal'
__name__ = 'account.journal'
name = fields.Char('Name', size=None, required=True, translate=True)
code = fields.Char('Code', size=None)
type = fields.Selection('get_types', 'Type', required=True)
type = fields.Selection([
('general', "General"),
('revenue', "Revenue"),
('expense', "Expense"),
('cash', "Cash"),
('situation', "Situation"),
('write-off', "Write-Off"),
], 'Type', required=True)
sequence = fields.MultiValue(fields.Many2One(
'ir.sequence', "Sequence",
domain=[
-66
View File
@@ -5,72 +5,6 @@ this repository contains the full copyright notices and license terms. -->
<data>
<menuitem name="Journals" parent="menu_account_configuration"
id="menu_journal_configuration"/>
<record model="ir.ui.view" id="journal_type_form">
<field name="model">account.journal.type</field>
<field name="type">form</field>
<field name="name">journal_type_form</field>
</record>
<record model="ir.ui.view" id="journal_type_tree">
<field name="model">account.journal.type</field>
<field name="type">tree</field>
<field name="name">journal_type_tree</field>
</record>
<record model="ir.action.act_window" id="act_journal_type_form">
<field name="name">Journal Types</field>
<field name="res_model">account.journal.type</field>
</record>
<record model="ir.action.act_window.view" id="act_journal_type_form_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="journal_type_tree"/>
<field name="act_window" ref="act_journal_type_form"/>
</record>
<record model="ir.action.act_window.view" id="act_journal_type_form_view2">
<field name="sequence" eval="20"/>
<field name="view" ref="journal_type_form"/>
<field name="act_window" ref="act_journal_type_form"/>
</record>
<menuitem parent="menu_journal_configuration"
action="act_journal_type_form" id="menu_journal_type_form"/>
<record model="ir.model.access" id="access_journal_type">
<field name="model" search="[('model', '=', 'account.journal.type')]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_journal_type_account_admin">
<field name="model" search="[('model', '=', 'account.journal.type')]"/>
<field name="group" ref="group_account_admin"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="account.journal.type" id="journal_type_general">
<field name="name">General</field>
<field name="code">general</field>
</record>
<record model="account.journal.type" id="journal_type_revenue">
<field name="name">Revenue</field>
<field name="code">revenue</field>
</record>
<record model="account.journal.type" id="journal_type_expense">
<field name="name">Expense</field>
<field name="code">expense</field>
</record>
<record model="account.journal.type" id="journal_type_cash">
<field name="name">Cash</field>
<field name="code">cash</field>
</record>
<record model="account.journal.type" id="journal_type_situation">
<field name="name">Situation</field>
<field name="code">situation</field>
</record>
<record model="account.journal.type" id="journal_type_write_off">
<field name="name">Write-Off</field>
<field name="code">write-off</field>
</record>
<record model="ir.ui.view" id="journal_view_form">
<field name="model">account.journal</field>
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<form>
<label name="name"/>
<field name="name"/>
<label name="code"/>
<field name="code"/>
</form>
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<tree>
<field name="name"/>
<field name="code"/>
</tree>