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