From 85076a8d7543974940d97809648efd43eaa91760 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Mon, 22 Jul 2019 16:48:18 -0500 Subject: [PATCH] [FIX] stock_request: Losing partner_id and origin (#664) --- stock_request/__manifest__.py | 2 +- stock_request/i18n/ca.po | 1 + stock_request/i18n/de.po | 1 + stock_request/i18n/el_GR.po | 1 + stock_request/i18n/es.po | 1 + stock_request/i18n/es_ES.po | 1 + stock_request/i18n/eu.po | 1 + stock_request/i18n/fi.po | 1 + stock_request/i18n/fr.po | 1 + stock_request/i18n/fr_CH.po | 1 + stock_request/i18n/fr_FR.po | 1 + stock_request/i18n/gl.po | 1 + stock_request/i18n/hr.po | 1 + stock_request/i18n/hr_HR.po | 1 + stock_request/i18n/it.po | 1 + stock_request/i18n/nl.po | 1 + stock_request/i18n/nl_NL.po | 1 + stock_request/i18n/pt.po | 1 + stock_request/i18n/pt_BR.po | 1 + stock_request/i18n/ro.po | 1 + stock_request/i18n/ru.po | 1 + stock_request/i18n/sl.po | 1 + stock_request/i18n/stock_request.pot | 1 + stock_request/i18n/tr.po | 1 + stock_request/i18n/tr_TR.po | 1 + stock_request/i18n/vi_VN.po | 1 + stock_request/i18n/zh_CN.po | 1 + stock_request/models/__init__.py | 1 + stock_request/models/procurement_group.py | 19 +++++++++++++++++++ stock_request/tests/test_stock_request.py | 1 + 30 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 stock_request/models/procurement_group.py diff --git a/stock_request/__manifest__.py b/stock_request/__manifest__.py index bdf84c7ce..0cb806881 100644 --- a/stock_request/__manifest__.py +++ b/stock_request/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Stock Request", "summary": "Internal request for stock", - "version": "12.0.1.0.1", + "version": "12.0.1.0.2", "license": "LGPL-3", "website": "https://github.com/stock-logistics-warehouse", "author": "Eficent, " diff --git a/stock_request/i18n/ca.po b/stock_request/i18n/ca.po index 9f4e5c980..6be03811c 100644 --- a/stock_request/i18n/ca.po +++ b/stock_request/i18n/ca.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/de.po b/stock_request/i18n/de.po index 3f3e1cd49..dd37beec9 100644 --- a/stock_request/i18n/de.po +++ b/stock_request/i18n/de.po @@ -521,6 +521,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/el_GR.po b/stock_request/i18n/el_GR.po index 5840d7353..528e4cc78 100644 --- a/stock_request/i18n/el_GR.po +++ b/stock_request/i18n/el_GR.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/es.po b/stock_request/i18n/es.po index dfcb07fe5..75f7148c4 100644 --- a/stock_request/i18n/es.po +++ b/stock_request/i18n/es.po @@ -515,6 +515,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/es_ES.po b/stock_request/i18n/es_ES.po index 4d26a6e2a..200fad36e 100644 --- a/stock_request/i18n/es_ES.po +++ b/stock_request/i18n/es_ES.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/eu.po b/stock_request/i18n/eu.po index 52912ee0a..14f98f2e4 100644 --- a/stock_request/i18n/eu.po +++ b/stock_request/i18n/eu.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/fi.po b/stock_request/i18n/fi.po index 9d27bc482..0b4610ee5 100644 --- a/stock_request/i18n/fi.po +++ b/stock_request/i18n/fi.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/fr.po b/stock_request/i18n/fr.po index 69884ad53..584f94c59 100644 --- a/stock_request/i18n/fr.po +++ b/stock_request/i18n/fr.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/fr_CH.po b/stock_request/i18n/fr_CH.po index fb1c33f7c..1810781fc 100644 --- a/stock_request/i18n/fr_CH.po +++ b/stock_request/i18n/fr_CH.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/fr_FR.po b/stock_request/i18n/fr_FR.po index bfda48e94..369ea1324 100644 --- a/stock_request/i18n/fr_FR.po +++ b/stock_request/i18n/fr_FR.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/gl.po b/stock_request/i18n/gl.po index 1aed68600..a50c37280 100644 --- a/stock_request/i18n/gl.po +++ b/stock_request/i18n/gl.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/hr.po b/stock_request/i18n/hr.po index 36b5c90c4..cef1bd8e1 100644 --- a/stock_request/i18n/hr.po +++ b/stock_request/i18n/hr.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/hr_HR.po b/stock_request/i18n/hr_HR.po index d88a08529..226ff8a47 100644 --- a/stock_request/i18n/hr_HR.po +++ b/stock_request/i18n/hr_HR.po @@ -508,6 +508,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/it.po b/stock_request/i18n/it.po index 0c46b0645..2d334be6e 100644 --- a/stock_request/i18n/it.po +++ b/stock_request/i18n/it.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/nl.po b/stock_request/i18n/nl.po index 741137645..6265d5efd 100644 --- a/stock_request/i18n/nl.po +++ b/stock_request/i18n/nl.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/nl_NL.po b/stock_request/i18n/nl_NL.po index 70be96782..7f1d3682c 100644 --- a/stock_request/i18n/nl_NL.po +++ b/stock_request/i18n/nl_NL.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/pt.po b/stock_request/i18n/pt.po index 093a9267b..0e50b18e1 100644 --- a/stock_request/i18n/pt.po +++ b/stock_request/i18n/pt.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/pt_BR.po b/stock_request/i18n/pt_BR.po index c65ed764a..3056d02f7 100644 --- a/stock_request/i18n/pt_BR.po +++ b/stock_request/i18n/pt_BR.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/ro.po b/stock_request/i18n/ro.po index e8ae11344..dd75889c9 100644 --- a/stock_request/i18n/ro.po +++ b/stock_request/i18n/ro.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/ru.po b/stock_request/i18n/ru.po index cc8f7dddd..9c452947d 100644 --- a/stock_request/i18n/ru.po +++ b/stock_request/i18n/ru.po @@ -508,6 +508,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/sl.po b/stock_request/i18n/sl.po index 9a327eec1..d00fd36b5 100644 --- a/stock_request/i18n/sl.po +++ b/stock_request/i18n/sl.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/stock_request.pot b/stock_request/i18n/stock_request.pot index 31383ee2a..275f302fd 100644 --- a/stock_request/i18n/stock_request.pot +++ b/stock_request/i18n/stock_request.pot @@ -501,6 +501,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/tr.po b/stock_request/i18n/tr.po index 6e4751f27..3f136a39c 100644 --- a/stock_request/i18n/tr.po +++ b/stock_request/i18n/tr.po @@ -506,6 +506,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/tr_TR.po b/stock_request/i18n/tr_TR.po index b24a8060f..5bdc4a524 100644 --- a/stock_request/i18n/tr_TR.po +++ b/stock_request/i18n/tr_TR.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/vi_VN.po b/stock_request/i18n/vi_VN.po index e58f6a816..7dca82b4d 100644 --- a/stock_request/i18n/vi_VN.po +++ b/stock_request/i18n/vi_VN.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/i18n/zh_CN.po b/stock_request/i18n/zh_CN.po index 842095ea1..4803eaa80 100644 --- a/stock_request/i18n/zh_CN.po +++ b/stock_request/i18n/zh_CN.po @@ -507,6 +507,7 @@ msgid "Planned" msgstr "" #. module: stock_request +#: model:ir.model,name:stock_request.model_procurement_group #: model:ir.model.fields,field_description:stock_request.field_stock_request__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__procurement_group_id #: model:ir.model.fields,field_description:stock_request.field_stock_request_order__procurement_group_id diff --git a/stock_request/models/__init__.py b/stock_request/models/__init__.py index fd01e5671..679c50a80 100644 --- a/stock_request/models/__init__.py +++ b/stock_request/models/__init__.py @@ -1,3 +1,4 @@ +from . import procurement_group from . import stock_request_abstract from . import stock_request from . import stock_request_allocation diff --git a/stock_request/models/procurement_group.py b/stock_request/models/procurement_group.py new file mode 100644 index 000000000..9f697189f --- /dev/null +++ b/stock_request/models/procurement_group.py @@ -0,0 +1,19 @@ +# Copyright (C) 2019 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +from odoo import api, models + + +class ProcurementGroup(models.Model): + _inherit = 'procurement.group' + + @api.model + def run(self, product_id, product_qty, product_uom, location_id, name, + origin, values): + if 'stock_request_id' in values and values.get('stock_request_id'): + req = self.env['stock.request'].browse( + values.get('stock_request_id')) + if req.order_id: + origin = req.order_id.name + return super().run(product_id, product_qty, product_uom, location_id, + name, origin, values) diff --git a/stock_request/tests/test_stock_request.py b/stock_request/tests/test_stock_request.py index c7669db4e..255b6d8d1 100644 --- a/stock_request/tests/test_stock_request.py +++ b/stock_request/tests/test_stock_request.py @@ -530,6 +530,7 @@ class TestStockRequest(common.TransactionCase): self.assertEqual(stock_request.qty_in_progress, 5.0) self.assertEqual(stock_request.qty_done, 0.0) picking.action_assign() + self.assertEqual(picking.origin, order.name) packout1 = picking.move_line_ids[0] packout1.qty_done = 5 picking.action_done()