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

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..5392440
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.project
+.pydevproject
+.settings
+*.pyc

diff --git a/__init__.py b/__init__.py
index 01cb177..00d905e 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -6,4 +6,6 @@ import partner
 import projet
 import evolution
 
-import wizards.domaine
\ No newline at end of file
+import wizards.domaine
+import wizards.moa
+import wizards.moe
\ No newline at end of file

diff --git a/__openerp__.py b/__openerp__.py
index e97bfef..212d68d 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -8,8 +8,8 @@
     "data": [
         # Vues associées aux assistants
         'views/wizards/domaine.xml',
-        #'views/wizards/moe.xml',
-        #'views/wizards/moa.xml',
+        'views/wizards/moe.xml',
+        'views/wizards/moa.xml',
         # Vues associées aux modèles
         'views/projet.xml',
         'views/evolution.xml',

diff --git a/wizards/domaine.py b/wizards/domaine.py
index 2304a2e..29b5c5d 100644 (file)
--- a/wizards/domaine.py
+++ b/wizards/domaine.py
@@ -117,8 +117,10 @@ class ProjetDomaineWizard(osv.TransientModel):
     _columns = {
         "main": fields.boolean(string="Domaine principal ?"),
         "project_id": fields.many2one("cmmi.projet",
-                                      string="Projet"),
+                                      string="Projet",
+                                      required=True),
         "domaine_id": fields.selection(_domaines_selection,
-                                      string="Domaine"),
+                                       string="Domaine",
+                                       required=True),
     }
 

diff --git a/wizards/moa.py b/wizards/moa.py
index 68b8ce3..28232a5 100644 (file)
--- a/wizards/moa.py
+++ b/wizards/moa.py
@@ -108,7 +108,9 @@ class ProjetMoaWizard(osv.TransientModel):
     _columns = {
         "main": fields.boolean(string="MOA principale ?"),
         "project_id": fields.many2one("cmmi.projet",
-                                      string="Projet"),
+                                      string="Projet",
+                                      required=True),
         "moa_id": fields.selection(_moas_selection,
-                                      string="moa"),
+                                   string="moa",
+                                   required=True),
     }
\ No newline at end of file

diff --git a/wizards/moe.py b/wizards/moe.py
index 1509b1c..37399bc 100644 (file)
--- a/wizards/moe.py
+++ b/wizards/moe.py
@@ -108,7 +108,9 @@ class ProjetMoeWizard(osv.TransientModel):
     _columns = {
         "main": fields.boolean(string="MOE principale ?"),
         "project_id": fields.many2one("cmmi.projet",
-                                      string="Projet"),
+                                      string="Projet",
+                                      required=True),
         "moe_id": fields.selection(_moes_selection,
-                                      string="MOE"),
+                                   string="MOE",
+                                   required=True),
     }
\ No newline at end of file