From 81d5cd02e3a92a14bdaec987a42501a6585855f2 Mon Sep 17 00:00:00 2001
From: VictorFabreF <victorfabre@me.com>
Date: Thu, 26 Jul 2018 15:58:05 -0300
Subject: [PATCH] Fix #2090

---
 sapl/norma/views.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sapl/norma/views.py b/sapl/norma/views.py
index 9c98e783e..9da8f24bc 100644
--- a/sapl/norma/views.py
+++ b/sapl/norma/views.py
@@ -201,15 +201,17 @@ def recuperar_norma(request):
 def recuperar_numero_norma(request):
     tipo = TipoNormaJuridica.objects.get(pk=request.GET['tipo'])
     ano = request.GET.get('ano', '')
-
     param = {'tipo': tipo}
     param['ano'] = ano if ano else timezone.now().year
-    norma = NormaJuridica.objects.filter(**param).extra(
-            {'numero_id': "CAST(numero as INTEGER)"}).order_by(
-            'tipo', 'ano','numero_id').values_list('numero', 'ano').last()
+    norma = NormaJuridica.objects.filter(**param).order_by(
+            'tipo', 'ano').values_list('numero', 'ano').last()
     if norma:
-        response = JsonResponse({'numero': int(norma[0]) + 1,
+        try:
+            response = JsonResponse({'numero': int(norma[0]) + 1,
                                  'ano': norma[1]})
+        except ValueError:
+            response = JsonResponse({'numero': int(norma[0][0:-1]) + 1,
+                                     'ano': norma[1]})
     else:
         response = JsonResponse(
             {'numero': 1, 'ano': ano})