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

[IMP] product: pricelist convert boundary dates to datetime

Browse Source 
Before this commit, pricelist boundaries were dates. It was not possible to get a modified price at a precise time: e.g. modify the formula at 12h00.

closes odoo/odoo#49030

Taskid: 2221094
Related: odoo/upgrade#1055
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
Arnaud Joset
2020-04-09 14:52:31 +00:00
parent dea52493b8
commit b3149d84a0
2 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/models/product_pricelist.py
+5 -4
View File
@@ -131,8 +131,7 @@ class Pricelist(models.Model):
"""
self.ensure_one()
if not date:
date = self._context.get('date') or fields.Date.today()
date = fields.Date.to_date(date) # boundary conditions differ if we have a datetime
date = self._context.get('date') or fields.Datetime.now()
if not uom_id and self._context.get('uom'):
uom_id = self._context['uom']
if uom_id:
@@ -448,8 +447,10 @@ class PricelistItem(models.Model):
readonly=True, related='pricelist_id.currency_id', store=True)
active = fields.Boolean(
readonly=True, related="pricelist_id.active", store=True)
date_start = fields.Date('Start Date', help="Starting date for the pricelist item validation")
date_end = fields.Date('End Date', help="Ending valid for the pricelist item validation")
date_start = fields.Datetime('Start Date', help="Starting datetime for the pricelist item validation\n"
"The displayed value depends on the timezone set in your preferences.")
date_end = fields.Datetime('End Date', help="Ending datetime for the pricelist item validation\n"
"The displayed value depends on the timezone set in your preferences.")
compute_price = fields.Selection([
('fixed', 'Fixed Price'),
('percentage', 'Percentage (discount)'),
addons/product/tests/test_product_pricelist.py
+43 -1
View File
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from datetime import datetime
from odoo.tests.common import TransactionCase
from odoo.tools import float_compare, test_reports
@@ -32,6 +34,12 @@ class TestProductPricelist(TransactionCase):
'categ_id': self.category_5_id,
'standard_price': 800.0,
})
self.monitor = self.env['product.product'].create({
'name': 'Super nice monitor',
'categ_id': self.category_5_id,
'list_price': 1000.0,
})
self.env['product.supplierinfo'].create([
{
'name': self.res_partner_1.id,
@@ -51,6 +59,12 @@ class TestProductPricelist(TransactionCase):
'delay': 3,
'min_qty': 3,
'price': 785,
}, {
'name': self.res_partner_4.id,
'product_tmpl_id': self.monitor.product_tmpl_id.id,
'delay': 3,
'min_qty': 3,
'price': 100,
}
])
self.apple_in_ear_headphones = self.env['product.product'].create({
@@ -107,7 +121,16 @@ class TestProductPricelist(TransactionCase):
'compute_price': 'formula',
'price_discount': 30,
'base': 'list_price'
})]
}), (0, 0, {
'name': 'Fixed on all products',
'applied_on': '1_product',
'product_tmpl_id': self.monitor.product_tmpl_id.id,
'date_start': '2020-04-06 09:00:00',
'date_end': '2020-04-09 12:00:00',
'compute_price': 'formula',
'price_discount': 50,
'base': 'list_price'
})]
})
def test_10_calculation_price_of_products_pricelist(self):
@@ -160,3 +183,22 @@ class TestProductPricelist(TransactionCase):
partner = self.res_partner_4.with_context(context)
msg = "Wrong cost price: LCD Monitor if more than 3 Unit.should be 785 instead of %s" % ipad_mini._select_seller(partner_id=partner, quantity=3.0).price
self.assertEqual(float_compare(ipad_mini._select_seller(partner_id=partner, quantity=3.0).price, 785, precision_digits=2), 0, msg)
# Check if the pricelist is applied at precise datetime
context.update({'quantity': 1, 'date': datetime.strptime('2020-04-05 08:00:00', '%Y-%m-%d %H:%M:%S')})
monitor = self.monitor.with_context(context)
partner = self.res_partner_4.with_context(context)
msg = "Wrong cost price: LCD Monitor. should be 1000 instead of %s" % monitor._select_seller(
partner_id=partner, quantity=1.0).price
self.assertEqual(
float_compare(monitor.price, monitor.lst_price, precision_digits=2), 0,
msg)
context.update({'quantity': 1, 'date': datetime.strptime('2020-04-06 10:00:00', '%Y-%m-%d %H:%M:%S')})
monitor = self.monitor.with_context(context)
msg = "Wrong cost price: LCD Monitor. should be 500 instead of %s" % monitor._select_seller(
partner_id=partner, quantity=1.0).price
self.assertEqual(
float_compare(monitor.price, monitor.lst_price/2, precision_digits=2), 0,
msg)