# -*- encoding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2007 TINY SPRL. (http://tiny.be) All Rights Reserved.
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# $Id$
#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
'title': fields.selection(_title_get, 'Title'),
'website':fields.char('Website',size=120),
'lang_id':fields.many2one('res.lang','Language'),
- 'job_ids':fields.one2many('res.partner.job','contact_id','Functions'),
+ 'job_ids':fields.one2many('res.partner.job','contact_id','Functions and Addresses'),
'country_id':fields.many2one('res.country','Nationality'),
'birthdate':fields.date('Birth Date'),
'active' : fields.boolean('Active'),
+ 'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
+ 'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Job'),
}
_defaults = {
'active' : lambda *a: True,
if not len(ids):
return []
res = []
- for r in self.read(cr, user, ids, ['name','first_name']):
- addr = str(r['name'] or '')
+ for r in self.read(cr, user, ids, ['name','first_name','title']):
+ addr = r['title'] and str(r['title'])+" " or ''
+ addr +=str(r['name'] or '')
if r['name'] and r['first_name']:
addr += ' '
addr += str(r['first_name'] or '')
_name = 'res.partner.address'
_inherit='res.partner.address'
- _description ='Partner Contact'
+ _description ='Partner Address'
_columns = {
'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
+ 'email': fields.related('job_ids', 'email', type='char', string='Default Email'),
}
res_partner_address()
class res_partner_job(osv.osv):
- def _get_partner_name(self, cr, uid, ids, *a):
- res={}
- for id in self.browse(cr, uid, ids):
- res[id.id] = id.address_id.partner_id.id
+ def name_get(self, cr, uid, ids, context={}):
+ if not len(ids):
+ return []
+ res = []
+ for r in self.browse(cr, uid, ids):
+ res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, [r.contact_id.id])[0][1] +", "+ r.function_id.name))
return res
+ def search(self, cr, user, args, offset=0, limit=None, order=None,
+ context=None, count=False):
+ for arg in args:
+ if arg[0]=='address_id':
+ self._order = 'sequence_partner'
+ if arg[0]=='contact_id':
+ self._order = 'sequence_contact'
+ return super(res_partner_job,self).search(cr, user, args, offset, limit, order, context, count)
+
_name = 'res.partner.job'
- _description ='Contact Function'
+ _description ='Contact Job Title'
_order = 'sequence_contact'
_columns = {
- 'name': fields.function(_get_partner_name, method=True, type='many2one', relation='res.partner', string='Partner'),
+ 'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
'address_id':fields.many2one('res.partner.address','Address', required=True),
'contact_id':fields.many2one('res.partner.contact','Contact', required=True),
- 'function_id': fields.many2one('res.partner.function','Function', required=True),
+ 'function_id': fields.many2one('res.partner.function','Job Title', required=True),
'sequence_contact':fields.integer('Sequence (Contact)',help='order of importance of this address in the list of addresses of the linked contact'),
- 'sequence_partner':fields.integer('Sequence (Partner)',help='order of importance of this function in the list of functions of the linked partner'),
+ 'sequence_partner':fields.integer('Sequence (Partner)',help='order of importance of this job title in the list of job title of the linked partner'),
'email': fields.char('E-Mail', size=240),
'phone': fields.char('Phone', size=64),
+ 'date_start' : fields.date('Date Start'),
+ 'date_stop' : fields.date('Date Stop'),
+ 'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True),
}
_defaults = {
'sequence_contact' : lambda *a: 0,
+ 'state' : lambda *a: 'current',
}
res_partner_job()
projects / odoo / odoo.git / blobdiff