initial commit 2

5 files changed, 65 insertions, 0 deletions

diff --git a/addons/sale_stock/wizard/__init__.py b/addons/sale_stock/wizard/__init__.py
new file mode 100644
index 00000000..8cacb400
--- /dev/null
+++ b/addons/sale_stock/wizard/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import stock_rules_report
+from . import sale_order_cancel
diff --git a/addons/sale_stock/wizard/sale_order_cancel.py b/addons/sale_stock/wizard/sale_order_cancel.py
new file mode 100644
index 00000000..8057c85c
--- /dev/null
+++ b/addons/sale_stock/wizard/sale_order_cancel.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class SaleOrderCancel(models.TransientModel):
+    _inherit = 'sale.order.cancel'
+
+    display_delivery_alert = fields.Boolean('Delivery Alert', compute='_compute_display_delivery_alert')
+
+    @api.depends('order_id')
+    def _compute_display_delivery_alert(self):
+        for wizard in self:
+            wizard.display_delivery_alert = bool(any(picking.state == 'done' for picking in wizard.order_id.picking_ids))
diff --git a/addons/sale_stock/wizard/sale_order_cancel_views.xml b/addons/sale_stock/wizard/sale_order_cancel_views.xml
new file mode 100644
index 00000000..3f98b5c5
--- /dev/null
+++ b/addons/sale_stock/wizard/sale_order_cancel_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="sale_order_cancel_view_form_inherit" model="ir.ui.view">
+        <field name="name">sale.order.cancel.form.inherit</field>
+        <field name="model">sale.order.cancel</field>
+        <field name="inherit_id" ref="sale.sale_order_cancel_view_form"/>
+        <field name="arch" type="xml">
+            <field name="display_invoice_alert" position="after">
+                <field name="display_delivery_alert" invisible="1"/>
+                <div attrs="{'invisible': [('display_delivery_alert', '=', False)]}">
+                    Some products have already been delivered. Returns can be created from the Delivery Orders.
+                </div>
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/sale_stock/wizard/stock_rules_report.py b/addons/sale_stock/wizard/stock_rules_report.py
new file mode 100644
index 00000000..e6abe934
--- /dev/null
+++ b/addons/sale_stock/wizard/stock_rules_report.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class StockRulesReport(models.TransientModel):
+    _inherit = 'stock.rules.report'
+
+    so_route_ids = fields.Many2many('stock.location.route', string='Apply specific routes',
+        domain="[('sale_selectable', '=', True)]", help="Choose to apply SO lines specific routes.")
+
+    def _prepare_report_data(self):
+        data = super(StockRulesReport, self)._prepare_report_data()
+        data['so_route_ids'] = self.so_route_ids.ids
+        return data
diff --git a/addons/sale_stock/wizard/stock_rules_report_views.xml b/addons/sale_stock/wizard/stock_rules_report_views.xml
new file mode 100644
index 00000000..61cad856
--- /dev/null
+++ b/addons/sale_stock/wizard/stock_rules_report_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_stock_rules_report_sale" model="ir.ui.view">
+        <field name="name">Stock Rules Report Sale</field>
+        <field name="model">stock.rules.report</field>
+        <field name="inherit_id" ref="stock.view_stock_rules_report"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='warehouse_ids']" position="after">
+                <field name="so_route_ids" widget="many2many_tags" groups="stock.group_adv_location"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>