Merge branch 'release-1.3' into develop

2012-05-15 22:48:56 +02:00
parent 231dfaa8a6 839444cc8a
commit 01febe1411
12 changed files with 113 additions and 13 deletions
--- a/src/IDF/Project.php
+++ b/src/IDF/Project.php
@@ -105,6 +105,8 @@ class IDF_Project extends Pluf_Model
                                  'type' => 'Pluf_DB_Field_Foreignkey',
                                  'model' => 'IDF_ProjectActivity',
                                  'blank' => true,
+                                  'is_null' => true,
+                                  'default' => null,
                                  'verbose' => __('current project activity'),
                                  ),
                            );