From: Emilie Zawadzki <zawadzki@ircam.fr>
Date: Wed, 11 Jan 2017 16:24:20 +0000 (+0100)
Subject: [Timesheet] : update network and project models
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d63cde98171daff5bfe61067832d34637ba24107;p=mezzo.git

[Timesheet] : update network and project models
---

diff --git a/app/organization/network/migrations/0082_merge.py b/app/organization/network/migrations/0082_merge.py
new file mode 100644
index 00000000..3242f2fd
--- /dev/null
+++ b/app/organization/network/migrations/0082_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-11 10:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0078_auto_20170105_1743'),
+        ('organization-network', '0081_auto_20170106_1645'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index fa2925cf..f8dcfcce 100644
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -149,7 +149,7 @@ class Organization(Named, Address, URL, AdminThumbRelatedMixin, Orderable):
             self.lat = lat
             self.lon = lon
 
-    def save(self):
+    def save(self, **kwargs):
         self.clean()
         super(Organization, self).save()
 
diff --git a/app/organization/projects/migrations/0041_merge.py b/app/organization/projects/migrations/0041_merge.py
new file mode 100644
index 00000000..f8cf456a
--- /dev/null
+++ b/app/organization/projects/migrations/0041_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-11 10:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0040_auto_20170105_1743'),
+        ('organization-projects', '0036_auto_20170106_1645'),
+    ]
+
+    operations = [
+    ]