Skip to content
Snippets Groups Projects
Commit 837140c9 authored by Daniil Digtyar Vasilieva's avatar Daniil Digtyar Vasilieva :call_me:
Browse files

Merge branch 'feature/IMP_energy_project_adding_reseller_supplier_model' into... 

Merge branch 'feature/IMP_energy_project_adding_reseller_supplier_model' into 'feature/IMP_selfconsumption_reseller_model'

# Conflicts:
#   energy_project/__manifest__.py
#   energy_project/models/__init__.py
#   energy_project/security/ir.model.access.csv
#   energy_project/tests/__init__.py
#   energy_selfconsumption/views/supply_point_views.xml
parents 2fa3de27 efd21c66
No related branches found
No related tags found
Checking pipeline status
This commit is part of merge request !205. Comments created here will be created in the context of that merge request.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 695 additions and 26 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment