From 4495114a4605c2f1fbe47e0aafce3b6a08d02e53 Mon Sep 17 00:00:00 2001
From: Alicia FLOREZ <alicflorez@gmail.com>
Date: Mon, 27 May 2013 11:48:02 +0200
Subject: [PATCH] Correction liasion projet - partner + vue teammember form
 (avec inherit)

---
 __openerp__.py        |    1 +
 partner.py            |    2 +-
 projet.py             |   16 +++++++++++++---
 views/team_member.xml |   24 ++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 views/team_member.xml

diff --git a/__openerp__.py b/__openerp__.py
index d1f97f2..442b1e3 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -16,6 +16,7 @@
         'views/phase.xml',
         'views/chantier.xml',
         'views/palier.xml',
+        'views/team_member.xml',
         # Menus
         'views/menu.xml',
         # Données
diff --git a/partner.py b/partner.py
index 9ceb6e5..a19cff5 100644
--- a/partner.py
+++ b/partner.py
@@ -11,7 +11,7 @@ class Teammember(osv.Model):
     _inherit = "res.partner"
 
     _columns = {
-        "projets": fields.many2many("cmmi.projet.teammember",
+        "projets": fields.one2many("cmmi.projet.teammember",
                                     "partner_id",
                                     string="Projets"),
         "charges": fields.one2many("cmmi.projet",
diff --git a/projet.py b/projet.py
index d9c4182..611c422 100644
--- a/projet.py
+++ b/projet.py
@@ -334,17 +334,27 @@ class ProjetPhase(osv.Model):
 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))])
 
+    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 = {
-        "name": fields.function(_get_name,
+        "name": fields.function(_get_partner_name,
                                 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'à"),
diff --git a/views/team_member.xml b/views/team_member.xml
new file mode 100644
index 0000000..d879851
--- /dev/null
+++ b/views/team_member.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <!--         FORM VIEW -->
+
+        <record model="ir.ui.view" id="teammember_form_view">
+            <field name="name">partner.form.inherit</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="model">res.partner</field>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Projets">
+                        <field name="projets">
+                            <tree>
+                                <field name="projet_name" />
+                            </tree>
+                        </field>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
-- 
1.7.10.4