diff --git a/addons/pos_sale/report/sale_report.py b/addons/pos_sale/report/sale_report.py index c525e3592b5..ad1c91da8f5 100644 --- a/addons/pos_sale/report/sale_report.py +++ b/addons/pos_sale/report/sale_report.py @@ -52,6 +52,7 @@ class SaleReport(models.Model): pos.name AS name, pos.date_order AS date, CASE WHEN pos.state = 'draft' THEN 'pos_draft' WHEN pos.state = 'done' THEN 'pos_done' else pos.state END AS state, + NULL as invoice_status, pos.partner_id AS partner_id, pos.user_id AS user_id, pos.company_id AS company_id, diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 91fb8fcf92a..a7a179ffb52 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -47,6 +47,13 @@ class SaleReport(models.Model): ('done', 'Sales Done'), ('cancel', 'Cancelled'), ], string='Status', readonly=True) + invoice_status = fields.Selection( + selection=[ + ('upselling', "Upselling Opportunity"), + ('invoiced', "Fully Invoiced"), + ('to invoice', "To Invoice"), + ('no', "Nothing to Invoice"), + ], string="Invoice Status", readonly=True) weight = fields.Float('Gross Weight', readonly=True) volume = fields.Float('Volume', readonly=True) @@ -95,6 +102,7 @@ class SaleReport(models.Model): s.name AS name, s.date_order AS date, s.state AS state, + s.invoice_status as invoice_status, s.partner_id AS partner_id, s.user_id AS user_id, s.company_id AS company_id, @@ -171,6 +179,7 @@ class SaleReport(models.Model): s.partner_id, s.user_id, s.state, + s.invoice_status, s.company_id, s.campaign_id, s.medium_id, diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml index 2300f7a4619..946c0cb6cf9 100644 --- a/addons/sale/report/sale_report_views.xml +++ b/addons/sale/report/sale_report_views.xml @@ -38,6 +38,7 @@ + @@ -58,6 +59,8 @@ + +