Merge branch '2.0-fixed' into 2.0

# Conflicts:
#	mis_builder_expimp/wizards/mis_builder_import_wizard.py
This commit is contained in:
Renzo Meister 2021-12-14 11:45:23 +01:00
commit 9918697d8d

View File

@ -73,6 +73,10 @@ class MisBuilderImportWizard(models.TransientModel):
for expr in kpi['expression_ids']: for expr in kpi['expression_ids']:
del expr['extid'] del expr['extid']
for kpi in report_values['subkpi_ids']:
del kpi['extid']
for expr in kpi['expression_ids']:
del expr['extid']
report_values['move_lines_source'] = self.env['ir.model'].search([('model', '=', report_values['move_lines_source'])]).id report_values['move_lines_source'] = self.env['ir.model'].search([('model', '=', report_values['move_lines_source'])]).id
return report_values return report_values