diff options
| author | Kirti Choudhary <kic@odoo.com> | 2017-06-14 14:42:58 +0530 |
|---|---|---|
| committer | Adrien Dieudonne <adr@odoo.com> | 2017-09-05 13:21:58 +0200 |
| commit | 36a2bfb9cfafc1642b65b783f6a63c0dbda11dd0 (patch) | |
| tree | 5219a21da7168d9b8df6e2e5bbfbf604d5960994 | |
| parent | 41e7a1374fcd0165f4c8f003a0d288966f07e9dd (diff) | |
[IMP] *: add and improve kanban views for mobile
This commit improves readability in kanban views.
The default view in mobile is kanban and many of them
needed to be improved.
task-33438
closes 17853
34 files changed, 716 insertions, 161 deletions
diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index 210d1f1d106..0c910e12251 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -318,6 +318,7 @@ <field name="res_model">account.journal</field> <field name="view_type">form</field> <field name="view_mode">kanban,form</field> + <field name="view_id" ref="account_journal_dashboard_kanban_view"/> <field name="usage">menu</field> <field name="context">{'search_default_dashboard':1}</field> <field name="domain">[('belongs_to_company', '=', True)]</field> diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml index e012baa6502..3ad1c3ce6db 100644 --- a/addons/account/views/account_payment_view.xml +++ b/addons/account/views/account_payment_view.xml @@ -61,11 +61,16 @@ </div> </div> <div class="row"> - <div class="col-xs-6"> + <div class="col-xs-12"> <span><field name="partner_id"/></span> </div> + </div> + <div class="row"> + <div class="col-xs-6"> + <field name="amount" widget='monetary'/> + </div> <div class="col-xs-6"> - <span class="pull-right"> + <span class="pull-right label label-default"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'sent': 'success'}}"/> </span> </div> diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index eedd5c95e5c..25c43ed2bb4 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -223,6 +223,29 @@ </tree> </field> </record> + <record id="account_journal_view_kanban" model="ir.ui.view"> + <field name="name">account.journal.kanban</field> + <field name="model">account.journal</field> + <field name="priority">1</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-6"> + <strong><field name="name"/></strong> + </div> + <div class="col-xs-6"> + <span class="pull-right"><field name="type"/></span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> <record id="view_account_journal_search" model="ir.ui.view"> <field name="name">account.journal.search</field> <field name="model">account.journal</field> @@ -339,6 +362,26 @@ </tree> </field> </record> + <record id="account_bank_journal_view_kanban" model="ir.ui.view"> + <field name="name">account.bank.journal.kanban</field> + <field name="model">account.journal</field> + <field name="priority">10</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-12"> + <strong><field name="name"/></strong> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> <record id="view_account_bank_journal_form" model="ir.ui.view"> <field name="name">account.bank.journal.form</field> <field name="model">account.journal</field> @@ -388,6 +431,7 @@ <field name="view_mode">tree,kanban,form</field> <field name="view_ids" eval="[(5, 0, 0), (0, 0, {'view_mode': 'tree', 'view_id': ref('view_account_bank_journal_tree')}), + (0, 0, {'view_mode': 'kanban', 'view_id': ref('account_bank_journal_view_kanban')}), (0, 0, {'view_mode': 'form', 'view_id': ref('view_account_bank_journal_form')})]"/> <field name="domain">[('type', '=', 'bank')]</field> <field name="context">{'default_type': 'bank'}</field> @@ -404,6 +448,10 @@ <field name="res_model">account.journal</field> <field name="view_type">form</field> <field name="view_mode">tree,kanban,form</field> + <field name="view_ids" eval="[(5, 0, 0), + (0, 0, {'view_mode': 'tree', 'view_id': ref('view_account_journal_tree')}), + (0, 0, {'view_mode': 'kanban', 'view_id': ref('account_journal_view_kanban')}), + (0, 0, {'view_mode': 'form', 'view_id': ref('view_account_journal_form')})]"/> <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to add a journal. @@ -1350,9 +1398,15 @@ </div> </div> <div class="row"> - <div class="col-xs-6"> + <div class="col-xs-12"> <span><field name="ref"/></span> </div> + </div> + <div class="row"> + <div class="col-xs-6"> + <span><field name="amount" widget='monetary'/></span> + <span><field name="currency_id" invisible="1"/></span> + </div> <div class="col-xs-6"> <span class="pull-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'posted': 'success'}}"/> @@ -1613,7 +1667,7 @@ <t t-name="kanban-box"> <div t-attf-class="oe_kanban_global_click"> <div><strong><t t-esc="record.name.value"/></strong></div> - <div t-if="record.note.value"><strong>Note: </strong><t t-esc="record.note.value"/></div> + <div t-if="record.note.value"><t t-esc="record.note.value"/></div> </div> </t> </templates> diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml index a0eff16fbfa..179d6f78650 100644 --- a/addons/analytic/views/analytic_account_views.xml +++ b/addons/analytic/views/analytic_account_views.xml @@ -151,8 +151,6 @@ <field name="display_name"/> <field name="tag_ids"/> <field name="balance"/> - <field name="debit"/> - <field name="credit"/> <field name="currency_id"/> <templates> <t t-name="kanban-box"> @@ -162,12 +160,11 @@ </div> <hr class="mt8 mb8"/> <div class="row"> - <div class="col-xs-4 text-center text-success"><strong>Credit</strong></div> - <div class="col-xs-4 text-center text-danger"><strong>Debit</strong></div> - <div class="col-xs-4 text-center"><strong>Balance</strong></div> - <div class="col-xs-4 text-center text-success"><field name="credit" widget="monetary"/></div> - <div class="col-xs-4 text-center text-danger"><field name="debit" widget="monetary"/></div> - <div class="col-xs-4 text-center"><field name="balance" widget="monetary"/></div> + <div class="col-xs-12 text-center"> + <span> + <strong>Balance: <field name="balance" widget="monetary"/></strong> + </span> + </div> </div> </div> </t> diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml index 9b9d8b360b4..26429043e84 100644 --- a/addons/fleet/views/fleet_vehicle_cost_views.xml +++ b/addons/fleet/views/fleet_vehicle_cost_views.xml @@ -14,6 +14,31 @@ </field> </record> + <record id='fleet_vehicle_cost_view_kanban' model='ir.ui.view'> + <field name="name">fleet.vehicle.cost.kanban</field> + <field name="model">fleet.vehicle.cost</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong> + <field name="vehicle_id"/> + <span class="pull-right"><field name="date"/></span> + </strong> + </div> + <div> + <field name="cost_subtype_id"/> + <span class="pull-right"><field name="amount"/></span> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id='fleet_vehicle_cost_view_pivot' model='ir.ui.view'> <field name="name">fleet.vehicle.cost.pivot</field> <field name="model">fleet.vehicle.cost</field> @@ -126,7 +151,7 @@ <field name="name">Vehicle Costs</field> <field name="res_model">fleet.vehicle.cost</field> <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> + <field name="view_mode">tree,kanban,form,graph</field> <field name="context">{"search_default_parent_false" : True, "search_default_groupby_vehicle_id" : True,}</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> @@ -261,6 +286,36 @@ </field> </record> + <record id='fleet_vehicle_log_contract_view_kanban' model='ir.ui.view'> + <field name="name">fleet.vehicle.log.contract.kanban</field> + <field name="model">fleet.vehicle.log.contract</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong> + <field name="vehicle_id"/> + <span class="pull-right label label-default"> + <field name="state"/> + </span> + </strong> + </div> + <div> + <field name="start_date"/> - <field name="expiration_date"/> + </div> + <div> + <field name="insurer_id"/> + <span class="pull-right"><field name="cost_subtype_id"/></span> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="fleet_vehicle_log_contract_view_graph" model="ir.ui.view"> <field name="name">fleet.vehicle.log.contract.graph</field> <field name="model">fleet.vehicle.log.contract</field> @@ -293,7 +348,7 @@ <field name="name">Vehicles Contracts</field> <field name="res_model">fleet.vehicle.log.contract</field> <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> + <field name="view_mode">tree,kanban,form,graph</field> <field name="context">{'search_default_open': 1}</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> @@ -367,6 +422,34 @@ </field> </record> + <record id='fleet_vehicle_log_fuel_view_kanban' model='ir.ui.view'> + <field name="name">fleet.vehicle.log.fuel.kanban</field> + <field name="model">fleet.vehicle.log.fuel</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong> + <field name="vehicle_id"/> + <span class="pull-right"><field name="date"/></span> + </strong> + </div> + <div> + <span><field name="purchaser_id"/></span> + </div> + <div> + <span><field name="liter"/> Liter</span> + <span class="pull-right"><field name="amount"/></span> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id='fleet_vehicle_log_fuel_view_search' model='ir.ui.view'> <field name="name">fleet.vehicle.log.fuel.search</field> <field name="model">fleet.vehicle.log.fuel</field> @@ -399,7 +482,7 @@ <field name="name">Vehicles Fuel Logs</field> <field name="res_model">fleet.vehicle.log.fuel</field> <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> + <field name="view_mode">tree,kanban,form,graph</field> <field name="context">{"search_default_groupby_vehicle" : True}</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> @@ -475,6 +558,37 @@ </field> </record> + <record id='fleet_vehicle_log_services_view_kanban' model='ir.ui.view'> + <field name="name">fleet.vehicle.log.services.kanban</field> + <field name="model">fleet.vehicle.log.services</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong> + <field name="vehicle_id"/> + <span class="pull-right"><field name="date"/></span> + </strong> + </div> + <div> + <field name="cost_subtype_id"/> + </div> + <div> + <field name="purchaser_id"/> + </div> + <div> + <span><field name="vendor_id"/></span> + <span class="pull-right"><field name="amount"/></span> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="fleet_vehicle_log_services_view_graph" model="ir.ui.view"> <field name="name">fleet.vehicle.log.services.graph</field> <field name="model">fleet.vehicle.log.services</field> @@ -502,7 +616,7 @@ <field name="name">Vehicles Services Logs</field> <field name="res_model">fleet.vehicle.log.services</field> <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> + <field name="view_mode">tree,kanban,form,graph</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to create a new service entry. diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml index 34f2e274f20..93fcc220243 100644 --- a/addons/fleet/views/fleet_vehicle_views.xml +++ b/addons/fleet/views/fleet_vehicle_views.xml @@ -275,6 +275,31 @@ </field> </record> + <record id='fleet_vehicle_odometer_view_kanban' model='ir.ui.view'> + <field name="name">fleet.vehicle.odometer.kanban</field> + <field name="model">fleet.vehicle.odometer</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong> + <field name="vehicle_id"/> + <span class="pull-right"><field name="date"/></span> + </strong> + </div> + <div> + <span><field name="driver_id"/></span> + <span class="pull-right"><field name="value"/> Km</span> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id='fleet_vehicle_odometer_view_search' model='ir.ui.view'> <field name="name">fleet.vehicle.odometer.search</field> <field name="model">fleet.vehicle.odometer</field> @@ -306,7 +331,7 @@ <field name="name">Vehicles Odometer</field> <field name="res_model">fleet.vehicle.odometer</field> <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> + <field name="view_mode">tree,kanban,form,graph</field> <field name="context">{"search_default_groupby_vehicle" : True}</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml index 39f46783147..b683726f0dd 100644 --- a/addons/hr/views/hr_views.xml +++ b/addons/hr/views/hr_views.xml @@ -386,6 +386,32 @@ </field> </record> + <record id="hr_job_view_kanban" model="ir.ui.view"> + <field name="name">hr.job.kanban</field> + <field name="model">hr.job</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong><field name="name"/></strong> + </div> + <div> + <span><field name="department_id"/></span> + </div> + <div> + <span>Vacancies : <field name="expected_employees"/></span> + <span class="pull-right label label-default"><field name="state"/> + </span> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="view_job_filter" model="ir.ui.view"> <field name="name">hr.job.search</field> <field name="model">hr.job</field> diff --git a/addons/hr_holidays/views/hr_holidays_views.xml b/addons/hr_holidays/views/hr_holidays_views.xml index 5ae5b14191e..c0a1d500d9e 100644 --- a/addons/hr_holidays/views/hr_holidays_views.xml +++ b/addons/hr_holidays/views/hr_holidays_views.xml @@ -207,21 +207,27 @@ <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_global_click"> - <div> - <span> + <div class="row"> + <div class="col-xs-2"> <img t-att-src="kanban_image('hr.employee', 'image_small', record.employee_id.raw_value)" t-att-title="record.employee_id.value" width="40" height="40" class="oe_kanban_avatar pull-left"/> - </span> - <span> - <div> - <strong><t t-esc="record.employee_id.value"/></strong> + </div> + <div class="col-xs-5"> + <div class="row"> + <div class="col-xs-12"> + <strong><t t-esc="record.employee_id.value"/></strong> + </div> </div> - <div class="text-muted"> - <t t-esc="record.name.value"/> + <div class="row"> + <div class="col-xs-12 o_text_overflow text-mute"> + <t t-esc="record.name.value"/> + </div> </div> - </span> - <span class="pull-right mt8"> - <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'validate': 'success','confirm': 'default', 'cancel': 'danger'}}"/> - </span> + </div> + <div class="col-xs-5"> + <span class="pull-right mt8 label label-default"> + <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'validate': 'success','confirm': 'default', 'cancel': 'danger'}}"/> + </span> + </div> </div> <hr class="mt4 mb4"/> <div t-if="record.date_from.value"> @@ -230,7 +236,7 @@ - <t t-esc="record.date_to.value"/> </div> <div> - <t t-esc="record.number_of_days.value"/> days + <span class="badge"><t t-esc="record.number_of_days.value"/> days</span> </div> </div> </t> @@ -647,6 +653,28 @@ </field> </record> + <record id="hr_holiday_status_view_kanban" model="ir.ui.view"> + <field name="name">hr.holidays.status.kanban</field> + <field name="model">hr.holidays.status</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong><field name="name"/></strong> + </div> + <div> + <span>Max Leaves: <field name="max_leaves"/></span> + <span class="pull-right">Leaves Taken: <field name="leaves_taken"/></span> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="view_holiday_status_normal_tree" model="ir.ui.view"> <field name="name">hr.holidays.status.normal.tree</field> <field name="model">hr.holidays.status</field> @@ -675,7 +703,7 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">hr.holidays.status</field> <field name="view_type">form</field> - <field name="view_mode">tree,form</field> + <field name="view_mode">tree,kanban,form</field> <field name="view_id" eval="view_holiday_status_normal_tree"/> <field name="search_view_id" ref="view_hr_holidays_status_search"/> </record> diff --git a/addons/hr_payroll/views/hr_payslip_views.xml b/addons/hr_payroll/views/hr_payslip_views.xml index 74cc888141c..aa38c543ea5 100644 --- a/addons/hr_payroll/views/hr_payslip_views.xml +++ b/addons/hr_payroll/views/hr_payslip_views.xml @@ -83,6 +83,39 @@ </field> </record> + <record id="hr_payslip_view_kanban" model="ir.ui.view"> + <field name="name">hr.payslip.kanban</field> + <field name="model">hr.payslip</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-6"> + <strong><field name="employee_id"/></strong> + </div> + <div class="col-xs-6"> + <span class="pull-right label label-default"> + <field name="state"/> + </span> + </div> + <div class="col-xs-12"> + <span> + <field name="date_from"/> - <field name="date_to"/> + </span> + </div> + <div class="col-xs-12"> + <span><field name="name"/></span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <act_window name="Payslip Computation Details" context="{'default_slip_id': active_id,'search_default_slip_id': active_id}" res_model="hr.payslip.line" @@ -251,7 +284,7 @@ <field name="name">Employee Payslips</field> <field name="res_model">hr.payslip</field> <field name="view_type">form</field> - <field name="view_id" ref="view_hr_payslip_tree"/> + <field name="view_mode">tree,kanban,form</field> <field name="search_view_id" ref="view_hr_payslip_filter"/> </record> @@ -295,6 +328,39 @@ </field> </record> + <record id="hr_payslip_run_view_kanban" model="ir.ui.view"> + <field name="name">hr.payslip.run.kanban</field> + <field name="model">hr.payslip.run</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-6"> + <strong><field name="name"/></strong> + </div> + <div class="col-xs-6"> + <span class="pull-right label label-default"> + <field name="state"/> + </span> + </div> + <div class="col-xs-12"> + <span> + <field name="date_start"/> - <field name="date_end"/> + </span> + <span class="pull-right" title="Is a Blocking Reason?"> + <field name="credit_note" widget="boolean"/> + </span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="hr_payslip_run_form" model="ir.ui.view"> <field name="name">hr.payslip.run.form</field> <field name="model">hr.payslip.run</field> @@ -329,7 +395,7 @@ <field name="name">Payslips Batches</field> <field name="res_model">hr.payslip.run</field> <field name="view_type">form</field> - <field name="view_id" ref="hr_payslip_run_tree"/> + <field name="view_mode">tree,kanban,form</field> <field name="search_view_id" ref="hr_payslip_run_filter"/> </record> <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_payroll_root"/> diff --git a/addons/hr_payroll/views/hr_salary_rule_views.xml b/addons/hr_payroll/views/hr_salary_rule_views.xml index b69efd1f14f..ebe871119ef 100644 --- a/addons/hr_payroll/views/hr_salary_rule_views.xml +++ b/addons/hr_payroll/views/hr_salary_rule_views.xml @@ -14,6 +14,32 @@ </tree> </field> </record> + + <record id="hr_payroll_structure_view_kanban" model="ir.ui.view"> + <field name="name">hr.payroll.structure.kanban</field> + <field name="model">hr.payroll.structure</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-12"> + <strong><field name="name"/></strong> + </div> + </div> + <div class="row"> + <div class="col-xs-12"> + <span>Code: <field name="code"/></span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="view_hr_payroll_structure_tree" model="ir.ui.view"> <field name="name">hr.payroll.structure.tree</field> <field name="model">hr.payroll.structure</field> @@ -69,7 +95,7 @@ <field name="name">Salary Structures</field> <field name="res_model">hr.payroll.structure</field> <field name="view_type">form</field> - <field name="view_id" ref="view_hr_payroll_structure_list_view"/> + <field name="view_mode">tree,kanban,form</field> </record> <menuitem id="menu_hr_payroll_structure_view" @@ -184,6 +210,25 @@ </tree> </field> </record> + <record id="hr_contribution_register_view_kanban" model="ir.ui.view"> + <field name="name">hr.contribution.register.kanban</field> + <field name="model">hr.contribution.register</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-12"> + <strong><field name="name"/></strong> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> <record id="hr_contribution_register_filter" model="ir.ui.view"> <field name="name">hr.contribution.register.search</field> <field name="model">hr.contribution.register</field> @@ -215,6 +260,7 @@ <field name="name">Contribution Registers</field> <field name="res_model">hr.contribution.register</field> <field name="view_type">form</field> + <field name="view_mode">tree,kanban,form</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to add a new contribution register. @@ -224,7 +270,6 @@ estate or anyone that collect or inject money on payslips. </p> </field> - <field name="view_id" ref="hr_contribution_register_tree"/> </record> <menuitem id="menu_action_hr_contribution_register_form" @@ -249,6 +294,34 @@ </field> </record> + <record id="hr_salary_rule_view_kanban" model="ir.ui.view"> + <field name="name">hr.salary.rule.kanban</field> + <field name="model">hr.salary.rule</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-8"> + <strong><field name="name"/></strong> + </div> + <div class="col-xs-4"> + <span class="pull-right"><field name="category_id"/></span> + </div> + </div> + <div class="row"> + <div class="col-xs-12"> + <span>Code: <field name="code"/></span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="hr_salary_rule_tree" model="ir.ui.view"> <field name="name">hr.salary.rule.tree</field> <field name="model">hr.salary.rule</field> @@ -340,7 +413,7 @@ <field name="name">Salary Rules</field> <field name="res_model">hr.salary.rule</field> <field name="view_type">form</field> - <field name="view_id" ref="hr_salary_rule_list"/> + <field name="view_mode">tree,kanban,form</field> <field name="domain">[('parent_rule_id','=',False)]</field> <field name="search_view_id" ref="view_hr_rule_filter"/> </record> diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml index 03374409c42..0a63565ff56 100644 --- a/addons/hr_recruitment/views/hr_job_views.xml +++ b/addons/hr_recruitment/views/hr_job_views.xml @@ -116,4 +116,24 @@ </kanban> </field> </record> + + <!-- hr related job position menu action --> + <record model="ir.actions.act_window" id="action_hr_job"> + <field name="name">Job Positions</field> + <field name="res_model">hr.job</field> + <field name="view_type">form</field> + <field name="view_mode">kanban,form</field> + <field name="view_id" ref="hr_recruitment.view_hr_job_kanban"/> + <field name="context">{}</field> + <field name="help" type="html"> + <p class="oe_view_nocontent_create"> + Click here to create a new job position. + </p><p> + Once a job position is created, you can track related applications + and manage the recruitment process. + </p> + </field> + </record> + + <menuitem parent="menu_hr_recruitment_root" id="menu_hr_job_position" action="action_hr_job" sequence="1"/> </odoo> diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml index bab63ca0d31..939abf62e56 100644 --- a/addons/hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/hr_recruitment/views/hr_recruitment_views.xml @@ -486,28 +486,15 @@ </record> <!-- hr related job position menu action --> - <record model="ir.actions.act_window" id="action_hr_job"> - <field name="name">Job Positions</field> - <field name="res_model">hr.job</field> - <field name="view_type">form</field> - <field name="view_mode">kanban,form</field> - <field name="context">{}</field> - <field name="help" type="html"> - <p class="oe_view_nocontent_create"> - Click here to create a new job position. - </p><p> - Once a job position is created, you can track related applications - and manage the recruitment process. - </p> - </field> - </record> - - <!-- hr related job position menu action --> <record model="ir.actions.act_window" id="action_hr_job_config"> <field name="name">Job Positions</field> <field name="res_model">hr.job</field> <field name="view_type">form</field> <field name="view_mode">tree,kanban,form</field> + <field name="view_ids" eval="[(5, 0, 0), + (0, 0, {'view_mode': 'tree', 'view_id': ref('hr.view_hr_job_tree')}), + (0, 0, {'view_mode': 'kanban', 'view_id': ref('hr.hr_job_view_kanban')}), + (0, 0, {'view_mode': 'form', 'view_id': ref('hr.view_hr_job_form')})]"/> <field name="context">{'search_default_in_recruitment': 1}</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> @@ -586,7 +573,6 @@ sequence="100"/> <!-- ALL JOBS REQUESTS --> - <menuitem parent="menu_hr_recruitment_root" id="menu_hr_job_position" action="action_hr_job" sequence="1"/> <menuitem parent="menu_hr_recruitment_configuration" id="menu_hr_job_position_config" action="action_hr_job_config" sequence="10"/> <menuitem name="Applications" @@ -660,6 +646,7 @@ </field> </record> + <!-- Stage Kanban View --> <record id="view_hr_recruitment_stage_kanban" model="ir.ui.view"> <field name="name">hr.recruitment.stage.kanban</field> <field name="model">hr.recruitment.stage</field> @@ -671,10 +658,10 @@ <t t-name="kanban-box"> <div t-attf-class="oe_kanban_global_click"> <div> - <field name="name"/> + <strong><field name="name"/></strong> </div> <div> - <strong>Folded in Recruitment Pipe: </strong> + <span>Folded in Recruitment Pipe: </span> <field name="fold" widget="boolean"/> </div> </div> diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml index f0e8ac5a65e..cc47fcc2acf 100644 --- a/addons/lunch/views/lunch_views.xml +++ b/addons/lunch/views/lunch_views.xml @@ -535,6 +535,9 @@ </div> </div> <div> + <t t-esc="record.supplier.value"/> + </div> + <div> <t t-esc="record.description.value"/> </div> </div> diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index da979db5952..d5425e91a6d 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -680,14 +680,30 @@ </tree> </field> </record> + <record id="hr_equipment_stage_view_kanban" model="ir.ui.view"> + <field name="name">equipment.stage.kanban</field> + <field name="model">maintenance.stage</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong><field name="name"/></strong> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> <!-- equipment.stages : actions --> <record id="hr_equipment_stage_action" model="ir.actions.act_window"> <field name="name">Stages</field> <field name="res_model">maintenance.stage</field> - <field name="view_mode">tree</field> + <field name="view_mode">tree,kanban,form</field> <field name="view_type">form</field> - <field name="view_id" ref="hr_equipment_stage_view_tree"/> <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to add a stage in the maintenance request. @@ -728,6 +744,24 @@ </field> </record> + <record id="maintenance_team_view_kanban" model="ir.ui.view"> + <field name="name">maintenance.team.kanban</field> + <field name="model">maintenance.team</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div> + <strong><field name="name"/></strong> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="maintenance_team_kanban" model="ir.ui.view"> <field name="name">maintenance.team.kanban</field> <field name="model">maintenance.team</field> @@ -858,7 +892,10 @@ <field name="name">Teams</field> <field name="res_model">maintenance.team</field> <field name="view_type">form</field> - <field name="view_mode">tree,form</field> + <field name="view_mode">tree,kanban,form</field> + <field name="view_ids" eval="[(5, 0, 0), + (0, 0, {'view_mode': 'tree', 'view_id': ref('maintenance_team_view_tree')}), + (0, 0, {'view_mode': 'kanban', 'view_id': ref('maintenance_team_view_kanban')})]"/> <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to add a team in the maintenance request. @@ -871,6 +908,7 @@ <field name="res_model">maintenance.team</field> <field name="view_mode">kanban,form</field> <field name="view_type">form</field> + <field name="view_id" ref="maintenance_team_kanban"/> <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to add a stage in the maintenance request. diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 3b2e77ec333..b5e6764317d 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -94,9 +94,7 @@ </div> <div class="row"> <div class="col-xs-6"> - <strong> - <t t-esc="record.email.value"/> - </strong> + <t t-esc="record.email.value"/> </div> <div class="col-xs-6"> <t t-esc="record.company_name.value"/> diff --git a/addons/mrp/views/mrp_message_views.xml b/addons/mrp/views/mrp_message_views.xml index 1a4cc84f976..e5b353a81a8 100644 --- a/addons/mrp/views/mrp_message_views.xml +++ b/addons/mrp/views/mrp_message_views.xml @@ -95,18 +95,17 @@ <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_global_click"> - <div t-if="record.name.value"> - <strong><t t-esc="record.name.value"/></strong> + <div t-if="record.product_id.value"> + <strong>Product: <t t-esc="record.product_id.value"/></strong> </div> <hr class="mt4 mb4"/> <div class="row"> - <div class="col-xs-6"> + <div class="col-xs-8"> <div t-if="record.name.value"> - <strong>Product: </strong><t t-esc="record.product_id.value"/> + <t t-esc="record.name.value"/> </div> - <strong>Valid until: </strong><t t-esc="record.valid_until.value"/> </div> - <div class="col-xs-6"> + <div class="col-xs-4"> <img t-att-src="kanban_image('res.users', 'image_small', record.create_uid.raw_value)" t-att-title="record.create_uid.value" width="40" height="40" class="oe_kanban_avatar pull-right"/> </div> </div> @@ -150,4 +149,4 @@ action="mrp_message_action_main" groups="group_mrp_routings" sequence="99"/> -</odoo>
\ No newline at end of file +</odoo> diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index 0fac28477f3..74ce4dc013f 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -45,6 +45,29 @@ </field> </record> + <record id="mrp_workcenter_view_kanban" model="ir.ui.view"> + <field name="name">mrp.workcenter.kanban</field> + <field name="model">mrp.workcenter</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-12"> + <strong><field name="name"/></strong> + </div> + <div class="col-xs-12"> + <span>Code <field name="code"/></span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="oee_pie_view" model="ir.ui.view"> <field name="name">mrp.workcenter.productivity.graph</field> <field name="model">mrp.workcenter.productivity</field> @@ -349,6 +372,10 @@ <field name="view_mode">tree,kanban,form</field> <field name="view_type">form</field> <field name="view_id" ref="mrp_workcenter_tree_view"/> + <field name="view_ids" eval="[(5, 0, 0), + (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp_workcenter_tree_view')}), + (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp_workcenter_view_kanban')}), + (0, 0, {'view_mode': 'form', 'view_id': ref('mrp_workcenter_view')})]"/> <field name="search_view_id" ref="view_mrp_workcenter_search"/> <field name="help" type="html"> <p class="oe_view_nocontent_create"> @@ -367,6 +394,7 @@ <field name="res_model">mrp.workcenter</field> <field name="view_type">form</field> <field name="view_mode">kanban,form</field> + <field name="view_id" ref="mrp_workcenter_kanban"/> <field name="search_view_id" ref="view_mrp_workcenter_search"/> <field name="help" type="html"> <p> @@ -436,13 +464,16 @@ <div t-attf-class="oe_kanban_global_click"> <div> <strong>Reason: </strong><field name="name"/> - <span class="pull-right" title="Is a Blocking Reason?"> - <field name="manual" widget="boolean"/> - </span> </div> <div> <strong>Effectiveness Category: </strong><field name="loss_type"/> </div> + <div> + <strong>Is a Blocking Reason? </strong> + <span class="pull-right" title="Is a Blocking Reason?"> + <field name="manual" widget="boolean"/> + </span> + </div> </div> </t> </templates> diff --git a/addons/mrp_repair/views/mrp_repair_views.xml b/addons/mrp_repair/views/mrp_repair_views.xml index 53cb9e7843a..bbe2ffe63b8 100644 --- a/addons/mrp_repair/views/mrp_repair_views.xml +++ b/addons/mrp_repair/views/mrp_repair_views.xml @@ -207,7 +207,7 @@ <strong><span><t t-esc="record.name.value"/></span></strong> </div> <div class="col-xs-6 text-right"> - <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'info', 'cancel': 'danger', 'done': 'success', 'under_repair': 'dafault'}}"/> + <span class="label label-default"><field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'info', 'cancel': 'danger', 'done': 'success', 'under_repair': 'dafault'}}"/></span> </div> </div> <div class="row"> diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml index 29ab44d606b..afe4913ebe8 100644 --- a/addons/payment/views/payment_views.xml +++ b/addons/payment/views/payment_views.xml @@ -279,6 +279,37 @@ </field> </record> + <record id="transaction_view_kanban" model="ir.ui.view"> + <field name="name">payment.transaction.kanban</field> + <field name="model">payment.transaction</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-6"> + <strong><field name="reference"/></strong> + </div> + <div class="col-xs-6"> + <span class="pull-right"><field name="create_date"/></span> + </div> + <div class="col-xs-6"> + <span><field name="partner_name"/></span> + </div> + <div class="col-xs-6"> + <span class="pull-right"> + <field name="amount" widget="monetary"/> + </span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="transaction" model="ir.ui.view"> <field name="name">payment.transaction.search</field> <field name="model">payment.transaction</field> @@ -296,7 +327,7 @@ <field name="name">Payment Transactions</field> <field name="res_model">payment.transaction</field> <field name='view_type'>form</field> - <field name='view_mode'>tree,form</field> + <field name='view_mode'>tree,kanban,form</field> </record> <menuitem diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml index 8dac1cf74fd..36523315e17 100644 --- a/addons/point_of_sale/views/pos_order_view.xml +++ b/addons/point_of_sale/views/pos_order_view.xml @@ -112,6 +112,8 @@ <field name="amount_total"/> <field name="date_order"/> <field name="state"/> + <field name="pos_reference"/> + <field name="partner_id"/> <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_card oe_kanban_global_click"> @@ -120,12 +122,19 @@ <strong><span><t t-esc="record.user_id.value"/></span></strong> </div> <div class="col-xs-6 pull-right text-right"> - <strong><field name="amount_total"/></strong> + <strong> + <span class="badge"><i class="fa fa-money"/> <field name="amount_total"/></span> + </strong> </div> </div> <div class="row"> + <div class="col-xs-12"> + <span><t t-esc="record.pos_reference.value"/></span> + </div> + </div> + <div class="row"> <div class="col-xs-8 text-muted"> - <span><t t-esc="record.name.value"/> <t t-esc="record.date_order.value"/></span> + <span><t t-esc="record.date_order.value"/></span> </div> <div class="col-xs-4"> <span class="pull-right text-right"> diff --git a/addons/point_of_sale/views/pos_session_view.xml b/addons/point_of_sale/views/pos_session_view.xml index dbfe5424b66..f610fbd683c 100644 --- a/addons/point_of_sale/views/pos_session_view.xml +++ b/addons/point_of_sale/views/pos_session_view.xml @@ -171,7 +171,7 @@ </div> <div class="row"> <div class="col-xs-8"> - <span><strong>Start Date: </strong><field name="start_at" /></span> + <span><field name="start_at" /></span> </div> <div class="col-xs-4"> <span class="pull-right"> diff --git a/addons/procurement/views/procurement_views.xml b/addons/procurement/views/procurement_views.xml index 7d546c05dd2..7f58d95e067 100644 --- a/addons/procurement/views/procurement_views.xml +++ b/addons/procurement/views/procurement_views.xml @@ -47,16 +47,7 @@ </div> <div class="mb4"> <i class="fa fa-pencil-square-o"/> <field name="name"/> - </div> - <div class="row"> - <div class="col-xs-4"> - <strong><span><field name="priority" widget="priority"/></span></strong> - </div> - <div class="col-xs-8"> - <span class="pull-right"> - <i class="fa fa-clock-o"/> <field name="date_planned"/> - </span> - </div> + <span class="pull-right"><field name="product_qty"/></span> </div> </div> </t> diff --git a/addons/product/views/product_pricelist_views.xml b/addons/product/views/product_pricelist_views.xml index f72ad16bba9..12089aa9fae 100644 --- a/addons/product/views/product_pricelist_views.xml +++ b/addons/product/views/product_pricelist_views.xml @@ -112,12 +112,10 @@ <field name="model">product.pricelist</field> <field name="arch" type="xml"> <kanban class="o_kanban_mobile"> - <field name="name"/> - <field name="currency_id"/> <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_global_click"> - <div> + <div id="product_pricelist"> <strong><span><field name="name"/></span></strong> <span class="text-primary pull-right"> <strong><i class="fa fa-money" aria-hidden="true"></i> <field name="currency_id"/></strong> diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 95e1cc953a1..a13c451f44e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -18,7 +18,7 @@ KanbanRecord.include({ * @private */ _openRecord: function () { - if (this.modelName === 'project.project') { + if (this.modelName === 'project.project' && this.$(".o_project_kanban_boxes a").length) { this.$('.o_project_kanban_boxes a').first().click(); } else { this._super.apply(this, arguments); diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 7712c8bc1c7..4ecc31ae062 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -208,6 +208,37 @@ </field> </record> + <record id="project_view_kanban" model="ir.ui.view"> + <field name="name">project.project.kanban</field> + <field name="model">project.project</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <field name="user_id" string="Project Manager"/> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click o_kanban_get_form"> + <div class="row"> + <div class="col-xs-12"> + <strong><field name="name" string="Project Name"/></strong> + </div> + </div> + <div class="row"> + <div class="col-xs-8"> + <field name="partner_id" string="Contact"/> + </div> + <div class="col-xs-4"> + <div class="oe_kanban_bottom_right"> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + </div> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="project_project_view_form_simplified" model="ir.ui.view"> <field name="name">project.project.view.form.simplified</field> <field name="model">project.project</field> @@ -326,6 +357,7 @@ <field name="view_type">form</field> <field name="domain">[]</field> <field name="view_mode">kanban,form</field> + <field name="view_id" ref="view_project_kanban"/> <field name="search_view_id" ref="view_project_project_filter"/> <field name="target">main</field> <field name="help" type="html"> @@ -342,6 +374,9 @@ <field name="view_type">form</field> <field name="domain">[]</field> <field name="view_mode">tree,kanban,form</field> + <field name="view_ids" eval="[(5, 0, 0), + (0, 0, {'view_mode': 'tree', 'view_id': ref('view_project')}), + (0, 0, {'view_mode': 'kanban', 'view_id': ref('project_view_kanban')})]"/> <field name="search_view_id" ref="view_project_project_filter"/> <field name="context">{}</field> <field name="help" type="html"> @@ -775,12 +810,9 @@ <t t-name="kanban-box"> <div t-attf-class="oe_kanban_global_click"> <div class="row"> - <div class="col-xs-6"> + <div class="col-xs-12"> <strong><t t-esc="record.name.value"/></strong> </div> - <div class="col-xs-6" title="Folded in Kanban"> - <field name="fold" widget="boolean"/> - </div> </div> <t t-if="record.description.value"> <hr class="mt8 mb8"/> diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml index c71ff071332..830a825d5d4 100644 --- a/addons/purchase_requisition/views/purchase_requisition_views.xml +++ b/addons/purchase_requisition/views/purchase_requisition_views.xml @@ -27,10 +27,12 @@ <t t-name="kanban-box"> <div t-attf-class="oe_kanban_global_click"> <div class="row"> - <div class="col-xs-6"> + <div class="col-xs-12"> <strong><field name="name"/></strong> </div> - <div class="col-xs-6"> + </div> + <div class="row"> + <div class="col-xs-12"> <field name="exclusive" widget="kanban_label_selection"/> </div> </div> @@ -243,10 +245,15 @@ </div> </div> <div class="row"> - <div class="col-xs-6 text-muted"> + <div class="col-xs-12 text-muted"> <field name="type_id"/> </div> - <div class="col-xs-6"> + </div> + <div class="row"> + <div class="col-xs-8"> + <field name="vendor_id"/> + </div> + <div class="col-xs-4"> <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" width="24" height="24" class="oe_kanban_avatar pull-right"/> </span> diff --git a/addons/report_intrastat/views/report_intrastat_views.xml b/addons/report_intrastat/views/report_intrastat_views.xml index 69c8e186a06..f9c0bc004cb 100644 --- a/addons/report_intrastat/views/report_intrastat_views.xml +++ b/addons/report_intrastat/views/report_intrastat_views.xml @@ -107,23 +107,12 @@ <div class="text-center"> <strong><span><field name="ref"/></span></strong> </div> - <div class="row"> - <div class="col-xs-4 text-center text-success"><strong>Year</strong></div> - <div class="col-xs-4 text-center text-danger"><strong>Month</strong></div> - <div class="col-xs-4 text-center"><strong>Country Code</strong></div> - <div class="col-xs-4 text-center text-success"><field name="name"/></div> - <div class="col-xs-4 text-center text-danger"><field name="month"/></div> - <div class="col-xs-4 text-center"><field name="code"/></div> - </div> <hr class="mt4 mb4"/> <div class="row"> <div class="col-xs-4 text-center"> <field name="value" widget="monetary"/> </div> - <div class="col-xs-4 text-center"> - <field name="supply_units"/> - </div> - <div class="col-xs-4 text-center"> + <div class="col-xs-offset-4 text-center"> <field name="type"/> </div> </div> diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index eafe4222161..7d6396716a5 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -810,6 +810,19 @@ </field> </record> + <record model="ir.ui.view" id="product_pricelist_view_kanban"> + <field name="name">product.pricelist.kanban.inherit.product</field> + <field name="model">product.pricelist</field> + <field name="inherit_id" ref="product.product_pricelist_view_kanban"/> + <field name="arch" type="xml"> + <data> + <xpath expr='//div[contains(@id, "product_pricelist")]' position="after"> + <field name="discount_policy"/> + </xpath> + </data> + </field> + </record> + <!-- search by Salesteams --> <record id="action_orders_salesteams" model="ir.actions.act_window"> <field name="name">Sales Orders</field> diff --git a/addons/sales_team/static/src/js/sales_team.js b/addons/sales_team/static/src/js/sales_team.js deleted file mode 100644 index c92119f0da9..00000000000 --- a/addons/sales_team/static/src/js/sales_team.js +++ /dev/null @@ -1,23 +0,0 @@ -odoo.define('sales_team.update_kanban', function (require) { -"use strict"; - -var KanbanRecord = require('web.KanbanRecord'); - -KanbanRecord.include({ - //-------------------------------------------------------------------------- - // Private - //-------------------------------------------------------------------------- - - /** - * @override - * @private - */ - _openRecord: function () { - if (this.modelName === 'crm.team') { - this.$('.oe_kanban_crm_salesteams_list a').first().click(); - } else { - this._super.apply(this, arguments); - } - }, -}); -}); diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml index 2a854dace0d..fbff36f7052 100644 --- a/addons/sales_team/views/crm_team_views.xml +++ b/addons/sales_team/views/crm_team_views.xml @@ -120,18 +120,27 @@ </field> </record> - <record id="crm_team_act" model="ir.actions.act_window"> - <field name="name">Sales Channels</field> - <field name="res_model">crm.team</field> - <field name="view_type">form</field> - <field name="view_id" ref="crm_team_view_tree"/> - <field name="help" type="html"> - <p class="oe_view_nocontent_create"> - Click here to define a new sales channel. - </p><p> - Use sales channels to organize your sales departments. - Each channel will work with a separate pipeline. - </p> + <!-- Case Teams Kanban View --> + <record id="crm_team_view_kanban" model="ir.ui.view"> + <field name="name">crm.team.kanban</field> + <field name="model">crm.team</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_content oe_kanban_global_click"> + <div class="row"> + <div class="col-xs-6"> + <strong><field name="name"/></strong> + </div> + <div class="col-xs-6"> + <span class="pull-right"><field name="user_id"/></span> + </div> + </div> + </div> + </t> + </templates> + </kanban> </field> </record> @@ -139,7 +148,6 @@ <template id="assets_backend" name="sales_team assets" inherit_id="web.assets_backend"> <xpath expr="." position="inside"> <link rel="stylesheet" href="/sales_team/static/src/less/sales_team_dashboard.less"/> - <script type="text/javascript" src="/sales_team/static/src/js/sales_team.js"></script> </xpath> </template> diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml index ff7f946050d..dbe538aafce 100644 --- a/addons/stock/views/stock_move_views.xml +++ b/addons/stock/views/stock_move_views.xml @@ -93,17 +93,12 @@ </span> </div> </div> - <div class="mb4"> - <field name="product_id"/> - </div> <div class="row"> - <div class="col-xs-4"> - <strong><span><field name="priority" widget="priority"/></span></strong> - </div> <div class="col-xs-8"> - <span class="pull-right"> - <i class="fa fa-clock-o"/> <field name="date"/> - </span> + <field name="product_id"/> + </div> + <div class="col-xs-4"> + <span class="pull-right"><field name="product_uom_qty"/></span> </div> </div> </div> @@ -440,6 +435,42 @@ </field> </record> + <record id="stock_move_view_kanban" model="ir.ui.view"> + <field name="name">stock.move.kanban2</field> + <field name="model">stock.move</field> + <field name="arch" type="xml"> + <kanban class="o_kanban_mobile"> + <templates> + <t t-name="kanban-box"> + <div t-attf-class="oe_kanban_global_click"> + <div class="row mb4"> + <div class="col-xs-8"> + <strong><span><field name="product_id"/></span></strong> + </div> + <div class="col-xs-4"> + <span class="pull-right text-right"> + <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'cancel': 'danger', + 'assigned': 'success', 'confirmed': 'default'}}"/> + </span> + </div> + </div> + <div class="row"> + <div class="col-xs-4"> + <strong><span><field name="priority" widget="priority"/></span></strong> + </div> + <div class="col-xs-8"> + <span class="pull-right"> + <i class="fa fa-clock-o"/> <field name="date"/> + </span> + </div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <!-- test --> <record id="view_move_tree_receipt_picking_board" model="ir.ui.view"> <field name="name">stock.move.tree3</field> @@ -501,7 +532,9 @@ <field name="view_type">form</field> <field name="view_mode">tree,kanban,form</field> <field name="domain" eval="[('picking_id.picking_type_id.code','=','incoming'), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')]"/> - <field name="view_id" ref="view_move_tree_receipt_picking"/> + <field name="view_ids" eval="[(5, 0, 0), + (0, 0, {'view_mode': 'tree', 'view_id': ref('view_move_tree_receipt_picking')}), + (0, 0, {'view_mode': 'kanban', 'view_id': ref('stock_move_view_kanban')})]"/> <field name="context">{'product_receive': True, 'search_default_future': True}</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml index 71ee16040b4..c54ba3bfa6b 100644 --- a/addons/website_event_track/views/event_track_views.xml +++ b/addons/website_event_track/views/event_track_views.xml @@ -417,9 +417,6 @@ <div t-attf-class="oe_kanban_global_click"> <div> <strong><field name="name"/></strong> - <span class="pull-right" title="Folded or not?"> - <field name="fold" widget="boolean"/> - </span> </div> </div> </t> diff --git a/odoo/addons/base/res/res_currency_view.xml b/odoo/addons/base/res/res_currency_view.xml index db0459dd45a..9e9cd6bfbd8 100644 --- a/odoo/addons/base/res/res_currency_view.xml +++ b/odoo/addons/base/res/res_currency_view.xml @@ -112,6 +112,12 @@ <span class="badge"><t t-esc="record.symbol.value"/></span> </div> </div> + <div class="row"> + <div class="col-xs-12"> + <strong><span>Current Rate: </span></strong> + <field name="rate"/> + </div> + </div> </div> </t> </templates> diff --git a/odoo/addons/base/res/res_users_view.xml b/odoo/addons/base/res/res_users_view.xml index d2795da23b7..172f03e6ecf 100644 --- a/odoo/addons/base/res/res_users_view.xml +++ b/odoo/addons/base/res/res_users_view.xml @@ -258,7 +258,6 @@ </li> <li class="badge pull-right mb4" t-if="record.lang.raw_value"><field name="lang"/></li> <li class="mb4" t-if="record.login.raw_value"><i class="fa fa-envelope"/> <field name="login"/></li> - <li t-if="record.login_date.raw_value" title="Latest connection"><i class="fa fa-calendar"/> <field name="login_date"/></li> </ul> </div> </div> |