Skip to content

Commit c900275

Browse files
[MIG] sale_order_route to 18
1 parent a6f1d4a commit c900275

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

sale_order_route/__manifest__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{
66
'name': 'Sale Order Route',
7-
'version': '16.0.1.0.0',
7+
'version': '18.0.1.0.0',
88
'category': 'Sales',
99
'license': 'AGPL-3',
1010
'summary': 'Set route on sale order',
@@ -18,5 +18,5 @@
1818
'website': 'http://www.akretion.com',
1919
'depends': ['sale_stock'],
2020
'data': ['views/sale_order.xml', 'views/sale_report.xml'],
21-
'installable': False,
21+
'installable': True,
2222
}

sale_order_route/models/sale_order.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ class SaleOrder(models.Model):
1111
route_id = fields.Many2one(
1212
'stock.route', string='Route',
1313
ondelete='restrict', readonly=True, tracking=True,
14-
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
1514
check_company=True,
1615
domain="['|', ('company_id', '=', company_id), ('company_id', '=', False), ('sale_selectable', '=', True)]")
1716

@@ -22,7 +21,7 @@ def _action_confirm(self):
2221
vals = {'route_id': order.route_id.id or False}
2322
order.order_line.filtered(
2423
lambda l:
25-
l.product_id and l.product_id.type in ('product', 'consu')).write(vals)
24+
l.product_id and l.product_id.type == 'consu').write(vals)
2625
return super()._action_confirm()
2726

2827

@@ -35,7 +34,7 @@ class SaleOrderLine(models.Model):
3534
@api.depends('display_type', 'product_id')
3635
def _compute_route_id(self):
3736
for line in self:
38-
if not line.display_type and line.product_id and line.product_id.type in ('product', 'consu'):
37+
if not line.display_type and line.product_id and line.product_id.type == 'consu':
3938
line.route_id = line.order_id.route_id or False
4039
else:
4140
line.route_id = False

sale_order_route/views/sale_order.xml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,19 @@
1313
<field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock"/>
1414
<field name="arch" type="xml">
1515
<field name="partner_shipping_id" position="after">
16-
<field name="route_id" options="{'no_create_edit': True}"/>
16+
<field name="route_id" options="{'no_create_edit': True}" readonly="state not in ('draft', 'sent')"/>
1717
</field>
1818
</field>
1919
</record>
2020

2121
<record id="view_quotation_tree" model="ir.ui.view">
2222
<field name="model">sale.order</field>
23-
<field name="inherit_id" ref="sale_stock.view_quotation_tree"/>
23+
<field name="inherit_id" ref="sale_stock.sale_order_tree"/>
2424
<field name="arch" type="xml">
2525
<field name="warehouse_id" position="after">
2626
<field name="route_id" optional="hide"/>
2727
</field>
2828
</field>
2929
</record>
3030

31-
<record id="view_order_tree" model="ir.ui.view">
32-
<field name="model">sale.order</field>
33-
<field name="inherit_id" ref="sale_stock.view_order_tree"/>
34-
<field name="arch" type="xml">
35-
<field name="warehouse_id" position="after">
36-
<field name="route_id" optional="hide"/>
37-
</field>
38-
</field>
39-
</record>
40-
41-
4231
</odoo>

0 commit comments

Comments
 (0)