Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] hr_timesheet_usability: En lineas de analitica inicializar los … #122

Open
wants to merge 1 commit into
base: 12.0
Choose a base branch
from
Open

[IMP] hr_timesheet_usability: En lineas de analitica inicializar los … #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hr_timesheet_usability/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "Hr Timesheet Usability",
'version': '12.0.1.0.0',
'version': '12.0.1.1.0',
"author": "Avanzosc",
"website": "http://www.avanzosc.es",
"category": "Project",
Expand Down
21 changes: 20 additions & 1 deletion hr_timesheet_usability/models/account_analytic_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2021 Berezi - AvanzOSC
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import models, api
from odoo import models, api, fields
from datetime import datetime
import pytz
from datetime import timedelta
Expand All @@ -9,6 +9,25 @@
class AccountAnalyticLine(models.Model):
_inherit = 'account.analytic.line'

def default_times(self):
timezone = pytz.timezone(self._context.get('tz') or 'UTC')
date = fields.Datetime.now()
date = date.replace(tzinfo=pytz.timezone(
'UTC')).astimezone(timezone)
hours = int(date.strftime("%H"))
minutes = int(date.strftime("%M"))
return round(hours + minutes/60, 14)

def default_employee_id(self):
employee_obj = self.env['hr.employee']
cond = [('user_id', '=', self.env.user.id)]
employee = employee_obj.search(cond, limit=1)
return employee if employee else employee_obj

time_start = fields.Float(default=default_times)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

time_start y time_stop ya los crea hr_timesheet_activity_begin_end entonces, deberían estar aquí de nuevo? Es porque se les asigna aquí un default que no tienen en el otro lado?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Muy buenos días @anajuaristi , efectivamente, en el módulo origen los crea, pero no les da ningún valor por defecto, esto hacé que cuando se muestra el formulario o el tree con estos campos, aparezcan vacios.
Con la modificación que yo he hecho al módulo "hr_timesheet_usability" les defino un default para que les de un valor por defecto.
Un saludo.

time_stop = fields.Float(default=default_times)
employee_id = fields.Many2one(default=default_employee_id)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

En analitica NO SIEMPRE hay que informar el empleado.


@api.multi
def action_button_end(self):
self.ensure_one()
Expand Down