Skip to content

Commit 117ae55

Browse files
Reyes4711-S73Reyes4711-S73
committed
[MIG] maintenance_stock: Migration to 14.0
1 parent b6a5612 commit 117ae55

9 files changed

+78
-94
lines changed

‎maintenance_stock/__manifest__.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,23 @@
55
"summary": "Links maintenance requests to stock",
66
"author": "Odoo Community Association (OCA), Solvos",
77
"license": "AGPL-3",
8-
"version": "13.0.1.0.0",
8+
"version": "14.0.1.0.0",
99
"category": "Warehouse",
1010
"website": "https://github.com/OCA/maintenance",
11-
"depends": ["base_maintenance", "stock",],
11+
"depends": [
12+
"base_maintenance",
13+
"stock",
14+
],
1215
"data": [
1316
"views/maintenance_equipment_views.xml",
1417
"views/maintenance_request_views.xml",
1518
"views/stock_move_views.xml",
1619
"views/stock_move_line_views.xml",
1720
"views/stock_picking_views.xml",
1821
],
19-
"demo": ["data/demo_maintenance_stock.xml",],
22+
"demo": [
23+
"data/demo_maintenance_stock.xml",
24+
],
2025
"post_init_hook": "post_init_hook",
2126
"installable": True,
2227
}

‎maintenance_stock/data/demo_maintenance_stock.xml

+36-19
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
33
<data noupdate="1">
4+
<record id="location_inventory" model="stock.location">
5+
<field name="name">Inventory adjustment</field>
6+
<field name="usage">inventory</field>
47

8+
</record>
59
<record id="stock_warehouse_maintenance" model="stock.warehouse">
610
<field name="name">Maintenance Warehouse</field>
711
<field name="partner_id" ref="stock.res_partner_address_41" />
812
<field name="code">Main</field>
13+
<field name="reception_steps">one_step</field>
14+
<field name="delivery_steps">ship_only</field>
915
</record>
1016

1117
<function model="ir.model.data" name="_update_xmlids">
@@ -37,18 +43,20 @@
3743
<field name="uom_id" ref="uom.product_uom_unit" />
3844
<field name="uom_po_id" ref="uom.product_uom_unit" />
3945
<field
40-
name="image"
46+
name="image_1920"
4147
type="base64"
4248
file="maintenance_stock/static/img/toner.png"
4349
/>
50+
4451
</record>
4552

4653
<record id="stock_inventory_toner" model="stock.inventory">
4754
<field name="name">Inventory for Toner</field>
4855
<field
4956
name="product_ids"
50-
eval="[(4, ref('maintenance_stock.product_toner'))]"
57+
eval="[(6,0,[ref('maintenance_stock.product_toner'),])]"
5158
/>
59+
5260
</record>
5361

5462
<record id="stock_inventory_toner_line" model="stock.inventory.line">
@@ -58,8 +66,14 @@
5866
<field name="product_qty">50.0</field>
5967
<field name="location_id" ref="maintenance_stock.main_location_stock" />
6068
</record>
61-
62-
<function model="stock.inventory" name="_action_start">
69+
<function name="action_start" model="stock.inventory">
70+
<function
71+
eval="[[('id', '=', ref('maintenance_stock.stock_inventory_toner'))]]"
72+
model="stock.inventory"
73+
name="search"
74+
/>
75+
</function>
76+
<function model="stock.inventory" name="action_validate">
6377
<function
6478
eval="[[('state','=','draft'),('id', '=', ref('maintenance_stock.stock_inventory_toner'))]]"
6579
model="stock.inventory"
@@ -69,7 +83,7 @@
6983

7084
<function model="stock.inventory" name="action_validate">
7185
<function
72-
eval="[[('state','=','confirm'),('id', '=', ref('maintenance_stock.stock_inventory_toner'))]]"
86+
eval="[[('state','in', ['draft, 'confirm']),('id', '=', ref('maintenance_stock.stock_inventory_toner'))]]"
7387
model="stock.inventory"
7488
name="search"
7589
/>
@@ -81,6 +95,7 @@
8195
name="default_consumption_warehouse_id"
8296
ref="maintenance_stock.stock_warehouse_maintenance"
8397
/>
98+
8499
</record>
85100

