[IMP] sales_team,calendar: improve wording for calendar.alarm

- sales_team: Rename Next actions into Next activities on CRM dashboard.

- calendar: In meetings, reminder config, display 2 fields "Unit" and "Amount" inline with the string "Remind Before".
This commit is contained in:
Kinjal Mehta
2016-11-04 16:21:04 +01:00
committed by Yannick Tivisse
parent 62c4b0356b
commit b50ec6afe3
3 changed files with 7 additions and 4 deletions
+1 -1
View File
@@ -452,7 +452,7 @@ class Alarm(models.Model):
name = fields.Char('Name', required=True)
type = fields.Selection([('notification', 'Notification'), ('email', 'Email')], 'Type', required=True, default='email')
duration = fields.Integer('Amount', required=True, default=1)
duration = fields.Integer('Remind Before', required=True, default=1)
interval = fields.Selection(list(_interval_selection.iteritems()), 'Unit', required=True, default='hours')
duration_minutes = fields.Integer('Duration in minutes', compute='_compute_duration_minutes', store=True, help="Duration in minutes")
+5 -2
View File
@@ -44,8 +44,11 @@
<field name="type" groups="base.group_no_one"/>
</group>
<group>
<field name="interval"/>
<field name="duration"/>
<label for="duration"/>
<div>
<field name="duration" class="oe_inline"/>
<field name="interval" class="oe_inline ml8"/>
</div>
</group>
</group>
</form>
@@ -36,7 +36,7 @@
7
</t>
</span> <br/>
Next Actions
Next Activities
</a>
</td>
<td class="o_main" title="My Pipeline" rowspan="2">