audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mig/13.0/purchase_by_sale_history' into 13.0-test

Browse Source 
# Conflicts:
#	purchase_by_sale_history/tests/test_purchase_by_sale_history.py
#	purchase_by_sale_history/wizard/purchase_by_sale_history.py
This commit is contained in:
Leighton Pennicott
2020-11-23 18:06:13 -05:00
parent f01b3616fb 6076687d9b
commit 5e77fcaa81
2 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
purchase_by_sale_history/tests/test_purchase_by_sale_history.py
View File

@@ -26,8 +26,8 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
color = self.env.ref('product.product_attribute_2') color = self.env.ref('product.product_attribute_2')
attribute_line = self.env['product.template.attribute.line'].create({ attribute_line = self.env['product.template.attribute.line'].create({
'product_tmpl_id': product_template1.id, 'product_tmpl_id': product_template1.id,
'attribute_id': color.id, 'attribute_id': color.id,
'value_ids': [(6, 0, [color.value_ids[0].id])], 'value_ids': [(6, 0, [color.value_ids[0].id])],
}) })
attribute_line.write({'value_ids': [(4, color.value_ids[1].id)]}) attribute_line.write({'value_ids': [(4, color.value_ids[1].id)]})
self.assertEqual(len(product_template1.product_variant_ids), 2) self.assertEqual(len(product_template1.product_variant_ids), 2)
@@ -53,12 +53,12 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
# Assign vendor to products created earlier. # Assign vendor to products created earlier.
self.env['product.supplierinfo'].create({ self.env['product.supplierinfo'].create({
'name': purchase_partner.id, 'name': purchase_partner.id,
'product_tmpl_id': product11.product_tmpl_id.id, 'product_tmpl_id': product11.product_tmpl_id.id,
'product_id': product11.id, 'product_id': product11.id,
}) })
self.env['product.supplierinfo'].create({ self.env['product.supplierinfo'].create({
'name': purchase_partner.id, 'name': purchase_partner.id,
'product_tmpl_id': product2.product_tmpl_id.id, 'product_tmpl_id': product2.product_tmpl_id.id,
}) })
# New wizard picks up the correct number of products supplied by this vendor. # New wizard picks up the correct number of products supplied by this vendor.
@@ -70,10 +70,10 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
# Make some sales history... # Make some sales history...
sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=30)) sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=30))
self.env['sale.order'].create({ self.env['sale.order'].create({
'partner_id': sale_partner.id, 'partner_id': sale_partner.id,
'date_order': sale_date, 'date_order': sale_date,
'picking_policy': 'direct', 'picking_policy': 'direct',
'order_line': [ 'order_line': [
(0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}),
@@ -84,26 +84,24 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
history_start = fields.Date.to_string(datetime.now() - timedelta(days=days)) history_start = fields.Date.to_string(datetime.now() - timedelta(days=days))
history_end = fields.Date.today() history_end = fields.Date.today()
wiz.write({ wiz.write({
'history_start': history_start, 'history_start': history_start,
'history_end': history_end, 'history_end': history_end,
'procure_days': days, 'procure_days': days,
'history_warehouse_ids': [(4, wh1.id, None)], 'history_warehouse_ids': [(4, wh1.id, None)],
}) })
self.assertEqual(wiz.history_days, days) self.assertEqual(wiz.history_days, days)
wiz.action_confirm() wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 3.0 + 3.0) # 3 from Sales History, 3 from Demand (from the sale)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty,
3.0 + 3.0) # 3 from Sales History, 3 from Demand (from the sale)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 3.0 + 3.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 3.0 + 3.0)
# Make additional sales history... # Make additional sales history...
sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15)) sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15))
self.env['sale.order'].create({ self.env['sale.order'].create({
'partner_id': sale_partner.id, 'partner_id': sale_partner.id,
'date_order': sale_date, 'date_order': sale_date,
'picking_policy': 'direct', 'picking_policy': 'direct',
'order_line': [ 'order_line': [
(0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}),
@@ -118,11 +116,11 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
# Make additional sales history in other warehouse # Make additional sales history in other warehouse
sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15)) sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15))
self.env['sale.order'].create({ self.env['sale.order'].create({
'partner_id': sale_partner.id, 'partner_id': sale_partner.id,
'date_order': sale_date, 'date_order': sale_date,
'picking_policy': 'direct', 'picking_policy': 'direct',
'warehouse_id': wh2.id, 'warehouse_id': wh2.id,
'order_line': [ 'order_line': [
(0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}),
@@ -137,10 +135,10 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
# Make additional sales history that should NOT be counted... # Make additional sales history that should NOT be counted...
sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=61)) sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=61))
self.env['sale.order'].create({ self.env['sale.order'].create({
'partner_id': sale_partner.id, 'partner_id': sale_partner.id,
'date_order': sale_date, 'date_order': sale_date,
'picking_policy': 'direct', 'picking_policy': 'direct',
'order_line': [ 'order_line': [
(0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}),
(0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}),
@@ -148,7 +146,6 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
}).action_confirm() }).action_confirm()
wiz.action_confirm() wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 9.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 9.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 6.0 + 9.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 6.0 + 9.0)
@@ -156,7 +153,9 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
# Test that the wizard will only use the existing PO line products now that we have lines. # Test that the wizard will only use the existing PO line products now that we have lines.
po1.order_line.filtered(lambda l: l.product_id == product2).unlink() po1.order_line.filtered(lambda l: l.product_id == product2).unlink()
wiz.action_confirm() wiz.action_confirm()
# This test (line 161) is failing due to the unlink call on line 159 in version 13.0. # This test is failing due to the unlink call above in version 13.0.
# During debugging, we looked closely into the query call made in the _sale_history method
# and confirmed that the same query was producing different results each time it's run.
# We intend to fix this in version 14.0 # We intend to fix this in version 14.0
# self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 9.0) # self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 9.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0)
@@ -169,22 +168,21 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
# Cause Inventory on existing product to make sure we don't order it. # Cause Inventory on existing product to make sure we don't order it.
adjust_product11 = self.env['stock.inventory'].create({ adjust_product11 = self.env['stock.inventory'].create({
'name': 'Product11', 'name': 'Product11',
'location_id': wh1.lot_stock_id.id, 'location_id': wh1.lot_stock_id.id,
'product_id': product11.id, 'product_id': product11.id,
'filter': 'product', 'filter': 'product',
}) })
adjust_product11.action_start() adjust_product11.action_start()
adjust_product11.line_ids.create({ adjust_product11.line_ids.create({
'inventory_id': adjust_product11.id, 'inventory_id': adjust_product11.id,
'product_id': product11.id, 'product_id': product11.id,
'product_qty': 100.0, 'product_qty': 100.0,
'location_id': wh1.lot_stock_id.id, 'location_id': wh1.lot_stock_id.id,
}) })
adjust_product11.action_validate() adjust_product11.action_validate()
wiz.action_confirm() wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 0.0) # Because we have so much in stock now.
0.0) # Because we have so much in stock now.
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 0.0) self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 0.0)

