From 2d3117593b7bbaceebaac481702a5c2c8f251c8f Mon Sep 17 00:00:00 2001 From: Javier Iniesta Date: Fri, 21 Aug 2015 11:01:20 +0200 Subject: [PATCH 01/34] [ADD] crm_timesheet --- crm_timesheet/README.rst | 84 ++++++++++++++++ crm_timesheet/__init__.py | 4 + crm_timesheet/__openerp__.py | 21 ++++ crm_timesheet/i18n/crm_timesheet.pot | 95 ++++++++++++++++++ crm_timesheet/i18n/es.po | 95 ++++++++++++++++++ crm_timesheet/models/__init__.py | 6 ++ crm_timesheet/models/crm_lead.py | 13 +++ crm_timesheet/models/crm_phonecall.py | 89 ++++++++++++++++ crm_timesheet/models/hr_analytic_timesheet.py | 13 +++ crm_timesheet/static/description/icon.png | Bin 0 -> 9455 bytes crm_timesheet/tests/__init__.py | 4 + crm_timesheet/tests/base.py | 37 +++++++ crm_timesheet/tests/test_crm_phonecall.py | 78 ++++++++++++++ crm_timesheet/views/crm_lead_view.xml | 41 ++++++++ crm_timesheet/views/crm_phonecall_view.xml | 59 +++++++++++ .../views/hr_analytic_timesheet_view.xml | 18 ++++ 16 files changed, 657 insertions(+) create mode 100644 crm_timesheet/README.rst create mode 100644 crm_timesheet/__init__.py create mode 100644 crm_timesheet/__openerp__.py create mode 100644 crm_timesheet/i18n/crm_timesheet.pot create mode 100644 crm_timesheet/i18n/es.po create mode 100644 crm_timesheet/models/__init__.py create mode 100644 crm_timesheet/models/crm_lead.py create mode 100644 crm_timesheet/models/crm_phonecall.py create mode 100644 crm_timesheet/models/hr_analytic_timesheet.py create mode 100644 crm_timesheet/static/description/icon.png create mode 100644 crm_timesheet/tests/__init__.py create mode 100644 crm_timesheet/tests/base.py create mode 100644 crm_timesheet/tests/test_crm_phonecall.py create mode 100644 crm_timesheet/views/crm_lead_view.xml create mode 100644 crm_timesheet/views/crm_phonecall_view.xml create mode 100644 crm_timesheet/views/hr_analytic_timesheet_view.xml diff --git a/crm_timesheet/README.rst b/crm_timesheet/README.rst new file mode 100644 index 0000000000..24cd4c97d0 --- /dev/null +++ b/crm_timesheet/README.rst @@ -0,0 +1,84 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============= +CRM Timesheet +============= + +This module allows to generate timesheets from leads/opportunities and phone +calls. + + +Usage +===== + +* In lead/opportunity forms you have Timesheet tab. +* In phone calls tree, you can add an analytic account, and if the call has + any duration, a timesheet activity will be created. +* You can choose how to input time: (1) set time you dedicated to call after + finishing it OR (2) create & save call with time set in 00:00 and Stop the + timer when call ends, this will set exactly the time you spent. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/117/8.0 + + +Known issues / Roadmap +====================== + +* crm.phonecall::write() method has to be wrapped by api.one and this could + affect performance when writing lot of records at the same time. + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + + +License +======= + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published +by the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + + +Credits +======= + +Contributors +------------ + +* Antonio Espinosa +* Rafael Blasco +* Javier Iniesta + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. \ No newline at end of file diff --git a/crm_timesheet/__init__.py b/crm_timesheet/__init__.py new file mode 100644 index 0000000000..30772dc1e8 --- /dev/null +++ b/crm_timesheet/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from . import models diff --git a/crm_timesheet/__openerp__.py b/crm_timesheet/__openerp__.py new file mode 100644 index 0000000000..42daa57044 --- /dev/null +++ b/crm_timesheet/__openerp__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +{ + 'name': "CRM Timesheet", + 'category': 'Customer Relationship Management', + 'version': '8.0.1.0.0', + 'depends': [ + 'crm', + 'hr_timesheet' + ], + 'data': [ + 'views/crm_lead_view.xml', + 'views/crm_phonecall_view.xml', + 'views/hr_analytic_timesheet_view.xml' + ], + 'author': 'Antiun Ingeniería S.L.,Odoo Community Association (OCA)', + 'website': 'http://www.antiun.com', + 'license': 'AGPL-3', + 'installable': True, +} diff --git a/crm_timesheet/i18n/crm_timesheet.pot b/crm_timesheet/i18n/crm_timesheet.pot new file mode 100644 index 0000000000..bbc1fb9af0 --- /dev/null +++ b/crm_timesheet/i18n/crm_timesheet.pot @@ -0,0 +1,95 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_timesheet +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-31 10:18+0000\n" +"PO-Revision-Date: 2015-08-31 10:18+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: crm_timesheet +#: field:crm.lead,analytic_account_id:0 +#: field:crm.phonecall,analytic_account_id:0 +msgid "Analytic account" +msgstr "" + +#. module: crm_timesheet +#: code:addons/crm_timesheet/models/crm_phonecall.py:49 +#, python-format +msgid "Date field must be filled." +msgstr "" + +#. module: crm_timesheet +#: code:addons/crm_timesheet/models/crm_phonecall.py:86 +#, python-format +msgid "End date must be datetime." +msgstr "" + +#. module: crm_timesheet +#: view:crm.lead:crm_timesheet.crm_case_form_view_leads +msgid "Extra Info" +msgstr "" + +#. module: crm_timesheet +#: view:crm.lead:crm_timesheet.crm_case_form_view_oppor +msgid "Lead" +msgstr "" + +#. module: crm_timesheet +#: field:hr.analytic.timesheet,lead_id:0 +#: model:ir.model,name:crm_timesheet.model_crm_lead +msgid "Lead/Opportunity" +msgstr "" + +#. module: crm_timesheet +#: field:hr.analytic.timesheet,phonecall_id:0 +msgid "Phone Call" +msgstr "" + +#. module: crm_timesheet +#: model:ir.model,name:crm_timesheet.model_crm_phonecall +msgid "Phonecall" +msgstr "" + +#. module: crm_timesheet +#: code:addons/crm_timesheet/models/crm_phonecall.py:84 +#, python-format +msgid "Start date must be datetime." +msgstr "" + +#. module: crm_timesheet +#: view:crm.phonecall:crm_timesheet.crm_case_inbound_phone_tree_view +msgid "Stop" +msgstr "" + +#. module: crm_timesheet +#: view:crm.lead:crm_timesheet.crm_case_form_view_leads +#: view:crm.lead:crm_timesheet.crm_case_form_view_oppor +#: view:crm.phonecall:crm_timesheet.crm_case_phone_form_view +msgid "Timesheet" +msgstr "" + +#. module: crm_timesheet +#: model:ir.model,name:crm_timesheet.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "" + +#. module: crm_timesheet +#: field:crm.lead,timesheet_ids:0 +#: field:crm.phonecall,timesheet_ids:0 +msgid "Timesheets" +msgstr "" + +#. module: crm_timesheet +#: view:crm.phonecall:crm_timesheet.crm_case_inbound_phone_tree_view +msgid "{'required': [('analytic_account_id', '!=', False)]}" +msgstr "" + diff --git a/crm_timesheet/i18n/es.po b/crm_timesheet/i18n/es.po new file mode 100644 index 0000000000..eb740b0058 --- /dev/null +++ b/crm_timesheet/i18n/es.po @@ -0,0 +1,95 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_timesheet +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-31 10:18+0000\n" +"PO-Revision-Date: 2015-08-31 10:18+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: crm_timesheet +#: field:crm.lead,analytic_account_id:0 +#: field:crm.phonecall,analytic_account_id:0 +msgid "Analytic account" +msgstr "Cuenta analítica" + +#. module: crm_timesheet +#: code:addons/crm_timesheet/models/crm_phonecall.py:49 +#, python-format +msgid "Date field must be filled." +msgstr "El campo Fecha debe estar relleno." + +#. module: crm_timesheet +#: code:addons/crm_timesheet/models/crm_phonecall.py:86 +#, python-format +msgid "End date must be datetime." +msgstr "La fecha final debe ser un datetime." + +#. module: crm_timesheet +#: view:crm.lead:crm_timesheet.crm_case_form_view_leads +msgid "Extra Info" +msgstr "Información extra" + +#. module: crm_timesheet +#: view:crm.lead:crm_timesheet.crm_case_form_view_oppor +msgid "Lead" +msgstr "Iniciativa" + +#. module: crm_timesheet +#: field:hr.analytic.timesheet,lead_id:0 +#: model:ir.model,name:crm_timesheet.model_crm_lead +msgid "Lead/Opportunity" +msgstr "Iniciativa/Oportunidad" + +#. module: crm_timesheet +#: field:hr.analytic.timesheet,phonecall_id:0 +msgid "Phone Call" +msgstr "Llamada telefónica" + +#. module: crm_timesheet +#: model:ir.model,name:crm_timesheet.model_crm_phonecall +msgid "Phonecall" +msgstr "Llamada telefónica" + +#. module: crm_timesheet +#: code:addons/crm_timesheet/models/crm_phonecall.py:84 +#, python-format +msgid "Start date must be datetime." +msgstr "la fecha inicial debe ser un datetime." + +#. module: crm_timesheet +#: view:crm.phonecall:crm_timesheet.crm_case_inbound_phone_tree_view +msgid "Stop" +msgstr "Parar" + +#. module: crm_timesheet +#: view:crm.lead:crm_timesheet.crm_case_form_view_leads +#: view:crm.lead:crm_timesheet.crm_case_form_view_oppor +#: view:crm.phonecall:crm_timesheet.crm_case_phone_form_view +msgid "Timesheet" +msgstr "Parte de horas" + +#. module: crm_timesheet +#: model:ir.model,name:crm_timesheet.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "Línea del parte de horas" + +#. module: crm_timesheet +#: field:crm.lead,timesheet_ids:0 +#: field:crm.phonecall,timesheet_ids:0 +msgid "Timesheets" +msgstr "Partes de horas" + +#. module: crm_timesheet +#: view:crm.phonecall:crm_timesheet.crm_case_inbound_phone_tree_view +msgid "{'required': [('analytic_account_id', '!=', False)]}" +msgstr "" + diff --git a/crm_timesheet/models/__init__.py b/crm_timesheet/models/__init__.py new file mode 100644 index 0000000000..72c273d656 --- /dev/null +++ b/crm_timesheet/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from . import crm_lead +from . import hr_analytic_timesheet +from . import crm_phonecall diff --git a/crm_timesheet/models/crm_lead.py b/crm_timesheet/models/crm_lead.py new file mode 100644 index 0000000000..00e38f9297 --- /dev/null +++ b/crm_timesheet/models/crm_lead.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from openerp import models, fields + + +class CrmLead(models.Model): + _inherit = 'crm.lead' + + analytic_account_id = fields.Many2one( + comodel_name='account.analytic.account') + timesheet_ids = fields.One2many(comodel_name='hr.analytic.timesheet', + inverse_name='lead_id') diff --git a/crm_timesheet/models/crm_phonecall.py b/crm_timesheet/models/crm_phonecall.py new file mode 100644 index 0000000000..93014a8d8a --- /dev/null +++ b/crm_timesheet/models/crm_phonecall.py @@ -0,0 +1,89 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from openerp import models, fields, api, _ +from openerp.fields import DATE_LENGTH +from datetime import datetime +from openerp.exceptions import ValidationError + + +class CrmPhonecall(models.Model): + _inherit = 'crm.phonecall' + + analytic_account_id = fields.Many2one( + comodel_name='account.analytic.account') + timesheet_ids = fields.One2many(comodel_name='hr.analytic.timesheet', + inverse_name='phonecall_id') + + def _timesheet_prepare(self, vals): + """ + param: vals + type: dict + desc: crm.phonecall vals dict (It's like create and write methods) + """ + if len(self) > 0: + self.ensure_one() + date = vals.get('date', self.date) + if not date: + raise ValidationError(_('Date field must be filled.')) + user_id = vals.get('user_id', self.user_id.id) + account_id = vals.get('analytic_account_id', + self.analytic_account_id.id) + unit_amount = vals.get('duration', self.duration) + res = { + 'date': date[:DATE_LENGTH], + 'user_id': user_id, + 'name': vals.get('name', self.name), + 'account_id': account_id, + 'unit_amount': unit_amount / 60.0, + 'code': 'phone', + 'journal_id': self.env[ + 'hr.analytic.timesheet']._getAnalyticJournal() + } + return res + + @api.model + def create(self, vals): + if vals.get('analytic_account_id') and vals.get('duration', 0) > 0: + timesheet_data = self._timesheet_prepare(vals) + vals['timesheet_ids'] = vals.get('timesheet_ids', []) + vals['timesheet_ids'].append((0, 0, timesheet_data)) + res = super(CrmPhonecall, self).create(vals) + return res + + @api.one + def write(self, vals): + timesheet = self.env['hr.analytic.timesheet'].search([ + ('code', '=', 'phone'), ('phonecall_id', '=', self.id)]) + analytic_account_id = vals.get('analytic_account_id', + self.analytic_account_id) + duration = vals.get('duration', 0) + if timesheet: + if ('analytic_account_id' in vals and + not vals['analytic_account_id']): + vals['timesheet_ids'] = [(2, timesheet.id, 0)] + else: + vals['timesheet_ids'] = [(1, timesheet.id, + self._timesheet_prepare(vals))] + elif analytic_account_id and duration > 0: + vals['timesheet_ids'] = [(0, 0, self._timesheet_prepare(vals))] + res = super(CrmPhonecall, self).write(vals) + return res + + @api.multi + def button_end_call(self): + end_date = datetime.now() + for call in self: + if call.date: + start_date = fields.Datetime.from_string(call.date) + call.duration = self._end_call(start_date, end_date) + return True + + def _end_call(self, start_dt, end_dt): + if not isinstance(start_dt, datetime): + raise ValidationError(_('Start date must be datetime.')) + if not isinstance(end_dt, datetime): + raise ValidationError(_('End date must be datetime.')) + if end_dt < start_dt: + return 0 + return (end_dt - start_dt).total_seconds() / 60.0 diff --git a/crm_timesheet/models/hr_analytic_timesheet.py b/crm_timesheet/models/hr_analytic_timesheet.py new file mode 100644 index 0000000000..2101041306 --- /dev/null +++ b/crm_timesheet/models/hr_analytic_timesheet.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from openerp import models, fields + + +class HrAnalyticTimesheet(models.Model): + _inherit = 'hr.analytic.timesheet' + + lead_id = fields.Many2one(string='Lead/Opportunity', + comodel_name='crm.lead') + phonecall_id = fields.Many2one(string='Phone Call', + comodel_name='crm.phonecall') diff --git a/crm_timesheet/static/description/icon.png b/crm_timesheet/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/crm_timesheet/tests/__init__.py b/crm_timesheet/tests/__init__.py new file mode 100644 index 0000000000..f053c6da2b --- /dev/null +++ b/crm_timesheet/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from . import test_crm_phonecall diff --git a/crm_timesheet/tests/base.py b/crm_timesheet/tests/base.py new file mode 100644 index 0000000000..ba9febb961 --- /dev/null +++ b/crm_timesheet/tests/base.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from openerp.tests.common import TransactionCase +from openerp.fields import DATE_LENGTH + + +class BaseCase(TransactionCase): + def setUp(self): + super(BaseCase, self).setUp() + m_data = self.registry("ir.model.data") + self.company_id = m_data.get_object_reference( + self.cr, self.uid, "base", "main_company")[1] + self.company = self.env['res.company'].browse(self.company_id) + m_account = self.env['account.analytic.account'] + m_partner = self.env['res.partner'] + self.analytic_account = m_account.create({ + 'name': 'Cuenta prueba', 'type': 'normal', 'use_timesheets': True}) + self.partner = m_partner.create({ + 'name': 'Partner prueba'}) + self.analytic_account2 = m_account.create({ + 'name': 'Cuenta prueba 2', 'type': 'normal', + 'use_timesheets': True}) + self.partner2 = m_partner.create({ + 'name': 'Partner prueba 2'}) + + def phonecall_create(self, vals): + self.original = self.env["crm.phonecall"].create(vals) + return self.original + + def check_phonecall_timesheet_asserts(self, phonecall, timesheet): + self.assertEqual(phonecall.date[:DATE_LENGTH], timesheet.date) + self.assertEqual(phonecall.user_id, timesheet.user_id) + self.assertEqual(phonecall.name, timesheet.name) + self.assertEqual(phonecall.analytic_account_id, timesheet.account_id) + self.assertAlmostEqual(phonecall.duration / 60.0, + timesheet.unit_amount, places=1) diff --git a/crm_timesheet/tests/test_crm_phonecall.py b/crm_timesheet/tests/test_crm_phonecall.py new file mode 100644 index 0000000000..301cd0c00b --- /dev/null +++ b/crm_timesheet/tests/test_crm_phonecall.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- +# See README.rst file on addon root folder for license details + +from . import base +import datetime +from openerp.exceptions import ValidationError + + +class CrmPhonecallCase(base.BaseCase): + + def test_end_call(self): + warning_cases = ( + (False, datetime.datetime(2015, 8, 25, 12, 30)), + (datetime.datetime(2015, 8, 25, 12, 30), False), + (False, False) + ) + with self.assertRaises(ValidationError): + for start_dt, end_dt in warning_cases: + self.env["crm.phonecall"]._end_call(start_dt, end_dt) + cases = ( + (datetime.datetime(2015, 8, 21, 12, 30), + datetime.datetime(2015, 8, 21, 12, 45), 15.0), + (datetime.datetime(2015, 7, 1, 11), + datetime.datetime(2015, 7, 1, 10, 55), 0.0) + ) + for start_dt, end_dt, expected_duration in cases: + duration = self.env["crm.phonecall"]._end_call(start_dt, end_dt) + self.assertAlmostEqual(duration, expected_duration, places=0) + + def test_button_end_call(self): + date_10 = datetime.datetime.now() - datetime.timedelta(minutes=10) + date_15 = datetime.datetime.now() + datetime.timedelta(minutes=15) + cases = ( + (date_10, 'name01', 10.0), + (date_15, 'name02', 0.0) + ) + for date, name, expected_duration in cases: + phonecall = self.phonecall_create({'date': date, 'name': name}) + phonecall.button_end_call() + self.assertAlmostEqual(phonecall.duration, expected_duration, + places=0) + + def test_phonecall_create_write(self): + create_cases = ( + {'date': '2015-08-21 10:15:00', + 'duration': 15, + 'name': 'test_01', + 'analytic_account_id': self.analytic_account.id, + 'partner_id': self.partner.id, + 'user_id': self.uid}, + {'date': '2015-08-21 10:15:00', + 'duration': 30, + 'name': 'test_02', + 'analytic_account_id': self.analytic_account.id, + 'partner_id': self.partner.id, + 'user_id': self.uid} + ) + write_cases = ( + {'date': '2015-08-20 11:20:00'}, + {'duration': 20}, + {'partner_id': self.partner2.id}, + {'analytic_account_id': self.analytic_account2.id}, + {'duration': 0}, + {'duration': -20}, + {'partner_id': False} + ) + for create_vals in create_cases: + phonecall = self.phonecall_create(create_vals) + self.check_phonecall_timesheet_asserts( + phonecall, phonecall.timesheet_ids[0]) + for write_vals in write_cases: + phonecall.write(write_vals) + self.check_phonecall_timesheet_asserts( + phonecall, phonecall.timesheet_ids[0]) + with self.assertRaises(ValidationError): + phonecall.write({'date': False}) + phonecall.write({'analytic_account_id': False}) + self.assertFalse(phonecall.timesheet_ids) diff --git a/crm_timesheet/views/crm_lead_view.xml b/crm_timesheet/views/crm_lead_view.xml new file mode 100644 index 0000000000..c680e887b9 --- /dev/null +++ b/crm_timesheet/views/crm_lead_view.xml @@ -0,0 +1,41 @@ + + + + + + CRM - Leads with timesheets + crm.lead + + + + + + + + + + + + + + + CRM - Opportunities with timesheets + crm.lead + + + + + + + + + + + + + + diff --git a/crm_timesheet/views/crm_phonecall_view.xml b/crm_timesheet/views/crm_phonecall_view.xml new file mode 100644 index 0000000000..ba7fbe6b37 --- /dev/null +++ b/crm_timesheet/views/crm_phonecall_view.xml @@ -0,0 +1,59 @@ + + + + + + CRM - Phone Calls with analytic account tree + crm.phonecall + + + + +