diff --git a/reports/__manifest__.py b/reports/__manifest__.py index e6adafe..f7a3cc2 100644 --- a/reports/__manifest__.py +++ b/reports/__manifest__.py @@ -10,7 +10,11 @@ 'maintainer': '', 'website': "", 'depends': [ +<<<<<<< Updated upstream 'base','account', 'bi_professional_reports_templates' +======= + 'base','report', 'account', 'bi_professional_reports_templates' +>>>>>>> Stashed changes ], 'data': [ 'views/invoice_report.xml', diff --git a/reports/views/account_report.xml b/reports/views/account_report.xml index 7f4f3aa..e05922e 100644 --- a/reports/views/account_report.xml +++ b/reports/views/account_report.xml @@ -15,7 +15,7 @@ 3 0 - 30 + 35 90 -->