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

[FIX] sale: correctly adapt forward-port of 51ef8514ea

Browse Source
This commit is contained in:
Christophe Simonis
2019-06-04 14:56:19 +00:00
parent 47fefea909
commit 2b0118b984
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/static/src/js/variant_mixin.js
+6 -3
View File
@@ -54,7 +54,7 @@ var VariantMixin = {
var self = this;
if ($(ev.target).hasClass('variant_custom_value')) {
return;
return Promise.resolve();
}
var $component;
@@ -80,7 +80,7 @@ var VariantMixin = {
self._checkExclusions($parent, combination);
ajax.jsonRpc(this._getUri('/sale/get_combination_info'), 'call', {
return ajax.jsonRpc(this._getUri('/sale/get_combination_info'), 'call', {
'product_template_id': productTemplateId,
'product_id': this._getProductId($parent),
'combination': combination,
@@ -469,7 +469,10 @@ var VariantMixin = {
$price.text(self._priceToStr(combination.price));
$default_price.text(self._priceToStr(combination.list_price));
var isCombinationPossible = combination.is_combination_possible;
var isCombinationPossible = true;
if (!_.isUndefined(combination.is_combination_possible)) {
isCombinationPossible = combination.is_combination_possible;
}
this._toggleDisable($parent, isCombinationPossible);