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

[FIX] point_of_sale: correctly set owner on pos order refund

Browse Source 
Current behavior:
If set an owner on a product and make a pos order with this product then
refund this order. The owner would be lost on the refund.

Steps to reproduce:
- Activate the consignment feature
- Create a product, and add some stock with a owner (e.g. "John Doe")
- Create a pos order with this product
- Refund the pos order
- Go to the stock picking of the refund, the owner is not set on the
  move lines.

opw-3146749

closes odoo/odoo#116437

X-original-commit: 7f70d990b1f42d7a830cf5886637cb35d346e276
Signed-off-by: Trinh Jacky (trj) <trj@odoo.com>
Signed-off-by: Engels Robin (roen) <roen@odoo.com>
This commit is contained in:
roen-odoo
2023-03-24 20:56:21 +01:00
parent 03ab3a4352
commit 1a3bea26f3
2 changed files with 82 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/models/stock_picking.py
+15
View File
@@ -94,6 +94,21 @@ class StockPicking(models.Model):
moves = self.env['stock.move'].create(move_vals)
confirmed_moves = moves._action_confirm()
confirmed_moves._add_mls_related_to_order(lines, are_qties_done=True)
self._link_owner_on_return_picking(lines)
def _link_owner_on_return_picking(self, lines):
"""This method tries to retrieve the owner of the returned product"""
if lines[0].order_id.refunded_order_ids.picking_ids:
returned_lines_picking = lines[0].order_id.refunded_order_ids.picking_ids
returnable_qty_by_product = {}
for move_line in returned_lines_picking.move_line_ids:
returnable_qty_by_product[(move_line.product_id.id, move_line.owner_id.id or 0)] = move_line.qty_done
for move in self.move_line_ids:
for keys in returnable_qty_by_product:
if move.product_id.id == keys[0] and keys[1] and returnable_qty_by_product[keys] > 0:
move.write({'owner_id': keys[1]})
returnable_qty_by_product[keys] -= move.qty_done
def _send_confirmation_email(self):
# Avoid sending Mail/SMS for POS deliveries
addons/point_of_sale/tests/test_point_of_sale_flow.py
+67
View File
@@ -1303,3 +1303,70 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon):
pos_order_id = self.PosOrder.create_from_ui([product5_order])[0]['id']
pos_order = self.PosOrder.search([('id', '=', pos_order_id)])
self.assertEqual(pos_order.account_move.amount_residual, 0)
def test_order_refund_with_owner(self):
# open pos session
self.pos_config.open_ui()
current_session = self.pos_config.current_session_id
# set up product iwith SN tracing and create two lots (1001, 1002)
self.stock_location = self.company_data['default_warehouse'].lot_stock_id
self.product2 = self.env['product.product'].create({
'name': 'Product A',
'type': 'product',
'categ_id': self.env.ref('product.product_category_all').id,
})
self.env['stock.quant'].with_context(inventory_mode=True).create({
'product_id': self.product2.id,
'inventory_quantity': 1,
'location_id': self.stock_location.id,
'owner_id': self.partner1.id
}).action_apply_inventory()
# create pos order with the two SN created before
order = self.PosOrder.create({
'company_id': self.env.company.id,
'session_id': current_session.id,
'partner_id': self.partner1.id,
'lines': [(0, 0, {
'name': "OL/0001",
'id': 1,
'product_id': self.product2.id,
'price_unit': 6,
'discount': 0,
'qty': 1,
'tax_ids': [[6, False, []]],
'price_subtotal': 6,
'price_subtotal_incl': 6,
})],
'pricelist_id': 1,
'amount_paid': 6.0,
'amount_total': 6.0,
'amount_tax': 0.0,
'amount_return': 0.0,
'to_invoice': False,
})
payment_context = {"active_ids": order.ids, "active_id": order.id}
order_payment = self.PosMakePayment.with_context(**payment_context).create({
'amount': order.amount_total,
'payment_method_id': self.cash_payment_method.id
})
order_payment.with_context(**payment_context).check()
# I create a refund
refund_action = order.refund()
refund = self.PosOrder.browse(refund_action['res_id'])
payment_context = {"active_ids": refund.ids, "active_id": refund.id}
refund_payment = self.PosMakePayment.with_context(**payment_context).create({
'amount': refund.amount_total,
'payment_method_id': self.cash_payment_method.id,
})
# I click on the validate button to register the payment.
refund_payment.with_context(**payment_context).check()
current_session.action_pos_session_closing_control()
self.assertEqual(refund.picking_ids.move_line_ids_without_package.owner_id.id, order.picking_ids.move_line_ids_without_package.owner_id.id, "The owner of the refund is not the same as the owner of the original order")