Deleted account.payment.journal.type model and changed type field of account.payment.journal in consequence.

This commit is contained in:
jmartin 2013-05-03 17:38:48 +02:00
parent 4080fcbbb7
commit 045e0b44bb
3 changed files with 2 additions and 71 deletions

View File

@ -7,7 +7,6 @@ from .account_payment import *
def register():
Pool.register(
AccountPaymentJournalType,
AccountPaymentJournal,
AccountPayment,
Line,

View File

@ -7,7 +7,7 @@ from trytond.pool import Pool, PoolMeta
from trytond.pyson import Eval, If, Equal
from trytond.transaction import Transaction
__all__ = [
'AccountPaymentJournalType',
# 'AccountPaymentJournalType',
'AccountPaymentJournal',
'AccountPayment',
'Line',
@ -18,14 +18,6 @@ _STATES = {
}
class AccountPaymentJournalType(ModelSQL, ModelView):
'Account Payment Journal Type'
__name__ = 'account.payment.journal.type'
code = fields.Char('Code', required=True, select=True)
name = fields.Char('Name', required=True, select=True, translate=True)
class AccountPaymentJournal(ModelSQL, ModelView):
'Account Payment Journal'
__name__ = 'account.payment.journal'
@ -35,14 +27,7 @@ class AccountPaymentJournal(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
select=True, readonly=True)
journal = fields.Many2One('account.journal', 'Journal', required=True)
type = fields.Selection('get_types', 'Type', required=True)
@staticmethod
def get_types():
Type = Pool().get('account.payment.journal.type')
types = Type.search([])
values = [(x.code, x.name) for x in types]
return values
type = fields.Selection([], 'Type of payment file', required=False)
@staticmethod
def default_active():

View File

@ -10,59 +10,6 @@ copyright notices and license terms. -->
<menuitem name="Payment" parent="account.menu_account"
id="menu_account_payment" sequence="55"/>
<!-- account.payment.journal.type -->
<record model="ir.ui.view" id="account_payment_journal_type_view_form">
<field name="model">account.payment.journal.type</field>
<field name="type">form</field>
<field name="name">account_payment_journal_type_form</field>
</record>
<record model="ir.ui.view" id="account_payment_journal_type_view_tree">
<field name="model">account.payment.journal.type</field>
<field name="type">tree</field>
<field name="name">account_payment_journal_type_tree</field>
</record>
<!-- Actions / Menu -->
<record model="ir.action.act_window"
id="act_window_account_payment_journal_type">
<field name="name">Payment Journal Types</field>
<field name="res_model">account.payment.journal.type</field>
</record>
<record model="ir.action.act_window.view"
id="act_window_account_payment_journal_type_tree">
<field name="sequence" eval="10"/>
<field name="view" ref="account_payment_journal_type_view_tree"/>
<field name="act_window" ref="act_window_account_payment_journal_type"/>
</record>
<record model="ir.action.act_window.view"
id="act_window_account_payment_journal_type_form">
<field name="sequence" eval="20"/>
<field name="view" ref="account_payment_journal_type_view_form"/>
<field name="act_window" ref="act_window_account_payment_journal_type"/>
</record>
<menuitem
id="menu_account_payment_journal_type_form"
parent="menu_account_payment_configuration"
action="act_window_account_payment_journal_type"/>
<!-- Access -->
<record model="ir.model.access" id="access_account_payment_journal_type">
<field name="model" search="[('model', '=', 'account.payment.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_account_payment_journal_type_admin">
<field name="model" search="[('model', '=', 'account.payment.journal.type')]"/>
<field name="group" ref="account.group_account"/>
<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>
<!-- account.payment.journal -->
<record model="ir.ui.view" id="account_payment_journal_view_form">
<field name="model">account.payment.journal</field>