tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix category import and states evaluation of address on partner form

Browse Source
This commit is contained in:
Cédric Krier
2008-02-17 17:30:02 +01:00
parent 0309df6988
commit 4adf484969
4 changed files with 68 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__init__.py
+5 -4
View File
@@ -26,7 +26,8 @@
#
##############################################################################
import partner
import state
import country
import address
from category import *
from partner import *
from country import *
from state import *
from address import *
category.py
+2 -2
View File
@@ -26,8 +26,8 @@ class Category(OSV):
}
_constraints = [
(check_recursion,
'Error ! You can not create recursive categories.', ['parent'])
('check_recursion',
'Error! You can not create recursive categories.', ['parent'])
]
def complete_name(self, cursor, user, obj_id, name, value, arg,
partner.py
+8 -8
View File
@@ -24,29 +24,29 @@ class Partner(OSV):
_columns = {
'name': fields.Char('Name', size=128, required=True, select=True,
states= STATES,),
states=STATES,),
'type': fields.Many2One("partner.partner.type", "Corp. Type",
states= STATES,),
states=STATES,),
'lang': fields.Many2One("ir.lang", 'Language',
states= STATES,),
states=STATES,),
'vat': fields.Char('VAT',size=32 ,help="Value Added Tax number",
states= STATES,),
states=STATES,),
'website': fields.Char('Website',size=64,
states= STATES,),
states=STATES,),
'addresses': fields.One2Many('partner.address', 'partner',
'Addresses',states= STATES,),
'Addresses',states=STATES,),
'categories': fields.Many2Many(
'partner.category', 'partner_category_rel',
'partner', 'category', 'Categories',
states= STATES,),
states=STATES,),
'active': fields.Boolean('Active'),
}
_defaults = {
'active': lambda *a: True,
}
_sql_constraints = [
('name_uniq', 'unique (name)',
'The name of the partner must be unique !')
]
Partner()
partner.xml
+53 -57
View File
@@ -27,40 +27,35 @@
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
<form string="Partner Addresses">
<form string="Partner Addresses" col="6">
<label name="partner"/>
<field name="partner"/>
<newline/>
<field name="partner" colspan="5"/>
<label name="name"/>
<field name="name"/>
<label name="type"/>
<field name="type"/>
<label name="active"/>
<field name="active" invisible="0"/>
<label name="street"/>
<field name="street"/>
<label name="streetbis"/>
<field name="streetbis"/>
<newline/>
<label name="zip"/>
<field name="zip"/>
<label name="city"/>
<field name="city"/>
<newline/>
<label name="country"/>
<field name="country" completion="1"/>
<label name="state"/>
<field name="state"/>
<newline/>
<label name="phone"/>
<field name="phone"/>
<label name="fax"/>
<field name="fax"/>
<newline/>
<label name="mobile"/>
<field name="mobile"/>
<label name="email"/>
<field name="email"/>
<label name="active"/>
<field name="active" invisible="0"/>
<field name="email" widget="email"/>
</form>
]]>
</field>
@@ -138,7 +133,7 @@
<field name="lang" select="2"/>
<field name="website"/>
<field name="vat" select="1"/>
<field name="active" select="2" invisible="1"/>
<field name="active" select="2"/>
</tree>
]]>
</field>
@@ -149,54 +144,55 @@
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
<form string="Partners" col="6">
<form string="Partners">
<label name="name"/>
<field name="name"/>
<notebook colspan="6">
<page string="General" col="6">
<field name="addresses" mode="form,tree" colspan="6">
<form string="Partner addresses" col="6">
<label name="name"/>
<field name="name" />
<label name="type"/>
<field name="type" />
<newline/>
<label name="street"/>
<field name="street" />
<label name="streetbis"/>
<field name="streetbis"/>
<label name="zip"/>
<field name="zip" />
<label name="city"/>
<field name="city" />
<label name="country"/>
<field name="country" completion="1"/>
<label name="state"/>
<field name="state" />
<label name="phone"/>
<field name="phone"/>
<label name="fax"/>
<field name="fax"/>
<label name="mobile"/>
<field name="mobile"/>
<label name="email"/>
<field name="email" widget="email" />
</form>
<tree string="Partner Addresses">
<field name="name" />
<field name="zip"/>
<field name="city"/>
<field name="country"/>
</tree>
</field>
<label name="lang"/>
<field name="lang" widget="selection"/>
<label name="active" invisible="0"/>
<field name="active"/>
<separator string="Categories" colspan="4"/>
<field name="categories" colspan="4" nolabel="1"/>
</page>
<notebook colspan="4">
<page string="General">
<field name="addresses" mode="form,tree" colspan="4">
<form string="Partner addresses" col="6">
<label name="name"/>
<field name="name"/>
<label name="type"/>
<field name="type"/>
<label name="active"/>
<field name="active" invisible="0"/>
<label name="street"/>
<field name="street"/>
<label name="streetbis"/>
<field name="streetbis"/>
<label name="zip"/>
<field name="zip"/>
<label name="city"/>
<field name="city"/>
<label name="country"/>
<field name="country" completion="1"/>
<label name="state"/>
<field name="state"/>
<label name="phone"/>
<field name="phone"/>
<label name="fax"/>
<field name="fax"/>
<label name="mobile"/>
<field name="mobile"/>
<label name="email"/>
<field name="email" widget="email"/>
</form>
<tree string="Partner Addresses">
<field name="name"/>
<field name="zip"/>
<field name="city"/>
<field name="country"/>
<field name="active" invisible="1"/>
</tree>
</field>
<label name="lang"/>
<field name="lang" widget="selection"/>
<label name="active"/>
<field name="active"/>
<separator string="Categories" colspan="4"/>
<field name="categories" colspan="4"/>
</page>
</notebook>
</form>
]]>