diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..dc5e6b6 --- /dev/null +++ b/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import models diff --git a/__manifest__.py b/__manifest__.py new file mode 100644 index 0000000..dba2cad --- /dev/null +++ b/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + + +{ + 'name': 'pos_mrp', + 'version': '1.0', + 'category': 'Hidden', + 'sequence': 6, + 'summary': 'Link module between Point of Sale and Mrp', + 'description': """ +This is a link module between Point of Sale and Mrp. +""", + 'depends': ['point_of_sale', 'mrp'], + 'installable': True, + 'auto_install': True, + 'license': 'LGPL-3', +} diff --git a/i18n/pos_mrp.pot b/i18n/pos_mrp.pot new file mode 100644 index 0000000..96263b4 --- /dev/null +++ b/i18n/pos_mrp.pot @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-01-05 12:31+0000\n" +"PO-Revision-Date: 2024-01-05 12:31+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: pos_mrp +#: model:ir.model,name:pos_mrp.model_pos_order_line +msgid "Point of Sale Order Lines" +msgstr "" + +#. module: pos_mrp +#: model:ir.model,name:pos_mrp.model_pos_order +msgid "Point of Sale Orders" +msgstr "" diff --git a/i18n/ru.po b/i18n/ru.po new file mode 100644 index 0000000..07b0eba --- /dev/null +++ b/i18n/ru.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_mrp +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-01-05 12:31+0000\n" +"PO-Revision-Date: 2024-01-30 15:14+0400\n" +"Last-Translator: \n" +"Language-Team: Russian (https://app.transifex.com/odoo/teams/41243/ru/)\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#. module: pos_mrp +#: model:ir.model,name:pos_mrp.model_pos_order_line +msgid "Point of Sale Order Lines" +msgstr "Линии заказов в точках продаж" + +#. module: pos_mrp +#: model:ir.model,name:pos_mrp.model_pos_order +msgid "Point of Sale Orders" +msgstr "Заказы в торговых точках" diff --git a/models/__init__.py b/models/__init__.py new file mode 100644 index 0000000..04f8c2c --- /dev/null +++ b/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import pos_order diff --git a/models/pos_order.py b/models/pos_order.py new file mode 100644 index 0000000..a95fce9 --- /dev/null +++ b/models/pos_order.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models + +class PosOrderLine(models.Model): + _inherit = "pos.order.line" + + def _get_stock_moves_to_consider(self, stock_moves, product): + self.ensure_one() + bom = product.env['mrp.bom']._bom_find(product, company_id=stock_moves.company_id.id, bom_type='phantom')[product] + if not bom: + return super()._get_stock_moves_to_consider(stock_moves, product) + _dummy, components = bom.explode(product, self.qty) + ml_product_to_consider = (product.bom_ids and [comp[0].product_id.id for comp in components]) or [product.id] + return stock_moves.filtered(lambda ml: ml.product_id.id in ml_product_to_consider and ml.bom_line_id) + +class PosOrder(models.Model): + _inherit = "pos.order" + + def _get_pos_anglo_saxon_price_unit(self, product, partner_id, quantity): + bom = product.env['mrp.bom']._bom_find(product, company_id=self.mapped('picking_ids.move_line_ids').company_id.id, bom_type='phantom')[product] + if not bom: + return super()._get_pos_anglo_saxon_price_unit(product, partner_id, quantity) + dummy, components = bom.explode(product, quantity) + return sum(super(PosOrder, self)._get_pos_anglo_saxon_price_unit(comp[0].product_id, partner_id, comp[1]['qty']) for comp in components) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..4f3016c --- /dev/null +++ b/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import test_pos_mrp_flow diff --git a/tests/test_pos_mrp_flow.py b/tests/test_pos_mrp_flow.py new file mode 100644 index 0000000..4cc8956 --- /dev/null +++ b/tests/test_pos_mrp_flow.py @@ -0,0 +1,256 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import odoo + +from odoo.addons.point_of_sale.tests.common import TestPointOfSaleCommon +from odoo import fields +from odoo.tests.common import Form + +@odoo.tests.tagged('post_install', '-at_install') +class TestPosMrp(TestPointOfSaleCommon): + def test_bom_kit_order_total_cost(self): + #create a product category that use fifo + category = self.env['product.category'].create({ + 'name': 'Category for kit', + 'property_cost_method': 'fifo', + }) + + self.kit = self.env['product.product'].create({ + 'name': 'Kit Product', + 'available_in_pos': True, + 'type': 'product', + 'lst_price': 10.0, + 'categ_id': category.id, + }) + + self.component_a = self.env['product.product'].create({ + 'name': 'Comp A', + 'type': 'product', + 'available_in_pos': True, + 'lst_price': 10.0, + 'standard_price': 5.0, + }) + + self.component_b = self.env['product.product'].create({ + 'name': 'Comp B', + 'type': 'product', + 'available_in_pos': True, + 'lst_price': 10.0, + 'standard_price': 10.0, + }) + + bom_product_form = Form(self.env['mrp.bom']) + bom_product_form.product_id = self.kit + bom_product_form.product_tmpl_id = self.kit.product_tmpl_id + bom_product_form.product_qty = 1.0 + bom_product_form.type = 'phantom' + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.component_a + bom_line.product_qty = 1.0 + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.component_b + bom_line.product_qty = 1.0 + self.bom_a = bom_product_form.save() + + self.pos_config.open_ui() + order = self.env['pos.order'].create({ + 'session_id': self.pos_config.current_session_id.id, + 'lines': [(0, 0, { + 'name': self.kit.name, + 'product_id': self.kit.id, + 'price_unit': self.kit.lst_price, + 'qty': 1, + 'tax_ids': [[6, False, []]], + 'price_subtotal': self.kit.lst_price, + 'price_subtotal_incl': self.kit.lst_price, + })], + 'pricelist_id': self.pos_config.pricelist_id.id, + 'amount_paid': self.kit.lst_price, + 'amount_total': self.kit.lst_price, + 'amount_tax': 0.0, + 'amount_return': 0.0, + 'to_invoice': False, + 'last_order_preparation_change': '{}' + }) + 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() + + self.pos_config.current_session_id.action_pos_session_closing_control() + pos_order = self.env['pos.order'].search([], order='id desc', limit=1) + self.assertEqual(pos_order.lines[0].total_cost, 15.0) + + def test_bom_kit_with_kit_invoice_valuation(self): + # create a product category that use fifo + category = self.env['product.category'].create({ + 'name': 'Category for kit', + 'property_cost_method': 'fifo', + 'property_valuation': 'real_time', + }) + + self.kit = self.env['product.product'].create({ + 'name': 'Final Kit', + 'available_in_pos': True, + 'categ_id': category.id, + 'taxes_id': False, + 'type': 'product', + }) + + self.kit_2 = self.env['product.product'].create({ + 'name': 'Final Kit 2', + 'available_in_pos': True, + 'categ_id': category.id, + 'taxes_id': False, + 'type': 'product', + }) + + self.subkit1 = self.env['product.product'].create({ + 'name': 'Subkit 1', + 'available_in_pos': True, + 'categ_id': category.id, + 'taxes_id': False, + }) + + self.subkit2 = self.env['product.product'].create({ + 'name': 'Subkit 2', + 'available_in_pos': True, + 'categ_id': category.id, + 'taxes_id': False, + }) + + self.component_a = self.env['product.product'].create({ + 'name': 'Comp A', + 'available_in_pos': True, + 'standard_price': 5.0, + 'categ_id': category.id, + 'taxes_id': False, + }) + + self.component_b = self.env['product.product'].create({ + 'name': 'Comp B', + 'available_in_pos': True, + 'standard_price': 5.0, + 'categ_id': category.id, + 'taxes_id': False, + }) + + self.component_c = self.env['product.product'].create({ + 'name': 'Comp C', + 'available_in_pos': True, + 'standard_price': 5.0, + 'categ_id': category.id, + 'taxes_id': False, + }) + + bom_product_form = Form(self.env['mrp.bom']) + bom_product_form.product_id = self.subkit1 + bom_product_form.product_tmpl_id = self.subkit1.product_tmpl_id + bom_product_form.product_qty = 1.0 + bom_product_form.type = 'phantom' + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.component_a + bom_line.product_qty = 1.0 + self.bom_a = bom_product_form.save() + + bom_product_form = Form(self.env['mrp.bom']) + bom_product_form.product_id = self.subkit2 + bom_product_form.product_tmpl_id = self.subkit2.product_tmpl_id + bom_product_form.product_qty = 1.0 + bom_product_form.type = 'phantom' + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.component_b + bom_line.product_qty = 1.0 + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.component_c + bom_line.product_qty = 1.0 + self.bom_b = bom_product_form.save() + + bom_product_form = Form(self.env['mrp.bom']) + bom_product_form.product_id = self.kit + bom_product_form.product_tmpl_id = self.kit.product_tmpl_id + bom_product_form.product_qty = 1.0 + bom_product_form.type = 'phantom' + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.subkit1 + bom_line.product_qty = 1.0 + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.subkit2 + bom_line.product_qty = 1.0 + self.final_bom = bom_product_form.save() + + bom_product_form = Form(self.env['mrp.bom']) + bom_product_form.product_id = self.kit_2 + bom_product_form.product_tmpl_id = self.kit_2.product_tmpl_id + bom_product_form.product_qty = 1.0 + bom_product_form.type = 'phantom' + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.subkit1 + bom_line.product_qty = 2.0 + with bom_product_form.bom_line_ids.new() as bom_line: + bom_line.product_id = self.subkit2 + bom_line.product_qty = 3.0 + self.final_bom = bom_product_form.save() + + self.pos_config.open_ui() + order_data = {'data': + {'to_invoice': True, + 'amount_paid': 2.0, + 'amount_return': 0, + 'amount_tax': 0, + 'amount_total': 2.0, + 'creation_date': fields.Datetime.to_string(fields.Datetime.now()), + 'date_order': fields.Datetime.to_string(fields.Datetime.now()), + 'fiscal_position_id': False, + 'pricelist_id': self.pos_config.pricelist_id.id, + 'lines': [[0, + 0, + {'discount': 0, + 'pack_lot_ids': [], + 'price_unit': 2, + 'product_id': self.kit.id, + 'price_subtotal': 2, + 'price_subtotal_incl': 2, + 'qty': 1, + 'tax_ids': [(6, 0, self.kit.taxes_id.ids)]}], + [0, + 0, + {'discount': 0, + 'pack_lot_ids': [], + 'price_unit': 2, + 'product_id': self.kit_2.id, + 'price_subtotal': 2, + 'price_subtotal_incl': 2, + 'qty': 1, + 'tax_ids': [(6, 0, self.kit_2.taxes_id.ids)]}]], + 'name': 'Order 00042-003-0014', + 'partner_id': self.partner1.id, + 'pos_session_id': self.pos_config.current_session_id.id, + 'sequence_number': 2, + 'statement_ids': [[0, + 0, + {'amount': 2.0, + 'name': fields.Datetime.now(), + 'payment_method_id': self.cash_payment_method.id}]], + 'uid': '00042-003-0014', + 'user_id': self.env.uid}, + } + order = self.env['pos.order'].create_from_ui([order_data]) + order = self.env['pos.order'].browse(order[0]['id']) + self.assertEqual(order.lines.filtered(lambda l: l.product_id == self.kit).total_cost, 15.0) + accounts = self.kit.product_tmpl_id.get_product_accounts() + debit_interim_account = accounts['stock_output'] + credit_expense_account = accounts['expense'] + invoice_accounts = order.account_move.line_ids.mapped('account_id.id') + self.assertTrue(debit_interim_account.id in invoice_accounts) + self.assertTrue(credit_expense_account.id in invoice_accounts) + expense_line = order.account_move.line_ids.filtered(lambda l: l.account_id.id == credit_expense_account.id) + self.assertEqual(expense_line.filtered(lambda l: l.product_id == self.kit).credit, 0.0) + self.assertEqual(expense_line.filtered(lambda l: l.product_id == self.kit).debit, 15.0) + interim_line = order.account_move.line_ids.filtered(lambda l: l.account_id.id == debit_interim_account.id) + self.assertEqual(interim_line.filtered(lambda l: l.product_id == self.kit).credit, 15.0) + self.assertEqual(interim_line.filtered(lambda l: l.product_id == self.kit).debit, 0.0) + self.pos_config.current_session_id.action_pos_session_closing_control()