86101
<record id="m_request_1" model="maintenance.request">
@@ -90,12 +105,13 @@
90105
<field name="equipment_id" ref="maintenance.equipment_printer1" />
91106
<field name="color">7</field>
92107
<field name="stage_id" ref="maintenance.stage_1" />
93-
<field
94-
name="maintenance_team_id"
95-
ref="maintenance.equipment_team_maintenance"
96-
/>
97-
</record>
98108

109+
</record>
110+
<record model="stock.quant" id="stock_quant_toner">
111+
<field name="product_id" ref="maintenance_stock.product_toner" />
112+
<field name="location_id" ref="maintenance_stock.main_location_stock" />
113+
<field name="quantity">1.0</field>
114+
</record>
99115
<record id="consuption_picking_m_request_1" model="stock.picking">
100116
<field
101117
name="picking_type_id"
@@ -105,6 +121,7 @@
105121
<field name="location_id" ref="maintenance_stock.main_location_stock" />
106122
<field name="location_dest_id" ref="maintenance_stock.main_location_cons" />
107123
<field name="maintenance_request_id" ref="maintenance_stock.m_request_1" />
124+
108125
<field
109126
name="move_lines"
110127
model="stock.move"
@@ -116,13 +133,7 @@
116133
'picking_type_id': ref('maintenance_stock.main_picking_type_cons'),
117134
'location_id': ref('maintenance_stock.main_location_stock'),
118135
'location_dest_id': ref('maintenance_stock.main_location_cons'),
119-
'move_line_ids': [(0, 0, {
120-
'product_id': ref('maintenance_stock.product_toner'),
121-
'qty_done': 1,
122-
'product_uom_id': ref('uom.product_uom_unit'),
123-
'location_id': ref('maintenance_stock.main_location_stock'),
124-
'location_dest_id': ref('maintenance_stock.main_location_cons'),
125-
})],
136+
126137
})]"
127138
/>
128139
</record>
@@ -134,8 +145,14 @@
134145
obj().env.ref('maintenance_stock.consuption_picking_m_request_1').id]"
135146
/>
136147
</function>
137-
138-
<function model="stock.picking" name="action_done">
148+
<function model="stock.picking" name="action_assign">
149+
<value
150+
model="stock.picking"
151+
eval="[
152+
obj().env.ref('maintenance_stock.consuption_picking_m_request_1').id]"
153+
/>
154+
</function>
155+
<function model="stock.picking" name="button_validate">
139156
<value
140157
model="stock.picking"
141158
eval="[

‎maintenance_stock/models/maintenance_equipment.py

-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
class MaintenanceEquipment(models.Model):
77
_inherit = "maintenance.equipment"
88

9-
stock_picking_ids = fields.One2many(
10-
comodel_name="stock.picking",
11-
inverse_name="maintenance_equipment_id",
12-
groups="stock.group_stock_user",
13-
)
149
allow_consumptions = fields.Boolean(
1510
groups="stock.group_stock_user",
1611
)

‎maintenance_stock/models/stock_warehouse.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ def _create_or_update_sequences_and_picking_types(self):
2020
# solved with a hook
2121
if "cons_type_id" in warehouse_data:
2222
PickingType.browse(warehouse_data["cons_type_id"]).write(
23-
{"return_picking_type_id": warehouse_data.get("in_type_id", False),}
23+
{
24+
"return_picking_type_id": warehouse_data.get("in_type_id", False),
25+
}
2426
)
2527
return warehouse_data
2628

