diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml index c39c1d3c68e..51c26e49583 100644 --- a/addons/account/views/account_payment_view.xml +++ b/addons/account/views/account_payment_view.xml @@ -70,7 +70,7 @@
- +
diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml index f5501228169..543f2b5a9f7 100644 --- a/addons/account/views/account_portal_templates.xml +++ b/addons/account/views/account_portal_templates.xml @@ -48,13 +48,13 @@ - Waiting for Payment + Waiting for Payment - Paid + Paid - Cancelled + Cancelled diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml index 16c471649b7..3f1270a124a 100644 --- a/addons/account_payment/views/account_portal_templates.xml +++ b/addons/account_payment/views/account_portal_templates.xml @@ -17,19 +17,19 @@ - Waiting for Payment + Waiting for Payment - Authorized + Authorized - Pending + Pending - Paid + Paid - Cancelled + Cancelled diff --git a/addons/calendar/views/calendar_templates.xml b/addons/calendar/views/calendar_templates.xml index 987d7ef1cb6..828245f4951 100644 --- a/addons/calendar/views/calendar_templates.xml +++ b/addons/calendar/views/calendar_templates.xml @@ -35,7 +35,7 @@
- + Yes I'm going. No I'm not going. diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 6a3b3b4c505..42d899b77f1 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -52,7 +52,7 @@
-
Won
+
Won
-
Lost
-
Won
+
Lost
+
Won
- +
@@ -341,7 +341,7 @@
- +
diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml index 3efe8b9942b..a98fd8e4624 100644 --- a/addons/hr_timesheet/views/project_views.xml +++ b/addons/hr_timesheet/views/project_views.xml @@ -151,7 +151,7 @@
-
+
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index 93732a20505..ef6eb31a593 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -6,9 +6,9 @@ Planned activities - - - + + +
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index a12bc655da8..b411b73504f 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -62,7 +62,7 @@
- Canceled + Canceled
@@ -451,10 +451,10 @@
-
+
Request
-
+
diff --git a/addons/mrp/static/src/js/mrp.js b/addons/mrp/static/src/js/mrp.js index ea6a06fc5e3..154b65ce473 100644 --- a/addons/mrp/static/src/js/mrp.js +++ b/addons/mrp/static/src/js/mrp.js @@ -38,7 +38,7 @@ var SetBulletStatus = AbstractField.extend({ var title = this.value === 'waiting' ? _t('Waiting Materials') : _t('Ready to produce'); this.$el.attr({'title': title, 'style': 'display:inline'}); this.$el.removeClass('text-success text-danger text-default'); - this.$el.html($('' + title + '').addClass('label label-' + bullet_class)); + this.$el.html($('' + title + '').addClass('badge badge-' + bullet_class)); } } }); diff --git a/addons/mrp/static/tests/mrp_tests.js b/addons/mrp/static/tests/mrp_tests.js index d86adf842c5..9d4e82ede12 100644 --- a/addons/mrp/static/tests/mrp_tests.js +++ b/addons/mrp/static/tests/mrp_tests.js @@ -45,8 +45,8 @@ QUnit.module('mrp', { assert.strictEqual(form.$('.o_field_widget').text(), "Waiting Materials", "the widget should be correctly named"); - assert.strictEqual(form.$('.o_field_widget .label-danger').length, 1, - "the label should be danger"); + assert.strictEqual(form.$('.o_field_widget .badge-danger').length, 1, + "the badge should be danger"); form.destroy(); }); diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index 592bf8f155b..5687f10c605 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -46,7 +46,7 @@
- +
diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml index e9b2de8cec1..5287da4f0bf 100644 --- a/addons/mrp/views/mrp_workorder_views.xml +++ b/addons/mrp/views/mrp_workorder_views.xml @@ -193,7 +193,7 @@
@@ -43,7 +43,7 @@ - Expiration Alert + Expiration Alert diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml index 8c3f4cdfafe..2750f0734e4 100644 --- a/addons/project/views/project_portal_templates.xml +++ b/addons/project/views/project_portal_templates.xml @@ -143,7 +143,7 @@ - + @@ -169,7 +169,7 @@

Task - (#) - + Edit Task

diff --git a/addons/project/views/project_rating_templates.xml b/addons/project/views/project_rating_templates.xml index da741eecb2f..dbf995814ad 100644 --- a/addons/project/views/project_rating_templates.xml +++ b/addons/project/views/project_rating_templates.xml @@ -24,7 +24,7 @@
- +

End date : diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml index d849861f397..5646dbf1f67 100644 --- a/addons/purchase/views/portal_templates.xml +++ b/addons/purchase/views/portal_templates.xml @@ -45,10 +45,10 @@ - Waiting for Bill + Waiting for Bill - Cancelled + Cancelled diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml index 7476d054b10..005dca2936c 100644 --- a/addons/repair/views/repair_views.xml +++ b/addons/repair/views/repair_views.xml @@ -206,7 +206,7 @@

- +
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index f1ac9d6a7dd..176735ef01d 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -58,10 +58,10 @@ - Cancelled + Cancelled - Expired + Expired @@ -108,7 +108,7 @@ - Done + Done @@ -138,10 +138,10 @@ Order - Cancelled + Cancelled - Done + Done
@@ -192,10 +192,10 @@ - Paid + Paid - Waiting + Waiting
diff --git a/addons/sale_payment/views/sale_portal_templates.xml b/addons/sale_payment/views/sale_portal_templates.xml index 75ed89b9145..185a0ebcf32 100644 --- a/addons/sale_payment/views/sale_portal_templates.xml +++ b/addons/sale_payment/views/sale_portal_templates.xml @@ -57,10 +57,10 @@ - Done + Done - Waiting + Waiting
diff --git a/addons/sale_stock/views/sale_stock_portal_template.xml b/addons/sale_stock/views/sale_stock_portal_template.xml index 0eca2cdd230..5e31f575c3f 100644 --- a/addons/sale_stock/views/sale_stock_portal_template.xml +++ b/addons/sale_stock/views/sale_stock_portal_template.xml @@ -14,16 +14,16 @@ - Shipped + Shipped - Partially Available + Partially Available - Cancelled + Cancelled - Preparation + Preparation diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml index 60c5ff999d9..4727a269ceb 100644 --- a/addons/stock/views/stock_scrap_views.xml +++ b/addons/stock/views/stock_scrap_views.xml @@ -95,7 +95,7 @@
- +
diff --git a/addons/stock_landed_costs/views/stock_landed_cost_views.xml b/addons/stock_landed_costs/views/stock_landed_cost_views.xml index 643618c8b4f..580d5e468b7 100644 --- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml +++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml @@ -130,7 +130,7 @@
- +
diff --git a/addons/survey/views/survey_result.xml b/addons/survey/views/survey_result.xml index b4a4d0a8c0f..a65b12acc7e 100644 --- a/addons/survey/views/survey_result.xml +++ b/addons/survey/views/survey_result.xml @@ -14,13 +14,13 @@
Filters Clear All Filters
- All surveysFinished surveys + All surveysFinished surveys - All surveysFinished surveys + All surveysFinished surveys - +
@@ -38,14 +38,14 @@ Question - Matrix: + Matrix: - + - Answered - Skipped + Answered + Skipped @@ -176,7 +176,7 @@ % - Vote + Vote