pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] *: migrate Bootstrap 3.3.7 to 4.1.3

Browse Source 
See sub-commits for details.

task-49280
Closes https://github.com/odoo/odoo/pull/25045
This commit is contained in:
qsm-odoo
2018-07-27 12:42:10 +02:00
parent 8ed8b46f64 519594e9ca
commit 2b3017974b
935 changed files with 34961 additions and 37353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_report_payment_receipt_templates.xml
+6 -6
View File
@@ -6,12 +6,12 @@
<div class="page">
<h3><strong>Payment Receipt: <span t-field="o.name"/></strong></h3>
<div class="row mt64">
<div class="col-xs-6" t-if="o.payment_date">
<div class="col-6" t-if="o.payment_date">
<strong>Payment Date: </strong> <span t-field="o.payment_date"/>
</div>
</div>
<div class="row">
<div class="col-xs-6" t-if="o.partner_type">
<div class="col-6" t-if="o.partner_type">
<t t-if="o.partner_type == 'customer'">
<strong>Customer: </strong>
</t>
@@ -19,19 +19,19 @@
<strong>Vendor: </strong>
</t><span t-field="o.partner_id"/>
</div>
<div class="col-xs-6" t-if="o.payment_method_id">
<div class="col-6" t-if="o.payment_method_id">
<strong>Payment Method: </strong><span t-field="o.payment_method_id.name"/>
</div>
</div>
<div class="row mb64">
<div class="col-xs-6" t-if="o.amount">
<div class="col-6" t-if="o.amount">
<strong>Payment Amount: </strong><span t-field="o.amount" t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"/>
</div>
<div class="col-xs-6" t-if="o.communication">
<div class="col-6" t-if="o.communication">
<strong>Memo: </strong><span t-field="o.communication"/>
</div>
</div>
<table class="table table-condensed">
<table class="table table-sm">
<thead>
<tr>
<th>Invoice Date</th>
addons/account/static/src/js/account_payment_field.js
+1
View File
@@ -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);
});
addons/account/static/src/js/reconciliation/reconciliation_renderer.js
+5 -5
View File
@@ -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');
}
});
addons/account/static/src/scss/account_dashboard.scss
+10 -10
View File
@@ -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');
}
}
}
addons/account/static/src/scss/account_journal_dashboard.scss
+6 -6
View File
@@ -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;
}
}
}
addons/account/static/src/scss/account_reconciliation.scss
+12 -12
View File
@@ -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;
}
}
addons/account/static/src/xml/account_dashboard_setup_bar.xml
+6 -6
View File
@@ -2,25 +2,25 @@
<templates>
<!-- This template defines the setup bar, at the top of account module's dashboard -->
<t t-name="account.AccountDashboardSetupBar">
<div class="o_account_dashboard_header hidden-xs o_form_view" t-if="values['show_setup_bar']">
<div class="o_account_dashboard_header d-none d-md-block o_form_view" t-if="values['show_setup_bar']">
<div class="o_form_statusbar">
<div class="o_statusbar_status" data-original-title="" title="" >
<button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" >
<button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" >
<i class="fa fa-check" t-if="values['chart_of_accounts']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">4</b>
Chart of Accounts
</button>
<button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}">
<button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['fiscal_year']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">3</b>
Fiscal Year
</button>
<button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}">
<button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['bank']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">2</b>
Add a Bank Account
</button>
<button name="setting_init_company_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}">
<button name="setting_init_company_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['company']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">1</b>
Company Data
@@ -28,7 +28,7 @@
<h4 class="text-muted">Configuration Steps</h4>
</div>
<div class="pull-right" style="padding: 7px 0;">
<div class="float-right" style="padding: 7px 0;">
<button aria-label="Hide setup bar" data-dismiss="modal" type="company_object" name="setting_hide_setup_bar" class="account_setup_dashboard_action close">×</button>
</div>
</div>
addons/account/static/src/xml/account_payment.xml
+3 -3
View File
@@ -6,7 +6,7 @@
<div>
<t t-if="outstanding">
<div>
<strong class="pull-left" id="outstanding"><t t-esc="title"></t></strong>
<strong class="float-left" id="outstanding"><t t-esc="title"></t></strong>
</div>
</t>
<table style="width:100%;">
@@ -78,8 +78,8 @@
</tr>
</table>
</div>
<button class="btn btn-xs btn-primary js_unreconcile_payment pull-left" t-att-payment-id="payment_id" style="margin-top:5px; margin-bottom:5px;">Unreconcile</button>
<button class="btn btn-xs btn-default js_open_payment pull-right" t-att-payment-id="account_payment_id" t-att-invoice-id="invoice_id" t-att-move-id="move_id" style="margin-top:5px; margin-bottom:5px;">View</button>
<button class="btn btn-sm btn-primary js_unreconcile_payment float-left" t-att-payment-id="payment_id" style="margin-top:5px; margin-bottom:5px;">Unreconcile</button>
<button class="btn btn-sm btn-secondary js_open_payment float-right" t-att-payment-id="account_payment_id" t-att-invoice-id="invoice_id" t-att-move-id="move_id" style="margin-top:5px; margin-bottom:5px;">View</button>
</t>
</templates>
addons/account/static/src/xml/account_reconciliation.xml
+25 -25
View File
@@ -26,14 +26,14 @@
</div>
<div aria-valuemin="0" t-att-aria-valuenow="widget._initialState.valuenow" class="progress-bar" role="progressbar" style="width: 0%;" t-att-aria-valuemax="widget._initialState.valuemax"></div>
</div>
<button class="btn btn-default o_automatic_reconciliation pull-right" title="Let odoo try to reconcile entries for the user">Automatic reconciliation</button>
<button class="btn btn-secondary o_automatic_reconciliation float-right" title="Let odoo try to reconcile entries for the user">Automatic reconciliation</button>
<div class="notification_area"/>
</div>
<div class="o_reconciliation_lines"/>
<div t-if="widget._initialState.valuemax &gt; widget._initialState.defaultDisplayQty">
<button class="btn btn-default js_load_more">Load more</button>
<button class="btn btn-secondary js_load_more">Load more</button>
</div>
<div class="pull-right text-muted">Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.</div>
<div class="float-right text-muted">Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.</div>
</div>
<div t-else="" class="o_view_noreconciliation">
<p>Nothing to do!</p>
@@ -59,10 +59,10 @@
<t t-if="context &amp;&amp; context.active_model">
<p t-if="context['active_model'] === 'account.journal' || context['active_model'] === 'account.bank.statement'" class="actions_buttons">
<t t-if="context.journal_id">
<button class="button_back_to_statement btn btn-default btn-sm" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button>
<button class="button_back_to_statement btn btn-secondary" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button>
</t>
<t t-if="context['active_model'] === 'account.bank.statement'">
<button class="button_close_statement btn btn-primary btn-sm" style="display: inline-block;">Close statement</button>
<button class="button_close_statement btn btn-primary" style="display: inline-block;">Close statement</button>
</t>
</p>
</t>
@@ -73,10 +73,10 @@
<div class="o_reconciliation_line" t-att-data-mode="state.mode">
<table class="accounting_view">
<caption>
<div class="pull-right o_buttons">
<button t-attf-class="o_validate btn btn-default btn-sm #{!state.balance.type ? '' : 'hidden'}">Validate</button>
<button t-attf-class="o_reconcile btn btn-primary btn-sm #{state.balance.type &gt; 0 ? '' : 'hidden'}">Reconcile</button>
<span t-attf-class="o_no_valid text-danger #{state.balance.type &lt; 0 ? '' : 'hidden'}">Select a partner or choose a counterpart</span>
<div class="float-right o_buttons">
<button t-attf-class="o_validate btn btn-secondary #{!state.balance.type ? '' : 'd-none'}">Validate</button>
<button t-attf-class="o_reconcile btn btn-primary #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
<span t-attf-class="o_no_valid text-danger #{state.balance.type &lt; 0 ? '' : 'd-none'}">Select a partner or choose a counterpart</span>
</div>
</caption>
<thead>
@@ -106,10 +106,10 @@
<t t-name="reconciliation.manual.line" t-extend="reconciliation.line">
<t t-jquery=".o_buttons" t-operation="replace">
<div class="pull-right o_buttons">
<button t-attf-class="o_validate btn btn-default btn-sm #{!state.balance.type ? '' : 'hidden'}">Reconcile</button>
<button t-attf-class="o_reconcile btn btn-primary btn-sm #{state.balance.type &gt; 0 ? '' : 'hidden'}">Reconcile</button>
<button t-attf-class="o_no_valid btn btn-default btn-sm #{state.balance.type &lt; 0 ? '' : 'hidden'}">Skip</button>
<div class="float-right o_buttons">
<button t-attf-class="o_validate btn btn-secondary #{!state.balance.type ? '' : 'd-none'}">Reconcile</button>
<button t-attf-class="o_reconcile btn btn-primary #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
<button t-attf-class="o_no_valid btn btn-secondary #{state.balance.type &lt; 0 ? '' : 'd-none'}">Skip</button>
</div>
</t>
<t t-jquery=".accounting_view tbody" t-operation="append">
@@ -144,8 +144,8 @@
<div t-name="reconciliation.line.match">
<div class="match_controls">
<input class="filter" placeholder="Filter..." type="text" value=""/>
<span class="pull-right fa fa-chevron-right disabled" role="img" aria-label="Previous" title="Previous"></span>
<span class="pull-right fa fa-chevron-left disabled" role="img" aria-label="Next" title="Next"></span>
<span class="float-right fa fa-chevron-right disabled" role="img" aria-label="Previous" title="Previous"></span>
<span class="float-right fa fa-chevron-left disabled" role="img" aria-label="Next" title="Next"></span>
</div>
<table>
<tbody>
@@ -156,21 +156,21 @@
<div t-name="reconciliation.line.create">
<div class="quick_add">
<div class="btn-group btn-group-sm o_reconcile_models" t-if="state.reconcileModels">
<div class="btn-group o_reconcile_models" t-if="state.reconcileModels">
<t t-foreach="state.reconcileModels" t-as="reconcileModel">
<button class="btn btn-primary" t-att-data-reconcile-model-id="reconcileModel.id"><t t-esc="reconcileModel.name"/></button>
</t>
<p t-if="!state.reconcileModels.length" style="color: #bbb;">To speed up reconciliation, define <a style="cursor: pointer;" class="reconcile_model_create">reconciliation models</a>.</p>
</div>
<div class="dropdown pull-right">
<div class="dropdown float-right">
<a data-toggle="dropdown" href="#"><span class="fa fa-cog" role="img" aria-label="Settings"/></a>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-label="Presets config">
<li><a role="menuitem" class="reconcile_model_create" href="#">Create model</a></li>
<li><a role="menuitem" class="reconcile_model_edit" href="#">Modify models</a></li>
</ul>
<div class="dropdown-menu dropdown-menu-right" role="menu" aria-label="Presets config">
<a role="menuitem" class="dropdown-item reconcile_model_create" href="#">Create model</a>
<a role="menuitem" class="dropdown-item reconcile_model_edit" href="#">Modify models</a>
</div>
</div>
</div>
<table class="pull-left">
<table class="float-left">
<tr class="create_account_id">
<td class="o_td_label">Account</td>
<td class="o_td_field"></td>
@@ -188,7 +188,7 @@
<td class="o_td_field"></td>
</tr>
</table>
<table class="pull-right">
<table class="float-right">
<tbody>
<tr class="create_journal_id" style="display: none;">
<td class="o_td_label">Journal</td>
@@ -218,8 +218,8 @@
<td class="cell_label">
<t t-if="line.partner_id &amp;&amp; line.partner_id !== state.st_line.partner_id">
<t t-if="line.partner_name.length">
<t t-esc="line.partner_name"/>:
</t>
<t t-esc="line.partner_name"/>:
</t>
</t>
<t t-esc="line.label || line.name"/>
<t t-if="line.ref &amp;&amp; line.ref.length"> : </t>
addons/account/static/tests/reconciliation_tests.js
+2 -2
View File
@@ -661,7 +661,7 @@ QUnit.module('account', {
" 101200 2017-02-28 Camptocamp: INV/2017/0001 $ 4,610.00 111100 2017-02-28 Camptocamp: BILL/2017/0001 $ 10,000.00 111100 2017-02-28 ASUSTeK: BILL/2017/0002 $ 5,749.99 ",
"should display the next 5 account move lines");
assert.ok(clientAction.widgets[0].$('caption button.btn-default:visible').length, "should display the 'validate' button");
assert.ok(clientAction.widgets[0].$('caption button.btn-secondary:visible').length, "should display the 'validate' button");
assert.ok(clientAction.widgets[1].$('caption .text-danger:visible').length, "should display the 'Select a partner or choose a counterpart' message");
assert.ok(clientAction.widgets[2].$('caption button.btn-primary:visible').length, "should display the 'Reconcile' button");
@@ -1029,7 +1029,7 @@ QUnit.module('account', {
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 1, "should have ever only the created reconcile line");
assert.strictEqual(widget.$('.accounting_view tbody tr').text().replace(/[\n\r\s$,]+/g, ' '), " 101200 SAJ/2014/002 and SAJ/2014/003 1100.00 ",
"the new line should be update the amout");
assert.ok(widget.$('caption button.btn-default:visible').length, "should display the 'validate' button");
assert.ok(widget.$('caption button.btn-secondary:visible').length, "should display the 'validate' button");
widget.$('.create .add_line').trigger('click').trigger('click');
widget.$('.create .create_amount input').val('-100').trigger('input');
addons/account/views/account_invoice_view.xml
+7 -7
View File
@@ -204,7 +204,7 @@
<span><t t-esc="record.number.value"/> <t t-esc="record.date_invoice.value"/></span>
</div>
<div class="oe_kanban_bottom_right">
<span class="pull-right text-right">
<span class="float-right text-right">
<field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'cancel': 'default', 'none': 'danger', 'open': 'warning',
'paid': 'success'}}"/>
</span>
@@ -510,16 +510,16 @@
<div t-attf-class="oe_kanban_card oe_kanban_global_click {{ record.display_type.raw_value ? 'o_is_' + record.display_type.raw_value : '' }}">
<t t-if="!record.display_type.raw_value">
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<strong>
<span>
<t t-esc="record.product_id.value"/>
</span>
</strong>
</div>
<div class="col-xs-4">
<div class="col-4">
<strong>
<span class="pull-right text-right">
<span class="float-right text-right">
<t t-esc="record.price_subtotal.value" groups="account.group_show_line_subtotals_tax_excluded"/>
<t t-esc="record.price_total.value" groups="account.group_show_line_subtotals_tax_included"/>
</span>
@@ -527,7 +527,7 @@
</div>
</div>
<div class="row">
<div class="col-xs-12 text-muted">
<div class="col-12 text-muted">
<span>
Quantity:
<t t-esc="record.quantity.value"/>
@@ -536,7 +536,7 @@
</div>
</div>
<div class="row">
<div class="col-xs-12 text-muted">
<div class="col-12 text-muted">
<span>
Unit Price:
<t t-esc="record.price_unit.value"/>
@@ -546,7 +546,7 @@
</t>
<t t-if="record.display_type.raw_value === 'line_section' || record.display_type.raw_value === 'line_note'">
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<span>
<t t-esc="record.name.value"/>
</span>
addons/account/views/account_journal_dashboard_view.xml
+31 -31
View File
@@ -21,8 +21,8 @@
<t t-if="(journal_type == 'bank' || journal_type == 'cash')" t-call="JournalBodyBankCash"/>
<t t-if="journal_type == 'sale' || journal_type == 'purchase'" t-call="JournalBodySalePurchase"/>
<t t-if="journal_type == 'general' || journal_type == 'situation'">
<div class="col-xs-6 o_kanban_primary_left">
<button type="object" name="open_action" context="{'action_name': 'action_move_journal_line', 'view_no_maturity': 1}" class="btn btn-primary btn-sm">
<div class="col-6 o_kanban_primary_left">
<button type="object" name="open_action" context="{'action_name': 'action_move_journal_line', 'view_no_maturity': 1}" class="btn btn-primary">
<span>Journal Entries</span>
</button>
</div>
@@ -55,7 +55,7 @@
<!-- For bank and cash -->
<div t-if="journal_type == 'bank' || journal_type == 'cash'" class="row">
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_view">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_view">
<div class="o_kanban_card_manage_title">
<span role="separator">View</span>
</div>
@@ -79,7 +79,7 @@
</div>
</div>
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_new">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_new">
<div class="o_kanban_card_manage_title">
<span role="separator">New</span>
</div>
@@ -102,7 +102,7 @@
</div>
</div>
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_reconciliation">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_reconciliation">
<div class="o_kanban_card_manage_title">
<span role="separator">Reconciliation</span>
</div>
@@ -114,7 +114,7 @@
<!-- For purchase and sale -->
<div t-if="journal_type == 'purchase' || journal_type == 'sale'" class="row">
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_view">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_view">
<div class="o_kanban_card_manage_title">
<span>View</span>
</div>
@@ -134,7 +134,7 @@
</div>
</div>
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_new">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_new">
<div class="o_kanban_card_manage_title">
<span>New</span>
</div>
@@ -152,7 +152,7 @@
</div>
</div>
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_reports">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_reports">
<div class="o_kanban_card_manage_title">
<span>Reporting</span>
</div>
@@ -165,7 +165,7 @@
<!-- For general and situation -->
<div t-if="journal_type == 'general' || journal_type == 'situation'" class="row">
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_view">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_view">
<div class="o_kanban_card_manage_title">
<span>View</span>
</div>
@@ -180,7 +180,7 @@
</div>
</div>
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_new">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_new">
<div class="o_kanban_card_manage_title">
<span>New</span>
</div>
@@ -189,7 +189,7 @@
</div>
</div>
<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_operations">
<div class="col-4 o_kanban_card_manage_section o_kanban_manage_operations">
<div class="o_kanban_card_manage_title">
<span>Operations</span>
</div>
@@ -200,16 +200,16 @@
</div>
<div t-if="widget.editable" class="o_kanban_card_manage_settings row">
<div class="col-xs-8">
<div class="col-8">
<ul class="oe_kanban_colorpicker" data-field="color"/>
</div>
</div>
<div groups="account.group_account_manager" class="row o_kanban_card_settings">
<div class="col-xs-6">
<div class="col-6">
<field name="show_on_dashboard" widget="boolean_favorite" />
</div>
<div class="col-xs-6 text-right">
<div class="col-6 text-right">
<a t-if="widget.editable" type="edit">Settings</a>
</div>
</div>
@@ -219,13 +219,13 @@
<!-- On the left, display :
- A button corresponding to the bank_statements_source, if it wasn't configured, a button for each of them
- If there are statements to reconcile, a link to reconcile them -->
<div class="col-xs-5 o_kanban_primary_left">
<div class="col-5 o_kanban_primary_left">
<t t-if="dashboard.number_to_reconcile > 0">
<button type="object" name="action_open_reconcile" class="btn btn-primary btn-sm"> Reconcile <t t-esc="dashboard.number_to_reconcile"/> Items</button>
<button type="object" name="action_open_reconcile" class="btn btn-primary"> Reconcile <t t-esc="dashboard.number_to_reconcile"/> Items</button>
</t>
<t t-if="journal_type == 'bank'">
<div name="bank_journal_cta">
<button t-if="dashboard.bank_statements_source == 'undefined'" name="action_configure_bank_journal" type="object" class="btn btn-primary btn-sm">Configure</button>
<button t-if="dashboard.bank_statements_source == 'undefined'" name="action_configure_bank_journal" type="object" class="btn btn-primary">Configure</button>
<div name="bank_statement_create_button" t-if="dashboard.bank_statements_source != 'online_sync'">
<a type="object" name="create_bank_statement" class="oe_inline">Create</a><span name="button_import_placeholder"/> Statements
</div>
@@ -235,25 +235,25 @@
<a t-if="journal_type == 'cash'" type="object" name="create_cash_statement" class="oe_inline">New Transactions</a>
</t>
<t t-if="dashboard.number_to_reconcile == 0">
<button t-if="journal_type == 'cash'" type="object" name="create_cash_statement" class="btn btn-primary btn-sm">New Transactions</button>
<button t-if="journal_type == 'cash'" type="object" name="create_cash_statement" class="btn btn-primary">New Transactions</button>
</t>
</div>
<!-- On the right, show other common informations/actions -->
<div class="col-xs-7 o_kanban_primary_right">
<div class="col-7 o_kanban_primary_right">
<div class="row">
<div class="col-xs-7">
<div class="col-7">
<span title="Balance in Odoo">Balance in GL</span>
</div>
<div class="col-xs-5 text-right">
<div class="col-5 text-right">
<span><t t-esc="dashboard.account_balance"/></span>
</div>
</div>
<t t-if="dashboard.last_balance != dashboard.account_balance">
<div class="row" name="latest_statement">
<div class="col-xs-7">
<div class="col-7">
<span title="Latest Statement">Latest Statement</span>
</div>
<div class="col-xs-5 text-right">
<div class="col-5 text-right">
<span><t t-esc="dashboard.last_balance"/></span>
</div>
</div>
@@ -261,32 +261,32 @@
</div>
</t>
<t t-name="JournalBodySalePurchase" id="account.JournalBodySalePurchase">
<div class="col-xs-5 o_kanban_primary_left">
<div class="col-5 o_kanban_primary_left">
<t t-if="journal_type == 'sale'">
<button type="object" name="action_create_new" class="btn btn-primary btn-sm o_invoice_new">
<button type="object" name="action_create_new" class="btn btn-primary o_invoice_new">
<span>New Invoice</span>
</button>
</t>
<t t-if="journal_type == 'purchase'">
<button type="object" name="action_create_new" class="btn btn-primary btn-sm">
<button type="object" name="action_create_new" class="btn btn-primary">
<span>New Bill</span>
</button>
</t>
</div>
<div class="col-xs-7 o_kanban_primary_right">
<div class="col-7 o_kanban_primary_right">
<div class="row">
<div class="col-xs-7">
<div class="col-7">
<a type="object" name="open_action" context="{'search_default_draft': '1'}">
<span t-if="journal_type == 'sale'" title="Invoices to Validate"><t t-esc="dashboard.number_draft"/> Invoices to Validate</span>
<span t-if="journal_type == 'purchase'" title="Bills to Validate"><t t-esc="dashboard.number_draft"/> Bills to Validate</span>
</a>
</div>
<div class="col-xs-5 text-right">
<div class="col-5 text-right">
<span><t t-esc="dashboard.sum_draft"/></span>
</div>
</div>
<div class="row">
<div class="col-xs-7">
<div class="col-7">
<a type="object" t-if="journal_type == 'sale'" name="open_action"
context="{'search_default_unpaid':1}" id="account_dashboard_sale_pay_link">
<t t-esc="dashboard.number_waiting"/> Unpaid Invoices
@@ -297,7 +297,7 @@
<t t-esc="dashboard.number_waiting"/> Bills to Pay
</a>
</div>
<div class="col-xs-5 text-right">
<div class="col-5 text-right">
<span><t t-esc="dashboard.sum_waiting"/></span>
</div>
</div>
addons/account/views/account_payment_view.xml
+8 -8
View File
@@ -53,24 +53,24 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row mb4">
<div class="col-xs-6">
<div class="col-6">
<strong><span><field name="name"/></span></strong>
</div>
<div class="col-xs-6 text-right">
<div class="col-6 text-right">
<strong><i class="fa fa-clock-o" role="img" aria-label="Date" title="Date"/> <t t-esc="record.payment_date.value"/></strong>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<span><field name="partner_id"/></span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<field name="amount" widget='monetary'/>
</div>
<div class="col-xs-6">
<span class="pull-right label label-default">
<div class="col-6">
<span class="float-right badge badge-secondary">
<field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'sent': 'success'}}"/>
</span>
</div>
@@ -287,7 +287,7 @@
</sheet>
<footer>
<button string='Validate' name="action_validate_invoice_payment" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -355,7 +355,7 @@
</group>
<footer>
<button string='Validate' name="create_payments" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/views/account_portal_templates.xml
+16 -16
View File
@@ -14,7 +14,7 @@
<template id="portal_my_home_invoice" name="Portal My Home : invoice entries" inherit_id="portal.portal_my_home" priority="30">
<xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
<li t-if="invoice_count" class="list-group-item">
<span class="badge" t-esc="invoice_count"/>
<span class="badge badge-pill" t-esc="invoice_count"/>
<a href="/my/invoices">Invoices</a>
</li>
</xpath>
@@ -28,13 +28,13 @@
<t t-if="not invoices">
<p>There are currently no invoices and payments for your account.</p>
</t>
<div t-if="invoices" class="panel panel-default">
<div t-if="invoices" class="card">
<div class="table-responsive"><table class="table table-hover o_portal_my_doc_table">
<thead>
<tr class="active">
<th>Invoice #</th>
<th>Invoice Date</th>
<th class='hidden-xs'>Due Date</th>
<th class='d-none d-md-table-cell'>Due Date</th>
<th></th>
<th>Amount Due</th>
</tr>
@@ -45,16 +45,16 @@
<a t-attf-href="/my/invoices/#{invoice.id}" t-att-title="invoice.number"><t t-esc="invoice.number"/></a>
</td>
<td><span t-field="invoice.date_invoice"/></td>
<td class='hidden-xs'><span t-field="invoice.date_due"/></td>
<td class='d-none d-md-table-cell'><span t-field="invoice.date_due"/></td>
<td class="tx_status">
<t t-if="invoice.state == 'open'">
<span class="label label-info"><i class="fa fa-fw fa-clock-o" aria-label="Opened" title="Opened" role="img"></i><span class="hidden-xs"> Waiting for Payment</span></span>
<span class="badge badge-info"><i class="fa fa-fw fa-clock-o" aria-label="Opened" title="Opened" role="img"></i><span class="d-none d-md-inline"> Waiting for Payment</span></span>
</t>
<t t-if="invoice.state == 'paid'">
<span class="label label-default"><i class="fa fa-fw fa-check" aria-label="Paid" title="Paid" role="img"></i><span class="hidden-xs"> Paid</span></span>
<span class="badge badge-secondary"><i class="fa fa-fw fa-check" aria-label="Paid" title="Paid" role="img"></i><span class="d-none d-md-inline"> Paid</span></span>
</t>
<t t-if="invoice.state == 'cancel'">
<span class="label label-default"><i class="fa fa-fw fa-remove" aria-label="Cancelled" title="Cancelled" role="img"></i><span class="hidden-xs"> Cancelled</span></span>
<span class="badge badge-secondary"><i class="fa fa-fw fa-remove" aria-label="Cancelled" title="Cancelled" role="img"></i><span class="d-none d-md-inline"> Cancelled</span></span>
</t>
</td>
<td><span t-esc="-invoice.residual if invoice.type == 'out_refund' else invoice.residual" t-options='{"widget": "monetary", "display_currency": invoice.currency_id}'/></td>
@@ -72,7 +72,7 @@
<xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
<div class="row mt16 o_portal_invoice_sidebar">
<!-- Sidebar -->
<div class="col-md-3 hidden-print">
<div class="col-lg-3 d-print-none">
<div class="bs-sidebar mb16" id="sidebar_content">
<div class="text-center pt16 o_account_portal_sidebar">
<h2 class="media-heading">
@@ -85,16 +85,16 @@
</div>
<div class="o_payment_button">
<div class="text-center mb8 ml16 mr16 o_download_pdf">
<a class="btn btn-default btn-block btn-sm o_download_btn" t-att-href="'/my/invoices/pdf/%s?%s' % (invoice.id, keep_query())" title="Download"><i class="fa fa-download"/> Download</a>
<a class="btn btn-default btn-block btn-sm hidden-xs hidden-sm o_print_btn o_portal_invoice_print" t-att-href="'/my/invoices/pdf/%s?%s&amp;print=true' % (invoice.id, keep_query())" id="print_invoice_report" title="Print"><i class="fa fa-print"/> Print</a>
<a class="btn btn-secondary btn-block o_download_btn" t-att-href="'/my/invoices/pdf/%s?%s' % (invoice.id, keep_query())" title="Download"><i class="fa fa-download"/> Download</a>
<a class="btn btn-secondary btn-block d-none d-lg-inline-block o_print_btn o_portal_invoice_print" t-att-href="'/my/invoices/pdf/%s?%s&amp;print=true' % (invoice.id, keep_query())" id="print_invoice_report" title="Print"><i class="fa fa-print"/> Print</a>
</div>
</div>
<hr t-if="invoice.user_id" class="mt0 mb0"/>
<div class="pb8 ml16 mr16 container">
<t t-if="invoice.user_id">
<div><strong>Your Contact:</strong></div>
<img class="img-circle mr4 pull-left o_portal_contact_img" t-if="invoice.user_id.image" t-attf-src="data:image/png;base64,#{invoice.user_id.image}" alt="Contact"/>
<img class="img-circle mr4 pull-left o_portal_contact_img" t-if="not invoice.user_id.image" src="/web/static/src/img/placeholder.png" alt="Contact"/>
<img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="invoice.user_id.image" t-attf-src="data:image/png;base64,#{invoice.user_id.image}" alt="Contact"/>
<img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not invoice.user_id.image" src="/web/static/src/img/placeholder.png" alt="Contact"/>
<span t-field="invoice.user_id" t-field-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/>
<a data-toggle="modal" href="#" data-target="#invoice_chatter">Contact us</a>
</t>
@@ -102,13 +102,13 @@
<a data-toggle="modal" href="#" data-target="#invoice_chatter">Contact us</a>
</div>
</div>
<div class="text-center hidden-xs mt4 o_portal_brand">
<div class="text-center d-none d-md-block mt4 o_portal_brand">
Powered by <a target="_blank" href="http://www.odoo.com">Odoo</a>
</div>
</div>
</div>
<!-- Page Content -->
<div id="invoice_content" class="col-md-9 o_portal_page_content hidden-print">
<div id="invoice_content" class="col-lg-9 o_portal_page_content d-print-none">
<t t-if="error or warning" t-call="account.portal_invoice_error"/>
<t t-if="success and (not error and not warning)" t-call="account.portal_invoice_success"/>
<div class="o_portal_html_view">
@@ -142,7 +142,7 @@
<template id="portal_invoice_error" name="Invoice error/warning display">
<div class="row mr16">
<div t-attf-class="'col-md-12 mr16 ml16 alert alert-dismissable' #{'alert-danger' if error else 'alert-warning'}" role="alert">
<div t-attf-class="'col-lg-12 mr16 ml16 alert alert-dismissable' #{'alert-danger' if error else 'alert-warning'}" role="alert">
<a href="#" class="close" data-dismiss="alert" aria-label="close" title="close">×</a>
<t t-if="error == 'generic'" name="generic">
There was an error processing this page.
@@ -153,7 +153,7 @@
<template id="portal_invoice_success" name="Invoice success display">
<div class="row mr16">
<div class="col-md-12 mr16 ml16 alert alert-dismissable alert-success" role="status">
<div class="col-lg-12 mr16 ml16 alert alert-dismissable alert-success" role="status">
<a href="#" class="close" data-dismiss="alert" aria-label="close" title="close">×</a>
</div>
</div>
addons/account/views/account_view.xml
+26 -26
View File
@@ -31,9 +31,9 @@
</group>
<group>
<div class="row">
<div class="col-md-11 col-md-offset-1 col-sm-12 no-margin-top" style="background-color: #eee">
<div class="col-lg-11 offset-lg-1 col-md-12 no-margin-top" style="background-color: #eee">
<p class="text-center" style="font-weight: bold;">How do account types affect your reports?</p>
<div class="col-md-6 col-sm-6">
<div class="col-lg-6 col-md-6">
<div class="oe_account_help">
<p class="oe_account_font_help text-center">Profit &amp; Loss</p>
<p class="oe_account_font_help oe_account_font_title">Income</p>
@@ -59,7 +59,7 @@
</div>
</div>
</div>
<div class="col-md-6 col-sm-6">
<div class="col-lg-6 col-md-6">
<div class="oe_account_help">
<p class="oe_account_font_help text-center">Balance Sheet</p>
<p class="oe_account_font_help oe_account_font_title" style="color: grey;">Current Assets</p>
@@ -113,11 +113,11 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<strong><field name="name"/></strong>
</div>
<div class="col-xs-6 text-right">
<span class="badge"><t t-esc="record.code.value"/></span>
<div class="col-6 text-right">
<span class="badge badge-pill"><t t-esc="record.code.value"/></span>
</div>
</div>
<div>
@@ -225,11 +225,11 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_content oe_kanban_global_click">
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<strong><field name="name"/></strong>
</div>
<div class="col-xs-6">
<span class="pull-right"><field name="type"/></span>
<div class="col-6">
<span class="float-right"><field name="type"/></span>
</div>
</div>
</div>
@@ -345,7 +345,7 @@
</div>
</div>
<div class="content-group" attrs="{'invisible': [('alias_domain', '!=', False)]}">
<a type='action' name='%(action_open_settings)d' class="btn btn-sm btn-link" role="button"><i class="fa fa-fw o_button_icon fa-arrow-right"/> Configure Email Servers</a>
<a type='action' name='%(action_open_settings)d' class="btn btn-link" role="button"><i class="fa fa-fw o_button_icon fa-arrow-right"/> Configure Email Servers</a>
</div>
</group>
</group>
@@ -379,7 +379,7 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_content oe_kanban_global_click">
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<strong><field name="name"/></strong>
</div>
</div>
@@ -531,7 +531,7 @@
</group>
<footer>
<button string="Confirm" name="validate" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -556,7 +556,7 @@
<p>Confirming this will create automatically a journal entry with the difference in the profit/loss account set on the cash journal.</p>
<footer>
<button string="Confirm" name="validate" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</div>
</form>
@@ -1027,11 +1027,11 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="row mb4">
<div class="col-xs-6">
<div class="col-6">
<strong><span><t t-esc="record.name.value"/></span></strong>
</div>
<div class="col-xs-6 pull-right text-right">
<span class="badge"><t t-esc="record.type_tax_use.value"/></span>
<div class="col-6 float-right text-right">
<span class="badge badge-pill"><t t-esc="record.type_tax_use.value"/></span>
</div>
</div>
</div>
@@ -1245,16 +1245,16 @@
<t t-name="kanban-box">
<div class="oe_kanban_global_click">
<div class="row mb4">
<strong class="col-xs-6">
<strong class="col-6">
<span t-esc="record.move_id.value"/>
</strong>
<strong class="col-xs-6 text-right">
<strong class="col-6 text-right">
<i class="fa fa-clock-o" aria-label="Date" role="img" title="Date"/><field name="date_maturity"/>
</strong>
<div class="col-xs-10">
<div class="col-10">
<span t-esc="record.name.value"/>
</div>
<div class="col-xs-2 text-right">
<div class="col-2 text-right">
<img t-att-src="kanban_image('res.partner', 'image_small', record.partner_id.raw_value)" t-att-title="record.partner_id.value" t-att-alt="record.partner_id.value" width="24" height="24" class="oe_kanban_avatar"/>
</div>
</div>
@@ -1456,25 +1456,25 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row mb4">
<div class="col-xs-6">
<div class="col-6">
<strong><span><field name="journal_id"/></span></strong>
</div>
<div class="col-xs-6 text-right">
<div class="col-6 text-right">
<strong><i class="fa fa-clock-o" aria-label="Date" role="img" title="Date"/> <t t-esc="record.date.value"/></strong>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<span><field name="ref"/></span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<span><field name="amount" widget='monetary'/></span>
<span><field name="currency_id" invisible="1"/></span>
</div>
<div class="col-xs-6">
<span class="pull-right">
<div class="col-6">
<span class="float-right">
<field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'posted': 'success'}}"/>
</span>
</div>
addons/account/views/report_agedpartnerbalance.xml
+5 -5
View File
@@ -7,17 +7,17 @@
<h2>Aged Partner Balance</h2>
<div class="row mt32">
<div class="col-xs-3">
<div class="col-3">
<strong>Start Date:</strong>
<p t-esc="data['date_from']"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Period Length (days)</strong>
<p t-esc="data['period_length']"/>
</div>
</div>
<div class="row mb32">
<div class="col-xs-3">
<div class="col-3">
<strong>Partner's:</strong>
<p>
<span t-if="data['result_selection'] == 'customer'">Receivable Accounts</span>
@@ -25,7 +25,7 @@
<span t-if="data['result_selection'] == 'customer_supplier'">Receivable and Payable Accounts</span>
</p>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Target Moves:</strong>
<p>
<span t-if="data['target_move'] == 'all'">All Entries</span>
@@ -34,7 +34,7 @@
</div>
</div>
<table class="table table-condensed">
<table class="table table-sm">
<thead>
<tr>
<th>Partners</th>
addons/account/views/report_financial.xml
+5 -5
View File
@@ -8,14 +8,14 @@
<h2 t-esc="data['account_report_id'][1]"/>
<div class="row mt32 mb32">
<div class="col-xs-4">
<div class="col-4">
<strong>Target Moves:</strong>
<p>
<span t-if="data['target_move'] == 'all'">All Entries</span>
<span t-if="data['target_move'] == 'posted'">All Posted Entries</span>
</p>
</div>
<div class="col-xs-4">
<div class="col-4">
<p>
<t t-if="data['date_from']"><strong>Date from :</strong> <span t-esc="data['date_from']"/><br/></t>
<t t-if="data['date_to']"><strong>Date to :</strong> <span t-esc="data['date_to']"/></t>
@@ -23,7 +23,7 @@
</div>
</div>
<table class="table table-condensed" t-if="data['debit_credit'] == 1">
<table class="table table-sm" t-if="data['debit_credit'] == 1">
<thead>
<tr>
<th>Name</th>
@@ -56,7 +56,7 @@
</tbody>
</table>
<table class="table table-condensed" t-if="not data['enable_filter'] and not data['debit_credit']">
<table class="table table-sm" t-if="not data['enable_filter'] and not data['debit_credit']">
<thead>
<tr>
<th>Name</th>
@@ -79,7 +79,7 @@
</tbody>
</table>
<table class="table table-condensed" t-if="data['enable_filter'] == 1 and not data['debit_credit']">
<table class="table table-sm" t-if="data['enable_filter'] == 1 and not data['debit_credit']">
<thead>
<tr>
<th>Name</th>
addons/account/views/report_generalledger.xml
+6 -6
View File
@@ -12,11 +12,11 @@
<h2><span t-esc="res_company.name"/>: General ledger</h2>
<div class="row mt32">
<div class="col-xs-4">
<div class="col-4">
<strong>Journals:</strong>
<p t-esc="', '.join([ lt or '' for lt in print_journal ])"/>
</div>
<div class="col-xs-4">
<div class="col-4">
<strong>Display Account</strong>
<p>
<span t-if="data['display_account'] == 'all'">All accounts'</span>
@@ -24,25 +24,25 @@
<span t-if="data['display_account'] == 'not_zero'">With balance not equal to zero</span>
</p>
</div>
<div class="col-xs-4">
<div class="col-4">
<strong>Target Moves:</strong>
<p t-if="data['target_move'] == 'all'">All Entries</p>
<p t-if="data['target_move'] == 'posted'">All Posted Entries</p>
</div>
</div>
<div class="row mb32">
<div class="col-xs-4">
<div class="col-4">
<strong>Sorted By:</strong>
<p t-if="data['sortby'] == 'sort_date'">Date</p>
<p t-if="data['sortby'] == 'sort_journal_partner'">Journal and Partner</p>
</div>
<div class="col-xs-4">
<div class="col-4">
<t t-if="data['date_from']"><strong>Date from :</strong> <span t-esc="data['date_from']"/><br/></t>
<t t-if="data['date_to']"><strong>Date to :</strong> <span t-esc="data['date_to']"/></t>
</div>
</div>
<table class="table table-condensed">
<table class="table table-sm">
<thead>
<tr class="text-center">
<th>Date</th>
addons/account/views/report_invoice.xml
+15 -15
View File
@@ -21,8 +21,8 @@
</h2>
<!-- HTML Preview for mobile responsive -->
<t t-set="o_grid_layout" t-value="'col-xs-2'"/>
<t t-if="type_html" t-set="o_grid_layout" t-value="'col-sm-2 col-xs-6'"/>
<t t-set="o_grid_layout" t-value="'col-2'"/>
<t t-if="type_html" t-set="o_grid_layout" t-value="'col-6 col-md-2'"/>
<div class="row mt32 mb32">
<div t-att-class="o_grid_layout" t-if="o.name" name="description">
<strong>Description:</strong>
@@ -58,20 +58,20 @@
<t t-set="display_taxamount"
t-value="o.company_id.tax_calculation_rounding_method == 'round_per_line'"/>
<table t-attf-class="table table-condensed " name="invoice_line_table">
<table t-attf-class="table table-sm" name="invoice_line_table">
<thead>
<tr>
<t t-set="colspan" t-value="6"/>
<th>Description</th>
<th class="hidden">Source Document</th>
<th class="d-none">Source Document</th>
<th class="text-right">Quantity</th>
<th class="text-right hidden-xs">Unit Price</th>
<th t-if="display_discount" class="text-right hidden-xs">
<th class="text-right d-none d-md-table-cell">Unit Price</th>
<th t-if="display_discount" class="text-right d-none d-md-table-cell">
<span>Disc.(%)</span>
<t t-set="colspan" t-value="colspan+1"/>
</th>
<th class="text-right hidden-xs">Taxes</th>
<th t-if="display_taxamount and type_is_out" class="text-right hidden-xs">
<th class="text-right d-none d-md-table-cell">Taxes</th>
<th t-if="display_taxamount and type_is_out" class="text-right d-none d-md-table-cell">
<span>Tax Amount</span>
<t t-set="colspan" t-value="colspan+1"/>
</th>
@@ -92,21 +92,21 @@
<tr t-attf-class="{{ 'o_is_' + line.display_type if line.display_type else '' }}">
<t t-if="not line.display_type" name="account_invoice_line_accountable">
<td name="account_invoice_line_name"><span t-field="line.name"/></td>
<td class="hidden"><span t-field="line.origin"/></td>
<td class="d-none"><span t-field="line.origin"/></td>
<td class="text-right">
<span t-field="line.quantity"/>
<span t-field="line.uom_id" groups="uom.group_uom"/>
</td>
<td class="text-right hidden-xs">
<td class="text-right d-none d-md-table-cell">
<span t-field="line.price_unit"/>
</td>
<td t-if="display_discount" class="text-right hidden-xs">
<td t-if="display_discount" class="text-right d-none d-md-table-cell">
<span t-field="line.discount"/>
</td>
<td class="text-right hidden-xs">
<td class="text-right d-none d-md-table-cell">
<span t-esc="', '.join(map(lambda x: (x.description or x.name), line.invoice_line_tax_ids))"/>
</td>
<td t-if="display_taxamount and type_is_out" class="text-right hidden-xs">
<td t-if="display_taxamount and type_is_out" class="text-right d-none d-md-table-cell">
<t t-set="taxes"
t-value="line.invoice_line_tax_ids.compute_all(line.price_unit, line.currency_id, line.quantity)"/>
<t t-set="tax_amount"
@@ -156,8 +156,8 @@
<div class="clearfix">
<div id="total" class="row">
<div t-attf-class="col-sm-4 pull-right #{'col-xs-4' if not type_html else ''}">
<table class="table table-condensed" style="min-width: 250px;max-width: 400px;">
<div t-attf-class="col-md-4 float-right #{'col-4' if not type_html else ''}">
<table class="table table-sm" style="min-width: 250px;max-width: 400px;">
<tr class="border-black" style="border-bottom:1px solid #dddddd;">
<td><strong>Subtotal</strong></td>
<td class="text-right">
addons/account/views/report_journal.xml
+9 -9
View File
@@ -11,27 +11,27 @@
<h2><t t-esc="o.name"/> Journal</h2>
<div class="row mt32">
<div class="col-xs-3">
<div class="col-3">
<strong>Company:</strong>
<p t-esc="res_company.name"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Journal:</strong>
<p t-esc="o.name"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Entries Sorted By:</strong>
<p t-if="data['form'].get('sort_selection') != 'l.date'">Journal Entry Number</p>
<p t-if="data['form'].get('sort_selection') == 'l.date'">Date</p>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Target Moves:</strong>
<p t-if="data['form']['target_move'] == 'all'">All Entries</p>
<p t-if="data['form']['target_move'] == 'posted'">All Posted Entries</p>
</div>
</div>
<table class="table table-condensed">
<table class="table table-sm">
<thead>
<tr>
<th>Move</th>
@@ -61,8 +61,8 @@
</table>
<div class="row">
<div class="col-xs-4 pull-right">
<table class="table table-condensed">
<div class="col-4 float-right">
<table class="table table-sm">
<tr>
<td><strong>Total</strong></td>
<td><span t-esc="sum_debit(data, o)" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></td>
@@ -73,8 +73,8 @@
</div>
<div class="row">
<div class="col-xs-4">
<table class="table table-condensed">
<div class="col-4">
<table class="table table-sm">
<thead>
<tr><th colspan="3">Tax Declaration</th></tr>
<tr>
addons/account/views/report_overdue.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<t t-call="web.external_layout">
<div class="page">
<div class="row">
<div class="col-xs-5 col-xs-offset-7">
<div class="col-5 offset-7">
<span t-field="o.name"/><br/>
<span t-raw="o.contact_address.replace('\n\n', '\n').replace('\n', '&lt;br&gt;')"/>
<span t-field="o.vat"/>
@@ -17,7 +17,7 @@
<t t-if="Lines[o.id]">
<span t-field="res_company.with_context(lang=o.lang).overdue_msg"/>
<table class="table table-condensed" t-foreach="Lines[o.id]" t-as="currency">
<table class="table table-sm" t-foreach="Lines[o.id]" t-as="currency">
<thead>
<tr>
<th>Reference number</th>
addons/account/views/report_partnerledger.xml
+4 -4
View File
@@ -11,22 +11,22 @@
<h2>Partner Ledger</h2>
<div class="row">
<div class="col-xs-3">
<div class="col-3">
<strong>Company:</strong>
<p t-esc="res_company.name"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<t t-if="data['form']['date_from']"><strong>Date from :</strong> <span t-esc="data['form']['date_from']"/><br/></t>
<t t-if="data['form']['date_to']"><strong>Date to :</strong> <span t-esc="data['form']['date_to']"/></t>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Target Moves:</strong>
<p t-if="data['form']['target_move'] == 'all'">All Entries</p>
<p t-if="data['form']['target_move'] == 'posted'">All Posted Entries</p>
</div>
</div>
<table class="table table-condensed">
<table class="table table-sm">
<thead>
<tr>
<th>Date</th>
addons/account/views/report_tax.xml
+2 -2
View File
@@ -6,12 +6,12 @@
<div class="page">
<h3> Tax Report</h3>
<div class="row">
<div class="col-xs-4">
<div class="col-4">
<t t-if="data['date_from']"><strong>From</strong> <span t-esc="data['date_from']"/><br/></t>
<t t-if="data['date_to']"><strong>to </strong><span t-esc="data['date_to']"/></t>
</div>
</div>
<table class="table table-condensed">
<table class="table table-sm">
<thead>
<tr class="text-center">
<th>Sale</th>
addons/account/views/report_trialbalance.xml
+4 -4
View File
@@ -7,7 +7,7 @@
<h2><span t-esc="res_company.name"/>: Trial Balance</h2>
<div class="row mt32">
<div class="col-xs-4">
<div class="col-4">
<strong>Display Account:</strong>
<p>
<span t-if="data['display_account'] == 'all'">All accounts</span>
@@ -15,13 +15,13 @@
<span t-if="data['display_account'] == 'not_zero'">With balance not equal to zero</span>
</p>
</div>
<div class="col-xs-4">
<div class="col-4">
<p>
<t t-if="data['date_from']"><strong>Date from :</strong> <span t-esc="data['date_from']"/><br/></t>
<t t-if="data['date_to']"><strong>Date to :</strong> <span t-esc="data['date_to']"/></t>
</p>
</div>
<div class="col-xs-4">
<div class="col-4">
<strong>Target Moves:</strong>
<p>
<span t-if="data['target_move'] == 'all'">All Entries</span>
@@ -30,7 +30,7 @@
</div>
</div>
<table class="table table-condensed">
<table class="table table-sm">
<thead>
<tr>
<th>Code</th>
addons/account/views/res_config_settings_views.xml
+39 -39
View File
@@ -21,7 +21,7 @@
<field name="has_accounting_entries" invisible="1"/>
<h2 attrs="{'invisible': [('has_accounting_entries','!=',False)]}">Fiscal Localization</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('has_accounting_entries','!=',False)]}">
<div class="col-12 col-lg-6 o_setting_box" attrs="{'invisible': [('has_accounting_entries','!=',False)]}">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<span class="o_form_label">Fiscal Localization</span>
@@ -31,7 +31,7 @@
</div>
<div class="content-group">
<div class="row mt16">
<label for="chart_template_id" string="Package" class="col-md-3 o_light_label"/>
<label for="chart_template_id" string="Package" class="col-lg-3 o_light_label"/>
<field name="chart_template_id" widget="selection"/>
</div>
<div>
@@ -44,7 +44,7 @@
<t groups="account.group_account_user">
<h2>Setup</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="account_hide_setup_bar" widget="upgrade_boolean"/>
</div>
@@ -59,7 +59,7 @@
</t>
<h2>Taxes</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" title="These taxes are set in any new product created.">
<div class="col-12 col-lg-6 o_setting_box" title="These taxes are set in any new product created.">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<span class="o_form_label">Default Taxes</span>
@@ -69,17 +69,17 @@
</div>
<div class="content-group">
<div class="row mt16">
<label string="Sales Tax" for="sale_tax_id" class="col-md-3 o_light_label"/>
<label string="Sales Tax" for="sale_tax_id" class="col-lg-3 o_light_label"/>
<field name="sale_tax_id" domain="[('type_tax_use', 'in', ('sale', 'all')), ('company_id', '=', company_id)]"/>
</div>
<div class="row">
<label string="Purchase Tax" for="purchase_tax_id" class="col-md-3 o_light_label"/>
<label string="Purchase Tax" for="purchase_tax_id" class="col-lg-3 o_light_label"/>
<field name="purchase_tax_id" domain="[('type_tax_use', 'in', ('purchase', 'all')), ('company_id', '=', company_id)]"/>
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="rounding_method" title="A rounding per line is advised if your prices are tax-included. That way, the sum of line subtotals equals the total with taxes.">
<div class="col-12 col-lg-6 o_setting_box" id="rounding_method" title="A rounding per line is advised if your prices are tax-included. That way, the sum of line subtotals equals the total with taxes.">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<span class="o_form_label">Rounding Method</span>
@@ -91,7 +91,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="taxcloud_settings">
<div class="col-12 col-lg-6 o_setting_box" id="taxcloud_settings">
<div class="o_setting_left_pane">
<field name="module_account_taxcloud"/>
</div>
@@ -103,7 +103,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="eu_service" title="If you're selling digital goods to customers in the EU, you must charge VAT based on your customers' locations. This rule applies regardless of you are located. Digital goods are defined in the legislation as broadcasting, telecommunications, and services that are electronically supplied instead of shipped. Gift cards sent online are not included in the definition.">
<div class="col-12 col-lg-6 o_setting_box" id="eu_service" title="If you're selling digital goods to customers in the EU, you must charge VAT based on your customers' locations. This rule applies regardless of you are located. Digital goods are defined in the legislation as broadcasting, telecommunications, and services that are electronically supplied instead of shipped. Gift cards sent online are not included in the definition.">
<div class="o_setting_left_pane">
<field name="module_l10n_eu_service"/>
</div>
@@ -114,7 +114,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Select this if the taxes should use cash basis, which will create an entry for such taxes on a given account during reconciliation." groups="account.group_account_user">
<div class="col-12 col-lg-6 o_setting_box" title="Select this if the taxes should use cash basis, which will create an entry for such taxes on a given account during reconciliation." groups="account.group_account_user">
<div class="o_setting_left_pane">
<field name="tax_exigibility"/>
</div>
@@ -126,7 +126,7 @@
</div>
<div class="content-group" attrs="{'invisible': [('tax_exigibility', '=', False)]}">
<div class="row mt16">
<label for="tax_cash_basis_journal_id" class="col-md-3 o_light_label"/>
<label for="tax_cash_basis_journal_id" class="col-lg-3 o_light_label"/>
<field name="tax_cash_basis_journal_id"/>
</div>
</div>
@@ -135,7 +135,7 @@
</div>
<h2>Currencies</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<span class="o_form_label">Main Currency</span>
@@ -145,13 +145,13 @@
</div>
<div class="content-group">
<div class="row mt16">
<label for="currency_id" class="col-md-3 o_light_label"/>
<label for="currency_id" class="col-lg-3 o_light_label"/>
<field name="currency_id" options="{'no_create_edit': True, 'no_open': True}" context="{'active_test': False}"/>
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_multi_currency"/>
</div>
@@ -165,13 +165,13 @@
<button name="%(base.action_currency_all_form)d" icon="fa-arrow-right" type="action" string="Activate Other Currencies" class="btn-link"/>
</div>
<div class="row mt16">
<label for="currency_exchange_journal_id" class="col-md-3 o_light_label"/>
<label for="currency_exchange_journal_id" class="col-lg-3 o_light_label"/>
<field name="currency_exchange_journal_id"/>
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('group_multi_currency', '=', False)]}">
<div class="col-12 col-lg-6 o_setting_box" attrs="{'invisible': [('group_multi_currency', '=', False)]}">
<div class="o_setting_left_pane">
<field name="module_currency_rate_live" widget="upgrade_boolean"/>
</div>
@@ -186,8 +186,8 @@
<t groups="account.group_account_user">
<h2>Fiscal Periods</h2>
<div class="row mt16 o_settings_container" id="accounting_reports">
<div class="col-xs-12 col-md-6 o_setting_box" id="fiscalyear" invisible="1" groups="account.group_account_user"/>
<div class="col-xs-12 col-md-6 o_setting_box" id="dynamic_report" invisible="1" groups="account.group_account_user">
<div class="col-12 col-lg-6 o_setting_box" id="fiscalyear" invisible="1" groups="account.group_account_user"/>
<div class="col-12 col-lg-6 o_setting_box" id="dynamic_report" invisible="1" groups="account.group_account_user">
<div class="o_setting_left_pane">
<field name="module_account_reports" widget="upgrade_boolean"/>
</div>
@@ -202,7 +202,7 @@
</t>
<h2>Customer Payments</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" id="account_followup" title="This feature is useful if you issue a high amounts of invoices.">
<div class="col-12 col-lg-6 o_setting_box" id="account_followup" title="This feature is useful if you issue a high amounts of invoices.">
<div class="o_setting_left_pane">
<field name="module_account_reports_followup" widget="upgrade_boolean"/>
</div>
@@ -218,7 +218,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_account_payment"/>
</div>
@@ -229,7 +229,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" groups="account.group_account_user">
<div class="col-12 col-lg-6 o_setting_box" groups="account.group_account_user">
<div class="o_setting_left_pane">
<field name="module_account_batch_payment" widget="upgrade_boolean"/>
</div>
@@ -240,7 +240,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="If you check this box, you will be able to collect payments using SEPA Direct Debit mandates.">
<div class="col-12 col-lg-6 o_setting_box" title="If you check this box, you will be able to collect payments using SEPA Direct Debit mandates.">
<div class="o_setting_left_pane">
<field name="module_account_sepa_direct_debit" class="oe_inline" widget="upgrade_boolean"/>
</div>
@@ -275,7 +275,7 @@
<h2>Supplier Payments</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" groups="account.group_account_user">
<div class="col-12 col-lg-6 o_setting_box" groups="account.group_account_user">
<div class="o_setting_left_pane">
<field name="module_account_check_printing" widget="upgrade_boolean"/>
</div>
@@ -287,7 +287,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="If you check this box, you will be able to register your payment using SEPA.">
<div class="col-12 col-lg-6 o_setting_box" title="If you check this box, you will be able to register your payment using SEPA.">
<div class="o_setting_left_pane">
<field name="module_account_sepa" widget="upgrade_boolean"/>
</div>
@@ -304,7 +304,7 @@
<t groups="account.group_account_user">
<h2>Bank &amp; Cash</h2>
<div class="row mt16 o_settings_container" id="bank_cash">
<div class="col-xs-12 col-md-6 o_setting_box" id="account_yodlee" title="Get your bank statements automatically imported every 4 hours, or in one-click, using Yodlee and Plaid services. Once installed, set “Bank Feeds” to “Bank Synchronization” in bank account settings. Then, click “Configure” on the online account to enter your bank credentials.">
<div class="col-12 col-lg-6 o_setting_box" id="account_yodlee" title="Get your bank statements automatically imported every 4 hours, or in one-click, using Yodlee and Plaid services. Once installed, set “Bank Feeds” to “Bank Synchronization” in bank account settings. Then, click “Configure” on the online account to enter your bank credentials.">
<div class="o_setting_left_pane">
<field name="module_account_yodlee" widget="upgrade_boolean"/>
</div>
@@ -315,7 +315,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="col-12 col-lg-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="o_setting_left_pane">
<field name="module_account_bank_statement_import_csv" widget="upgrade_boolean"/>
</div>
@@ -326,7 +326,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="col-12 col-lg-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="o_setting_left_pane">
<field name="module_account_bank_statement_import_qif" widget="upgrade_boolean"/>
</div>
@@ -337,7 +337,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="col-12 col-lg-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="o_setting_left_pane">
<field name="module_account_bank_statement_import_ofx" widget="upgrade_boolean"/>
</div>
@@ -348,7 +348,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="col-12 col-lg-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
<div class="o_setting_left_pane">
<field name="module_account_bank_statement_import_camt" widget="upgrade_boolean"/>
</div>
@@ -363,7 +363,7 @@
</t>
<h2>Analytics</h2>
<div class="row mt16 o_settings_container" id="analytic">
<div class="col-xs-12 col-md-6 o_setting_box" title="Allows you to use the analytic accounting." groups="account.group_account_user">
<div class="col-12 col-lg-6 o_setting_box" title="Allows you to use the analytic accounting." groups="account.group_account_user">
<div class="o_setting_left_pane">
<field name="group_analytic_accounting"/>
</div>
@@ -382,7 +382,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" groups="account.group_account_user">
<div class="col-12 col-lg-6 o_setting_box" groups="account.group_account_user">
<div class="o_setting_left_pane">
<field name="group_analytic_tags"/>
</div>
@@ -398,7 +398,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="account_budget" title="This allows accountants to manage analytic and crossovered budgets. Once the master budgets and the budgets are defined, the project managers can set the planned amount on each analytic account." groups="account.group_account_user">
<div class="col-12 col-lg-6 o_setting_box" id="account_budget" title="This allows accountants to manage analytic and crossovered budgets. Once the master budgets and the budgets are defined, the project managers can set the planned amount on each analytic account." groups="account.group_account_user">
<div class="o_setting_left_pane">
<field name="module_account_budget"/>
</div>
@@ -414,7 +414,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_product_margin"/>
</div>
@@ -428,7 +428,7 @@
</div>
<h2>Invoices</h2>
<div class="row mt16 o_settings_container" id="invoicing_settings">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
</div>
<div class="o_setting_right_pane">
@@ -443,7 +443,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_warning_account"/>
</div>
@@ -454,7 +454,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_print_docsaway" widget="upgrade_boolean"/>
</div>
@@ -465,7 +465,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_cash_rounding"/>
</div>
@@ -495,7 +495,7 @@
</div>
<h2 groups="account.group_account_user">Automated Entries</h2>
<div class="row mt16 o_settings_container" id="recommended_apps" groups="account.group_account_user">
<div class="col-xs-12 col-md-6 o_setting_box" id="asset_types" title="This allows you to manage the assets owned by a company or a person. It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.">
<div class="col-12 col-lg-6 o_setting_box" id="asset_types" title="This allows you to manage the assets owned by a company or a person. It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.">
<div class="o_setting_left_pane">
<field name="module_account_asset"/>
</div>
@@ -511,7 +511,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="This allows you to manage the revenue recognition on selling products. It keeps track of the installments occurred on those revenue recognitions, and creates account moves for those installment lines.">
<div class="col-12 col-lg-6 o_setting_box" title="This allows you to manage the revenue recognition on selling products. It keeps track of the installments occurred on those revenue recognitions, and creates account moves for those installment lines.">
<div class="o_setting_left_pane">
<field name="module_account_deferred_revenue" widget="upgrade_boolean"/>
</div>
addons/account/wizard/account_invoice_refund_view.xml
+1 -1
View File
@@ -41,7 +41,7 @@
</group>
<footer>
<button string='Add Credit Note' name="invoice_refund" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_invoice_state_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</p>
<footer>
<button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_move_reversal_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button string="Reverse Moves" name="reverse_moves" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_reconcile_view.xml
+2 -2
View File
@@ -20,7 +20,7 @@
<button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="btn-primary"/>
<button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','=',0)]}" class="btn-primary"/>
<button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':['|',('writeoff','=',0),('trans_nbr','&lt;',2)]}" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -47,7 +47,7 @@
</group>
<footer>
<button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_report_aged_partner_balance_view.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<field name="journal_ids" required="0" invisible="1"/>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
<button string="Cancel" class="btn btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_report_common_view.xml
+1 -1
View File
@@ -17,7 +17,7 @@
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel" />
<button string="Cancel" class="btn btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/account/wizard/account_unreconcile_view.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<form class="o_form_label">If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled</form>
<footer>
<button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_validate_move_view.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<span class="o_form_label">All selected journal entries will be validated and posted. You won't be able to modify them afterwards.</span>
<footer>
<button string="Post Journal Entries" name="validate_move" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/multi_compose_message_views.xml
+2 -2
View File
@@ -52,10 +52,10 @@
attrs="{'invisible': ['|', '|', '|', ('is_log', '=', True), ('printed', '=', True), ('is_print', '=', False), ('is_email', '=', True)]}"
name="print_action" type="object" class="btn-primary o_mail_send"/>
<button string="Done" attrs="{'invisible': [('printed', '=', False)]}" special="cancel" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
<button icon="fa-lg fa-save" type="object" name="save_as_template" string="Save as new template"
attrs="{'invisible': ['|', '|', '|', ('is_log', '=', True), ('printed', '=', True), ('is_email', '=', False)]}"
class="pull-right btn-default" help="Save as a new template" />
class="float-right btn-secondary" help="Save as a new template" />
</footer>
</form>
</field>
addons/account/wizard/pos_box.xml
+2 -2
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="run" string="Put Money In" type="object" class="btn-primary"/>
<button special="cancel" string="Cancel" class="btn-default"/>
<button special="cancel" string="Cancel" class="btn-secondary"/>
</footer>
</form>
</field>
@@ -41,7 +41,7 @@
<footer>
<button name="run" string="Take Money Out" type="object" class="btn-primary"/>
<button class="btn-default" special="cancel" string="Cancel" />
<button class="btn-secondary" special="cancel" string="Cancel" />
</footer>
</form>
</field>
addons/account/wizard/setup_wizards_view.xml
+5 -5
View File
@@ -28,23 +28,23 @@
<field name="arch" type="xml">
<form>
<div class="row">
<div class="col-xs-4">
<div class="col-4">
<label for="opening_date"/>
</div>
<div class="col-xs-8">
<div class="col-8">
<field name="opening_move_posted" invisible="1"/>
<field name="opening_date" attrs="{'readonly': [('opening_move_posted', '=', True)]}"/>
</div>
</div>
<div class="row">
<div class="col-xs-4">
<div class="col-4">
<strong>Fiscal Year End</strong>
</div>
<div class="col-xs-4">
<div class="col-4">
<field name="fiscalyear_last_day"/>
</div>
<div class="col-xs-4">
<div class="col-4">
<field name="fiscalyear_last_month"/>
</div>
</div>
addons/account/wizard/wizard_tax_adjustments_view.xml
+2 -2
View File
@@ -29,11 +29,11 @@
<footer>
<div attrs="{'invisible': [('adjustment_type', '=', 'credit')]}">
<button name="create_move_debit" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel" />
<button string="Cancel" class="btn btn-secondary" special="cancel" />
</div>
<div attrs="{'invisible': [('adjustment_type', '!=', 'credit')]}">
<button name="create_move_credit" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel" />
<button string="Cancel" class="btn btn-secondary" special="cancel" />
</div>
</footer>
</form>
addons/account_analytic_default/views/account_analytic_default_view.xml
+1 -1
View File
@@ -55,7 +55,7 @@
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div>
<strong><span><field name="analytic_id"/></span></strong>
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/>
</div>
<div t-if="record.date_start.value"><i class="fa fa-calendar"></i> From <field name="date_start"/> <t t-if="record.date_stop.value">to <field name="date_stop"/></t></div>
<div t-if="record.product_id.value"><strong>Product</strong> <field name="product_id"/> </div>
addons/account_asset/static/src/js/account_asset.js
+1 -1
View File
@@ -58,7 +58,7 @@ var AccountAssetWidget = AbstractField.extend({
type: 'button',
title: title,
disabled: disabled,
}).addClass('btn btn-sm btn-link fa fa-circle o_deprec_lines_toggler ' + className);
}).addClass('btn btn-link fa fa-circle o_deprec_lines_toggler ' + className);
this.$el.html($button);
},
addons/account_asset/static/src/scss/account_asset.scss
+3 -3
View File
@@ -1,9 +1,9 @@
.o_web_client .o_deprec_lines_toggler {
color: $brand-danger;
color: theme-color('danger');
&.o_is_posted {
color: $brand-success;
color: theme-color('success');
}
&.o_unposted {
color: $brand-warning;
color: theme-color('warning');
}
}
addons/account_asset/views/account_asset_views.xml
+8 -8
View File
@@ -92,11 +92,11 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="row mb4">
<div class="col-xs-6">
<div class="col-6">
<strong><span><t t-esc="record.name.value"/></span></strong>
</div>
<div class="col-xs-6 text-right">
<span class="badge"><strong><t t-esc="record.method.value"/></strong></span>
<div class="col-6 text-right">
<span class="badge badge-pill"><strong><t t-esc="record.method.value"/></strong></span>
</div>
</div>
<div> <t t-esc="record.journal_id.value"/></div>
@@ -249,19 +249,19 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row mb4">
<div class="col-xs-6">
<div class="col-6">
<strong><span><t t-esc="record.name.value"/></span></strong>
</div>
<div class="col-xs-6 pull-right text-right">
<div class="col-6 float-right text-right">
<strong><t t-esc="record.date.value"/></strong>
</div>
</div>
<div class="row">
<div class="col-xs-6 text-muted">
<div class="col-6 text-muted">
<span><t t-esc="record.category_id.value"/></span>
</div>
<div class="col-xs-6">
<span class="pull-right text-right">
<div class="col-6">
<span class="float-right text-right">
<field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'primary', 'open': 'success', 'close': 'default'}}"/>
</span>
</div>
addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
+1 -1
View File
@@ -16,7 +16,7 @@
</group>
<footer>
<button string="Generate Entries" name="asset_compute" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_asset/wizard/asset_modify_views.xml
+1 -1
View File
@@ -22,7 +22,7 @@
</group>
<footer>
<button name="modify" string="Modify" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_bank_statement_import/account_bank_statement_import_view.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<field name="filename" invisible="1"/>
<footer>
<button name="import_file" string="_Import" type="object" class="btn-primary" />
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_bank_statement_import/static/src/js/account_bank_statement_import.js
+1 -1
View File
@@ -11,7 +11,7 @@ BaseImport.DataImport.include({
this._super();
if (this.res_model == 'account.bank.statement') {
this.$(".import-link").prop({"text": _t(" Import Template for Bank Statements"), "href": "/account_bank_statement_import/static/csv/account.bank.statement.csv"});
this.$(".template-import").removeClass("hidden");
this.$(".template-import").removeClass('d-none');
}
},
});
addons/account_bank_statement_import/wizard/journal_creation.xml
+1 -1
View File
@@ -22,7 +22,7 @@
</group>
<footer>
<button name="create_journal" string="OK" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_budget/views/account_budget_views.xml
+7 -7
View File
@@ -182,29 +182,29 @@ Budgets
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row mb4">
<div class="col-xs-8">
<div class="col-8">
<strong>
<field name="name"/>
</strong>
</div>
<div class="col-xs-4">
<span class="pull-right">
<div class="col-4">
<span class="float-right">
<field name="state" widget="kanban_label_selection"
options="{'classes': {'draft': 'default', 'done': 'success'}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-xs-10">
<div class="col-10">
<i class="fa fa-clock-o" role="img" aria-label="Period" title="Period"/>
<t t-esc="record.date_from.value"/>-
<t t-esc="record.date_to.value"/>
</div>
<div class="col-xs-2">
<span class="pull-right">
<div class="col-2">
<span class="float-right">
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)"
t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24"
class="oe_kanban_avatar pull-right"/>
class="oe_kanban_avatar float-right"/>
</span>
</div>
</div>
addons/account_check_printing/views/account_journal_views.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<xpath expr="//t[@t-name='JournalBodyBankCash']//div[hasclass('o_kanban_primary_right')]" position="inside">
<div t-if="journal_type == 'bank' and dashboard.num_checks_to_print != 0">
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<a type="object" name="action_checks_to_print">
<t t-esc="dashboard.num_checks_to_print"/>
<t t-if="dashboard.num_checks_to_print == 1">Check to print</t>
addons/account_check_printing/views/res_config_settings_views.xml
+6 -6
View File
@@ -8,28 +8,28 @@
<div id="print_bills_payment" position="after">
<div class="content-group">
<div class="row mt16">
<label for="account_check_printing_layout" class="col-md-4 o_light_label"/>
<label for="account_check_printing_layout" class="col-lg-4 o_light_label"/>
<field name="account_check_printing_layout"/>
</div>
<div class="row">
<label for="account_check_printing_multi_stub" class="col-md-4 o_light_label"/>
<label for="account_check_printing_multi_stub" class="col-lg-4 o_light_label"/>
<field name="account_check_printing_multi_stub"/>
</div>
<div class="row">
<label for="account_check_printing_margin_top" class="col-md-4 o_light_label"/>
<label for="account_check_printing_margin_top" class="col-lg-4 o_light_label"/>
<field name="account_check_printing_margin_top"/>
</div>
<div class="row">
<label for="account_check_printing_margin_left" class="col-md-4 o_light_label"/>
<label for="account_check_printing_margin_left" class="col-lg-4 o_light_label"/>
<field name="account_check_printing_margin_left"/>
</div>
<field name="country_code" invisible="1" />
<div class="row" attrs="{'invisible': [('country_code', '!=', 'CA')]}">
<label for="account_check_printing_margin_right" class="col-md-4 o_light_label"/>
<label for="account_check_printing_margin_right" class="col-lg-4 o_light_label"/>
<field name="account_check_printing_margin_right"/>
</div>
<div class="row" attrs="{'invisible': [('country_code', '!=', 'CA')]}">
<label for="account_check_printing_date_label" class="col-md-4 o_light_label"/>
<label for="account_check_printing_date_label" class="col-lg-4 o_light_label"/>
<field name="account_check_printing_date_label"/>
</div>
</div>
addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="print_checks" string="Print" type="object" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
<button string="Cancel" class="btn btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_invoicing/static/description/index.html
+2 -2
View File
@@ -20,7 +20,7 @@
Automatically send them by email as a PDF attachment or print and send them by post.
</p>
</div>
<div class="col-md-8 col-md-offset-2 oe_mt32">
<div class="col-lg-8 offset-lg-2 oe_mt32">
<img class="oe_picture oe_screenshot" src="account_sc_01.png"/>
</div>
</div>
@@ -33,7 +33,7 @@
<p class="oe_mt32">
Accept online payments via Paypal, Ogone, Buckaroo or Adyen. Eliminate the stress of sending reminders for late or outstanding payments. Simply set up and automate follow-ups to get paid quickly.
</p>
<div class="col-md-8 col-md-offset-3 oe_mt16">
<div class="col-lg-8 offset-lg-3 oe_mt16">
<img class="oe_picture" src="account_voucher.png" height="300">
</div>
</div>
addons/account_payment/views/account_portal_templates.xml
+9 -9
View File
@@ -8,8 +8,8 @@
<t t-set="tx_ids" t-value="invoice.transaction_ids.filtered(lambda tx: tx.state in ('pending', 'authorized', 'done'))"/>
<t t-set="pending_manual_txs" t-value="tx_ids.filtered(lambda tx: tx.state == 'pending' and tx.acquirer_id.provider in ('transfer', 'manual'))"/>
<a t-if="invoice.state == 'open' and invoice.amount_total and invoice.type == 'out_invoice' and (pending_manual_txs or not tx_ids)"
t-att-href="'/my/invoices/%s#portal_pay' % invoice.id" title="Pay now" aria-label="Pay now" class="btn btn-xs btn-primary" role="button">
<i class="fa fa-arrow-circle-right"/><span class='hidden-xs'> Pay Now</span>
t-att-href="'/my/invoices/%s#portal_pay' % invoice.id" title="Pay now" aria-label="Pay now" class="btn btn-sm btn-primary" role="button">
<i class="fa fa-arrow-circle-right"/><span class='d-none d-md-inline'> Pay Now</span>
</a>
</td>
</xpath>
@@ -17,19 +17,19 @@
<t t-set="last_tx" t-value="invoice.get_portal_last_transaction()"/>
<td class="tx_status">
<t t-if="invoice.state == 'open' and (last_tx.state not in ['pending', 'authorized', 'done', 'cancel'] or (last_tx.state == 'pending' and last_tx.acquirer_id.provider in ('transfer', 'manual')))">
<span class="label label-info"><i class="fa fa-fw fa-clock-o"></i><span class="hidden-xs"> Waiting for Payment</span></span>
<span class="badge badge-info"><i class="fa fa-fw fa-clock-o"></i><span class="d-none d-md-inline"> Waiting for Payment</span></span>
</t>
<t t-if="invoice.state == 'open' and last_tx.state == 'authorized'">
<span class="label label-success"><i class="fa fa-fw fa-check"/><span class="hidden-xs"> Authorized</span></span>
<span class="badge badge-success"><i class="fa fa-fw fa-check"/><span class="d-none d-md-inline"> Authorized</span></span>
</t>
<t t-if="invoice.state == 'open' and last_tx.state == 'pending' and last_tx.acquirer_id.provider not in ('transfer', 'manual')">
<span class="label label-warning"><span class="hidden-xs"> Pending</span></span>
<span class="badge badge-warning"><span class="d-none d-md-inline"> Pending</span></span>
</t>
<t t-if="invoice.state == 'paid' or last_tx.state == 'done'">
<span class="label label-default"><i class="fa fa-fw fa-check"></i><span class="hidden-xs"> Paid</span></span>
<span class="badge badge-secondary"><i class="fa fa-fw fa-check"></i><span class="d-none d-md-inline"> Paid</span></span>
</t>
<t t-if="invoice.state == 'cancel'">
<span class="label label-default"><i class="fa fa-fw fa-remove"></i><span class="hidden-xs"> Cancelled</span></span>
<span class="badge badge-secondary"><i class="fa fa-fw fa-remove"></i><span class="d-none d-md-inline"> Cancelled</span></span>
</t>
</td>
</xpath>
@@ -97,8 +97,8 @@
<t t-call="account_payment.portal_invoice_payment"/>
</div>
</div>
<div class="panel-body" t-if="existing_token">
<div class="col-md-offset-3 col-md-6">
<div class="panel-body" t-if="existing_token"><!-- FIXME -->
<div class="offset-lg-3 col-lg-6">
<i class="fa fa-info"></i> You have credits card registered, you can log-in to be able to use them.
</div>
</div>
addons/account_voucher/views/account_voucher_views.xml
+6 -6
View File
@@ -45,19 +45,19 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<strong><span><t t-esc="record.partner_id.value"/></span></strong>
</div>
<div class="col-xs-6">
<strong><span class="pull-right text-right"><t t-esc="record.amount.value"/></span></strong>
<div class="col-6">
<strong><span class="float-right text-right"><t t-esc="record.amount.value"/></span></strong>
</div>
</div>
<div class="row">
<div class="col-xs-6 text-muted">
<div class="col-6 text-muted">
<span><t t-esc="record.number.value"/> <t t-esc="record.date.value"/></span>
</div>
<div class="col-xs-6">
<span class="pull-right text-right">
<div class="col-6">
<span class="float-right text-right">
<field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'cancel': 'default', 'none': 'danger', 'proforma': 'warning',
'posted': 'success'}}"/>
</span>
addons/analytic/views/analytic_account_views.xml
+6 -6
View File
@@ -213,7 +213,7 @@
</div>
<hr class="mt8 mb8"/>
<div class="row">
<div class="col-xs-12 text-center">
<div class="col-12 text-center">
<span>
<strong>Balance: <field name="balance" widget="monetary"/></strong>
</span>
@@ -348,19 +348,19 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<strong><span><t t-esc="record.name.value"/></span></strong>
</div>
<div class="col-xs-6 pull-right text-right">
<div class="col-6 float-right text-right">
<strong><t t-esc="record.date.value"/></strong>
</div>
</div>
<div class="row">
<div class="col-xs-6 text-muted">
<div class="col-6 text-muted">
<span><t t-esc="record.account_id.value"/></span>
</div>
<div class="col-xs-6">
<span class="pull-right text-right">
<div class="col-6">
<span class="float-right text-right">
<field name="amount" widget="monetary"/>
</span>
</div>
addons/anonymization/views/anonymization_views.xml
+6 -6
View File
@@ -48,15 +48,15 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row">
<div class="col-xs-4 text-center"><strong>Model</strong></div>
<div class="col-xs-4 text-center"><strong>Field</strong></div>
<div class="col-xs-4 text-center"><strong>Status</strong></div>
<div class="col-4 text-center"><strong>Model</strong></div>
<div class="col-4 text-center"><strong>Field</strong></div>
<div class="col-4 text-center"><strong>Status</strong></div>
</div>
<hr class="mb4 mt4"/>
<div class="row">
<div class="col-xs-4 text-center"><field name="model_name"/></div>
<div class="col-xs-4 text-center"><field name="field_name"/></div>
<div class="col-xs-4 text-center">
<div class="col-4 text-center"><field name="model_name"/></div>
<div class="col-4 text-center"><field name="field_name"/></div>
<div class="col-4 text-center">
<field name="state"/>
</div>
</div>
addons/auth_oauth/views/auth_oauth_templates.xml
+3 -3
View File
@@ -11,7 +11,7 @@
<template id="auth_oauth.login" inherit_id="web.login" name="OAuth Login buttons">
<xpath expr="//button[@type='submit']" position="before">
<div class="pull-right">
<div class="float-right">
<t t-call="auth_oauth.providers"/>
</div>
</xpath>
@@ -19,7 +19,7 @@
<template id="auth_oauth.signup" inherit_id="auth_signup.signup" name="OAuth Signup buttons">
<xpath expr="//button[@type='submit']" position="before">
<div class="pull-right">
<div class="float-right">
<t t-call="auth_oauth.providers"/>
</div>
</xpath>
@@ -27,7 +27,7 @@
<template id="auth_oauth.reset_password" inherit_id="auth_signup.reset_password" name="OAuth Reset Password buttons">
<xpath expr="//button[@type='submit']" position="before">
<div class="pull-right">
<div class="float-right">
<t t-call="auth_oauth.providers"/>
</div>
</xpath>
addons/auth_oauth/views/res_config_settings_views.xml
+2 -2
View File
@@ -13,7 +13,7 @@
</div>
</div>
<div id="module_auth_oauth" position="after">
<div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('module_auth_oauth','=',False)]}">
<div class="col-12 col-lg-6 o_setting_box" attrs="{'invisible': [('module_auth_oauth','=',False)]}">
<div class="o_setting_left_pane">
<field name="auth_oauth_google_enabled"/>
</div>
@@ -24,7 +24,7 @@
</div>
<div class="content-group" attrs="{'invisible': [('auth_oauth_google_enabled','=',False)]}">
<div class="row mt16">
<label for="auth_oauth_google_client_id" string="Client ID:" class="col-md-3 o_light_label"/>
<label for="auth_oauth_google_client_id" string="Client ID:" class="col-lg-3 o_light_label"/>
<field name="auth_oauth_google_client_id" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
</div>
<a href="https://www.odoo.com/documentation/user/online/general/auth/google.html" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Tutorial</a>
addons/auth_signup/views/auth_signup_login_templates.xml
+13 -13
View File
@@ -2,34 +2,34 @@
<odoo>
<template id="auth_signup.login" inherit_id="web.login" name="Sign up - Reset Password">
<xpath expr="//button[@type='submit']" position="before">
<a t-if="signup_enabled" t-attf-href="/web/signup?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Don't have an account?</a>
<a t-if="reset_password_enabled" t-attf-href="/web/reset_password?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Reset Password</a>
<a t-if="signup_enabled" t-attf-href="/web/signup?{{ keep_query() }}" class="btn btn-link float-right" role="button">Don't have an account?</a>
<a t-if="reset_password_enabled" t-attf-href="/web/reset_password?{{ keep_query() }}" class="btn btn-link float-right" role="button">Reset Password</a>
</xpath>
</template>
<template id="auth_signup.fields" name="Auth Signup/ResetPassword form fields">
<div class="form-group field-login">
<label for="login" class="control-label">Your Email</label>
<label for="login" class="col-form-label">Your Email</label>
<input type="text" name="login" t-att-value="login" id="login" class="form-control" autofocus="autofocus"
autocapitalize="off" required="required" t-att-readonly="'readonly' if only_passwords else None"/>
</div>
<div class="form-group field-name">
<label for="name" class="control-label">Your Name</label>
<label for="name" class="col-form-label">Your Name</label>
<input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="e.g. John Doe"
required="required" t-att-readonly="'readonly' if only_passwords else None"
t-att-autofocus="'autofocus' if login and not only_passwords else None" />
</div>
<div class="form-group field-password">
<label for="password" class="control-label">Password</label>
<label for="password" class="col-form-label">Password</label>
<input type="password" name="password" id="password" class="form-control"
required="required" t-att-autofocus="'autofocus' if only_passwords else None"/>
</div>
<div class="form-group field-confirm_password">
<label for="confirm_password" class="control-label">Confirm Password</label>
<label for="confirm_password" class="col-form-label">Confirm Password</label>
<input type="password" name="confirm_password" id="confirm_password" class="form-control" required="required"/>
</div>
</template>
@@ -49,8 +49,8 @@
<input type="hidden" name="redirect" t-att-value="redirect"/>
<input type="hidden" name="token" t-att-value="token"/>
<div class="clearfix oe_login_buttons">
<a t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Already have an account?</a>
<button type="submit" class="btn btn-primary pull-left o_signup_btn"> Sign up</button>
<a t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link float-right" role="button">Already have an account?</a>
<button type="submit" class="btn btn-primary float-left o_signup_btn"> Sign up</button>
</div>
</form>
@@ -63,7 +63,7 @@
<p class="alert alert-success" t-if="message" role="status">
<t t-esc="message"/>
</p>
<a href="/web/login" class="btn btn-link pull-right" role="button">Back to Login</a>
<a href="/web/login" class="btn btn-link float-right" role="button">Back to Login</a>
</div>
<form class="oe_reset_password_form" role="form" method="post" t-if="not message">
@@ -77,7 +77,7 @@
<t t-if="not token">
<div class="form-group field-login">
<label for="login" class="control-label">Your Email</label>
<label for="login" class="col-form-label">Your Email</label>
<input type="text" name="login" t-att-value="login" id="login" class="form-control"
autofocus="autofocus" required="required" autocapitalize="off"/>
</div>
@@ -89,9 +89,9 @@
<input type="hidden" name="redirect" t-att-value="redirect"/>
<input type="hidden" name="token" t-att-value="token"/>
<div class="clearfix oe_login_buttons">
<a t-if="not token" t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Back to Login</a>
<a t-if="invalid_token" href="/web/login" class="btn btn-link pull-right" role="button">Back to Login</a>
<button type="submit" class="btn btn-primary pull-left">Confirm</button>
<a t-if="not token" t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link float-right" role="button">Back to Login</a>
<a t-if="invalid_token" href="/web/login" class="btn btn-link float-right" role="button">Back to Login</a>
<button type="submit" class="btn btn-primary float-left">Confirm</button>
</div>
</form>
addons/auth_signup/views/res_config_settings_views.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='access_rights']" position="after">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
</div>
<div class="o_setting_right_pane">
@@ -25,7 +25,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="auth_signup_reset_password"/>
</div>
addons/base_gengo/wizard/base_gengo_translations_view.xml
+1 -1
View File
@@ -23,7 +23,7 @@
</group>
<footer>
<button name="act_update" string="Send" type="object" class="btn-primary"/>
<button name="act_cancel" special="cancel" string="Cancel" type="object" class="btn-default"/>
<button name="act_cancel" special="cancel" string="Cancel" type="object" class="btn-secondary"/>
</footer>
</form>
</field>
addons/base_import/static/src/js/import_action.js
+9 -9
View File
@@ -249,7 +249,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
//- File & settings change section
onfile_loaded: function () {
var file = this.$('.oe_import_file')[0].files[0];
this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('hidden');
this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('d-none');
if (!this.$('input.oe_import_file').val()) { return this['settings_changed'](); }
this.$('.oe_import_date_format').val('');
this.$('.oe_import_datetime_format').val('');
@@ -268,7 +268,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
},
onpreviewing: function () {
var self = this;
this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('hidden');
this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('d-none');
this.$el.addClass('oe_import_with_file');
// TODO: test that write // succeeded?
this.$el.removeClass('oe_import_preview_error oe_import_error');
@@ -287,10 +287,10 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
},
onpreview_error: function (event, from, to, result) {
this.$('.oe_import_options').show();
this.$buttons.filter('.o_import_file_reload').removeClass('hidden');
this.$buttons.filter('.o_import_file_reload').removeClass('d-none');
this.$el.addClass('oe_import_preview_error oe_import_error');
this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('hidden');
this.$el.find('.o_view_nocontent').addClass('hidden');
this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none');
this.$el.find('.o_view_nocontent').addClass('d-none');
this.$('.oe_import_error_report').html(
QWeb.render('ImportView.preview.error', result));
},
@@ -298,11 +298,11 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
var self = this;
this.$buttons.filter('.oe_import_file')
.text(_t('Load New File'))
.removeClass('btn-primary').addClass('btn-default')
.removeClass('btn-primary').addClass('btn-secondary')
.blur();
this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('hidden');
this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('hidden');
this.$el.find('.o_view_nocontent').addClass('hidden');
this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('d-none');
this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none');
this.$el.find('.o_view_nocontent').addClass('d-none');
this.$el.addClass('oe_import_preview');
this.$('input.oe_import_advanced_mode').prop('checked', result.advanced_mode);
this.$('.oe_import_grid').html(QWeb.render('ImportView.preview', result));
addons/base_import/static/src/scss/base_import.scss
Vendored
+4 -4
View File
@@ -6,7 +6,7 @@
right: 0;
bottom: 0;
left: 0;
@media (max-width: $screen-xs-max) {
@include media-breakpoint-down(sm) {
position: static;
}
@@ -28,7 +28,7 @@
.oe_import_box {
padding: 8px;
background: #F0EEEE;
border-radius: $border-radius-base;
border-radius: $border-radius;
border: solid 1px #dddddd;
label {
font-weight: normal;
@@ -89,7 +89,7 @@
padding: 4px;
margin: 2px 0;
list-style: none;
border-radius: $border-radius-base;
border-radius: $border-radius;
&.bg-error {
@extend .bg-danger;
}
@@ -122,7 +122,7 @@
/* Field dropdown */
.oe_import_selector {
font-size: $font-size-small;
font-size: $font-size-sm;
ul, li {
margin: 0; padding: 0;
}
addons/base_import/static/src/xml/base_import.xml
+9 -9
View File
@@ -6,7 +6,7 @@
<input type="hidden" name="session_id"
t-att-value="widget.session.session_id"/>
<input type="hidden" name="import_id"/>
<div class="oe_import_box col-md-12 hidden">
<div class="oe_import_box col-lg-12 d-none">
<input accept=".csv, .xls, .xlsx, .xlsm, .ods" t-attf-id="file_#{_id}"
name="file" class="oe_import_file" type="file" style="display:none;"/>
<div class="oe_import_with_file">
@@ -22,7 +22,7 @@
t-att-value="option.value"/>
</p>
</div>
<div class="oe_import_toggled oe_import_options col-sm-5">
<div class="oe_import_toggled oe_import_options col-md-5">
<p t-foreach="widget.parse_opts" t-as="option">
<!-- no @name, avoid submission when file_update called -->
<label t-attf-for="#{option.name}_#{_id}">
@@ -35,7 +35,7 @@
</div>
</div>
<div class="oe_import_with_file oe_padding col-sm-12 hidden">
<div class="oe_import_with_file oe_padding col-md-12 d-none">
<h2>Map your columns to import</h2>
<div title="If the model uses openchatter, history tracking
will set up subscriptions and send notifications
@@ -93,11 +93,11 @@
</t>
<t t-name="ImportView.buttons">
<button type="button" class="btn btn-sm btn-primary o_import_import hidden">Import</button>
<button type="button" class="btn btn-sm btn-default o_import_validate hidden">Test Import</button>
<button type="button" class="btn btn-sm btn-primary oe_import_file">Load File</button>
<button type="button" class="btn btn-sm btn-default o_import_file_reload hidden">Reload File</button>
<button type="button" class="btn btn-sm btn-default o_import_cancel">Cancel</button>
<button type="button" class="btn btn-primary o_import_import d-none">Import</button>
<button type="button" class="btn btn-secondary o_import_validate d-none">Test Import</button>
<button type="button" class="btn btn-primary oe_import_file">Load File</button>
<button type="button" class="btn btn-secondary o_import_file_reload d-none">Reload File</button>
<button type="button" class="btn btn-secondary o_import_cancel">Cancel</button>
</t>
<t t-name="ImportView.preview">
@@ -155,7 +155,7 @@
<t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/>
</t>
<t t-name="ImportView.import_button">
<button t-if='widget and widget.importEnabled' type="button" class="btn btn-sm btn-default o_button_import">
<button t-if='widget and widget.importEnabled' type="button" class="btn btn-secondary o_button_import">
Import
</button>
</t>
addons/base_import_module/views/base_import_module_view.xml
+2 -2
View File
@@ -20,11 +20,11 @@
<footer>
<div states="init">
<button name="import_module" string="Import App" type="object" class="btn-primary"/>
<button special="cancel" string="Cancel" class="btn-default"/>
<button special="cancel" string="Cancel" class="btn-secondary"/>
</div>
<div states="done">
<button name="action_module_open" string="Open Modules" type="object" class="btn-primary"/>
<button special="cancel" string="Close" class="btn-default"/>
<button special="cancel" string="Close" class="btn-secondary"/>
</div>
</footer>
</form>
addons/base_setup/views/res_config_settings_views.xml
+17 -17
View File
@@ -11,7 +11,7 @@
<div id="business_documents">
<h2>Business Documents</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_right_pane">
<span class="o_form_label">Format</span>
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
@@ -20,13 +20,13 @@
</div>
<div class="content-group">
<div class="mt16 row">
<label for="paperformat_id" string="Format" class="col-xs-3 col-md-3 o_light_label"/>
<label for="paperformat_id" string="Format" class="col-3 col-lg-3 o_light_label"/>
<field name="paperformat_id" class="oe_inline" required="1"/>
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_right_pane">
<span class="o_form_label">Document Template</span>
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
@@ -35,7 +35,7 @@
</div>
<div class="content-group">
<div class="mt16" groups="base.group_no_one">
<label for="external_report_layout" string="Template" class="col-xs-3 col-md-3 o_light_label"/>
<label for="external_report_layout" string="Template" class="col-3 col-lg-3 o_light_label"/>
<field name="external_report_layout" class="oe_inline"/>
</div>
<div class="mt16">
@@ -51,7 +51,7 @@
<div id="emails"/>
<h2>Users</h2>
<div class="row mt16 o_settings_container" id="user_default_rights">
<div class="col-xs-12 col-md-6 o_setting_box" title="By default, new users get highest access rights for all installed apps." id="access_rights">
<div class="col-12 col-lg-6 o_setting_box" title="By default, new users get highest access rights for all installed apps." id="access_rights">
<div class="o_setting_left_pane">
<field name="user_default_rights"/>
</div>
@@ -67,7 +67,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_base_import" />
</div>
@@ -78,7 +78,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" groups="base.group_no_one">
<div class="col-12 col-lg-6 o_setting_box" groups="base.group_no_one">
<div class="o_setting_left_pane">
<field name="show_effect"/>
</div>
@@ -94,7 +94,7 @@
<field name="company_id" invisible="1"/>
<h2>Multi-company</h2>
<div class="row mt16 o_settings_container" name="multi_company">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_multi_company"/>
</div>
@@ -114,7 +114,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." attrs="{'invisible': [('group_multi_company', '=', False)]}" id="inter_company">
<div class="col-12 col-lg-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." attrs="{'invisible': [('group_multi_company', '=', False)]}" id="inter_company">
<div class="o_setting_left_pane">
<field name="module_inter_company_rules" widget="upgrade_boolean"/>
</div>
@@ -135,7 +135,7 @@
</div>
<h2>Integrations</h2>
<div class="row mt16 o_settings_container" name="integration">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_pad"/>
</div>
@@ -149,7 +149,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_google_calendar" />
</div>
@@ -163,7 +163,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_google_drive" />
</div>
@@ -177,7 +177,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_google_spreadsheet" />
</div>
@@ -191,7 +191,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="module_auth_oauth">
<div class="col-12 col-lg-6 o_setting_box" id="module_auth_oauth">
<div class="o_setting_left_pane">
<field name="module_auth_oauth" />
</div>
@@ -205,7 +205,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="oauth">
<div class="col-12 col-lg-6 o_setting_box" id="oauth">
<div class="o_setting_left_pane">
<field name="module_auth_ldap"/>
</div>
@@ -219,7 +219,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="oauth">
<div class="col-12 col-lg-6 o_setting_box" id="oauth">
<div class="o_setting_left_pane">
<field name="module_base_gengo"/>
</div>
@@ -233,7 +233,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_web_unsplash" widget="upgrade_boolean"/>
</div>
addons/base_vat/views/res_config_settings_views.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<field name="inherit_id" ref="account.res_config_settings_view_form"/>
<field name="arch" type="xml">
<div id="eu_service" position="after">
<div class="col-xs-12 col-md-6 o_setting_box" title="If this checkbox is ticked, you will not be able to save a contact if its VAT number cannot be verified by the European VIES service.">
<div class="col-12 col-lg-6 o_setting_box" title="If this checkbox is ticked, you will not be able to save a contact if its VAT number cannot be verified by the European VIES service.">
<div class="o_setting_left_pane">
<field name="vat_check_vies"/>
</div>
addons/board/static/src/scss/dashboard.scss
+1 -1
View File
@@ -148,5 +148,5 @@
// Favorites menu in control panel
.o_add_to_dashboard {
display: none; // hidden by default
@include o-search-options-dropdown-custom-li;
@include o-search-options-dropdown-custom-item;
}
addons/board/static/src/xml/board.xml
+7 -9
View File
@@ -75,14 +75,12 @@
</t>
<t t-name="SearchView.addtodashboard">
<li class="o_add_to_dashboard_link o_closed_menu">
<a href="#">Add to my Dashboard</a>
</li>
<li class="o_add_to_dashboard">
<input class="o_add_to_dashboard_input" type="text"/>
</li>
<li class="o_add_to_dashboard">
<button type="button" class="btn btn-primary btn-sm o_add_to_dashboard_button">Add</button>
</li>
<a href="#" class="dropdown-item o_add_to_dashboard_link o_closed_menu">Add to my Dashboard</a>
<div class="dropdown-item-text o_add_to_dashboard">
<input class="o_input o_add_to_dashboard_input" type="text"/>
</div>
<div class="dropdown-item-text o_add_to_dashboard">
<button type="button" class="btn btn-primary o_add_to_dashboard_button">Add</button>
</div>
</t>
</template>
addons/calendar/static/src/scss/calendar.scss
+7 -8
View File
@@ -5,7 +5,7 @@
border-radius: 5px;
&.accepted {
background-color: $brand-success;
background-color: theme-color('success');
}
&.needsAction {
@@ -13,7 +13,7 @@
}
&.declined {
background-color: $brand-danger;
background-color: theme-color('danger');
}
}
@@ -42,7 +42,7 @@
}
.o_calendar_invitation_page {
@include o-flex(0, 0, auto);
flex: 0 0 auto;
width: 50%;
margin: 30px auto 0;
@include o-webclient-padding($top: 10px, $bottom: 10px);
@@ -71,20 +71,19 @@
}
.o_accepted {
color: $brand-success;
color: theme-color('success');
}
.o_declined {
color: $brand-danger;
color: theme-color('danger');
}
}
.o_meeting_filter {
@include text-overflow();
@include o-text-overflow();
width: 64%;
color: grey;
display: inline-block;
vertical-align: top;
&:hover {
color: $o-brand-optional;
color: $o-brand-primary;
}
&.o_meeting_bold {
font-weight: bold;
addons/calendar/static/src/xml/base_calendar.xml
+4 -4
View File
@@ -14,9 +14,9 @@
</t>
<t t-jquery=".o_notification_content" t-operation="append">
<br/><br/>
<button type="button" class="btn btn-sm btn-primary link2showed oe_highlight oe_form oe_button"><span>OK</span></button>
<button type="button" class="btn btn-sm btn-link link2event">Details</button>
<button type="button" class="btn btn-sm btn-link link2recall">Snooze</button>
<button type="button" class="btn btn-primary link2showed oe_highlight oe_form oe_button"><span>OK</span></button>
<button type="button" class="btn btn-link link2event">Details</button>
<button type="button" class="btn btn-link link2recall">Snooze</button>
</t>
</t>
@@ -32,7 +32,7 @@
</span>
<span><t t-esc="meeting.name"/></span>
</span>
<span t-if="meeting.start" class="pull-right">
<span t-if="meeting.start" class="float-right">
<t t-if="meeting.allday">All Day</t>
<t t-else=''>
<t t-set="is_next_meeting" t-value="false"/>
addons/calendar/views/calendar_templates.xml
+5 -5
View File
@@ -26,16 +26,16 @@
<div class="container">
<div class="o_logo">
<img class="img img-responsive center-block" src="/web/binary/company_logo" alt="Logo"/>
<img class="img img-fluid d-block mx-auto" src="/web/binary/company_logo" alt="Logo"/>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<div class="card">
<div class="card-header">
<h2>Calendar Invitation <small><t t-esc="event.name"/></small></h2>
</div>
<div class="panel-body">
<div class="card-body">
<div class="clearfix mb16" t-if="attendee.state != 'needsAction'">
<span class="pull-right label label-info">
<span class="float-right badge badge-info">
<t t-if="attendee.state == 'accepted'">Yes I'm going.</t>
<t t-if="attendee.state == 'declined'">No I'm not going.</t>
</span>
addons/calendar/views/calendar_views.xml
+2 -2
View File
@@ -88,7 +88,7 @@
<field name="arch" type="xml">
<form string="Meetings">
<sheet>
<button string="Document" class="oe_stat_button pull-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/>
<button string="Document" class="oe_stat_button float-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/>
<field name="res_model" invisible="1" />
<field name="res_id" invisible="1" />
<field name="state" invisible="1"/>
@@ -235,7 +235,7 @@
<field name="priority" eval="2"/>
<field name="arch" type="xml">
<form string="Meetings">
<button string="Document" class="oe_stat_button pull-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/>
<button string="Document" class="oe_stat_button float-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/>
<field name="res_model" invisible="1" />
<field name="res_id" invisible="1" />
<field name="state" invisible="1"/>
addons/crm/static/description/index.html
+4 -4
View File
@@ -13,15 +13,15 @@
<h2 class="oe_slogan" style="color:#875A7B;">Get accurate forecasts</h2>
<h3 class="oe_slogan">Use actionable data to make better decisions</h3>
<div class="oe_span6 text-justify oe_mt32">
<span class="fa fa-search fa-2x pull-left"/>
<span class="fa fa-search fa-2x float-left"/>
<p class="oe_mb32" style="margin-left:48px;">
Get the insights you need to make smarter decisions.
</p>
<span class="fa fa-sliders fa-2x pull-left"/>
<span class="fa fa-sliders fa-2x float-left"/>
<p class="oe_mb32" style="margin-left:48px;">
Design custom dashboards to get a picture of your business at a glance.
</p>
<span class="fa fa-bar-chart fa-2x pull-left"></span>
<span class="fa fa-bar-chart fa-2x float-left"></span>
<p>
Dig deeper with real-time reports and flow charts that anyone can create and share.
</p>
@@ -43,7 +43,7 @@
<p class="oe_mt32 oe_mb32 text-justify">
Automate activities based on your sales scripts: calls, meetings, mails and quotations. Get all information you need, right on the opportunity: page viewed, mails received, etc.
</p>
<img class='img-responsive' src="crm_sc_02b.png">
<img class='img-fluid' src="crm_sc_02b.png">
</div>
</div>
</section>
addons/crm/static/src/js/tour.js
+1 -1
View File
@@ -61,7 +61,7 @@ tour.register('crm_tour', {
content: _t('<p><b>Send messages</b> to your prospect and get replies automatically attached to this opportunity.</p><p class="mb0">Type <i>\'@\'</i> to mention people - it\'s like cc-ing on emails.</p>'),
position: "bottom"
}, {
trigger: ".breadcrumb li:not(.active):last",
trigger: ".breadcrumb-item:not(.active):last",
extra_trigger: '.o_opportunity_form',
content: _t("Use the breadcrumbs to <b>go back to your sales pipeline</b>."),
position: "bottom"
addons/crm/views/crm_lead_views.xml
+13 -13
View File
@@ -52,7 +52,7 @@
<field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
</button>
</div>
<div class="label label-success pull-right" attrs="{'invisible': [('probability', '&lt;', 100)]}">Won</div>
<div class="badge badge-success float-right" attrs="{'invisible': [('probability', '&lt;', 100)]}">Won</div>
<div class="oe_title">
<label for="name" class="oe_edit_only" string="Lead"/>
<h1><field name="name" placeholder="Describe the lead..."/></h1>
@@ -196,7 +196,7 @@
</div>
</div>
<div class="oe_kanban_bottom_right">
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/>
</div>
</div>
</div>
@@ -248,7 +248,7 @@
<footer>
<button string="Create" name="close_dialog" type="object" class="btn-primary"/>
<button string="Create &amp; Edit" name="edit_dialog" type="object" class="btn-primary"/>
<button string="Discard" class="btn-default" special="cancel"/>
<button string="Discard" class="btn-secondary" special="cancel"/>
</footer>
<field name="partner_name" invisible="1"/>
<field name="contact_name" invisible="1"/>
@@ -324,16 +324,16 @@
<div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click">
<div class="o_dropdown_kanban dropdown">
<a class="dropdown-toggle btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
<a class="dropdown-toggle o-no-caret btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
<span class="fa fa-ellipsis-v"/>
</a>
<ul class="dropdown-menu" role="menu">
<t t-if="widget.editable"><li><a role="menuitem" type="edit">Edit</a></li></t>
<t t-if="widget.deletable"><li><a role="menuitem" type="delete">Delete</a></li></t>
<li t-if="! record.active.value"><a role="menuitem" name="action_set_active" type="object">Restore</a></li>
<li t-if="record.active.value"><a role="menuitem" name="action_set_unactive" type="object">Archive</a></li>
<li role="menuitem" aria-haspopup="true"><ul class="oe_kanban_colorpicker" data-field="color" role="menu"/></li>
</ul>
<div class="dropdown-menu" role="menu">
<t t-if="widget.editable"><a role="menuitem" type="edit" class="dropdown-item">Edit</a></t>
<t t-if="widget.deletable"><a role="menuitem" type="delete" class="dropdown-item">Delete</a></t>
<a t-if="! record.active.value" role="menuitem" name="action_set_active" type="object" class="dropdown-item">Restore</a>
<a t-if="record.active.value" role="menuitem" name="action_set_unactive" type="object" class="dropdown-item">Archive</a>
<ul class="oe_kanban_colorpicker" data-field="color"/>
</div>
</div>
<div class="oe_kanban_content">
<div>
@@ -461,8 +461,8 @@
<field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
</button>
</div>
<div class="label label-danger pull-right" attrs="{'invisible': ['|', ('probability', '&gt;', 0), ('active', '=', True)]}">Lost</div>
<div class="label label-success pull-right" attrs="{'invisible': [('probability', '&lt;', 100)]}">Won</div>
<div class="badge badge-danger float-right" attrs="{'invisible': ['|', ('probability', '&gt;', 0), ('active', '=', True)]}">Lost</div>
<div class="badge badge-success float-right" attrs="{'invisible': [('probability', '&lt;', 100)]}">Won</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name" placeholder="e.g. Product Pricing"/></h1>
addons/crm/views/crm_team_views.xml
+2 -2
View File
@@ -201,14 +201,14 @@
</a>
</div>
<div class="row" t-if="record.opportunities_count.raw_value">
<div class="col-xs-8">
<div class="col-8">
<a name="%(crm_case_form_view_salesteams_opportunity)d" type="action"> <!-- context="{'search_default_probability': NOT or < 100}" -->
<field name="opportunities_count"/>
<t t-if="record.opportunities_count.raw_value == 1">Open Opportunity</t>
<t t-else="">Open Opportunities</t>
</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<field name="opportunities_amount" widget="monetary"/>
</div>
</div>
addons/crm/views/res_config_settings_views.xml
+4 -4
View File
@@ -11,7 +11,7 @@
<div class="app_settings_block" data-string="CRM" string="CRM" data-key="crm" groups="sales_team.group_sale_manager">
<h2>CRM</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" id="crm_lead"
<div class="col-12 col-lg-6 o_setting_box" id="crm_lead"
title="Use leads if you need a qualification step before creating an opportunity or a customer. It can be a business card you received, a contact form filled in your website, or a file of unqualified prospects you import, etc. Once qualified, the lead can be converted into a business opportunity and/or a new customer in your address book.">
<div class="o_setting_left_pane">
<field name="group_use_lead"/>
@@ -23,7 +23,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="crm_lead"
<div class="col-12 col-lg-6 o_setting_box" id="crm_lead"
attrs="{'invisible': [('group_use_lead','=',False)]}"
title="Emails received to that address generate new leads not assigned to any Sales Team yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific Sales Teams. To do so, set an email alias on the Sales Team."
groups="base.group_no_one">
@@ -55,7 +55,7 @@
</div>
<h2>Contacts</h2>
<div class="row mt16 o_settings_container">
<div class="col-md-6 o_setting_box">
<div class="col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_crm_phone_validation"/>
</div>
@@ -66,7 +66,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="When populating your address book, Odoo relies on Clearbit’s API to provide you with a list of matching contacts or companies.When selecting one item, the partner name, logo and website get automatically set.">
<div class="col-12 col-lg-6 o_setting_box" title="When populating your address book, Odoo relies on Clearbit’s API to provide you with a list of matching contacts or companies.When selecting one item, the partner name, logo and website get automatically set.">
<div class="o_setting_left_pane">
<field name="module_web_clearbit" widget="upgrade_boolean"/>
</div>
addons/crm/views/res_partner_views.xml
+2 -2
View File
@@ -70,8 +70,8 @@
<field name="meeting_count"/>
</field>
<xpath expr="//div[hasclass('oe_kanban_partner_links')]" position="inside">
<span class="badge" t-if="record.opportunity_count.value>0"><i class="fa fa-fw fa-star" aria-label="Favorites" role="img" title="Favorites"/><t t-esc="record.opportunity_count.value"/></span>
<span class="badge" t-if="record.meeting_count.value>0"><i class="fa fa-fw fa-calendar" aria-label="Meetings" role="img" title="Meetings"/><t t-esc="record.meeting_count.value"/></span>
<span class="badge badge-pill" t-if="record.opportunity_count.value>0"><i class="fa fa-fw fa-star" aria-label="Favorites" role="img" title="Favorites"/><t t-esc="record.opportunity_count.value"/></span>
<span class="badge badge-pill" t-if="record.meeting_count.value>0"><i class="fa fa-fw fa-calendar" aria-label="Meetings" role="img" title="Meetings"/><t t-esc="record.meeting_count.value"/></span>
</xpath>
</field>
</record>
addons/crm/wizard/crm_lead_lost_views.xml
+3 -3
View File
@@ -9,13 +9,13 @@
<field name="lost_reason_id"/>
</group>
<footer>
<button name="action_lost_reason_apply" string="Submit" type="object" class="btn btn-sm btn-primary"/>
<button string="Cancel" class="btn btn-sm btn-default" special="cancel"/>
<button name="action_lost_reason_apply" string="Submit" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
</record>
<record id="crm_lead_lost_action" model="ir.actions.act_window">
<field name="name">Lost Reason</field>
<field name="type">ir.actions.act_window</field>
addons/crm/wizard/crm_lead_to_opportunity_views.xml
+2 -2
View File
@@ -37,7 +37,7 @@
</group>
<footer>
<button name="action_apply" string="Create Opportunity" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -85,7 +85,7 @@
</group>
<footer>
<button name="mass_convert" string="Convert to Opportunities" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/crm/wizard/crm_merge_opportunities_views.xml
+1 -1
View File
@@ -27,7 +27,7 @@
</group>
<footer>
<button name="action_merge" type="object" string="Merge" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/crm_project/wizard/crm_lead_convert2task_views.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</group>
<footer>
<button type="object" name="action_lead_to_project_task" string="Create Task" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/delivery/views/report_package_barcode.xml
+4 -4
View File
@@ -2,10 +2,10 @@
<template id="report_package_barcode_delivery" inherit_id="stock.report_package_barcode">
<xpath expr="//div[hasclass('o_packaging_type')]" position="after">
<div class="row o_package_weight" t-if="o.weight">
<div class="col-xs-12" style="font-weight:bold;">Weight: <span t-field="o.weight"/></div>
<div class="col-12" style="font-weight:bold;">Weight: <span t-field="o.weight"/></div>
</div>
<div class="row o_package_shipping_weight" t-if="o.shipping_weight">
<div class="col-xs-12" style="font-weight:bold;">Shipping Weight: <span t-field="o.shipping_weight"/></div>
<div class="col-12" style="font-weight:bold;">Shipping Weight: <span t-field="o.shipping_weight"/></div>
</div>
</xpath>
</template>
@@ -13,10 +13,10 @@
<template id="report_package_barcode_small_delivery" inherit_id="stock.report_package_barcode_small">
<xpath expr="//div[hasclass('o_packaging_type')]" position="after">
<div class="row o_package_weight" t-if="o.weight">
<div class="col-xs-12" style="font-size:24px; font-weight:bold;">Weight: <span t-field="o.weight"/></div>
<div class="col-12" style="font-size:24px; font-weight:bold;">Weight: <span t-field="o.weight"/></div>
</div>
<div class="row o_package_shipping_weight" t-if="o.shipping_weight">
<div class="col-xs-12" style="font-size:24px; font-weight:bold;">Shipping Weight: <span t-field="o.shipping_weight"/></div>
<div class="col-12" style="font-size:24px; font-weight:bold;">Shipping Weight: <span t-field="o.shipping_weight"/></div>
</div>
</xpath>
</template>
addons/delivery/wizard/choose_delivery_package_views.xml
+2 -2
View File
@@ -15,8 +15,8 @@
</div>
</group>
<footer>
<button name="put_in_pack" type="object" string="Save" class="btn btn-sm btn-primary"/>
<button string="Discard" special="cancel" class="btn btn-sm btn-default"/>
<button name="put_in_pack" type="object" string="Save" class="btn-primary"/>
<button string="Discard" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/digest/views/digest_templates.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<t t-call="portal.portal_layout">
<div class="container mt8">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="col-lg-6 offset-lg-3">
<h3>Digest Subscriptions</h3>
<div class="alert alert-success text-center" role="status">
<p>You have been successfully unsubscribed from <string t-field="digest.name"/></p>
addons/digest/views/res_config_settings_views.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='access_rights']" position="before">
<div class="col-xs-12 col-md-6 o_setting_box" title="New users are automatically added as recipient of the following digest email.">
<div class="col-12 col-lg-6 o_setting_box" title="New users are automatically added as recipient of the following digest email.">
<div class="o_setting_left_pane">
<field name="digest_emails"/>
</div>
addons/event/report/event_event_templates.xml
+12 -12
View File
@@ -8,9 +8,9 @@
<div class="page">
<div class="row">
<!-- Front -->
<div class="col-xs-6 text-center" style="padding-left:7mm; border-left:1px dashed black; height: 149mm; -webkit-transform:rotate(180deg); padding-top: 7mm">
<div class="col-6 text-center" style="padding-left:7mm; border-left:1px dashed black; height: 149mm; -webkit-transform:rotate(180deg); padding-top: 7mm">
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<t t-if="o.event_id.event_logo">
<div t-field="o.event_id.event_logo"/>
</t>
@@ -21,7 +21,7 @@
<h5>( <i class="fa fa-clock-o" aria-label="Period" role="img" title="Period"></i> <span itemprop="startDate" t-field="o.event_id.with_context(tz=o.event_id.date_tz).date_begin" t-options='{"hide_seconds": True}'> </span> <i>to</i> <span itemprop="endDate" t-field="o.event_id.with_context(tz=o.event_id.date_tz).date_end" t-options='{"hide_seconds": True}'> </span> )</h5>
</div>
<div class="row">
<div class="col-xs-12 text-center" id="o_event_name">
<div class="col-12 text-center" id="o_event_name">
<small>
<h3 t-field="o.name"/>
</small>
@@ -33,17 +33,17 @@
</div>
</div>
<!-- Back -->
<div class="col-xs-6" style="padding-right:7mm; height: 149mm; -webkit-transform:rotate(180deg); padding-top: 2mm;">
<div class="col-6" style="padding-right:7mm; height: 149mm; -webkit-transform:rotate(180deg); padding-top: 2mm;">
<span t-field="o.event_id.badge_back"/>
</div>
</div>
<div class="row">
<!-- Inner left -->
<div class="col-xs-6 text-center" style="padding-right:7mm; border-top:1px dashed black; height: 148mm;">
<div class="col-6 text-center" style="padding-right:7mm; border-top:1px dashed black; height: 148mm;">
<span t-field="o.event_id.badge_innerleft"/>
</div>
<!-- Inner right -->
<div class="col-xs-6 text-center" style="border-left:1px dashed black; border-top:1px dashed black; height: 148mm; text-center">
<div class="col-6 text-center" style="border-left:1px dashed black; border-top:1px dashed black; height: 148mm; text-center">
<span t-field="o.event_id.badge_innerright"/>
</div>
</div>
@@ -60,9 +60,9 @@
<t t-foreach="docs" t-as="event">
<div class="row">
<!-- Front -->
<div class="col-xs-6 text-center" style="padding-left:7mm; border-right:1px dashed black; height: 149mm; padding-top: 7mm">
<div class="col-6 text-center" style="padding-left:7mm; border-right:1px dashed black; height: 149mm; padding-top: 7mm">
<div class="row" t-ignore="true">
<div class="col-xs-12">
<div class="col-12">
<span t-if="event.organizer_id.is_company and event.organizer_id.company_id.logo_web">
<div t-field="event.event_logo">
<img t-att-src="'data:image/png;base64,%s' % to_text(event.organizer_id.company_id.logo_web)" style="max-height:1cm; max-width:4cm;" alt="Logo"/>
@@ -73,7 +73,7 @@
</div>
</div>
<div class="row" t-ignore="true">
<div class="col-xs-12 text-center" id="o_event_attendee_name">
<div class="col-12 text-center" id="o_event_attendee_name">
<small><h3>Attendee Name</h3></small>
</div>
</div>
@@ -82,17 +82,17 @@
</div>
</div>
<!-- Back -->
<div class="col-xs-6" style="padding-right:7mm; height: 149mm; padding-top: 2mm;">
<div class="col-6" style="padding-right:7mm; height: 149mm; padding-top: 2mm;">
<div t-field="event.badge_back"/>
</div>
</div>
<div class="row">
<!-- Inner left -->
<div class="col-xs-6 text-center" style="padding-right:7mm; border-top:1px dashed black; height: 148mm;">
<div class="col-6 text-center" style="padding-right:7mm; border-top:1px dashed black; height: 148mm;">
<div t-field="event.badge_innerleft"/>
</div>
<!-- Inner right -->
<div class="col-xs-6 text-center" style="border-left:1px dashed black; border-top:1px dashed black; height: 148mm; text-center">
<div class="col-6 text-center" style="border-left:1px dashed black; border-top:1px dashed black; height: 148mm; text-center">
<div t-field="event.badge_innerright"/>
</div>
</div>
addons/event/static/src/scss/event.scss
+4 -4
View File
@@ -4,13 +4,13 @@
position: relative;
padding: 0;
@include o-flex-display;
display: flex;
.o_event_left {
@include o-flex(1, 1, 25%);
flex: 1 1 25%;
text-align: center;
color: white;
background-color: $o-brand-optional;
background-color: $o-brand-primary;
padding: 8px;
.o_day {
@@ -19,7 +19,7 @@
}
.o_event_right {
@include o-flex(1, 1, 75%);
flex: 1 1 75%;
padding: 8px;
margin-left: 8px;
}
addons/event/views/event_views.xml
+18 -18
View File
@@ -19,28 +19,28 @@
</div>
<h2>Location</h2>
<div class="row mt16 o_settings_container" name="event_type_location">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="is_online"/>
</div>
<div class="o_setting_right_pane">
<label for="is_online"/>
<div class="row">
<div class="col-md-8 mt16 text-muted">
<div class="col-lg-8 mt16 text-muted">
Online events like webinars do not require a specific location
and are hosted online.
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="use_timezone"/>
</div>
<div class="o_setting_right_pane">
<label for="use_timezone"/>
<div class="row">
<div class="col-md-8 mt16" attrs="{'invisible': [('use_timezone', '=', False)]}">
<div class="col-lg-8 mt16" attrs="{'invisible': [('use_timezone', '=', False)]}">
<label for="default_timezone"/>
<field name="default_timezone"
attrs="{'required': [('use_timezone', '=', True)]}"/>
@@ -51,14 +51,14 @@
</div>
<h2>Communication</h2>
<div class="row mt16 o_settings_container" name="event_type_communication">
<div class="col-xs-12 col-md-12 o_setting_box">
<div class="col-12 col-lg-12 o_setting_box">
<div class="o_setting_left_pane">
<field name="use_mail_schedule"/>
</div>
<div class="o_setting_right_pane">
<label for="use_mail_schedule"/>
<div class="row mt16" attrs="{'invisible': [('use_mail_schedule', '=', False)]}">
<div class="col-md-9">
<div class="col-lg-9">
<field name="event_type_mail_ids">
<tree string="Email Schedule" editable="bottom">
<field name="template_id"/>
@@ -71,14 +71,14 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="use_hashtag"/>
</div>
<div class="o_setting_right_pane">
<label for="use_hashtag"/>
<div class="row">
<div class="col-md-8 mt16" attrs="{'invisible': [('use_hashtag', '=', False)]}">
<div class="col-lg-8 mt16" attrs="{'invisible': [('use_hashtag', '=', False)]}">
<label for="default_hashtag"/>
<field name="default_hashtag"
attrs="{'required': [('use_hashtag', '=', True)]}"/>
@@ -89,14 +89,14 @@
</div>
<h2>Visibility</h2>
<div class="row mt16 o_settings_container" name="event_type_visibility">
<div class="col-xs-12 col-md-6 o_setting_box" name="event_type_visibility_seats">
<div class="col-12 col-lg-6 o_setting_box" name="event_type_visibility_seats">
<div class="o_setting_left_pane">
<field name="has_seats_limitation"/>
</div>
<div class="o_setting_right_pane">
<label for="has_seats_limitation"/>
<div class="row">
<div class="col-md-8 mt16" attrs="{'invisible': [('has_seats_limitation', '=', False)]}">
<div class="col-lg-8 mt16" attrs="{'invisible': [('has_seats_limitation', '=', False)]}">
<div>
<label for="default_registration_min"/> <field name="default_registration_min"/>
</div>
@@ -110,14 +110,14 @@
</div>
<h2>Attendees</h2>
<div class="row mt16 o_settings_container" name="event_type_attendees">
<div class="col-xs-12 col-md-6 o_setting_box" name="event_type_attendees_auto_confirm">
<div class="col-12 col-lg-6 o_setting_box" name="event_type_attendees_auto_confirm">
<div class="o_setting_left_pane">
<field name="auto_confirm"/>
</div>
<div class="o_setting_right_pane">
<label for="auto_confirm"/>
<div class="row">
<div class="col-md-8 mt16 text-muted">
<div class="col-lg-8 mt16 text-muted">
Events and registrations will automatically be confirmed
upon creation, easing the flow for simple events.
</div>
@@ -238,7 +238,7 @@
<div>
<field name="seats_availability" widget='radio'/>
<span attrs="{'invisible': [('seats_availability', '=', 'unlimited')]}" class="oe_read_only">
to
to
</span>
<field name="seats_max" attrs="{'invisible': [('seats_availability', '=', 'unlimited')], 'required': [('seats_availability', '=', 'limited')]}"/>
</div>
@@ -305,15 +305,15 @@
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
<div class="o_dropdown_kanban dropdown">
<a class="dropdown-toggle btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
<a class="dropdown-toggle o-no-caret btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
<span class="fa fa-ellipsis-v"/>
</a>
<ul class="dropdown-menu" role="menu">
<div class="dropdown-menu" role="menu">
<t t-if="widget.deletable">
<li><a role="menuitem" type="delete">Delete</a></li>
<a role="menuitem" type="delete" class="dropdown-item">Delete</a>
</t>
<li role="menuitem" aria-haspopup="true"><ul class="oe_kanban_colorpicker" data-field="color" role="menu"/></li>
</ul>
<ul class="oe_kanban_colorpicker" data-field="color" role="menu"/>
</div>
</div>
<div class="o_event_left">
<div class="o_day"><t t-esc="record.date_begin.raw_value.getDate()"/></div>
addons/event/views/res_config_settings_views.xml
+4 -4
View File
@@ -11,7 +11,7 @@
<div class="app_settings_block" data-string="Events" string="Events" data-key="event" groups="event.group_event_manager">
<h2>Events</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" title="Add a navigation menu to your event web pages with schedule, tracks, a track proposal form, etc.">
<div class="col-12 col-lg-6 o_setting_box" title="Add a navigation menu to your event web pages with schedule, tracks, a track proposal form, etc.">
<div class="o_setting_left_pane">
<field name="module_website_event_track"/>
</div>
@@ -25,7 +25,7 @@
</div>
<h2>Registration</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_event_sale"/>
</div>
@@ -36,7 +36,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" name="event_settings_website">
<div class="col-12 col-lg-6 o_setting_box" name="event_settings_website">
<div class="o_setting_left_pane">
<field name="module_website_event_sale"/>
</div>
@@ -50,7 +50,7 @@
</div>
<h2>Attendance</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_event_barcode" widget="upgrade_boolean"/>
</div>
addons/event/wizard/event_confirm_view.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<span class="o_form_label">Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?</span>
<footer>
<button name="confirm" string="Confirm Anyway" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/event_sale/report/event_event_templates.xml
+2 -2
View File
@@ -3,7 +3,7 @@
<template id="event_registration_report_template_badge" inherit_id="event.event_registration_report_template_badge">
<xpath expr="//div[@id='o_event_name']" position="inside">
<div t-if="o.event_ticket_id" class="col-xs-12 text-center" style="padding:0px;">
<div t-if="o.event_ticket_id" class="col-12 text-center" style="padding:0px;">
<div style="background: lightgrey; height: 65px;" class="mt16 text-center">
<h3><span t-field="o.event_ticket_id"/></h3>
</div>
@@ -13,7 +13,7 @@
<template id="event_event_report_template_badge" inherit_id="event.event_event_report_template_badge">
<xpath expr="//div[@id='o_event_attendee_name']" position="inside">
<div t-if="bool(len(event.event_ticket_ids))" class="col-xs-12" style="padding: 0px;" t-ignore="true">
<div t-if="bool(len(event.event_ticket_ids))" class="col-12" style="padding: 0px;" t-ignore="true">
<div style="background: lightgrey; height: 65px;" class="mt16 text-center">
<h3>Ticket Type</h3>
</div>
addons/event_sale/views/event_views.xml
+4 -4
View File
@@ -47,14 +47,14 @@
<field name="inherit_id" ref="event.view_event_type_form"/>
<field name="arch" type="xml">
<div name="event_type_attendees_auto_confirm" position="after">
<div class="col-xs-12 col-md-12 o_setting_box">
<div class="col-12 col-lg-12 o_setting_box">
<div class="o_setting_left_pane">
<field name="use_ticketing"/>
</div>
<div class="o_setting_right_pane">
<label for="use_ticketing"/>
<div class="row mt16" attrs="{'invisible': [('use_ticketing', '=', False)]}">
<div class="col-md-9">
<div class="col-lg-9">
<field name="event_ticket_ids">
<tree string="Tickets" editable="bottom">
<field name="name"/>
@@ -98,10 +98,10 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<strong><t t-esc="record.name.value"/></strong>
</div>
<div class="col-xs-4 text-right"><strong> <t t-esc="record.price.value"/></strong></div>
<div class="col-4 text-right"><strong> <t t-esc="record.price.value"/></strong></div>
</div>
<div t-esc="record.product_id.value"/>
<div><i>
addons/event_sale/wizard/event_edit_registration.xml
+1 -1
View File
@@ -20,7 +20,7 @@
</field>
<footer>
<button string="Apply" name="action_make_registration" type="object" class="btn-primary"/>
<button string="Skip" class="btn-default" special="cancel"/>
<button string="Skip" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/fleet/views/fleet_vehicle_cost_views.xml
+8 -8
View File
@@ -25,12 +25,12 @@
<div>
<strong>
<field name="vehicle_id"/>
<span class="pull-right"><field name="date"/></span>
<span class="float-right"><field name="date"/></span>
</strong>
</div>
<div>
<field name="cost_subtype_id"/>
<span class="pull-right"><field name="amount"/></span>
<span class="float-right"><field name="amount"/></span>
</div>
</div>
</t>
@@ -297,7 +297,7 @@
<div>
<strong>
<field name="vehicle_id"/>
<span class="pull-right label label-default">
<span class="float-right badge badge-secondary">
<field name="state"/>
</span>
</strong>
@@ -307,7 +307,7 @@
</div>
<div>
<field name="insurer_id"/>
<span class="pull-right"><field name="cost_subtype_id"/></span>
<span class="float-right"><field name="cost_subtype_id"/></span>
</div>
</div>
</t>
@@ -446,7 +446,7 @@
<div>
<strong>
<field name="vehicle_id"/>
<span class="pull-right"><field name="date"/></span>
<span class="float-right"><field name="date"/></span>
</strong>
</div>
<div>
@@ -454,7 +454,7 @@
</div>
<div>
<span><field name="liter"/> Liter</span>
<span class="pull-right"><field name="amount"/></span>
<span class="float-right"><field name="amount"/></span>
</div>
</div>
</t>
@@ -580,7 +580,7 @@
<div>
<strong>
<field name="vehicle_id"/>
<span class="pull-right"><field name="date"/></span>
<span class="float-right"><field name="date"/></span>
</strong>
</div>
<div>
@@ -591,7 +591,7 @@
</div>
<div>
<span><field name="vendor_id"/></span>
<span class="pull-right"><field name="amount"/></span>
<span class="float-right"><field name="amount"/></span>
</div>
</div>
</t>
addons/fleet/views/fleet_vehicle_model_views.xml
+1 -1
View File
@@ -125,7 +125,7 @@
<t t-name="kanban-box">
<div class="oe_kanban_vignette oe_semantic_html_override">
<a type="open" href="#" class="o_kanban_image oe_kanban_action">
<img alt="Open" t-att-src="kanban_image('fleet.vehicle.model.brand', 'image_small', record.id.raw_value)" class="img-responsive" style="width:100px;"/>
<img alt="Open" t-att-src="kanban_image('fleet.vehicle.model.brand', 'image_small', record.id.raw_value)" class="img-fluid" style="width:100px;"/>
</a>
<div class="oe_kanban_details">
<h4 class="oe_partner_heading">
addons/fleet/views/fleet_vehicle_views.xml
+2 -2
View File
@@ -302,12 +302,12 @@
<div>
<strong>
<field name="vehicle_id"/>
<span class="pull-right"><field name="date"/></span>
<span class="float-right"><field name="date"/></span>
</strong>
</div>
<div>
<span><field name="driver_id"/></span>
<span class="pull-right"><field name="value"/> Km</span>
<span class="float-right"><field name="value"/> Km</span>
</div>
</div>
</t>
addons/gamification/views/badge.xml
+1 -1
View File
@@ -137,7 +137,7 @@
</div>
</div>
<div t-if="record.remaining_sending.value != 0" class="o_kanban_button">
<button type="action" name="%(action_grant_wizard)d" class="oe_highlight btn btn-sm btn-primary">Grant</button>
<button type="action" name="%(action_grant_wizard)d" class="oe_highlight btn btn-primary">Grant</button>
</div>
</div>
</div>
addons/gamification/views/goal.xml
+1 -1
View File
@@ -149,7 +149,7 @@
<div t-attf-class="oe_kanban_card o_kanban_gamification #{record.end_date.raw_value &lt; record.last_update.raw_value &amp; record.state.raw_value == 'failed' ? 'oe_kanban_color_2' : ''} #{record.end_date.raw_value &lt; record.last_update.raw_value &amp; record.state.raw_value == 'reached' ? 'oe_kanban_color_5' : ''}">
<div class="o_kanban_content">
<p><strong><h4 class="oe_goal_name text-center" tooltip="kanban-tooltip"><field name="definition_id" /></h4></strong></p>
<div class="pull-left">
<div class="float-left">
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" />
</div>
<field name="user_id" />
addons/gamification/wizard/grant_badge.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</group>
<footer>
<button string="Grant Badge" type="object" name="action_grant_badge" class="btn-primary" />
<button string="Cancel" special="cancel" class="btn-default"/>
<button string="Cancel" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>

Some files were not shown because too many files have changed in this diff Show More