diff --git a/__init__.py b/__init__.py index 9b038f222f..fa5ea5ede3 100644 --- a/__init__.py +++ b/__init__.py @@ -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 * diff --git a/category.py b/category.py index a4b642fa13..69f1b735e6 100644 --- a/category.py +++ b/category.py @@ -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, diff --git a/partner.py b/partner.py index cb600faa2c..cc451f6d90 100644 --- a/partner.py +++ b/partner.py @@ -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() diff --git a/partner.xml b/partner.xml index b5d8608da0..22c8e29892 100644 --- a/partner.xml +++ b/partner.xml @@ -27,40 +27,35 @@ form +