@@ -41,8 +43,9 @@ def _get_picking_type_create_values(self, max_sequence):
4143
"use_existing_lots": True,
4244
"default_location_src_id": self.lot_stock_id.id,
4345
"default_location_dest_id": self.wh_cons_loc_id.id,
44-
"sequence": max_sequence_new,
46+
"sequence_code": max_sequence_new,
4547
"barcode": self.code.replace(" ", "").upper() + "-CONS",
48+
"company_id": self.company_id.id or self.env.company.id,
4649
},
4750
},
4851
max_sequence_new + 1,
@@ -64,8 +67,8 @@ def _get_sequence_values(self):
6467
},
6568
}
6669

67-
def _get_locations_values(self, vals):
68-
sub_locations = super()._get_locations_values(vals)
70+
def _get_locations_values(self, vals, code=False):
71+
sub_locations = super()._get_locations_values(vals, code)
6972
code = vals.get("code") or self.code
7073
code = code.replace(" ", "").upper()
7174
company_id = vals.get("company_id", self.company_id.id)

‎maintenance_stock/tests/test_maintenance_stock.py

+24-59
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# © 2020 Solvos Consultoría Informática (<http://www.solvos.es>)
22
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
33
import odoo.tests.common as test_common
4+
from odoo.tests.common import Form
45

56

