Feature/variable hourly dist table
Compare changes
- emanuel buzey authored
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -9,6 +9,10 @@ import werkzeug
@@ -9,6 +9,10 @@ import werkzeug
@@ -36,7 +40,7 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -36,7 +40,7 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -45,19 +49,48 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -45,19 +49,48 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -97,9 +130,110 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -97,9 +130,110 @@ class DistributionTableImportWizard(models.TransientModel):