Merge pull request #245 from gisce/imp_b10_consums2

FIx sempre
gisce · Feb 8, 2024 · a21e4df · a21e4df
2 parents 3e1c242 + 77d2a80
commit a21e4df
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/gestionatr/input/messages/B70.py b/gestionatr/input/messages/B70.py
@@ -1398,13 +1398,8 @@ def get_lectures_info(self):
                     if not factor_ultima_lectura and self.meters[-1].factorconver:
                         factor_ultima_lectura = float(self.meters[-1].factorconver)
                     if factor_ultima_lectura:
-                        consum_calculat_segons_factor_ultim = round(vals['consum_m3'] * factor_ultima_lectura, 3)
-                        if consum_calculat_segons_factor_ultim == consum_kwh_facturat:
-                            vals['factor_k'] = consum_kwh_facturat / (vals['consum_m3'] * vals['pcs'])
-                            vals['consum'] = consum_kwh_facturat
-                        elif round(consum_calculat_segons_factor_ultim, 0) == consum_kwh_facturat:
-                            vals['factor_k'] = consum_kwh_facturat / (vals['consum_m3'] * vals['pcs'])
-                            vals['consum'] = consum_kwh_facturat
+                        vals['factor_k'] = consum_kwh_facturat / (vals['consum_m3'] * vals['pcs'])
+                        vals['consum'] = consum_kwh_facturat
                 res.append(vals)
         return res