projects
/
OpenERP
/
cmmi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction liasion projet - partner + vue teammember form (avec inherit)
[OpenERP/cmmi.git]
/
projet.py
diff --git
a/projet.py
b/projet.py
index
d9c4182
..
611c422
100644
(file)
--- a/
projet.py
+++ b/
projet.py
@@
-334,17
+334,27
@@
class ProjetPhase(osv.Model):
class ProjetTeammember(osv.Model):
_name = "cmmi.projet.teammember"
class ProjetTeammember(osv.Model):
_name = "cmmi.projet.teammember"
- def _get_name(self, cr, uid, ids, field_name=None, arg=None, context=None):
+ def _get_partner_name(self, cr, uid, ids, field_name=None, arg=None, context=None):
if isinstance(ids, (int, long)):
ids = [ids]
return dict([(i, r.partner_id.name) for i, r in
zip(ids, self.browse(cr, uid, ids, context=context))])
if isinstance(ids, (int, long)):
ids = [ids]
return dict([(i, r.partner_id.name) for i, r in
zip(ids, self.browse(cr, uid, ids, context=context))])
+ def _get_project_name(self, cr, uid, ids, field_name=None, arg=None, context=None):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ return dict([(i, r.projet_id.name) for i, r in
+ zip(ids, self.browse(cr, uid, ids, context=context))])
+
_columns = {
_columns = {
- "name": fields.function(_get_name,
+ "name": fields.function(_get_partner_name,
type='char',
store=True,
type='char',
store=True,
- string="Nom de la phase"),
+ string="Nom du partner"),
+ "projet_name": fields.function(_get_project_name,
+ type='char',
+ store=True,
+ string="Nom du projet"),
"affecte": fields.integer(string="Affecté à"),
"depuis": fields.date(string="Depuis"),
"jusqua": fields.date(string="Jusqu'à"),
"affecte": fields.integer(string="Affecté à"),
"depuis": fields.date(string="Depuis"),
"jusqua": fields.date(string="Jusqu'à"),