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

Initial commit of purchase_by_sale_history_mrp for 11.0

Browse Source 
Additionally, refactor and improve `purchase_by_sale_history` to include current inventory demand (virtual_available) for specific warehouses.
This commit is contained in:
Jared Kipe
2018-09-29 09:32:31 -07:00
committed by Jared Kipe
parent 619670051d
commit 2533114ac3
3 changed files with 99 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
purchase_by_sale_history/tests/test_purchase_by_sale_history.py
View File

@@ -6,6 +6,12 @@ from datetime import datetime, timedelta
class TestPurchaseBySaleHistory(common.TransactionCase):
def test_00_wizard(self):
wh1 = self.env.ref('stock.warehouse0')
wh2 = self.env['stock.warehouse'].create({
'name': 'WH2',
'code': 'twh2',
})
sale_partner = self.env.ref('base.res_partner_2')
purchase_partner = self.env['res.partner'].create({
'name': 'Purchase Partner',
@@ -74,12 +80,13 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
'history_start': history_start,
'history_end': history_end,
'procure_days': days,
'history_warehouse_ids': [(4, wh1.id, None)],
})
self.assertEqual(wiz.history_days, days)
wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 3.0)
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 == product2).product_qty, 3.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 3.0 + 3.0)
# Make additional sales history...
sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15))
@@ -96,9 +103,29 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
}).action_confirm()
wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 6.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)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 6.0 + 6.0)
# Make additional sales history in other warehouse
sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15))
self.env['sale.order'].create({
'partner_id': sale_partner.id,
'date_order': sale_date,
'confirmation_date': sale_date,
'picking_policy': 'direct',
'warehouse_id': wh2.id,
'order_line': [
(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': product2.id, 'product_uom_qty': 3.0}),
],
}).action_confirm()
wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 6.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 + 6.0)
# Make additional sales history that should NOT be counted...
sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=61))
@@ -115,19 +142,39 @@ class TestPurchaseBySaleHistory(common.TransactionCase):
}).action_confirm()
wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.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 == product2).product_qty, 6.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 6.0 + 9.0)
# 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()
wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.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 == product2).product_qty, 0.0)
# Plan for 1/2 the days of inventory
wiz.procure_days = days / 2.0
wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 / 2.0)
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 3.0 + 9.0)
# Cause Inventory on existing product to make sure we don't order it.
adjust_product11 = self.env['stock.inventory'].create({
'name': 'Product11',
'location_id': wh1.lot_stock_id.id,
'product_id': product11.id,
'filter': 'product',
})
adjust_product11.action_start()
adjust_product11.line_ids.create({
'inventory_id': adjust_product11.id,
'product_id': product11.id,
'product_qty': 100.0,
'location_id': wh1.lot_stock_id.id,
})
adjust_product11.action_done()
wiz.action_confirm()
self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 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 == product2).product_qty, 0.0)

51
purchase_by_sale_history/wizard/purchase_by_sale_history.py
View File

@@ -16,6 +16,11 @@ class PurchaseBySaleHistory(models.TransientModel):
'and then multiplied by the days you wish to procure for.')
product_count = fields.Integer(string='Product Count', compute='_compute_product_count',
help='Products on the PO or that the Vendor provides.')
history_warehouse_ids = fields.Many2many('stock.warehouse', string='Warehouses',
help='Sales are calculated by these warehouses. '
'Current Inventory is summed from these warehouses. '
'If it is left blank then all warehouses and inventory '
'will be considered.')
@api.multi
@api.depends('history_start', 'history_end')
@@ -54,18 +59,48 @@ class PurchaseBySaleHistory(models.TransientModel):
return [r[0] for r in rows if r[0]]
def _sale_history(self, product_ids):
self.env.cr.execute("""SELECT product_id, sum(product_uom_qty)
FROM sale_report
WHERE date BETWEEN %s AND %s AND product_id IN %s
GROUP BY 1""", (self.history_start, self.history_end, tuple(product_ids)))
p_ids = tuple(product_ids)
if self.history_warehouse_ids:
wh_ids = tuple(self.history_warehouse_ids.ids)
self.env.cr.execute("""SELECT product_id, sum(product_uom_qty)
FROM sale_report
WHERE date BETWEEN %s AND %s AND product_id IN %s AND warehouse_id IN %s
GROUP BY 1""",
(self.history_start, self.history_end, p_ids, wh_ids))
else:
self.env.cr.execute("""SELECT product_id, sum(product_uom_qty)
FROM sale_report
WHERE date BETWEEN %s AND %s AND product_id IN %s
GROUP BY 1""",
(self.history_start, self.history_end, p_ids))
return self.env.cr.fetchall()
def _apply_history(self, history):
def _apply_history_product(self, product, history):
qty = ceil(history['sold_qty'] * self.procure_days / self.history_days)
history['buy_qty'] = max((0.0, qty - product.virtual_available))
def _apply_history(self, history, product_ids):
line_model = self.env['purchase.order.line']
updated_lines = line_model.browse()
for pid, sold_qty in history:
# Collect stock to consider against the sales demand.
product_model = self.env['product.product']
if self.history_warehouse_ids:
product_model = self.env['product.product']\
.with_context({'location': [wh.lot_stock_id.id for wh in self.history_warehouse_ids]})
products = product_model.browse(product_ids)
#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}
for p in products:
if p.id not in history_dict:
history_dict[p.id] = {'sold_qty': 0.0}
self._apply_history_product(p, history_dict[p.id])
for pid, history in history_dict.items():
# TODO: Should convert from Sale UOM to Purchase UOM
qty = ceil(sold_qty * self.procure_days / self.history_days)
qty = history.get('buy_qty', 0.0)
# Find line that already exists on PO
line = self.purchase_id.order_line.filtered(lambda l: l.product_id.id == pid)
if line:
@@ -95,6 +130,6 @@ class PurchaseBySaleHistory(models.TransientModel):
self.ensure_one()
history_product_ids = self._history_product_ids()
history = self._sale_history(history_product_ids)
self._apply_history(history)
self._apply_history(history, history_product_ids)

1
purchase_by_sale_history/wizard/purchase_by_sale_history_views.xml
View File

@@ -13,6 +13,7 @@
<field name="history_start"/>
<field name="history_end"/>
<field name="history_days"/>
<field name="history_warehouse_ids" widget="many2many_tags"/>
</group>
<group>
<field name="procure_days"/>