diff options
| author | jem-odoo <jem@openerp.com> | 2018-08-07 16:36:13 +0200 |
|---|---|---|
| committer | jem-odoo <jem@openerp.com> | 2018-08-10 16:30:20 +0200 |
| commit | 8cdc95a331d9102778ff855f9bc4cdb7a8b6c9ba (patch) | |
| tree | f1aebca74c44067852207e0a01c2def355addb33 | |
| parent | ed987b73af4e13d8c8f3f5abdef807f47e98f8fe (diff) | |
[IMP] sale,stock: adapt schedule activity new type
Now, the style of exception activity depends on
the activity subtype, since a global warning type
exists.
| -rw-r--r-- | addons/purchase_stock/data/mail_data.xml | 2 | ||||
| -rw-r--r-- | addons/sale_stock/views/stock_views.xml | 4 | ||||
| -rw-r--r-- | addons/stock/models/stock_picking.py | 2 | ||||
| -rw-r--r-- | addons/stock/views/stock_template.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/addons/purchase_stock/data/mail_data.xml b/addons/purchase_stock/data/mail_data.xml index 9e00feab233..849e04af78f 100644 --- a/addons/purchase_stock/data/mail_data.xml +++ b/addons/purchase_stock/data/mail_data.xml @@ -2,7 +2,7 @@ <odoo> <template id="exception_on_po"> - <div class="alert alert-warning" role="alert"> + <div> Exception(s) occurred on the purchase order(s): <t t-foreach="purchase_order_ids" t-as="purchase_order"> <a href="#" data-oe-model="purchase.order" t-att-data-oe-id="purchase_order.id"><t t-esc="purchase_order.name"/></a>. diff --git a/addons/sale_stock/views/stock_views.xml b/addons/sale_stock/views/stock_views.xml index 80cc91c6069..23f28d21eb8 100644 --- a/addons/sale_stock/views/stock_views.xml +++ b/addons/sale_stock/views/stock_views.xml @@ -8,7 +8,7 @@ </template> <template id="exception_on_so"> - <div class="alert alert-warning" role="alert"> + <div> Exception(s) occurred on the sale order(s): <t t-foreach="sale_order_ids" t-as="sale_order"> <a href="#" data-oe-model="sale.order" t-att-data-oe-id="sale_order.id"><t t-esc="sale_order.name"/></a>. @@ -42,7 +42,7 @@ </template> <template id="exception_on_picking"> - <div class="alert alert-warning" role="alert"> + <div> Exception(s) occurred on the picking: <a href="#" data-oe-model="stock.picking" t-att-data-oe-id="origin_picking.id"><t t-esc="origin_picking.name"/></a>. Manual actions may be needed. diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index a4a73229c8a..d2172eef82e 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -923,7 +923,7 @@ class Picking(models.Model): note = render_method(rendering_context) self.env['mail.activity'].create({ - 'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id, + 'activity_type_id': self.env.ref('mail.mail_activity_data_warning').id, 'note': note, 'user_id': responsible.id, 'res_id': parent.id, diff --git a/addons/stock/views/stock_template.xml b/addons/stock/views/stock_template.xml index 119fbd2ff6c..fa3ae244ee2 100644 --- a/addons/stock/views/stock_template.xml +++ b/addons/stock/views/stock_template.xml @@ -102,7 +102,7 @@ </template> <template id="exception_on_picking"> - <div class="alert alert-warning" role="alert"> Exception(s) occurred on the picking + <div> Exception(s) occurred on the picking <a href="#" data-oe-model="stock.picking" t-att-data-oe-id="origin_picking.id"><t t-esc="origin_picking.name"/></a>. Manual actions may be needed. <div class="mt16"> |