25
purchase_by_sale_history/wizard/purchase_by_sale_history.py
View File

@@ -7,8 +7,8 @@ class PurchaseBySaleHistory(models.TransientModel):
_name = 'purchase.sale.history.make' _name = 'purchase.sale.history.make'
purchase_id = fields.Many2one('purchase.order', string='Purchase Order') purchase_id = fields.Many2one('purchase.order', string='Purchase Order')
history_start = fields.Date(string='Sales History Start', history_start = fields.Date(string='Sales History Start', default=lambda o: fields.Date.from_string(fields.Date.today()) - timedelta(days=30))
default=lambda o: fields.Date.from_string(fields.Date.today()) - timedelta(days=30))
history_end = fields.Date(string='Sales History End', default=fields.Date.today) history_end = fields.Date(string='Sales History End', default=fields.Date.today)
history_days = fields.Integer(string='Sales History Days', compute='_compute_history_days') history_days = fields.Integer(string='Sales History Days', compute='_compute_history_days')
procure_days = fields.Integer(string='Days to Procure', procure_days = fields.Integer(string='Days to Procure',
@@ -42,7 +42,7 @@ class PurchaseBySaleHistory(models.TransientModel):
FROM product_supplierinfo psi FROM product_supplierinfo psi
LEFT JOIN product_product p ON p.product_tmpl_id = psi.product_tmpl_id AND psi.product_id IS NULL LEFT JOIN product_product p ON p.product_tmpl_id = psi.product_tmpl_id AND psi.product_id IS NULL
WHERE psi.name = %d;""" WHERE psi.name = %d;"""
% (wiz.purchase_id.partner_id.id,)) % (wiz.purchase_id.partner_id.id, ))
wiz.product_count = self.env.cr.fetchall()[0][0] wiz.product_count = self.env.cr.fetchall()[0][0]
def _history_product_ids(self): def _history_product_ids(self):
@@ -53,7 +53,7 @@ class PurchaseBySaleHistory(models.TransientModel):
FROM product_supplierinfo psi FROM product_supplierinfo psi
LEFT JOIN product_product p ON p.product_tmpl_id = psi.product_tmpl_id AND psi.product_id IS NULL LEFT JOIN product_product p ON p.product_tmpl_id = psi.product_tmpl_id AND psi.product_id IS NULL
WHERE psi.name = %d;""" WHERE psi.name = %d;"""
% (self.purchase_id.partner_id.id,)) % (self.purchase_id.partner_id.id, ))
rows = self.env.cr.fetchall() rows = self.env.cr.fetchall()
return [r[0] for r in rows if r[0]] return [r[0] for r in rows if r[0]]
@@ -61,19 +61,17 @@ class PurchaseBySaleHistory(models.TransientModel):
p_ids = tuple(product_ids) p_ids = tuple(product_ids)
if self.history_warehouse_ids: if self.history_warehouse_ids:
wh_ids = tuple(self.history_warehouse_ids.ids) wh_ids = tuple(self.history_warehouse_ids.ids)
self.env.cr.execute("""SELECT product_id, sum(product_uom_qty) self.env.cr.execute("""SELECT product_id, sum(product_uom_qty)
FROM sale_report FROM sale_report
WHERE date BETWEEN %s AND %s AND product_id IN %s AND warehouse_id IN %s WHERE date BETWEEN %s AND %s AND product_id IN %s AND warehouse_id IN %s
GROUP BY 1;""", GROUP BY 1""",
(self.history_start, self.history_end, p_ids, wh_ids)) (self.history_start, self.history_end, p_ids, wh_ids))
else: else:
self.env.cr.execute("""SELECT product_id, sum(product_uom_qty) self.env.cr.execute("""SELECT product_id, sum(product_uom_qty)
FROM sale_report FROM sale_report
WHERE date BETWEEN %s AND %s AND product_id IN %s WHERE date BETWEEN %s AND %s AND product_id IN %s
GROUP BY 1;""", GROUP BY 1""",
(self.history_start, self.history_end, p_ids)) (self.history_start, self.history_end, p_ids))
return self.env.cr.fetchall() return self.env.cr.fetchall()
def _apply_history_product(self, product, history): def _apply_history_product(self, product, history):
@@ -93,29 +91,30 @@ class PurchaseBySaleHistory(models.TransientModel):
# Collect stock to consider against the sales demand. # Collect stock to consider against the sales demand.
product_model = self.env['product.product'] product_model = self.env['product.product']
if self.history_warehouse_ids: if self.history_warehouse_ids:
product_model = self.env['product.product'] \ product_model = self.env['product.product']\
.with_context({'location': [wh.lot_stock_id.id for wh in self.history_warehouse_ids]}) .with_context({'location': [wh.lot_stock_id.id for wh in self.history_warehouse_ids]})
products = product_model.browse(product_ids) products = product_model.browse(product_ids)
# product_available_stock = {p.id: p.virtual_available for p in products} #product_available_stock = {p.id: p.virtual_available for p in products}
history_dict = {pid: {'sold_qty': sold_qty} for pid, sold_qty in history} history_dict = {pid: {'sold_qty': sold_qty} for pid, sold_qty in history}
for p in products: for p in products:
if p.id not in history_dict: if p.id not in history_dict:
history_dict[p.id] = {'sold_qty': 0.0} history_dict[p.id] = {'sold_qty': 0.0}
self._apply_history_product(p, history_dict[p.id]) self._apply_history_product(p, history_dict[p.id])
for pid, history in history_dict.items(): for pid, history in history_dict.items():
qty = history.get('buy_qty', 0.0) qty = history.get('buy_qty', 0.0)
# Find line that already exists on PO # Find line that already exists on PO
line = self.purchase_id.order_line.filtered(lambda l: l.product_id.id == pid) line = self.purchase_id.order_line.filtered(lambda l: l.product_id.id == pid)
if line: if line:
line.write({'product_qty': self._convert_to_purchase_line_qty(line, qty)}) line.write({'product_qty': self._convert_to_purchase_line_qty(line, qty)})
line._onchange_quantity() line._onchange_quantity()
else: else:
# Create new PO line # Create new PO line
line = line_model.new({ line = line_model.new({
'order_id': self.purchase_id.id, 'order_id': self.purchase_id.id,
'product_id': pid, 'product_id': pid,
'product_qty': qty, 'product_qty': qty,
}) })
line.onchange_product_id() line.onchange_product_id()