diff --git a/addons/pos_sale/report/sale_report.py b/addons/pos_sale/report/sale_report.py index e99b8255442..5415824a1be 100644 --- a/addons/pos_sale/report/sale_report.py +++ b/addons/pos_sale/report/sale_report.py @@ -64,10 +64,11 @@ class SaleReport(models.Model): NULL AS analytic_account_id, pos.crm_team_id AS team_id, p.product_tmpl_id, + partner.commercial_partner_id AS commercial_partner_id, partner.country_id AS country_id, partner.industry_id AS industry_id, + partner.state_id AS state_id, partner.zip AS partner_zip, - partner.commercial_partner_id AS commercial_partner_id, (SUM(p.weight) * l.qty / u.factor) AS weight, (SUM(p.volume) * l.qty / u.factor) AS volume, l.discount AS discount, @@ -133,10 +134,11 @@ class SaleReport(models.Model): pos.company_id, pos.pricelist_id, p.product_tmpl_id, + partner.commercial_partner_id, partner.country_id, partner.industry_id, + partner.state_id, partner.zip, - partner.commercial_partner_id, u.factor, pos.crm_team_id, currency_table.rate""" diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 4dbe4d7edf3..baad95d0895 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -53,6 +53,7 @@ class SaleReport(models.Model): industry_id = fields.Many2one( comodel_name='res.partner.industry', string="Customer Industry", readonly=True) partner_zip = fields.Char(string="Customer ZIP", readonly=True) + state_id = fields.Many2one(comodel_name='res.country.state', readonly=True) # sale.order.line fields order_id = fields.Many2one(comodel_name='sale.order', string="Order #", readonly=True) @@ -137,10 +138,11 @@ class SaleReport(models.Model): s.analytic_account_id AS analytic_account_id, s.team_id AS team_id, p.product_tmpl_id, + partner.commercial_partner_id AS commercial_partner_id, partner.country_id AS country_id, partner.industry_id AS industry_id, + partner.state_id AS state_id, partner.zip AS partner_zip, - partner.commercial_partner_id AS commercial_partner_id, CASE WHEN l.product_id IS NOT NULL THEN SUM(p.weight * l.product_uom_qty / u.factor * u2.factor) ELSE 0 END AS weight, CASE WHEN l.product_id IS NOT NULL THEN SUM(p.volume * l.product_uom_qty / u.factor * u2.factor) ELSE 0 END AS volume, l.discount AS discount, @@ -212,10 +214,11 @@ class SaleReport(models.Model): s.analytic_account_id, s.team_id, p.product_tmpl_id, + partner.commercial_partner_id, partner.country_id, partner.industry_id, + partner.state_id, partner.zip, - partner.commercial_partner_id, l.discount, s.id, currency_table.rate"""