From 0b5df29c8fccd63ff05a0b2895052feb7aba304c Mon Sep 17 00:00:00 2001 From: Damien Bouvy Date: Mon, 5 Oct 2015 16:07:49 +0200 Subject: [PATCH] [FIX] website_sale, website_portal_sale: new sale module compatibility - SO states have changed, reflect this in the controller - digital products are no longer services, but they still do not need a picking --- addons/website_portal_sale/controllers/main.py | 2 +- addons/website_sale/models/sale_order.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website_portal_sale/controllers/main.py b/addons/website_portal_sale/controllers/main.py index c4374ad7fb6..e9f1c48ee99 100644 --- a/addons/website_portal_sale/controllers/main.py +++ b/addons/website_portal_sale/controllers/main.py @@ -22,7 +22,7 @@ class website_account(website_account): ]) orders = res_sale_order.search([ ('partner_id.id', '=', partner.id), - ('state', 'in', ['progress', 'manual', 'shipping_except', 'invoice_except', 'done']) + ('state', 'in', ['sale', 'done']) ]) invoices = res_invoices.search([ ('partner_id.id', '=', partner.id), diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py index 6e8ebae1cd8..637901c6347 100644 --- a/addons/website_sale/models/sale_order.py +++ b/addons/website_sale/models/sale_order.py @@ -17,7 +17,7 @@ class sale_order(osv.Model): for order in self.browse(cr, uid, ids, context=context): res[order.id] = { 'cart_quantity': int(sum(l.product_uom_qty for l in (order.website_order_line or []))), - 'only_services': all(l.product_id and l.product_id.type == 'service' for l in order.website_order_line) + 'only_services': all(l.product_id and l.product_id.type in ('service', 'digital') for l in order.website_order_line) } return res