Remove group_name and view_load on Property field

This commit is contained in:
Cédric Krier
2008-10-27 13:17:41 +01:00
parent 1ff9be89fe
commit 45fc3f7d42
2 changed files with 16 additions and 12 deletions
+2 -6
View File
@@ -9,14 +9,12 @@ class Category(OSV):
account_expense = fields.Property(type='many2one',
relation='account.account', string='Account Expense',
group_name='Accounting Properties', view_load=True,
domain="[('kind', '=', 'expense'), ('company', '=', company)]",
states={
'invisible': "not company",
})
account_revenue = fields.Property(type='many2one',
relation='account.account', string='Account Revenue',
group_name='Accounting Properties', view_load=True,
domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
states={
'invisible': "not company",
@@ -35,16 +33,14 @@ class Template(OSV):
_name = 'product.template'
account_expense = fields.Property(type='many2one',
string='Account Expense', group_name='Accounting Properties',
view_load=True, relation='account.account',
string='Account Expense', relation='account.account',
domain="[('kind', '=', 'expense'), ('company', '=', company)]",
states={
'invisible': "not company",
}, help='This account will be used instead of the one defined ' \
'on the category.')
account_revenue = fields.Property(type='many2one',
string='Account Revenue', group_name='Accounting Properties',
view_load=True, relation='account.account',
string='Account Revenue', relation='account.account',
domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
states={
'invisible': "not company",
+14 -6
View File
@@ -11,9 +11,13 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<data>
<xpath
expr="/form/notebook/page[@string=&quot;Properties&quot;]"
position="before">
<page string="Taxes" col="4">
expr="/form/notebook/page[@string=&quot;Childs&quot;]"
position="after">
<page string="Accounting" col="4">
<label name="account_revenue"/>
<field name="account_revenue"/>
<label name="account_expense"/>
<field name="account_expense"/>
<separator name="customer_taxes" colspan="4"/>
<field name="customer_taxes" colspan="4"/>
<separator name="supplier_taxes" colspan="4"/>
@@ -32,9 +36,13 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<data>
<xpath
expr="/form/notebook/page[@string=&quot;Properties&quot;]"
position="before">
<page string="Taxes" col="4">
expr="/form/notebook/page[@string=&quot;General&quot;]"
position="after">
<page string="Accounting" col="4">
<label name="account_revenue"/>
<field name="account_revenue"/>
<label name="account_expense"/>
<field name="account_expense"/>
<label name="taxes_category"/>
<field name="taxes_category"/>
<separator name="customer_taxes" colspan="4"/>