From 88c2fb612a77929e8790a5863d96ef01e8189134 Mon Sep 17 00:00:00 2001
From: "Starlone (Estagiario)" <starlone>
Date: Thu, 9 Jun 2011 15:08:14 +0000
Subject: [PATCH] Adicionando datas sem assinatura em convenio (admin e models)

---
 sigi/apps/convenios/admin.py  |  3 +++
 sigi/apps/convenios/models.py | 12 ++++++++++++
 sigi/settings.py              | 10 +++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/sigi/apps/convenios/admin.py b/sigi/apps/convenios/admin.py
index f0ef6d6..bc10725 100644
--- a/sigi/apps/convenios/admin.py
+++ b/sigi/apps/convenios/admin.py
@@ -39,6 +39,9 @@ class ConvenioAdmin(admin.ModelAdmin):
                         'data_termo_aceite', 'data_pub_diario',
                         'data_devolucao_via', 'data_postagem_correio')}
         ),
+	('Datas - Convenio sem assinatura',
+	    {'fields': ('data_devolucao_sem_assinatura','data_retorno_sem_assinatura',)}
+	),
     )
     actions = ['adicionar_convenios']
     inlines = (AnexosInline, EquipamentoPrevistoInline)
diff --git a/sigi/apps/convenios/models.py b/sigi/apps/convenios/models.py
index 8c1193d..cdcfa5e 100644
--- a/sigi/apps/convenios/models.py
+++ b/sigi/apps/convenios/models.py
@@ -67,6 +67,18 @@ class Convenio(models.Model):
         null=True,
         blank=True,
     )
+    data_devolucao_sem_assinatura = models.DateField(
+        'data de devolução por falta de assinatura',
+	null=True,
+	blank=True,
+	help_text=u'Data de devolução por falta de assinatura',
+    )
+    data_retorno_sem_assinatura = models.DateField(
+	'data do retorno sem assinatura',
+	null=True,
+	blank=True,
+	help_text=u'Data do retorno do convênio sem assinatura',
+    )
     observacao = models.CharField(
         null=True, 
         blank=True,
diff --git a/sigi/settings.py b/sigi/settings.py
index f3a6328..1e970e6 100644
--- a/sigi/settings.py
+++ b/sigi/settings.py
@@ -23,13 +23,13 @@ DEFAULT_FROM_EMAIL = 'noreply@localhost'
 
 INTERNAL_IPS = ('127.0.0.1',)
 
-#DATABASE_ENGINE = 'postgresql_psycopg2'
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = '../sigi.db'
+DATABASE_ENGINE = 'postgresql_psycopg2'
+#DATABASE_ENGINE = 'sqlite3'
+DATABASE_NAME = 'sigi'
 DATABASE_USER = 'administrador'
 DATABASE_PASSWORD = 'interlegis' 
-#DATABASE_HOST = '10.1.10.102'
-#DATABASE_PORT = '5432'          
+DATABASE_HOST = '10.1.10.44'
+DATABASE_PORT = '5432'          
 
 TIME_ZONE = 'Brazil/East'
 LANGUAGE_CODE = 'pt-br'