diff options
| author | Parth Choksi <pch@odoo.com> | 2019-01-23 12:30:55 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-02-07 04:36:18 +0000 |
| commit | aa07f73d6da8ca28f9f65a6874a1c32de6a4fea6 (patch) | |
| tree | 8c2561143bc7f13f86beb50253914c8b585a8bcb | |
| parent | 2bba2e1a20c5a71e5ed5b5af7a68c7205e5c476f (diff) | |
[IMP] sale, pos_sale: Add industry in sales reporting
New reading level in the sales reporting : Customer Industry
Task ID: 1922025
closes odoo/odoo#30495
| -rw-r--r-- | addons/pos_sale/report/sale_report.py | 2 | ||||
| -rw-r--r-- | addons/sale/report/sale_report.py | 3 | ||||
| -rw-r--r-- | addons/sale/report/sale_report_views.xml | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/addons/pos_sale/report/sale_report.py b/addons/pos_sale/report/sale_report.py index 23fa127b0cd..735aaf56169 100644 --- a/addons/pos_sale/report/sale_report.py +++ b/addons/pos_sale/report/sale_report.py @@ -48,6 +48,7 @@ class SaleReport(models.Model): config.crm_team_id AS team_id, p.product_tmpl_id, partner.country_id AS country_id, + partner.industry_id AS industry_id, partner.commercial_partner_id AS commercial_partner_id, (select sum(t.weight*l.qty/u.factor) from pos_order_line l join product_product p on (l.product_id=p.id) @@ -95,6 +96,7 @@ class SaleReport(models.Model): pos.pricelist_id, p.product_tmpl_id, partner.country_id, + partner.industry_id, partner.commercial_partner_id, pol_tax.amount, u.factor, diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 70a1ebd4277..79402453440 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -35,6 +35,7 @@ class SaleReport(models.Model): analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account', readonly=True) team_id = fields.Many2one('crm.team', 'Sales Team', readonly=True, oldname='section_id') country_id = fields.Many2one('res.country', 'Customer Country', readonly=True) + industry_id = fields.Many2one('res.partner.industry', 'Customer Industry', readonly=True) commercial_partner_id = fields.Many2one('res.partner', 'Customer Entity', readonly=True) state = fields.Selection([ ('draft', 'Draft Quotation'), @@ -81,6 +82,7 @@ class SaleReport(models.Model): s.team_id as team_id, p.product_tmpl_id, partner.country_id as country_id, + partner.industry_id as industry_id, partner.commercial_partner_id as commercial_partner_id, sum(p.weight * l.product_uom_qty / u.factor * u2.factor) as weight, sum(p.volume * l.product_uom_qty / u.factor * u2.factor) as volume, @@ -121,6 +123,7 @@ class SaleReport(models.Model): s.team_id, p.product_tmpl_id, partner.country_id, + partner.industry_id, partner.commercial_partner_id, l.discount, s.id %s diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml index 0b098040bd5..2f234cf6526 100644 --- a/addons/sale/report/sale_report_views.xml +++ b/addons/sale/report/sale_report_views.xml @@ -40,6 +40,7 @@ <field name="categ_id"/> <field name="partner_id"/> <field name="country_id"/> + <field name="industry_id"/> <group expand="0" string="Extended Filters"> <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/> <field name="company_id" groups="base.group_multi_company"/> @@ -49,6 +50,7 @@ <filter string="Sales Team" name="sales_channel" context="{'group_by':'team_id'}"/> <filter string="Customer" name="Customer" context="{'group_by':'partner_id'}"/> <filter string="Customer Country" name="country_id" context="{'group_by':'country_id'}"/> + <filter string="Customer Industry" name="industry_id" context="{'group_by':'industry_id'}"/> <filter string="Product" name="Product" context="{'group_by':'product_id'}"/> <filter string="Product Category" name="Category" context="{'group_by':'categ_id'}"/> <filter name="status" string="Status" context="{'group_by':'state'}"/> |