summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorAymane (ayt) <ayt@odoo.com>2020-08-10 09:41:05 +0000
committerAurélien Warnon <awa@odoo.com>2020-08-14 13:32:01 +0000
commit62bda18d1ab7474d71fbbe532eaecff82cf9b055 (patch)
treeca8ea7a83ff963ff83ccfa4b1c9e73622667d7bc /addons
parent7cf8f6f40e5769d2f22620ac425208c4ad9ae80b (diff)
[IMP] crm,website_crm_partner_assign: small view improvements
This commit adds a few minor improvements to crm views: - Add the crm.team currency on opportunity amounts on the crm.team kanban view - Slightly reorganize "My Activities" view for increased usability - Remove the "alias_user_id" field in the crm.team form view because it's a related technical field that is not supposed to be modified there. Task #2314894 closes odoo/odoo#55940 Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com> Co-authored-by: Aurélien Warnon <awa@odoo.com>
Diffstat (limited to 'addons')
-rw-r--r--addons/crm/models/crm_team.py4
-rw-r--r--addons/crm/views/crm_lead_views.xml6
-rw-r--r--addons/crm/views/crm_team_views.xml5
-rw-r--r--addons/website_crm_partner_assign/views/crm_lead_views.xml2
4 files changed, 8 insertions, 9 deletions
diff --git a/addons/crm/models/crm_team.py b/addons/crm/models/crm_team.py
index 5d0b8267d43..850349dc79a 100644
--- a/addons/crm/models/crm_team.py
+++ b/addons/crm/models/crm_team.py
@@ -26,11 +26,11 @@ class Team(models.Model):
help="Number of leads and opportunities assigned this last month.")
opportunities_count = fields.Integer(
string='# Opportunities', compute='_compute_opportunities_data')
- opportunities_amount = fields.Integer(
+ opportunities_amount = fields.Monetary(
string='Opportunities Revenues', compute='_compute_opportunities_data')
opportunities_overdue_count = fields.Integer(
string='# Overdue Opportunities', compute='_compute_opportunities_overdue_data')
- opportunities_overdue_amount = fields.Integer(
+ opportunities_overdue_amount = fields.Monetary(
string='Overdue Opportunities Revenues', compute='_compute_opportunities_overdue_data',)
# alias: improve fields coming from _inherits, use inherited to avoid replacing them
alias_user_id = fields.Many2one(
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index be059c80d52..cdc95c11ada 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -330,13 +330,13 @@
<field name="partner_name" optional="hide"/>
<field name="email_from" optional="show"/>
<field name="phone" optional="show" class="o_force_ltr"/>
+ <field name="company_id" groups="base.group_multi_company" optional="show"/>
<field name="city" optional="show"/>
<field name="state_id" optional="hide"/>
<field name="country_id" optional="show"/>
<field name="partner_id" invisible="1"/>
<field name="user_id" optional="show" widget="many2one_avatar_user"/>
<field name="team_id" optional="show"/>
- <field name="company_id" groups="base.group_multi_company" optional="show"/>
<field name="active" invisible="1"/>
<field name="probability" invisible="1"/>
<field name="campaign_id" optional="hide"/>
@@ -394,7 +394,7 @@
</field>
</record>
- <record id="crm_case_calendar_view_leads" model="ir.ui.view">
+ <record id="crm_case_calendar_view_leads" model="ir.ui.view">
<field name="name">crm.lead.calendar.lead</field>
<field name="model">crm.lead</field>
<field name="priority" eval="2"/>
@@ -655,6 +655,7 @@
<field name="contact_name" optional="show"/>
<field name="email_from"/>
<field name="phone" class="o_force_ltr"/>
+ <field name="company_id" groups="base.group_multi_company" optional="show"/>
<field name="city" optional="hide"/>
<field name="state_id" optional="hide"/>
<field name="country_id" optional="hide"/>
@@ -675,7 +676,6 @@
<field name="stage_id" optional="show" decoration-bf="1"/>
<field name="active" invisible="1"/>
<field name="probability" optional="hide"/>
- <field name="company_id" groups="base.group_multi_company" optional="show"/>
<field name="tag_ids" optional="hide" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="referred" invisible="1"/>
<field name="message_needaction" invisible="1"/>
diff --git a/addons/crm/views/crm_team_views.xml b/addons/crm/views/crm_team_views.xml
index 3102f0028a6..7eb900bca17 100644
--- a/addons/crm/views/crm_team_views.xml
+++ b/addons/crm/views/crm_team_views.xml
@@ -135,7 +135,6 @@
<field name="alias_contact"
string="Accept Emails From"
attrs="{'invisible': [('use_leads', '=', False), ('use_opportunities', '=', False)]}"/>
- <field name="alias_user_id" string="Assign to"/>
</xpath>
</field>
</record>
@@ -215,7 +214,7 @@
</a>
</div>
<div class="col-4 text-right text-truncate">
- <field name="opportunities_amount" widget="monetary"/>
+ <field name="opportunities_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</div>
</div>
<div class="row" t-if="record.opportunities_overdue_count.raw_value">
@@ -227,7 +226,7 @@
</a>
</div>
<div class="col-4 text-right text-truncate">
- <field name="opportunities_overdue_amount" widget="monetary"/>
+ <field name="opportunities_overdue_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</div>
</div>
</xpath>
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index 6d3ffd77853..89a564c0985 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -38,7 +38,7 @@
<field name="inherit_id" ref="crm.crm_case_tree_view_oppor"/>
<field name="arch" type="xml">
<field name="priority" position="after">
- <field name="partner_assigned_id" optional="show"/>
+ <field name="partner_assigned_id" optional="hide"/>
<field name="date_partner_assign" invisible="1"/>
</field>
</field>