Merge branch 'feature/IMP_energy_selfconsumption_invoicing_energy_delivered'...
Merge branch 'feature/IMP_energy_selfconsumption_invoicing_energy_delivered' into 'feature/IMP_send_invoicing_reminder' # Conflicts: # energy_selfconsumption/__manifest__.py # energy_selfconsumption/models/contract.py # energy_selfconsumption/views/contract_views.xml # energy_selfconsumption/wizards/invoicing_wizard.py # energy_selfconsumption/wizards/invoicing_wizard_views.xml
No related branches found
No related tags found
This commit is part of merge request !246. Comments created here will be created in the context of that merge request.
Showing
- energy_selfconsumption/models/contract.py 37 additions, 0 deletionsenergy_selfconsumption/models/contract.py
- energy_selfconsumption/models/supply_point_assignation.py 1 addition, 1 deletionenergy_selfconsumption/models/supply_point_assignation.py
- energy_selfconsumption/views/contract_views.xml 14 additions, 1 deletionenergy_selfconsumption/views/contract_views.xml
- energy_selfconsumption/wizards/invoicing_wizard.py 78 additions, 1 deletionenergy_selfconsumption/wizards/invoicing_wizard.py
- energy_selfconsumption/wizards/invoicing_wizard_views.xml 14 additions, 6 deletionsenergy_selfconsumption/wizards/invoicing_wizard_views.xml
Please register or sign in to comment