diff --git a/addons/account/report/account_report_payment_receipt_templates.xml b/addons/account/report/account_report_payment_receipt_templates.xml index 1b37bf35656..438c83ee975 100644 --- a/addons/account/report/account_report_payment_receipt_templates.xml +++ b/addons/account/report/account_report_payment_receipt_templates.xml @@ -6,12 +6,12 @@

Payment Receipt:

-
+
Payment Date:
-
+
Customer: @@ -19,19 +19,19 @@ Vendor:
-
+
Payment Method:
-
+
Payment Amount:
-
+
Memo:
- +
diff --git a/addons/account/static/src/js/account_payment_field.js b/addons/account/static/src/js/account_payment_field.js index 1e5171e1f44..3c7bbdc0b1f 100644 --- a/addons/account/static/src/js/account_payment_field.js +++ b/addons/account/static/src/js/account_payment_field.js @@ -80,6 +80,7 @@ var ShowPaymentLineWidget = AbstractField.extend({ title: 'Payment Information', trigger: 'focus', delay: { "show": 0, "hide": 100 }, + container: $(k).parent(), // FIXME Ugly, should use the default body container but system & tests to adapt to properly destroy the popover }; $(k).popover(options); }); diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js index 7578f9c4d1d..a66b02fa853 100644 --- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js +++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js @@ -343,9 +343,9 @@ var LineRenderer = Widget.extend(FieldManagerMixin, { update: function (state) { var self = this; // isValid - this.$('caption .o_buttons button.o_validate').toggleClass('hidden', !!state.balance.type); - this.$('caption .o_buttons button.o_reconcile').toggleClass('hidden', state.balance.type <= 0); - this.$('caption .o_buttons .o_no_valid').toggleClass('hidden', state.balance.type >= 0); + this.$('caption .o_buttons button.o_validate').toggleClass('d-none', !!state.balance.type); + this.$('caption .o_buttons button.o_reconcile').toggleClass('d-none', state.balance.type <= 0); + this.$('caption .o_buttons .o_no_valid').toggleClass('d-none', state.balance.type >= 0); // partner_id this._makePartnerRecord(state.st_line.partner_id, state.st_line.partner_name).then(function (recordID) { @@ -485,7 +485,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, { _destroyPopover: function ($el) { var popover = $el.data('bs.popover'); if (popover) { - popover.destroy(); + popover.dispose(); } }, /** @@ -775,7 +775,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, { _onTogglePartialReconcile: function (e) { e.stopPropagation(); var popover = $(e.target).data('bs.popover'); - popover && popover.destroy(); + popover && popover.dispose(); this.trigger_up('toggle_partial_reconcile'); } }); diff --git a/addons/account/static/src/scss/account_dashboard.scss b/addons/account/static/src/scss/account_dashboard.scss index 938bc058af2..b93e2d35c55 100644 --- a/addons/account/static/src/scss/account_dashboard.scss +++ b/addons/account/static/src/scss/account_dashboard.scss @@ -5,9 +5,9 @@ } .o_account_dashboard_header { - @include o-flex(1, 0, 100%); - @include o-flex-flow(column, nowrap); - @include o-align-self(flex-start); + flex: 1 0 100%; + flex-flow: column nowrap; + align-self: flex-start; width: 100%; height: auto; // cancel o_form_view height 100%, which hides the help tip message at the bottom of the screen min-height: 0%; // cancel o_form_view min-height 100%, which hides the help tip message at the bottom of the screen @@ -29,32 +29,32 @@ } } - .o_arrow_button.btn-default { + .o_arrow_button.btn-secondary { color: $text-muted; text-transform: none; font-weight: 500; .o_account_dashboard_index { - color: $gray-dark; + color: gray('900'); } &.o_action_done { - color: $gray-dark; - background-color: $gray-lighter; + color: gray('900'); + background-color: gray('200'); &:after { - border-left-color: $gray-lighter; + border-left-color: gray('200'); } .fa-check { - color: $brand-success; + color: theme-color('success'); } } &:last-of-type { margin-left: $o-horizontal-padding; padding-left: $o-horizontal-padding*.5; - border-left: 1px solid $gray-lighter-dark; + border-left: 1px solid gray('300'); } } } diff --git a/addons/account/static/src/scss/account_journal_dashboard.scss b/addons/account/static/src/scss/account_journal_dashboard.scss index 1b87a6363a6..1bff7ba9057 100644 --- a/addons/account/static/src/scss/account_journal_dashboard.scss +++ b/addons/account/static/src/scss/account_journal_dashboard.scss @@ -58,7 +58,7 @@ } g.tick.major { // Don't know why, but leads to strange bold text - // stroke: $o-brand-primary; + // stroke: $o-brand-odoo; line { display: none; @@ -72,13 +72,13 @@ g.nv-linesWrap { g.nv-group.nv-series-0 { fill-opacity: 0.3 !important; - fill: $o-brand-primary !important; - stroke: $o-brand-primary !important; + fill: $o-brand-odoo !important; + stroke: $o-brand-odoo !important; .nv-point { visibility: hidden; r: 3; - stroke: $o-brand-primary !important; + stroke: $o-brand-odoo !important; fill: white; stroke-width: 2; } @@ -99,11 +99,11 @@ g.nv-group.nv-series-0 { g.past { opacity: 0.5; - fill: $o-brand-primary !important; + fill: $o-brand-odoo !important; } g.future { opacity: 0.5; - fill: $o-brand-optional !important; + fill: $o-brand-primary !important; } } } diff --git a/addons/account/static/src/scss/account_reconciliation.scss b/addons/account/static/src/scss/account_reconciliation.scss index 590e6d8df32..baae6a584f1 100644 --- a/addons/account/static/src/scss/account_reconciliation.scss +++ b/addons/account/static/src/scss/account_reconciliation.scss @@ -8,7 +8,7 @@ &.statement_name { @include o-text-overflow; &.editable:hover { - outline: 1px dashed $o-brand-optional; + outline: 1px dashed $o-brand-primary; outline-offset: -1px; cursor: pointer; } @@ -25,7 +25,7 @@ position: relative; display: inline-block; .progress-bar { - background-color: #7c7bad; + background-color: $o-community-color; // FIXME probably supposed to be primary to be auto-adapted in enterprise ? } .progress-text { text-align: center; @@ -33,9 +33,9 @@ width: 100%; } } - + h1, .progress { - @media screen and (min-width: $screen-xs) { + @media screen and (min-width: 480px) { // FIXME width: 48%; } } @@ -59,7 +59,7 @@ padding-right: 5px; } .do_partial_reconcile_true { - color: #7c7bad; + color: $o-community-color; // FIXME probably supposed to be primary to be auto-adapted in enterprise ? padding-right: 5px; } .do_partial_reconcile_false { @@ -128,7 +128,7 @@ .cell_action { width: 15px; - color: $gray; + color: gray('700'); background: #fff; border: 0; text-align: center; @@ -200,12 +200,12 @@ /* Icons */ .toggle_match, .toggle_create { - @include o-transform(rotate(0deg)); - @include o-transition(transform, 300ms); + transform: rotate(0deg); + transition: transform 300ms ease 0s; } .visible_toggle, &[data-mode="match"] .toggle_match, &[data-mode="create"] .toggle_create { visibility: visible !important; - @include o-transform(rotate(90deg)); + transform: rotate(90deg); } .toggle_create { font-size: 10px; @@ -218,18 +218,18 @@ max-height: 0px; overflow: hidden; margin-bottom: 5px; - @include o-transition(max-height, 250ms); + transition: max-height 250ms ease 0s; } &[data-mode="match"] > .match { display: block; max-height: none; overflow: visible; - @include o-transition(max-height, 400ms); + transition: max-height 400ms ease 0s; } &[data-mode="create"] > .create { display: block; max-height: 210px; - @include o-transition(max-height, 400ms); + transition: max-height 400ms ease 0s; } } diff --git a/addons/account/static/src/xml/account_dashboard_setup_bar.xml b/addons/account/static/src/xml/account_dashboard_setup_bar.xml index 8b065bc7829..a3e8600b894 100644 --- a/addons/account/static/src/xml/account_dashboard_setup_bar.xml +++ b/addons/account/static/src/xml/account_dashboard_setup_bar.xml @@ -2,25 +2,25 @@ -
Invoice Date
@@ -78,8 +78,8 @@
- - + + diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml index 7595bb06c86..bccd3ebde9c 100644 --- a/addons/account/static/src/xml/account_reconciliation.xml +++ b/addons/account/static/src/xml/account_reconciliation.xml @@ -26,14 +26,14 @@
- +
- +
-
Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.
+
Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.

Nothing to do!

@@ -59,10 +59,10 @@

- + - +

@@ -73,10 +73,10 @@
@@ -106,10 +106,10 @@ -
- - - +
+ + +
@@ -144,8 +144,8 @@
- - + +
-
- - - Select a partner or choose a counterpart +
+ + + Select a partner or choose a counterpart
@@ -156,21 +156,21 @@
-
+

To speed up reconciliation, define reconciliation models.

-
+
- +
-
+
@@ -188,7 +188,7 @@
- +
@@ -218,8 +218,8 @@