diff -Nru tryton-modules-timesheet-cost-5.0.3/CHANGELOG tryton-modules-timesheet-cost-6.0.0/CHANGELOG --- tryton-modules-timesheet-cost-5.0.3/CHANGELOG 2020-04-04 16:07:13.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/CHANGELOG 2021-05-03 13:46:33.000000000 +0000 @@ -1,10 +1,17 @@ -Version 5.0.3 - 2020-04-04 +Version 6.0.0 - 2021-05-03 * Bug fixes (see mercurial logs for details) -Version 5.0.2 - 2019-04-22 +Version 5.8.0 - 2020-11-02 * Bug fixes (see mercurial logs for details) +* Remove support for Python 3.5 -Version 5.0.1 - 2019-02-19 +Version 5.6.0 - 2020-05-04 +* Bug fixes (see mercurial logs for details) + +Version 5.4.0 - 2019-11-04 +* Bug fixes (see mercurial logs for details) + +Version 5.2.0 - 2019-05-06 * Bug fixes (see mercurial logs for details) Version 5.0.0 - 2018-10-01 diff -Nru tryton-modules-timesheet-cost-5.0.3/company.py tryton-modules-timesheet-cost-6.0.0/company.py --- tryton-modules-timesheet-cost-5.0.3/company.py 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/company.py 2020-03-01 11:49:51.000000000 +0000 @@ -7,7 +7,7 @@ from trytond.pool import Pool, PoolMeta from trytond.config import config -__all__ = ['Employee', 'EmployeeCostPrice', 'price_digits'] +__all__ = ['price_digits'] price_digits = (16, config.getint( 'timesheet_cost', 'price_decimal', default=4)) @@ -17,9 +17,9 @@ __name__ = 'company.employee' cost_price = fields.Function(fields.Numeric('Cost Price', digits=price_digits, - help="Hourly cost price for this Employee"), 'get_cost_price') + help="Hourly cost price for this Employee."), 'get_cost_price') cost_prices = fields.One2Many('company.employee_cost_price', 'employee', - 'Cost Prices', help="List of hourly cost price over time") + 'Cost Prices', help="List of hourly cost price over time.") _cost_prices_cache = Cache('company_employee.cost_prices') def get_cost_price(self, name): @@ -73,7 +73,7 @@ __name__ = 'company.employee_cost_price' date = fields.Date('Date', required=True, select=True) cost_price = fields.Numeric('Cost Price', - digits=price_digits, required=True, help="Hourly cost price") + digits=price_digits, required=True, help="Hourly cost price.") employee = fields.Many2One('company.employee', 'Employee') @classmethod @@ -83,7 +83,7 @@ cls._sql_constraints = [ ('employee_date_cost_price_uniq', Unique(t, t.employee, t.date, t.cost_price), - 'A employee can only have one cost price by date.'), + 'timesheet_cost.msg_employee_unique_cost_price_date'), ] cls._order.insert(0, ('date', 'DESC')) diff -Nru tryton-modules-timesheet-cost-5.0.3/company.xml tryton-modules-timesheet-cost-6.0.0/company.xml --- tryton-modules-timesheet-cost-5.0.3/company.xml 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/company.xml 2019-12-05 21:37:26.000000000 +0000 @@ -32,7 +32,7 @@ - + @@ -49,7 +49,7 @@ id="model_field_access_employee_cost_price_admin"> - + diff -Nru tryton-modules-timesheet-cost-5.0.3/COPYRIGHT tryton-modules-timesheet-cost-6.0.0/COPYRIGHT --- tryton-modules-timesheet-cost-5.0.3/COPYRIGHT 2020-04-04 16:07:12.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/COPYRIGHT 2021-05-03 13:46:33.000000000 +0000 @@ -1,5 +1,5 @@ -Copyright (C) 2008-2020 Cédric Krier. -Copyright (C) 2008-2020 B2CK SPRL. +Copyright (C) 2008-2021 Cédric Krier. +Copyright (C) 2008-2021 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru tryton-modules-timesheet-cost-5.0.3/debian/changelog tryton-modules-timesheet-cost-6.0.0/debian/changelog --- tryton-modules-timesheet-cost-5.0.3/debian/changelog 2020-04-05 09:17:50.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/debian/changelog 2021-11-12 20:53:26.000000000 +0000 @@ -1,3 +1,32 @@ +tryton-modules-timesheet-cost (6.0.0-2) unstable; urgency=medium + + * Use debhelper-compat (=13). + * Depend on the tryton-server-api of the same major version. + + -- Mathias Behrle Fri, 12 Nov 2021 21:53:26 +0100 + +tryton-modules-timesheet-cost (6.0.0-1) unstable; urgency=medium + + * Update year of debian copyright. + * Bump the Standards-Version to 4.6.0, no changes needed. + * Set the watch file version to 4. + * Setting the branch in the watch file to the fixed version 6.0. + * Merging upstream version 6.0.0. + * Use same debhelper compat as for server and client. + + -- Mathias Behrle Tue, 19 Oct 2021 12:13:43 +0200 + +tryton-modules-timesheet-cost (5.0.4-1) unstable; urgency=medium + + * Update year of debian copyright. + * Bump the Standards-Version to 4.5.0, no changes needed. + * Add Rules-Requires-Root: no to d/control. + * Updating to standards version 4.5.1, no changes needed. + * Merging upstream version 5.0.4. + * Updating copyright file. + + -- Mathias Behrle Tue, 29 Jun 2021 11:49:36 +0200 + tryton-modules-timesheet-cost (5.0.3-1) unstable; urgency=medium * Merging upstream version 5.0.3. diff -Nru tryton-modules-timesheet-cost-5.0.3/debian/compat tryton-modules-timesheet-cost-6.0.0/debian/compat --- tryton-modules-timesheet-cost-5.0.3/debian/compat 2020-04-05 09:17:49.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru tryton-modules-timesheet-cost-5.0.3/debian/control tryton-modules-timesheet-cost-6.0.0/debian/control --- tryton-modules-timesheet-cost-5.0.3/debian/control 2020-04-05 09:17:49.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/debian/control 2021-11-12 20:29:39.000000000 +0000 @@ -3,18 +3,20 @@ Uploaders: Mathias Behrle Section: python Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper-compat (= 13), dh-python, python3, python3-setuptools -Standards-Version: 4.4.0 +Standards-Version: 4.6.0 +Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/tryton-team/tryton-modules-timesheet-cost Vcs-Git: https://salsa.debian.org/tryton-team/tryton-modules-timesheet-cost.git Homepage: http://www.tryton.org/ Package: tryton-modules-timesheet-cost Architecture: all -Depends: python3-pkg-resources, +Depends: ${API}, + python3-pkg-resources, python3-sql, tryton-modules-company (>= ${version:major}), tryton-modules-party (>= ${version:major}), diff -Nru tryton-modules-timesheet-cost-5.0.3/debian/copyright tryton-modules-timesheet-cost-6.0.0/debian/copyright --- tryton-modules-timesheet-cost-5.0.3/debian/copyright 2020-04-05 09:17:49.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/debian/copyright 2021-10-20 10:01:43.000000000 +0000 @@ -1,12 +1,12 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * -Copyright: 2008-2020 Cédric Krier - 2008-2020 B2CK SPRL +Copyright: 2008-2021 Cédric Krier + 2008-2021 B2CK SPRL License: GPL-3+ Files: debian/* -Copyright: 2013-2019 Mathias Behrle +Copyright: 2013-2021 Mathias Behrle License: GPL-3+ License: GPL-3+ diff -Nru tryton-modules-timesheet-cost-5.0.3/debian/rules tryton-modules-timesheet-cost-6.0.0/debian/rules --- tryton-modules-timesheet-cost-5.0.3/debian/rules 2020-04-05 09:17:49.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/debian/rules 2021-11-12 20:31:49.000000000 +0000 @@ -14,4 +14,4 @@ dh $@ --with python3 --buildsystem=pybuild override_dh_gencontrol: - dh_gencontrol -- -Vversion:major="$(MAJOR)" + dh_gencontrol -- -Vversion:major="$(MAJOR)" -VAPI="tryton-server-api-$(MAJOR)" diff -Nru tryton-modules-timesheet-cost-5.0.3/debian/watch tryton-modules-timesheet-cost-6.0.0/debian/watch --- tryton-modules-timesheet-cost-5.0.3/debian/watch 2020-04-05 09:17:49.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/debian/watch 2021-10-20 10:01:43.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/5.0/ .*trytond_timesheet_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +version=4 +opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/6.0/ .*trytond_timesheet_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) diff -Nru tryton-modules-timesheet-cost-5.0.3/doc/index.rst tryton-modules-timesheet-cost-6.0.0/doc/index.rst --- tryton-modules-timesheet-cost-5.0.3/doc/index.rst 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/doc/index.rst 2019-06-04 16:49:46.000000000 +0000 @@ -0,0 +1,4 @@ +Timesheet Cost Module +##################### + +The timesheet cost module adds cost price per employee. diff -Nru tryton-modules-timesheet-cost-5.0.3/.drone.yml tryton-modules-timesheet-cost-6.0.0/.drone.yml --- tryton-modules-timesheet-cost-5.0.3/.drone.yml 2020-03-01 15:46:10.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/.drone.yml 2020-12-19 16:09:34.000000000 +0000 @@ -1,6 +1,10 @@ clone: hg: image: plugins/hg + environment: + - HG_SHARE_POOL=/root/.cache/hg + volumes: + - cache:/root/.cache pipeline: tox: @@ -8,37 +12,36 @@ environment: - CFLAGS=-O0 - DB_CACHE=/cache - - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE + - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/ commands: + - echo "[extensions]" >> /root/.hgrc + - echo "hgext.share =" >> /root/.hgrc + - echo "[share]" >> /root/.hgrc + - echo "pool = /root/.cache/hg" >> /root/.hgrc - pip install tox - tox -e "${TOXENV}-${DATABASE}" volumes: - cache:/root/.cache + check_dist: + image: ${IMAGE} + commands: + - pip install twine + - python setup.py sdist + - twine check dist/* services: postgresql: image: postgres environment: - POSTGRES_HOST_AUTH_METHOD=trust + command: "-c fsync=off -c synchronous_commit=off -c full_page_writes=off" when: matrix: DATABASE: postgresql matrix: include: - - IMAGE: python:3.4 - TOXENV: py34 - DATABASE: sqlite - - IMAGE: python:3.4 - TOXENV: py34 - DATABASE: postgresql - - IMAGE: python:3.5 - TOXENV: py35 - DATABASE: sqlite - - IMAGE: python:3.5 - TOXENV: py35 - DATABASE: postgresql - IMAGE: python:3.6 TOXENV: py36 DATABASE: sqlite @@ -51,3 +54,15 @@ - IMAGE: python:3.7 TOXENV: py37 DATABASE: postgresql + - IMAGE: python:3.8 + TOXENV: py38 + DATABASE: sqlite + - IMAGE: python:3.8 + TOXENV: py38 + DATABASE: postgresql + - IMAGE: python:3.9 + TOXENV: py39 + DATABASE: sqlite + - IMAGE: python:3.9 + TOXENV: py39 + DATABASE: postgresql diff -Nru tryton-modules-timesheet-cost-5.0.3/.flake8 tryton-modules-timesheet-cost-6.0.0/.flake8 --- tryton-modules-timesheet-cost-5.0.3/.flake8 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/.flake8 2020-10-16 17:15:34.000000000 +0000 @@ -0,0 +1,2 @@ +[flake8] +ignore=E123,E124,E126,E128,E741,W503 diff -Nru tryton-modules-timesheet-cost-5.0.3/.hgtags tryton-modules-timesheet-cost-6.0.0/.hgtags --- tryton-modules-timesheet-cost-5.0.3/.hgtags 2020-04-04 16:07:13.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/.hgtags 2021-05-03 13:46:34.000000000 +0000 @@ -9,6 +9,8 @@ 486b4928c849a93beb92d3bdfecfc8f622a38956 4.6.0 03ded560c597cabf1a3e7df1fb586ecde33c1529 4.8.0 7fcc5447286ed6be08252a52014a229fb21e706b 5.0.0 -bc2f670e0c46f5cf2182291f5f212dd80efa00a0 5.0.1 -de17e64e7fb6633c96c351405907de080c356a4b 5.0.2 -68490b31ee8c36aeb7208b496017e57641ec3d10 5.0.3 +25dfcaa29bcd9d57cdf019b3cae55b6226c355f6 5.2.0 +d4b86ad1ba39b874c39da9a5a007690489f4e15f 5.4.0 +f55c3c6bdd16d4b2ce85c8d691e9cafa71ce3d1f 5.6.0 +74c459fcf1a4a1237e25c4e3a63adbed65a7d1a8 5.8.0 +71a5bc1d16dc5b2b613ab21d94116f74d3b99320 6.0.0 diff -Nru tryton-modules-timesheet-cost-5.0.3/__init__.py tryton-modules-timesheet-cost-6.0.0/__init__.py --- tryton-modules-timesheet-cost-5.0.3/__init__.py 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/__init__.py 2020-03-01 11:49:51.000000000 +0000 @@ -2,13 +2,13 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from .company import * -from .timesheet import * +from . import company +from . import timesheet def register(): Pool.register( - Employee, - EmployeeCostPrice, - TimesheetLine, + company.Employee, + company.EmployeeCostPrice, + timesheet.Line, module='timesheet_cost', type_='model') diff -Nru tryton-modules-timesheet-cost-5.0.3/INSTALL tryton-modules-timesheet-cost-6.0.0/INSTALL --- tryton-modules-timesheet-cost-5.0.3/INSTALL 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/INSTALL 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Installing trytond_timesheet_cost -================================= - -Prerequisites -------------- - - * Python 3.4 or later (http://www.python.org/) - * python-sql 0.4 or later (http://pypi.python.org/pypi/python-sql) - * trytond (http://www.tryton.org/) - * trytond_timesheet (http://www.tryton.org/) - * trytond_party (http://www.tryton.org/) - * trytond_company (http://www.tryton.org/) - -Installation ------------- - -Once you've downloaded and unpacked the trytond_timesheet_cost source release, enter the -directory where the archive was unpacked, and run: - - python setup.py install - -Note that you may need administrator/root privileges for this step, as -this command will by default attempt to install module to the Python -site-packages directory on your system. - -For advanced options, please refer to the easy_install and/or the distutils -documentation: - - http://setuptools.readthedocs.io/en/latest/easy_install.html - http://docs.python.org/inst/inst.html - -To use without installation, extract the archive into ``trytond/modules`` with -the directory name timesheet_cost. diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/bg.po tryton-modules-timesheet-cost-6.0.0/locale/bg.po --- tryton-modules-timesheet-cost-5.0.3/locale/bg.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/bg.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Фабрична цена" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Фабрична цена" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Създадено на" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Създадено от" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "Дата" @@ -34,46 +22,33 @@ msgid "Employee" msgstr "Служител" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Променено на" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Променено от" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Фабрична цена" +#, fuzzy msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "Себестойност за час за този служител" +#, fuzzy msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "Списък на себестойност за час през времето" +#, fuzzy msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "Себестойност за час" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Себестойност на клиент" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + msgctxt "view:company.employee:" msgid "Cost" msgstr "Разход" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Себестойност" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/ca.po tryton-modules-timesheet-cost-6.0.0/locale/ca.po --- tryton-modules-timesheet-cost-5.0.3/locale/ca.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/ca.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "Un empleat només pot tenir un preu de cost per data." - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Preu de cost" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Preu de cost" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Data de creació" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Usuari de creació" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "Data" @@ -34,46 +22,30 @@ msgid "Employee" msgstr "Empleat" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "Nom del registre" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Data de modificació" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Usuari de modificació" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Preu de cost" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "Preu de cost per hora per a aquest empleat." msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "Llista de preus de cost per hora a través del temps." msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "Preu de cost per hora." msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Preu de cost de l'empleat" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Un empleat només pot tenir un preu de cost per data." + msgctxt "view:company.employee:" msgid "Cost" msgstr "Cost" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Preus de cost" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/cs.po tryton-modules-timesheet-cost-6.0.0/locale/cs.po --- tryton-modules-timesheet-cost-5.0.3/locale/cs.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/cs.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "" @@ -34,42 +22,30 @@ msgid "Employee" msgstr "" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "" msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "" msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + msgctxt "view:company.employee:" msgid "Cost" msgstr "" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/de.po tryton-modules-timesheet-cost-6.0.0/locale/de.po --- tryton-modules-timesheet-cost-5.0.3/locale/de.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/de.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,31 +2,17 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" -"Es kann nur ein Kostenpreis pro Datum für einen Mitarbeiter eingetragen " -"werden." - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" -msgstr "Kostenpreis" +msgstr "Einstandspreis" msgctxt "field:company.employee,cost_prices:" msgid "Cost Prices" -msgstr "Kostenpreise" +msgstr "Einstandspreise" msgctxt "field:company.employee_cost_price,cost_price:" msgid "Cost Price" -msgstr "Kostenpreis" - -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Erstellungsdatum" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Erstellt durch" +msgstr "Einstandspreis" msgctxt "field:company.employee_cost_price,date:" msgid "Date" @@ -36,46 +22,32 @@ msgid "Employee" msgstr "Mitarbeiter" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "Bezeichnung des Datensatzes" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Zuletzt geändert" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Letzte Änderung durch" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" -msgstr "Kostenpreis" +msgstr "Einstandspreis" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "Kostenpreis pro Stunde für diesen Mitarbeiter" +msgid "Hourly cost price for this Employee." +msgstr "Einstandspreis pro Stunde für diesen Mitarbeiter." msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "Liste der Kostenpreise pro Stunde über die Zeit" +msgid "List of hourly cost price over time." +msgstr "Entwicklung des Einstandspreises pro Stunde." msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" -msgstr "Kostenpreis pro Stunde" +msgid "Hourly cost price." +msgstr "Einstandspreis pro Stunde." msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" -msgstr "Mitarbeiter Kostenpreis" +msgstr "Mitarbeiter Einstandspreis" + +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" +"Es kann nur ein Einstandspreis pro Datum für einen Mitarbeiter eingetragen " +"werden." msgctxt "view:company.employee:" msgid "Cost" msgstr "Kosten" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Kostenpreise" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/es_419.po tryton-modules-timesheet-cost-6.0.0/locale/es_419.po --- tryton-modules-timesheet-cost-5.0.3/locale/es_419.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/es_419.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Precio de costo" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Precio de costo" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Creado por usuario" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "" @@ -34,42 +22,33 @@ msgid "Employee" msgstr "" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Modificado por usuario" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Precio de costo" +#, fuzzy msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "Precio de costo por hora para este empleado" +#, fuzzy msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "Lista de precio de costo por hora de tiempo extra" +#, fuzzy msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "Precio de costo por hora" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Precio de costo del empleado" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + msgctxt "view:company.employee:" msgid "Cost" msgstr "Costo" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/es.po tryton-modules-timesheet-cost-6.0.0/locale/es.po --- tryton-modules-timesheet-cost-5.0.3/locale/es.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/es.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "Un empleado sólo puede disponer de un precio de coste por fecha." - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Precio de coste" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Precio de coste" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Fecha de creación" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Usuario de creación" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "Fecha" @@ -34,46 +22,30 @@ msgid "Employee" msgstr "Empleado" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "Nombre del registro" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Fecha de modificación" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Usuario de modificación" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Precio de coste" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "Precio de coste por hora para este empleado." msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "Lista de precio de coste por hora a lo largo del tiempo." +msgid "List of hourly cost price over time." +msgstr "Lista de precios de coste por hora a lo largo del tiempo." msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "Precio de coste por hora." msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Precio de coste del empleado" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Un empleado sólo puede tener un precio de coste por fecha." + msgctxt "view:company.employee:" msgid "Cost" msgstr "Coste" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Precios de coste" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/et.po tryton-modules-timesheet-cost-6.0.0/locale/et.po --- tryton-modules-timesheet-cost-5.0.3/locale/et.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/et.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,54 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "Ostuhind" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "Ostuhinnad" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "Ostuhind" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "Kuupäev" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "Töötaja" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "Ostuhind" + +#, fuzzy +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "Töötaja tunnitasu" + +#, fuzzy +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "Tunnitasu ületunni hind" + +#, fuzzy +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "Tunnitasu" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "Töötaja tasu" + +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Töötajal saab olla ainult üks tasu kuupäeva kohta" + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "Kulu" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/fa.po tryton-modules-timesheet-cost-6.0.0/locale/fa.po --- tryton-modules-timesheet-cost-5.0.3/locale/fa.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/fa.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "در هر تاریخ ،یک کارمند تنها می تواند یک مبلغ هزینه داشته باشد." - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "مبلغ هزینه" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "مبلغ هزینه" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "تاریخ ایجاد" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "کاربر ایجاد کننده" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "تاریخ" @@ -34,42 +22,33 @@ msgid "Employee" msgstr "کارمند" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "شناسه" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "نام پرونده" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "تاریخ نوشته" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "نوشته کاربر" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "مبلغ هزینه" +#, fuzzy msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "مبلغ هزینه ساعتی برای این کارمند" +#, fuzzy msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "لیست مبلغ هزینه ساعتی اضافه کار" +#, fuzzy msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "مبلغ هزینه ساعتی" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "مبلغ هزینه کارمند" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "در هر تاریخ ،یک کارمند تنها می تواند یک مبلغ هزینه داشته باشد." + msgctxt "view:company.employee:" msgid "Cost" msgstr "هزینه" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/fi.po tryton-modules-timesheet-cost-6.0.0/locale/fi.po --- tryton-modules-timesheet-cost-5.0.3/locale/fi.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/fi.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,51 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "" + +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "" + +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "" + +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "" + +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/fr.po tryton-modules-timesheet-cost-6.0.0/locale/fr.po --- tryton-modules-timesheet-cost-5.0.3/locale/fr.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/fr.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "Un employé ne peut avoir qu'un seul prix de revient par date." - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Prix de revient" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Prix de revient" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Date de création" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Créé par" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "Date" @@ -34,46 +22,30 @@ msgid "Employee" msgstr "Employé" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "Nom de l'enregistrement" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Date de mise à jour" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Mis à jour par" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Prix de revient" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "Prix de revient horaire de cet employé" +msgid "Hourly cost price for this Employee." +msgstr "Prix de revient horaire de cet employé." msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "Liste du prix de revient horaire au cours du temps" +msgid "List of hourly cost price over time." +msgstr "Liste du prix de revient horaire au cours du temps." msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" -msgstr "Prix de revient horaire" +msgid "Hourly cost price." +msgstr "Prix de revient horaire." msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Prix de revient de l'employé" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Un employé ne peut avoir qu'un seul prix de revient par date." + msgctxt "view:company.employee:" msgid "Cost" msgstr "Coût" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Prix de revient" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/hu_HU.po tryton-modules-timesheet-cost-6.0.0/locale/hu_HU.po --- tryton-modules-timesheet-cost-5.0.3/locale/hu_HU.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/hu_HU.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -# -msgid "" -msgstr "Content-Type: text/plain; charset=utf-8\n" - -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "Egy alkalmazottnak dátumonként egy költség írható be." - -msgctxt "field:company.employee,cost_price:" -msgid "Cost Price" -msgstr "Költség" - -msgctxt "field:company.employee,cost_prices:" -msgid "Cost Prices" -msgstr "Költség" - -msgctxt "field:company.employee_cost_price,cost_price:" -msgid "Cost Price" -msgstr "Költség" - -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Létrehozás dátuma" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Által létrehozva" - -msgctxt "field:company.employee_cost_price,date:" -msgid "Date" -msgstr "Dátum" - -msgctxt "field:company.employee_cost_price,employee:" -msgid "Employee" -msgstr "Alkalmazott" - -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Módosítás dátuma" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Által módosítva" - -msgctxt "field:timesheet.line,cost_price:" -msgid "Cost Price" -msgstr "Költség" - -msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "Alkalmazott költsége per óra " - -msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "Lista a költség per óráról" - -msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" -msgstr "Költség per óra" - -msgctxt "model:company.employee_cost_price,name:" -msgid "Employee Cost Price" -msgstr "Alkalmazott költsége" - -msgctxt "view:company.employee:" -msgid "Cost" -msgstr "Költség" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Önköltségi ár" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/hu.po tryton-modules-timesheet-cost-6.0.0/locale/hu.po --- tryton-modules-timesheet-cost-5.0.3/locale/hu.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/hu.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,55 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "Költség" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "Költség" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "Költség" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "Dátum" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "Alkalmazott" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "Költség" + +#, fuzzy +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "Alkalmazott költsége per óra " + +#, fuzzy +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "Lista a költség per óráról" + +#, fuzzy +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "Költség per óra" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "Alkalmazott költsége" + +#, fuzzy +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Egy alkalmazottnak dátumonként egy költség írható be." + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "Költség" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/id.po tryton-modules-timesheet-cost-6.0.0/locale/id.po --- tryton-modules-timesheet-cost-5.0.3/locale/id.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/id.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,51 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "Tanggal" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "Pegawai" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "" + +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "" + +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "" + +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "" + +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/it_IT.po tryton-modules-timesheet-cost-6.0.0/locale/it_IT.po --- tryton-modules-timesheet-cost-5.0.3/locale/it_IT.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/it_IT.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -# -msgid "" -msgstr "Content-Type: text/plain; charset=utf-8\n" - -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "Un dipendente può avere un costo giornaliero." - -msgctxt "field:company.employee,cost_price:" -msgid "Cost Price" -msgstr "Costo" - -msgctxt "field:company.employee,cost_prices:" -msgid "Cost Prices" -msgstr "Costi" - -msgctxt "field:company.employee_cost_price,cost_price:" -msgid "Cost Price" -msgstr "Costo" - -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "creato il" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "creato da" - -msgctxt "field:company.employee_cost_price,date:" -msgid "Date" -msgstr "Data" - -msgctxt "field:company.employee_cost_price,employee:" -msgid "Employee" -msgstr "Dipendente" - -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "modificato il" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "modificato da" - -msgctxt "field:timesheet.line,cost_price:" -msgid "Cost Price" -msgstr "Costo" - -msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "Costo orario del dipendente" - -msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "Serie dei costi orari nel periodo" - -msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" -msgstr "costo orario" - -msgctxt "model:company.employee_cost_price,name:" -msgid "Employee Cost Price" -msgstr "Costo del dipendente" - -msgctxt "view:company.employee:" -msgid "Cost" -msgstr "Costo" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/it.po tryton-modules-timesheet-cost-6.0.0/locale/it.po --- tryton-modules-timesheet-cost-5.0.3/locale/it.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/it.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,55 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "Costo" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "Costi" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "Costo" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "Data" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "Dipendente" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "Costo" + +#, fuzzy +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "Costo orario del dipendente" + +#, fuzzy +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "Serie dei costi orari nel periodo" + +#, fuzzy +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "costo orario" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "Costo del dipendente" + +#, fuzzy +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Un dipendente può avere un costo giornaliero." + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "Costo" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/ja_JP.po tryton-modules-timesheet-cost-6.0.0/locale/ja_JP.po --- tryton-modules-timesheet-cost-5.0.3/locale/ja_JP.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/ja_JP.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -# -msgid "" -msgstr "Content-Type: text/plain; charset=utf-8\n" - -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - -msgctxt "field:company.employee,cost_price:" -msgid "Cost Price" -msgstr "" - -msgctxt "field:company.employee,cost_prices:" -msgid "Cost Prices" -msgstr "" - -msgctxt "field:company.employee_cost_price,cost_price:" -msgid "Cost Price" -msgstr "" - -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:company.employee_cost_price,date:" -msgid "Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,employee:" -msgid "Employee" -msgstr "" - -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "" - -msgctxt "field:timesheet.line,cost_price:" -msgid "Cost Price" -msgstr "" - -msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "" - -msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "" - -msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" -msgstr "" - -msgctxt "model:company.employee_cost_price,name:" -msgid "Employee Cost Price" -msgstr "" - -msgctxt "view:company.employee:" -msgid "Cost" -msgstr "" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/lo.po tryton-modules-timesheet-cost-6.0.0/locale/lo.po --- tryton-modules-timesheet-cost-5.0.3/locale/lo.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/lo.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "ລູກຈ້າງຜູ້ໜຶ່ງສາມາດມີພຽງມູນຄ່າລາຄາດຽວຕໍ່ມື້ເທົ່ານັ້ນ" - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "ລາຄາຄິດໄລ່" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "ລາຄາຄິດໄລ່" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "ວັນທີສ້າງ" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "ຜູ້ສ້າງ" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "ວັນທີ" @@ -34,42 +22,34 @@ msgid "Employee" msgstr "ພະນັກງານ" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ເລກລຳດັບ" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "ວັນທີບັນທຶກ" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "ຜູ້ບັນທຶກ" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "ລາຄາຄິດໄລ່" +#, fuzzy msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "ລາຄາຕໍ່ຊົ່ວໂມງສຳລັບພະນັກງານຜູ້ນີ້" +#, fuzzy msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "ບັນຊີລາຍການຄ່າລ່ວງເວລາ" +#, fuzzy msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "ລາຄາຕໍ່ຊົ່ວໂມງ" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "ມູນຄ່າລາຄາພະນັກງານ" +#, fuzzy +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "ລູກຈ້າງຜູ້ໜຶ່ງສາມາດມີພຽງມູນຄ່າລາຄາດຽວຕໍ່ມື້ເທົ່ານັ້ນ" + msgctxt "view:company.employee:" msgid "Cost" msgstr "ມູນຄ່າ" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/lt.po tryton-modules-timesheet-cost-6.0.0/locale/lt.po --- tryton-modules-timesheet-cost-5.0.3/locale/lt.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/lt.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "" @@ -34,42 +22,30 @@ msgid "Employee" msgstr "" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "" msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "" msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + msgctxt "view:company.employee:" msgid "Cost" msgstr "" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/nl.po tryton-modules-timesheet-cost-6.0.0/locale/nl.po --- tryton-modules-timesheet-cost-5.0.3/locale/nl.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/nl.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,90 +2,50 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - -#, fuzzy msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Kostprijs" -#, fuzzy msgctxt "field:company.employee,cost_prices:" msgid "Cost Prices" msgstr "Kostprijs" -#, fuzzy msgctxt "field:company.employee_cost_price,cost_price:" msgid "Cost Price" msgstr "Kostprijs" -#, fuzzy -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Datum" - -#, fuzzy -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Gebruiker" - -#, fuzzy msgctxt "field:company.employee_cost_price,date:" msgid "Date" -msgstr "Vervaldatum" +msgstr "datum" -#, fuzzy msgctxt "field:company.employee_cost_price,employee:" msgid "Employee" msgstr "Werknemer" -#, fuzzy -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Schrijfdatum" - -#, fuzzy -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Gebruiker" - -#, fuzzy msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Kostprijs" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "" +msgid "Hourly cost price for this Employee." +msgstr "Kostprijs per uur voor deze werknemer." msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "" +msgid "List of hourly cost price over time." +msgstr "Lijst met kostprijs per uur in de tijd." msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" -msgstr "" +msgid "Hourly cost price." +msgstr "Kostprijs per uur." msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" -msgstr "" +msgstr "Personeelskostprijs" + +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Een medewerker kan slechts één kostprijs hebben op datum." msgctxt "view:company.employee:" msgid "Cost" -msgstr "" - -#, fuzzy -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Kostprijs" +msgstr "Kosten" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/pl.po tryton-modules-timesheet-cost-6.0.0/locale/pl.po --- tryton-modules-timesheet-cost-5.0.3/locale/pl.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/pl.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Cena kosztów" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Cena kosztów" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Data utworzenia" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Utworzył" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "Data" @@ -34,42 +22,33 @@ msgid "Employee" msgstr "Pracownik" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "Nazwa rekordu" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Data zapisu" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Zapisał" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Cena kosztów" +#, fuzzy msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "" +msgid "Hourly cost price for this Employee." +msgstr "Godzinowa cena kosztów" +#, fuzzy msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "" +msgid "List of hourly cost price over time." +msgstr "Godzinowa cena kosztów" +#, fuzzy msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "Godzinowa cena kosztów" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Robocza cena kosztów" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + msgctxt "view:company.employee:" msgid "Cost" msgstr "Koszt" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/pt_BR.po tryton-modules-timesheet-cost-6.0.0/locale/pt_BR.po --- tryton-modules-timesheet-cost-5.0.3/locale/pt_BR.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -# -msgid "" -msgstr "Content-Type: text/plain; charset=utf-8\n" - -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "Um empregado somente pode ter um preço de custo por data." - -msgctxt "field:company.employee,cost_price:" -msgid "Cost Price" -msgstr "Preço de custo" - -msgctxt "field:company.employee,cost_prices:" -msgid "Cost Prices" -msgstr "Preços de custo" - -msgctxt "field:company.employee_cost_price,cost_price:" -msgid "Cost Price" -msgstr "Preços de custo" - -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Data de criação" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Criado por" - -msgctxt "field:company.employee_cost_price,date:" -msgid "Date" -msgstr "Data" - -msgctxt "field:company.employee_cost_price,employee:" -msgid "Employee" -msgstr "Empregado" - -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "Nome do Registro" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Data de edição" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Editado por" - -msgctxt "field:timesheet.line,cost_price:" -msgid "Cost Price" -msgstr "Preço de custo" - -msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" -msgstr "Preço de custo por hora para este empregado." - -msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" -msgstr "Lista de preços de custo por hora ao longo do tempo." - -msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" -msgstr "Preço de custo por hora" - -msgctxt "model:company.employee_cost_price,name:" -msgid "Employee Cost Price" -msgstr "Preço de custo do empregado" - -msgctxt "view:company.employee:" -msgid "Cost" -msgstr "Custo" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Custo" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/pt.po tryton-modules-timesheet-cost-6.0.0/locale/pt.po --- tryton-modules-timesheet-cost-5.0.3/locale/pt.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/pt.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,55 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "Preço de custo" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "Preços de custo" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "Preços de custo" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "Data" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "Empregado" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "Preço de custo" + +#, fuzzy +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "Preço de custo por hora para este empregado." + +#, fuzzy +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "Lista de preços de custo por hora ao longo do tempo." + +#, fuzzy +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "Preço de custo por hora" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "Preço de custo do empregado" + +#, fuzzy +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Um empregado somente pode ter um preço de custo por data." + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "Custo" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/ro.po tryton-modules-timesheet-cost-6.0.0/locale/ro.po --- tryton-modules-timesheet-cost-5.0.3/locale/ro.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/ro.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,51 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "Cost" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "Costuri" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "Cost" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "Data" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "Angajat" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "Cost" + +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "" + +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "" + +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "" + +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/ru.po tryton-modules-timesheet-cost-6.0.0/locale/ru.po --- tryton-modules-timesheet-cost-5.0.3/locale/ru.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/ru.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "У сотрудника может быть только одна себестоимость за день." - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Себестоимость" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Себестоимость" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Дата создания" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Создано пользователем" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "Дата" @@ -34,46 +22,34 @@ msgid "Employee" msgstr "Сотрудник" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Дата изменения" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Изменено пользователем" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Себестоимость" +#, fuzzy msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "Часовая себестоимость для этого сотрудника" +#, fuzzy msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "Список часовой себестоимости по времени" +#, fuzzy msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "Часовая себестоимость" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Себестоимость сотрудника" +#, fuzzy +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "У сотрудника может быть только одна себестоимость за день." + msgctxt "view:company.employee:" msgid "Cost" msgstr "Стоимость" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Себестоимость" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/sl.po tryton-modules-timesheet-cost-6.0.0/locale/sl.po --- tryton-modules-timesheet-cost-5.0.3/locale/sl.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/sl.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "Zaposlenec ima lahko samo en strošek na datum." - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "Strošek" @@ -18,14 +14,6 @@ msgid "Cost Price" msgstr "Strošek" -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "Izdelano" - -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "Izdelal" - msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "Datum" @@ -34,46 +22,34 @@ msgid "Employee" msgstr "Zaposlenec" -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "Ime" - -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "Zapisano" - -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "Zapisal" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "Strošek" +#, fuzzy msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "Strošek na uro za tega zaposlenca" +#, fuzzy msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "Seznam stroškov na uro po času" +#, fuzzy msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "Strošek na uro" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "Strošek zaposlenca" +#, fuzzy +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Zaposlenec ima lahko samo en strošek na datum." + msgctxt "view:company.employee:" msgid "Cost" msgstr "Strošek" - -msgctxt "view:company.employee_cost_price:" -msgid "Cost Prices" -msgstr "Stroški" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/tr.po tryton-modules-timesheet-cost-6.0.0/locale/tr.po --- tryton-modules-timesheet-cost-5.0.3/locale/tr.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/tr.po 2021-05-02 08:26:46.000000000 +0000 @@ -0,0 +1,55 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:company.employee,cost_price:" +msgid "Cost Price" +msgstr "Maliyet Fiyatı" + +msgctxt "field:company.employee,cost_prices:" +msgid "Cost Prices" +msgstr "Maliyet Fiyatları" + +msgctxt "field:company.employee_cost_price,cost_price:" +msgid "Cost Price" +msgstr "Maliyet Fiyatı" + +msgctxt "field:company.employee_cost_price,date:" +msgid "Date" +msgstr "Tarih" + +msgctxt "field:company.employee_cost_price,employee:" +msgid "Employee" +msgstr "Çalışan" + +msgctxt "field:timesheet.line,cost_price:" +msgid "Cost Price" +msgstr "Maliyet fiyatı" + +#, fuzzy +msgctxt "help:company.employee,cost_price:" +msgid "Hourly cost price for this Employee." +msgstr "Bu çalışan için saatlik maliyet fiyatı" + +#, fuzzy +msgctxt "help:company.employee,cost_prices:" +msgid "List of hourly cost price over time." +msgstr "Saatlik fazla mesai maliyet fiyatı listesi" + +#, fuzzy +msgctxt "help:company.employee_cost_price,cost_price:" +msgid "Hourly cost price." +msgstr "Saatlik maliyet fiyatı" + +msgctxt "model:company.employee_cost_price,name:" +msgid "Employee Cost Price" +msgstr "Çalışan Maliyet Fiyatı" + +#, fuzzy +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "Bir çalışan için tarihe göre yalnız bir maliyet fiyatı olabilir" + +msgctxt "view:company.employee:" +msgid "Cost" +msgstr "Maliyet" diff -Nru tryton-modules-timesheet-cost-5.0.3/locale/zh_CN.po tryton-modules-timesheet-cost-6.0.0/locale/zh_CN.po --- tryton-modules-timesheet-cost-5.0.3/locale/zh_CN.po 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/locale/zh_CN.po 2021-05-02 08:26:46.000000000 +0000 @@ -2,10 +2,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:company.employee_cost_price:" -msgid "A employee can only have one cost price by date." -msgstr "" - msgctxt "field:company.employee,cost_price:" msgid "Cost Price" msgstr "" @@ -19,16 +15,6 @@ msgstr "" #, fuzzy -msgctxt "field:company.employee_cost_price,create_date:" -msgid "Create Date" -msgstr "创建日期:" - -#, fuzzy -msgctxt "field:company.employee_cost_price,create_uid:" -msgid "Create User" -msgstr "添加用户" - -#, fuzzy msgctxt "field:company.employee_cost_price,date:" msgid "Date" msgstr "日期格式" @@ -37,45 +23,30 @@ msgid "Employee" msgstr "" -#, fuzzy -msgctxt "field:company.employee_cost_price,id:" -msgid "ID" -msgstr "编号" - -msgctxt "field:company.employee_cost_price,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:company.employee_cost_price,write_date:" -msgid "Write Date" -msgstr "写入日期" - -#, fuzzy -msgctxt "field:company.employee_cost_price,write_uid:" -msgid "Write User" -msgstr "写入帐号" - msgctxt "field:timesheet.line,cost_price:" msgid "Cost Price" msgstr "" msgctxt "help:company.employee,cost_price:" -msgid "Hourly cost price for this Employee" +msgid "Hourly cost price for this Employee." msgstr "" msgctxt "help:company.employee,cost_prices:" -msgid "List of hourly cost price over time" +msgid "List of hourly cost price over time." msgstr "" msgctxt "help:company.employee_cost_price,cost_price:" -msgid "Hourly cost price" +msgid "Hourly cost price." msgstr "" msgctxt "model:company.employee_cost_price,name:" msgid "Employee Cost Price" msgstr "" +msgctxt "model:ir.message,text:msg_employee_unique_cost_price_date" +msgid "An employee can only have one cost price by date." +msgstr "" + msgctxt "view:company.employee:" msgid "Cost" msgstr "" diff -Nru tryton-modules-timesheet-cost-5.0.3/MANIFEST.in tryton-modules-timesheet-cost-6.0.0/MANIFEST.in --- tryton-modules-timesheet-cost-5.0.3/MANIFEST.in 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/MANIFEST.in 2019-06-04 16:49:46.000000000 +0000 @@ -1,10 +1,5 @@ -include INSTALL -include README -include COPYRIGHT include CHANGELOG +include COPYRIGHT include LICENSE -include tryton.cfg -include *.xml -include view/*.xml -include locale/*.po +include README.rst include doc/* diff -Nru tryton-modules-timesheet-cost-5.0.3/message.xml tryton-modules-timesheet-cost-6.0.0/message.xml --- tryton-modules-timesheet-cost-5.0.3/message.xml 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/message.xml 2019-08-09 14:52:54.000000000 +0000 @@ -0,0 +1,10 @@ + + + + + + An employee can only have one cost price by date. + + + diff -Nru tryton-modules-timesheet-cost-5.0.3/PKG-INFO tryton-modules-timesheet-cost-6.0.0/PKG-INFO --- tryton-modules-timesheet-cost-5.0.3/PKG-INFO 2020-04-04 16:07:14.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/PKG-INFO 2021-05-03 13:46:35.661367400 +0000 @@ -1,47 +1,20 @@ Metadata-Version: 1.2 Name: trytond_timesheet_cost -Version: 5.0.3 +Version: 6.0.0 Summary: Tryton module to add cost on timesheet Home-page: http://www.tryton.org/ Author: Tryton -Author-email: issue_tracker@tryton.org +Author-email: bugs@tryton.org License: GPL-3 -Download-URL: http://downloads.tryton.org/5.0/ -Description: trytond_timesheet_cost - ====================== +Download-URL: http://downloads.tryton.org/6.0/ +Project-URL: Bug Tracker, https://bugs.tryton.org/ +Project-URL: Documentation, https://docs.tryton.org/ +Project-URL: Forum, https://www.tryton.org/forum +Project-URL: Source Code, https://hg.tryton.org/modules/timesheet_cost +Description: Timesheet Cost Module + ##################### - The timesheet_cost module of the Tryton application platform. - - Installing - ---------- - - See INSTALL - - Support - ------- - - If you encounter any problems with Tryton, please don't hesitate to ask - questions on the Tryton bug tracker, mailing list, wiki or IRC channel: - - http://bugs.tryton.org/ - http://groups.tryton.org/ - http://wiki.tryton.org/ - irc://irc.freenode.net/tryton - - License - ------- - - See LICENSE - - Copyright - --------- - - See COPYRIGHT - - - For more information please visit the Tryton web site: - - http://www.tryton.org/ + The timesheet cost module adds cost price per employee. Keywords: tryton timesheet cost Platform: UNKNOWN @@ -59,22 +32,27 @@ Classifier: Natural Language :: Czech Classifier: Natural Language :: Dutch Classifier: Natural Language :: English +Classifier: Natural Language :: Finnish Classifier: Natural Language :: French Classifier: Natural Language :: German Classifier: Natural Language :: Hungarian +Classifier: Natural Language :: Indonesian Classifier: Natural Language :: Italian Classifier: Natural Language :: Persian Classifier: Natural Language :: Polish Classifier: Natural Language :: Portuguese (Brazilian) +Classifier: Natural Language :: Romanian Classifier: Natural Language :: Russian Classifier: Natural Language :: Slovenian Classifier: Natural Language :: Spanish +Classifier: Natural Language :: Turkish Classifier: Operating System :: OS Independent -Classifier: Programming Language :: Python :: 3.4 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Office/Business -Requires-Python: >=3.4 +Requires-Python: >=3.6 diff -Nru tryton-modules-timesheet-cost-5.0.3/README tryton-modules-timesheet-cost-6.0.0/README --- tryton-modules-timesheet-cost-5.0.3/README 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -trytond_timesheet_cost -====================== - -The timesheet_cost module of the Tryton application platform. - -Installing ----------- - -See INSTALL - -Support -------- - -If you encounter any problems with Tryton, please don't hesitate to ask -questions on the Tryton bug tracker, mailing list, wiki or IRC channel: - - http://bugs.tryton.org/ - http://groups.tryton.org/ - http://wiki.tryton.org/ - irc://irc.freenode.net/tryton - -License -------- - -See LICENSE - -Copyright ---------- - -See COPYRIGHT - - -For more information please visit the Tryton web site: - - http://www.tryton.org/ diff -Nru tryton-modules-timesheet-cost-5.0.3/README.rst tryton-modules-timesheet-cost-6.0.0/README.rst --- tryton-modules-timesheet-cost-5.0.3/README.rst 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/README.rst 2019-06-04 16:49:46.000000000 +0000 @@ -0,0 +1,4 @@ +Timesheet Cost Module +##################### + +The timesheet cost module adds cost price per employee. diff -Nru tryton-modules-timesheet-cost-5.0.3/setup.py tryton-modules-timesheet-cost-6.0.0/setup.py --- tryton-modules-timesheet-cost-5.0.3/setup.py 2019-04-10 17:03:29.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/setup.py 2021-05-02 07:58:48.000000000 +0000 @@ -6,7 +6,7 @@ import os import re from configparser import ConfigParser -from setuptools import setup +from setuptools import setup, find_packages def read(fname): @@ -26,7 +26,7 @@ config = ConfigParser() -config.read_file(open('tryton.cfg')) +config.read_file(open(os.path.join(os.path.dirname(__file__), 'tryton.cfg'))) info = dict(config.items('tryton')) for key in ('depends', 'extras_depend', 'xml'): if key in info: @@ -44,6 +44,18 @@ download_url = ( 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % ( name[8:], name, version)) +local_version = [] +if os.environ.get('CI_JOB_ID'): + local_version.append(os.environ['CI_JOB_ID']) +else: + for build in ['CI_BUILD_NUMBER', 'CI_JOB_NUMBER']: + if os.environ.get(build): + local_version.append(os.environ[build]) + else: + local_version = [] + break +if local_version: + version += '+' + '.'.join(local_version) requires = ['python-sql >= 0.4'] for dep in info.get('depends', []): @@ -53,22 +65,30 @@ dependency_links = [] if minor_version % 2: - dependency_links.append('https://trydevpi.tryton.org/') + dependency_links.append( + 'https://trydevpi.tryton.org/?local_version=' + + '.'.join(local_version)) setup(name=name, version=version, description='Tryton module to add cost on timesheet', - long_description=read('README'), + long_description=read('README.rst'), author='Tryton', - author_email='issue_tracker@tryton.org', + author_email='bugs@tryton.org', url='http://www.tryton.org/', download_url=download_url, + project_urls={ + "Bug Tracker": 'https://bugs.tryton.org/', + "Documentation": 'https://docs.tryton.org/', + "Forum": 'https://www.tryton.org/forum', + "Source Code": 'https://hg.tryton.org/modules/timesheet_cost', + }, keywords='tryton timesheet cost', package_dir={'trytond.modules.timesheet_cost': '.'}, - packages=[ - 'trytond.modules.timesheet_cost', - 'trytond.modules.timesheet_cost.tests', - ], + packages=( + ['trytond.modules.timesheet_cost'] + + ['trytond.modules.timesheet_cost.%s' % p for p in find_packages()] + ), package_data={ 'trytond.modules.timesheet_cost': (info.get('xml', []) + ['tryton.cfg', 'view/*.xml', 'locale/*.po']), @@ -81,34 +101,40 @@ 'Intended Audience :: Financial and Insurance Industry', 'Intended Audience :: Legal Industry', 'Intended Audience :: Manufacturing', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'License :: OSI Approved :: ' + 'GNU General Public License v3 or later (GPLv3+)', 'Natural Language :: Bulgarian', 'Natural Language :: Catalan', 'Natural Language :: Chinese (Simplified)', 'Natural Language :: Czech', 'Natural Language :: Dutch', 'Natural Language :: English', + 'Natural Language :: Finnish', 'Natural Language :: French', 'Natural Language :: German', 'Natural Language :: Hungarian', + 'Natural Language :: Indonesian', 'Natural Language :: Italian', 'Natural Language :: Persian', 'Natural Language :: Polish', 'Natural Language :: Portuguese (Brazilian)', + 'Natural Language :: Romanian', 'Natural Language :: Russian', 'Natural Language :: Slovenian', 'Natural Language :: Spanish', + 'Natural Language :: Turkish', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Office/Business', ], license='GPL-3', - python_requires='>=3.4', + python_requires='>=3.6', install_requires=requires, dependency_links=dependency_links, zip_safe=False, diff -Nru tryton-modules-timesheet-cost-5.0.3/tests/test_timesheet_cost.py tryton-modules-timesheet-cost-6.0.0/tests/test_timesheet_cost.py --- tryton-modules-timesheet-cost-5.0.3/tests/test_timesheet_cost.py 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/tests/test_timesheet_cost.py 2021-04-27 07:34:41.000000000 +0000 @@ -8,10 +8,11 @@ from trytond.tests.test_tryton import ModuleTestCase, with_transaction from trytond.pool import Pool -from trytond.modules.company.tests import create_company, set_company +from trytond.modules.company.tests import ( + create_company, set_company, create_employee, CompanyTestMixin) -class TimesheetCostTestCase(ModuleTestCase): +class TimesheetCostTestCase(CompanyTestMixin, ModuleTestCase): 'Test TimesheetCost module' module = 'timesheet_cost' @@ -20,7 +21,6 @@ 'Test compute_cost_price' pool = Pool() Party = pool.get('party.party') - Employee = pool.get('company.employee') EmployeeCostPrice = pool.get('company.employee_cost_price') cost_prices = [ @@ -41,8 +41,7 @@ party.save() company = create_company() with set_company(company): - employee = Employee(party=party.id, company=company) - employee.save() + employee = create_employee(company) for date, cost_price in cost_prices: EmployeeCostPrice( employee=employee, diff -Nru tryton-modules-timesheet-cost-5.0.3/timesheet.py tryton-modules-timesheet-cost-6.0.0/timesheet.py --- tryton-modules-timesheet-cost-5.0.3/timesheet.py 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/timesheet.py 2021-04-03 16:10:54.000000000 +0000 @@ -8,10 +8,8 @@ from .company import price_digits -__all__ = ['TimesheetLine'] - -class TimesheetLine(metaclass=PoolMeta): +class Line(metaclass=PoolMeta): __name__ = 'timesheet.line' cost_price = fields.Numeric('Cost Price', @@ -22,13 +20,15 @@ pool = Pool() Employee = pool.get('company.employee') - cursor = Transaction().connection.cursor() + transaction = Transaction() + cursor = transaction.connection.cursor() + update = transaction.connection.cursor() table = cls.__table__() table_h = cls.__table_handler__(module_name) migrate_cost_price = not table_h.column_exist('cost_price') - super(TimesheetLine, cls).__register__(module_name) + super().__register__(module_name) # Migration from 3.6: add cost_price if migrate_cost_price: @@ -36,10 +36,10 @@ where=(table.cost_price == 0) & (table.employee != Null) & (table.date != Null))) - for line_id, employee_id, date in cursor.fetchall(): + for line_id, employee_id, date in cursor: employee = Employee(employee_id) cost_price = employee.compute_cost_price(date=date) - cursor.execute(*table.update( + update.execute(*table.update( [table.cost_price], [cost_price], where=table.id == line_id)) @@ -55,13 +55,13 @@ vlist = [v.copy() for v in vlist] for values in vlist: values.pop('cost_price', None) - lines = super(TimesheetLine, cls).create(vlist) + lines = super().create(vlist) cls.sync_cost(lines) return lines @classmethod def write(cls, *args): - super(TimesheetLine, cls).write(*args) + super().write(*args) cls.sync_cost(sum(args[0:None:2], [])) @classmethod diff -Nru tryton-modules-timesheet-cost-5.0.3/tox.ini tryton-modules-timesheet-cost-6.0.0/tox.ini --- tryton-modules-timesheet-cost-5.0.3/tox.ini 2019-01-25 22:28:02.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/tox.ini 2020-12-19 16:09:34.000000000 +0000 @@ -1,15 +1,15 @@ [tox] -envlist = {py34,py35,py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql} +envlist = {py36,py37,py38,py39}-{sqlite,postgresql},pypy3-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - {py34,py35,py36,py37}-postgresql: psycopg2 >= 2.5 + {py36,py37,py38,py39}-postgresql: psycopg2 >= 2.5 pypy3-postgresql: psycopg2cffi >= 2.5 - {py34,py35,py36}-sqlite: sqlitebck + py36-sqlite: sqlitebck setenv = sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://} postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://} sqlite: DB_NAME={env:SQLITE_NAME::memory:} postgresql: DB_NAME={env:POSTGRESQL_NAME:test} -install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages} +install_command = pip install --pre --find-links https://trydevpi.tryton.org/?local_version={env:CI_JOB_ID:{env:CI_BUILD_NUMBER}.{env:CI_JOB_NUMBER}} {opts} {packages} diff -Nru tryton-modules-timesheet-cost-5.0.3/tryton.cfg tryton-modules-timesheet-cost-6.0.0/tryton.cfg --- tryton-modules-timesheet-cost-5.0.3/tryton.cfg 2019-04-22 08:45:13.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/tryton.cfg 2021-05-03 13:46:32.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=5.0.3 +version=6.0.0 depends: ir company @@ -8,3 +8,4 @@ xml: company.xml timesheet.xml + message.xml diff -Nru tryton-modules-timesheet-cost-5.0.3/trytond_timesheet_cost.egg-info/PKG-INFO tryton-modules-timesheet-cost-6.0.0/trytond_timesheet_cost.egg-info/PKG-INFO --- tryton-modules-timesheet-cost-5.0.3/trytond_timesheet_cost.egg-info/PKG-INFO 2020-04-04 16:07:14.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/trytond_timesheet_cost.egg-info/PKG-INFO 2021-05-03 13:46:35.000000000 +0000 @@ -1,47 +1,20 @@ Metadata-Version: 1.2 Name: trytond-timesheet-cost -Version: 5.0.3 +Version: 6.0.0 Summary: Tryton module to add cost on timesheet Home-page: http://www.tryton.org/ Author: Tryton -Author-email: issue_tracker@tryton.org +Author-email: bugs@tryton.org License: GPL-3 -Download-URL: http://downloads.tryton.org/5.0/ -Description: trytond_timesheet_cost - ====================== +Download-URL: http://downloads.tryton.org/6.0/ +Project-URL: Bug Tracker, https://bugs.tryton.org/ +Project-URL: Documentation, https://docs.tryton.org/ +Project-URL: Forum, https://www.tryton.org/forum +Project-URL: Source Code, https://hg.tryton.org/modules/timesheet_cost +Description: Timesheet Cost Module + ##################### - The timesheet_cost module of the Tryton application platform. - - Installing - ---------- - - See INSTALL - - Support - ------- - - If you encounter any problems with Tryton, please don't hesitate to ask - questions on the Tryton bug tracker, mailing list, wiki or IRC channel: - - http://bugs.tryton.org/ - http://groups.tryton.org/ - http://wiki.tryton.org/ - irc://irc.freenode.net/tryton - - License - ------- - - See LICENSE - - Copyright - --------- - - See COPYRIGHT - - - For more information please visit the Tryton web site: - - http://www.tryton.org/ + The timesheet cost module adds cost price per employee. Keywords: tryton timesheet cost Platform: UNKNOWN @@ -59,22 +32,27 @@ Classifier: Natural Language :: Czech Classifier: Natural Language :: Dutch Classifier: Natural Language :: English +Classifier: Natural Language :: Finnish Classifier: Natural Language :: French Classifier: Natural Language :: German Classifier: Natural Language :: Hungarian +Classifier: Natural Language :: Indonesian Classifier: Natural Language :: Italian Classifier: Natural Language :: Persian Classifier: Natural Language :: Polish Classifier: Natural Language :: Portuguese (Brazilian) +Classifier: Natural Language :: Romanian Classifier: Natural Language :: Russian Classifier: Natural Language :: Slovenian Classifier: Natural Language :: Spanish +Classifier: Natural Language :: Turkish Classifier: Operating System :: OS Independent -Classifier: Programming Language :: Python :: 3.4 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Office/Business -Requires-Python: >=3.4 +Requires-Python: >=3.6 diff -Nru tryton-modules-timesheet-cost-5.0.3/trytond_timesheet_cost.egg-info/requires.txt tryton-modules-timesheet-cost-6.0.0/trytond_timesheet_cost.egg-info/requires.txt --- tryton-modules-timesheet-cost-5.0.3/trytond_timesheet_cost.egg-info/requires.txt 2020-04-04 16:07:14.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/trytond_timesheet_cost.egg-info/requires.txt 2021-05-03 13:46:35.000000000 +0000 @@ -1,5 +1,5 @@ python-sql>=0.4 -trytond_company<5.1,>=5.0 -trytond_party<5.1,>=5.0 -trytond_timesheet<5.1,>=5.0 -trytond<5.1,>=5.0 +trytond_company<6.1,>=6.0 +trytond_party<6.1,>=6.0 +trytond_timesheet<6.1,>=6.0 +trytond<6.1,>=6.0 diff -Nru tryton-modules-timesheet-cost-5.0.3/trytond_timesheet_cost.egg-info/SOURCES.txt tryton-modules-timesheet-cost-6.0.0/trytond_timesheet_cost.egg-info/SOURCES.txt --- tryton-modules-timesheet-cost-5.0.3/trytond_timesheet_cost.egg-info/SOURCES.txt 2020-04-04 16:07:14.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/trytond_timesheet_cost.egg-info/SOURCES.txt 2021-05-03 13:46:35.000000000 +0000 @@ -1,14 +1,15 @@ .drone.yml +.flake8 .hgtags CHANGELOG COPYRIGHT -INSTALL LICENSE MANIFEST.in -README +README.rst __init__.py company.py company.xml +message.xml setup.py timesheet.py timesheet.xml @@ -17,6 +18,7 @@ ./__init__.py ./company.py ./company.xml +./message.xml ./timesheet.py ./timesheet.xml ./tryton.cfg @@ -26,42 +28,51 @@ ./locale/de.po ./locale/es.po ./locale/es_419.po +./locale/et.po ./locale/fa.po +./locale/fi.po ./locale/fr.po -./locale/hu_HU.po -./locale/it_IT.po -./locale/ja_JP.po +./locale/hu.po +./locale/id.po +./locale/it.po ./locale/lo.po ./locale/lt.po ./locale/nl.po ./locale/pl.po -./locale/pt_BR.po +./locale/pt.po +./locale/ro.po ./locale/ru.po ./locale/sl.po +./locale/tr.po ./locale/zh_CN.po ./tests/__init__.py ./tests/test_timesheet_cost.py ./view/employee_cost_price_form.xml ./view/employee_cost_price_tree.xml ./view/employee_form.xml +doc/index.rst locale/bg.po locale/ca.po locale/cs.po locale/de.po locale/es.po locale/es_419.po +locale/et.po locale/fa.po +locale/fi.po locale/fr.po -locale/hu_HU.po -locale/it_IT.po -locale/ja_JP.po +locale/hu.po +locale/id.po +locale/it.po locale/lo.po locale/lt.po locale/nl.po locale/pl.po -locale/pt_BR.po +locale/pt.po +locale/ro.po locale/ru.po locale/sl.po +locale/tr.po locale/zh_CN.po tests/__init__.py tests/test_timesheet_cost.py diff -Nru tryton-modules-timesheet-cost-5.0.3/view/employee_form.xml tryton-modules-timesheet-cost-6.0.0/view/employee_form.xml --- tryton-modules-timesheet-cost-5.0.3/view/employee_form.xml 2018-10-01 13:51:19.000000000 +0000 +++ tryton-modules-timesheet-cost-6.0.0/view/employee_form.xml 2019-10-11 21:50:16.000000000 +0000 @@ -2,7 +2,7 @@ - +