Skip to content

Commit e074014

Browse files
[MIG] base_delivery_carrier_files: Migration to 14.0
1 parent b541011 commit e074014

10 files changed

+21
-31
lines changed

base_delivery_carrier_files/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
44
{
55
"name": "Base Delivery Carrier Files",
6-
"version": "12.0.1.0.1",
6+
"version": "14.0.1.0.0",
77
"category": "Generic Modules/Warehouse",
88
"author": "Camptocamp,Odoo Community Association (OCA)",
99
"license": "AGPL-3",

base_delivery_carrier_files/models/delivery_carrier_file.py

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def get_write_mode_selection(self):
2929
"""
3030
return [("disk", "Disk")]
3131

32-
@api.multi
3332
def _write_file(self, filename, file_content):
3433
"""
3534
Method responsible of writing the file, on the filesystem or

base_delivery_carrier_files/models/stock_move.py

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,17 @@
22
# Author: Guewen Baconnier
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
44

5-
from odoo import api, models
5+
from odoo import models
66

77

88
class StockMove(models.Model):
99
_inherit = "stock.move"
1010

11-
@api.multi
1211
def write(self, values):
1312
write_result = super(StockMove, self).write(values)
14-
if values.get("state") and values["state"] == "done":
15-
picking_ids = list(map(lambda p: p.id, self.mapped("picking_id")))
16-
done_pickings = self.env["stock.picking"].search(
17-
[
18-
("id", "in", picking_ids),
19-
("state", "=", "done"),
20-
]
13+
if values.get("state") == "done":
14+
done_pickings = self.mapped("picking_id").filtered(
15+
lambda sp: sp.state == "done"
2116
)
2217
if done_pickings:
2318
done_pickings.generate_carrier_files()

base_delivery_carrier_files/models/stock_picking.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
# Author: Guewen Baconnier
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
44

5-
from odoo import api, fields, models
5+
from odoo import fields, models
66

77

88
class StockPicking(models.Model):
99
_inherit = "stock.picking"
1010

11-
@api.multi
1211
def generate_carrier_files(self, auto=True, recreate=False):
1312
"""
1413
Generates all the files for a list of pickings according to
@@ -48,9 +47,8 @@ def generate_carrier_files(self, auto=True, recreate=False):
4847
carrier_file.generate_files(carrier_file_ids[carrier_file.id])
4948
return True
5049

51-
@api.multi
52-
def action_done(self):
53-
result = super(StockPicking, self).action_done()
50+
def _action_done(self):
51+
result = super(StockPicking, self)._action_done()
5452
self.generate_carrier_files(auto=True)
5553
return result
5654

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* Guewen Baconnier <guewen.baconnier@camptocamp.com>
22
* Tom Blauwendraat <tom@sunflowerweb.nl>
33
* Marc Poch <mpoch@planetatic.com>
4+
* Stefan Rijnhart <stefan@opener.amsterdam>

base_delivery_carrier_files/security/ir.model.access.csv

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
22
access_delivery_carrier_file,delivery.carrier.file,model_delivery_carrier_file,sales_team.group_sale_salesman,1,0,0,0
33
access_delivery_carrier_file_manager,delivery.carrier.file manager,model_delivery_carrier_file,sales_team.group_sale_manager,1,1,1,1
44
access_delivery_carrier_file_partner_manager,delivery.carrier.file partner_manager,model_delivery_carrier_file,base.group_partner_manager,1,0,0,0
5+
access_delivery_carrier_file_generate,delivery.carrier.file.generate,model_delivery_carrier_file_generate,sales_team.group_sale_salesman,1,1,1,1

base_delivery_carrier_files/tests/test_base_delivery_carrier_files.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,7 @@ def setUp(self):
7070
}
7171
)
7272

73-
self.picking_type = self.env["stock.picking.type"].create(
74-
{
75-
"name": "Outgoing Ice Cream",
76-
"code": "outgoing",
77-
"sequence_id": self.env.ref("stock.sequence_mrp_op").id,
78-
}
79-
)
73+
self.picking_type = self.env.ref("stock.warehouse0").out_type_id
8074

8175
def test_carrier_file_generation(self):
8276
""" Test carrier file generation """
@@ -114,8 +108,11 @@ def test_carrier_file_generation(self):
114108
# I check outgoing shipment after stock availablity in refrigerator.
115109
picking.action_assign()
116110

117-
# I deliver outgoing shipment.
118-
picking.action_done()
111+
# I deliver the outgoing shipment.
112+
action = picking.button_validate()
113+
self.env[action["res_model"]].with_context(action["context"]).create(
114+
{}
115+
).process()
119116

120117
# I check shipment details after shipment
121118
# The carrier file must have been generated.
@@ -163,8 +160,11 @@ def test_manual_carrier_file_generation(self):
163160
# I check outgoing shipment after stock availablity in refrigerator.
164161
picking.action_assign()
165162

166-
# I deliver outgoing shipment.
167-
picking.action_done()
163+
# I deliver the outgoing shipment.
164+
action = picking.button_validate()
165+
self.env[action["res_model"]].with_context(action["context"]).create(
166+
{}
167+
).process()
168168

169169
# I check shipment details after shipment
170170
# The carrier file must NOT have been generated.

base_delivery_carrier_files/views/carrier_file_view.xml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<field name="name">Carrier File</field>
4242
<field name="type">ir.actions.act_window</field>
4343
<field name="res_model">delivery.carrier.file</field>
44-
<field name="view_type">form</field>
4544
<field name="view_mode">tree,form</field>
4645
</record>
4746

base_delivery_carrier_files/wizards/generate_carrier_files.py

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def _get_pickings(self):
1717
if context.get("active_model") == "stock.picking" and context.get("active_ids"):
1818
return self.env["stock.picking"].browse(context["active_ids"])
1919

20-
@api.multi
2120
def action_generate(self):
2221
"""
2322
Call the creation of the delivery carrier files
@@ -31,7 +30,6 @@ def action_generate(self):
3130
"stock.picking",
3231
string="Delivery Orders",
3332
default=_get_pickings,
34-
oldname="picking_ids",
3533
)
3634
recreate = fields.Boolean(
3735
"Recreate files",

base_delivery_carrier_files/wizards/generate_carrier_files_view.xml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<field name="name">Generate Carrier Files</field>
4848
<field name="type">ir.actions.act_window</field>
4949
<field name="res_model">delivery.carrier.file.generate</field>
50-
<field name="view_type">form</field>
5150
<field name="view_mode">form</field>
5251
<field name="view_id" ref="view_delivery_carrier_file_generate" />
5352
<field name="groups_id" eval="[(6, 0, [ref('stock.group_stock_manager')])]" />

0 commit comments

Comments
 (0)