|
|
@ -21,22 +21,22 @@ function pos_pricelist_models(instance, module) { |
|
|
var round_pr = instance.web.round_precision; |
|
|
var round_pr = instance.web.round_precision; |
|
|
var round_di = instance.web.round_decimals; |
|
|
var round_di = instance.web.round_decimals; |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* @param funcName |
|
|
|
|
|
* @returns {*} |
|
|
|
|
|
* @private |
|
|
|
|
|
*/ |
|
|
|
|
|
Backbone.Model.prototype._super = function (funcName) { |
|
|
|
|
|
return this.constructor.__super__[funcName].apply(this, _.rest(arguments)); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Extend the POS model |
|
|
* Extend the POS model |
|
|
*/ |
|
|
*/ |
|
|
|
|
|
var PosModelParent = module.PosModel; |
|
|
module.PosModel = module.PosModel.extend({ |
|
|
module.PosModel = module.PosModel.extend({ |
|
|
|
|
|
/** |
|
|
|
|
|
* @param session |
|
|
|
|
|
* @param attributes |
|
|
|
|
|
*/ |
|
|
initialize: function (session, attributes) { |
|
|
initialize: function (session, attributes) { |
|
|
this._super('initialize', session, attributes); |
|
|
|
|
|
this.pricelist_engine = new module.PricelistEngine({'pos': this, 'db': this.db, 'pos_widget': this.pos_widget}); |
|
|
|
|
|
|
|
|
PosModelParent.prototype.initialize.apply(this, arguments); |
|
|
|
|
|
this.pricelist_engine = new module.PricelistEngine({ |
|
|
|
|
|
'pos': this, |
|
|
|
|
|
'db': this.db, |
|
|
|
|
|
'pos_widget': this.pos_widget |
|
|
|
|
|
}); |
|
|
arrange_elements(this); |
|
|
arrange_elements(this); |
|
|
}, |
|
|
}, |
|
|
/** |
|
|
/** |
|
|
@ -54,11 +54,20 @@ function pos_pricelist_models(instance, module) { |
|
|
} |
|
|
} |
|
|
return lookup |
|
|
return lookup |
|
|
}, |
|
|
}, |
|
|
|
|
|
/** |
|
|
|
|
|
* @param removed_order |
|
|
|
|
|
* @param index |
|
|
|
|
|
* @param reason |
|
|
|
|
|
*/ |
|
|
on_removed_order: function (removed_order, index, reason) { |
|
|
on_removed_order: function (removed_order, index, reason) { |
|
|
this._super('on_removed_order', removed_order, index, reason); |
|
|
|
|
|
if ((reason === 'abandon' || removed_order.temporary) && this.get('orders').size() > 0) { |
|
|
|
|
|
var current_order = (this.get('orders').at(index) || this.get('orders').last()); |
|
|
|
|
|
var partner = current_order.get_client() ? current_order.get_client() : false; |
|
|
|
|
|
|
|
|
PosModelParent.prototype.on_removed_order.apply(this, arguments); |
|
|
|
|
|
if ((reason === 'abandon' || removed_order.temporary) |
|
|
|
|
|
&& this.get('orders').size() > 0) { |
|
|
|
|
|
var current_order = (this.get('orders').at(index) |
|
|
|
|
|
|| this.get('orders').last()); |
|
|
|
|
|
var partner = current_order.get_client() ? |
|
|
|
|
|
current_order.get_client() : |
|
|
|
|
|
false; |
|
|
this.pricelist_engine.update_products_ui(partner); |
|
|
this.pricelist_engine.update_products_ui(partner); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -80,7 +89,11 @@ function pos_pricelist_models(instance, module) { |
|
|
var attr = JSON.parse(JSON.stringify(product)); |
|
|
var attr = JSON.parse(JSON.stringify(product)); |
|
|
attr.pos = this.pos; |
|
|
attr.pos = this.pos; |
|
|
attr.order = this; |
|
|
attr.order = this; |
|
|
var line = new module.Orderline({}, {pos: this.pos, order: this, product: product}); |
|
|
|
|
|
|
|
|
var line = new module.Orderline({}, { |
|
|
|
|
|
pos: this.pos, |
|
|
|
|
|
order: this, |
|
|
|
|
|
product: product |
|
|
|
|
|
}); |
|
|
var self = this; |
|
|
var self = this; |
|
|
var found = false; |
|
|
var found = false; |
|
|
|
|
|
|
|
|
@ -100,7 +113,8 @@ function pos_pricelist_models(instance, module) { |
|
|
} |
|
|
} |
|
|
for (var i = 0; i < orderlines.length; i++) { |
|
|
for (var i = 0; i < orderlines.length; i++) { |
|
|
var _line = orderlines[i]; |
|
|
var _line = orderlines[i]; |
|
|
if (_line && _line.can_be_merged_with(line) && options.merge !== false) { |
|
|
|
|
|
|
|
|
if (_line && _line.can_be_merged_with(line) && |
|
|
|
|
|
options.merge !== false) { |
|
|
_line.merge(line); |
|
|
_line.merge(line); |
|
|
found = true; |
|
|
found = true; |
|
|
break; |
|
|
break; |
|
|
@ -116,16 +130,23 @@ function pos_pricelist_models(instance, module) { |
|
|
/** |
|
|
/** |
|
|
* Extend the Order line |
|
|
* Extend the Order line |
|
|
*/ |
|
|
*/ |
|
|
|
|
|
var OrderlineParent = module.Orderline; |
|
|
module.Orderline = module.Orderline.extend({ |
|
|
module.Orderline = module.Orderline.extend({ |
|
|
|
|
|
/** |
|
|
|
|
|
* @param attr |
|
|
|
|
|
* @param options |
|
|
|
|
|
*/ |
|
|
initialize: function (attr, options) { |
|
|
initialize: function (attr, options) { |
|
|
this._super('initialize', attr, options); |
|
|
|
|
|
this.manuel_price = false; |
|
|
|
|
|
if (options.product !== undefined) { |
|
|
|
|
|
var qty = this.compute_qty(options.order, options.product); |
|
|
|
|
|
var partner = options.order.get_client(); |
|
|
|
|
|
var product = options.product; |
|
|
|
|
|
|
|
|
OrderlineParent.prototype.initialize.apply(this, arguments); |
|
|
|
|
|
this.manual_price = false; |
|
|
|
|
|
if (this.product !== undefined) { |
|
|
|
|
|
var qty = this.compute_qty(this.order, this.product); |
|
|
|
|
|
var partner = this.order ? this.order.get_client() : null; |
|
|
|
|
|
var product = this.product; |
|
|
var db = this.pos.db; |
|
|
var db = this.pos.db; |
|
|
var price = this.pos.pricelist_engine.compute_price_all(db, product, partner, qty); |
|
|
|
|
|
|
|
|
var price = this.pos.pricelist_engine.compute_price_all( |
|
|
|
|
|
db, product, partner, qty |
|
|
|
|
|
); |
|
|
if (price !== false && price !== 0.0) { |
|
|
if (price !== false && price !== 0.0) { |
|
|
this.price = price; |
|
|
this.price = price; |
|
|
} |
|
|
} |
|
|
@ -134,18 +155,20 @@ function pos_pricelist_models(instance, module) { |
|
|
/** |
|
|
/** |
|
|
* @param state |
|
|
* @param state |
|
|
*/ |
|
|
*/ |
|
|
set_manuel_price: function (state) { |
|
|
|
|
|
this.manuel_price = state; |
|
|
|
|
|
|
|
|
set_manual_price: function (state) { |
|
|
|
|
|
this.manual_price = state; |
|
|
}, |
|
|
}, |
|
|
/** |
|
|
/** |
|
|
* @param quantity |
|
|
* @param quantity |
|
|
*/ |
|
|
*/ |
|
|
set_quantity: function (quantity) { |
|
|
set_quantity: function (quantity) { |
|
|
this._super('set_quantity', quantity); |
|
|
|
|
|
|
|
|
OrderlineParent.prototype.set_quantity.apply(this, arguments); |
|
|
var partner = this.order.get_client(); |
|
|
var partner = this.order.get_client(); |
|
|
var product = this.product; |
|
|
var product = this.product; |
|
|
var db = this.pos.db; |
|
|
var db = this.pos.db; |
|
|
var price = this.pos.pricelist_engine.compute_price_all(db, product, partner, quantity); |
|
|
|
|
|
|
|
|
var price = this.pos.pricelist_engine.compute_price_all( |
|
|
|
|
|
db, product, partner, quantity |
|
|
|
|
|
); |
|
|
if (price !== false && price !== 0.0) { |
|
|
if (price !== false && price !== 0.0) { |
|
|
this.price = price; |
|
|
this.price = price; |
|
|
} |
|
|
} |
|
|
@ -154,81 +177,30 @@ function pos_pricelist_models(instance, module) { |
|
|
/** |
|
|
/** |
|
|
* override this method to take fiscal positions in consideration |
|
|
* override this method to take fiscal positions in consideration |
|
|
* get all price |
|
|
* get all price |
|
|
* TODO : find a better way to do it : need some refactoring in the pos standard |
|
|
|
|
|
* @returns {{priceWithTax: *, priceWithoutTax: *, tax: number, taxDetails: {}}} |
|
|
|
|
|
|
|
|
* TODO : find a better way to do it : need some refactoring |
|
|
|
|
|
* in the pos standard |
|
|
|
|
|
* @returns {{ |
|
|
|
|
|
* priceWithTax: *, priceWithoutTax: *, tax: number, taxDetails: {} |
|
|
|
|
|
* }} |
|
|
*/ |
|
|
*/ |
|
|
get_all_prices: function () { |
|
|
get_all_prices: function () { |
|
|
|
|
|
|
|
|
var self = this; |
|
|
|
|
|
var currency_rounding = this.pos.currency.rounding; |
|
|
|
|
|
var base = this.get_base_price(); |
|
|
var base = this.get_base_price(); |
|
|
var totalTax = base; |
|
|
var totalTax = base; |
|
|
var totalNoTax = base; |
|
|
var totalNoTax = base; |
|
|
var product = this.get_product(); |
|
|
|
|
|
var taxes = this.get_applicable_taxes(); |
|
|
|
|
|
var taxtotal = 0; |
|
|
var taxtotal = 0; |
|
|
var taxdetail = {}; |
|
|
var taxdetail = {}; |
|
|
|
|
|
|
|
|
// Add by pos_pricelist
|
|
|
|
|
|
var partner = this.order.get_client(); |
|
|
|
|
|
var fiscal_position_taxes = []; |
|
|
|
|
|
if (partner && partner.property_account_position) { |
|
|
|
|
|
fiscal_position_taxes = self.pos.db.find_taxes_by_fiscal_position_id(partner.property_account_position[0]); |
|
|
|
|
|
} |
|
|
|
|
|
var product_taxes = []; |
|
|
|
|
|
for (var i = 0, ilen = fiscal_position_taxes.length; i < ilen; i++) { |
|
|
|
|
|
var fp_tax = fiscal_position_taxes[i]; |
|
|
|
|
|
for (var j = 0, jlen = taxes.length; j < jlen; j++) { |
|
|
|
|
|
var p_tax = taxes[j]; |
|
|
|
|
|
if (fp_tax && p_tax && fp_tax.tax_src_id[0] === p_tax.id) { |
|
|
|
|
|
var dest_tax = _.detect(this.pos.taxes, function (t) { |
|
|
|
|
|
return t.id === fp_tax.tax_dest_id[0]; |
|
|
|
|
|
}); |
|
|
|
|
|
product_taxes.push(dest_tax); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (product_taxes.length === 0) { |
|
|
|
|
|
for (var i = 0, ilen = product.taxes_id.length; i < ilen; i++) { |
|
|
|
|
|
var _id = product.taxes_id[i]; |
|
|
|
|
|
var p_tax = _.detect(this.pos.taxes, function (t) { |
|
|
|
|
|
return t.id === _id; |
|
|
|
|
|
}); |
|
|
|
|
|
product_taxes.push(p_tax); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
_.each(product_taxes, function (tax) { |
|
|
|
|
|
|
|
|
var product_taxes = this.get_applicable_taxes_for_orderline(); |
|
|
|
|
|
var all_taxes = _(this.compute_all(product_taxes, base)).flatten(); |
|
|
|
|
|
_(all_taxes).each(function (tax) { |
|
|
if (tax.price_include) { |
|
|
if (tax.price_include) { |
|
|
var tmp; |
|
|
|
|
|
if (tax.type === "percent") { |
|
|
|
|
|
tmp = base - round_pr(base / (1 + tax.amount), currency_rounding); |
|
|
|
|
|
} else if (tax.type === "fixed") { |
|
|
|
|
|
tmp = round_pr(tax.amount * self.get_quantity(), currency_rounding); |
|
|
|
|
|
} else { |
|
|
|
|
|
throw "This type of tax is not supported by the point of sale: " + tax.type; |
|
|
|
|
|
} |
|
|
|
|
|
tmp = round_pr(tmp, currency_rounding); |
|
|
|
|
|
taxtotal += tmp; |
|
|
|
|
|
totalNoTax -= tmp; |
|
|
|
|
|
taxdetail[tax.id] = tmp; |
|
|
|
|
|
} else { |
|
|
|
|
|
var tmp; |
|
|
|
|
|
if (tax.type === "percent") { |
|
|
|
|
|
tmp = tax.amount * base; |
|
|
|
|
|
} else if (tax.type === "fixed") { |
|
|
|
|
|
tmp = tax.amount * self.get_quantity(); |
|
|
|
|
|
|
|
|
totalNoTax -= tax.amount; |
|
|
} else { |
|
|
} else { |
|
|
throw "This type of tax is not supported by the point of sale: " + tax.type; |
|
|
|
|
|
} |
|
|
|
|
|
tmp = round_pr(tmp, currency_rounding); |
|
|
|
|
|
if (tax.include_base_amount) { |
|
|
|
|
|
base += tmp; |
|
|
|
|
|
} |
|
|
|
|
|
taxtotal += tmp; |
|
|
|
|
|
totalTax += tmp; |
|
|
|
|
|
taxdetail[tax.id] = tmp; |
|
|
|
|
|
|
|
|
totalTax += tax.amount; |
|
|
} |
|
|
} |
|
|
|
|
|
taxtotal += tax.amount; |
|
|
|
|
|
taxdetail[tax.id] = tax.amount; |
|
|
}); |
|
|
}); |
|
|
|
|
|
totalNoTax = round_pr(totalNoTax, this.pos.currency.rounding); |
|
|
return { |
|
|
return { |
|
|
"priceWithTax": totalTax, |
|
|
"priceWithTax": totalTax, |
|
|
"priceWithoutTax": totalNoTax, |
|
|
"priceWithoutTax": totalNoTax, |
|
|
@ -237,16 +209,22 @@ function pos_pricelist_models(instance, module) { |
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
/** |
|
|
/** |
|
|
* Override this method to avoid a return false if the price is different |
|
|
|
|
|
* Check super method : (this.price !== orderline.price) is not necessary in our case |
|
|
|
|
|
|
|
|
* Override this method to avoid a return false |
|
|
|
|
|
* if the price is different |
|
|
|
|
|
* Check super method : (this.price !== orderline.price) |
|
|
|
|
|
* is not necessary in our case |
|
|
* @param orderline |
|
|
* @param orderline |
|
|
* @returns {boolean} |
|
|
* @returns {boolean} |
|
|
*/ |
|
|
*/ |
|
|
can_be_merged_with: function (orderline) { |
|
|
can_be_merged_with: function (orderline) { |
|
|
var result = this._super('can_be_merged_with', orderline); |
|
|
|
|
|
|
|
|
var result = OrderlineParent.prototype.can_be_merged_with.apply( |
|
|
|
|
|
this, arguments |
|
|
|
|
|
); |
|
|
if (!result) { |
|
|
if (!result) { |
|
|
if (!this.manuel_price) { |
|
|
|
|
|
return (this.get_product().id === orderline.get_product().id); |
|
|
|
|
|
|
|
|
if (!this.manual_price) { |
|
|
|
|
|
return ( |
|
|
|
|
|
this.get_product().id === orderline.get_product().id |
|
|
|
|
|
); |
|
|
} else { |
|
|
} else { |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
@ -258,7 +236,7 @@ function pos_pricelist_models(instance, module) { |
|
|
* @param orderline |
|
|
* @param orderline |
|
|
*/ |
|
|
*/ |
|
|
merge: function (orderline) { |
|
|
merge: function (orderline) { |
|
|
this._super('merge', orderline); |
|
|
|
|
|
|
|
|
OrderlineParent.prototype.merge.apply(this, arguments); |
|
|
this.set_unit_price(orderline.price); |
|
|
this.set_unit_price(orderline.price); |
|
|
}, |
|
|
}, |
|
|
/** |
|
|
/** |
|
|
@ -269,22 +247,77 @@ function pos_pricelist_models(instance, module) { |
|
|
compute_qty: function (order, product) { |
|
|
compute_qty: function (order, product) { |
|
|
var qty = 1; |
|
|
var qty = 1; |
|
|
var orderlines = []; |
|
|
var orderlines = []; |
|
|
if (order.get('orderLines').models !== undefined) { |
|
|
|
|
|
|
|
|
if (order && order.get('orderLines').models !== undefined) { |
|
|
orderlines = order.get('orderLines').models; |
|
|
orderlines = order.get('orderLines').models; |
|
|
} |
|
|
} |
|
|
for (var i = 0; i < orderlines.length; i++) { |
|
|
for (var i = 0; i < orderlines.length; i++) { |
|
|
if (orderlines[i].product.id === product.id && !orderlines[i].manuel_price) { |
|
|
|
|
|
|
|
|
if (orderlines[i].product.id === product.id |
|
|
|
|
|
&& !orderlines[i].manual_price) { |
|
|
qty += orderlines[i].quantity; |
|
|
qty += orderlines[i].quantity; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return qty; |
|
|
return qty; |
|
|
}, |
|
|
}, |
|
|
|
|
|
/** |
|
|
|
|
|
* @returns {Array} |
|
|
|
|
|
*/ |
|
|
|
|
|
get_applicable_taxes_for_orderline: function () { |
|
|
|
|
|
// find applicable taxes for this product and this customer
|
|
|
|
|
|
var product = this.get_product(); |
|
|
|
|
|
var product_tax_ids = product.taxes_id; |
|
|
|
|
|
var product_taxes = []; |
|
|
|
|
|
var taxes = this.pos.taxes; |
|
|
|
|
|
var partner = this.order ? this.order.get_client() : null; |
|
|
|
|
|
if (partner && partner.property_account_position) { |
|
|
|
|
|
product_tax_ids = |
|
|
|
|
|
this.pos.db.map_tax( |
|
|
|
|
|
partner.property_account_position[0], product_tax_ids |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
for (var i = 0, ilen = product_tax_ids.length; |
|
|
|
|
|
i < ilen; i++) { |
|
|
|
|
|
var tax_id = product_tax_ids[i]; |
|
|
|
|
|
var tax = _.detect(taxes, function (t) { |
|
|
|
|
|
return t.id === tax_id; |
|
|
|
|
|
}); |
|
|
|
|
|
product_taxes.push(tax); |
|
|
|
|
|
} |
|
|
|
|
|
return product_taxes; |
|
|
|
|
|
}, |
|
|
|
|
|
/** |
|
|
|
|
|
* @returns {*} |
|
|
|
|
|
*/ |
|
|
|
|
|
get_display_price: function () { |
|
|
|
|
|
if (this.pos.config.display_price_with_taxes) { |
|
|
|
|
|
return this.get_price_with_tax(); |
|
|
|
|
|
} |
|
|
|
|
|
return OrderlineParent.prototype.get_display_price.apply( |
|
|
|
|
|
this, arguments |
|
|
|
|
|
); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
export_as_JSON: function() { |
|
|
|
|
|
var res = OrderlineParent.prototype.export_as_JSON.apply(this, arguments); |
|
|
|
|
|
var product_tax_ids = this.get_product().taxes_id || []; |
|
|
|
|
|
var partner = this.order ? this.order.get_client() : null; |
|
|
|
|
|
if (partner && partner.property_account_position) { |
|
|
|
|
|
product_tax_ids = |
|
|
|
|
|
this.pos.db.map_tax( |
|
|
|
|
|
partner.property_account_position[0], product_tax_ids |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
res["tax_ids"] = [[6, false, product_tax_ids]]; |
|
|
|
|
|
return res; |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Pricelist Engine to compute price |
|
|
* Pricelist Engine to compute price |
|
|
*/ |
|
|
*/ |
|
|
module.PricelistEngine = instance.web.Class.extend({ |
|
|
module.PricelistEngine = instance.web.Class.extend({ |
|
|
|
|
|
/** |
|
|
|
|
|
* @param options |
|
|
|
|
|
*/ |
|
|
init: function (options) { |
|
|
init: function (options) { |
|
|
options = options || {}; |
|
|
options = options || {}; |
|
|
this.pos = options.pos; |
|
|
this.pos = options.pos; |
|
|
@ -304,9 +337,11 @@ function pos_pricelist_models(instance, module) { |
|
|
if (partner && partner.property_product_pricelist) { |
|
|
if (partner && partner.property_product_pricelist) { |
|
|
price_list_id = partner.property_product_pricelist[0]; |
|
|
price_list_id = partner.property_product_pricelist[0]; |
|
|
} else { |
|
|
} else { |
|
|
price_list_id = db.default_pricelist_id; |
|
|
|
|
|
|
|
|
price_list_id = this.pos.config.pricelist_id[0]; |
|
|
} |
|
|
} |
|
|
return this.compute_price(db, product, partner, qty, parseInt(price_list_id)); |
|
|
|
|
|
|
|
|
return this.compute_price( |
|
|
|
|
|
db, product, partner, qty, parseInt(price_list_id) |
|
|
|
|
|
); |
|
|
}, |
|
|
}, |
|
|
/** |
|
|
/** |
|
|
* loop find a valid version for the price list id given in param |
|
|
* loop find a valid version for the price list id given in param |
|
|
@ -320,8 +355,10 @@ function pos_pricelist_models(instance, module) { |
|
|
var pricelist = db.pricelist_by_id[pricelist_id]; |
|
|
var pricelist = db.pricelist_by_id[pricelist_id]; |
|
|
for (var i = 0, len = pricelist.version_id.length; i < len; i++) { |
|
|
for (var i = 0, len = pricelist.version_id.length; i < len; i++) { |
|
|
var v = db.pricelist_version_by_id[pricelist.version_id[i]]; |
|
|
var v = db.pricelist_version_by_id[pricelist.version_id[i]]; |
|
|
if (((v.date_start == false) || (new Date(v.date_start) <= date)) && |
|
|
|
|
|
((v.date_end == false) || (new Date(v.date_end) >= date))) { |
|
|
|
|
|
|
|
|
if (((v.date_start == false) |
|
|
|
|
|
|| (new Date(v.date_start) <= date)) && |
|
|
|
|
|
((v.date_end == false) |
|
|
|
|
|
|| (new Date(v.date_end) >= date))) { |
|
|
version = v; |
|
|
version = v; |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
@ -346,7 +383,8 @@ function pos_pricelist_models(instance, module) { |
|
|
var version = this.find_valid_pricelist_version(db, pricelist_id); |
|
|
var version = this.find_valid_pricelist_version(db, pricelist_id); |
|
|
if (version == false) { |
|
|
if (version == false) { |
|
|
var message = _t('Pricelist Error'); |
|
|
var message = _t('Pricelist Error'); |
|
|
var comment = _t('At least one pricelist has no active version ! Please create or activate one.'); |
|
|
|
|
|
|
|
|
var comment = _t('At least one pricelist has no active ' + |
|
|
|
|
|
'version ! Please create or activate one.'); |
|
|
show_error(this, message, comment); |
|
|
show_error(this, message, comment); |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
@ -355,15 +393,19 @@ function pos_pricelist_models(instance, module) { |
|
|
var categ_ids = []; |
|
|
var categ_ids = []; |
|
|
if (product.categ_id) { |
|
|
if (product.categ_id) { |
|
|
categ_ids.push(product.categ_id[0]); |
|
|
categ_ids.push(product.categ_id[0]); |
|
|
categ_ids = categ_ids.concat(db.product_category_ancestors[product.categ_id[0]]); |
|
|
|
|
|
|
|
|
categ_ids = categ_ids.concat( |
|
|
|
|
|
db.product_category_ancestors[product.categ_id[0]] |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// find items
|
|
|
// find items
|
|
|
var items = [], i, len; |
|
|
var items = [], i, len; |
|
|
for (i = 0, len = db.pricelist_item_sorted.length; i < len; i++) { |
|
|
for (i = 0, len = db.pricelist_item_sorted.length; i < len; i++) { |
|
|
var item = db.pricelist_item_sorted[i]; |
|
|
var item = db.pricelist_item_sorted[i]; |
|
|
if ((item.product_id === false || item.product_id[0] === product.id) && |
|
|
|
|
|
(item.categ_id === false || categ_ids.indexOf(item.categ_id[0]) !== -1) && |
|
|
|
|
|
|
|
|
if ((item.product_id === false |
|
|
|
|
|
|| item.product_id[0] === product.id) && |
|
|
|
|
|
(item.categ_id === false |
|
|
|
|
|
|| categ_ids.indexOf(item.categ_id[0]) !== -1) && |
|
|
(item.price_version_id[0] === version.id)) { |
|
|
(item.price_version_id[0] === version.id)) { |
|
|
items.push(item); |
|
|
items.push(item); |
|
|
} |
|
|
} |
|
|
@ -381,7 +423,8 @@ function pos_pricelist_models(instance, module) { |
|
|
if (rule.min_quantity && qty < rule.min_quantity) { |
|
|
if (rule.min_quantity && qty < rule.min_quantity) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
if (rule.product_id && rule.product_id[0] && product.id != rule.product_id[0]) { |
|
|
|
|
|
|
|
|
if (rule.product_id && rule.product_id[0] |
|
|
|
|
|
&& product.id != rule.product_id[0]) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
if (rule.categ_id) { |
|
|
if (rule.categ_id) { |
|
|
@ -390,7 +433,7 @@ function pos_pricelist_models(instance, module) { |
|
|
if (cat_id == rule.categ_id[0]) { |
|
|
if (cat_id == rule.categ_id[0]) { |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
cat_id = db.product_category_by_id[cat_id].parent_id[0]; |
|
|
|
|
|
|
|
|
cat_id = db.product_category_by_id[cat_id].parent_id[0] |
|
|
} |
|
|
} |
|
|
if (!(cat_id)) { |
|
|
if (!(cat_id)) { |
|
|
continue; |
|
|
continue; |
|
|
@ -400,7 +443,10 @@ function pos_pricelist_models(instance, module) { |
|
|
switch (rule.base) { |
|
|
switch (rule.base) { |
|
|
case -1: |
|
|
case -1: |
|
|
if (rule.base_pricelist_id) { |
|
|
if (rule.base_pricelist_id) { |
|
|
price = self.compute_price(db, product, false, qty, rule.base_pricelist_id[0]); |
|
|
|
|
|
|
|
|
price = self.compute_price( |
|
|
|
|
|
db, product, false, qty, |
|
|
|
|
|
rule.base_pricelist_id[0] |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
break; |
|
|
break; |
|
|
case -2: |
|
|
case -2: |
|
|
@ -408,17 +454,20 @@ function pos_pricelist_models(instance, module) { |
|
|
for (var index in product.seller_ids) { |
|
|
for (var index in product.seller_ids) { |
|
|
var seller_id = product.seller_ids[index]; |
|
|
var seller_id = product.seller_ids[index]; |
|
|
var _tmp_seller = db.supplierinfo_by_id[seller_id]; |
|
|
var _tmp_seller = db.supplierinfo_by_id[seller_id]; |
|
|
if ((!partner) || (_tmp_seller.name.length && _tmp_seller.name[0] != partner.name)) |
|
|
|
|
|
|
|
|
if ((!partner) || (_tmp_seller.name.length |
|
|
|
|
|
&& _tmp_seller.name[0] != partner.name)) |
|
|
continue; |
|
|
continue; |
|
|
seller = _tmp_seller |
|
|
seller = _tmp_seller |
|
|
} |
|
|
} |
|
|
if (!seller && product.seller_ids) { |
|
|
if (!seller && product.seller_ids) { |
|
|
seller = db.supplierinfo_by_id[product.seller_ids[0]]; |
|
|
|
|
|
|
|
|
seller = |
|
|
|
|
|
db.supplierinfo_by_id[product.seller_ids[0]]; |
|
|
} |
|
|
} |
|
|
if (seller) { |
|
|
if (seller) { |
|
|
for (var _id in seller.pricelist_ids) { |
|
|
for (var _id in seller.pricelist_ids) { |
|
|
var info_id = seller.pricelist_ids[_id]; |
|
|
var info_id = seller.pricelist_ids[_id]; |
|
|
var line = db.pricelist_partnerinfo_by_id[info_id]; |
|
|
|
|
|
|
|
|
var line = |
|
|
|
|
|
db.pricelist_partnerinfo_by_id[info_id]; |
|
|
if (line.min_quantity <= qty) { |
|
|
if (line.min_quantity <= qty) { |
|
|
price = line.price |
|
|
price = line.price |
|
|
} |
|
|
} |
|
|
@ -427,25 +476,39 @@ function pos_pricelist_models(instance, module) { |
|
|
break; |
|
|
break; |
|
|
default: |
|
|
default: |
|
|
if (!price_types.hasOwnProperty(rule.base)) { |
|
|
if (!price_types.hasOwnProperty(rule.base)) { |
|
|
price_types[rule.base] = db.product_price_type_by_id[rule.base]; |
|
|
|
|
|
|
|
|
price_types[rule.base] = |
|
|
|
|
|
db.product_price_type_by_id[rule.base]; |
|
|
} |
|
|
} |
|
|
var price_type = price_types[rule.base]; |
|
|
var price_type = price_types[rule.base]; |
|
|
if (db.product_by_id[product.id].hasOwnProperty(price_type.field)) { |
|
|
|
|
|
price = db.product_by_id[product.id][price_type.field]; |
|
|
|
|
|
|
|
|
if (db.product_by_id[product.id] |
|
|
|
|
|
.hasOwnProperty(price_type.field)) { |
|
|
|
|
|
price = |
|
|
|
|
|
db.product_by_id[product.id][price_type.field]; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (price !== false) { |
|
|
if (price !== false) { |
|
|
var price_limit = price; |
|
|
var price_limit = price; |
|
|
price = price * (1.0 + (rule['price_discount'] ? rule['price_discount'] : 0.0)) |
|
|
|
|
|
|
|
|
price = price * (1.0 + (rule['price_discount'] |
|
|
|
|
|
? rule['price_discount'] |
|
|
|
|
|
: 0.0)); |
|
|
if (rule['price_round']) { |
|
|
if (rule['price_round']) { |
|
|
price = parseFloat(price.toFixed(Math.ceil(Math.log(1.0 / rule['price_round']) / Math.log(10)))); |
|
|
|
|
|
|
|
|
price = parseFloat(price.toFixed( |
|
|
|
|
|
Math.ceil(Math.log(1.0 / rule['price_round']) |
|
|
|
|
|
/ Math.log(10))) |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
price += (rule['price_surcharge'] ? rule['price_surcharge'] : 0.0); |
|
|
|
|
|
|
|
|
price += (rule['price_surcharge'] |
|
|
|
|
|
? rule['price_surcharge'] |
|
|
|
|
|
: 0.0); |
|
|
if (rule['price_min_margin']) { |
|
|
if (rule['price_min_margin']) { |
|
|
price = Math.max(price, price_limit + rule['price_min_margin']) |
|
|
|
|
|
|
|
|
price = Math.max( |
|
|
|
|
|
price, price_limit + rule['price_min_margin'] |
|
|
|
|
|
) |
|
|
} |
|
|
} |
|
|
if (rule['price_max_margin']) { |
|
|
if (rule['price_max_margin']) { |
|
|
price = Math.min(price, price_limit + rule['price_min_margin']) |
|
|
|
|
|
|
|
|
price = Math.min( |
|
|
|
|
|
price, price_limit + rule['price_min_margin'] |
|
|
|
|
|
) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
break; |
|
|
break; |
|
|
@ -458,18 +521,72 @@ function pos_pricelist_models(instance, module) { |
|
|
update_products_ui: function (partner) { |
|
|
update_products_ui: function (partner) { |
|
|
var db = this.db; |
|
|
var db = this.db; |
|
|
if (!this.pos_widget.product_screen) return; |
|
|
if (!this.pos_widget.product_screen) return; |
|
|
var product_list_ui = this.pos_widget.product_screen.$('.product-list span.product'); |
|
|
|
|
|
|
|
|
var product_list_ui |
|
|
|
|
|
= this.pos_widget.product_screen.$( |
|
|
|
|
|
'.product-list span.product' |
|
|
|
|
|
); |
|
|
for (var i = 0, len = product_list_ui.length; i < len; i++) { |
|
|
for (var i = 0, len = product_list_ui.length; i < len; i++) { |
|
|
var product_ui = product_list_ui[i]; |
|
|
var product_ui = product_list_ui[i]; |
|
|
var product_id = $(product_ui).data('product-id'); |
|
|
var product_id = $(product_ui).data('product-id'); |
|
|
var product = db.get_product_by_id(product_id); |
|
|
|
|
|
var price = this.compute_price_all(db, product, partner, 1); |
|
|
|
|
|
|
|
|
var product = $.extend({}, db.get_product_by_id(product_id)); |
|
|
|
|
|
var rules = db.find_product_rules(product); |
|
|
|
|
|
var quantities = []; |
|
|
|
|
|
quantities.push(1); |
|
|
|
|
|
for (var j = 0; j < rules.length; j++) { |
|
|
|
|
|
quantities.push(rules[j].min_quantity); |
|
|
|
|
|
} |
|
|
|
|
|
quantities = quantities.sort(); |
|
|
|
|
|
var prices_displayed = ''; |
|
|
|
|
|
for (var k = 0; k < quantities.length; k++) { |
|
|
|
|
|
var qty = quantities[k]; |
|
|
|
|
|
var price = this.compute_price_all( |
|
|
|
|
|
db, product, partner, qty |
|
|
|
|
|
); |
|
|
if (price !== false && price !== 0.0) { |
|
|
if (price !== false && price !== 0.0) { |
|
|
price = round_di(parseFloat(price) || 0, this.pos.dp['Product Price']); |
|
|
|
|
|
|
|
|
if (this.pos.config.display_price_with_taxes) { |
|
|
|
|
|
var prices = this.simulate_price( |
|
|
|
|
|
product, partner, price, qty |
|
|
|
|
|
); |
|
|
|
|
|
price = prices['priceWithTax'] |
|
|
|
|
|
} |
|
|
|
|
|
price = round_di(parseFloat(price) |
|
|
|
|
|
|| 0, this.pos.dp['Product Price']); |
|
|
price = this.pos_widget.format_currency(price); |
|
|
price = this.pos_widget.format_currency(price); |
|
|
|
|
|
if (k == 0) { |
|
|
$(product_ui).find('.price-tag').html(price); |
|
|
$(product_ui).find('.price-tag').html(price); |
|
|
} |
|
|
} |
|
|
|
|
|
prices_displayed += qty |
|
|
|
|
|
+ 'x → ' + price + '<br/>'; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
if (prices_displayed != '') { |
|
|
|
|
|
$(product_ui).find('.price-tag').attr( |
|
|
|
|
|
'data-original-title', prices_displayed |
|
|
|
|
|
); |
|
|
|
|
|
$(product_ui).find('.price-tag').attr( |
|
|
|
|
|
'data-toggle', 'tooltip' |
|
|
|
|
|
); |
|
|
|
|
|
$(product_ui).find('.price-tag').tooltip( |
|
|
|
|
|
{delay: {show: 50, hide: 100}} |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
simulate_price: function (product, partner, price, qty) { |
|
|
|
|
|
// create a fake order in order to get price
|
|
|
|
|
|
// for this customer
|
|
|
|
|
|
var order = new module.Order({pos: this.pos}); |
|
|
|
|
|
order.set_client(partner); |
|
|
|
|
|
var orderline = new openerp.point_of_sale.Orderline |
|
|
|
|
|
({}, { |
|
|
|
|
|
pos: this.pos, order: order, |
|
|
|
|
|
product: product, price: price |
|
|
|
|
|
}); |
|
|
|
|
|
orderline.set_quantity(qty); |
|
|
|
|
|
// reset the sequence
|
|
|
|
|
|
this.pos.pos_session.sequence_number--; |
|
|
|
|
|
var prices = orderline.get_all_prices(); |
|
|
|
|
|
return prices; |
|
|
}, |
|
|
}, |
|
|
/** |
|
|
/** |
|
|
* |
|
|
* |
|
|
@ -482,7 +599,9 @@ function pos_pricelist_models(instance, module) { |
|
|
var line = orderLines[i]; |
|
|
var line = orderLines[i]; |
|
|
var product = line.product; |
|
|
var product = line.product; |
|
|
var quantity = line.quantity; |
|
|
var quantity = line.quantity; |
|
|
var price = this.compute_price_all(db, product, partner, quantity); |
|
|
|
|
|
|
|
|
var price = this.compute_price_all( |
|
|
|
|
|
db, product, partner, quantity |
|
|
|
|
|
); |
|
|
if (price !== false && price !== 0.0) { |
|
|
if (price !== false && price !== 0.0) { |
|
|
line.price = price; |
|
|
line.price = price; |
|
|
} |
|
|
} |
|
|
@ -490,7 +609,6 @@ function pos_pricelist_models(instance, module) { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* show error |
|
|
* show error |
|
|
* @param context |
|
|
* @param context |
|
|
@ -513,33 +631,55 @@ function pos_pricelist_models(instance, module) { |
|
|
var product_model = pos_model.find_model('product.product'); |
|
|
var product_model = pos_model.find_model('product.product'); |
|
|
if (_.size(product_model) == 1) { |
|
|
if (_.size(product_model) == 1) { |
|
|
var product_index = parseInt(Object.keys(product_model)[0]); |
|
|
var product_index = parseInt(Object.keys(product_model)[0]); |
|
|
pos_model.models[product_index].fields.push('categ_id', 'seller_ids'); |
|
|
|
|
|
|
|
|
pos_model.models[product_index].fields.push( |
|
|
|
|
|
'categ_id', 'seller_ids' |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var res_product_pricelist = pos_model.find_model('product.pricelist'); |
|
|
var res_product_pricelist = pos_model.find_model('product.pricelist'); |
|
|
if (_.size(res_product_pricelist) == 1) { |
|
|
if (_.size(res_product_pricelist) == 1) { |
|
|
var pricelist_index = parseInt(Object.keys(res_product_pricelist)[0]); |
|
|
|
|
|
|
|
|
var pricelist_index = parseInt(Object.keys( |
|
|
|
|
|
res_product_pricelist)[0] |
|
|
|
|
|
); |
|
|
pos_model.models.splice(++pricelist_index, 0, |
|
|
pos_model.models.splice(++pricelist_index, 0, |
|
|
{ |
|
|
{ |
|
|
model: 'account.fiscal.position.tax', |
|
|
model: 'account.fiscal.position.tax', |
|
|
fields: ['display_name', 'position_id', 'tax_src_id', 'tax_dest_id'], |
|
|
|
|
|
|
|
|
fields: ['display_name', |
|
|
|
|
|
'position_id', |
|
|
|
|
|
'tax_src_id', |
|
|
|
|
|
'tax_dest_id'], |
|
|
domain: null, |
|
|
domain: null, |
|
|
loaded: function (self, fiscal_position_taxes) { |
|
|
loaded: function (self, fiscal_position_taxes) { |
|
|
self.db.add_fiscal_position_taxes(fiscal_position_taxes); |
|
|
|
|
|
|
|
|
self.db.add_fiscal_position_taxes( |
|
|
|
|
|
fiscal_position_taxes |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
model: 'pricelist.partnerinfo', |
|
|
model: 'pricelist.partnerinfo', |
|
|
fields: ['display_name', 'min_quantity', 'name', 'price', 'suppinfo_id'], |
|
|
|
|
|
|
|
|
fields: ['display_name', |
|
|
|
|
|
'min_quantity', |
|
|
|
|
|
'name', |
|
|
|
|
|
'price', |
|
|
|
|
|
'suppinfo_id'], |
|
|
domain: null, |
|
|
domain: null, |
|
|
loaded: function (self, pricelist_partnerinfos) { |
|
|
loaded: function (self, pricelist_partnerinfos) { |
|
|
self.db.add_pricelist_partnerinfo(pricelist_partnerinfos); |
|
|
|
|
|
|
|
|
self.db.add_pricelist_partnerinfo( |
|
|
|
|
|
pricelist_partnerinfos |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
model: 'product.supplierinfo', |
|
|
model: 'product.supplierinfo', |
|
|
fields: ['delay', 'name', 'min_qty', 'pricelist_ids', 'product_code', 'product_name', 'sequence', |
|
|
|
|
|
'qty', 'product_tmpl_id'], |
|
|
|
|
|
|
|
|
fields: ['delay', |
|
|
|
|
|
'name', |
|
|
|
|
|
'min_qty', |
|
|
|
|
|
'pricelist_ids', |
|
|
|
|
|
'product_code', |
|
|
|
|
|
'product_name', |
|
|
|
|
|
'sequence', |
|
|
|
|
|
'qty', |
|
|
|
|
|
'product_tmpl_id'], |
|
|
domain: null, |
|
|
domain: null, |
|
|
loaded: function (self, supplierinfos) { |
|
|
loaded: function (self, supplierinfos) { |
|
|
self.db.add_supplierinfo(supplierinfos); |
|
|
self.db.add_supplierinfo(supplierinfos); |
|
|
@ -547,29 +687,22 @@ function pos_pricelist_models(instance, module) { |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
model: 'product.category', |
|
|
model: 'product.category', |
|
|
fields: ['name', 'display_name', 'parent_id', 'child_id'], |
|
|
|
|
|
|
|
|
fields: ['name', |
|
|
|
|
|
'display_name', |
|
|
|
|
|
'parent_id', |
|
|
|
|
|
'child_id'], |
|
|
domain: null, |
|
|
domain: null, |
|
|
loaded: function (self, categories) { |
|
|
loaded: function (self, categories) { |
|
|
self.db.add_product_categories(categories); |
|
|
self.db.add_product_categories(categories); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
|
|
|
model: 'ir.model.data', |
|
|
|
|
|
fields: ['res_id'], |
|
|
|
|
|
domain: function () { |
|
|
|
|
|
return [ |
|
|
|
|
|
['module', '=', 'product'], |
|
|
|
|
|
['name', '=', 'property_product_pricelist'] |
|
|
|
|
|
] |
|
|
|
|
|
}, |
|
|
|
|
|
loaded: function (self, res) { |
|
|
|
|
|
self.db.add_default_pricelist(res); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
{ |
|
|
model: 'product.pricelist', |
|
|
model: 'product.pricelist', |
|
|
fields: ['display_name', 'name', 'version_id', 'currency_id'], |
|
|
|
|
|
|
|
|
fields: ['display_name', |
|
|
|
|
|
'name', |
|
|
|
|
|
'version_id', |
|
|
|
|
|
'currency_id'], |
|
|
domain: function () { |
|
|
domain: function () { |
|
|
return [ |
|
|
return [ |
|
|
['type', '=', 'sale'] |
|
|
['type', '=', 'sale'] |
|
|
@ -581,7 +714,11 @@ function pos_pricelist_models(instance, module) { |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
model: 'product.pricelist.version', |
|
|
model: 'product.pricelist.version', |
|
|
fields: ['name', 'pricelist_id', 'date_start', 'date_end', 'items'], |
|
|
|
|
|
|
|
|
fields: ['name', |
|
|
|
|
|
'pricelist_id', |
|
|
|
|
|
'date_start', |
|
|
|
|
|
'date_end', |
|
|
|
|
|
'items'], |
|
|
domain: null, |
|
|
domain: null, |
|
|
loaded: function (self, versions) { |
|
|
loaded: function (self, versions) { |
|
|
self.db.add_pricelist_versions(versions); |
|
|
self.db.add_pricelist_versions(versions); |
|
|
@ -589,9 +726,20 @@ function pos_pricelist_models(instance, module) { |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
model: 'product.pricelist.item', |
|
|
model: 'product.pricelist.item', |
|
|
fields: ['name', 'base', 'base_pricelist_id', 'categ_id', 'min_quantity', |
|
|
|
|
|
'price_discount', 'price_max_margin', 'price_min_margin', 'price_round', 'price_surcharge', |
|
|
|
|
|
'price_version_id', 'product_id', 'product_tmpl_id', 'sequence' |
|
|
|
|
|
|
|
|
fields: ['name', |
|
|
|
|
|
'base', |
|
|
|
|
|
'base_pricelist_id', |
|
|
|
|
|
'categ_id', |
|
|
|
|
|
'min_quantity', |
|
|
|
|
|
'price_discount', |
|
|
|
|
|
'price_max_margin', |
|
|
|
|
|
'price_min_margin', |
|
|
|
|
|
'price_round', |
|
|
|
|
|
'price_surcharge', |
|
|
|
|
|
'price_version_id', |
|
|
|
|
|
'product_id', |
|
|
|
|
|
'product_tmpl_id', |
|
|
|
|
|
'sequence' |
|
|
], |
|
|
], |
|
|
domain: null, |
|
|
domain: null, |
|
|
loaded: function (self, items) { |
|
|
loaded: function (self, items) { |
|
|
@ -603,14 +751,21 @@ function pos_pricelist_models(instance, module) { |
|
|
fields: ['name', 'field', 'currency_id'], |
|
|
fields: ['name', 'field', 'currency_id'], |
|
|
domain: null, |
|
|
domain: null, |
|
|
loaded: function (self, price_types) { |
|
|
loaded: function (self, price_types) { |
|
|
// we need to add price type field to product.product model if not the case
|
|
|
|
|
|
var product_model = posmodel.find_model('product.product'); |
|
|
|
|
|
for(var i = 0, len = price_types.length; i < len; i++) { |
|
|
|
|
|
|
|
|
// we need to add price type
|
|
|
|
|
|
// field to product.product model if not the case
|
|
|
|
|
|
var product_model = |
|
|
|
|
|
posmodel.find_model('product.product'); |
|
|
|
|
|
for (var i = 0, len = price_types.length; |
|
|
|
|
|
i < len; i++) { |
|
|
var p_type = price_types[i].field; |
|
|
var p_type = price_types[i].field; |
|
|
if (_.size(product_model) == 1) { |
|
|
if (_.size(product_model) == 1) { |
|
|
var product_index = parseInt(Object.keys(product_model)[0]); |
|
|
|
|
|
if(posmodel.models[product_index].fields.indexOf(p_type) === -1) { |
|
|
|
|
|
posmodel.models[product_index].fields.push(p_type); |
|
|
|
|
|
|
|
|
var product_index = |
|
|
|
|
|
parseInt(Object.keys(product_model)[0]); |
|
|
|
|
|
if (posmodel.models[product_index] |
|
|
|
|
|
.fields.indexOf(p_type) === -1) { |
|
|
|
|
|
posmodel.models[product_index].fields.push( |
|
|
|
|
|
p_type |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -622,8 +777,12 @@ function pos_pricelist_models(instance, module) { |
|
|
|
|
|
|
|
|
var res_partner_model = pos_model.find_model('res.partner'); |
|
|
var res_partner_model = pos_model.find_model('res.partner'); |
|
|
if (_.size(res_partner_model) == 1) { |
|
|
if (_.size(res_partner_model) == 1) { |
|
|
var res_partner_index = parseInt(Object.keys(res_partner_model)[0]); |
|
|
|
|
|
pos_model.models[res_partner_index].fields.push('property_account_position', 'property_product_pricelist'); |
|
|
|
|
|
|
|
|
var res_partner_index = |
|
|
|
|
|
parseInt(Object.keys(res_partner_model)[0]); |
|
|
|
|
|
pos_model.models[res_partner_index].fields.push( |
|
|
|
|
|
'property_account_position', |
|
|
|
|
|
'property_product_pricelist' |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
Pedro M. Baeza
9 years ago