diff --git a/controllers/main.py b/controllers/main.py index 39fc7f1581588e5804a3d7af7cfd9ddbc232e3ef..72ba92594ee39eb725de9136e20056a314aa33fc 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -233,9 +233,11 @@ class CustomerPortal(CustomerPortal): if ( request.env.user.commercial_partner_id.id not in operation.partner_role_ids.partner_id.ids + and not request.env.user.has_group("oacc.group_operation_superadmin") ): raise AccessError(_("You are not allowed to access this operation")) roles = self._get_role(operation) + except AccessError as e: raise werkzeug.exceptions.abort( werkzeug.wrappers.Response(status=401) diff --git a/tools/export_cdc.py b/tools/export_cdc.py index e41bb041ebd348f2d2fd8e8dd2d7284b406c2a4f..471dc06ec76d084b02a5b0a2be9a21d83d20ba0d 100644 --- a/tools/export_cdc.py +++ b/tools/export_cdc.py @@ -100,8 +100,6 @@ def make_cons_data(energy_dict): period.strftime("%d/%m/%Y %H:%M"), # consommation en kwh str(round(energy_dict[period]["cons"], rounding)), - # autocons - str(round(energy_dict[period]["autocons"], rounding)), # allocons str( round( @@ -110,6 +108,8 @@ def make_cons_data(energy_dict): rounding, ) ), + # autocons + str(round(energy_dict[period]["autocons"], rounding)), ] ) )