67
class TestMaintenanceStock(test_common.TransactionCase):
78
def setUp(self):
89
super().setUp()
9-
1010
self.maintenance_warehouse = self.env["stock.warehouse"].create(
11-
{"name": "Test warehouse", "code": "TEST",}
12-
{"name": "Test warehouse", "code": "TEST"}
1311
{
1412
"name": "Test warehouse",
1513
"code": "TEST",
@@ -30,6 +28,7 @@ def setUp(self):
3028
{
3129
"name": "Test equipment",
3230
"allow_consumptions": True,
31+
"equipment_assign_to": "employee",
3332
"default_consumption_warehouse_id": self.maintenance_warehouse.id,
3433
}
3534
)
@@ -109,61 +108,26 @@ def test_request(self):
109108

110109
def test_picking(self):
111110
self.assertEqual(len(self.request_1.stock_picking_ids), 0)
112-
self.assertEqual(len(self.equipment_1.stock_picking_ids), 0)
113-
114-
qty_done = 5.0
115-
move_line_data = {
116-
"product_id": self.product1.id,
117-
"product_uom_id": self.env.ref("uom.product_uom_unit").id,
118-
"qty_done": qty_done,
119-
"location_id": self.maintenance_warehouse.lot_stock_id.id,
120-
"location_dest_id": self.maintenance_warehouse.wh_cons_loc_id.id,
121-
}
122-
location_id = self.maintenance_warehouse.lot_stock_id.id
123-
location_dest_id = self.maintenance_warehouse.wh_cons_loc_id.id
124-
picking_type_id = self.maintenance_warehouse.cons_type_id.id
125-
picking = self.env["stock.picking"].create(
111+
location_id = self.maintenance_warehouse.lot_stock_id
112+
location_dest_id = self.maintenance_warehouse.wh_cons_loc_id
113+
picking_type_id = self.maintenance_warehouse.cons_type_id
114+
self.env["stock.quant"].create(
126115
{
127-
"maintenance_request_id": self.request_1.id,
128-
"picking_type_id": picking_type_id,
129-
"location_id": location_id,
130-
"location_dest_id": location_dest_id,
131-
"move_lines": [
132-
(
133-
0,
134-
0,
135-
{
136-
"name": "Test move",
137-
"product_id": self.product1.id,
138-
"product_uom": self.env.ref("uom.product_uom_unit").id,
139-
"product_uom_qty": 5.0,
140-
"picking_type_id": picking_type_id,
141-
"location_id": location_id,
142-
"location_dest_id": location_dest_id,
143-
"move_line_ids": [
144-
(
145-
0,
146-
0,
147-
{
148-
"product_id": self.product1.id,
149-
"product_uom_id": self.env.ref(
150-
"uom.product_uom_unit"
151-
).id,
152-
"qty_done": qty_done,
153-
"location_id": location_id,
154-
"location_dest_id": location_dest_id,
155-
},
156-
)
157-
],
158-
},
159-
)
160-
],
116+
"product_id": self.product1.id,
117+
"location_id": location_id.id,
118+
"quantity": 5,
161119
}
162120
)
163-
121+
picking_form = Form(self.env["stock.picking"])
122+
picking_form.picking_type_id = picking_type_id
123+
picking_form.location_id = location_id
124+
picking_form.location_dest_id = location_dest_id
125+
with picking_form.move_ids_without_package.new() as move:
126+
move.product_id = self.product1
127+
move.product_uom_qty = 5.0
128+
picking = picking_form.save()
129+
picking.write({"maintenance_request_id": self.request_1.id})
164130
self.assertEqual(len(self.request_1.stock_picking_ids), 1)
165-
self.assertEqual(len(self.equipment_1.stock_picking_ids), 1)
166-
167131
stock_quant_obj = self.env["stock.quant"]
168132
domain_from = [
169133
("product_id", "=", self.product1.id),
@@ -173,11 +137,12 @@ def test_picking(self):
173137
("product_id", "=", self.product1.id),
174138
("location_id", "=", self.maintenance_warehouse.wh_cons_loc_id.id),
175139
]
176-
self.assertEqual(stock_quant_obj.search(domain_from).quantity, 0)
140+
self.assertEqual(stock_quant_obj.search(domain_from).quantity, 5)
177141
self.assertEqual(stock_quant_obj.search(domain_to).quantity, 0)
178142

179143
picking.action_confirm()
180-
picking.action_done()
181-
182-
self.assertEqual(stock_quant_obj.search(domain_from).quantity, -qty_done)
183-
self.assertEqual(stock_quant_obj.search(domain_to).quantity, qty_done)
144+
picking.action_assign()
145+
picking.move_line_ids.write({"qty_done": 5.0})
146+
picking.button_validate()
147+
self.assertEqual(stock_quant_obj.search(domain_from).quantity, 0)
148+
self.assertEqual(stock_quant_obj.search(domain_to).quantity, 5)

‎maintenance_stock/views/maintenance_request_views.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<field name="inherit_id" ref="maintenance.hr_equipment_request_view_search" />
77
<field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]" />
88
<field name="arch" type="xml">
9-
<xpath expr="//filter[@name='top_priority']" position="after">
9+
<xpath expr="//filter[@name='high_priority']" position="after">
1010
<separator />
1111
<filter
1212
string="Allow Consumptions"

‎maintenance_stock/views/stock_move_line_views.xml

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<field name="name">Product Moves</field>
6363
<field name="res_model">stock.move.line</field>
6464
<field name="type">ir.actions.act_window</field>
65-
<field name="view_type">form</field>
6665
<field name="view_mode">tree,kanban,pivot,form</field>
6766
<field name="view_id" ref="stock.view_move_line_tree" />
6867
<field name="domain">[('maintenance_request_id', '!=', False)]</field>

‎maintenance_stock/views/stock_move_views.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
</xpath>
5050
</field>
5151
</record>
52-
5352
<record id="stock_move_action" model="ir.actions.act_window">
5453
<field name="name">Stock Moves</field>
5554
<field name="res_model">stock.move</field>
5655
<field name="type">ir.actions.act_window</field>
56+
<field name="view_mode">form</field>
5757
<field name="view_id" ref="stock.view_move_tree" />
5858
<field name="search_view_id" ref="stock.view_move_search" />
5959
<field name="domain">[('maintenance_request_id', '!=', False)]</field>

‎maintenance_stock/views/stock_picking_views.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<field name="model">stock.picking</field>
66
<field name="inherit_id" ref="stock.view_picking_internal_search" />
77
<field name="arch" type="xml">
8-
<xpath expr="//field[@name='group_id']" position="after">
8+
<xpath expr="//field[@name='picking_type_id']" position="after">
99
<field name="maintenance_equipment_id" />
1010
<field name="maintenance_request_id" />
1111
</xpath>

0 commit comments

Comments
 (0)