diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py index 4847c4950137de..5710f4ba8aaf57 100644 --- a/addons/account/models/partner.py +++ b/addons/account/models/partner.py @@ -711,7 +711,7 @@ def _compute_application_statistics_hook(self): if not self.env.user.has_group('account.group_account_invoice'): return data_list for partner in self.filtered(lambda p: p._get_account_statistics_count()): - stat_info = {'iconClass': 'fa-pencil-square-o', 'value': partner._get_account_statistics_count(), 'label': _('Invoices/Bills/Mandates')} + stat_info = {'icon': 'edit_square', 'value': partner._get_account_statistics_count(), 'label': _('Invoices/Bills/Mandates')} data_list[partner.id].append(stat_info) return data_list diff --git a/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml b/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml index 70943c86bcc26f..5f3c6144f87312 100644 --- a/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml +++ b/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml @@ -20,7 +20,7 @@
- +
diff --git a/addons/account/static/src/components/account_number_widget/account_number_widget.xml b/addons/account/static/src/components/account_number_widget/account_number_widget.xml index 27a1fc0d49936f..34f678bbbd62a0 100644 --- a/addons/account/static/src/components/account_number_widget/account_number_widget.xml +++ b/addons/account/static/src/components/account_number_widget/account_number_widget.xml @@ -13,7 +13,7 @@
diff --git a/addons/account/static/src/components/account_payment_field/account_payment.xml b/addons/account/static/src/components/account_payment_field/account_payment.xml index 55ed989961b1e6..b191814ebf0081 100644 --- a/addons/account/static/src/components/account_payment_field/account_payment.xml +++ b/addons/account/static/src/components/account_payment_field/account_payment.xml @@ -58,7 +58,7 @@
- + @@ -85,7 +85,7 @@ - ( ) + ( ) diff --git a/addons/account/static/src/components/account_pick_currency_rate/account_pick_currency_rate.xml b/addons/account/static/src/components/account_pick_currency_rate/account_pick_currency_rate.xml index 9fd34ce42b4283..a875943f1dee1b 100644 --- a/addons/account/static/src/components/account_pick_currency_rate/account_pick_currency_rate.xml +++ b/addons/account/static/src/components/account_pick_currency_rate/account_pick_currency_rate.xml @@ -8,7 +8,7 @@ title="Pick the rate on a certain date" t-custom-ref="datetime-picker-target" > - + diff --git a/addons/account/static/src/components/account_statusbar_secured/account_move_statusbar_secured.xml b/addons/account/static/src/components/account_statusbar_secured/account_move_statusbar_secured.xml index ee3390810e178c..08c689684cdb64 100644 --- a/addons/account/static/src/components/account_statusbar_secured/account_move_statusbar_secured.xml +++ b/addons/account/static/src/components/account_statusbar_secured/account_move_statusbar_secured.xml @@ -5,7 +5,7 @@ - + diff --git a/addons/account/static/src/components/actionable_errors/actionable_errors.xml b/addons/account/static/src/components/actionable_errors/actionable_errors.xml index e4039463306b60..49325b961f0c6f 100644 --- a/addons/account/static/src/components/actionable_errors/actionable_errors.xml +++ b/addons/account/static/src/components/actionable_errors/actionable_errors.xml @@ -13,9 +13,9 @@ href="#" t-on-click.prevent="() => this.handleOnClick(error_value)" > - + - + diff --git a/addons/account/static/src/components/currency_form/open_decimal_precision_btn_template.xml b/addons/account/static/src/components/currency_form/open_decimal_precision_btn_template.xml index bc08a6ea9941f4..b689505f78db7f 100644 --- a/addons/account/static/src/components/currency_form/open_decimal_precision_btn_template.xml +++ b/addons/account/static/src/components/currency_form/open_decimal_precision_btn_template.xml @@ -4,7 +4,7 @@ diff --git a/addons/account/static/src/components/document_state/document_state_field.xml b/addons/account/static/src/components/document_state/document_state_field.xml index ee84cf2ed24527..54705d803d9d39 100644 --- a/addons/account/static/src/components/document_state/document_state_field.xml +++ b/addons/account/static/src/components/document_state/document_state_field.xml @@ -4,7 +4,7 @@ @@ -14,7 +14,7 @@ + class="oi" data-icon="info"/> diff --git a/addons/account/static/src/components/fetch_einvoices/fetch_einvoices.xml b/addons/account/static/src/components/fetch_einvoices/fetch_einvoices.xml index 5eeb1c37642bcd..459e37b5a58431 100644 --- a/addons/account/static/src/components/fetch_einvoices/fetch_einvoices.xml +++ b/addons/account/static/src/components/fetch_einvoices/fetch_einvoices.xml @@ -2,7 +2,7 @@ - + diff --git a/addons/account/static/src/components/mail_attachments/mail_attachments.xml b/addons/account/static/src/components/mail_attachments/mail_attachments.xml index a5b358c16f35b7..52889046832882 100644 --- a/addons/account/static/src/components/mail_attachments/mail_attachments.xml +++ b/addons/account/static/src/components/mail_attachments/mail_attachments.xml @@ -8,10 +8,10 @@ - + diff --git a/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml b/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml index bef9c260ca30cd..5a682265cdf449 100644 --- a/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml +++ b/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml @@ -2,8 +2,8 @@ - - + +
diff --git a/addons/account/static/src/components/manyone_banks/many2one_banks.js b/addons/account/static/src/components/manyone_banks/many2one_banks.js index 98d75309dd51df..2f6a57ab60324f 100644 --- a/addons/account/static/src/components/manyone_banks/many2one_banks.js +++ b/addons/account/static/src/components/manyone_banks/many2one_banks.js @@ -13,10 +13,10 @@ import { Many2XAutocomplete } from "@web/views/fields/relational_utils"; export class Many2XAutocompleteBank extends Many2XAutocomplete { buildRecordSuggestion(request, record) { const recordSuggestion = super.buildRecordSuggestion(request, record); - const icon = record.allow_out_payment ? "fa-shield" : "fa-exclamation-circle"; + const icon = record.allow_out_payment ? "security" : "error"; const colorClass = record.allow_out_payment ? "text-success" : "text-danger"; const title = record.allow_out_payment ? _t("Trusted") : _t("Untrusted"); - recordSuggestion.label = markup` ${recordSuggestion.label}`; + recordSuggestion.label = markup` ${recordSuggestion.label}`; return recordSuggestion; } diff --git a/addons/account/static/src/components/manyone_banks/many2one_banks.xml b/addons/account/static/src/components/manyone_banks/many2one_banks.xml index 9de6291db8ab12..d79daa6a6057f5 100644 --- a/addons/account/static/src/components/manyone_banks/many2one_banks.xml +++ b/addons/account/static/src/components/manyone_banks/many2one_banks.xml @@ -3,8 +3,8 @@ - - + + diff --git a/addons/account/static/src/components/onboarding/onboarding.xml b/addons/account/static/src/components/onboarding/onboarding.xml index 6fef66924c2507..ec1adb003d7ae0 100644 --- a/addons/account/static/src/components/onboarding/onboarding.xml +++ b/addons/account/static/src/components/onboarding/onboarding.xml @@ -4,10 +4,10 @@
- +
- + Sections
Filter @@ -43,11 +43,13 @@ - Add a line + Add a line - Add a subsection + Add a subsection @@ -32,7 +32,7 @@ onSelected="() => this.toggleCollapse(record, 'collapse_prices')" attrs="{ 'class': this.disablePricesButton(record) ? 'disabled' : '' }" > - + Show Prices Hide Prices @@ -42,35 +42,35 @@ onSelected="() => this.toggleCollapse(record, 'collapse_composition')" attrs="{ 'class': this.disableCompositionButton(record) ? 'disabled' : '' }" > - + Show Composition Hide Composition - Add a note + Add a note - Move Up + Move Up - Move Down + Move Down - Duplicate + Duplicate - Delete + Delete - Show all lines + Show all lines diff --git a/addons/account/static/src/components/section_state/section_state_icon.js b/addons/account/static/src/components/section_state/section_state_icon.js index 46304ce1371296..19c5c48608ae69 100644 --- a/addons/account/static/src/components/section_state/section_state_icon.js +++ b/addons/account/static/src/components/section_state/section_state_icon.js @@ -3,8 +3,8 @@ import { registry } from '@web/core/registry'; import { standardWidgetProps } from '@web/views/widgets/standard_widget_props'; export const COLLAPSE_ICONS = { - collapse_composition: 'fa fa-compress', - collapse_prices: 'fa fa-eye-slash', + collapse_composition: 'close_fullscreen', + collapse_prices: 'visibility_off', } export class SectionStateIcon extends Component { @@ -14,7 +14,7 @@ export class SectionStateIcon extends Component { iconMapping: Object, }; - get iconClass() { + get icon() { for (const [field, icon] of Object.entries(this.props.iconMapping)) { if (this.props.record.data[field]) { return icon; diff --git a/addons/account/static/src/components/section_state/section_state_icon.xml b/addons/account/static/src/components/section_state/section_state_icon.xml index 6d3d8ede9993f9..73f68ade0c7c57 100644 --- a/addons/account/static/src/components/section_state/section_state_icon.xml +++ b/addons/account/static/src/components/section_state/section_state_icon.xml @@ -4,8 +4,9 @@
@@ -42,9 +42,9 @@ src="/account/static/src/img/bill.svg" style="height: auto; width: 120px;" /> - - - + + +

diff --git a/addons/account/static/src/css/account.css b/addons/account/static/src/css/account.css index af95b68b06ed4f..e1a6c4326ff67b 100644 --- a/addons/account/static/src/css/account.css +++ b/addons/account/static/src/css/account.css @@ -68,7 +68,7 @@ display: inline-block; } - i.fa { + i.oi { margin-left: 2px; } } diff --git a/addons/account/static/src/js/tours/tour_utils.js b/addons/account/static/src/js/tours/tour_utils.js index 0095c4fe66db86..312b3b427dc30c 100644 --- a/addons/account/static/src/js/tours/tour_utils.js +++ b/addons/account/static/src/js/tours/tour_utils.js @@ -62,7 +62,7 @@ export function addSectionFromProductCatalog() { }, { content: "Wait for product to be added", - trigger: '.o_kanban_record:contains("Test Product"):not(:has(.fa-shopping-cart))', + trigger: '.o_kanban_record:contains("Test Product"):not(:has([data-icon="shopping_cart"]))', }, { content: "Close the catalog", diff --git a/addons/account/static/src/scss/account_journal_dashboard.scss b/addons/account/static/src/scss/account_journal_dashboard.scss index f1c0ca26eb6f53..936fa27dece2e0 100644 --- a/addons/account/static/src/scss/account_journal_dashboard.scss +++ b/addons/account/static/src/scss/account_journal_dashboard.scss @@ -17,14 +17,15 @@ .o_dashboard_star { font-size: 12px; - &.fa-star-o { + &[data-icon="star"] { color: $o-main-color-muted; &:hover { color: gold; } - } - &.fa-star { - color: gold; + + &.oi-filled { + color: gold; + } } } diff --git a/addons/account/static/tests/account_number_widget.test.js b/addons/account/static/tests/account_number_widget.test.js index 1d59b4f5bc5468..8273b4999e876a 100644 --- a/addons/account/static/tests/account_number_widget.test.js +++ b/addons/account/static/tests/account_number_widget.test.js @@ -57,7 +57,7 @@ test("Account Number Widget full flow", async () => { await contains(".o_account_number", { count: 0 }); // "Shouldn't change its state of display" await advanceTime(DELAY); await contains(".o_account_number"); // "Should contain a validation icon 400ms after edition" - await contains(".o_account_number i.fa.fa-check"); // "The validation icon should be the successful one" + await contains(".o_account_number i[data-icon='check']"); // "The validation icon should be the successful one" await click(".o_form_button_save"); await advanceTime(DELAY); await contains(".o_account_number"); // "Should display validation icon at all time even when not editing" diff --git a/addons/account/views/account_account_views.xml b/addons/account/views/account_account_views.xml index 39a7209ca12b76..c41d83a9cf806a 100644 --- a/addons/account/views/account_account_views.xml +++ b/addons/account/views/account_account_views.xml @@ -9,7 +9,7 @@
diff --git a/addons/account/views/account_journal_views.xml b/addons/account/views/account_journal_views.xml index 7ec28032c5f26c..9c48bd26f2cea5 100644 --- a/addons/account/views/account_journal_views.xml +++ b/addons/account/views/account_journal_views.xml @@ -33,7 +33,7 @@
@@ -201,7 +201,7 @@ - @@ -907,7 +907,7 @@
@@ -1154,7 +1154,7 @@ invisible="state != 'draft' or invoice_currency_rate == expected_currency_rate">
@@ -1182,7 +1182,7 @@ invisible="show_journal or state != 'draft' or invoice_currency_rate == expected_currency_rate">

diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml index 0a9fafd80bb72d..598574d5c506af 100644 --- a/addons/account/views/account_payment_view.xml +++ b/addons/account/views/account_payment_view.xml @@ -190,7 +190,7 @@
diff --git a/addons/account_payment/views/account_move_views.xml b/addons/account_payment/views/account_move_views.xml index e0d570b6426733..7ecfb90ab27cce 100644 --- a/addons/account_payment/views/account_move_views.xml +++ b/addons/account_payment/views/account_move_views.xml @@ -30,7 +30,7 @@ diff --git a/addons/account_payment/views/account_payment_views.xml b/addons/account_payment/views/account_payment_views.xml index 42c7362d074705..bea7742ef1bf7e 100644 --- a/addons/account_payment/views/account_payment_views.xml +++ b/addons/account_payment/views/account_payment_views.xml @@ -19,7 +19,7 @@ diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml index 9c9c8975712e03..a1fc1c670b36aa 100644 --- a/addons/account_payment/views/account_portal_templates.xml +++ b/addons/account_payment/views/account_portal_templates.xml @@ -86,7 +86,7 @@ class="btn btn-sm btn-primary" role="button" > - Pay Now + Pay Now @@ -96,7 +96,7 @@ - + Authorized Pending - + Paid @@ -253,13 +253,13 @@
- Paid + Paid
- Processing Payment + Processing Payment
- Pending + Pending
@@ -268,7 +268,7 @@ class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#pay_with"> - Pay Now + Pay Now
diff --git a/addons/account_payment/views/payment_transaction_views.xml b/addons/account_payment/views/payment_transaction_views.xml index e9c5b875964357..2e0d7c03a6d544 100644 --- a/addons/account_payment/views/payment_transaction_views.xml +++ b/addons/account_payment/views/payment_transaction_views.xml @@ -8,7 +8,7 @@ diff --git a/addons/account_peppol/views/res_config_settings_views.xml b/addons/account_peppol/views/res_config_settings_views.xml index 9599ada7712e05..6a487107c35073 100644 --- a/addons/account_peppol/views/res_config_settings_views.xml +++ b/addons/account_peppol/views/res_config_settings_views.xml @@ -88,7 +88,7 @@
diff --git a/addons/account_update_tax_tags/views/res_config_settings_views.xml b/addons/account_update_tax_tags/views/res_config_settings_views.xml index 49e079b86199cc..dcc90031c7d417 100644 --- a/addons/account_update_tax_tags/views/res_config_settings_views.xml +++ b/addons/account_update_tax_tags/views/res_config_settings_views.xml @@ -15,7 +15,7 @@ -
- +
@@ -70,7 +70,7 @@ - + diff --git a/addons/analytic/static/tests/analytic_distribution.test.js b/addons/analytic/static/tests/analytic_distribution.test.js index 24b3737c428276..7050e099a72998 100644 --- a/addons/analytic/static/tests/analytic_distribution.test.js +++ b/addons/analytic/static/tests/analytic_distribution.test.js @@ -188,7 +188,7 @@ test("analytic field in form view basic features", async () => { ).toHaveCount(1); // tags - await contains(".fa-close").click(); + await contains("[data-icon='close']").click(); expect(".analytic_distribution_popup").toHaveCount(0); expect(".badge").toHaveCount(2); expect(".badge:eq(0) .o_tag_badge_text").toHaveText("30.3% RD | 50% HR | 19.7% FI"); @@ -242,7 +242,7 @@ test("analytic field in multi_edit list view + search more", async () => { await contains(".modal-dialog .o_data_row:nth-of-type(4) .o_data_cell:first-of-type").click(); expect(".modal-dialog .o_list_renderer").toHaveCount(0); - await contains(".fa-close").click(); + await contains("[data-icon='close']").click(); await contains(".modal-dialog .btn-primary").click(); await animationFrame(); expect(".o_data_row .badge").toHaveCount(4); diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml index 1e4bd26112307c..b8302bf6301ca0 100644 --- a/addons/analytic/views/analytic_account_views.xml +++ b/addons/analytic/views/analytic_account_views.xml @@ -8,7 +8,7 @@
- -