mirror of
https://github.com/OCA/stock-logistics-warehouse.git
synced 2025-01-21 14:27:28 +02:00
[IMP] refactor to use pickings instead of inventories
This commit is contained in:
@@ -2,5 +2,4 @@
|
||||
# Copyright 2018 Camptocamp SA
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
|
||||
from . import models
|
||||
from . import wizard
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
],
|
||||
"category": "Stock",
|
||||
"data": [
|
||||
'data/stock_move_sequence.xml',
|
||||
'views/stock_view.xml',
|
||||
'wizard/stock_move_location.xml',
|
||||
],
|
||||
}
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<data noupdate="1">
|
||||
|
||||
<record id="sequence_inventory_move" model="ir.sequence">
|
||||
<field name="name">Inventory Move</field>
|
||||
<field name="code">stock.inventory.move</field>
|
||||
<field name="prefix">MOV</field>
|
||||
<field name="padding">3</field>
|
||||
<field name="number_next">1</field>
|
||||
<field name="number_increment">1</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0+e\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-12-28 14:49+0000\n"
|
||||
"PO-Revision-Date: 2018-12-28 14:49+0000\n"
|
||||
"POT-Creation-Date: 2019-01-08 23:43+0000\n"
|
||||
"PO-Revision-Date: 2019-01-08 23:43+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -16,39 +16,47 @@ msgstr ""
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_stock_move_location_form_stock_move_location
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_wiz_stock_move_location_form_stock_move_location
|
||||
msgid "Add all"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_wiz_stock_move_location_form_stock_move_location
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_inventory_comments
|
||||
msgid "Comments"
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_wiz_stock_move_location_form_stock_move_location
|
||||
msgid "Clear all"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_create_uid
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_create_uid
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_create_uid
|
||||
msgid "Created by"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_create_date
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_create_date
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_create_date
|
||||
msgid "Created on"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_inventory_destination_location_id
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_inventory_line_destination_location_id
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_destination_location_id
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_destination_location_id
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_destination_location_id
|
||||
msgid "Destination Location"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_display_name
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_display_name
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_display_name
|
||||
msgid "Display Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_id_9042
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_id
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_id
|
||||
msgid "ID"
|
||||
msgstr ""
|
||||
|
||||
@@ -57,61 +65,104 @@ msgstr ""
|
||||
msgid "Inventory"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_wiz_stock_move_location_form_stock_move_location
|
||||
msgid "Inventory Details"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model,name:stock_move_location.model_stock_inventory_line
|
||||
msgid "Inventory Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location___last_update
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location___last_update
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line___last_update
|
||||
msgid "Last Modified on"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_write_uid
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_write_uid
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_write_uid
|
||||
msgid "Last Updated by"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_write_date
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_write_date
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_write_date
|
||||
msgid "Last Updated on"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_stock_move_location_form_stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_lot_id
|
||||
msgid "Lot/Serial Number"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_max_quantity
|
||||
msgid "Maximum available quantity"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_wiz_stock_move_location_form_stock_move_location
|
||||
msgid "Move Location"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.actions.act_window,name:stock_move_location.stock_move_location_action
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_stock_move_location_line_ids
|
||||
msgid "Move Location lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.actions.act_window,name:stock_move_location.wiz_stock_move_location_action
|
||||
#: model:ir.ui.menu,name:stock_move_location.menuitem_move_location
|
||||
msgid "Move from location..."
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_move_location_origin_location_id
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_move_location_wizard_id
|
||||
msgid "Move location Wizard"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: code:addons/stock_move_location/wizard/stock_move_location_line.py:56
|
||||
#, python-format
|
||||
msgid "Move quantity can not exceed max quantity or be negative"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_origin_location_id
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_origin_location_id
|
||||
msgid "Origin Location"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: code:addons/stock_move_location/models/stock_inventory.py:40
|
||||
#, python-format
|
||||
msgid "Please select the destination of your move"
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_product_id
|
||||
msgid "Product"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model,name:stock_move_location.model_stock_move
|
||||
msgid "Stock Move"
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_product_uom_id
|
||||
msgid "Product Unit of Measure"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_inventory_inventory_type
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_stock_inventory_line_inventory_type
|
||||
msgid "Type"
|
||||
#: model:ir.model.fields,field_description:stock_move_location.field_wiz_stock_move_location_line_move_quantity
|
||||
msgid "Quantity to move"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model,name:stock_move_location.model_stock_move_location
|
||||
msgid "stock.move.location"
|
||||
#: model:ir.ui.view,arch_db:stock_move_location.view_wiz_stock_move_location_form_stock_move_location
|
||||
msgid "UoM"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model,name:stock_move_location.model_wiz_stock_move_location
|
||||
msgid "wiz.stock.move.location"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock_move_location
|
||||
#: model:ir.model,name:stock_move_location.model_wiz_stock_move_location_line
|
||||
msgid "wiz.stock.move.location.line"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
# Copyright (C) 2011 Julius Network Solutions SARL <contact@julius.fr>
|
||||
# Copyright 2018 Camptocamp SA
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
|
||||
from . import stock_inventory
|
||||
from . import inventory_line
|
||||
@@ -1,47 +0,0 @@
|
||||
# Copyright 2018 Camptocamp SA
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class InventoryLine(models.Model):
|
||||
_inherit = "stock.inventory.line"
|
||||
|
||||
destination_location_id = fields.Many2one(
|
||||
related="inventory_id.destination_location_id",
|
||||
readonly=True,
|
||||
)
|
||||
inventory_type = fields.Selection(
|
||||
related="inventory_id.inventory_type",
|
||||
)
|
||||
|
||||
def _get_move_location_values(self):
|
||||
self.ensure_one()
|
||||
location_id = self.inventory_id.destination_location_id
|
||||
date = self.inventory_id.date
|
||||
return {
|
||||
'name': ("MOVE:{}:{}".format(
|
||||
self.inventory_id.id,
|
||||
self.inventory_id.name,
|
||||
)),
|
||||
'move_line_ids': self._get_move_line_location_values(),
|
||||
'product_id': self.product_id.id,
|
||||
'product_uom': self.product_uom_id.id,
|
||||
'location_id': self.location_id.id,
|
||||
'location_dest_id': location_id.id,
|
||||
'date': date,
|
||||
}
|
||||
|
||||
def _get_move_line_location_values(self):
|
||||
self.ensure_one()
|
||||
location_id = self.inventory_id.destination_location_id
|
||||
return [
|
||||
(0, 0, {
|
||||
'product_id': self.product_id.id,
|
||||
'lot_id': self.prod_lot_id.id,
|
||||
'location_id': self.location_id.id,
|
||||
'location_dest_id': location_id.id,
|
||||
'qty_done': self.product_qty,
|
||||
'product_uom_id': self.product_uom_id.id,
|
||||
})
|
||||
]
|
||||
@@ -1,54 +0,0 @@
|
||||
# Copyright (C) 2011 Julius Network Solutions SARL <contact@julius.fr>
|
||||
# Copyright 2018 Camptocamp SA
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
|
||||
import logging
|
||||
|
||||
from odoo import _, fields, models
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class StockInventory(models.Model):
|
||||
_inherit = "stock.inventory"
|
||||
|
||||
def _select_inventory_type(self):
|
||||
return [
|
||||
('normal', 'Inventory'),
|
||||
('move', 'Location Move'),
|
||||
]
|
||||
|
||||
inventory_type = fields.Selection(
|
||||
string='Type',
|
||||
selection="_select_inventory_type",
|
||||
default='normal',
|
||||
)
|
||||
destination_location_id = fields.Many2one(
|
||||
string='Destination Location',
|
||||
comodel_name='stock.location',
|
||||
)
|
||||
comments = fields.Text(
|
||||
string='Comments',
|
||||
)
|
||||
|
||||
def move_stock(self):
|
||||
for inventory in self:
|
||||
if not inventory.destination_location_id:
|
||||
raise ValidationError(
|
||||
_('Please select the destination of your move')
|
||||
)
|
||||
moves = [
|
||||
(0, 0, line._get_move_location_values())
|
||||
for line in inventory.line_ids
|
||||
]
|
||||
self.write({
|
||||
'move_ids': moves,
|
||||
})
|
||||
self.mapped('move_ids')._action_done()
|
||||
self.write({
|
||||
"state": "done",
|
||||
})
|
||||
_logger.info("Move '{}' is done.".format(inventory.name))
|
||||
return True
|
||||
@@ -1,9 +1,10 @@
|
||||
* A new menuitem Stock > Move from location... opens a wizard
|
||||
where 2 location ca be specified.
|
||||
* Select origin and destination locations and press "MOVE LOCATION"
|
||||
* Select origin and destination locations and press "IMMEDIATE TRANSFER" or "PLANNED TRANSFER"
|
||||
* Press `ADD ALL` button to add all products available
|
||||
* Those lines can be edited. Move quantity can't be more than a max available quantity
|
||||
* Move doesn't care about the reservations and will move stuff anyway
|
||||
* If during you operation with the wizard the real quantity will change
|
||||
it will move only the available quantity at the button press
|
||||
* Products will be moved and a form view of inventory that did that will show up
|
||||
* Products will be moved and a form view of picking that did that will show up
|
||||
* If "PLANNED TRANSFER" is used - the picking won't be validated automatically
|
||||
|
||||
@@ -9,7 +9,7 @@ class TestsCommon(common.SavepointCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
super(TestsCommon, cls).setUpClass()
|
||||
super().setUpClass()
|
||||
cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
|
||||
cls.location_obj = cls.env["stock.location"]
|
||||
product_obj = cls.env["product.product"]
|
||||
@@ -49,6 +49,31 @@ class TestsCommon(common.SavepointCase):
|
||||
'product_id': cls.product_lots.id,
|
||||
})
|
||||
|
||||
def setup_product_amounts(self):
|
||||
self.set_product_amount(
|
||||
self.product_no_lots,
|
||||
self.internal_loc_1,
|
||||
123,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot1,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot2,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot3,
|
||||
)
|
||||
|
||||
def set_product_amount(self, product, location, amount, lot_id=None):
|
||||
self.env['stock.quant']._update_available_quantity(
|
||||
product,
|
||||
|
||||
@@ -8,33 +8,16 @@ from odoo.exceptions import ValidationError
|
||||
|
||||
class TestMoveLocation(TestsCommon):
|
||||
|
||||
def _create_wizard(self, origin_location, destination_location):
|
||||
return self.wizard_obj.create({
|
||||
"origin_location_id": origin_location.id,
|
||||
"destination_location_id": destination_location.id,
|
||||
})
|
||||
|
||||
def test_move_location_wizard(self):
|
||||
"""Test a simple move.
|
||||
"""
|
||||
self.set_product_amount(
|
||||
self.product_no_lots,
|
||||
self.internal_loc_1,
|
||||
123,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot1,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot2,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot3,
|
||||
)
|
||||
|
||||
self.setup_product_amounts()
|
||||
wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2)
|
||||
wizard.add_lines()
|
||||
wizard.action_move_location()
|
||||
@@ -63,39 +46,10 @@ class TestMoveLocation(TestsCommon):
|
||||
self.product_lots, self.internal_loc_2, 1, self.lot1,
|
||||
)
|
||||
|
||||
def _create_wizard(self, origin_location, destination_location):
|
||||
return self.wizard_obj.create({
|
||||
"origin_location_id": origin_location.id,
|
||||
"destination_location_id": destination_location.id,
|
||||
})
|
||||
|
||||
def test_move_location_wizard_amount(self):
|
||||
"""Can't move more than exists
|
||||
"""
|
||||
self.set_product_amount(
|
||||
self.product_no_lots,
|
||||
self.internal_loc_1,
|
||||
123,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot1,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot2,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot3,
|
||||
)
|
||||
|
||||
self.setup_product_amounts()
|
||||
wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2)
|
||||
wizard.add_lines()
|
||||
with self.assertRaises(ValidationError):
|
||||
@@ -104,29 +58,7 @@ class TestMoveLocation(TestsCommon):
|
||||
def test_move_location_wizard_ignore_reserved(self):
|
||||
"""Can't move more than exists
|
||||
"""
|
||||
self.set_product_amount(
|
||||
self.product_no_lots,
|
||||
self.internal_loc_1,
|
||||
123,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot1,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot2,
|
||||
)
|
||||
self.set_product_amount(
|
||||
self.product_lots,
|
||||
self.internal_loc_1,
|
||||
1,
|
||||
lot_id=self.lot3,
|
||||
)
|
||||
self.setup_product_amounts()
|
||||
wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2)
|
||||
wizard.add_lines()
|
||||
# reserve some quants
|
||||
@@ -152,3 +84,28 @@ class TestMoveLocation(TestsCommon):
|
||||
self.check_product_amount(
|
||||
self.product_lots, self.internal_loc_2, 1, self.lot1,
|
||||
)
|
||||
|
||||
def test_wizard_clear_lines(self):
|
||||
"""Test lines getting cleared properly
|
||||
"""
|
||||
self.setup_product_amounts()
|
||||
wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2)
|
||||
wizard.add_lines()
|
||||
self.assertEqual(len(wizard.stock_move_location_line_ids), 4)
|
||||
wizard._onchange_locations()
|
||||
self.assertEqual(len(wizard.stock_move_location_line_ids), 0)
|
||||
|
||||
def test_planned_transfer(self):
|
||||
"""Test planned transfer
|
||||
"""
|
||||
self.setup_product_amounts()
|
||||
wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2)
|
||||
wizard.add_lines()
|
||||
wizard.with_context({'planned': True}).action_move_location()
|
||||
picking = wizard.picking_id
|
||||
self.assertEqual(picking.state, 'draft')
|
||||
self.assertEqual(len(picking.move_line_ids), 4)
|
||||
self.assertEqual(
|
||||
sorted(picking.move_line_ids.mapped("qty_done")),
|
||||
[1, 1, 1, 123],
|
||||
)
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="view_stock_inventory_form_stock_move_location" model="ir.ui.view">
|
||||
<field name="name">stock.inventory.form.stock_move_location</field>
|
||||
<field name="model">stock.inventory</field>
|
||||
<field name="inherit_id" ref="stock.view_inventory_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='location_id']" position="after">
|
||||
<field name="inventory_type" invisible="1"/>
|
||||
<field name="destination_location_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('inventory_type', '!=', 'move')]}" />
|
||||
</xpath>
|
||||
<xpath expr="//tree/field[@name='location_id']" position="after">
|
||||
<field name="inventory_type" invisible="1"/>
|
||||
<field name="destination_location_id" attrs="{'invisible': [('inventory_type', '!=', 'move')]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -25,6 +25,10 @@ class StockMoveLocationWizard(models.TransientModel):
|
||||
comodel_name="wiz.stock.move.location.line",
|
||||
inverse_name="move_location_wizard_id",
|
||||
)
|
||||
picking_id = fields.Many2one(
|
||||
string="Connected Picking",
|
||||
comodel_name="stock.picking",
|
||||
)
|
||||
|
||||
@api.onchange('origin_location_id', 'destination_location_id')
|
||||
def _onchange_locations(self):
|
||||
@@ -43,42 +47,33 @@ class StockMoveLocationWizard(models.TransientModel):
|
||||
def _get_locations_domain(self):
|
||||
return [('usage', '=', 'internal')]
|
||||
|
||||
def _create_picking(self):
|
||||
return self.env['stock.picking'].create({
|
||||
'picking_type_id': self.env.ref('stock.picking_type_internal').id,
|
||||
'location_id': self.origin_location_id.id,
|
||||
'location_dest_id': self.destination_location_id.id,
|
||||
})
|
||||
|
||||
def _create_moves(self, picking):
|
||||
return self.stock_move_location_line_ids.create_move_lines(picking)
|
||||
|
||||
@api.multi
|
||||
def action_move_location(self):
|
||||
inventory_obj = self.env["stock.inventory"]
|
||||
collected_inventory = inventory_obj.create(
|
||||
self._get_collected_inventory_values()
|
||||
)
|
||||
collected_inventory.action_start()
|
||||
self.set_inventory_lines(collected_inventory)
|
||||
collected_inventory.move_stock()
|
||||
return self._get_inventory_action(collected_inventory.id)
|
||||
self.ensure_one()
|
||||
picking = self._create_picking()
|
||||
self._create_moves(picking)
|
||||
if not self.env.context.get("planned"):
|
||||
picking.button_validate()
|
||||
self.picking_id = picking
|
||||
return self._get_picking_action(picking.id)
|
||||
|
||||
def _get_collected_inventory_name(self):
|
||||
sequence = self.env['ir.sequence'].next_by_code(
|
||||
'stock.inventory.move') or '/'
|
||||
res = "{sequence}:{location_from}:{location_to}".format(
|
||||
sequence=sequence,
|
||||
location_from=self.origin_location_id.display_name,
|
||||
location_to=self.destination_location_id.display_name,
|
||||
)
|
||||
return res
|
||||
|
||||
def _get_collected_inventory_values(self):
|
||||
return {
|
||||
"name": self._get_collected_inventory_name(),
|
||||
"location_id": self.origin_location_id.id,
|
||||
"inventory_type": "move",
|
||||
"destination_location_id": self.destination_location_id.id,
|
||||
"filter": "partial",
|
||||
}
|
||||
|
||||
def _get_inventory_action(self, inventory_id):
|
||||
action = self.env.ref("stock.action_inventory_form").read()[0]
|
||||
form_view = self.env.ref("stock.view_inventory_form").id
|
||||
def _get_picking_action(self, pickinig_id):
|
||||
action = self.env.ref("stock.action_picking_tree_all").read()[0]
|
||||
form_view = self.env.ref("stock.view_picking_form").id
|
||||
action.update({
|
||||
"view_mode": "form",
|
||||
"views": [(form_view, "form")],
|
||||
"res_id": inventory_id,
|
||||
"res_id": pickinig_id,
|
||||
})
|
||||
return action
|
||||
|
||||
@@ -133,53 +128,3 @@ class StockMoveLocationWizard(models.TransientModel):
|
||||
return {
|
||||
"type": "ir.action.do_nothing",
|
||||
}
|
||||
|
||||
def _get_inventory_lines_values(self, inventory):
|
||||
self.ensure_one()
|
||||
lines = []
|
||||
for wizard_line in self.stock_move_location_line_ids:
|
||||
lines.append({
|
||||
'product_id': wizard_line.product_id.id,
|
||||
'product_uom_id': wizard_line.product_uom_id.id,
|
||||
'prod_lot_id': wizard_line.lot_id.id,
|
||||
'product_qty': self._get_available_quantity(wizard_line),
|
||||
'inventory_id': inventory.id,
|
||||
'location_id': self.origin_location_id.id,
|
||||
})
|
||||
return lines
|
||||
|
||||
def set_inventory_lines(self, inventory):
|
||||
inventory_line_obj = self.env["stock.inventory.line"]
|
||||
for line_vals in self._get_inventory_lines_values(inventory):
|
||||
inventory_line_obj.create(line_vals)
|
||||
|
||||
def _get_available_quantity(self, line):
|
||||
"""We check here if the actual amount changed in the stock.
|
||||
|
||||
We don't care about the reservations but we do care about not moving
|
||||
more than exists."""
|
||||
if not line.product_id:
|
||||
return 0
|
||||
# switched to sql here to improve performance and lower db queries
|
||||
self.env.cr.execute(self._get_specific_quants_sql(line))
|
||||
available_qty = self.env.cr.fetchone()[0]
|
||||
if available_qty < line.move_quantity:
|
||||
return available_qty
|
||||
return line.move_quantity
|
||||
|
||||
def _get_specific_quants_sql(self, line):
|
||||
lot = "AND lot_id = {}".format(line.lot_id.id)
|
||||
if not line.lot_id:
|
||||
lot = "AND lot_id is null"
|
||||
return """
|
||||
SELECT sum(quantity)
|
||||
FROM stock_quant
|
||||
WHERE location_id = {location}
|
||||
{lot}
|
||||
AND product_id = {product}
|
||||
GROUP BY location_id, product_id, lot_id
|
||||
""".format(
|
||||
location=line.origin_location_id.id,
|
||||
product=line.product_id.id,
|
||||
lot=lot,
|
||||
)
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
</field>
|
||||
</group>
|
||||
<footer>
|
||||
<button name="action_move_location" string="Move Location" type="object" class="btn-primary"/>
|
||||
<button name="action_move_location" string="Immediate Transfer" type="object" class="btn-primary"/>
|
||||
<button name="action_move_location" string="Planned Transfer" type="object" class="btn-primary" context="{'planned': True}"/>
|
||||
<button special="cancel" string="Cancel" class="btn-default"/>
|
||||
</footer>
|
||||
</sheet>
|
||||
|
||||
@@ -14,10 +14,12 @@ class StockMoveLocationWizardLine(models.TransientModel):
|
||||
string="Move location Wizard",
|
||||
comodel_name="wiz.stock.move.location",
|
||||
ondelete="cascade",
|
||||
required=True,
|
||||
)
|
||||
product_id = fields.Many2one(
|
||||
string="Product",
|
||||
comodel_name="product.product",
|
||||
required=True,
|
||||
)
|
||||
origin_location_id = fields.Many2one(
|
||||
string='Origin Location',
|
||||
@@ -56,3 +58,54 @@ class StockMoveLocationWizardLine(models.TransientModel):
|
||||
raise ValidationError(_(
|
||||
"Move quantity can not exceed max quantity or be negative"
|
||||
))
|
||||
|
||||
def create_move_lines(self, picking):
|
||||
for line in self:
|
||||
self.env["stock.move.line"].create(
|
||||
self._get_move_line_values(line, picking)
|
||||
)
|
||||
return True
|
||||
|
||||
def _get_move_line_values(self, line, picking):
|
||||
return {
|
||||
"product_id": line.product_id.id,
|
||||
"lot_id": line.lot_id.id,
|
||||
"location_id": line.origin_location_id.id,
|
||||
"location_dest_id": line.destination_location_id.id,
|
||||
"qty_done": line._get_available_quantity(),
|
||||
"product_uom_id": line.product_uom_id.id,
|
||||
"picking_id": picking.id,
|
||||
}
|
||||
|
||||
def _get_available_quantity(self):
|
||||
"""We check here if the actual amount changed in the stock.
|
||||
|
||||
We don't care about the reservations but we do care about not moving
|
||||
more than exists."""
|
||||
self.ensure_one()
|
||||
if not self.product_id:
|
||||
return 0
|
||||
# switched to sql here to improve performance and lower db queries
|
||||
self.env.cr.execute(self._get_specific_quants_sql())
|
||||
available_qty = self.env.cr.fetchone()[0]
|
||||
if available_qty < self.move_quantity:
|
||||
return available_qty
|
||||
return self.move_quantity
|
||||
|
||||
def _get_specific_quants_sql(self):
|
||||
self.ensure_one()
|
||||
lot = "AND lot_id = {}".format(self.lot_id.id)
|
||||
if not self.lot_id:
|
||||
lot = "AND lot_id is null"
|
||||
return """
|
||||
SELECT sum(quantity)
|
||||
FROM stock_quant
|
||||
WHERE location_id = {location}
|
||||
{lot}
|
||||
AND product_id = {product}
|
||||
GROUP BY location_id, product_id, lot_id
|
||||
""".format(
|
||||
location=self.origin_location_id.id,
|
||||
product=self.product_id.id,
|
||||
lot=lot,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user