From aca76c7008091986b3371f6537887c6200305a19 Mon Sep 17 00:00:00 2001 From: "Alexandre Fayolle @ camptocamp" Date: Wed, 17 Oct 2012 12:29:21 +0200 Subject: [PATCH] [MRG] from 6.1 (lp:c2c-addons/6.1 rev 28.3.29) --- base_address_category/base_address.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/base_address_category/base_address.py b/base_address_category/base_address.py index 0247a456d..513b551fb 100644 --- a/base_address_category/base_address.py +++ b/base_address_category/base_address.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp), Joel Grand-Guillaume @@ -31,10 +31,6 @@ from osv import osv, fields -import time -from mx import DateTime -import netsvc -import string class ResPartnerAdressCategory(osv.osv): def name_get(self, cr, uid, ids, context={}): @@ -62,8 +58,8 @@ class ResPartnerAdressCategory(osv.osv): return False level -= 1 return True - - + + _description='Partner address Categories' _name = 'res.partner.address.category' @@ -81,15 +77,15 @@ class ResPartnerAdressCategory(osv.osv): 'active' : lambda *a: 1, } _order = 'parent_id,name' - + ResPartnerAdressCategory() class ResPartnerAddress(osv.osv): _inherit = "res.partner.address" - + _columns = { 'category_id': fields.many2many('res.partner.address.category', 'res_partner_address_category_rel', 'adress_id', 'category_id', 'Adress categories'), } -ResPartnerAddress() \ No newline at end of file +ResPartnerAddress()