From f76cc095b8493dfac788f5e1a545adc571f0693f Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Fri, 16 Feb 2018 11:30:21 -0800 Subject: [PATCH] [FIX] point_of_sale: fix the behavior of default fiscal positions Issue 1) and 3) in 73f7567627f2440d898984ed167befa62ed289c4 still occured in 11.0. It seems this was not fully forward-ported, most likely due to conflicts caused by ac89783d2f6cf5477de1c5e576e90ee0f576c9cc. opw-782855 --- addons/point_of_sale/static/src/js/screens.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index d4b36313abb..dadd9cffbb8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -1170,8 +1170,9 @@ var ClientListScreenWidget = ScreenWidget.extend({ var order = this.pos.get_order(); if( this.has_client_changed() ){ var default_fiscal_position_id = _.findWhere(this.pos.fiscal_positions, {'id': this.pos.config.default_fiscal_position_id[0]}); - if ( this.new_client ) { - order.fiscal_position = _.findWhere(this.pos.fiscal_positions, {'id': this.new_client.property_account_position_id[0]}); + if ( this.new_client && this.new_client.property_account_position_id ) { + var client_fiscal_position_id = _.findWhere(this.pos.fiscal_positions, {'id': this.new_client.property_account_position_id[0]}); + order.fiscal_position = client_fiscal_position_id || default_fiscal_position_id; order.set_pricelist(_.findWhere(this.pos.pricelists, {'id': this.new_client.property_product_pricelist[0]}) || this.pos.default_pricelist); } else { order.fiscal_position = default_fiscal_position_id;