pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website_sale: loaded default pricelist

Browse Source 
If a user signed in, the pricelist must be,
in this very specific order:
 - the pricelist of its saved cart
   except if the cart is no longer valid
   (pricelist no longer available or
    order no longer draft),
 - or, the user specific pricelist,
   in other words, the pricelist set by an employee
   for this specific customer, if any,
 - or, the public user pricelist, if it is available
   in the user geolocalization
 - or, the first pricelist available

In addition, if the user firstly browses the shop
without being signed in, and then signs it, the pricelist
loaded after the sign in must be the user specific pricelist,
if any, and not the default website pricelist (the public
user pricelist or the first pricelist available)

opw-666620
This commit is contained in:
Denis Ledoux
2016-01-25 13:04:58 +01:00
parent b8e9017f66
commit bf78ad7bf7
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/models/sale_order.py
+25 -8
View File
@@ -219,16 +219,33 @@ class website(orm.Model):
"""
:returns: The current pricelist record
"""
pl_id = request.session.get('website_sale_current_pl')
if pl_id:
return self.pool['product.pricelist'].browse(cr, uid, [pl_id], context=context)[0]
# The list of available pricelists for this user.
# If the user is signed in, and has a pricelist set different than the public user pricelist
# then this pricelist will always be considered as available
available_pricelists = self.get_pricelist_available(cr, uid, context=context)
if request.session.get('website_sale_current_pl'):
# `website_sale_current_pl` is set only if the user specifically chose it:
# - Either, he chose it from the pricelist selection
# - Either, he entered a coupon code
return self.pool['product.pricelist'].browse(cr, uid, [request.session['website_sale_current_pl']], context=context)[0]
else:
available_pricelists = self.get_pricelist_available(cr, uid, context=context)
if available_pricelists:
partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
# If the user has a saved cart, it take the pricelist of this cart, except if
# the order is no longer draft (It has already been confirmed, or cancelled, ...)
pl = partner.last_website_so_id and partner.last_website_so_id.state == 'draft' and partner.last_website_so_id.pricelist_id
if not pl:
# The pricelist of the user set on its partner form.
# If the user is not signed in, it's the public user pricelist
pl = partner.property_product_pricelist
if available_pricelists and pl not in available_pricelists:
# If there is at least one pricelist in the available pricelists
# and the chosen pricelist is not within them
# it then choose the first available pricelist.
# This can only happen when the pricelist is the public user pricelist and this pricelist is not in the available pricelist for this localization
# If the user is signed in, and has a special pricelist (different than the public user pricelist),
# then this special pricelist is amongs these available pricelists, and therefore it won't fall in this case.
pl = available_pricelists[0]
else:
pl = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.property_product_pricelist
request.session['website_sale_current_pl'] = pl.id
return pl
def sale_product_domain(self, cr, uid, ids, context=None):