Browse Source
Merge pull request #251 from Tecnativa/10.0-pos_pricelist
[FIX] pos_pricelist: Use lower-version date comparison
pull/257/head
Pedro M. Baeza
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
pos_pricelist/__manifest__.py
-
pos_pricelist/static/src/js/models.js
|
|
@ -4,7 +4,7 @@ |
|
|
|
|
|
|
|
|
{ |
|
|
{ |
|
|
'name': 'POS Pricelist', |
|
|
'name': 'POS Pricelist', |
|
|
'version': '10.0.1.0.0', |
|
|
|
|
|
|
|
|
'version': '10.0.1.0.1', |
|
|
'category': 'Point Of Sale', |
|
|
'category': 'Point Of Sale', |
|
|
'author': "Tecnativa, " |
|
|
'author': "Tecnativa, " |
|
|
"Odoo SA, " |
|
|
"Odoo SA, " |
|
|
|
|
|
@ -145,8 +145,8 @@ odoo.define("pos_pricelist.models", function (require) { |
|
|
return (! item.product_tmpl_id || item.product_tmpl_id[0] === self.product_tmpl_id) && |
|
|
return (! item.product_tmpl_id || item.product_tmpl_id[0] === self.product_tmpl_id) && |
|
|
(! item.product_id || item.product_id[0] === self.id) && |
|
|
(! item.product_id || item.product_id[0] === self.id) && |
|
|
(! item.categ_id || _.contains(category_ids, item.categ_id[0])) && |
|
|
(! item.categ_id || _.contains(category_ids, item.categ_id[0])) && |
|
|
(! item.date_start || moment(item.date_start).isSameOrBefore(date)) && |
|
|
|
|
|
(! item.date_end || moment(item.date_end).isSameOrAfter(date)); |
|
|
|
|
|
|
|
|
(! item.date_start || moment(item.date_start) <= date) && |
|
|
|
|
|
(! item.date_end || moment(item.date_end) >= date); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
var price = self.lst_price; |
|
|
var price = self.lst_price; |
|
|
|
