Merge branch 'fix_canvi_de_preus' into developer

gisce · Feb 6, 2012 · 26fc254 · 26fc254
2 parents 9e9faba + a983c7c
commit 26fc254
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/switching/messages/F1.py b/switching/messages/F1.py
@@ -190,13 +190,12 @@ def get_linies_factura(self):
     def get_info_activa(self):
         """Retornat els periodes d'energia"""
         periode = []
-        total = 0
-        ch = self.factura.EnergiaActiva.TerminoEnergiaActiva.getchildren()
-        p = 0
-        for i in ch:
-            if 'Periodo' in i.tag:
-                p += 1
-                periode.append(PeriodeActiva(i, 'P%d' % p))
+        for ea in self.factura.EnergiaActiva.getchildren():
+            p = 0
+            for i in ea.getchildren():
+                if 'Periodo' in i.tag:
+                    p += 1
+                    periode.append(PeriodeActiva(i, 'P%d' % p))
         total = float(self.factura.EnergiaActiva.ImporteTotalEnergiaActiva.text)
         return periode, total