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

[IMP] project,_timesheet_holidays: improve source terms

Browse Source 
closes odoo/odoo#35227

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
This commit is contained in:
Yenthe666
2019-07-30 11:37:07 +00:00
committed by Martin Trigaux
parent f247475cdd
commit faec20239c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/static/src/js/project_task_kanban_examples.js
+2 -2
View File
@@ -67,12 +67,12 @@ kanbanExamplesRegistry.add('project', {
}, {
name: _t('Research Project'),
columns: [_t('Brainstorm'), _t('Research'), _t('Draft'), _t('Final Document')],
description: escFormat(_t('Handle your idea gahtering within Tasks of your new Project and discuss them in the chatter of the tasks. Use the %s and %s to signalize what is the current status of your Idea'), greenBullet, redBullet),
description: escFormat(_t('Handle your idea gathering within Tasks of your new Project and discuss them in the chatter of the tasks. Use the %s and %s to signalize what is the current status of your Idea'), greenBullet, redBullet),
bullets: [greenBullet, redBullet],
}, {
name: _t('Website Redesign'),
columns: [_t('Page Ideas'), _t('Copywriting'), _t('Design'), _t('Live')],
description: escFormat(_t('Handle your idea gahtering within Tasks of your new Project and discuss them in the chatter of the tasks. Use the %s and %s to signalize what is the current status of your Idea'), greenBullet, redBullet),
description: escFormat(_t('Handle your idea gathering within Tasks of your new Project and discuss them in the chatter of the tasks. Use the %s and %s to signalize what is the current status of your Idea'), greenBullet, redBullet),
}, {
name: _t('T-shirt Printing'),
columns: [_t('New Orders'), _t('Logo Design'), _t('To Print'), _t('Done')],
addons/project_timesheet_holidays/models/hr_holidays.py
+3 -3
View File
@@ -45,9 +45,9 @@ class HolidaysType(models.Model):
for holiday_status in self:
if holiday_status.timesheet_generate:
if not holiday_status.timesheet_project_id or not holiday_status.timesheet_task_id:
raise ValidationError(_('Both the internal project and task are required to\
generate timesheet for the time of. If you don\'t want timesheet, you must let\
empty internal project and task.'))
raise ValidationError(_("Both the internal project and task are required to "
"generate a timesheet for the time off. If you don't want a timesheet, you should "
"leave the internal project and task empty."))
class Holidays(models.Model):