More changes and edits tariff names

Author: egarciadiaz

gestionatr/defs.py

@@ -41,9 +41,9 @@
            ('J', 'Jurídica')]
 
 
-TARIFES_SEMPRE_MAX = ['003', '011', '012', '013', '014', '015', '016', '017', '019', '020', '021', '022', '023', '024', '025']
-TARIFES_6_PERIODES = ['012', '013', '014', '015', '016', '017', '019', '020', '021', '022', '023', '024', '025']
-TARIFES_TD = ['018', '019', '020', '021', '022', '023', '024', '025']
+TARIFES_SEMPRE_MAX = ['003', '011', '012', '013', '014', '015', '016', '017', '019', '020', '021', '022', '023', '024', '025', '026', '027', '028', '029']
+TARIFES_6_PERIODES = ['012', '013', '014', '015', '016', '017', '019', '020', '021', '022', '023', '024', '025', '026', '027', '028', '029']
+TARIFES_TD = ['018', '019', '020', '021', '022', '023', '024', '025', '026', '027', '028', '029']
 
 # Data about R101 subtypes and their minimum fields
 SUBTYPES_R101 = [
@@ -830,9 +830,9 @@
     ('024', '3.0TDVE'),
     ('025', '6.1TDVE'),
     ('026', '6.2TDVE'),
-    ('027', '3.0 TDVE - Embarcaciones'),
-    ('028', '6.1 TDVE – Embarcaciones'),
-    ('029', '6.2 TDVE – Embarcaciones'),
+    ('027', '3.0TDVE - Embarcaciones'),
+    ('028', '6.1TDVE – Embarcaciones'),
+    ('029', '6.2TDVE – Embarcaciones'),
 ]
 
 TABLA_20 = [
@@ -2338,6 +2338,10 @@
     ('023',  u'6.4TD'),
     ('024',  u'3.0TDVE'),
     ('025',  u'6.1TDVE'),
+    ('026',  u'6.2TDVE'),
+    ('027',  u'3.0TDVE - Embarcaciones'),
+    ('028',  u'6.1TDVE – Embarcaciones'),
+    ('029',  u'6.2TDVE – Embarcaciones'),
 ]
 
 TABLA_108 = [('01', u'Mensual'),

gestionatr/helpers/funcions.py

@@ -159,5 +159,5 @@ def codi_dh(tarifa, nlectures=6):
         return '8'
     elif tarifa == '018':
         return '9'
-    elif tarifa in ('019', '020', '021', '022', '023', '024', '025'):
+    elif tarifa in ('019', '020', '021', '022', '023', '024', '025', '026', '027', '028', '029'):
         return 'A'

gestionatr/input/messages/F1.py

@@ -156,6 +156,38 @@
         'M': 6,
         'EP': 6,
     },
+    '026': {
+        'A': 6,
+        'S': 6,
+        'R': 6,
+        'RC': 6,
+        'M': 6,
+        'EP': 6,
+    },
+    '027': {
+        'A': 6,
+        'S': 6,
+        'R': 6,
+        'RC': 6,
+        'M': 6,
+        'EP': 6,
+    },
+    '028': {
+        'A': 6,
+        'S': 6,
+        'R': 6,
+        'RC': 6,
+        'M': 6,
+        'EP': 6,
+    },
+    '029': {
+        'A': 6,
+        'S': 6,
+        'R': 6,
+        'RC': 6,
+        'M': 6,
+        'EP': 6,
+    },
 }