Merge branch 'master' into feature/GSYE-719

gridsingularity · Dec 30, 2024 · e8b9312 · e8b9312
2 parents af45dd0 + 3a264f9
commit e8b9312
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/gsy_framework/community_datasheet/row_converters.py b/gsy_framework/community_datasheet/row_converters.py
@@ -44,6 +44,8 @@
     "Enable electricity tax": "enable_electricity_tax",
     "Enable fixed monthly fee": "enable_fixed_monthly_fee",
     "Enable marketplace monthly fee": "enable_marketplace_monthly_fee",
+    "Enable electricity tax": "enable_electricity_tax",
+    "Enable fixed monthly fee": "enable_fixed_monthly_fee",
     "Enable assistance monthly fee": "enable_assistance_monthly_fee",
     "Enable service monthly fee": "enable_service_monthly_fee",
     "Enable contracted power monthly fee": "enable_contracted_power_monthly_fee",

diff --git a/tests/test_community_datasheet/test_community_datasheet_parser.py b/tests/test_community_datasheet/test_community_datasheet_parser.py
@@ -537,6 +537,8 @@ def test_parse(_uuid_mock, asset_coordinates_builder_cls_mock):
             "enable_grid_export_fee_const": False,
             "enable_grid_import_fee_const": False,
             "enable_marketplace_monthly_fee": False,
+            "enable_electricity_tax": False,
+            "enable_fixed_monthly_fee": False,
             "enable_service_monthly_fee": False,
             "enable_taxes_surcharges": False,
         }