summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorVictor Feyens <vfe@odoo.com>2020-01-28 12:48:01 +0000
committerVictor Feyens <vfe@odoo.com>2020-01-28 12:57:13 +0000
commit6f1c6a504a2e2849adb6f05c903158d7de18ea4c (patch)
tree9a3393a8523653589d9fb55e4e48ba183b8e3fe7 /addons
parent44c3a6ef8dfaacb0b347d9efd28651162de139ca (diff)
[FIX] sale: Sales Team Amount & targets
closes odoo/odoo#44103 Signed-off-by: Damien Bouvy (dbo) <dbo@odoo.com>
Diffstat (limited to 'addons')
-rw-r--r--addons/sale/models/sales_team.py6
-rw-r--r--addons/sale/views/sales_team_views.xml2
-rw-r--r--addons/sales_team/views/crm_team_views.xml1
3 files changed, 5 insertions, 4 deletions
diff --git a/addons/sale/models/sales_team.py b/addons/sale/models/sales_team.py
index 9f2d58adde1..8affae2f3cb 100644
--- a/addons/sale/models/sales_team.py
+++ b/addons/sale/models/sales_team.py
@@ -10,19 +10,19 @@ class CrmTeam(models.Model):
_inherit = 'crm.team'
use_quotations = fields.Boolean(string='Quotations', help="Check this box if you send quotations to your customers rather than confirming orders straight away.")
- invoiced = fields.Integer(
+ invoiced = fields.Float(
compute='_compute_invoiced',
string='Invoiced This Month', readonly=True,
help="Invoice revenue for the current month. This is the amount the sales "
"channel has invoiced this month. It is used to compute the progression ratio "
"of the current and target revenue on the kanban view.")
- invoiced_target = fields.Integer(
+ invoiced_target = fields.Float(
string='Invoicing Target',
help="Revenue target for the current month (untaxed total of confirmed invoices).")
quotations_count = fields.Integer(
compute='_compute_quotations_to_invoice',
string='Number of quotations to invoice', readonly=True)
- quotations_amount = fields.Integer(
+ quotations_amount = fields.Float(
compute='_compute_quotations_to_invoice',
string='Amount of quotations to invoice', readonly=True)
sales_to_invoice_count = fields.Integer(
diff --git a/addons/sale/views/sales_team_views.xml b/addons/sale/views/sales_team_views.xml
index 1d4406bde40..2f010d4bcab 100644
--- a/addons/sale/views/sales_team_views.xml
+++ b/addons/sale/views/sales_team_views.xml
@@ -12,7 +12,7 @@
</div>
</xpath>
<xpath expr="//field[@name='user_id']" position="after">
- <field name="invoiced_target"/>
+ <field name="invoiced_target" widget="monetary"/>
</xpath>
</field>
</record>
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index 96aebf3cb2b..008a40f7d0c 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -73,6 +73,7 @@
<field name="active" invisible="1"/>
<field name="user_id" domain="[('share', '=', False)]"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
+ <field name="currency_id" invisible="1"/>
</group>
<group name="right">
</group>