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

[REF] *: BS4, adapt col-related classes

Browse Source 
col-lg-* -> col-xl-*
col-md-* -> col-lg-*
col-sm-* -> col-md-*
col-xs-* -> col-*

col-lg-offset-* -> offset-xl-*
col-md-offset-* -> offset-lg-*
col-sm-offset-* -> offset-md-*
col-xs-offset-* -> offset-*

col-lg-pull-* -> order-xl-1
col-md-pull-* -> order-lg-1
col-sm-pull-* -> order-md-1
col-xs-pull-* -> order-1

col-lg-push-* -> order-xl-2
col-md-push-* -> order-lg-2
col-sm-push-* -> order-md-2
col-xs-push-* -> order-2
This commit is contained in:
qsm-odoo
2018-07-27 12:36:54 +02:00
parent 66289d639c
commit ed1b18f103
261 changed files with 1870 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_report_payment_receipt_templates.xml
+5 -5
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,15 +19,15 @@
<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>
addons/account/views/account_invoice_view.xml
+5 -5
View File
@@ -510,14 +510,14 @@
<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">
<t t-esc="record.price_subtotal.value" groups="account.group_show_line_subtotals_tax_excluded"/>
@@ -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
+25 -25
View File
@@ -21,7 +21,7 @@
<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">
<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>
@@ -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,7 +219,7 @@
<!-- 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"> Reconcile <t t-esc="dashboard.number_to_reconcile"/> Items</button>
</t>
@@ -239,21 +239,21 @@
</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,7 +261,7 @@
</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 o_invoice_new">
<span>New Invoice</span>
@@ -273,20 +273,20 @@
</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
+5 -5
View File
@@ -53,23 +53,23 @@
<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">
<div class="col-6">
<span class="pull-right label label-default">
<field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'sent': 'success'}}"/>
</span>
addons/account/views/account_portal_templates.xml
+4 -4
View File
@@ -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 d-print-none">
<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">
@@ -108,7 +108,7 @@
</div>
</div>
<!-- Page Content -->
<div id="invoice_content" class="col-md-9 o_portal_page_content d-print-none">
<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
+19 -19
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,10 +113,10 @@
<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">
<div class="col-6 text-right">
<span class="badge"><t t-esc="record.code.value"/></span>
</div>
</div>
@@ -225,10 +225,10 @@
<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">
<div class="col-6">
<span class="pull-right"><field name="type"/></span>
</div>
</div>
@@ -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>
@@ -1027,10 +1027,10 @@
<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">
<div class="col-6 pull-right text-right">
<span class="badge"><t t-esc="record.type_tax_use.value"/></span>
</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,24 +1456,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="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">
<div class="col-6">
<span class="pull-right">
<field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'posted': 'success'}}"/>
</span>
addons/account/views/report_agedpartnerbalance.xml
+4 -4
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>
addons/account/views/report_financial.xml
+2 -2
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>
addons/account/views/report_generalledger.xml
+5 -5
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,19 +24,19 @@
<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>
addons/account/views/report_invoice.xml
+3 -3
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>
@@ -156,7 +156,7 @@
<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 ''}">
<div t-attf-class="col-md-4 pull-right #{'col-4' if not type_html else ''}">
<table class="table table-condensed" style="min-width: 250px;max-width: 400px;">
<tr class="border-black" style="border-bottom:1px solid #dddddd;">
<td><strong>Subtotal</strong></td>
addons/account/views/report_journal.xml
+6 -6
View File
@@ -11,20 +11,20 @@
<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>
@@ -61,7 +61,7 @@
</table>
<div class="row">
<div class="col-xs-4 pull-right">
<div class="col-4 pull-right">
<table class="table table-condensed">
<tr>
<td><strong>Total</strong></td>
@@ -73,7 +73,7 @@
</div>
<div class="row">
<div class="col-xs-4">
<div class="col-4">
<table class="table table-condensed">
<thead>
<tr><th colspan="3">Tax Declaration</th></tr>
addons/account/views/report_overdue.xml
+1 -1
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"/>
addons/account/views/report_partnerledger.xml
+3 -3
View File
@@ -11,15 +11,15 @@
<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>
addons/account/views/report_tax.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<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>
addons/account/views/report_trialbalance.xml
+3 -3
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>
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/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_asset/views/account_asset_views.xml
+6 -6
View File
@@ -92,10 +92,10 @@
<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">
<div class="col-6 text-right">
<span class="badge"><strong><t t-esc="record.method.value"/></strong></span>
</div>
</div>
@@ -249,18 +249,18 @@
<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 pull-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">
<div class="col-6">
<span class="pull-right text-right">
<field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'primary', 'open': 'success', 'close': 'default'}}"/>
</span>
addons/account_budget/views/account_budget_views.xml
+4 -4
View File
@@ -182,12 +182,12 @@ 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">
<div class="col-4">
<span class="pull-right">
<field name="state" widget="kanban_label_selection"
options="{'classes': {'draft': 'default', 'done': 'success'}}"/>
@@ -195,12 +195,12 @@ Budgets
</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">
<div class="col-2">
<span class="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"
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_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
+1 -1
View File
@@ -98,7 +98,7 @@
</div>
</div>
<div class="panel-body" t-if="existing_token">
<div class="col-md-offset-3 col-md-6">
<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
+4 -4
View File
@@ -45,18 +45,18 @@
<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">
<div class="col-6">
<strong><span class="pull-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">
<div class="col-6">
<span class="pull-right text-right">
<field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'cancel': 'default', 'none': 'danger', 'proforma': 'warning',
'posted': 'success'}}"/>
addons/analytic/views/analytic_account_views.xml
+5 -5
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,18 +348,18 @@
<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 pull-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">
<div class="col-6">
<span class="pull-right text-right">
<field name="amount" widget="monetary"/>
</span>
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/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/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_import/static/src/xml/base_import.xml
+3 -3
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 d-none">
<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 d-none">
<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
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/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/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/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/views/event_views.xml
+12 -12
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>
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_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/google_calendar/views/res_config_settings_views.xml
+2 -2
View File
@@ -8,9 +8,9 @@
<div id="msg_module_google_calendar" position="replace">
<div class="content-group" attrs="{'invisible': [('module_google_calendar','=',False)]}">
<div class="mt16 row">
<label for="cal_client_id" string="Client ID" class="col-xs-3 col-md-3 o_light_label"/>
<label for="cal_client_id" string="Client ID" class="col-3 col-lg-3 o_light_label"/>
<field name="cal_client_id" nolabel="1"/>
<label for="cal_client_secret" string="Client Secret" class="col-xs-3 col-md-3 o_light_label"/>
<label for="cal_client_secret" string="Client Secret" class="col-3 col-lg-3 o_light_label"/>
<field name="cal_client_secret" password="True" nolabel="1"/>
</div>
<a href="https://www.odoo.com/documentation/user/11.0/crm/optimize/google_calendar_credentials.html" class="oe-link" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Tutorial</a>
addons/google_drive/views/google_drive_views.xml
+6 -6
View File
@@ -64,15 +64,15 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row o_kanban_record_title">
<div class="col-xs-4 text-center"><strong>Template</strong></div>
<div class="col-xs-4 text-center"><strong>Model</strong></div>
<div class="col-xs-4 text-center"><strong>Active</strong></div>
<div class="col-4 text-center"><strong>Template</strong></div>
<div class="col-4 text-center"><strong>Model</strong></div>
<div class="col-4 text-center"><strong>Active</strong></div>
</div>
<hr class="mb4 mt4"/>
<div class="row o_kanban_record_subtitle">
<div class="col-xs-4 text-center"><field name="name"/></div>
<div class="col-xs-4 text-center"><field name="model_id"/></div>
<div class="col-xs-4 text-center">
<div class="col-4 text-center"><field name="name"/></div>
<div class="col-4 text-center"><field name="model_id"/></div>
<div class="col-4 text-center">
<field name="active" widget="boolean"/>
</div>
</div>
addons/google_drive/views/res_config_settings_views.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<div id="msg_module_google_drive" position="replace">
<div class="content-group" attrs="{'invisible': [('module_google_drive','=',False)]}">
<div class="mt16 row">
<label for="google_drive_authorization_code" class="col-md-3 o_light_label"/>
<label for="google_drive_authorization_code" class="col-lg-3 o_light_label"/>
<field name="google_drive_authorization_code"/>
</div>
<div>
addons/hr/views/hr_views.xml
+7 -7
View File
@@ -572,25 +572,25 @@
</div>
<div class="container o_kanban_card_content">
<div class="row">
<div class="col-xs-6 o_kanban_primary_left">
<div class="col-6 o_kanban_primary_left">
<button class="btn btn-primary" name="%(act_employee_from_department)d" type="action">Employees</button>
</div>
<div class="col-xs-6 o_kanban_primary_right">
<div class="col-6 o_kanban_primary_right">
</div>
</div>
</div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
<div class="row">
<div role="menuitem" class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_to_do">
<div role="menuitem" class="col-4 o_kanban_card_manage_section o_kanban_manage_to_do">
<div class="o_kanban_card_manage_title">
<span>To Do</span>
</div>
</div>
<div role="menuitem" class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_to_approve">
<div role="menuitem" class="col-4 o_kanban_card_manage_section o_kanban_manage_to_approve">
<div class="o_kanban_card_manage_title">
<span>To Approve</span>
</div>
</div>
<div role="menuitem" class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_reports">
<div role="menuitem" class="col-4 o_kanban_card_manage_section o_kanban_manage_reports">
<div class="o_kanban_card_manage_title">
<span>Reporting</span>
</div>
@@ -598,10 +598,10 @@
</div>
<div t-if="widget.editable" class="o_kanban_card_manage_settings row">
<div role="menuitem" aria-haspopup="true" class="col-xs-8">
<div role="menuitem" aria-haspopup="true" class="col-8">
<ul class="oe_kanban_colorpicker" data-field="color" role="menu"/>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<a role="menuitem" type="edit">Settings</a>
</div>
</div>
addons/hr/views/res_config_settings_views.xml
+3 -3
View File
@@ -10,12 +10,12 @@
<div class="app_settings_block" data-string="Employees" string="Employees" data-key="hr" groups="hr.group_hr_manager">
<h2>Work Organization</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">
<label for="resource_calendar_id"/>
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." role="img" aria-label="Values set here are company-specific." groups="base.group_multi_company"/>
<div class="row">
<div class="text-muted col-md-8">
<div class="text-muted col-lg-8">
Set default calendar used to compute time allocation for leaves, timesheets, ...
</div>
</div>
@@ -30,7 +30,7 @@
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Show organizational chart on employee form">
<div class="col-12 col-lg-6 o_setting_box" title="Show organizational chart on employee form">
<div class="o_setting_left_pane">
<field name="module_hr_org_chart"/>
</div>
addons/hr_attendance/report/hr_employee_badge.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<t t-call="web.basic_layout">
<div class="page">
<t t-foreach="docs" t-as="employee">
<div class="col-sm-6">
<div class="col-md-6">
<table style="width:243pt; height:153pt; border: 1pt solid black; border-collapse:separate; border-radius:8pt; margin:5pt">
<td style="width:33%;" valign="center">
<table style="width:77pt; height:150pt">
addons/hr_attendance/static/src/xml/attendance.xml
+3 -3
View File
@@ -77,13 +77,13 @@
<t t-else="">
<h3 class="mt0 mb0 text-muted">Please enter your PIN to <b t-if="checked_in">check out</b><b t-else="">check in</b></h3>
<div class="row">
<div class="col-sm-8 col-sm-offset-2 o_hr_attendance_pin_pad">
<div class="col-md-8 offset-md-2 o_hr_attendance_pin_pad">
<div class="row" >
<div class="col-xs-12 mb8 mt8"><input class="o_hr_attendance_PINbox text-center" type="password" disabled="true"/></div>
<div class="col-12 mb8 mt8"><input class="o_hr_attendance_PINbox text-center" type="password" disabled="true"/></div>
</div>
<div class="row">
<t t-foreach="['1', '2', '3', '4', '5', '6', '7', '8', '9', ['C', 'btn-warning'], '0', ['ok', 'btn-primary']]" t-as="btn_name">
<div class="col-xs-4 mb4">
<div class="col-4 mb4">
<a t-attf-class="btn {{btn_name[1]? btn_name[1] : 'btn-secondary'}} btn-block btn-lg {{ 'o_hr_attendance_pin_pad_button_' + btn_name[0] }}"><t t-esc="btn_name[0]"/></a>
</div>
</t>
addons/hr_attendance/views/hr_department_view.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<xpath expr="//div[hasclass('o_kanban_manage_reports')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(hr_attendance_action_graph_filtered)d" type="action">
Attendances
</a>
addons/hr_attendance/views/res_config_settings_views.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<div class="app_settings_block" data-string="Attendances" string="Attendances" data-key="hr_attendance" groups="hr_attendance.group_hr_attendance_manager">
<h2>Check-In/Out</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" title="Set PIN codes in the employee detail form (in HR Settings tab).">
<div class="col-12 col-lg-6 o_setting_box" title="Set PIN codes in the employee detail form (in HR Settings tab).">
<div class="o_setting_left_pane">
<field name="group_attendance_use_pin"/>
</div>
addons/hr_expense/report/hr_expense_report.xml
+6 -6
View File
@@ -8,23 +8,23 @@
<h2>Expenses Report</h2>
<div class="row mt32 mb32">
<div class="col-xs-2">
<div class="col-2">
<strong>Employee:</strong>
<p t-field="o.employee_id.name"/>
</div>
<div class="col-xs-2">
<div class="col-2">
<strong>Date:</strong>
<p t-field="o.accounting_date"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Description:</strong>
<p t-field="o.name"/>
</div>
<div class="col-xs-2">
<div class="col-2">
<strong>Validated By:</strong>
<p t-field="o.user_id"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Payment By:</strong>
<p t-field="o.payment_mode"/>
</div>
@@ -82,7 +82,7 @@
</table>
<div class="row">
<div class="col-xs-4 pull-right">
<div class="col-4 pull-right">
<table class="table table-condensed">
<tr class="border-black">
<td><strong>Total</strong></td>
addons/hr_expense/static/description/index.html
+1 -1
View File
@@ -17,7 +17,7 @@
<p class="oe_mt32">
Manage your employees' daily expenses. Whether it's travel expenses or any other costs, access all your employees&apos; fee notes and complete, validate or refuse them. No need to download any specialized software or program to manage expenses - everything can be done directly in the app!
</p>
<div class="col-md-8 col-md-offset-2">
<div class="col-lg-8 offset-lg-2">
<img class="oe_picture oe_screenshot" src="expense_sc_01.png">
</div>
</div>
addons/hr_expense/views/account_journal_dashboard.xml
+2 -2
View File
@@ -8,12 +8,12 @@
<field name="arch" type="xml">
<xpath expr="//t[@id='account.JournalBodySalePurchase']//div[hasclass('o_kanban_primary_right')]" position="inside">
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<a type="object" t-if="journal_type == 'purchase'" name="open_expenses_action">
<t t-esc="dashboard.number_expenses_to_pay"/> Expenses to Process
</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<span t-if="journal_type == 'purchase'"><t t-esc="dashboard.sum_expenses_to_pay"/></span>
</div>
</div>
addons/hr_expense/views/hr_department_views.xml
+4 -4
View File
@@ -13,12 +13,12 @@
<xpath expr="//div[hasclass('o_kanban_primary_right')]" position="inside">
<div t-if="record.expense_sheets_to_approve_count.raw_value > 0" class="row">
<div class="col-xs-9">
<div class="col-9">
<a name="%(action_hr_expense_sheet_department_to_approve)d" type="action">
Expense Reports
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<t t-esc="record.expense_sheets_to_approve_count.raw_value"/>
</div>
</div>
@@ -26,7 +26,7 @@
<xpath expr="//div[hasclass('o_kanban_manage_to_approve')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(action_hr_expense_sheet_department_to_approve)d" type="action">
<t t-esc="record.expense_sheets_to_approve_count.raw_value or 0"/> Expense Reports
</a>
@@ -36,7 +36,7 @@
<xpath expr="//div[hasclass('o_kanban_manage_reports')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(action_hr_expense_sheet_department_filtered)d" type="action">
Expense Reports
</a>
addons/hr_expense/views/hr_expense_views.xml
+6 -6
View File
@@ -137,16 +137,16 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<strong class="o_kanban_record_title"><span><t t-esc="record.name.value"/></span></strong>
<strong class="o_kanban_record_subtitle pull-right"><span class="text-right"><t t-esc="record.total_amount.value"/></span></strong>
</div>
</div>
<div class="row mt8">
<div class="col-xs-6 text-muted">
<div class="col-6 text-muted">
<span><t t-esc="record.employee_id.value"/> <t t-esc="record.date.value"/></span>
</div>
<div class="col-xs-6">
<div class="col-6">
<span class="pull-right text-right">
<field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'reported': 'primary', 'refused': 'danger', 'done': 'warning',
'approved': 'success'}}"/>
@@ -520,16 +520,16 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<strong class="o_kanban_record_title"><span><t t-esc="record.name.value"/></span></strong>
<strong class="o_kanban_record_subtitle pull-right"><span class="text-right"><t t-esc="record.total_amount.value"/></span></strong>
</div>
</div>
<div class="row mt8">
<div class="col-xs-6 text-muted">
<div class="col-6 text-muted">
<span><t t-esc="record.employee_id.value"/> <t t-esc="record.accounting_date.value"/></span>
</div>
<div class="col-xs-6">
<div class="col-6">
<span class="pull-right text-right">
<field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'submit': 'default', 'cancel': 'danger', 'post': 'warning',
'done': 'success'}}"/>
addons/hr_expense/views/res_config_settings_views.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="app_settings_block" data-string="Expenses" string="Expenses" data-key="hr_expense" groups="hr_expense.group_hr_expense_manager">
<h2>Recording</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" title="You can setup a generic email alias to create incoming expenses easily. Write an email with the receipt in attachment to create an expense line in one click. If the mail subject contains the product's internal reference between brackets, the product will be set automatically. Type the expense amount in the mail subject to set it on the expense too.">
<div class="col-12 col-lg-6 o_setting_box" title="You can setup a generic email alias to create incoming expenses easily. Write an email with the receipt in attachment to create an expense line in one click. If the mail subject contains the product's internal reference between brackets, the product will be set automatically. Type the expense amount in the mail subject to set it on the expense too.">
<div class="o_setting_left_pane">
<field name="use_mailgateway"/>
</div>
addons/hr_holidays/report/hr_holidays_templates.xml
+2 -2
View File
@@ -58,11 +58,11 @@
</tbody>
</table>
<div class="col-xs-3 col-xs-offset-5 mt32">
<div class="col-3 offset-5 mt32">
<table class="table table-bordered">
<thead>
<tr>
<th class="col-xs-1">Color</th>
<th class="col-1">Color</th>
<th class="text-center">Leave Type</th>
</tr>
</thead>
addons/hr_holidays/views/hr_views.xml
+10 -10
View File
@@ -71,34 +71,34 @@
<xpath expr="//div[hasclass('o_kanban_primary_right')]" position="inside">
<div t-if="record.leave_to_approve_count.raw_value > 0" class="row">
<div class="col-xs-9">
<div class="col-9">
<a name="%(hr_holidays_action_request_from_department)d" type="action">
Leave Requests
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<field name="leave_to_approve_count"/>
</div>
</div>
<div t-if="record.allocation_to_approve_count.raw_value > 0" class="row">
<div class="col-xs-9">
<div class="col-9">
<a name="%(hr_holidays_action_allocation_from_department)d" type="action">
Allocation Requests
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<field name="allocation_to_approve_count"/>
</div>
</div>
</xpath>
<xpath expr="//div[hasclass('o_kanban_primary_right')]" position="after">
<div class="col-xs-12 o_kanban_primary_bottom bottom_block">
<div class="col-12 o_kanban_primary_bottom bottom_block">
<div class="row">
<div class="col-xs-3">
<div class="col-3">
<a name="%(hr_employee_action_from_department)d" type="action" title="Absent Employee(s), Whose leaves request are either confirmed or validated on today">Absence</a>
</div>
<div class="col-xs-9">
<div class="col-9">
<field name="absence_of_today" widget="progressbar" options="{'current_value': 'absence_of_today', 'max_value': 'total_employee', 'editable': false}"/>
</div>
</div>
@@ -107,7 +107,7 @@
<xpath expr="//div[hasclass('o_kanban_manage_to_approve')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(hr_holidays_action_request_from_department)d" type="action">
<t t-esc="record.leave_to_approve_count.raw_value or 0"/> Leave Requests
</a>
@@ -115,7 +115,7 @@
</div>
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(hr_holidays_action_allocation_from_department)d" type="action">
<t t-esc="record.allocation_to_approve_count.raw_value or 0"/> Allocation Requests
</a>
@@ -125,7 +125,7 @@
<xpath expr="//div[hasclass('o_kanban_manage_reports')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(action_hr_holidays_leaves_analysis_filtered)d" type="action">
Leaves
</a>
addons/hr_payroll/views/hr_payslip_views.xml
+7 -7
View File
@@ -92,20 +92,20 @@
<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="employee_id"/></strong>
</div>
<div class="col-xs-6">
<div class="col-6">
<span class="pull-right label label-default">
<field name="state"/>
</span>
</div>
<div class="col-xs-12">
<div class="col-12">
<span>
<field name="date_from"/> - <field name="date_to"/>
</span>
</div>
<div class="col-xs-12">
<div class="col-12">
<span><field name="name"/></span>
</div>
</div>
@@ -337,15 +337,15 @@
<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">
<div class="col-6">
<span class="pull-right label label-default">
<field name="state"/>
</span>
</div>
<div class="col-xs-12">
<div class="col-12">
<span>
<field name="date_start"/> - <field name="date_end"/>
</span>
addons/hr_payroll/views/hr_salary_rule_views.xml
+6 -6
View File
@@ -24,12 +24,12 @@
<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>
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<span>Code: <field name="code"/></span>
</div>
</div>
@@ -180,7 +180,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>
@@ -264,15 +264,15 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_content oe_kanban_global_click">
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<strong><field name="name"/></strong>
</div>
<div class="col-xs-4">
<div class="col-4">
<span class="pull-right"><field name="category_id"/></span>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<span>Code: <field name="code"/></span>
</div>
</div>
addons/hr_payroll/views/report_contributionregister_templates.xml
+4 -4
View File
@@ -9,15 +9,15 @@
<div class="row mt32 mb32">
<div class="col-xs-3">
<div class="col-3">
<strong>Register Name:</strong>
<p t-field="o.name"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Date From:</strong>
<p t-esc="data['form']['date_from']"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Date To:</strong>
<p t-esc="data['form']['date_to']"/>
</div>
@@ -53,7 +53,7 @@
</table>
<div class="row">
<div class="col-xs-4 pull-right">
<div class="col-4 pull-right">
<table class="table table-condensed">
<tr class="border-black">
<td><strong>Total</strong></td>
addons/hr_payroll/views/res_config_settings_views.xml
+2 -2
View File
@@ -21,7 +21,7 @@
<field name="module_l10n_in_hr_payroll" invisible="1"/>
<h2 attrs="{'invisible': ['|', '|', ('module_l10n_fr_hr_payroll', '=', True), ('module_l10n_be_hr_payroll', '=', True), ('module_l10n_in_hr_payroll', '=', True)]}">Payroll</h2>
<div class="row mt16 o_settings_container" id="hr_payroll_localization" attrs="{'invisible': ['|', '|', ('module_l10n_fr_hr_payroll', '=', True), ('module_l10n_be_hr_payroll', '=', True), ('module_l10n_in_hr_payroll', '=', True)]}">
<div class="col-md-6 col-xs-12 o_setting_box">
<div class="col-lg-6 col-12 o_setting_box">
<div class="o_setting_right_pane">
<span class="o_form_label">Payroll Rules</span>
<div class="text-muted">
@@ -35,7 +35,7 @@
</div>
<h2>Accounting</h2>
<div class="row mt16 o_settings_container" id="hr_payroll_accountant">
<div class="col-md-6 col-xs-12 o_setting_box">
<div class="col-lg-6 col-12 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_account_accountant" widget="upgrade_boolean"/>
</div>
addons/hr_recruitment/static/description/index.html
+1 -1
View File
@@ -49,7 +49,7 @@
Whether applicants contact you by email or using an online form, get all the data automatically indexed (resumes, motivation letter, etc.) and answered in just a click, using templates or personalized emails.
</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="job_sources.png">
</div>
</div>
addons/hr_recruitment/views/hr_department_views.xml
+4 -4
View File
@@ -15,12 +15,12 @@
<xpath expr="//div[hasclass('o_kanban_primary_right')]" position="inside">
<div t-if="record.new_applicant_count.raw_value > 0" class="row">
<div class="col-xs-9">
<div class="col-9">
<a name="%(hr_applicant_action_from_department)d" type="action">
New Applicants
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<field name="new_applicant_count"/>
</div>
</div>
@@ -28,7 +28,7 @@
<xpath expr="//div[hasclass('o_kanban_manage_to_do')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(hr_applicant_action_from_department)d" type="action">
<t t-esc="record.new_applicant_count.raw_value or 0"/> New Applicants
</a>
@@ -38,7 +38,7 @@
<xpath expr="//div[hasclass('o_kanban_manage_reports')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(action_hr_recruitment_report_filtered_department)d" type="action">
Recruitments
</a>
addons/hr_recruitment/views/hr_job_views.xml
+4 -4
View File
@@ -40,7 +40,7 @@
<div class="container o_kanban_card_content">
<t t-if="record.state.raw_value == 'recruit'">
<div class="row">
<div name="application_button" class="col-xs-6 o_kanban_primary_left">
<div name="application_button" class="col-6 o_kanban_primary_left">
<button class="btn btn-primary" name="%(action_hr_job_applications)d" type="action">Application(s)</button>
</div>
</div>
@@ -61,17 +61,17 @@
</t>
<t t-if="record.state.raw_value == 'open'">
<div class="row">
<div class="col-xs-12 o_kanban_primary_left">
<div class="col-12 o_kanban_primary_left">
<button class="btn btn-secondary" name="set_recruit" type="object">Start Recruitment</button>
</div>
</div>
</t>
</div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
<div t-if="widget.editable" class="o_kanban_card_manage_settings row">
<div class="col-xs-8" role="menuitem" aria-haspopup="true">
<div class="col-8" role="menuitem" aria-haspopup="true">
<ul class="oe_kanban_colorpicker" data-field="color" role="menu"/>
</div>
<div class="col-xs-4">
<div class="col-4">
<a role="menuitem" t-if="record.state.raw_value == 'recruit'" name="set_open" type="object">Recruitment Done</a>
<a role="menuitem" t-if="record.state.raw_value == 'open'" name="set_recruit" type="object">Start recruitment</a>
<br role="separator"/>
addons/hr_recruitment/views/res_config_settings_views.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<div class="app_settings_block" data-string="Recruitment" string="Recruitment" data-key="hr_recruitment" groups="hr_recruitment.group_hr_recruitment_manager">
<h2>Job Posting</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_website_hr_recruitment"/>
</div>
@@ -25,7 +25,7 @@
</div>
<h2>Recruitment Process</h2>
<div class="row mt16 o_settings_container" name="recruitment_process_div">
<div class="col-xs-12 col-md-6 o_setting_box" title="Use interview forms tailored to each job position during the recruitment process. Select the form to use in the job position detail form. This relies on Survey app.">
<div class="col-12 col-lg-6 o_setting_box" title="Use interview forms tailored to each job position during the recruitment process. Select the form to use in the job position detail form. This relies on Survey app.">
<div class="o_setting_left_pane">
<field name="module_hr_recruitment_survey"/>
</div>
addons/hr_timesheet/report/report_timesheet_templates.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<div class="page">
<div class="oe_structure"/>
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<h2>
<span>Timesheet Entries</span>
</h2>
@@ -15,7 +15,7 @@
</div>
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<table class="table table-condensed">
<thead>
<tr>
addons/hr_timesheet/views/hr_timesheet_views.xml
+2 -2
View File
@@ -164,10 +164,10 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="row">
<div class="col-xs-2">
<div class="col-2">
<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="40" height="40" class="oe_kanban_avatar pull-left"/>
</div>
<div class="col-xs-10">
<div class="col-10">
<div>
<strong><t t-esc="record.project_id.value"/></strong>
</div>
addons/hr_timesheet/views/hr_views.xml
+1 -1
View File
@@ -46,7 +46,7 @@
<data>
<xpath expr="//div[hasclass('o_kanban_manage_reports')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(act_hr_timesheet_report)d" type="action"
context="{ 'search_default_department_id': [active_id], 'default_department_id': active_id}">
Timesheets
addons/hr_timesheet/views/project_portal_templates.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<thead>
<tr class="active">
<th>Date</th>
<th class="col-md-6">Description</th>
<th class="col-lg-6">Description</th>
<th>Responsible</th>
<th>Duration</th>
</tr>
addons/hr_timesheet/views/res_config_settings_views.xml
+5 -5
View File
@@ -13,7 +13,7 @@
<div class="app_settings_block" data-string="Timesheets" string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">
<h2>Timesheet Apps</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_project_timesheet_synchro" widget="upgrade_boolean"/>
</div>
@@ -24,17 +24,17 @@
</div>
<div class="content-group">
<div class="row mt16 oe_center">
<div class="col-md-4">
<div class="col-lg-4">
<a href="http://www.odoo.com/page/timesheet?platform=chrome">
<img alt="Google Chrome Store" class="img img-fluid" src="project/static/src/img/chrome_store.png"/>
</a>
</div>
<div class="col-md-4">
<div class="col-lg-4">
<a href="http://www.odoo.com/page/timesheet?platform=ios">
<img alt="Apple App Store" class="img img-fluid" src="project/static/src/img/app_store.png"/>
</a>
</div>
<div class="col-md-4">
<div class="col-lg-4">
<a href="http://www.odoo.com/page/timesheet?platform=android">
<img alt="Google Play Store" class="img img-fluid" src="project/static/src/img/play_store.png"/>
</a>
@@ -47,7 +47,7 @@
<div name="section_leaves" groups="base.group_no_one">
<h2>Leaves</h2>
<div class="row mt16 o_settings_container" name="timesheet_control">
<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_project_timesheet_holidays"/>
</div>
addons/hw_screen/controllers/main.py
+1 -1
View File
@@ -152,7 +152,7 @@ class HardwareScreen(web.Home):
<div hidden class="shadow"></div>
<div class="container">
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="col-lg-4 offset-lg-4">
<h1>Odoo Point of Sale</h1>
<h2>POSBox Client display</h2>
<h3>My IPs</h3>
addons/im_livechat/static/description/index.html
+3 -3
View File
@@ -14,7 +14,7 @@
<div class="oe_row oe_spaced">
<h2 class="oe_slogan" style="color:#875A7B;">Do it live!</h2>
<h3 class="oe_slogan">Convert more visitors into leads and customers</h3>
<div class="col-md-5 oe_mt32 text-justify">
<div class="col-lg-5 oe_mt32 text-justify">
<span class="fa fa-eyedropper fa-2x pull-left"/>
<div class="oe_mb32">
<p style="margin-left:45px;">Chat online with customers and website visitors in real time.</p>
@@ -28,10 +28,10 @@
Provide your visitors with information in a fast and simple way - direct chat with customers on your website has never been easier!
</p>
</div>
<div class="col-md-3" style="margin-left:68px;">
<div class="col-lg-3" style="margin-left:68px;">
<img class="oe_picture oe_screenshot" src="im_livechat_01.png">
</div>
<div class="col-md-3">
<div class="col-lg-3">
<img class="oe_picture oe_screenshot" src="im_livechat_02.png">
</div>
</div>
addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="app_settings_block" data-string="Fleet" string="Fleet" data-key="fleet" groups="fleet.fleet_group_manager">
<h2>Fleet Management</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">New Car Request</span>
addons/l10n_ch/views/res_config_settings_views.xml
+6 -6
View File
@@ -7,7 +7,7 @@
<field name="inherit_id" ref="account.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='accounting_reports']" position="inside">
<div class="col-xs-12 col-md-6 o_setting_box" id="l10n_ch-isr_print_bank">
<div class="col-12 col-lg-6 o_setting_box" id="l10n_ch-isr_print_bank">
<div class="o_setting_left_pane">
<field name="l10n_ch_isr_print_bank_location"/>
</div>
@@ -19,17 +19,17 @@
</div>
<div class="content-group" attrs="{'invisible': [('l10n_ch_isr_print_bank_location', '=', False)]}">
<div class="row mt16">
<label for="l10n_ch_isr_preprinted_bank" class="col-md-4 o_light_label"/>
<label for="l10n_ch_isr_preprinted_bank" class="col-lg-4 o_light_label"/>
<field name="l10n_ch_isr_preprinted_bank"/>
</div>
<div class="row">
<label for="l10n_ch_isr_preprinted_account" class="col-md-4 o_light_label"/>
<label for="l10n_ch_isr_preprinted_account" class="col-lg-4 o_light_label"/>
<field name="l10n_ch_isr_preprinted_account"/>
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="l10n_ch-isr_print_scanline_offset">
<div class="col-12 col-lg-6 o_setting_box" id="l10n_ch-isr_print_scanline_offset">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<span class="o_form_label">ISR scan line offset</span>
@@ -38,11 +38,11 @@
</div>
<div class="content-group">
<div class="row mt16">
<label for="l10n_ch_isr_scan_line_top" class="col-md-4 o_light_label"/>
<label for="l10n_ch_isr_scan_line_top" class="col-lg-4 o_light_label"/>
<field name="l10n_ch_isr_scan_line_top"/>
</div>
<div class="row">
<label for="l10n_ch_isr_scan_line_left" class="col-md-4 o_light_label"/>
<label for="l10n_ch_isr_scan_line_left" class="col-lg-4 o_light_label"/>
<field name="l10n_ch_isr_scan_line_left"/>
</div>
</div>
addons/l10n_fr/views/report_l10nfrbilan.xml
+2 -2
View File
@@ -7,12 +7,12 @@
<div class="page">
<h2>Bilan</h2>
<div class="row mt32 mb32">
<div class="col-xs-3">
<div class="col-3">
<span t-esc="res_company.name"/>
<br/>au
<span t-esc="time.strftime('%d-%m-%Y', time.strptime(date_stop,'%Y-%m-%d'))"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<p>Imprimé le
<span t-esc="time.strftime('%d-%m-%Y')"/>
<br/>Tenue de compte:
addons/l10n_fr/views/report_l10nfrresultat.xml
+2 -2
View File
@@ -7,12 +7,12 @@
<div class="page">
<h2>Compte de résultat</h2>
<div class="row mt32 mb32">
<div class="col-xs-3">
<div class="col-3">
<span t-esc="res_company.name"/>
<br/>au
<span t-esc="time.strftime('%d-%m-%Y', time.strptime(date_stop,'%Y-%m-%d'))"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<p>Imprimé le
<span t-esc="time.strftime('%d-%m-%Y')"/>
<br/>Tenue de compte:
addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
+3 -3
View File
@@ -7,11 +7,11 @@
<div class="page">
<div class="oe_structure"/>
<div class="row">
<div class="col-xs-4">
<div class="col-4">
<h2>Bulletin de paie</h2>
<h4>Paie du <span t-field="o.date_from"/> au <span t-field="o.date_to"/></h4>
</div>
<div class="col-xs-4 pull-right">
<div class="col-4 pull-right">
<table class="table table-bordered" stype="border: 2px solid black;">
<tr>
<td>
@@ -107,7 +107,7 @@
</tbody>
</table>
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<table class="table table-round-border">
<tr>
<td>
addons/l10n_fr_hr_payroll/views/res_config_settings_views.xml
+6 -6
View File
@@ -9,30 +9,30 @@
<field name="module_l10n_fr_hr_payroll" invisible="1"/>
<h2 attrs="{'invisible': [('module_l10n_fr_hr_payroll','=',False)]}">Payroll</h2>
<div class="row mt16 o_settings_container" attrs="{'invisible': [('module_l10n_fr_hr_payroll','=',False)]}">
<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="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"/>
<span class="o_form_label">Paie</span>
<div class="content-group">
<div class="row mt16">
<label for="plafond_secu" class="col-md-3 o_light_label"/>
<label for="plafond_secu" class="col-lg-3 o_light_label"/>
<field name="plafond_secu"/>
</div>
<div class="row mt16">
<label for="nombre_employes" class="col-md-3 o_light_label"/>
<label for="nombre_employes" class="col-lg-3 o_light_label"/>
<field name="nombre_employes"/>
</div>
<div class="row mt16">
<label for="cotisation_prevoyance" class="col-md-3 o_light_label"/>
<label for="cotisation_prevoyance" class="col-lg-3 o_light_label"/>
<field name="cotisation_prevoyance"/>
</div>
<div class="row mt16">
<label for="org_ss" class="col-md-3 o_light_label"/>
<label for="org_ss" class="col-lg-3 o_light_label"/>
<field name="org_ss"/>
</div>
<div class="row mt16">
<label for="conv_coll" class="col-md-3 o_light_label"/>
<label for="conv_coll" class="col-lg-3 o_light_label"/>
<field name="conv_coll"/>
</div>
addons/l10n_in_hr_payroll/report/payslip_report_view.xml
+1 -1
View File
@@ -86,7 +86,7 @@
<data>
<xpath expr="//div[hasclass('o_kanban_manage_reports')]" position="inside">
<div class="row">
<div class="col-xs-12 text-left">
<div class="col-12 text-left">
<a name="%(action_payslip_report_all)d" type="action">
Payslip Analysis
</a>
addons/l10n_mx/views/res_config_settings_views.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="inherit_id" ref="account.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr=".//div[@id='invoicing_settings']" position="inside">
<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_l10n_mx_edi" class="oe_inline" widget="upgrade_boolean"/>
</div>
addons/lunch/report/lunch_order_templates.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<div class="oe_structure"/>
<div class="row">
<div class="col-xs-5 col-xs-offset-7">
<div class="col-5 offset-7">
<div t-field="user.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
</div>
@@ -59,7 +59,7 @@
</table>
<div class="row">
<div class="col-xs-4 pull-right">
<div class="col-4 pull-right">
<table class="table table-condensed">
<tr class="border-black">
<td><strong>Total</strong></td>
addons/lunch/static/src/xml/lunch.xml
+2 -2
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
<div t-name="LunchPreviousOrdersWidgetNoOrder" class="col-md-12">
<div t-name="LunchPreviousOrdersWidgetNoOrder" class="col-lg-12">
<h3>This is the first time you order a meal</h3>
<p class="text-muted">Select a product and put your order comments on the note.</p>
<p class="text-muted">Your favorite meals will be created based on your last orders.</p>
<p class="text-muted">Don't forget the alerts displayed in the reddish area</p>
</div>
<t t-name="LunchPreviousOrdersWidgetList">
<div t-foreach="categories" t-as="supplier" class="col-md-4">
<div t-foreach="categories" t-as="supplier" class="col-lg-4">
<h3><t t-esc="supplier"/></h3>
<div t-foreach='categories[supplier]' t-as='order' class="o_lunch_vignette">
<button type="button" class="pull-right o_add_button oe_edit_only oe_link" t-att-data-id="order.line_id">
addons/lunch/views/lunch_views.xml
+10 -10
View File
@@ -98,23 +98,23 @@
<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">
<span>
<strong class="o_kanban_record_title"><t t-esc="record.description.value"/></strong>
</span>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<span class="badge">
<strong><i class="fa fa-money" role="img" aria-label="Amount" title="Amount"/> <field name="amount"/></strong>
</span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<i class="fa fa-clock-o" role="img" aria-label="Date" title="Date"/>
<t t-esc="record.date.value"/>
</div>
<div class="col-xs-6">
<div class="col-6">
<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"/>
</div>
</div>
@@ -389,15 +389,15 @@
<field name="note"/>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<i class="fa fa-money" role="img" aria-label="Money" title="Money"/> <field name="price"/>
</div>
<div class="col-xs-6 text-right">
<div class="col-6 text-right">
<i class="fa fa-clock-o" role="img" aria-label="Date" title="Date"/> <field name="date"/>
</div>
</div>
<div class="row mt4">
<div class="col-xs-6">
<div class="col-6">
<a class="btn btn-xs btn-success" role="button" name="order" string="Order" type="object" attrs="{'invisible': ['|',('state','=','confirmed'),('state','=','ordered')]}" groups="lunch.group_lunch_manager">
<i class="fa fa-phone" role="img" aria-label="Order button" title="Order button"/>
</a>
@@ -408,7 +408,7 @@
<i class="fa fa-times" role="img" aria-label="Cancel button" title="Cancel button"/>
</a>
</div>
<div class="col-xs-6">
<div class="col-6">
<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"/>
</div>
</div>
@@ -638,11 +638,11 @@
<strong class="o_kanban_record_title"><t t-esc="record.message.value"/></strong>
</div>
<div class="row mb4">
<div class="col-xs-6">
<div class="col-6">
Between: <t t-esc="record.start_hour.value"/> -
<t t-esc="record.end_hour.value"/>
</div>
<div class="col-xs-6">
<div class="col-6">
<span class="badge pull-right">
<t t-esc="record.alert_type.value"/>
</span>
addons/mail/views/res_config_settings_views.xml
+3 -3
View File
@@ -9,7 +9,7 @@
<div id="emails" position='replace'>
<h2>Discuss</h2>
<div class="row mt16 o_settings_container" id="emails">
<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">Activities</span>
@@ -23,7 +23,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.odoo.com).">
<div class="col-12 col-lg-6 o_setting_box" title="Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.odoo.com).">
<div class="o_setting_left_pane">
<field name="external_email_server_default"/>
</div>
@@ -34,7 +34,7 @@
</div>
<div class="content-group" attrs="{'invisible': [('external_email_server_default', '=', False)]}">
<div class="row mt16" id="mail_alias_domain">
<label for="alias_domain" class="col-md-3 o_light_label"/>
<label for="alias_domain" class="col-lg-3 o_light_label"/>
<field name="alias_domain" placeholder="mycompany.odoo.com"/>
</div>
</div>
addons/maintenance/views/maintenance_views.xml
+16 -16
View File
@@ -657,12 +657,12 @@
<img t-att-src="kanban_image('res.users', 'image_small', record.technician_user_id.raw_value)" t-att-title="record.technician_user_id.value" t-att-alt="record.technician_user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
</div>
<div class="row mt4">
<div class="col-xs-6">
<div class="col-6">
<span class="badge">
<strong>Equipments:</strong> <field name="equipment_count"/>
</span>
</div>
<div class="col-xs-6 text-right">
<div class="col-6 text-right">
<span class="badge">
<strong>Maintenance:</strong> <field name="maintenance_count"/>
</span>
@@ -830,43 +830,43 @@
</div>
<div class="container o_kanban_card_content">
<div class="row">
<div class="col-xs-6 o_kanban_primary_left">
<div class="col-6 o_kanban_primary_left">
<button class="btn btn-primary" name="%(hr_equipment_todo_request_action_from_dashboard)d" type="action" context="{'search_default_todo': 1}">
<t t-esc="record.todo_request_count.value"/> To Do
</button>
</div>
<div class="col-xs-6 o_kanban_primary_right">
<div class="col-6 o_kanban_primary_right">
<div class="row">
<div class="col-xs-9">
<div class="col-9">
<a name="%(hr_equipment_request_action_cal)d" type="action">
Scheduled
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<t t-esc="record.todo_request_count_date.value"/>
</div>
<div class="col-xs-9">
<div class="col-9">
<a name="%(hr_equipment_todo_request_action_from_dashboard)d" type="action" context="{'search_default_top_priority': 1}">
Top Priorities
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<t t-esc="record.todo_request_count_high_priority.value"/>
</div>
<div class="col-xs-9">
<div class="col-9">
<a name="%(hr_equipment_todo_request_action_from_dashboard)d" type="action" context="{'search_default_kanban_state_block': 1}">
Blocked
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<t t-esc="record.todo_request_count_block.value"/>
</div>
<div class="col-xs-9">
<div class="col-9">
<a name="%(hr_equipment_todo_request_action_from_dashboard)d" type="action" context="{'search_default_unscheduled': 1}">
Unscheduled
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<t t-esc="record.todo_request_count_unscheduled.value"/>
</div>
</div>
@@ -874,7 +874,7 @@
</div>
</div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
<div class="row">
<div class="col-xs-6 o_kanban_card_manage_section o_kanban_manage_view">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
<div role="menuitem" class="o_kanban_card_manage_title">
<span>View</span>
</div>
@@ -899,7 +899,7 @@
</a>
</div>
</div>
<div class="col-xs-6 o_kanban_card_manage_section o_kanban_manage_new">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
<div role="menuitem" class="o_kanban_card_manage_title">
<span>Reporting</span>
</div>
@@ -911,10 +911,10 @@
</div>
</div>
<div t-if="widget.editable" class="o_kanban_card_manage_settings row">
<div class="col-xs-8" role="menuitem" aria-haspopup="true">
<div class="col-8" role="menuitem" aria-haspopup="true">
<ul role="menu" class="oe_kanban_colorpicker" data-field="color"/>
</div>
<div role="menuitem" class="col-xs-4 text-right">
<div role="menuitem" class="col-4 text-right">
<a type="edit">Settings</a>
</div>
</div>
addons/mass_mailing/static/description/index.html
+2 -2
View File
@@ -61,12 +61,12 @@
<div class="oe_row oe_spaced">
<h2 class="oe_slogan" style="color:#875A7B;">Reach your target on any device</h2>
<h3 class="oe_slogan">Fully responsive, 100% mobile friendly</h3>
<div class="col-md-7">
<div class="col-lg-7">
<p class="oe_mt32 text-justify">
Be sure that your email newsletter is optimally displayed on every screen - whether it is a tablet, a mobile phone, laptop or desktop computer. Our dynamic content will adapt automatically to your subscriber&apos;s screen by adjusting spacing and optimizing images, offering the best reading comfort.
</p>
</div>
<div class="col-md-4 col-md-offset-1">
<div class="col-lg-4 offset-lg-1">
<img class="oe_picture" src="mass_mailing_sc_03.png">
</div>
</div>
addons/mass_mailing/views/mass_mailing_views.xml
+6 -6
View File
@@ -585,31 +585,31 @@
<div class="o_kanban_record_body" attrs="{'invisible': [('sent_date', '=', False)]}">
<t t-if="record.sent_date">
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<a name="%(action_view_mail_mail_statistics_mailing)d"
context="{'search_default_filter_opened': True}"
type="action">Opened</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<field name="opened_ratio"/> %
</div>
</div>
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<a name="%(action_view_mail_mail_statistics_mailing)d"
context="{'search_default_filter_replied': True}"
type="action">Replied</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<field name="replied_ratio"/> %
</div>
</div>
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<a name="%(action_view_mass_mailing_links_statistics)d"
type="action">Clicks</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<field name="clicks_ratio"/> %
</div>
</div>
addons/mass_mailing/views/res_config_settings_views.xml
+2 -2
View File
@@ -10,7 +10,7 @@
<div class="app_settings_block" data-string="Email Marketing" string="Email Marketing" data-key="mass_mailing" groups="mass_mailing.group_mass_mailing_user">
<h2>Email Marketing</h2>
<div class="row mt16 o_settings_container">
<div class="col-md-6 o_setting_box col-xs-12" title="This tool is advised if your marketing campaign is composed of several emails.">
<div class="col-lg-6 o_setting_box col-12" title="This tool is advised if your marketing campaign is composed of several emails.">
<div class="o_setting_left_pane" title="This is useful if your marketing campaigns are composed of several emails.">
<field name="group_mass_mailing_campaign"/>
</div>
@@ -28,7 +28,7 @@
</div>
</div>
</div>
<div class="col-md-6 o_setting_box col-xs-12">
<div class="col-lg-6 o_setting_box col-12">
<div class="o_setting_left_pane" title="Use a specific mail server in priority. Otherwise Odoo relies on the first outgoing mail server available (based on their sequencing) as it does for normal mails.">
<field name="mass_mailing_outgoing_mail_server"/>
</div>
addons/mrp/report/mrp_production_templates.xml
+7 -7
View File
@@ -7,20 +7,20 @@
<div class="page">
<div class="oe_structure"/>
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<h2><span t-field="o.name"/></h2>
</div>
</div>
<div class="row mt32 mb32">
<div class="col-xs-3" t-if="o.origin">
<div class="col-3" t-if="o.origin">
<strong>Source Document:</strong><br/>
<span t-field="o.origin"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Responsible:</strong><br/>
<span t-field="o.user_id"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Scheduled Date:</strong><br/>
<span t-field="o.date_planned_start"/>
<span t-if="o.date_planned_finished"> - <span t-field="o.date_planned_finished"/></span>
@@ -28,16 +28,16 @@
</div>
<div class="row mt32 mb32">
<div class="col-xs-3">
<div class="col-3">
<strong>Finished Product:</strong><br/>
<span t-field="o.product_id"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Quantity to Produce:</strong><br/>
<span t-field="o.product_qty"/>
<span t-field="o.product_uom_id.name" groups="product.group_uom"/>
</div>
<div class="col-xs-3">
<div class="col-3">
<strong>Printing date:</strong><br/>
<span t-esc="time.strftime('%Y-%m-%d')"
t-options='{"widget": "date"}'/>
addons/mrp/report/mrp_report_bom_structure.xml
+2 -2
View File
@@ -5,7 +5,7 @@
<div class="container o_mrp_bom_report_page">
<t t-if="data.get('components') or data.get('lines')">
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<h1>BoM Structure &amp; Cost</h1>
<h3>
<a t-if="data['report_type'] == 'html'" t-att-data-res-id="data['product'].id" t-att-data-model="data['product']._name" class="o_mrp_bom_action">
@@ -18,7 +18,7 @@
</div>
<t t-set="currency" t-value="data['currency']"/>
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<div class="mt16">
<table width="100%" class="o_mrp_bom_expandable">
<thead>
addons/mrp/static/src/xml/mrp.xml
+5 -5
View File
@@ -6,18 +6,18 @@
</t>
<form class="form-inline" t-name="mrp.report_bom_search">
<div class="form-group col-md-4">
<div class="form-group col-lg-4">
<label>Quantity:</label>
<div class="row">
<div class="col-md-6">
<div class="col-lg-6">
<input type="number" t-att-value="bom_qty" min="1" class="o_input o_mrp_bom_report_qty"/>
</div>
<div class="col-md-6">
<div class="col-lg-6">
<t t-if="is_uom_applied" t-esc="bom_uom_name"/>
</div>
</div>
</div>
<div t-if="is_variant_applied" class="form-group col-md-4">
<div t-if="is_variant_applied" class="form-group col-lg-4">
<label>Variant:</label>
<select class="o_input o_mrp_bom_report_variants">
<option t-foreach="variants" t-as="variant" t-att-value="variant">
@@ -25,7 +25,7 @@
</option>
</select>
</div>
<div class="form-group col-md-4">
<div class="form-group col-lg-4">
<label>Report:</label>
<select class="o_input o_mrp_bom_report_type">
<option t-att-data-type="'all'">BoM Structure &amp; Cost</option>
addons/mrp/views/ir_attachment_view.xml
+2 -2
View File
@@ -18,7 +18,7 @@
<div class="oe_kanban_vignette">
<div class="oe_attachment">
<div class="row">
<div class="col-xs-4 o_kanban_primary_left" t-if="record.type.raw_value == 'binary'">
<div class="col-4 o_kanban_primary_left" t-if="record.type.raw_value == 'binary'">
<a t-attf-href="/web/content/#{record.ir_attachment_id.raw_value}?download=1">
<t t-set="webimage" t-value="new RegExp('image.*(gif|jpeg|jpg|png)').test(record.mimetype.value)"/>
<div t-if="!webimage" class="o_image" t-att-data-mimetype="record.mimetype.value"/>
@@ -27,7 +27,7 @@
</div>
</a>
</div>
<div class="col-xs-8">
<div class="col-8">
<strong><field name="name"/></strong><br/>
<field name="datas_fname"/><br/>
<div class="mt8">
addons/mrp/views/mrp_unbuild_views.xml
+2 -2
View File
@@ -78,10 +78,10 @@
<strong><t t-esc="record.product_qty.value"/> <small><t t-esc="record.product_uom_id.value"/></small></strong>
</div>
<div class="row">
<div class="col-xs-8 text-muted">
<div class="col-8 text-muted">
<span><t t-esc="record.product_id.value"/></span>
</div>
<div class="col-xs-4">
<div class="col-4">
<span class="pull-right text-right">
<field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'done': 'success'}}"/>
</span>
addons/mrp/views/mrp_workcenter_views.xml
+17 -17
View File
@@ -54,10 +54,10 @@
<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 class="col-xs-12">
<div class="col-12">
<span>Code <field name="code"/></span>
</div>
</div>
@@ -168,7 +168,7 @@
</div>
<div class="container o_kanban_card_content">
<div class="row">
<div class="col-xs-6 o_kanban_primary_left">
<div class="col-6 o_kanban_primary_left">
<div class="btn-group" name="o_wo">
<t t-if="record.workorder_count.raw_value &gt; 0">
<button class="btn btn-primary" name="%(action_work_orders)d" type="action" context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1}">
@@ -182,44 +182,44 @@
</t>
</div>
</div>
<div class="col-xs-6 o_kanban_primary_right">
<div class="col-6 o_kanban_primary_right">
<div class="row" t-if="record.workorder_ready_count.raw_value &gt; 0">
<div class="col-xs-8">
<div class="col-8">
<a name="%(action_work_orders)d" type="action" context="{'search_default_ready': 1}">
To Launch
</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<field name="workorder_ready_count"/>
</div>
</div>
<div class="row" t-if="record.workorder_progress_count.raw_value &gt; 0">
<div class="col-xs-8">
<div class="col-8">
<a name="%(action_work_orders)d" type="action" context="{'search_default_progress': 1}">
In Progress
</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<field name="workorder_progress_count"/>
</div>
</div>
<div class="row" t-if="record.workorder_late_count.raw_value &gt; 0">
<div class="col-xs-8">
<div class="col-8">
<a name="%(action_work_orders)d" type="action" context="{'search_default_late': 1}">
Late
</a>
</div>
<div class="col-xs-4 text-right">
<div class="col-4 text-right">
<field name="workorder_late_count"/>
</div>
</div>
<div class="row" t-if="record.oee.raw_value &gt; 0">
<div class="col-xs-6">
<div class="col-6">
<a name="%(mrp_workcenter_productivity_report_oee)d" type="action">
OEE
</a>
</div>
<div class="col-xs-6 text-right">
<div class="col-6 text-right">
<span t-att-class="record.oee_target.raw_value and (record.oee.raw_value &lt; record.oee_target.raw_value) and 'text-danger' or (record.oee.raw_value &gt; record.oee_target.raw_value) and 'text-success' or 'text-warning'">
<strong>
<field name="oee"/>%
@@ -230,7 +230,7 @@
</div>
</div>
<div class="row">
<div class="col-xs-12 o_kanban_primary_left" style="position:absolute; bottom:10px;" name="wc_stages">
<div class="col-12 o_kanban_primary_left" style="position:absolute; bottom:10px;" name="wc_stages">
<a name="%(act_mrp_block_workcenter)d" type="action" class="o_status pull-right"
title="No workorder currently in progress. Click to mark work center as blocked."
aria-label="No workorder currently in progress. Click to mark work center as blocked."
@@ -247,7 +247,7 @@
</div>
</div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
<div class="row">
<div class="col-xs-6 o_kanban_card_manage_section o_kanban_manage_view">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
<div role="menuitem" class="o_kanban_card_manage_title">
<span>Actions</span>
</div>
@@ -255,7 +255,7 @@
<a name="%(action_work_orders)d" type="action">Plan Orders</a>
</div>
</div>
<div class="col-xs-6 o_kanban_card_manage_section o_kanban_manage_new">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
<div role="menuitem" class="o_kanban_card_manage_title">
<span>Reporting</span>
</div>
@@ -274,10 +274,10 @@
</div>
<div t-if="widget.editable" class="o_kanban_card_manage_settings row">
<div role="menuitem" aria-haspopup="true" class="col-xs-8">
<div role="menuitem" aria-haspopup="true" class="col-8">
<ul role="menu" class="oe_kanban_colorpicker" data-field="color"/>
</div>
<div role="menuitem" class="col-xs-4 text-right">
<div role="menuitem" class="col-4 text-right">
<a type="edit">Settings</a>
</div>
</div>
addons/mrp/views/res_config_settings_views.xml
+5 -5
View File
@@ -11,7 +11,7 @@
<div class="app_settings_block" data-string="Manufacturing" string="Manufacturing" data-key="mrp" groups="mrp.group_mrp_manager">
<h2>Operations</h2>
<div class="row mt16 o_settings_container">
<div class="col-md-6 col-xs-12 o_setting_box" id="work_order" title="Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.">
<div class="col-lg-6 col-12 o_setting_box" id="work_order" title="Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.">
<div class="o_setting_left_pane">
<field name="group_mrp_routings" widget="upgrade_boolean"/>
<field name="module_mrp_workorder" invisible="1"/>
@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="col-md-6 col-xs-12 o_setting_box" attrs="{'invisible': [('group_mrp_routings', '=', False)]}" id="quality_control">
<div class="col-lg-6 col-12 o_setting_box" attrs="{'invisible': [('group_mrp_routings', '=', False)]}" id="quality_control">
<div class="o_setting_left_pane">
<field name="module_quality_control" widget="upgrade_boolean"/>
</div>
@@ -47,7 +47,7 @@
</div>
<h2>Products</h2>
<div class="row mt16 o_settings_container">
<div class="col-md-6 col-xs-12 o_setting_box" id="mrp_byproduct" title="Add by-products to bills of materials. This can be used to get several finished products as well. Without this option you only do: A + B = C. With the option: A + B = C + D.">
<div class="col-lg-6 col-12 o_setting_box" id="mrp_byproduct" title="Add by-products to bills of materials. This can be used to get several finished products as well. Without this option you only do: A + B = C. With the option: A + B = C + D.">
<div class="o_setting_left_pane">
<field name="module_mrp_byproduct"/>
</div>
@@ -61,7 +61,7 @@
</div>
<h2>Planning</h2>
<div class="row mt16 o_settings_container">
<div class="col-md-6 col-xs-12 o_setting_box" id="mrp_mps" title="Using a MPS report to schedule your reordering and manufacturing operations is useful if you have long lead time and if you produce based on sales forecasts.">
<div class="col-lg-6 col-12 o_setting_box" id="mrp_mps" title="Using a MPS report to schedule your reordering and manufacturing operations is useful if you have long lead time and if you produce based on sales forecasts.">
<div class="o_setting_left_pane">
<field name="module_mrp_mps" widget="upgrade_boolean"/>
</div>
@@ -73,7 +73,7 @@
<div class="content-group" id="content_mrp_mps"/>
</div>
</div>
<div class="col-md-6 col-xs-12 o_setting_box" id="security_lead_time">
<div class="col-lg-6 col-12 o_setting_box" id="security_lead_time">
<div class="o_setting_left_pane">
<field name="use_manufacturing_lead"/>
</div>
addons/mrp/views/stock_picking_views.xml
+10 -10
View File
@@ -27,29 +27,29 @@
</div>
<div class="container o_kanban_card_content">
<div class="row">
<div class="col-xs-6 o_kanban_primary_left">
<div class="col-6 o_kanban_primary_left">
<button class="btn btn-primary" name="%(mrp_production_action_picking_deshboard)d" type="action" context="{'search_default_todo': 1}">
<span t-if="record.code.raw_value =='mrp_operation'"><t t-esc="record.count_mo_todo.value"/> To Do</span>
</button>
</div>
<div class="col-xs-6 o_kanban_primary_right">
<div class="col-6 o_kanban_primary_right">
<div t-if="record.count_mo_waiting.raw_value > 0" class="row">
<div class="col-xs-9">
<div class="col-9">
<a name="%(mrp_production_action_picking_deshboard)d" type="action" context="{'search_default_waiting': 1}">
Waiting
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<field name="count_mo_waiting"/>
</div>
</div>
<div t-if="record.count_mo_late.raw_value > 0" class="row">
<div class="col-xs-9">
<div class="col-9">
<a class="oe_kanban_stock_picking_type_list" name="%(mrp_production_action_picking_deshboard)d" type="action" context="{'search_default_late': 1}">
Late
</a>
</div>
<div class="col-xs-3">
<div class="col-3">
<field name="count_mo_late"/>
</div>
</div>
@@ -57,7 +57,7 @@
</div>
</div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
<div class="row">
<div class="col-xs-6 o_kanban_card_manage_section o_kanban_manage_view" name="picking_left_manage_pane">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_view" name="picking_left_manage_pane">
<div role="menuitem" class="o_kanban_card_manage_title">
<span>View</span>
</div>
@@ -71,7 +71,7 @@
<a name="%(mrp_production_action_picking_deshboard)d" type="action" context="{'search_default_planned': 1}">Planned</a>
</div>
</div>
<div class="col-xs-6 o_kanban_card_manage_section o_kanban_manage_new">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
<div role="menuitem" class="o_kanban_card_manage_title">
<span>New</span>
</div>
@@ -82,10 +82,10 @@
</div>
<div t-if="widget.editable" class="o_kanban_card_manage_settings row">
<div role="menuitem" aria-haspopup="true" class="col-xs-8">
<div role="menuitem" aria-haspopup="true" class="col-8">
<ul role="menu" class="oe_kanban_colorpicker" data-field="color"/>
</div>
<div role="menuitem" class="col-xs-4 text-right">
<div role="menuitem" class="col-4 text-right">
<a type="edit">Settings</a>
</div>
</div>
addons/pad/views/res_config_settings_views.xml
+2 -2
View File
@@ -8,9 +8,9 @@
<div id="msg_module_pad" position="replace">
<div class="content-group" attrs="{'invisible': [('module_pad','=',False)]}">
<div class="mt16 row">
<label for="pad_server" string="Server" class="col-xs-3 col-md-3 o_light_label"/>
<label for="pad_server" string="Server" class="col-3 col-lg-3 o_light_label"/>
<field name="pad_server" placeholder="e.g. beta.primarypad.com"/>
<label for="pad_key" string="API Key" class="col-xs-3 col-md-3 o_light_label"/>
<label for="pad_key" string="API Key" class="col-3 col-lg-3 o_light_label"/>
<field name="pad_key"/>
</div>
</div>
addons/pad_project/views/res_config_settings_views.xml
+2 -2
View File
@@ -9,11 +9,11 @@
<div class="content-group">
<field name='company_id' invisible="1"/>
<div class="row mt16">
<label for="pad_server" class="col-md-3 o_light_label"/>
<label for="pad_server" class="col-lg-3 o_light_label"/>
<field name="pad_server"/>
</div>
<div class="row">
<label for="pad_key" class="col-md-3 o_light_label"/>
<label for="pad_key" class="col-lg-3 o_light_label"/>
<field name="pad_key"/>
</div>
</div>
addons/payment/views/payment_acquirer_onboarding_templates.xml
+6 -6
View File
@@ -33,7 +33,7 @@
</a>
</div>
<div class="row">
<div class="col-xs-1 mb16">
<div class="col-1 mb16">
<field name="paypal_checked" nolabel="1" />
</div>
<div>
@@ -42,7 +42,7 @@
</div>
<div class="row">
<div attrs="{'invisible': [('paypal_checked', '=', False)]}"
class="col-xs-offset-1">
class="offset-1">
<a href="https://www.paypal.com" target="_blank">PayPal</a>
is the easiest way to accept payments. It's easy to configure and it offers
<a href="https://www.paypal.com/us/webapps/mpp/merchant-fees"
@@ -60,7 +60,7 @@
</div>
</div>
<div class="row">
<div class="col-xs-1 mb16">
<div class="col-1 mb16">
<field name="stripe_checked" nolabel="1" />
</div>
<div>
@@ -69,7 +69,7 @@
</div>
<div class="row">
<div attrs="{'invisible': [('stripe_checked', '=', False)]}"
class="col-xs-offset-1">
class="offset-1">
<a href="https://stripe.com" target="_blank">Stripe</a>
is a payment provider with
<a href="https://stripe.com/pricing" target="_blank">
@@ -90,7 +90,7 @@
</div>
</div>
<div class="row">
<div class="col-xs-1">
<div class="col-1">
<field name="manual_checked" nolabel="1" />
</div>
<div>
@@ -99,7 +99,7 @@
</div>
<div class="row">
<div attrs="{'invisible': [('manual_checked', '=', False)]}"
class="col-xs-offset-1">
class="offset-1">
Provide customers with instructions to pay outside of your platform (wire
transfer, cash on delivery, etc.).
<group>

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