diff --git a/extra-addons/sales/controllers/controller.py b/extra-addons/sales/controllers/controller.py index fd865e83cf386af941025a0c17ed0b5929f908e9..aa3afbea8c5636435ec1f78d0b6a7cee9f969eeb 100644 --- a/extra-addons/sales/controllers/controller.py +++ b/extra-addons/sales/controllers/controller.py @@ -45,6 +45,8 @@ class ChartData(http.Controller): @http.route('/sale/chart/data/line', type='http', auth='user') def line(self, **kw): res = {'labels': [], 'datasets': []} + if not http.request.env['res.users'].browse(http.request.uid).has_group('sales.sales_info_group_manager'): + return json.dumps(res) search_domain = [] if kw.get('sale_order') and kw.get('quotation'): @@ -61,6 +63,9 @@ class ChartData(http.Controller): return json.dumps(res) quotations = http.request.env['sale.order'].search(search_domain) + if not quotations: + return json.dumps(res) + min_date = min([q.date_order for q in quotations]) max_date = max([q.date_order for q in quotations]) current_date = min_date diff --git a/extra-addons/sales/models/__init__.py b/extra-addons/sales/models/__init__.py index 8d8de5f0a36012023991a59353fe856e32dbfb8b..8a6f277af29716d128d10078ed323d62c2e429ce 100644 --- a/extra-addons/sales/models/__init__.py +++ b/extra-addons/sales/models/__init__.py @@ -4,4 +4,3 @@ from . import inquiry_model from . import sale_order_model from . import sale_order_line_model -from . import report_chart_model diff --git a/extra-addons/sales/models/report_chart_model.py b/extra-addons/sales/models/report_chart_model.py deleted file mode 100644 index 55405d8c100a35916ddd71407ec2fc97ba110f97..0000000000000000000000000000000000000000 --- a/extra-addons/sales/models/report_chart_model.py +++ /dev/null @@ -1,15 +0,0 @@ -from odoo import models, fields - -class View(models.Model): - _inherit = 'ir.ui.view' - type = fields.Selection(selection_add=[('sale_report_chart', 'Sale Report Chart')]) - -class ActWindowView(models.Model): - _inherit = 'ir.actions.act_window.view' - view_mode = fields.Selection(selection_add=[('sale_report_chart', 'Sale Report Chart')], ondelete={'sale_report_chart': 'cascade'}) - -class ReportChart(models.Model): - _name = 'sale.report.chart' - _description = 'Sale Report Chart' - - name = fields.Char(string='Name', required=True) diff --git a/extra-addons/sales/static/src/js/sale_report_chart.js b/extra-addons/sales/static/src/js/sale_report_chart.js index 7a49b6abcd764c21bf9ee3442ba6ed877907db15..05c8a13e775d339989f63f7ee18777e1719f8b1a 100644 --- a/extra-addons/sales/static/src/js/sale_report_chart.js +++ b/extra-addons/sales/static/src/js/sale_report_chart.js @@ -28,14 +28,11 @@ async function showNewChart() { updateChart(); }); const autocolors = window["chartjs-plugin-autocolors"]; - console.log(location.href); - console.log(canvas); if (canvas) { const res = await fetch( `/sale/chart/data/line?${$("#chartFilter").serialize()}` ); const data = await res.json(); - console.log(data.labels); chart = new Chart(canvas, { type: "line", data: { diff --git a/extra-addons/sales/views/report_chart.xml b/extra-addons/sales/views/report_chart.xml index 3c0372cdbdeaad3b1b861413781f1b18106752a9..3ca022aa9cf4e4a76cef6d3f54973098cf8edd4f 100644 --- a/extra-addons/sales/views/report_chart.xml +++ b/extra-addons/sales/views/report_chart.xml @@ -9,5 +9,6 @@ name="�㬢�⏚�����" parent="sale.sale_menu_root" action="sale_report_chart_action" + groups="sales_info_group_manager" sequence="5"/> </odoo> \ No newline at end of file