Merge branch 'master' of git+ssh://inspyration.org/~/OpenERP/cmmi

diff --git a/evolution.py b/evolution.py
index 9ceff4f..22759f0 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -8,6 +8,10 @@ from openerp.osv import osv, fields
 class Evolution(osv.Model):
     _name = "cmmi.evolution"
 
+    _domains = {
+        'human': [('is_company', '=', "False")],
+    }
+
     _priorites = [("incontournable", "Incontournable"),
                   ("necessaire", "Nécéssaire"),
                   ("utile", "Utile")]
@@ -38,6 +42,9 @@ class Evolution(osv.Model):
                                     string="Phase"),
         "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet"),
+        "demandeur": fields.many2one("cmmi.partner.teammember",
+                                     string="Demandeur",
+                                     domain=_domains['human']),
     }
 
 

diff --git a/partner.py b/partner.py
index e5277f2..8462dee 100644 (file)
--- a/partner.py
+++ b/partner.py
@@ -11,6 +11,9 @@ class Teammember(osv.Model):
     _inherit = "res.partner"
 
     _columns = {
+        "affectation": fields.integer(string="Affecté à"),
+        "depuis": fields.date(string="Depuis"),
+        "jusqua": fields.date(string="Jusqu'à"),
         "projets": fields.many2many("cmmi.projet",
                                     "cmmi_projet_teammember_rel",
                                     "partner_id",

diff --git a/views/projet.xml b/views/projet.xml
index ea74c46..4e19cf4 100644 (file)
--- a/views/projet.xml
+++ b/views/projet.xml
@@ -6,11 +6,10 @@
             <field name="name">projet.form</field>
             <field name="model">cmmi.projet</field>
             <field name="arch" type="xml">
-                <form string="Todolist Form" version="7.0">
+                <form string="Formulaire Projet" version="7.0">
                     <header />
 
                     <sheet>
-                        <label for="name" colspan="1" />
                         <field name="name" nolabel="1" />
                         <notebook colspan="4">
                             <page string="Projet">
@@ -47,7 +46,9 @@
                                 <field name="team_members" nolabel="1">
                                     <tree>
                                         <field name="name"/>
-                                        <field name="title"/>
+                                        <field name="affectation" />
+                                        <field name="depuis" />
+                                        <field name="jusqua" />
                                     </tree>
                                 </field>
                             </page>
@@ -114,6 +115,46 @@
                             <page string="Evolutions">
                                 <field name="evolutions">
                                     <tree>
+                                        <field name="name"/>
+                                        <field name="priorite" />
+                                        <field name="palier_id" />
+                                        <field name="chantier_id" />
+                                        <field name="statut" />
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+
+        <!--         VIEWS PHASE         -->
+
+        <record model="ir.ui.view" id="phase_form_view">
+            <field name="name">phase.form</field>
+            <field name="model">cmmi.phase</field>
+            <field name="arch" type="xml">
+                <form string="Formulaire phase" version="7.0">
+                    <header />
+
+                    <sheet>
+                        <field name="name" />
+                        <notebook colspan="4">
+
+                            <page string="Détails">
+                                <group colspan="4" col="1">
+                                    <field name="description" />
+                                    <field name="statut" colspan="2" />
+                                    <field name="type_phase_id" colspan="2" />
+                                    <field name="projet_id" colspan="2" />
+                                    <field name="palier_id" colspan="2" />
+                                </group>
+                            </page>
+                            <page string="Évolutions">
+                                <field name="evolutions">
+                                    <tree>
                                         <field name="name" />
                                         <field name="priorite" />
                                         <field name="palier_id" />
@@ -129,9 +170,41 @@
         </record>
 
 
-        <!--         VIEWS STRUCTURES         -->
+        <!--         VIEWS EVOLUTIONS         -->
 
+        <record model="ir.ui.view" id="evolution_form_view">
+            <field name="name">evolution.form</field>
+            <field name="model">cmmi.evolution</field>
+            <field name="arch" type="xml">
+                <form string="Formulaire évolution" version="7.0">
+                    <header />
 
+                    <sheet>
+                        <group colspan="4" col="3">
+                            <field name="name" colspan="3"/>
+                            <field name="pid" colspan="3"/>
+                            <field name="priorite" colspan="3"/>
+                            <field name="statut" colspan="3"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Détails">
+                                <group colspan="4" col="1">
+                                    <field name="demandeur" />
+                                    <field name="description" />
+                                    <field name="objectif" />
+                                    <field name="commentaire" />
+                                </group>
+                            </page>
+                            <page string="Charges">
+                                <field name="charges">
+                                    <field name="name" />
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
 
 
         <!--         ACTIONS         -->