[tryton-debian-vcs] tryton-modules-project-revenue branch debian created. ddb7c37c339dafd5240693e00733a2847fba379d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:12 UTC 2013
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-revenue.git;a=commitdiff;h=ddb7c37c339dafd5240693e00733a2847fba379d
commit ddb7c37c339dafd5240693e00733a2847fba379d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:22 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 292bc94..9c4c45a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project-revenue (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating Depends for new module timesheet-cost.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+ * Adding pydist-overrides for new module timesheet-cost not yet in the
+ archive.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 19:51:41 +0100
+
tryton-modules-project-revenue (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit 5adae0146306ae21a3a69de52444a55b15c1ca98
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 19:51:23 2013 +0100
Adding pydist-overrides for new module timesheet-cost not yet in the archive.
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..e1818fe
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+trytond_timesheet_cost tryton-modules-timesheet-cost
commit 76bf99c35c5304c814294bd8a847801435062fe0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:52 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index c35a0f5..c6939aa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 5849d47a83ce08ba35a605dbcb263418a8d7066c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 2eb2a64..c35a0f5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-project-revenue.git
commit a63303f520d89264456e8dae0c816c6281304a73
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:44:55 2013 +0100
Updating Depends for new module timesheet-cost.
diff --git a/debian/control b/debian/control
index 2996292..2eb2a64 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Depends:
tryton-modules-company (>= ${version:major}),
tryton-modules-product (>= ${version:major}),
tryton-modules-project (>= ${version:major}),
- tryton-modules-timesheet (>= ${version:major}), python-pkg-resources
+ tryton-modules-timesheet (>= ${version:major}),
+ tryton-modules-timesheet-cost (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Project Revenue Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit c8e62d4100cc81cf37ae75902b47b5f8d28704fb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:50 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index ef04e90..e1758e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 0b61f09..f9df19b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,6 +8,7 @@ Prerequisites
* trytond (http://www.tryton.org/)
* trytond_project (http://www.tryton.org/)
* trytond_timesheet (http://www.tryton.org/)
+ * trytond_timesheet_cost (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 9a033cc..3f5f925 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add cost/revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_project_revenue
=======================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/__init__.py b/__init__.py
index ec6eaf4..587601f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,14 +2,10 @@
#this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
-from .service import *
from .work import *
def register():
Pool.register(
- Employee,
- EmployeeCostPrice,
- TimesheetLine,
Work,
module='project_revenue', type_='model')
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index d2818a5..27cdbeb 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,62 +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 "Фабрична цена"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Себестойност"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-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,currency_digits:"
-msgid "Currency Digits"
-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 "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "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:project.work,cost:"
msgid "Cost"
msgstr "Разход"
@@ -78,30 +22,6 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
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 "Разход"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Себестойност"
-
msgctxt "view:project.work:"
msgid "Cost"
msgstr "Разход"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index ee83412..5264e89 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,62 +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"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Preus de cost"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimals de la moneda"
-
-msgctxt "field:company.employee_cost_price,cost_price:"
-msgid "Cost Price"
-msgstr "Preu de cost"
-
-msgctxt "field:company.employee_cost_price,create_date:"
-msgid "Create Date"
-msgstr "Data creació"
-
-msgctxt "field:company.employee_cost_price,create_uid:"
-msgid "Create User"
-msgstr "Usuari creació"
-
-msgctxt "field:company.employee_cost_price,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimals de la moneda"
-
-msgctxt "field:company.employee_cost_price,date:"
-msgid "Date"
-msgstr "Data"
-
-msgctxt "field:company.employee_cost_price,employee:"
-msgid "Employee"
-msgstr "Empleat"
-
-msgctxt "field:company.employee_cost_price,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:company.employee_cost_price,write_date:"
-msgid "Write Date"
-msgstr "Data modificació"
-
-msgctxt "field:company.employee_cost_price,write_uid:"
-msgid "Write User"
-msgstr "Usuari modificació"
-
msgctxt "field:project.work,cost:"
msgid "Cost"
msgstr "Cost"
@@ -78,30 +22,6 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Benefici"
-msgctxt "help:company.employee,cost_price:"
-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"
-msgstr "Llista de preu de cost per hora a través del temps"
-
-msgctxt "help:company.employee_cost_price,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 "view:company.employee:"
-msgid "Cost"
-msgstr "Cost"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Preus de cost"
-
msgctxt "view:project.work:"
msgid "Cost"
msgstr "Cost"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 69b56c6..bfce1c1 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,62 +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 ""
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr ""
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-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,currency_digits:"
-msgid "Currency Digits"
-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 "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:project.work,cost:"
msgid "Cost"
msgstr ""
@@ -77,27 +21,3 @@ msgstr ""
msgctxt "field:project.work,revenue:"
msgid "Revenue"
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 ""
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 1d38158..4227c32 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,64 +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 ""
-"Es kann nur ein Kostenpreis pro Datum für einen Mitarbeiter eingetragen "
-"werden."
-
-msgctxt "field:company.employee,cost_price:"
-msgid "Cost Price"
-msgstr "Kostenpreis"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Kostenpreise"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
-
-msgctxt "field:company.employee_cost_price,cost_price:"
-msgid "Cost Price"
-msgstr "Einkaufspreis"
-
-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"
-
-msgctxt "field:company.employee_cost_price,currency_digits:"
-msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
-
-msgctxt "field:company.employee_cost_price,date:"
-msgid "Date"
-msgstr "Datum"
-
-msgctxt "field:company.employee_cost_price,employee:"
-msgid "Employee"
-msgstr "Mitarbeiter"
-
-msgctxt "field:company.employee_cost_price,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "Name"
-msgstr "Name"
-
-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:project.work,cost:"
msgid "Cost"
msgstr "Kosten"
@@ -80,30 +22,6 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Ertrag"
-msgctxt "help:company.employee,cost_price:"
-msgid "Hourly cost price for this Employee"
-msgstr "Kostenpreis 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"
-
-msgctxt "help:company.employee_cost_price,cost_price:"
-msgid "Hourly cost price"
-msgstr "Kostenpreis pro Stunde"
-
-msgctxt "model:company.employee_cost_price,name:"
-msgid "Employee Cost Price"
-msgstr "Mitarbeiter Kostenpreis"
-
-msgctxt "view:company.employee:"
-msgid "Cost"
-msgstr "Kosten"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Kostenpreise"
-
msgctxt "view:project.work:"
msgid "Cost"
msgstr "Kosten"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 47ecc1f..f9c1549 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,69 +2,13 @@
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 costo por fecha."
-
-msgctxt "field:company.employee,cost_price:"
-msgid "Cost Price"
-msgstr "Precio de costo"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Precios de costo"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-msgstr "Dígitos de divisa"
-
-msgctxt "field:company.employee_cost_price,cost_price:"
-msgid "Cost Price"
-msgstr "Precio de costo"
-
-msgctxt "field:company.employee_cost_price,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:company.employee_cost_price,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:company.employee_cost_price,currency_digits:"
-msgid "Currency Digits"
-msgstr "Dígitos de divisa"
-
-msgctxt "field:company.employee_cost_price,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:company.employee_cost_price,employee:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "field:company.employee_cost_price,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:company.employee_cost_price,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:company.employee_cost_price,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
msgctxt "field:project.work,cost:"
msgid "Cost"
msgstr "Costo"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:project.work,list_price:"
msgid "List Price"
@@ -78,30 +22,6 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Ingresos"
-msgctxt "help:company.employee,cost_price:"
-msgid "Hourly cost price for this Employee"
-msgstr "Precio de costo por hora para este empleado"
-
-msgctxt "help:company.employee,cost_prices:"
-msgid "List of hourly cost price over time"
-msgstr "Lista de precio de costo por hora a lo largo del tiempo"
-
-msgctxt "help:company.employee_cost_price,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 "view:company.employee:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Precios de costo"
-
msgctxt "view:project.work:"
msgid "Cost"
msgstr "Costo"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index a7047eb..557d5bf 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,62 +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"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Precios de Costo"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-msgstr "Gestión de Moneda"
-
-msgctxt "field:company.employee_cost_price,cost_price:"
-msgid "Cost Price"
-msgstr "Precio de Costo"
-
-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 "Creado por Usuario"
-
-msgctxt "field:company.employee_cost_price,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de Moneda"
-
-msgctxt "field:company.employee_cost_price,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:company.employee_cost_price,employee:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "field:company.employee_cost_price,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "Name"
-msgstr "Nombre de Contacto"
-
-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 "Modificado por Usuario"
-
msgctxt "field:project.work,cost:"
msgid "Cost"
msgstr "Costo"
@@ -68,40 +12,16 @@ msgstr "Decimales de Moneda"
msgctxt "field:project.work,list_price:"
msgid "List Price"
-msgstr "Precio de Lista"
+msgstr "Precio de Venta"
msgctxt "field:project.work,product:"
msgid "Product"
-msgstr "Productos"
+msgstr "Producto"
msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Ingresos"
-msgctxt "help:company.employee,cost_price:"
-msgid "Hourly cost price for this Employee"
-msgstr "Costo por hora del empleado"
-
-msgctxt "help:company.employee,cost_prices:"
-msgid "List of hourly cost price over time"
-msgstr "Lista de costo por hora de tiempo extra"
-
-msgctxt "help:company.employee_cost_price,cost_price:"
-msgid "Hourly cost price"
-msgstr "Costo por hora"
-
-msgctxt "model:company.employee_cost_price,name:"
-msgid "Employee Cost Price"
-msgstr "Costo por Empleado"
-
-msgctxt "view:company.employee:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Precio de Costo"
-
msgctxt "view:project.work:"
msgid "Cost"
msgstr "Costo"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index a866d37..e2e2fa1 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,62 +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"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Precios de coste"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de la moneda"
-
-msgctxt "field:company.employee_cost_price,cost_price:"
-msgid "Cost Price"
-msgstr "Precio de coste"
-
-msgctxt "field:company.employee_cost_price,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:company.employee_cost_price,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:company.employee_cost_price,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de la moneda"
-
-msgctxt "field:company.employee_cost_price,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:company.employee_cost_price,employee:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "field:company.employee_cost_price,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:company.employee_cost_price,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:company.employee_cost_price,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
msgctxt "field:project.work,cost:"
msgid "Cost"
msgstr "Coste"
@@ -78,30 +22,6 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Ingresos"
-msgctxt "help:company.employee,cost_price:"
-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."
-
-msgctxt "help:company.employee_cost_price,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 "view:company.employee:"
-msgid "Cost"
-msgstr "Coste"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Precios de coste"
-
msgctxt "view:project.work:"
msgid "Cost"
msgstr "Coste"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index ca5ff9d..7e1da76 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,62 +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"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Prix de revient"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-msgstr "Décimales de la devise"
-
-msgctxt "field:company.employee_cost_price,cost_price:"
-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,currency_digits:"
-msgid "Currency Digits"
-msgstr "Décimales de la devise"
-
-msgctxt "field:company.employee_cost_price,date:"
-msgid "Date"
-msgstr "Date"
-
-msgctxt "field:company.employee_cost_price,employee:"
-msgid "Employee"
-msgstr "Employé"
-
-msgctxt "field:company.employee_cost_price,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-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:project.work,cost:"
msgid "Cost"
msgstr "Coût"
@@ -78,30 +22,6 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Revenu"
-msgctxt "help:company.employee,cost_price:"
-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"
-
-msgctxt "help:company.employee_cost_price,cost_price:"
-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 "view:company.employee:"
-msgid "Cost"
-msgstr "Coût"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Prix de revient"
-
msgctxt "view:project.work:"
msgid "Cost"
msgstr "Coût"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 65a3bc7..ff670b0 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,69 +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 ""
-
-#, fuzzy
-msgctxt "field:company.employee,cost_price:"
-msgid "Cost Price"
-msgstr "Kostprijs"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-msgstr "Valuta decimalen"
-
-#, fuzzy
-msgctxt "field:company.employee_cost_price,cost_price:"
-msgid "Cost Price"
-msgstr "Kostprijs"
-
-msgctxt "field:company.employee_cost_price,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:company.employee_cost_price,create_uid:"
-msgid "Create User"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:company.employee_cost_price,currency_digits:"
-msgid "Currency Digits"
-msgstr "Valuta decimalen"
-
-#, fuzzy
-msgctxt "field:company.employee_cost_price,date:"
-msgid "Date"
-msgstr "Vervaldatum"
-
-#, fuzzy
-msgctxt "field:company.employee_cost_price,employee:"
-msgid "Employee"
-msgstr "Werknemer"
-
-msgctxt "field:company.employee_cost_price,id:"
-msgid "ID"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
-
-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:project.work,cost:"
msgid "Cost"
msgstr ""
@@ -88,27 +25,3 @@ msgstr "Producten"
msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Opbrengst"
-
-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 ""
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 4470de9..37adc4f 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,62 +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 "Себестоимость"
-
-msgctxt "field:company.employee,cost_prices:"
-msgid "Cost Prices"
-msgstr "Себестоимость"
-
-msgctxt "field:company.employee,currency_digits:"
-msgid "Currency Digits"
-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,currency_digits:"
-msgid "Currency Digits"
-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 "ID"
-
-msgctxt "field:company.employee_cost_price,rec_name:"
-msgid "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:project.work,cost:"
msgid "Cost"
msgstr "Стоимость"
@@ -77,27 +21,3 @@ msgstr "Продукт"
msgctxt "field:project.work,revenue:"
msgid "Revenue"
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 "Стоимость"
-
-msgctxt "view:company.employee_cost_price:"
-msgid "Cost Prices"
-msgstr "Себестоимость"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..9bd05d7
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:project.work,cost:"
+msgid "Cost"
+msgstr "Strošek"
+
+msgctxt "field:project.work,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimalke"
+
+msgctxt "field:project.work,list_price:"
+msgid "List Price"
+msgstr "Prodajna cena"
+
+msgctxt "field:project.work,product:"
+msgid "Product"
+msgstr "Izdelek"
+
+msgctxt "field:project.work,revenue:"
+msgid "Revenue"
+msgstr "Prihodki"
diff --git a/service.py b/service.py
deleted file mode 100644
index 8a80468..0000000
--- a/service.py
+++ /dev/null
@@ -1,140 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-from decimal import Decimal
-from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Eval
-from trytond.cache import Cache
-from trytond.transaction import Transaction
-from trytond.pool import Pool, PoolMeta
-
-__all__ = ['Employee', 'EmployeeCostPrice']
-__metaclass__ = PoolMeta
-
-
-class Employee:
- __name__ = 'company.employee'
- cost_price = fields.Function(fields.Numeric('Cost Price',
- digits=(16, Eval('currency_digits', 2)), depends=['currency_digits'],
- 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")
- currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['company']), 'on_change_with_currency_digits')
- _cost_prices_cache = Cache('company_employee.cost_prices')
-
- def get_cost_price(self, name):
- '''
- Return the cost price at the date given in the context or the
- current date
- '''
- ctx_date = Transaction().context.get('date', None)
- return self.compute_cost_price(ctx_date)
-
- def compute_cost_price(self, date=None):
- pool = Pool()
- Date = pool.get('ir.date')
- CostPrice = pool.get('company.employee_cost_price')
-
- # Get from cache employee costs or fetch them from the db
- employee_costs = self._cost_prices_cache.get(self.id)
- if employee_costs is None:
- cost_prices = CostPrice.search([
- ('employee', '=', self.id),
- ], order=[('date', 'ASC')])
-
- employee_costs = []
- for cost_price in cost_prices:
- employee_costs.append(
- (cost_price.date, cost_price.cost_price))
- self._cost_prices_cache.set(self.id, employee_costs)
-
- if date is None:
- date = Date.today()
- # compute the cost price for the given date
- cost = 0
- if employee_costs and date >= employee_costs[0][0]:
- for edate, ecost in employee_costs:
- if date >= edate:
- cost = ecost
- else:
- break
- return cost
-
- def on_change_with_currency_digits(self, name=None):
- if self.company:
- return self.company.currency.digits
- return 2
-
- @staticmethod
- def default_currency_digits():
- Company = Pool().get('company.company')
- company = Transaction().context.get('company')
- if company:
- company = Company(company)
- return company.currency.digits
- return 2
-
-
-class EmployeeCostPrice(ModelSQL, ModelView):
- 'Employee Cost Price'
- __name__ = 'company.employee_cost_price'
- _rec_name = 'date'
- date = fields.Date('Date', required=True, select=True)
- cost_price = fields.Numeric('Cost Price',
- digits=(16, Eval('currency_digits', 2)),
- required=True, depends=['currency_digits'],
- help="Hourly cost price")
- employee = fields.Many2One('company.employee', 'Employee')
- currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['employee']), 'on_change_with_currency_digits')
-
- @classmethod
- def __setup__(cls):
- super(EmployeeCostPrice, cls).__setup__()
- cls._sql_constraints = [
- ('date_cost_price_uniq', 'UNIQUE(date, cost_price)',
- 'A employee can only have one cost price by date.'),
- ]
- cls._order.insert(0, ('date', 'DESC'))
-
- @staticmethod
- def default_cost_price():
- return Decimal(0)
-
- @staticmethod
- def default_date():
- Date = Pool().get('ir.date')
- return Date.today()
-
- @classmethod
- def delete(cls, prices):
- Employee = Pool().get('company.employee')
- super(EmployeeCostPrice, cls).delete(prices)
- Employee._cost_prices_cache.clear()
-
- @classmethod
- def create(cls, vlist):
- Employee = Pool().get('company.employee')
- prices = super(EmployeeCostPrice, cls).create(vlist)
- Employee._cost_prices_cache.clear()
- return prices
-
- @classmethod
- def write(cls, prices, vals):
- Employee = Pool().get('company.employee')
- super(EmployeeCostPrice, cls).write(prices, vals)
- Employee._cost_prices_cache.clear()
-
- def on_change_with_currency_digits(self, name=None):
- if self.employee:
- return self.employee.company.currency.digits
- return 2
-
- @staticmethod
- def default_currency_digits():
- Company = Pool().get('company.company')
- company = Transaction().context.get('company')
- if company:
- company = Company(company)
- return company.currency.digits
- return 2
diff --git a/service.xml b/service.xml
deleted file mode 100644
index 375e04f..0000000
--- a/service.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<tryton>
- <data>
- <record model="ir.ui.view" id="cost_price_view_form">
- <field name="model">company.employee_cost_price</field>
- <field name="type">form</field>
- <field name="name">employee_cost_price_form</field>
- </record>
-
- <record model="ir.ui.view" id="cost_price_view_tree">
- <field name="model">company.employee_cost_price</field>
- <field name="type">tree</field>
- <field name="name">employee_cost_price_tree</field>
- </record>
-
-
- <record model="ir.ui.view" id="employee_view_form">
- <field name="model">company.employee</field>
- <field name="inherit" ref="company.employee_view_form"/>
- <field name="name">employee_form</field>
- </record>
- </data>
-</tryton>
diff --git a/setup.py b/setup.py
index 0042749..65568cf 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(name='trytond_project_revenue',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 4f77c86..910bb7c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_project_revenue import suite
+
+__all__ = ['suite']
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index f29ad77..94cdec1 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -10,13 +10,9 @@ if os.path.isdir(DIR):
sys.path.insert(0, os.path.dirname(DIR))
import unittest
-import datetime
-from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
- test_depends
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import test_view, test_depends
class ProjectRevenueTestCase(unittest.TestCase):
@@ -26,10 +22,6 @@ class ProjectRevenueTestCase(unittest.TestCase):
def setUp(self):
trytond.tests.test_tryton.install_module('project_revenue')
- self.party = POOL.get('party.party')
- self.employee = POOL.get('company.employee')
- self.employee_cost_price = POOL.get('company.employee_cost_price')
- self.company = POOL.get('company.company')
def test0005views(self):
'''
@@ -43,46 +35,9 @@ class ProjectRevenueTestCase(unittest.TestCase):
'''
test_depends()
- def test0010compute_cost_price(self):
- '''
- Test compute_cost_price
- '''
- cost_prices = [
- (datetime.date(2011, 1, 1), Decimal(10)),
- (datetime.date(2012, 1, 1), Decimal(15)),
- (datetime.date(2013, 1, 1), Decimal(20)),
- ]
- test_prices = [
- (datetime.date(2010, 1, 1), 0),
- (datetime.date(2011, 1, 1), Decimal(10)),
- (datetime.date(2011, 6, 1), Decimal(10)),
- (datetime.date(2012, 1, 1), Decimal(15)),
- (datetime.date(2012, 6, 1), Decimal(15)),
- (datetime.date(2013, 1, 1), Decimal(20)),
- (datetime.date(2013, 6, 1), Decimal(20)),
- ]
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- company, = self.company.search([('rec_name', '=', 'B2CK')])
- party = self.party(name='Pam Beesly')
- party.save()
- employee = self.employee(party=party.id,
- company=company)
- employee.save()
- for date, cost_price in cost_prices:
- self.employee_cost_price(
- employee=employee,
- date=date,
- cost_price=cost_price).save()
- for date, cost_price in test_prices:
- self.assertEqual(employee.compute_cost_price(date), cost_price)
-
def suite():
suite = trytond.tests.test_tryton.suite()
- from trytond.modules.company.tests import test_company
- for test in test_company.suite():
- if test not in suite:
- suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
ProjectRevenueTestCase))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 3f2e6cb..475c48d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,11 +1,11 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
project
timesheet
+ timesheet_cost
company
product
xml:
- service.xml
work.xml
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 04b4256..21456a6 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-project-revenue
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add cost/revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_project_revenue
=======================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index 9414023..ad0fd51 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -4,12 +4,10 @@ INSTALL
LICENSE
MANIFEST.in
README
-service.xml
setup.py
tryton.cfg
work.xml
./__init__.py
-./service.py
./work.py
./tests/__init__.py
./tests/test_project_revenue.py
@@ -23,6 +21,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_project_revenue.egg-info/PKG-INFO
trytond_project_revenue.egg-info/SOURCES.txt
trytond_project_revenue.egg-info/dependency_links.txt
@@ -30,9 +29,6 @@ trytond_project_revenue.egg-info/entry_points.txt
trytond_project_revenue.egg-info/not-zip-safe
trytond_project_revenue.egg-info/requires.txt
trytond_project_revenue.egg-info/top_level.txt
-view/employee_cost_price_form.xml
-view/employee_cost_price_tree.xml
-view/employee_form.xml
view/work_form.xml
view/work_list2.xml
view/work_tree.xml
\ No newline at end of file
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 34972e8..40d7800 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,5 +1,6 @@
-trytond_project >= 2.8, < 2.9
-trytond_timesheet >= 2.8, < 2.9
-trytond_company >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_project >= 3.0, < 3.1
+trytond_timesheet >= 3.0, < 3.1
+trytond_timesheet_cost >= 3.0, < 3.1
+trytond_company >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/employee_cost_price_form.xml b/view/employee_cost_price_form.xml
deleted file mode 100644
index 7d670c9..0000000
--- a/view/employee_cost_price_form.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<form string="Cost Prices">
- <label name="date"/>
- <field name="date"/>
- <label name="cost_price"/>
- <field name="cost_price"/>
- <label name="employee"/>
- <field name="employee"/>
-</form>
diff --git a/view/employee_cost_price_tree.xml b/view/employee_cost_price_tree.xml
deleted file mode 100644
index 93d4c90..0000000
--- a/view/employee_cost_price_tree.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<tree string="Cost Prices">
- <field name="date"/>
- <field name="cost_price"/>
-</tree>
diff --git a/view/employee_form.xml b/view/employee_form.xml
deleted file mode 100644
index 21ccb41..0000000
--- a/view/employee_form.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<data>
- <xpath expr="/form/field[@name='company']" position="after">
- <separator string="Cost" id="cost_prices" colspan="4"/>
- <label name="cost_price"/>
- <field name="cost_price"/>
- <field name="cost_prices" colspan="4"/>
- </xpath>
-</data>
diff --git a/work.py b/work.py
index b280929..d53a68b 100644
--- a/work.py
+++ b/work.py
@@ -1,37 +1,25 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
+import datetime
+
from trytond.model import fields
-from trytond.pyson import Eval
+from trytond.pyson import Eval, Id
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
+from trytond.tools import reduce_ids
-__all__ = ['TimesheetLine', 'Work']
+__all__ = ['Work']
__metaclass__ = PoolMeta
-class TimesheetLine:
- __name__ = 'timesheet.line'
-
- def compute_cost(self):
- Currency = Pool().get('currency.currency')
-
- cost_price = self.employee.compute_cost_price(date=self.date)
-
- line_company = self.employee.company
- work_company = self.work.company
- if (line_company != work_company and
- line_company.currency != work_company.currency):
- with Transaction().set_context(date=self.date):
- cost_price = Currency.compute(line_company.currency,
- cost_price, work_company.currency)
-
- return Decimal(str(self.hours)) * cost_price
-
-
class Work:
__name__ = 'project.work'
product = fields.Many2One('product.product', 'Product',
+ domain=[
+ ('type', '=', 'service'),
+ ('default_uom_category', '=', Id('product', 'uom_cat_time')),
+ ],
states={
'invisible': ~Eval('timesheet_available'),
},
@@ -53,12 +41,51 @@ class Work:
@classmethod
def get_cost(cls, works, name):
+ pool = Pool()
+ Employee = pool.get('company.employee')
+ Line = pool.get('timesheet.line')
+ Work = pool.get('timesheet.work')
+ transaction = Transaction()
+ cursor = transaction.cursor
+ in_max = cursor.IN_MAX
+
works += cls.search([
('parent', 'child_of', [w.id for w in works]),
('active', '=', True)]) + works
-
- return cls.sum_tree(works, lambda w: (sum(t.compute_cost()
- for t in w.work.timesheet_lines) or Decimal(0)))
+ costs = dict.fromkeys([w.id for w in works], 0)
+ works_to_timesheet = dict((w.work.id, w.id) for w in works)
+
+ table_w = Work.__table__()
+ table_c = Work.__table__()
+ line = Line.__table__()
+
+ timesheet_work_ids = works_to_timesheet.keys()
+ employee_ids = set()
+ for i in range(0, len(timesheet_work_ids), in_max):
+ sub_ids = timesheet_work_ids[i:i + in_max]
+ red_sql = reduce_ids(table_w.id, sub_ids)
+ cursor.execute(*table_w.join(table_c,
+ condition=(table_c.left >= table_w.left)
+ & (table_c.right <= table_w.right)
+ ).join(line, condition=line.work == table_c.id
+ ).select(line.employee,
+ where=red_sql,
+ group_by=line.employee))
+ employee_ids |= set(r[0] for r in cursor.fetchall())
+ for employee in Employee.browse(list(employee_ids)):
+ employee_costs = employee.get_employee_costs()
+ to_date = None
+ for from_date, cost in reversed(employee_costs):
+ with transaction.set_context(
+ from_date=from_date,
+ to_date=to_date,
+ employees=[employee.id]):
+ for timesheet_work in Work.browse(timesheet_work_ids):
+ work_id = works_to_timesheet[timesheet_work.id]
+ costs[work_id] += (
+ Decimal(str(timesheet_work.hours)) * cost)
+ to_date = from_date - datetime.timedelta(1)
+ return costs
@classmethod
def get_revenue(cls, works, name):
commit 5d3dba4b93c848cb5adcdb252f7a1d4be93ad4d3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:21:03 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index 1244d94..292bc94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-project-revenue (2.8.0-3) unstable; urgency=low
+
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:33:20 +0200
+
tryton-modules-project-revenue (2.8.0-2) unstable; urgency=low
* Removing needless empty line in rules.
commit 6d06ced932ef03d6f409170d51ecfd8dd5985394
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 70edce291f35f84116b539099543f380419adddd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:33 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index b330147..1244d94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-project-revenue (2.8.0-2) unstable; urgency=low
+
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:27:02 +0200
+
tryton-modules-project-revenue (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 1dc506b2ebf74213df784548ab679dd4adbc3b96
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit 1e8ad6ed5668fcb7bfaa321e46dc0ecb4ec9afb8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:09 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 3808cf5..b330147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project-revenue (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:20:39 +0200
+
tryton-modules-project-revenue (2.6.0-4) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704394).
commit 94adbb241bdb852e3d14f455bd3bc9ab74e5ce6e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:11 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 4186674..43ff1f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2012 Cédric Krier
- 2008-2012 B2CK SPRL
+Copyright: 2008-2013 Cédric Krier
+ 2008-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 45baff1f13674b0729cf3a4783fd7b6be77bb428
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:16 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1664a8d..ef04e90 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index d3682c5..cf5f3f9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2012 Cédric Krier.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2013 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 --git a/MANIFEST.in b/MANIFEST.in
index 97a9596..2569955 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index af57f75..9a033cc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add cost/revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_project_revenue
=======================
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index e6e0de4..d2818a5 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,8 @@ 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 "Служител може да има само една себестойност за ден!"
+msgid "A employee can only have one cost price by date."
+msgstr ""
msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 7a751d8..ee83412 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,8 +3,8 @@ 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"
+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"
@@ -26,10 +26,9 @@ msgctxt "field:company.employee_cost_price,create_date:"
msgid "Create Date"
msgstr "Data creació"
-#, fuzzy
msgctxt "field:company.employee_cost_price,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
@@ -99,10 +98,6 @@ msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Cost"
-msgctxt "view:company.employee:"
-msgid "Services"
-msgstr "Serveis"
-
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Preus de cost"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 99e19db..69b56c6 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ 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!"
+msgid "A employee can only have one cost price by date."
msgstr ""
msgctxt "field:company.employee,cost_price:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index faf9783..1d38158 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,9 +3,10 @@ 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!"
+msgid "A employee can only have one cost price by date."
msgstr ""
-"Einem Mitarbeiter kann nur ein Kostenpreis pro Datum zugeordnet werden!"
+"Es kann nur ein Kostenpreis pro Datum für einen Mitarbeiter eingetragen "
+"werden."
msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
@@ -99,10 +100,6 @@ msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Kosten"
-msgctxt "view:company.employee:"
-msgid "Services"
-msgstr "Leistungen"
-
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Kostenpreise"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index e4f24b0..47ecc1f 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,8 +3,8 @@ 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 solo puede tener un precio de costo por fecha!"
+msgid "A employee can only have one cost price by date."
+msgstr "Un empleado sólo puede disponer de un precio de costo por fecha."
msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
@@ -16,7 +16,7 @@ msgstr "Precios de costo"
msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Dígitos de divisa"
msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
@@ -32,7 +32,7 @@ msgstr "Usuario creación"
msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Dígitos de divisa"
msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
@@ -64,7 +64,7 @@ msgstr "Costo"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Dígitos de divisa"
msgctxt "field:project.work,list_price:"
msgid "List Price"
@@ -76,7 +76,7 @@ msgstr "Producto"
msgctxt "field:project.work,revenue:"
msgid "Revenue"
-msgstr "Beneficio"
+msgstr "Ingresos"
msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
@@ -98,10 +98,6 @@ msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Costo"
-msgctxt "view:company.employee:"
-msgid "Services"
-msgstr "Servicios"
-
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Precios de costo"
@@ -112,4 +108,4 @@ msgstr "Costo"
msgctxt "view:project.work:"
msgid "Revenue"
-msgstr "Beneficio"
+msgstr "Ingresos"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 3f53bf7..a7047eb 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,8 +3,8 @@ 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 solo puede tener un precio de costo por fecha!"
+msgid "A employee can only have one cost price by date."
+msgstr ""
msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
@@ -98,10 +98,6 @@ msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Costo"
-msgctxt "view:company.employee:"
-msgid "Services"
-msgstr "Servicios"
-
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Precio de Costo"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 25f221e..a866d37 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,8 +3,8 @@ 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 tener un precio de coste por fecha."
+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"
@@ -98,10 +98,6 @@ msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Coste"
-msgctxt "view:company.employee:"
-msgid "Services"
-msgstr "Servicios"
-
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Precios de coste"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 2d0617e..ca5ff9d 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,8 +3,8 @@ 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 !"
+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"
@@ -98,10 +98,6 @@ msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Coût"
-msgctxt "view:company.employee:"
-msgid "Services"
-msgstr "Services"
-
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Prix de revient"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index ce7113f..65a3bc7 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,7 +3,7 @@ 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!"
+msgid "A employee can only have one cost price by date."
msgstr ""
#, fuzzy
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 17d5f57..4470de9 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,108 +3,101 @@ 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 ""
+msgid "A employee can only have one cost price by date."
+msgstr "У сотрудника может быть только одна себестоимость за день."
-#, fuzzy
msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
-msgstr "Цена за единицу"
+msgstr "Себестоимость"
msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
-msgstr ""
+msgstr "Себестоимость"
msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
-#, fuzzy
msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
-msgstr "Цена за единицу"
+msgstr "Себестоимость"
msgctxt "field:company.employee_cost_price,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:company.employee_cost_price,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
-#, fuzzy
msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Дата"
-#, fuzzy
msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Сотрудник"
msgctxt "field:company.employee_cost_price,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:company.employee_cost_price,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:company.employee_cost_price,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:project.work,cost:"
msgid "Cost"
-msgstr ""
+msgstr "Стоимость"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
-#, fuzzy
msgctxt "field:project.work,list_price:"
msgid "List Price"
-msgstr "Прайс-лист"
+msgstr "Цена"
-#, fuzzy
msgctxt "field:project.work,product:"
msgid "Product"
-msgstr "Товарно материальные ценности (ТМЦ)"
+msgstr "Продукт"
msgctxt "field:project.work,revenue:"
msgid "Revenue"
-msgstr ""
+msgstr "Доходы"
msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
-msgstr ""
+msgstr "Часовая себестоимость для этого сотрудника"
msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
-msgstr ""
+msgstr "Список часовой себестоимости по времени"
msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
-msgstr ""
+msgstr "Часовая себестоимость"
msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
-msgstr ""
+msgstr "Себестоимость сотрудника"
msgctxt "view:company.employee:"
msgid "Cost"
-msgstr ""
+msgstr "Стоимость"
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
-msgstr ""
+msgstr "Себестоимость"
diff --git a/service.py b/service.py
index 7bcb8b9..8a80468 100644
--- a/service.py
+++ b/service.py
@@ -93,7 +93,7 @@ class EmployeeCostPrice(ModelSQL, ModelView):
super(EmployeeCostPrice, cls).__setup__()
cls._sql_constraints = [
('date_cost_price_uniq', 'UNIQUE(date, cost_price)',
- 'A employee can only have one cost price by date!'),
+ 'A employee can only have one cost price by date.'),
]
cls._order.insert(0, ('date', 'DESC'))
@@ -113,11 +113,11 @@ class EmployeeCostPrice(ModelSQL, ModelView):
Employee._cost_prices_cache.clear()
@classmethod
- def create(cls, vals):
+ def create(cls, vlist):
Employee = Pool().get('company.employee')
- price = super(EmployeeCostPrice, cls).create(vals)
+ prices = super(EmployeeCostPrice, cls).create(vlist)
Employee._cost_prices_cache.clear()
- return price
+ return prices
@classmethod
def write(cls, prices, vals):
diff --git a/service.xml b/service.xml
index a265eaa..375e04f 100644
--- a/service.xml
+++ b/service.xml
@@ -6,69 +6,20 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="cost_price_view_form">
<field name="model">company.employee_cost_price</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Cost Prices">
- <label name="date"/>
- <field name="date"/>
- <label name="cost_price"/>
- <field name="cost_price"/>
- <label name="employee"/>
- <field name="employee"/>
- </form>
- ]]>
- </field>
+ <field name="name">employee_cost_price_form</field>
</record>
<record model="ir.ui.view" id="cost_price_view_tree">
<field name="model">company.employee_cost_price</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Cost Prices">
- <field name="date"/>
- <field name="cost_price"/>
- </tree>
- ]]>
- </field>
+ <field name="name">employee_cost_price_tree</field>
</record>
<record model="ir.ui.view" id="employee_view_form">
<field name="model">company.employee</field>
<field name="inherit" ref="company.employee_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page[@id="general"]"
- position="after">
- <page string="Cost" id="cost_prices">
- <label name="cost_price"/>
- <field name="cost_price"/>
- <field name="cost_prices" colspan="4"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
- </record>
- <record model="ir.ui.view" id="employee_view_form2">
- <field name="model">company.employee</field>
- <field name="inherit" ref="company.employee_view_form2"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/field[@name='company']"
- position="after">
- <label name="cost_price"/>
- <field name="cost_price"/>
- <field name="cost_prices" colspan="4"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">employee_form</field>
</record>
</data>
</tryton>
diff --git a/setup.py b/setup.py
index d9373fe..0042749 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_project_revenue',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_project_revenue',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.project_revenue': '.'},
packages=[
'trytond.modules.project_revenue',
'trytond.modules.project_revenue.tests',
],
package_data={
- 'trytond.modules.project_revenue': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.project_revenue': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -57,6 +57,7 @@ setup(name='trytond_project_revenue',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index 2a40fb1..f29ad77 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -26,6 +26,7 @@ class ProjectRevenueTestCase(unittest.TestCase):
def setUp(self):
trytond.tests.test_tryton.install_module('project_revenue')
+ self.party = POOL.get('party.party')
self.employee = POOL.get('company.employee')
self.employee_cost_price = POOL.get('company.employee_cost_price')
self.company = POOL.get('company.company')
@@ -61,8 +62,10 @@ class ProjectRevenueTestCase(unittest.TestCase):
(datetime.date(2013, 6, 1), Decimal(20)),
]
with Transaction().start(DB_NAME, USER, context=CONTEXT):
- company, = self.company.search([('name', '=', 'B2CK')])
- employee = self.employee(name='Pam Beesly',
+ company, = self.company.search([('rec_name', '=', 'B2CK')])
+ party = self.party(name='Pam Beesly')
+ party.save()
+ employee = self.employee(party=party.id,
company=company)
employee.save()
for date, cost_price in cost_prices:
diff --git a/tryton.cfg b/tryton.cfg
index 72df382..3f2e6cb 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 18f0cf5..04b4256 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-project-revenue
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add cost/revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_project_revenue
=======================
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index 5f35d48..9414023 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -29,4 +29,10 @@ trytond_project_revenue.egg-info/dependency_links.txt
trytond_project_revenue.egg-info/entry_points.txt
trytond_project_revenue.egg-info/not-zip-safe
trytond_project_revenue.egg-info/requires.txt
-trytond_project_revenue.egg-info/top_level.txt
\ No newline at end of file
+trytond_project_revenue.egg-info/top_level.txt
+view/employee_cost_price_form.xml
+view/employee_cost_price_tree.xml
+view/employee_form.xml
+view/work_form.xml
+view/work_list2.xml
+view/work_tree.xml
\ No newline at end of file
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index e329932..34972e8 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_project >= 2.6, < 2.7
-trytond_timesheet >= 2.6, < 2.7
-trytond_company >= 2.6, < 2.7
-trytond_product >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_project >= 2.8, < 2.9
+trytond_timesheet >= 2.8, < 2.9
+trytond_company >= 2.8, < 2.9
+trytond_product >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/employee_cost_price_form.xml b/view/employee_cost_price_form.xml
new file mode 100644
index 0000000..7d670c9
--- /dev/null
+++ b/view/employee_cost_price_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Cost Prices">
+ <label name="date"/>
+ <field name="date"/>
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+ <label name="employee"/>
+ <field name="employee"/>
+</form>
diff --git a/view/employee_cost_price_tree.xml b/view/employee_cost_price_tree.xml
new file mode 100644
index 0000000..93d4c90
--- /dev/null
+++ b/view/employee_cost_price_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Cost Prices">
+ <field name="date"/>
+ <field name="cost_price"/>
+</tree>
diff --git a/view/employee_form.xml b/view/employee_form.xml
new file mode 100644
index 0000000..21ccb41
--- /dev/null
+++ b/view/employee_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/form/field[@name='company']" position="after">
+ <separator string="Cost" id="cost_prices" colspan="4"/>
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+ <field name="cost_prices" colspan="4"/>
+ </xpath>
+</data>
diff --git a/view/work_form.xml b/view/work_form.xml
new file mode 100644
index 0000000..2efe9b5
--- /dev/null
+++ b/view/work_form.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/form/notebook/page[@id='general']/field[@name='effort']"
+ position="after">
+ <label name="product"/>
+ <field name="product"/>
+ <label name="list_price"/>
+ <field name="list_price"/>
+ <newline/>
+ </xpath>
+ <xpath expr="/form/notebook/page[@id='general']/field[@name='total_effort']"
+ position="after">
+ <newline/>
+ <label name="cost"/>
+ <field name="cost"/>
+ <label name="revenue"/>
+ <field name="revenue"/>
+ </xpath>
+</data>
diff --git a/view/work_list2.xml b/view/work_list2.xml
new file mode 100644
index 0000000..33ec82f
--- /dev/null
+++ b/view/work_list2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/tree/field[@name='total_effort']" position="after">
+ <field name="product"/>
+ <field name="list_price"/>
+ <field name="cost"/>
+ </xpath>
+</data>
diff --git a/view/work_tree.xml b/view/work_tree.xml
new file mode 100644
index 0000000..ee7972a
--- /dev/null
+++ b/view/work_tree.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/tree/field[@name='total_effort']" position="after">
+ <field name="product"/>
+ <field name="list_price"/>
+ <field name="revenue"/>
+ <field name="cost"/>
+ </xpath>
+</data>
diff --git a/work.py b/work.py
index ea4c0bd..b280929 100644
--- a/work.py
+++ b/work.py
@@ -56,74 +56,23 @@ class Work:
works += cls.search([
('parent', 'child_of', [w.id for w in works]),
('active', '=', True)]) + works
- works = set(works)
-
- costs = {}
- id2work = {}
- leafs = set()
- for work in works:
- id2work[work.id] = work
- if not work.children:
- leafs.add(work.id)
-
- costs[work.id] = Decimal('0')
- for ts_line in work.timesheet_lines:
- costs[work.id] += ts_line.compute_cost()
-
- while leafs:
- for work_id in leafs:
- work = id2work[work_id]
- works.remove(work)
- if not work.active:
- continue
- if work.parent and work.parent.id in costs:
- costs[work.parent.id] += costs[work_id]
- next_leafs = set(w.id for w in works)
- for work in works:
- if not work.parent:
- continue
- if work.parent.id in next_leafs and work.parent in works:
- next_leafs.remove(work.parent.id)
- leafs = next_leafs
- return costs
+
+ return cls.sum_tree(works, lambda w: (sum(t.compute_cost()
+ for t in w.work.timesheet_lines) or Decimal(0)))
@classmethod
def get_revenue(cls, works, name):
works = cls.search([
('parent', 'child_of', [w.id for w in works]),
('active', '=', True)]) + works
- works = set(works)
-
- revenues = {}
- id2work = {}
- leafs = set()
- for work in works:
- id2work[work.id] = work
- if not work.children:
- leafs.add(work.id)
-
- if work.type == 'task' and work.list_price:
- revenues[work.id] = (work.list_price
- * Decimal(str(work.total_effort)))
+
+ def getter(work):
+ if work.list_price:
+ return work.list_price * Decimal(str(work.total_effort))
else:
- revenues[work.id] = Decimal('0')
-
- while leafs:
- for work_id in leafs:
- work = id2work[work_id]
- works.remove(work)
- if not work.active:
- continue
- if work.parent and work.parent.id in revenues:
- revenues[work.parent.id] += revenues[work_id]
- next_leafs = set(w.id for w in works)
- for work in works:
- if not work.parent:
- continue
- if work.parent.id in next_leafs and work.parent in works:
- next_leafs.remove(work.parent.id)
- leafs = next_leafs
- return revenues
+ return Decimal(0)
+
+ return cls.sum_tree(works, getter)
def on_change_with_currency_digits(self, name=None):
if self.company:
diff --git a/work.xml b/work.xml
index 017afdc..17fbdbe 100644
--- a/work.xml
+++ b/work.xml
@@ -7,61 +7,19 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="work_view_form">
<field name="model">project.work</field>
<field name="inherit" ref="project.work_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/notebook/page[@id='general']/label[@name='hours']"
- position="before">
- <label name="product"/>
- <field name="product"/>
- <label name="list_price"/>
- <field name="list_price"/>
- <newline/>
- </xpath>
- <xpath expr="/form/notebook/page[@id='general']/field[@name='effort']"
- position="after">
- <label name="cost"/>
- <field name="cost"/>
- <label name="revenue"/>
- <field name="revenue"/>
- <newline/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">work_form</field>
</record>
<record model="ir.ui.view" id="work_view_tree">
<field name="model">project.work</field>
<field name="inherit" ref="project.work_view_tree"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/tree/field[@name='total_effort']" position="after">
- <field name="product"/>
- <field name="list_price"/>
- <field name="revenue"/>
- <field name="cost"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">work_tree</field>
</record>
<record model="ir.ui.view" id="work_view_list2">
<field name="model">project.work</field>
<field name="inherit" ref="project.work_view_list2"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/tree/field[@name='total_effort']" position="after">
- <field name="product"/>
- <field name="list_price"/>
- <field name="cost"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">work_list2</field>
</record>
</data>
commit 62d0e9e3e635fe6304d0b91efd8bd4979445516b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:53 2013 +0200
Releasing debian version 2.6.0-4.
diff --git a/debian/changelog b/debian/changelog
index 845c445..3808cf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project-revenue (2.6.0-4) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704394).
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:08:25 +0200
+
tryton-modules-project-revenue (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 231117978f5ce1db5fa4ba3cc6977ba838389421
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 4a4d00b..2996292 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,11 @@ X-Python-Version: >= 2.6
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-company (>= 2.6), tryton-modules-product (>= 2.6),
- tryton-modules-project (>= 2.6), tryton-modules-timesheet (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}),
+ tryton-modules-project (>= ${version:major}),
+ tryton-modules-timesheet (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Project Revenue Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit 669e8869972c0c9ceec201d80ef79b6b337880cb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:35:17 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704394).
diff --git a/debian/control b/debian/control
index 1e429c7..4a4d00b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-project-revenue
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit e09ddde0abdd72b85e444a8b98d46a76940b19c8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:04:11 2013 +0100
Releasing debian version 2.6.0-3.
diff --git a/debian/changelog b/debian/changelog
index dd0f059..845c445 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project-revenue (2.6.0-3) experimental; urgency=low
+
+ * Updating Vcs-Git to correct address.
+ * Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 Mar 2013 14:01:05 +0100
+
tryton-modules-project-revenue (2.6.0-2) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit dca40170b3b2508f49d3ba3e3a12f17dde4fc58c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 13:52:33 2013 +0100
Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..c716f88
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_project_revenue-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 45eebcabab5b9ae7663c87852503b751e8e65208
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:11 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index 73e28d6..1e429c7 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project-revenue.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-project-revenue.git
X-Python-Version: >= 2.6
Package: tryton-modules-project-revenue
commit 5fd7a1419e2ec8abf4354404ee9a94a44b21d487
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:45 2013 +0100
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 5c42d43..dd0f059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project-revenue (2.6.0-2) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:41:43 +0100
+
tryton-modules-project-revenue (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit bfba1a0dbfe4fe3193158c7f6aec5cb4eb375fa5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:20 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 9a6d1e6..4186674 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,14 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2008-2012 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit d695e75f819b4876149172094d1775e9a095f516
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:35 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 7b3c117..73e28d6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project-revenue.git
commit 0110cf4b84464348004f7c8aedbfb010d00d5e02
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 13 21:37:13 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 1ca57c0..7b3c117 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
commit f1ac0f2d404260ada9abe3d21dbb2739dee7bc3b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:02:09 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index 80d77fc..5c42d43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project-revenue (2.6.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.6.0.
+ * Bumping versioned tryton depends to 2.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 24 Oct 2012 14:24:56 +0200
+
tryton-modules-project-revenue (2.4.0-2) experimental; urgency=low
[ Daniel Baumann ]
commit c5ba43e491d0039d42dedce4195029dfbec67e27
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:59:46 2012 +0200
Bumping versioned tryton depends to 2.6.
diff --git a/debian/control b/debian/control
index 5135878..1ca57c0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,9 @@ X-Python-Version: >= 2.6
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
- tryton-modules-company (>= 2.4), tryton-modules-product (>= 2.4),
- tryton-modules-project (>= 2.4), tryton-modules-timesheet (>= 2.4),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-company (>= 2.6), tryton-modules-product (>= 2.6),
+ tryton-modules-project (>= 2.6), tryton-modules-timesheet (>= 2.6),
python-pkg-resources
Description: Tryton Application Platform (Project Revenue Module)
Tryton is a high-level general purpose application platform written in Python
commit 91aa3a91a26c311a5aa4d18d566c63b66091c9ba
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:40 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1dcc670..1664a8d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 107be08..af57f75 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,15 +1,48 @@
Metadata-Version: 1.0
Name: trytond_project_revenue
-Version: 2.4.0
-Summary: Add product on timesheet lines.
-Define allowed services for each employees.
-
+Version: 2.6.0
+Summary: Tryton module to add cost/revenue on project
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_project_revenue
+ =======================
+
+ The project_revenue 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/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index 91c2dd4..1077f8c 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_project_revenue
=======================
The project_revenue module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index d576d8d..ec6eaf4 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,15 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from trytond.pool import Pool
from .service import *
from .work import *
+
+
+def register():
+ Pool.register(
+ Employee,
+ EmployeeCostPrice,
+ TimesheetLine,
+ Work,
+ module='project_revenue', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index a1d02f4..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
- 'name': 'Project Revenue',
- 'name_bg_BG': 'Приходи на проект',
- 'name_ca_ES': 'Ingressos per projecte',
- 'name_de_DE': 'Projekte Ertrag',
- 'name_es_AR': 'Beneficio de proyecto',
- 'name_es_CO': 'Ingresos por proyectos',
- 'name_es_ES': 'Ingresos por proyecto',
- 'name_fr_FR': 'Revenu des projets',
- 'version': '2.4.0',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Add product on timesheet lines.
-Define allowed services for each employees.
-''',
- 'description_bg_BG': '''Модул Приходи на проект:
- - Позволява добавяне на продукт към редове от график.
- - Позволява задаване на позволените за всеки служител услуги.
-''',
- 'description_ca_ES': '''Ingressos per projecte:
- - Afegeix productes a les línies de les ordres de treball.
- - Defineix serveis permesos per cada empleat.
-''',
- 'description_de_DE': '''Projektmodul Ertrag:
- - Ermöglicht das Hinzufügen von Artikeln zu Zeitpositionen.
- - Ermöglicht die Definition von Dienstleistungen, die für einen Mitarbeiter verwendet werden können.
-''',
- 'description_es_AR': '''Beneficio de proyecto:
- - Añade productos a las líneas de los partes de trabajo.
- - Define servicios permitidos por cada empleado.
-''',
- 'description_es_CO': ''' - Se añade el producto a las tarjetas de registro de tiempos.
- - Se define por empleado los servicios que tiene autorizados.
-''',
- 'description_es_ES': '''Ingresos por proyecto:
- - Añade productos a las líneas de los partes de trabajo.
- - Define servicios permitidos por cada empleado.
-''',
- 'description_fr_FR': '''Ajoute le produit sur la ligne de présence.
-Défini par employé quels services sont autorisés.
-''',
- 'depends': [
- 'ir',
- 'project',
- 'timesheet',
- 'company',
- 'product',
- ],
- 'xml': [
- 'service.xml',
- 'work.xml',
- ],
- 'translation': [
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/cs_CZ.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 8337e17..7a751d8 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -16,7 +16,7 @@ msgstr "Preus de cost"
msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimals de la divisa"
+msgstr "Decimals de la moneda"
msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
@@ -24,7 +24,7 @@ msgstr "Preu de cost"
msgctxt "field:company.employee_cost_price,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
#, fuzzy
msgctxt "field:company.employee_cost_price,create_uid:"
@@ -33,7 +33,7 @@ msgstr "Crear usuari"
msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimals de la divisa"
+msgstr "Decimals de la moneda"
msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
@@ -45,7 +45,7 @@ msgstr "Empleat"
msgctxt "field:company.employee_cost_price,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
@@ -53,11 +53,11 @@ msgstr "Nom"
msgctxt "field:company.employee_cost_price,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:company.employee_cost_price,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:project.work,cost:"
msgid "Cost"
@@ -65,7 +65,7 @@ msgstr "Cost"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimals de la divisa"
+msgstr "Decimals de la moneda"
msgctxt "field:project.work,list_price:"
msgid "List Price"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 9cd55ff..e4f24b0 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -84,7 +84,7 @@ msgstr "Precio de costo por hora para este empleado"
msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
-msgstr "Lista de precio de costo por hora a través del tiempo"
+msgstr "Lista de precio de costo por hora a lo largo del tiempo"
msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 50172ea..3f53bf7 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,111 +4,99 @@ 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 ""
+msgstr "Un empleado solo puede tener un precio de costo por fecha!"
-#, fuzzy
msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Precio de Costo"
msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
-msgstr ""
+msgstr "Precios de Costo"
-#, fuzzy
msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr "Gestión de Moneda"
-#, fuzzy
msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Precio de Costo"
msgctxt "field:company.employee_cost_price,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:company.employee_cost_price,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
-#, fuzzy
msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
-msgstr "Gestión de Moneda"
+msgstr "Decimales de Moneda"
-#, fuzzy
msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Fecha"
-#, fuzzy
msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Empleado"
msgctxt "field:company.employee_cost_price,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Nombre de Contacto"
msgctxt "field:company.employee_cost_price,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:company.employee_cost_price,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:project.work,cost:"
msgid "Cost"
-msgstr ""
+msgstr "Costo"
-#, fuzzy
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Gestión de Moneda"
+msgstr "Decimales de Moneda"
-#, fuzzy
msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr "Precio de Lista"
-#, fuzzy
msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Productos"
-#, fuzzy
msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Ingresos"
msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
-msgstr ""
+msgstr "Costo por hora del empleado"
msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
-msgstr ""
+msgstr "Lista de costo por hora de tiempo extra"
msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
-msgstr ""
+msgstr "Costo por hora"
msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
-msgstr ""
+msgstr "Costo por Empleado"
msgctxt "view:company.employee:"
msgid "Cost"
-msgstr ""
+msgstr "Costo"
msgctxt "view:company.employee:"
msgid "Services"
@@ -116,13 +104,12 @@ msgstr "Servicios"
msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
-msgstr ""
+msgstr "Precio de Costo"
msgctxt "view:project.work:"
msgid "Cost"
-msgstr ""
+msgstr "Costo"
-#, fuzzy
msgctxt "view:project.work:"
msgid "Revenue"
msgstr "Ingresos"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 66e59ae..25f221e 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -16,7 +16,7 @@ msgstr "Precios de coste"
msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
@@ -32,7 +32,7 @@ msgstr "Usuario creación"
msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
@@ -64,7 +64,7 @@ msgstr "Coste"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
msgctxt "field:project.work,list_price:"
msgid "List Price"
@@ -84,7 +84,7 @@ 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 través del tiempo."
+msgstr "Lista de precio de coste por hora a lo largo del tiempo."
msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
diff --git a/service.py b/service.py
index 2d698c9..7bcb8b9 100644
--- a/service.py
+++ b/service.py
@@ -2,93 +2,82 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
-from trytond.model.cacheable import Cacheable
from trytond.pyson import Eval
+from trytond.cache import Cache
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['Employee', 'EmployeeCostPrice']
+__metaclass__ = PoolMeta
-class Employee(ModelSQL, ModelView, Cacheable):
- _name = 'company.employee'
+class Employee:
+ __name__ = 'company.employee'
cost_price = fields.Function(fields.Numeric('Cost Price',
digits=(16, Eval('currency_digits', 2)), depends=['currency_digits'],
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")
currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['company']), 'get_currency_digits')
+ on_change_with=['company']), 'on_change_with_currency_digits')
+ _cost_prices_cache = Cache('company_employee.cost_prices')
- def get_cost_price(self, ids, name):
+ def get_cost_price(self, name):
'''
Return the cost price at the date given in the context or the
current date
'''
-
- res = {}
ctx_date = Transaction().context.get('date', None)
+ return self.compute_cost_price(ctx_date)
- for employee_id in ids:
- res[employee_id] = self.compute_cost_price(employee_id, ctx_date)
- return res
-
- def compute_cost_price(self, employee_id, date=None):
- date_obj = Pool().get('ir.date')
- cost_price_obj = Pool().get('company.employee_cost_price')
+ def compute_cost_price(self, date=None):
+ pool = Pool()
+ Date = pool.get('ir.date')
+ CostPrice = pool.get('company.employee_cost_price')
# Get from cache employee costs or fetch them from the db
- employee_costs = self.get(employee_id)
+ employee_costs = self._cost_prices_cache.get(self.id)
if employee_costs is None:
- cost_price_ids = cost_price_obj.search([
- ('employee', '=', employee_id),
+ cost_prices = CostPrice.search([
+ ('employee', '=', self.id),
], order=[('date', 'ASC')])
- cost_prices = cost_price_obj.browse(cost_price_ids)
employee_costs = []
for cost_price in cost_prices:
employee_costs.append(
(cost_price.date, cost_price.cost_price))
- self.add(employee_id, employee_costs)
+ self._cost_prices_cache.set(self.id, employee_costs)
if date is None:
- date = date_obj.today()
+ date = Date.today()
# compute the cost price for the given date
cost = 0
if employee_costs and date >= employee_costs[0][0]:
for edate, ecost in employee_costs:
if date >= edate:
cost = ecost
+ else:
break
return cost
- def get_currency_digits(self, ids, name):
- res = {}
- for employee in self.browse(ids):
- res[employee.id] = employee.company.currency.digits
- return res
-
- def on_change_with_currency_digits(self, vals):
- company_obj = Pool().get('company.company')
- if vals.get('company'):
- company = company_obj.browse(vals['company'])
- return company.currency.digits
+ def on_change_with_currency_digits(self, name=None):
+ if self.company:
+ return self.company.currency.digits
return 2
- def default_currency_digits(self):
- company_obj = Pool().get('company.company')
+ @staticmethod
+ def default_currency_digits():
+ Company = Pool().get('company.company')
company = Transaction().context.get('company')
if company:
- company = company_obj.browse(company)
+ company = Company(company)
return company.currency.digits
return 2
-Employee()
-
class EmployeeCostPrice(ModelSQL, ModelView):
'Employee Cost Price'
- _name = 'company.employee_cost_price'
- _description = __doc__
+ __name__ = 'company.employee_cost_price'
_rec_name = 'date'
date = fields.Date('Date', required=True, select=True)
cost_price = fields.Numeric('Cost Price',
@@ -97,54 +86,55 @@ class EmployeeCostPrice(ModelSQL, ModelView):
help="Hourly cost price")
employee = fields.Many2One('company.employee', 'Employee')
currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['employee']), 'get_currency_digits')
+ on_change_with=['employee']), 'on_change_with_currency_digits')
- def __init__(self):
- super(EmployeeCostPrice, self).__init__()
- self._sql_constraints = [
+ @classmethod
+ def __setup__(cls):
+ super(EmployeeCostPrice, cls).__setup__()
+ cls._sql_constraints = [
('date_cost_price_uniq', 'UNIQUE(date, cost_price)',
'A employee can only have one cost price by date!'),
- ]
- self._order.insert(0, ('date', 'DESC'))
+ ]
+ cls._order.insert(0, ('date', 'DESC'))
- def default_cost_price(self):
+ @staticmethod
+ def default_cost_price():
return Decimal(0)
- def default_date(self):
- date_obj = Pool().get('ir.date')
- return date_obj.today()
-
- def delete(self, ids):
- Pool().get('company.employee').clear()
- return super(EmployeeCostPrice, self).delete(ids)
-
- def create(self, vals):
- Pool().get('company.employee').clear()
- return super(EmployeeCostPrice, self).create(vals)
-
- def write(self, ids, vals):
- Pool().get('company.employee').clear()
- return super(EmployeeCostPrice, self).write(ids, vals)
-
- def get_currency_digits(self, ids, name):
- res = {}
- for costprice in self.browse(ids):
- res[costprice.id] = costprice.employee.company.currency.digits
- return res
-
- def on_change_with_currency_digits(self, vals):
- employee_obj = Pool().get('company.employee')
- if vals.get('employee'):
- employee = employee_obj.browse(vals['employee'])
- return employee.company.currency.digits
+ @staticmethod
+ def default_date():
+ Date = Pool().get('ir.date')
+ return Date.today()
+
+ @classmethod
+ def delete(cls, prices):
+ Employee = Pool().get('company.employee')
+ super(EmployeeCostPrice, cls).delete(prices)
+ Employee._cost_prices_cache.clear()
+
+ @classmethod
+ def create(cls, vals):
+ Employee = Pool().get('company.employee')
+ price = super(EmployeeCostPrice, cls).create(vals)
+ Employee._cost_prices_cache.clear()
+ return price
+
+ @classmethod
+ def write(cls, prices, vals):
+ Employee = Pool().get('company.employee')
+ super(EmployeeCostPrice, cls).write(prices, vals)
+ Employee._cost_prices_cache.clear()
+
+ def on_change_with_currency_digits(self, name=None):
+ if self.employee:
+ return self.employee.company.currency.digits
return 2
- def default_currency_digits(self):
- company_obj = Pool().get('company.company')
+ @staticmethod
+ def default_currency_digits():
+ Company = Pool().get('company.company')
company = Transaction().context.get('company')
if company:
- company = company_obj.browse(company)
+ company = Company(company)
return company.currency.digits
return 2
-
-EmployeeCostPrice()
diff --git a/service.xml b/service.xml
index d549d50..a265eaa 100644
--- a/service.xml
+++ b/service.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
- <form string="Cost Prices" col="2">
+ <form string="Cost Prices">
<label name="date"/>
<field name="date"/>
<label name="cost_price"/>
@@ -53,5 +53,22 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
+ <record model="ir.ui.view" id="employee_view_form2">
+ <field name="model">company.employee</field>
+ <field name="inherit" ref="company.employee_view_form2"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/field[@name='company']"
+ position="after">
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+ <field name="cost_prices" colspan="4"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
</data>
</tryton>
diff --git a/setup.py b/setup.py
index 91333b9..d9373fe 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_project_revenue',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module to add cost/revenue on project',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.project_revenue': '.'},
packages=[
'trytond.modules.project_revenue',
'trytond.modules.project_revenue.tests',
- ],
+ ],
package_data={
'trytond.modules.project_revenue': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_project_revenue',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_project_revenue',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index 4dcf4b0..2a40fb1 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -10,8 +10,13 @@ if os.path.isdir(DIR):
sys.path.insert(0, os.path.dirname(DIR))
import unittest
+import datetime
+from decimal import Decimal
+
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
+ test_depends
+from trytond.transaction import Transaction
class ProjectRevenueTestCase(unittest.TestCase):
@@ -21,6 +26,9 @@ class ProjectRevenueTestCase(unittest.TestCase):
def setUp(self):
trytond.tests.test_tryton.install_module('project_revenue')
+ self.employee = POOL.get('company.employee')
+ self.employee_cost_price = POOL.get('company.employee_cost_price')
+ self.company = POOL.get('company.company')
def test0005views(self):
'''
@@ -34,9 +42,44 @@ class ProjectRevenueTestCase(unittest.TestCase):
'''
test_depends()
+ def test0010compute_cost_price(self):
+ '''
+ Test compute_cost_price
+ '''
+ cost_prices = [
+ (datetime.date(2011, 1, 1), Decimal(10)),
+ (datetime.date(2012, 1, 1), Decimal(15)),
+ (datetime.date(2013, 1, 1), Decimal(20)),
+ ]
+ test_prices = [
+ (datetime.date(2010, 1, 1), 0),
+ (datetime.date(2011, 1, 1), Decimal(10)),
+ (datetime.date(2011, 6, 1), Decimal(10)),
+ (datetime.date(2012, 1, 1), Decimal(15)),
+ (datetime.date(2012, 6, 1), Decimal(15)),
+ (datetime.date(2013, 1, 1), Decimal(20)),
+ (datetime.date(2013, 6, 1), Decimal(20)),
+ ]
+ with Transaction().start(DB_NAME, USER, context=CONTEXT):
+ company, = self.company.search([('name', '=', 'B2CK')])
+ employee = self.employee(name='Pam Beesly',
+ company=company)
+ employee.save()
+ for date, cost_price in cost_prices:
+ self.employee_cost_price(
+ employee=employee,
+ date=date,
+ cost_price=cost_price).save()
+ for date, cost_price in test_prices:
+ self.assertEqual(employee.compute_cost_price(date), cost_price)
+
def suite():
suite = trytond.tests.test_tryton.suite()
+ from trytond.modules.company.tests import test_company
+ for test in test_company.suite():
+ if test not in suite:
+ suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
ProjectRevenueTestCase))
return suite
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..72df382
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,11 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ project
+ timesheet
+ company
+ product
+xml:
+ service.xml
+ work.xml
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 465f63f..18f0cf5 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,15 +1,48 @@
Metadata-Version: 1.0
Name: trytond-project-revenue
-Version: 2.4.0
-Summary: Add product on timesheet lines.
-Define allowed services for each employees.
-
+Version: 2.6.0
+Summary: Tryton module to add cost/revenue on project
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_project_revenue
+ =======================
+
+ The project_revenue 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/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index 6251373..5f35d48 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -6,9 +6,9 @@ MANIFEST.in
README
service.xml
setup.py
+tryton.cfg
work.xml
./__init__.py
-./__tryton__.py
./service.py
./work.py
./tests/__init__.py
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 9eaf447..e329932 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_project >= 2.4, < 2.5
-trytond_timesheet >= 2.4, < 2.5
-trytond_company >= 2.4, < 2.5
-trytond_product >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_project >= 2.6, < 2.7
+trytond_timesheet >= 2.6, < 2.7
+trytond_company >= 2.6, < 2.7
+trytond_product >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
diff --git a/work.py b/work.py
index eefb7ea..ea4c0bd 100644
--- a/work.py
+++ b/work.py
@@ -1,39 +1,36 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['TimesheetLine', 'Work']
+__metaclass__ = PoolMeta
-class TimesheetLine(ModelSQL, ModelView):
- _name = 'timesheet.line'
- def compute_cost(self, line):
- employee_obj = Pool().get('company.employee')
- currency_obj = Pool().get('currency.currency')
+class TimesheetLine:
+ __name__ = 'timesheet.line'
- cost_price = employee_obj.compute_cost_price(line.employee.id,
- date=line.date)
+ def compute_cost(self):
+ Currency = Pool().get('currency.currency')
- line_company = line.employee.company
- work_company = line.work.company
- if line_company.id != work_company.id and\
- line_company.currency.id != work_company.currency.id:
- with Transaction().set_context(date=line.date):
- cost_price = currency_obj.compute(line_company.currency.id,
- cost_price, work_company.currency.id)
+ cost_price = self.employee.compute_cost_price(date=self.date)
- return Decimal(str(line.hours)) * cost_price
+ line_company = self.employee.company
+ work_company = self.work.company
+ if (line_company != work_company and
+ line_company.currency != work_company.currency):
+ with Transaction().set_context(date=self.date):
+ cost_price = Currency.compute(line_company.currency,
+ cost_price, work_company.currency)
-TimesheetLine()
+ return Decimal(str(self.hours)) * cost_price
-class Work(ModelSQL, ModelView):
- 'Work Effort'
- _name = 'project.work'
-
+class Work:
+ __name__ = 'project.work'
product = fields.Many2One('product.product', 'Product',
states={
'invisible': ~Eval('timesheet_available'),
@@ -46,136 +43,128 @@ class Work(ModelSQL, ModelView):
digits=(16, Eval('currency_digits', 2)),
depends=['currency_digits']), 'get_revenue')
cost = fields.Function(fields.Numeric('Cost',
- digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']),
- 'get_cost')
+ states={
+ 'invisible': ~Eval('timesheet_available'),
+ },
+ digits=(16, Eval('currency_digits', 2)),
+ depends=['currency_digits', 'timesheet_available']), 'get_cost')
currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['company']), 'get_currency_digits')
-
- def get_cost(self, ids, name):
- timesheet_line_obj = Pool().get('timesheet.line')
- all_ids = self.search([
- ('parent', 'child_of', ids),
- ('active', '=', True)]) + ids
- all_ids = list(set(all_ids))
- res = {}
+ on_change_with=['company']), 'on_change_with_currency_digits')
+
+ @classmethod
+ def get_cost(cls, works, name):
+ works += cls.search([
+ ('parent', 'child_of', [w.id for w in works]),
+ ('active', '=', True)]) + works
+ works = set(works)
+
+ costs = {}
id2work = {}
leafs = set()
- for work in self.browse(all_ids):
+ for work in works:
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
- res[work.id] = Decimal('0')
+ costs[work.id] = Decimal('0')
for ts_line in work.timesheet_lines:
- res[work.id] += timesheet_line_obj.compute_cost(ts_line)
+ costs[work.id] += ts_line.compute_cost()
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ works.remove(work)
if not work.active:
continue
- if work.parent and work.parent.id in res:
- res[work.parent.id] += res[work_id]
- parents.add(work.parent.id)
- leafs = parents
-
- for id in all_ids:
- if id not in ids:
- del res[id]
-
- return res
-
- def get_revenue(self, ids, name):
- all_ids = self.search([
- ('parent', 'child_of', ids),
- ('active', '=', True)]) + ids
- all_ids = list(set(all_ids))
- res = {}
+ if work.parent and work.parent.id in costs:
+ costs[work.parent.id] += costs[work_id]
+ next_leafs = set(w.id for w in works)
+ for work in works:
+ if not work.parent:
+ continue
+ if work.parent.id in next_leafs and work.parent in works:
+ next_leafs.remove(work.parent.id)
+ leafs = next_leafs
+ return costs
+
+ @classmethod
+ def get_revenue(cls, works, name):
+ works = cls.search([
+ ('parent', 'child_of', [w.id for w in works]),
+ ('active', '=', True)]) + works
+ works = set(works)
+
+ revenues = {}
id2work = {}
leafs = set()
- for work in self.browse(all_ids):
+ for work in works:
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
if work.type == 'task' and work.list_price:
- res[work.id] = (work.list_price
+ revenues[work.id] = (work.list_price
* Decimal(str(work.total_effort)))
else:
- res[work.id] = Decimal('0')
+ revenues[work.id] = Decimal('0')
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ works.remove(work)
if not work.active:
continue
- if work.parent and work.parent.id in res:
- res[work.parent.id] += res[work_id]
- parents.add(work.parent.id)
- leafs = parents
-
- for id in all_ids:
- if id not in ids:
- del res[id]
-
- return res
-
- def get_currency_digits(self, ids, name):
- res = {}
- for work in self.browse(ids):
- res[work.id] = work.company.currency.digits
- return res
-
- def on_change_with_currency_digits(self, vals):
- company_obj = Pool().get('company.company')
- if vals.get('company'):
- company = company_obj.browse(vals['company'])
- return company.currency.digits
+ if work.parent and work.parent.id in revenues:
+ revenues[work.parent.id] += revenues[work_id]
+ next_leafs = set(w.id for w in works)
+ for work in works:
+ if not work.parent:
+ continue
+ if work.parent.id in next_leafs and work.parent in works:
+ next_leafs.remove(work.parent.id)
+ leafs = next_leafs
+ return revenues
+
+ def on_change_with_currency_digits(self, name=None):
+ if self.company:
+ return self.company.currency.digits
return 2
- def default_currency_digits(self):
- company_obj = Pool().get('company.company')
+ @staticmethod
+ def default_currency_digits():
+ Company = Pool().get('company.company')
company = Transaction().context.get('company')
if company:
- company = company_obj.browse(company)
+ company = Company(company)
return company.currency.digits
return 2
- def on_change_product(self, vals):
+ def on_change_product(self):
pool = Pool()
- product_obj = pool.get('product.product')
- user_obj = pool.get('res.user')
- company_obj = pool.get('company.company')
- model_data_obj = pool.get('ir.model.data')
- uom_obj = pool.get('product.uom')
- currency_obj = pool.get('currency.currency')
-
- if not vals.get('product'):
+ User = pool.get('res.user')
+ ModelData = pool.get('ir.model.data')
+ Uom = pool.get('product.uom')
+ Currency = pool.get('currency.currency')
+
+ if not self.product:
return {}
context = {}
- product = product_obj.browse(vals['product'])
-
- if vals.get('party'):
- context['customer'] = vals['party']
+ if self.party:
+ context['customer'] = self.party.id
- uom_id = model_data_obj.get_id('product', 'uom_hour')
- hour_uom = uom_obj.browse(uom_id)
+ hour_uom = Uom(ModelData.get_id('product', 'uom_hour'))
with Transaction().set_context(context):
- list_price = uom_obj.compute_price(product.default_uom,
- product.list_price, hour_uom)
+ list_price = Uom.compute_price(self.product.default_uom,
+ self.product.list_price, hour_uom)
- if vals.get('company'):
- user = user_obj.browse(Transaction().user)
- if user.company.id != vals['company']:
- company = company_obj.browse(vals['company'])
- if user.company.currency.id != company.currency.id:
- list_price = currency_obj.compute(user.company.currency,
- list_price, company.currency)
+ if self.company:
+ user = User(Transaction().user)
+ if user.company != self.company:
+ if user.company.currency != self.company.currency:
+ list_price = Currency.compute(user.company.currency,
+ list_price, self.company.currency)
return {'list_price': list_price}
-Work()
diff --git a/work.xml b/work.xml
index c1c0ec0..017afdc 100644
--- a/work.xml
+++ b/work.xml
@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<data>
- <xpath expr="/form/notebook/page[@id='general']/label[@name='party']"
+ <xpath expr="/form/notebook/page[@id='general']/label[@name='hours']"
position="before">
<label name="product"/>
<field name="product"/>
commit dd53f35188ac26015db0c59f311936e576dd3e92
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:23 2012 +0200
Releasing debian version 2.4.0-2.
diff --git a/debian/changelog b/debian/changelog
index 5a50765..80d77fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-project-revenue (2.4.0-2) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ [ Mathias Behrle ]
+ * Merging branch debian-wheezy-2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 18 Sep 2012 13:41:24 +0200
+
tryton-modules-project-revenue (2.4.0-1) experimental; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 4d6011acf8248fb311190de47e25a43a9b6a3225
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 79626d2..5135878 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
commit d9bf3c66f72a27f7581b8cfee30ebfdb6b936096
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 28d1b0f0a342566bc4ff1acc3c61478467d299e7
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 9bbc88a..9a6d1e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008-2012 Cedric Krier
- (C) 2008-2012 B2CK SPRL
+ 2008-2012 Cedric Krier
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 9b248af4ab7ca84891d4fd0a245524dc5ca94329
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index bb90d8b..79626d2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project-revenue.git
X-Python-Version: >= 2.6
Package: tryton-modules-project-revenue
commit f7da1cdd42b3957f616eb3abc0cd08b9792e28b0
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 7a0121f..bb90d8b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-project-revenue
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 37292cb5171ce3016dd9542e0e50be695a0348c5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:44:08 2012 +0200
Releasing debian version 2.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index a6d3ac9..5a50765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-project-revenue (2.4.0-1) experimental; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.4.0.
+ * Updating Copyright.
+ * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:32:05 +0200
+
tryton-modules-project-revenue (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit b60a6cf123c5ff0c08947c844a8efa379a48eb78
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 19:11:45 2012 +0200
Bumping versioned tryton depends to 2.4.
diff --git a/debian/control b/debian/control
index 756058c..7a0121f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,9 @@ X-Python-Version: >= 2.6
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
- tryton-modules-company (>= 2.2), tryton-modules-product (>= 2.2),
- tryton-modules-project (>= 2.2), tryton-modules-timesheet (>= 2.2),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ tryton-modules-company (>= 2.4), tryton-modules-product (>= 2.4),
+ tryton-modules-project (>= 2.4), tryton-modules-timesheet (>= 2.4),
python-pkg-resources
Description: Tryton Application Platform (Project Revenue Module)
Tryton is a high-level general purpose application platform written in Python
commit a90803fe006eb1f07291b069f03c8a64709712ba
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:13 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index da0f275..9bbc88a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008 Cedric Krier
- (C) 2008 B2CK SPRL
+ (C) 2008-2012 Cedric Krier
+ (C) 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit ffb393f6515438f33c609dffec66fdcb379c10c1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:02 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index f9faa83..1dcc670 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.2.1 - 2011-12-26
+Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
Version 2.2.0 - 2011-10-25
diff --git a/COPYRIGHT b/COPYRIGHT
index bd93e8d..d3682c5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 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 --git a/INSTALL b/INSTALL
index d4a0ecd..0b61f09 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_project_revenue
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_project (http://www.tryton.org/)
* trytond_timesheet (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index ed9cb51..107be08 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond_project_revenue
-Version: 2.2.1
+Version: 2.4.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 5e44e6e..d576d8d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from service import *
-from work import *
+from .service import *
+from .work import *
diff --git a/__tryton__.py b/__tryton__.py
index 2d1b3e9..a1d02f4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,13 @@
{
'name': 'Project Revenue',
'name_bg_BG': 'Приходи на проект',
+ 'name_ca_ES': 'Ingressos per projecte',
'name_de_DE': 'Projekte Ertrag',
+ 'name_es_AR': 'Beneficio de proyecto',
'name_es_CO': 'Ingresos por proyectos',
- 'name_es_ES': 'Beneficio de proyecto',
+ 'name_es_ES': 'Ingresos por proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '2.2.1',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -18,18 +20,26 @@ Define allowed services for each employees.
- Позволява добавяне на продукт към редове от график.
- Позволява задаване на позволените за всеки служител услуги.
''',
+ 'description_ca_ES': '''Ingressos per projecte:
+ - Afegeix productes a les línies de les ordres de treball.
+ - Defineix serveis permesos per cada empleat.
+''',
'description_de_DE': '''Projektmodul Ertrag:
- Ermöglicht das Hinzufügen von Artikeln zu Zeitpositionen.
- Ermöglicht die Definition von Dienstleistungen, die für einen Mitarbeiter verwendet werden können.
''',
- 'description_es_CO':''' - Se añade el producto a las tarjetas de registro de tiempos.
+ 'description_es_AR': '''Beneficio de proyecto:
+ - Añade productos a las líneas de los partes de trabajo.
+ - Define servicios permitidos por cada empleado.
+''',
+ 'description_es_CO': ''' - Se añade el producto a las tarjetas de registro de tiempos.
- Se define por empleado los servicios que tiene autorizados.
''',
- 'description_es_ES':'''Beneficio de proyecto:
+ 'description_es_ES': '''Ingresos por proyecto:
- Añade productos a las líneas de los partes de trabajo.
- Define servicios permitidos por cada empleado.
''',
- 'description_fr_FR':'''Ajoute le produit sur la ligne de présence.
+ 'description_fr_FR': '''Ajoute le produit sur la ligne de présence.
Défini par employé quels services sont autorisés.
''',
'depends': [
@@ -45,8 +55,10 @@ Défini par employé quels services sont autorisés.
],
'translation': [
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/cs_CZ.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index a6b5ba2..e6e0de4 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,90 +2,110 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+msgctxt "error:company.employee_cost_price:"
msgid "A employee can only have one cost price by date!"
msgstr "Служител може да има само една себестойност за ден!"
-msgctxt "field:company.employee,cost_price:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Фабрична цена"
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr "Себестойност"
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr "Цифри за валута"
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Фабрична цена"
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+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,currency_digits:"
msgid "Currency Digits"
msgstr "Цифри за валута"
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Дата"
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Служител"
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:project.work,cost:0"
+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:project.work,cost:"
msgid "Cost"
msgstr "Разход"
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr "Цифри за валута"
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr "Каталожна цена"
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Продукт"
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Приход"
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
msgstr "Себестойност за час за този служител"
-msgctxt "help:company.employee,cost_prices:0"
+msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
msgstr "Списък на себестойност за час през времето"
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
msgstr "Себестойност за час"
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr "Себестойност на клиент"
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Разход"
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Себестойност"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Cost"
msgstr "Разход"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Revenue"
msgstr "Приход"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..8337e17
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,116 @@
+#
+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"
+
+msgctxt "field:company.employee,cost_prices:"
+msgid "Cost Prices"
+msgstr "Preus de cost"
+
+msgctxt "field:company.employee,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de la divisa"
+
+msgctxt "field:company.employee_cost_price,cost_price:"
+msgid "Cost Price"
+msgstr "Preu de cost"
+
+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 "Crear usuari"
+
+msgctxt "field:company.employee_cost_price,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de la divisa"
+
+msgctxt "field:company.employee_cost_price,date:"
+msgid "Date"
+msgstr "Data"
+
+msgctxt "field:company.employee_cost_price,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+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:project.work,cost:"
+msgid "Cost"
+msgstr "Cost"
+
+msgctxt "field:project.work,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de la divisa"
+
+msgctxt "field:project.work,list_price:"
+msgid "List Price"
+msgstr "Preu de llista"
+
+msgctxt "field:project.work,product:"
+msgid "Product"
+msgstr "Producte"
+
+msgctxt "field:project.work,revenue:"
+msgid "Revenue"
+msgstr "Benefici"
+
+msgctxt "help:company.employee,cost_price:"
+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"
+msgstr "Llista de preu de cost per hora a través del temps"
+
+msgctxt "help:company.employee_cost_price,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 "view:company.employee:"
+msgid "Cost"
+msgstr "Cost"
+
+msgctxt "view:company.employee:"
+msgid "Services"
+msgstr "Serveis"
+
+msgctxt "view:company.employee_cost_price:"
+msgid "Cost Prices"
+msgstr "Preus de cost"
+
+msgctxt "view:project.work:"
+msgid "Cost"
+msgstr "Cost"
+
+msgctxt "view:project.work:"
+msgid "Revenue"
+msgstr "Benefici"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index ad8c08e..99e19db 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,82 +2,102 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+msgctxt "error:company.employee_cost_price:"
msgid "A employee can only have one cost price by date!"
msgstr ""
-msgctxt "field:company.employee,cost_price:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr ""
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr ""
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr ""
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr ""
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+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,currency_digits:"
msgid "Currency Digits"
msgstr ""
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr ""
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr ""
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:project.work,cost:0"
+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:project.work,cost:"
msgid "Cost"
msgstr ""
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr ""
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr ""
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr ""
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr ""
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
msgstr ""
-msgctxt "help:company.employee,cost_prices:0"
+msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
msgstr ""
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
msgstr ""
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr ""
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr ""
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index d2c61b7..faf9783 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,95 +2,115 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+msgctxt "error:company.employee_cost_price:"
msgid "A employee can only have one cost price by date!"
msgstr ""
"Einem Mitarbeiter kann nur ein Kostenpreis pro Datum zugeordnet werden!"
-msgctxt "field:company.employee,cost_price:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Kostenpreis"
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr "Kostenpreise"
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr "Währung (signifikante Stellen)"
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Einkaufspreis"
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+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"
+
+msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
msgstr "Währung (signifikante Stellen)"
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Datum"
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Mitarbeiter"
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:project.work,cost:0"
+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:project.work,cost:"
msgid "Cost"
msgstr "Kosten"
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr "Währung (signifikante Stellen)"
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr "Listenpreis"
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Artikel"
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Ertrag"
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
msgstr "Kostenpreis pro Stunde für diesen Mitarbeiter"
-msgctxt "help:company.employee,cost_prices:0"
+msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
msgstr "Liste der Kostenpreise pro Stunde über die Zeit"
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
msgstr "Kostenpreis pro Stunde"
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr "Mitarbeiter Kostenpreis"
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Kosten"
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Services"
msgstr "Leistungen"
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Kostenpreise"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Cost"
msgstr "Kosten"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Revenue"
msgstr "Ertrag"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..9cd55ff
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,115 @@
+#
+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 solo puede tener un precio de costo por fecha!"
+
+msgctxt "field:company.employee,cost_price:"
+msgid "Cost Price"
+msgstr "Precio de costo"
+
+msgctxt "field:company.employee,cost_prices:"
+msgid "Cost Prices"
+msgstr "Precios de costo"
+
+msgctxt "field:company.employee,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:company.employee_cost_price,cost_price:"
+msgid "Cost Price"
+msgstr "Precio de costo"
+
+msgctxt "field:company.employee_cost_price,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:company.employee_cost_price,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:company.employee_cost_price,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:company.employee_cost_price,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:company.employee_cost_price,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:company.employee_cost_price,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:company.employee_cost_price,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:company.employee_cost_price,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:project.work,cost:"
+msgid "Cost"
+msgstr "Costo"
+
+msgctxt "field:project.work,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:project.work,list_price:"
+msgid "List Price"
+msgstr "Precio de lista"
+
+msgctxt "field:project.work,product:"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:project.work,revenue:"
+msgid "Revenue"
+msgstr "Beneficio"
+
+msgctxt "help:company.employee,cost_price:"
+msgid "Hourly cost price for this Employee"
+msgstr "Precio de costo por hora para este empleado"
+
+msgctxt "help:company.employee,cost_prices:"
+msgid "List of hourly cost price over time"
+msgstr "Lista de precio de costo por hora a través del tiempo"
+
+msgctxt "help:company.employee_cost_price,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 "view:company.employee:"
+msgid "Cost"
+msgstr "Costo"
+
+msgctxt "view:company.employee:"
+msgid "Services"
+msgstr "Servicios"
+
+msgctxt "view:company.employee_cost_price:"
+msgid "Cost Prices"
+msgstr "Precios de costo"
+
+msgctxt "view:project.work:"
+msgid "Cost"
+msgstr "Costo"
+
+msgctxt "view:project.work:"
+msgid "Revenue"
+msgstr "Beneficio"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index e39e9e6..50172ea 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,106 +2,127 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+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:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Precio de Costo"
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr ""
#, fuzzy
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr "Gestión de Moneda"
#, fuzzy
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Precio de Costo"
+msgctxt "field:company.employee_cost_price,create_date:"
+msgid "Create Date"
+msgstr ""
+
#, fuzzy
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgctxt "field:company.employee_cost_price,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
msgstr "Gestión de Moneda"
#, fuzzy
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Fecha"
#, fuzzy
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Empleado"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Nombre de Contacto"
-msgctxt "field:project.work,cost:0"
+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:project.work,cost:"
msgid "Cost"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr "Gestión de Moneda"
#, fuzzy
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr "Precio de Lista"
#, fuzzy
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Productos"
#, fuzzy
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Ingresos"
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
msgstr ""
-msgctxt "help:company.employee,cost_prices:0"
+msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
msgstr ""
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
msgstr ""
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr ""
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr ""
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Services"
msgstr "Servicios"
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Cost"
msgstr ""
#, fuzzy
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Revenue"
msgstr "Ingresos"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index fff6e59..66e59ae 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,94 +2,114 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+msgctxt "error:company.employee_cost_price:"
msgid "A employee can only have one cost price by date!"
-msgstr "Un empleado solo puede tener un precio de coste por fecha"
+msgstr "Un empleado sólo puede tener un precio de coste por fecha."
-msgctxt "field:company.employee,cost_price:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Precio de coste"
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr "Precios de coste"
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la divisa"
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Precio de coste"
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgctxt "field:company.employee_cost_price,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:company.employee_cost_price,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la divisa"
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Fecha"
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:project.work,cost:0"
+msgctxt "field:company.employee_cost_price,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:company.employee_cost_price,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:project.work,cost:"
msgid "Cost"
msgstr "Coste"
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la divisa"
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
-msgstr "Precio de lista"
+msgstr "Precio de venta"
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
-msgstr "Beneficio"
+msgstr "Ingresos"
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
-msgstr "Precio de coste por hora para este empleado"
+msgstr "Precio de coste por hora para este empleado."
-msgctxt "help:company.employee,cost_prices:0"
+msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
-msgstr "Lista de precio de coste por hora a través del tiempo"
+msgstr "Lista de precio de coste por hora a través del tiempo."
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
-msgstr "Precio de coste por hora"
+msgstr "Precio de coste por hora."
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr "Precio de coste del empleado"
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Coste"
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Services"
msgstr "Servicios"
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Precios de coste"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Cost"
msgstr "Coste"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Revenue"
-msgstr "Beneficio"
+msgstr "Ingresos"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index a5021ae..2d0617e 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,94 +2,114 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+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:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Prix de Revient"
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr "Prix de revient"
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr "Décimales de la devise"
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Prix de Revient"
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+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,currency_digits:"
msgid "Currency Digits"
msgstr "Décimales de la devise"
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Date"
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Employé"
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:project.work,cost:0"
+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:project.work,cost:"
msgid "Cost"
msgstr "Coût"
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr "Décimales de la devise"
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr "Prix Listé"
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Produit"
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Revenu"
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
msgstr "Prix de revient horaire de cet employé"
-msgctxt "help:company.employee,cost_prices:0"
+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"
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
msgstr "Prix de revient horaire"
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr "Prix de revient de l'employé"
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr "Coût"
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Services"
msgstr "Services"
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr "Prix de revient"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Cost"
msgstr "Coût"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Revenue"
msgstr "Revenu"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index aa41ee8..ce7113f 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,93 +2,113 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+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:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Kostprijs"
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr ""
#, fuzzy
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr "Valuta decimalen"
#, fuzzy
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Kostprijs"
+msgctxt "field:company.employee_cost_price,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,create_uid:"
+msgid "Create User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgctxt "field:company.employee_cost_price,currency_digits:"
msgid "Currency Digits"
msgstr "Valuta decimalen"
#, fuzzy
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Vervaldatum"
#, fuzzy
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Werknemer"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
-msgctxt "field:project.work,cost:0"
+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:project.work,cost:"
msgid "Cost"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr "Valuta decimalen"
#, fuzzy
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr "Catalogusprijs"
#, fuzzy
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Producten"
#, fuzzy
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Opbrengst"
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
msgstr ""
-msgctxt "help:company.employee,cost_prices:0"
+msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
msgstr ""
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
msgstr ""
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr ""
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr ""
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index c46a60f..17d5f57 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,89 +2,109 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:company.employee_cost_price:0"
+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:0"
+msgctxt "field:company.employee,cost_price:"
msgid "Cost Price"
msgstr "Цена за единицу"
-msgctxt "field:company.employee,cost_prices:0"
+msgctxt "field:company.employee,cost_prices:"
msgid "Cost Prices"
msgstr ""
-msgctxt "field:company.employee,currency_digits:0"
+msgctxt "field:company.employee,currency_digits:"
msgid "Currency Digits"
msgstr ""
#, fuzzy
-msgctxt "field:company.employee_cost_price,cost_price:0"
+msgctxt "field:company.employee_cost_price,cost_price:"
msgid "Cost Price"
msgstr "Цена за единицу"
-msgctxt "field:company.employee_cost_price,currency_digits:0"
+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,currency_digits:"
msgid "Currency Digits"
msgstr ""
#, fuzzy
-msgctxt "field:company.employee_cost_price,date:0"
+msgctxt "field:company.employee_cost_price,date:"
msgid "Date"
msgstr "Дата"
#, fuzzy
-msgctxt "field:company.employee_cost_price,employee:0"
+msgctxt "field:company.employee_cost_price,employee:"
msgid "Employee"
msgstr "Сотрудник"
+msgctxt "field:company.employee_cost_price,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:company.employee_cost_price,rec_name:0"
+msgctxt "field:company.employee_cost_price,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:project.work,cost:0"
+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:project.work,cost:"
msgid "Cost"
msgstr ""
-msgctxt "field:project.work,currency_digits:0"
+msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,list_price:0"
+msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr "Прайс-лист"
#, fuzzy
-msgctxt "field:project.work,product:0"
+msgctxt "field:project.work,product:"
msgid "Product"
msgstr "Товарно материальные ценности (ТМЦ)"
-msgctxt "field:project.work,revenue:0"
+msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr ""
-msgctxt "help:company.employee,cost_price:0"
+msgctxt "help:company.employee,cost_price:"
msgid "Hourly cost price for this Employee"
msgstr ""
-msgctxt "help:company.employee,cost_prices:0"
+msgctxt "help:company.employee,cost_prices:"
msgid "List of hourly cost price over time"
msgstr ""
-msgctxt "help:company.employee_cost_price,cost_price:0"
+msgctxt "help:company.employee_cost_price,cost_price:"
msgid "Hourly cost price"
msgstr ""
-msgctxt "model:company.employee_cost_price,name:0"
+msgctxt "model:company.employee_cost_price,name:"
msgid "Employee Cost Price"
msgstr ""
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
msgid "Cost"
msgstr ""
-msgctxt "view:company.employee_cost_price:0"
+msgctxt "view:company.employee_cost_price:"
msgid "Cost Prices"
msgstr ""
diff --git a/service.py b/service.py
index fcf6892..2d698c9 100644
--- a/service.py
+++ b/service.py
@@ -1,5 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.cacheable import Cacheable
from trytond.pyson import Eval
@@ -89,7 +90,7 @@ class EmployeeCostPrice(ModelSQL, ModelView):
_name = 'company.employee_cost_price'
_description = __doc__
_rec_name = 'date'
- date = fields.Date('Date', required=True, select=1)
+ date = fields.Date('Date', required=True, select=True)
cost_price = fields.Numeric('Cost Price',
digits=(16, Eval('currency_digits', 2)),
required=True, depends=['currency_digits'],
@@ -106,21 +107,24 @@ class EmployeeCostPrice(ModelSQL, ModelView):
]
self._order.insert(0, ('date', 'DESC'))
+ def default_cost_price(self):
+ return Decimal(0)
+
def default_date(self):
date_obj = Pool().get('ir.date')
return date_obj.today()
def delete(self, ids):
Pool().get('company.employee').clear()
- return super(EmployeeCostPrice , self).delete(ids)
+ return super(EmployeeCostPrice, self).delete(ids)
def create(self, vals):
Pool().get('company.employee').clear()
- return super(EmployeeCostPrice , self).create(vals)
+ return super(EmployeeCostPrice, self).create(vals)
def write(self, ids, vals):
Pool().get('company.employee').clear()
- return super(EmployeeCostPrice , self).write(ids, vals)
+ return super(EmployeeCostPrice, self).write(ids, vals)
def get_currency_digits(self, ids, name):
res = {}
diff --git a/setup.py b/setup.py
index c224a63..91333b9 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index 7e7ed9e..4f77c86 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_project_revenue import suite
+from .test_project_revenue import suite
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index f7c7b01..4dcf4b0 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -2,7 +2,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class ProjectRevenueTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index d47e23c..465f63f 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond-project-revenue
-Version: 2.2.1
+Version: 2.4.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index d6045a3..6251373 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -14,8 +14,10 @@ work.xml
./tests/__init__.py
./tests/test_project_revenue.py
locale/bg_BG.po
+locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
+locale/es_AR.po
locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 008935e..9eaf447 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_project >= 2.2, < 2.3
-trytond_timesheet >= 2.2, < 2.3
-trytond_company >= 2.2, < 2.3
-trytond_product >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_project >= 2.4, < 2.5
+trytond_timesheet >= 2.4, < 2.5
+trytond_company >= 2.4, < 2.5
+trytond_product >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
diff --git a/work.py b/work.py
index c5c419b..eefb7ea 100644
--- a/work.py
+++ b/work.py
@@ -29,25 +29,22 @@ class TimesheetLine(ModelSQL, ModelView):
TimesheetLine()
+
class Work(ModelSQL, ModelView):
'Work Effort'
_name = 'project.work'
product = fields.Many2One('product.product', 'Product',
states={
- 'invisible': Eval('type') != 'task',
- }, on_change=['product', 'party', 'hours', 'company'],
- depends=['type', 'party', 'hours', 'company'])
+ 'invisible': ~Eval('timesheet_available'),
+ },
+ depends=['timesheet_available'],
+ on_change=['product', 'party', 'hours', 'company'])
list_price = fields.Numeric('List Price',
- digits=(16, Eval('currency_digits', 2)),
- states={
- 'invisible': Eval('type') != 'task',
- }, depends=['type', 'currency_digits'])
+ digits=(16, Eval('currency_digits', 2)), depends=['currency_digits'])
revenue = fields.Function(fields.Numeric('Revenue',
digits=(16, Eval('currency_digits', 2)),
- states={
- 'invisible': Eval('type') != 'project',
- }, depends=['type', 'currency_digits']), 'get_revenue')
+ depends=['currency_digits']), 'get_revenue')
cost = fields.Function(fields.Numeric('Cost',
digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']),
'get_cost')
@@ -102,8 +99,9 @@ class Work(ModelSQL, ModelView):
if not work.children:
leafs.add(work.id)
- if work.type == 'task':
- res[work.id] = work.list_price * Decimal(str(work.total_effort))
+ if work.type == 'task' and work.list_price:
+ res[work.id] = (work.list_price
+ * Decimal(str(work.total_effort)))
else:
res[work.id] = Decimal('0')
@@ -152,6 +150,7 @@ class Work(ModelSQL, ModelView):
company_obj = pool.get('company.company')
model_data_obj = pool.get('ir.model.data')
uom_obj = pool.get('product.uom')
+ currency_obj = pool.get('currency.currency')
if not vals.get('product'):
return {}
diff --git a/work.xml b/work.xml
index a445031..c1c0ec0 100644
--- a/work.xml
+++ b/work.xml
@@ -10,28 +10,21 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<data>
- <xpath expr="/form/notebook/page[@id='general']/group[@id='left']"
- position="inside">
- <label name="cost"/>
- <field name="cost"/>
- </xpath>
-
- <xpath expr="/form/notebook/page[@id='general']/group[@id='right']"
- position="inside">
- <label name="revenue"/>
- <field name="revenue"/>
- <label name="product"/>
- <field name="product"/>
- <label name="list_price"/>
- <field name="list_price"/>
- </xpath>
-
- <xpath expr="/form/notebook/page[@id='children']/field[@name='children']/tree/field[@name='total_effort']"
- position="after">
+ <xpath expr="/form/notebook/page[@id='general']/label[@name='party']"
+ position="before">
+ <label name="product"/>
<field name="product"/>
+ <label name="list_price"/>
<field name="list_price"/>
- <field name="revenue"/>
+ <newline/>
+ </xpath>
+ <xpath expr="/form/notebook/page[@id='general']/field[@name='effort']"
+ position="after">
+ <label name="cost"/>
<field name="cost"/>
+ <label name="revenue"/>
+ <field name="revenue"/>
+ <newline/>
</xpath>
</data>
]]>
@@ -71,20 +64,5 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <record model="ir.ui.view" id="work_view_list3">
- <field name="model">project.work</field>
- <field name="inherit" ref="project.work_view_list3"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/tree/field[@name='total_effort']" position="after">
- <field name="revenue"/>
- <field name="cost"/>
- </xpath>
- </data>
- ]]>
- </field>
- </record>
-
</data>
</tryton>
commit 36c4511188bc13e4d0f9f096bb1dd4a87768d604
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:18 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index 40059b6..da0f275 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,5 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
Files: *
Copyright:
(C) 2008 Cedric Krier
commit c5c69f0fe436da96c4dd469dc30f4f73f664addf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:09:12 2012 +0100
Adding myself to copyright.
diff --git a/debian/copyright b/debian/copyright
index 490b192..40059b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,9 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 3e3c8311bfcd35afdfabbc4a14074b68caaabf11
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:01:03 2012 +0100
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 4048d6d..490b192 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
License: GPL-3+
License: GPL-3+
commit 522b1041d1c63f4885b90e65d0e9910d4bad87c7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:02 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index b58ad07..756058c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
commit 0c8515c3f9b4deb07cfc3ad10834218f10fcd919
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:09:15 2011 +0100
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index 90cccc7..a6d3ac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-project-revenue (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+ * Bumping X-Python-Version to >=2.6.
+ * Updating versioned tryton depends to 2.2.
+ * Merging upstream version 2.2.0.
+ * Removing deprecated XB-Python-Version for dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 13:55:37 +0100
+
tryton-modules-project-revenue (2.0.0-2) unstable; urgency=low
[ Daniel Baumann ]
commit 9ef8ddccb1c87e0270212d0b379e523e8bba07eb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 13:35:52 2011 +0100
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 85cd1c1..f9faa83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2011-12-26
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 0f9943f..ed9cb51 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 2.2.0
+Version: 2.2.1
Summary: Add product on timesheet lines.
Define allowed services for each employees.
diff --git a/__tryton__.py b/__tryton__.py
index f17297f..2d1b3e9 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Ingresos por proyectos',
'name_es_ES': 'Beneficio de proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '2.2.0',
+ 'version': '2.2.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/service.py b/service.py
index 67086ac..fcf6892 100644
--- a/service.py
+++ b/service.py
@@ -129,7 +129,7 @@ class EmployeeCostPrice(ModelSQL, ModelView):
return res
def on_change_with_currency_digits(self, vals):
- company_obj = Pool().get('company.employee')
+ employee_obj = Pool().get('company.employee')
if vals.get('employee'):
employee = employee_obj.browse(vals['employee'])
return employee.company.currency.digits
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index ac31e5d..d47e23c 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-project-revenue
-Version: 2.2.0
+Version: 2.2.1
Summary: Add product on timesheet lines.
Define allowed services for each employees.
commit 6fb42659f8577e681c3a1c085693322ead333a13
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Dec 17 13:59:45 2011 +0100
Bumping X-Python-Version to >=2.6.
diff --git a/debian/control b/debian/control
index a5b463d..b58ad07 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-modules-project-revenue
Architecture: all
commit f71f5310ba388453fffa30a27432a98084f572df
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:19:31 2011 +0100
Updating versioned tryton depends to 2.2.
diff --git a/debian/control b/debian/control
index 5d875f1..a5b463d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,9 @@ X-Python-Version: >= 2.5
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- tryton-modules-company (>= 2.0), tryton-modules-product (>= 2.0),
- tryton-modules-project (>= 2.0), tryton-modules-timesheet (>= 2.0),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ tryton-modules-company (>= 2.2), tryton-modules-product (>= 2.2),
+ tryton-modules-project (>= 2.2), tryton-modules-timesheet (>= 2.2),
python-pkg-resources
Description: Tryton Application Platform (Project Revenue Module)
Tryton is a high-level general purpose application platform written in Python
commit 16b64e040ad32de8c1692f4c394365121352cc09
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:18 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index b7dc78f..85cd1c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-25
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..32879df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 0c35317..0f9943f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project_revenue
-Version: 2.0.0
+Version: 2.2.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,23 +8,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index b451bd8..f17297f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Ingresos por proyectos',
'name_es_ES': 'Beneficio de proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -44,10 +44,13 @@ Défini par employé quels services sont autorisés.
'work.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 1807ab9..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,23 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,company.employee_cost_price,0,A employee can only have one cost price by date!,Служител може да има само една себестойност за ден!,0
-field,"company.employee,cost_price",0,Cost Price,Фабрична цена,0
-field,"company.employee,cost_prices",0,Cost Prices,Себестойност,0
-field,"company.employee,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"company.employee_cost_price,cost_price",0,Cost Price,Фабрична цена,0
-field,"company.employee_cost_price,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"company.employee_cost_price,date",0,Date,Дата,0
-field,"company.employee_cost_price,employee",0,Employee,Служител,0
-field,"company.employee_cost_price,rec_name",0,Name,Име,0
-field,"project.work,cost",0,Cost,Разход,0
-field,"project.work,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"project.work,list_price",0,List Price,Каталожна цена,0
-field,"project.work,product",0,Product,Продукт,0
-field,"project.work,revenue",0,Revenue,Приход,0
-help,"company.employee,cost_price",0,Hourly cost price for this Employee,Себестойност за час за този служител,0
-help,"company.employee,cost_prices",0,List of hourly cost price over time,Списък на себестойност за час през времето,0
-help,"company.employee_cost_price,cost_price",0,Hourly cost price,Себестойност за час,0
-model,"company.employee_cost_price,name",0,Employee Cost Price,Себестойност на клиент,0
-view,company.employee,0,Cost,Разход,0
-view,company.employee_cost_price,0,Cost Prices,Себестойност,0
-view,project.work,0,Cost,Разход,0
-view,project.work,0,Revenue,Приход,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 3d7edd6..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,company.employee_cost_price,0,A employee can only have one cost price by date!,Einem Mitarbeiter kann nur ein Kostenpreis pro Datum zugeordnet werden!,0
-field,"company.employee,cost_price",0,Cost Price,Kostenpreis,0
-field,"company.employee,cost_prices",0,Cost Prices,Kostenpreise,0
-field,"company.employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"company.employee_cost_price,cost_price",0,Cost Price,Einkaufspreis,0
-field,"company.employee_cost_price,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"company.employee_cost_price,date",0,Date,Datum,0
-field,"company.employee_cost_price,employee",0,Employee,Mitarbeiter,0
-field,"company.employee_cost_price,rec_name",0,Name,Name,0
-field,"project.work,cost",0,Cost,Kosten,0
-field,"project.work,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"project.work,list_price",0,List Price,Listenpreis,0
-field,"project.work,product",0,Product,Artikel,0
-field,"project.work,revenue",0,Revenue,Ertrag,0
-help,"company.employee,cost_price",0,Hourly cost price for this Employee,Kostenpreis pro Stunde für diesen Mitarbeiter,0
-help,"company.employee,cost_prices",0,List of hourly cost price over time,Liste der Kostenpreise pro Stunde über die Zeit,0
-help,"company.employee_cost_price,cost_price",0,Hourly cost price,Kostenpreis pro Stunde,0
-model,"company.employee_cost_price,name",0,Employee Cost Price,Mitarbeiter Kostenpreis,0
-view,company.employee,0,Cost,Kosten,0
-view,company.employee,0,Services,Leistungen,0
-view,company.employee_cost_price,0,Cost Prices,Kostenpreise,0
-view,project.work,0,Cost,Kosten,0
-view,project.work,0,Revenue,Ertrag,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 4583b7d..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,company.employee_cost_price,0,A employee can only have one cost price by date!,,0
-field,"company.employee,cost_price",0,Cost Price,Precio de Costo,1
-field,"company.employee_cost_price,cost_price",0,Cost Price,Precio de Costo,1
-field,"company.employee_cost_price,currency_digits",0,Currency Digits,Gestión de Moneda,1
-field,"company.employee_cost_price,date",0,Date,Fecha,1
-field,"company.employee_cost_price,employee",0,Employee,Empleado,1
-field,"company.employee_cost_price,rec_name",0,Name,Nombre de Contacto,1
-field,"company.employee,cost_prices",0,Cost Prices,,0
-field,"company.employee,currency_digits",0,Currency Digits,Gestión de Moneda,1
-field,"project.work,cost",0,Cost,,0
-field,"project.work,currency_digits",0,Currency Digits,Gestión de Moneda,1
-field,"project.work,list_price",0,List Price,Precio de Lista,1
-field,"project.work,product",0,Product,Productos,1
-field,"project.work,revenue",0,Revenue,Ingresos,1
-help,"company.employee,cost_price",0,Hourly cost price for this Employee,,0
-help,"company.employee_cost_price,cost_price",0,Hourly cost price,,0
-help,"company.employee,cost_prices",0,List of hourly cost price over time,,0
-model,"company.employee_cost_price,name",0,Employee Cost Price,,0
-view,company.employee,0,Cost,,0
-view,company.employee,0,Services,Servicios,0
-view,company.employee_cost_price,0,Cost Prices,,0
-view,project.work,0,Cost,,0
-view,project.work,0,Revenue,Ingresos,1
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index dc3272c..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,company.employee_cost_price,0,A employee can only have one cost price by date!,Un empleado solo puede tener un precio de coste por fecha,0
-field,"company.employee,cost_price",0,Cost Price,Precio de coste,0
-field,"company.employee_cost_price,cost_price",0,Cost Price,Precio de coste,0
-field,"company.employee_cost_price,currency_digits",0,Currency Digits,Decimales de la divisa,0
-field,"company.employee_cost_price,date",0,Date,Fecha,0
-field,"company.employee_cost_price,employee",0,Employee,Empleado,0
-field,"company.employee_cost_price,rec_name",0,Name,Nombre,0
-field,"company.employee,cost_prices",0,Cost Prices,Precios de coste,0
-field,"company.employee,currency_digits",0,Currency Digits,Decimales de la divisa,0
-field,"project.work,cost",0,Cost,Coste,0
-field,"project.work,currency_digits",0,Currency Digits,Decimales de la divisa,0
-field,"project.work,list_price",0,List Price,Precio de lista,0
-field,"project.work,product",0,Product,Producto,0
-field,"project.work,revenue",0,Revenue,Beneficio,0
-help,"company.employee,cost_price",0,Hourly cost price for this Employee,Precio de coste por hora para este empleado,0
-help,"company.employee_cost_price,cost_price",0,Hourly cost price,Precio de coste por hora,0
-help,"company.employee,cost_prices",0,List of hourly cost price over time,Lista de precio de coste por hora a través del tiempo,0
-model,"company.employee_cost_price,name",0,Employee Cost Price,Precio de coste del empleado,0
-view,company.employee,0,Cost,Coste,0
-view,company.employee,0,Services,Servicios,0
-view,company.employee_cost_price,0,Cost Prices,Precios de coste,0
-view,project.work,0,Cost,Coste,0
-view,project.work,0,Revenue,Beneficio,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index e79dade..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,company.employee_cost_price,0,A employee can only have one cost price by date!,Un employé ne peut avoir qu'un seul prix de revient par date !,0
-field,"company.employee,cost_price",0,Cost Price,Prix de Revient,0
-field,"company.employee,cost_prices",0,Cost Prices,Prix de revient,0
-field,"company.employee,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"company.employee_cost_price,cost_price",0,Cost Price,Prix de Revient,0
-field,"company.employee_cost_price,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"company.employee_cost_price,date",0,Date,Date,0
-field,"company.employee_cost_price,employee",0,Employee,Employé,0
-field,"company.employee_cost_price,rec_name",0,Name,Nom,0
-field,"project.work,cost",0,Cost,Coût,0
-field,"project.work,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"project.work,list_price",0,List Price,Prix Listé,0
-field,"project.work,product",0,Product,Produit,0
-field,"project.work,revenue",0,Revenue,Revenu,0
-help,"company.employee,cost_price",0,Hourly cost price for this Employee,Prix de revient horaire de cet employé,0
-help,"company.employee,cost_prices",0,List of hourly cost price over time,Liste du prix de revient horaire au cours du temps,0
-help,"company.employee_cost_price,cost_price",0,Hourly cost price,Prix de revient horaire,0
-model,"company.employee_cost_price,name",0,Employee Cost Price,Prix de revient de l'employé,0
-view,company.employee,0,Cost,Coût,0
-view,company.employee,0,Services,Services,0
-view,company.employee_cost_price,0,Cost Prices,Prix de revient,0
-view,project.work,0,Cost,Coût,0
-view,project.work,0,Revenue,Revenu,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..a6b5ba2
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,91 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+msgid "A employee can only have one cost price by date!"
+msgstr "Служител може да има само една себестойност за ден!"
+
+msgctxt "field:company.employee,cost_price:0"
+msgid "Cost Price"
+msgstr "Фабрична цена"
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr "Себестойност"
+
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr "Фабрична цена"
+
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr "Дата"
+
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr "Разход"
+
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr "Каталожна цена"
+
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr "Продукт"
+
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr "Приход"
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr "Себестойност за час за този служител"
+
+msgctxt "help:company.employee,cost_prices:0"
+msgid "List of hourly cost price over time"
+msgstr "Списък на себестойност за час през времето"
+
+msgctxt "help:company.employee_cost_price,cost_price:0"
+msgid "Hourly cost price"
+msgstr "Себестойност за час"
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr "Себестойност на клиент"
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr "Разход"
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr "Себестойност"
+
+msgctxt "view:project.work:0"
+msgid "Cost"
+msgstr "Разход"
+
+msgctxt "view:project.work:0"
+msgid "Revenue"
+msgstr "Приход"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..ad8c08e
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,83 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+msgid "A employee can only have one cost price by date!"
+msgstr ""
+
+msgctxt "field:company.employee,cost_price:0"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr ""
+
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr ""
+
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr ""
+
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr ""
+
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr ""
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr ""
+
+msgctxt "help:company.employee,cost_prices:0"
+msgid "List of hourly cost price over time"
+msgstr ""
+
+msgctxt "help:company.employee_cost_price,cost_price:0"
+msgid "Hourly cost price"
+msgstr ""
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr ""
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr ""
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..d2c61b7
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,96 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+msgid "A employee can only have one cost price by date!"
+msgstr ""
+"Einem Mitarbeiter kann nur ein Kostenpreis pro Datum zugeordnet werden!"
+
+msgctxt "field:company.employee,cost_price:0"
+msgid "Cost Price"
+msgstr "Kostenpreis"
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr "Kostenpreise"
+
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr "Einkaufspreis"
+
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr "Kosten"
+
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr "Listenpreis"
+
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr "Ertrag"
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr "Kostenpreis pro Stunde für diesen Mitarbeiter"
+
+msgctxt "help:company.employee,cost_prices:0"
+msgid "List of hourly cost price over time"
+msgstr "Liste der Kostenpreise pro Stunde über die Zeit"
+
+msgctxt "help:company.employee_cost_price,cost_price:0"
+msgid "Hourly cost price"
+msgstr "Kostenpreis pro Stunde"
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr "Mitarbeiter Kostenpreis"
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr "Kosten"
+
+msgctxt "view:company.employee:0"
+msgid "Services"
+msgstr "Leistungen"
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr "Kostenpreise"
+
+msgctxt "view:project.work:0"
+msgid "Cost"
+msgstr "Kosten"
+
+msgctxt "view:project.work:0"
+msgid "Revenue"
+msgstr "Ertrag"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..e39e9e6
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,107 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+msgid "A employee can only have one cost price by date!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee,cost_price:0"
+msgid "Cost Price"
+msgstr "Precio de Costo"
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Gestión de Moneda"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr "Precio de Costo"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Gestión de Moneda"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Gestión de Moneda"
+
+#, fuzzy
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr "Precio de Lista"
+
+#, fuzzy
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr "Productos"
+
+#, fuzzy
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr "Ingresos"
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr ""
+
+msgctxt "help:company.employee,cost_prices:0"
+msgid "List of hourly cost price over time"
+msgstr ""
+
+msgctxt "help:company.employee_cost_price,cost_price:0"
+msgid "Hourly cost price"
+msgstr ""
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr ""
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr ""
+
+msgctxt "view:company.employee:0"
+msgid "Services"
+msgstr "Servicios"
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Cost"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:project.work:0"
+msgid "Revenue"
+msgstr "Ingresos"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..fff6e59
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,95 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+msgid "A employee can only have one cost price by date!"
+msgstr "Un empleado solo puede tener un precio de coste por fecha"
+
+msgctxt "field:company.employee,cost_price:0"
+msgid "Cost Price"
+msgstr "Precio de coste"
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr "Precios de coste"
+
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr "Precio de coste"
+
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr "Coste"
+
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr "Precio de lista"
+
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr "Beneficio"
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr "Precio de coste por hora para este empleado"
+
+msgctxt "help:company.employee,cost_prices:0"
+msgid "List of hourly cost price over time"
+msgstr "Lista de precio de coste por hora a través del tiempo"
+
+msgctxt "help:company.employee_cost_price,cost_price:0"
+msgid "Hourly cost price"
+msgstr "Precio de coste por hora"
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr "Precio de coste del empleado"
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr "Coste"
+
+msgctxt "view:company.employee:0"
+msgid "Services"
+msgstr "Servicios"
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr "Precios de coste"
+
+msgctxt "view:project.work:0"
+msgid "Cost"
+msgstr "Coste"
+
+msgctxt "view:project.work:0"
+msgid "Revenue"
+msgstr "Beneficio"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..a5021ae
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,95 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+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:0"
+msgid "Cost Price"
+msgstr "Prix de Revient"
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr "Prix de revient"
+
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr "Prix de Revient"
+
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr "Date"
+
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr "Coût"
+
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr "Prix Listé"
+
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr "Produit"
+
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr "Revenu"
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr "Prix de revient horaire de cet employé"
+
+msgctxt "help:company.employee,cost_prices:0"
+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:0"
+msgid "Hourly cost price"
+msgstr "Prix de revient horaire"
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr "Prix de revient de l'employé"
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr "Coût"
+
+msgctxt "view:company.employee:0"
+msgid "Services"
+msgstr "Services"
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr "Prix de revient"
+
+msgctxt "view:project.work:0"
+msgid "Cost"
+msgstr "Coût"
+
+msgctxt "view:project.work:0"
+msgid "Revenue"
+msgstr "Revenu"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..aa41ee8
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,94 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+msgid "A employee can only have one cost price by date!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee,cost_price:0"
+msgid "Cost Price"
+msgstr "Kostprijs"
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr "Kostprijs"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr "Vervaldatum"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+#, fuzzy
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr "Catalogusprijs"
+
+#, fuzzy
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr "Producten"
+
+#, fuzzy
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr "Opbrengst"
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr ""
+
+msgctxt "help:company.employee,cost_prices:0"
+msgid "List of hourly cost price over time"
+msgstr ""
+
+msgctxt "help:company.employee_cost_price,cost_price:0"
+msgid "Hourly cost price"
+msgstr ""
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr ""
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr ""
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..c46a60f
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,90 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:company.employee_cost_price:0"
+msgid "A employee can only have one cost price by date!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee,cost_price:0"
+msgid "Cost Price"
+msgstr "Цена за единицу"
+
+msgctxt "field:company.employee,cost_prices:0"
+msgid "Cost Prices"
+msgstr ""
+
+msgctxt "field:company.employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,cost_price:0"
+msgid "Cost Price"
+msgstr "Цена за единицу"
+
+msgctxt "field:company.employee_cost_price,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,date:0"
+msgid "Date"
+msgstr "Дата"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:company.employee_cost_price,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:project.work,cost:0"
+msgid "Cost"
+msgstr ""
+
+msgctxt "field:project.work,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,list_price:0"
+msgid "List Price"
+msgstr "Прайс-лист"
+
+#, fuzzy
+msgctxt "field:project.work,product:0"
+msgid "Product"
+msgstr "Товарно материальные ценности (ТМЦ)"
+
+msgctxt "field:project.work,revenue:0"
+msgid "Revenue"
+msgstr ""
+
+msgctxt "help:company.employee,cost_price:0"
+msgid "Hourly cost price for this Employee"
+msgstr ""
+
+msgctxt "help:company.employee,cost_prices:0"
+msgid "List of hourly cost price over time"
+msgstr ""
+
+msgctxt "help:company.employee_cost_price,cost_price:0"
+msgid "Hourly cost price"
+msgstr ""
+
+msgctxt "model:company.employee_cost_price,name:0"
+msgid "Employee Cost Price"
+msgstr ""
+
+msgctxt "view:company.employee:0"
+msgid "Cost"
+msgstr ""
+
+msgctxt "view:company.employee_cost_price:0"
+msgid "Cost Prices"
+msgstr ""
diff --git a/service.py b/service.py
index d3f895d..67086ac 100644
--- a/service.py
+++ b/service.py
@@ -4,6 +4,7 @@ from trytond.model import ModelView, ModelSQL, fields
from trytond.model.cacheable import Cacheable
from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
class Employee(ModelSQL, ModelView, Cacheable):
@@ -31,8 +32,8 @@ class Employee(ModelSQL, ModelView, Cacheable):
return res
def compute_cost_price(self, employee_id, date=None):
- date_obj = self.pool.get('ir.date')
- cost_price_obj = self.pool.get('company.employee_cost_price')
+ date_obj = Pool().get('ir.date')
+ cost_price_obj = Pool().get('company.employee_cost_price')
# Get from cache employee costs or fetch them from the db
employee_costs = self.get(employee_id)
@@ -66,14 +67,14 @@ class Employee(ModelSQL, ModelView, Cacheable):
return res
def on_change_with_currency_digits(self, vals):
- company_obj = self.pool.get('company.company')
+ company_obj = Pool().get('company.company')
if vals.get('company'):
company = company_obj.browse(vals['company'])
return company.currency.digits
return 2
def default_currency_digits(self):
- company_obj = self.pool.get('company.company')
+ company_obj = Pool().get('company.company')
company = Transaction().context.get('company')
if company:
company = company_obj.browse(company)
@@ -106,19 +107,19 @@ class EmployeeCostPrice(ModelSQL, ModelView):
self._order.insert(0, ('date', 'DESC'))
def default_date(self):
- date_obj = self.pool.get('ir.date')
+ date_obj = Pool().get('ir.date')
return date_obj.today()
def delete(self, ids):
- self.pool.get('company.employee').clear()
+ Pool().get('company.employee').clear()
return super(EmployeeCostPrice , self).delete(ids)
def create(self, vals):
- self.pool.get('company.employee').clear()
+ Pool().get('company.employee').clear()
return super(EmployeeCostPrice , self).create(vals)
def write(self, ids, vals):
- self.pool.get('company.employee').clear()
+ Pool().get('company.employee').clear()
return super(EmployeeCostPrice , self).write(ids, vals)
def get_currency_digits(self, ids, name):
@@ -128,14 +129,14 @@ class EmployeeCostPrice(ModelSQL, ModelView):
return res
def on_change_with_currency_digits(self, vals):
- company_obj = self.pool.get('company.employee')
+ company_obj = Pool().get('company.employee')
if vals.get('employee'):
employee = employee_obj.browse(vals['employee'])
return employee.company.currency.digits
return 2
def default_currency_digits(self):
- company_obj = self.pool.get('company.company')
+ company_obj = Pool().get('company.company')
company = Transaction().context.get('company')
if company:
company = company_obj.browse(company)
diff --git a/setup.py b/setup.py
index b4065d8..c224a63 100644
--- a/setup.py
+++ b/setup.py
@@ -39,18 +39,21 @@ setup(name='trytond_project_revenue',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index 7476a5e..f7c7b01 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class ProjectRevenueTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class ProjectRevenueTestCase(unittest.TestCase):
'''
test_view('project_revenue')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 6fbd146..ac31e5d 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project-revenue
-Version: 2.0.0
+Version: 2.2.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,23 +8,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index fbed64e..d6045a3 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -4,11 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
service.xml
setup.py
work.xml
@@ -18,6 +13,14 @@ work.xml
./work.py
./tests/__init__.py
./tests/test_project_revenue.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_project_revenue.egg-info/PKG-INFO
trytond_project_revenue.egg-info/SOURCES.txt
trytond_project_revenue.egg-info/dependency_links.txt
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 0b215cf..008935e 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_project >= 2.0, < 2.1
-trytond_timesheet >= 2.0, < 2.1
-trytond_company >= 2.0, < 2.1
-trytond_product >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_project >= 2.2, < 2.3
+trytond_timesheet >= 2.2, < 2.3
+trytond_company >= 2.2, < 2.3
+trytond_product >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/work.py b/work.py
index 4a1e34a..c5c419b 100644
--- a/work.py
+++ b/work.py
@@ -1,18 +1,18 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from __future__ import with_statement
from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Not, Equal, Eval
+from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
class TimesheetLine(ModelSQL, ModelView):
_name = 'timesheet.line'
def compute_cost(self, line):
- employee_obj = self.pool.get('company.employee')
- currency_obj = self.pool.get('currency.currency')
+ employee_obj = Pool().get('company.employee')
+ currency_obj = Pool().get('currency.currency')
cost_price = employee_obj.compute_cost_price(line.employee.id,
date=line.date)
@@ -34,20 +34,20 @@ class Work(ModelSQL, ModelView):
_name = 'project.work'
product = fields.Many2One('product.product', 'Product',
- states={
- 'invisible': Not(Equal(Eval('type'), 'task')),
+ states={
+ 'invisible': Eval('type') != 'task',
}, on_change=['product', 'party', 'hours', 'company'],
depends=['type', 'party', 'hours', 'company'])
list_price = fields.Numeric('List Price',
- digits=(16, Eval('currency_digits', 2)),
- states={
- 'invisible': Not(Equal(Eval('type'), 'task')),
- }, depends=['type', 'currency_digits'])
- revenue = fields.Function(fields.Numeric('Revenue',
digits=(16, Eval('currency_digits', 2)),
states={
- 'invisible': Not(Equal(Eval('type'), 'project')),
- }, depends=['type', 'currency_digits']), 'get_revenue')
+ 'invisible': Eval('type') != 'task',
+ }, depends=['type', 'currency_digits'])
+ revenue = fields.Function(fields.Numeric('Revenue',
+ digits=(16, Eval('currency_digits', 2)),
+ states={
+ 'invisible': Eval('type') != 'project',
+ }, depends=['type', 'currency_digits']), 'get_revenue')
cost = fields.Function(fields.Numeric('Cost',
digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']),
'get_cost')
@@ -55,7 +55,7 @@ class Work(ModelSQL, ModelView):
on_change_with=['company']), 'get_currency_digits')
def get_cost(self, ids, name):
- timesheet_line_obj = self.pool.get('timesheet.line')
+ timesheet_line_obj = Pool().get('timesheet.line')
all_ids = self.search([
('parent', 'child_of', ids),
('active', '=', True)]) + ids
@@ -131,14 +131,14 @@ class Work(ModelSQL, ModelView):
return res
def on_change_with_currency_digits(self, vals):
- company_obj = self.pool.get('company.company')
+ company_obj = Pool().get('company.company')
if vals.get('company'):
company = company_obj.browse(vals['company'])
return company.currency.digits
return 2
def default_currency_digits(self):
- company_obj = self.pool.get('company.company')
+ company_obj = Pool().get('company.company')
company = Transaction().context.get('company')
if company:
company = company_obj.browse(company)
@@ -146,11 +146,12 @@ class Work(ModelSQL, ModelView):
return 2
def on_change_product(self, vals):
- product_obj = self.pool.get('product.product')
- user_obj = self.pool.get('res.user')
- company_obj = self.pool.get('company.company')
- model_data_obj = self.pool.get('ir.model.data')
- uom_obj = self.pool.get('product.uom')
+ pool = Pool()
+ product_obj = pool.get('product.product')
+ user_obj = pool.get('res.user')
+ company_obj = pool.get('company.company')
+ model_data_obj = pool.get('ir.model.data')
+ uom_obj = pool.get('product.uom')
if not vals.get('product'):
return {}
diff --git a/work.xml b/work.xml
index c17506f..a445031 100644
--- a/work.xml
+++ b/work.xml
@@ -10,35 +10,24 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<data>
- <xpath expr="/form/notebook/page[@id="general"]/label[@name="hours"]" position="replace"/>
-
- <xpath expr="/form/notebook/page[@id="general"]/field[@name="hours"]" position="replace">
- <group colspan="2" col="2" id="cost">
- <separator string="Cost" id="cost" colspan="2"/>
- <label name="cost"/>
- <field name="cost"/>
- <label name="hours"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- </group>
+ <xpath expr="/form/notebook/page[@id='general']/group[@id='left']"
+ position="inside">
+ <label name="cost"/>
+ <field name="cost"/>
</xpath>
- <xpath expr="/form/notebook/page[@id="general"]/group[@id="effort"]" position="replace">
- <group colspan="2" col="2" id="revenue">
- <separator string="Revenue" id="revenue" colspan="2"/>
+ <xpath expr="/form/notebook/page[@id='general']/group[@id='right']"
+ position="inside">
<label name="revenue"/>
<field name="revenue"/>
<label name="product"/>
<field name="product"/>
<label name="list_price"/>
<field name="list_price"/>
- <label name="effort"/>
- <field name="effort" widget="float_time" float_time="company_work_time"/>
- <label name="total_effort"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- </group>
</xpath>
- <xpath expr="/form/notebook/page[@id="children"]/field[@name="children"]/tree/field[@name="total_effort"]" position="after">
+ <xpath expr="/form/notebook/page[@id='children']/field[@name='children']/tree/field[@name='total_effort']"
+ position="after">
<field name="product"/>
<field name="list_price"/>
<field name="revenue"/>
@@ -55,7 +44,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<data>
- <xpath expr="/tree/field[@name="total_effort"]" position="after">
+ <xpath expr="/tree/field[@name='total_effort']" position="after">
<field name="product"/>
<field name="list_price"/>
<field name="revenue"/>
@@ -72,7 +61,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<data>
- <xpath expr="/tree/field[@name="total_effort"]" position="after">
+ <xpath expr="/tree/field[@name='total_effort']" position="after">
<field name="product"/>
<field name="list_price"/>
<field name="cost"/>
@@ -88,7 +77,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<data>
- <xpath expr="/tree/field[@name="total_effort"]" position="after">
+ <xpath expr="/tree/field[@name='total_effort']" position="after">
<field name="revenue"/>
<field name="cost"/>
</xpath>
commit aee1c48666e6bdc1a76464cc27ac8f5cf6e8eac6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 12:26:59 2011 +0200
Removing deprecated XB-Python-Version for dh_python2.
diff --git a/debian/control b/debian/control
index d28b79d..5d875f1 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Depends:
tryton-modules-company (>= 2.0), tryton-modules-product (>= 2.0),
tryton-modules-project (>= 2.0), tryton-modules-timesheet (>= 2.0),
python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Revenue Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 2d838dfa56bfd637781edf423f561cbee755db81
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:21:34 2011 +0200
Releasing debian version 2.0.0-2.
diff --git a/debian/changelog b/debian/changelog
index 9ba213f..90cccc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-project-revenue (2.0.0-2) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing for new source package version obsoleted README.source file.
+ * Adding options for source package.
+ * Compacting copyright file.
+ * Not wrapping uploaders field, it does not exceed 80 chars.
+
+ [ Mathias Behrle ]
+ * Moving from deprecated python-support to dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 14 Jul 2011 01:21:29 +0200
+
tryton-modules-project-revenue (2.0.0-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit 512ed45c7df0910735e5fc2e507f3f0fb46db506
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 20:28:23 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index 12ffdcb..d28b79d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
+X-Python-Version: >= 2.5
Package: tryton-modules-project-revenue
Architecture: all
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit 880ab33375d47e4d2aaef7ecd34ba1f067fada4a
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 16:01:11 2011 +0200
Not wrapping uploaders field, it does not exceed 80 chars.
diff --git a/debian/control b/debian/control
index 88fffc0..12ffdcb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-project-revenue
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders:
- Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.2
commit 7b865572c156be0e44a9255a5e11a70cc62c671b
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:54:40 2011 +0200
Compacting copyright file.
diff --git a/debian/copyright b/debian/copyright
index b4e2946..4048d6d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,14 @@
-Upstream-Contact: Tryton project <tryton at googlegroups.com>
-Upstream-Homepage: http://downloads.tryton.org/
-Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Maintainer-Homepage: http://tryton.debian-maintainers.org/
-
Files: *
Copyright:
(C) 2008 Cedric Krier
(C) 2008 B2CK SPRL
License: GPL-3+
- 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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
+
+License: GPL-3+
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
the Free Software Foundation, either version 3 of the License, or
@@ -40,5 +22,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
commit 5f67fc37557a9b09b9dab8ba700f41a5c6943a07
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:55 2011 +0200
Adding options for source package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit 3117b7a20c6439421a67fc53b3c1188524991d01
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:03 2011 +0200
Removing for new source package version obsoleted README.source file.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b24..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-Package Repositories
---------------------
-
-Backports for the current stable debian distribution as well as snapshots of
-unreleased versions may be available in repositories listed on the maintainers
-homepage. The current URL of the maintainer homepage can be seen in
-debian/copyright.
-
-
-Source Access
--------------
-
-You can obtain the sources of this package with:
-
- $ apt-get source ${PACKAGE}
-
-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
-
-This package is maintained with the Git version control system. The current git
-source tree can be obtained with:
-
- $ git clone ${GIT_URI}
-
-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
-repository. The current Git URI can be seen in debian/control in the extracted
-package sources.
-
-More information about Git can be found in the git-core package.
-
-This package may use the Quilt patch system to manage all modifications to the
-upstream source. Changes, if any, are stored in the source package as diffs in
-debian/diff and are applied during the build. Current modifications can be
-applied to the source tree with:
-
- $ QUILT_PATCHES=debian/patches quilt push -a
-
-More information about Quilt can be found in the quilt package.
commit ccfea69a933c69f3f5011b080b2df92b163fab43
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:05 2011 +0200
Releasing debian version 2.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 8588077..9ba213f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project-revenue (2.0.0-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+ * Updating versioned tryton depends to 2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:35:50 +0200
+
tryton-modules-project-revenue (1.8.1-1) unstable; urgency=low
* Changing my email address.
commit cbb448727c6b65e20f352e1968b3ea90f91bada5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:21:34 2011 +0200
Updating versioned tryton depends to 2.0.
diff --git a/debian/control b/debian/control
index c3ca03d..88fffc0 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-reve
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
- tryton-modules-company (>= 1.8), tryton-modules-product (>= 1.8),
- tryton-modules-project (>= 1.8), tryton-modules-timesheet (>= 1.8),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ tryton-modules-company (>= 2.0), tryton-modules-product (>= 2.0),
+ tryton-modules-project (>= 2.0), tryton-modules-timesheet (>= 2.0),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Revenue Module)
commit e192daa1430d821045e04803bb65849fb8c3f94b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:58 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index fccb943..b7dc78f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 1.8.1 - 2011-02-13
+Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
Version 1.8.0 - 2010-11-01
diff --git a/PKG-INFO b/PKG-INFO
index 6feffff..0c35317 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project_revenue
-Version: 1.8.1
+Version: 2.0.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,8 +18,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
+Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 5d404ca..b451bd8 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,17 +2,22 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Project Revenue',
+ 'name_bg_BG': 'Приходи на проект',
'name_de_DE': 'Projekte Ertrag',
'name_es_CO': 'Ingresos por proyectos',
'name_es_ES': 'Beneficio de proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '1.8.1',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Add product on timesheet lines.
Define allowed services for each employees.
''',
+ 'description_bg_BG': '''Модул Приходи на проект:
+ - Позволява добавяне на продукт към редове от график.
+ - Позволява задаване на позволените за всеки служител услуги.
+''',
'description_de_DE': '''Projektmodul Ertrag:
- Ermöglicht das Hinzufügen von Artikeln zu Zeitpositionen.
- Ermöglicht die Definition von Dienstleistungen, die für einen Mitarbeiter verwendet werden können.
@@ -39,6 +44,7 @@ Défini par employé quels services sont autorisés.
'work.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..1807ab9
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,23 @@
+type,name,res_id,src,value,fuzzy
+error,company.employee_cost_price,0,A employee can only have one cost price by date!,Служител може да има само една себестойност за ден!,0
+field,"company.employee,cost_price",0,Cost Price,Фабрична цена,0
+field,"company.employee,cost_prices",0,Cost Prices,Себестойност,0
+field,"company.employee,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"company.employee_cost_price,cost_price",0,Cost Price,Фабрична цена,0
+field,"company.employee_cost_price,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"company.employee_cost_price,date",0,Date,Дата,0
+field,"company.employee_cost_price,employee",0,Employee,Служител,0
+field,"company.employee_cost_price,rec_name",0,Name,Име,0
+field,"project.work,cost",0,Cost,Разход,0
+field,"project.work,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"project.work,list_price",0,List Price,Каталожна цена,0
+field,"project.work,product",0,Product,Продукт,0
+field,"project.work,revenue",0,Revenue,Приход,0
+help,"company.employee,cost_price",0,Hourly cost price for this Employee,Себестойност за час за този служител,0
+help,"company.employee,cost_prices",0,List of hourly cost price over time,Списък на себестойност за час през времето,0
+help,"company.employee_cost_price,cost_price",0,Hourly cost price,Себестойност за час,0
+model,"company.employee_cost_price,name",0,Employee Cost Price,Себестойност на клиент,0
+view,company.employee,0,Cost,Разход,0
+view,company.employee_cost_price,0,Cost Prices,Себестойност,0
+view,project.work,0,Cost,Разход,0
+view,project.work,0,Revenue,Приход,0
diff --git a/setup.py b/setup.py
index 1fb9243..b4065d8 100644
--- a/setup.py
+++ b/setup.py
@@ -44,10 +44,15 @@ setup(name='trytond_project_revenue',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
+ 'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index cd55a8d..6fbd146 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project-revenue
-Version: 1.8.1
+Version: 2.0.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,8 +18,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
+Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index 56eb7fc..fbed64e 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 96c66f8..0b215cf 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_project >= 1.8, < 1.9
-trytond_timesheet >= 1.8, < 1.9
-trytond_company >= 1.8, < 1.9
-trytond_product >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_project >= 2.0, < 2.1
+trytond_timesheet >= 2.0, < 2.1
+trytond_company >= 2.0, < 2.1
+trytond_product >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
diff --git a/work.py b/work.py
index eba37fa..4a1e34a 100644
--- a/work.py
+++ b/work.py
@@ -21,9 +21,9 @@ class TimesheetLine(ModelSQL, ModelView):
work_company = line.work.company
if line_company.id != work_company.id and\
line_company.currency.id != work_company.currency.id:
-
- cost_price = currency_obj.compute(line_company.currency,
- cost_price, work_company.currency)
+ with Transaction().set_context(date=line.date):
+ cost_price = currency_obj.compute(line_company.currency.id,
+ cost_price, work_company.currency.id)
return Decimal(str(line.hours)) * cost_price
diff --git a/work.xml b/work.xml
index 0cf92f5..c17506f 100644
--- a/work.xml
+++ b/work.xml
@@ -66,9 +66,9 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <record model="ir.ui.view" id="work_view_tree2">
+ <record model="ir.ui.view" id="work_view_list2">
<field name="model">project.work</field>
- <field name="inherit" ref="project.work_view_tree2"/>
+ <field name="inherit" ref="project.work_view_list2"/>
<field name="arch" type="xml">
<![CDATA[
<data>
@@ -82,9 +82,9 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <record model="ir.ui.view" id="work_view_tree3">
+ <record model="ir.ui.view" id="work_view_list3">
<field name="model">project.work</field>
- <field name="inherit" ref="project.work_view_tree3"/>
+ <field name="inherit" ref="project.work_view_list3"/>
<field name="arch" type="xml">
<![CDATA[
<data>
commit 03be048cd4867d673d8c2ea9a83be1a09033c5e3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:54 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index 9ed42bf..c3ca03d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
commit 2c8ad06480e3df59953f8e711585e0660a32a291
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:14:40 2011 +0100
Releasing debian version 1.8.1-1.
diff --git a/debian/changelog b/debian/changelog
index 31d9cf6..8588077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project-revenue (1.8.1-1) unstable; urgency=low
+
+ * Changing my email address.
+ * Setting minimal Python version to 2.5.
+ * Merging upstream version 1.8.1.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:14:23 +0100
+
tryton-modules-project-revenue (1.8.0-1) experimental; urgency=low
* Updating standards version to 3.9.0.
commit 32b1b48f8fe02e8d3a9fdb848a32f9926ac5359a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:45 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index ef904bc..b4e2946 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit b972e5824eae93a243007ca6e7072d32c6d36416
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 11:46:21 2011 +0100
Merging upstream version 1.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 505414f..fccb943 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.1 - 2011-02-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 2afd2a7..bd93e8d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008 Cédric Krier.
-Copyright (C) 2008 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 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 --git a/PKG-INFO b/PKG-INFO
index 74e6b65..6feffff 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project_revenue
-Version: 1.8.0
+Version: 1.8.1
Summary: Add product on timesheet lines.
Define allowed services for each employees.
diff --git a/__tryton__.py b/__tryton__.py
index ae71399..5d404ca 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Ingresos por proyectos',
'name_es_ES': 'Beneficio de proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '1.8.0',
+ 'version': '1.8.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/service.py b/service.py
index a7993c9..d3f895d 100644
--- a/service.py
+++ b/service.py
@@ -110,15 +110,15 @@ class EmployeeCostPrice(ModelSQL, ModelView):
return date_obj.today()
def delete(self, ids):
- self.pool.get('company.employee').clear.reset()
+ self.pool.get('company.employee').clear()
return super(EmployeeCostPrice , self).delete(ids)
def create(self, vals):
- self.pool.get('company.employee').clear.reset()
+ self.pool.get('company.employee').clear()
return super(EmployeeCostPrice , self).create(vals)
def write(self, ids, vals):
- self.pool.get('company.employee').clear.reset()
+ self.pool.get('company.employee').clear()
return super(EmployeeCostPrice , self).write(ids, vals)
def get_currency_digits(self, ids, name):
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 4487d22..cd55a8d 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project-revenue
-Version: 1.8.0
+Version: 1.8.1
Summary: Add product on timesheet lines.
Define allowed services for each employees.
commit 7f3e2b231e1e5a18513ee0d555bb89595bf073f8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 15 17:27:20 2011 +0100
Setting minimal Python version to 2.5.
diff --git a/debian/pyversions b/debian/pyversions
index 8b253bc..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.5-
commit b48d0194d349bb1ff16c462dd199748ae9a55a8b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 11:48:56 2010 +0100
Changing my email address.
diff --git a/debian/control b/debian/control
index b0dfaaf..9ed42bf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+ Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.1
commit d7bc8a7528e70842a6ade60339b35c592c1b09d5
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Nov 12 13:07:25 2010 +0100
Releasing debian version 1.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index d0dd7dc..31d9cf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project-revenue (1.8.0-1) experimental; urgency=low
+
+ * Updating standards version to 3.9.0.
+ * Updating to debhelper version 8.
+ * Updating to standards version 3.9.1.
+ * Switching to source format 3.0 (quilt).
+ * Merging upstream version 1.8.0.
+ * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 12 Nov 2010 13:07:23 +0100
+
tryton-modules-project-revenue (1.6.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit 52f7dea3dda1ae5a5b92b4f6e9090719ec7e4858
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:16:01 2010 +0100
Updating versioned tryton depends to 1.8.
diff --git a/debian/control b/debian/control
index 3c4a55d..b0dfaaf 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-reve
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-company (>= 1.6), tryton-modules-product (>= 1.6),
- tryton-modules-project (>= 1.6), tryton-modules-timesheet (>= 1.6),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ tryton-modules-company (>= 1.8), tryton-modules-product (>= 1.8),
+ tryton-modules-project (>= 1.8), tryton-modules-timesheet (>= 1.8),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Revenue Module)
commit c18eff6f5c140e677039c12f403b6776f2d96f27
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:13:25 2010 +0100
Merging upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6175416..505414f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-13
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 2f5b09a..d4a0ecd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_project_revenue
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_project (http://www.tryton.org/)
* trytond_timesheet (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index cdd7ae5..74e6b65 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project_revenue
-Version: 1.6.0
+Version: 1.8.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index eed514e..ae71399 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Ingresos por proyectos',
'name_es_ES': 'Beneficio de proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index e59977e..3d7edd6 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,21 +1,21 @@
type,name,res_id,src,value,fuzzy
error,company.employee_cost_price,0,A employee can only have one cost price by date!,Einem Mitarbeiter kann nur ein Kostenpreis pro Datum zugeordnet werden!,0
field,"company.employee,cost_price",0,Cost Price,Kostenpreis,0
+field,"company.employee,cost_prices",0,Cost Prices,Kostenpreise,0
+field,"company.employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
field,"company.employee_cost_price,cost_price",0,Cost Price,Einkaufspreis,0
field,"company.employee_cost_price,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
field,"company.employee_cost_price,date",0,Date,Datum,0
field,"company.employee_cost_price,employee",0,Employee,Mitarbeiter,0
field,"company.employee_cost_price,rec_name",0,Name,Name,0
-field,"company.employee,cost_prices",0,Cost Prices,Kostenpreise,0
-field,"company.employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
field,"project.work,cost",0,Cost,Kosten,0
field,"project.work,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
field,"project.work,list_price",0,List Price,Listenpreis,0
field,"project.work,product",0,Product,Artikel,0
field,"project.work,revenue",0,Revenue,Ertrag,0
help,"company.employee,cost_price",0,Hourly cost price for this Employee,Kostenpreis pro Stunde für diesen Mitarbeiter,0
-help,"company.employee_cost_price,cost_price",0,Hourly cost price,Kostenpreis pro Stunde,0
help,"company.employee,cost_prices",0,List of hourly cost price over time,Liste der Kostenpreise pro Stunde über die Zeit,0
+help,"company.employee_cost_price,cost_price",0,Hourly cost price,Kostenpreis pro Stunde,0
model,"company.employee_cost_price,name",0,Employee Cost Price,Mitarbeiter Kostenpreis,0
view,company.employee,0,Cost,Kosten,0
view,company.employee,0,Services,Leistungen,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 52e846b..e79dade 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,21 +1,21 @@
type,name,res_id,src,value,fuzzy
error,company.employee_cost_price,0,A employee can only have one cost price by date!,Un employé ne peut avoir qu'un seul prix de revient par date !,0
field,"company.employee,cost_price",0,Cost Price,Prix de Revient,0
+field,"company.employee,cost_prices",0,Cost Prices,Prix de revient,0
+field,"company.employee,currency_digits",0,Currency Digits,Décimales de la devise,0
field,"company.employee_cost_price,cost_price",0,Cost Price,Prix de Revient,0
field,"company.employee_cost_price,currency_digits",0,Currency Digits,Décimales de la devise,0
field,"company.employee_cost_price,date",0,Date,Date,0
field,"company.employee_cost_price,employee",0,Employee,Employé,0
field,"company.employee_cost_price,rec_name",0,Name,Nom,0
-field,"company.employee,cost_prices",0,Cost Prices,Prix de revient,0
-field,"company.employee,currency_digits",0,Currency Digits,Décimales de la devise,0
field,"project.work,cost",0,Cost,Coût,0
field,"project.work,currency_digits",0,Currency Digits,Décimales de la devise,0
field,"project.work,list_price",0,List Price,Prix Listé,0
field,"project.work,product",0,Product,Produit,0
field,"project.work,revenue",0,Revenue,Revenu,0
help,"company.employee,cost_price",0,Hourly cost price for this Employee,Prix de revient horaire de cet employé,0
-help,"company.employee_cost_price,cost_price",0,Hourly cost price,Prix de revient horaire,0
help,"company.employee,cost_prices",0,List of hourly cost price over time,Liste du prix de revient horaire au cours du temps,0
+help,"company.employee_cost_price,cost_price",0,Hourly cost price,Prix de revient horaire,0
model,"company.employee_cost_price,name",0,Employee Cost Price,Prix de revient de l'employé,0
view,company.employee,0,Cost,Coût,0
view,company.employee,0,Services,Services,0
diff --git a/service.py b/service.py
index cf40c1b..a7993c9 100644
--- a/service.py
+++ b/service.py
@@ -1,9 +1,9 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-"Service"
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.cacheable import Cacheable
from trytond.pyson import Eval
+from trytond.transaction import Transaction
class Employee(ModelSQL, ModelView, Cacheable):
@@ -17,44 +17,39 @@ class Employee(ModelSQL, ModelView, Cacheable):
currency_digits = fields.Function(fields.Integer('Currency Digits',
on_change_with=['company']), 'get_currency_digits')
- def get_cost_price(self, cursor, user, ids, name, context=None):
+ def get_cost_price(self, ids, name):
'''
Return the cost price at the date given in the context or the
current date
'''
res = {}
- if context is None:
- context = {}
- ctx_date = context.get('date', None)
+ ctx_date = Transaction().context.get('date', None)
for employee_id in ids:
- res[employee_id] = self.compute_cost_price(cursor, user,
- employee_id, ctx_date, context=context)
+ res[employee_id] = self.compute_cost_price(employee_id, ctx_date)
return res
- def compute_cost_price(self, cursor, user, employee_id, date=None,
- context=None):
+ def compute_cost_price(self, employee_id, date=None):
date_obj = self.pool.get('ir.date')
cost_price_obj = self.pool.get('company.employee_cost_price')
# Get from cache employee costs or fetch them from the db
- employee_costs = self.get(cursor, employee_id)
+ employee_costs = self.get(employee_id)
if employee_costs is None:
- cost_price_ids = cost_price_obj.search(cursor, user, [
+ cost_price_ids = cost_price_obj.search([
('employee', '=', employee_id),
], order=[('date', 'ASC')])
- cost_prices = cost_price_obj.browse(
- cursor, user, cost_price_ids, context=context)
+ cost_prices = cost_price_obj.browse(cost_price_ids)
employee_costs = []
for cost_price in cost_prices:
employee_costs.append(
(cost_price.date, cost_price.cost_price))
- self.add(cursor, employee_id, employee_costs)
+ self.add(employee_id, employee_costs)
if date is None:
- date = date_obj.today(cursor, user, context=context)
+ date = date_obj.today()
# compute the cost price for the given date
cost = 0
if employee_costs and date >= employee_costs[0][0]:
@@ -64,28 +59,24 @@ class Employee(ModelSQL, ModelView, Cacheable):
break
return cost
- def get_currency_digits(self, cursor, user, ids, name, context=None):
+ def get_currency_digits(self, ids, name):
res = {}
- for employee in self.browse(cursor, user, ids, context=context):
+ for employee in self.browse(ids):
res[employee.id] = employee.company.currency.digits
return res
- def on_change_with_currency_digits(self, cursor, user, vals, context=None):
+ def on_change_with_currency_digits(self, vals):
company_obj = self.pool.get('company.company')
if vals.get('company'):
- company = company_obj.browse(cursor, user, vals['company'],
- context=context)
+ company = company_obj.browse(vals['company'])
return company.currency.digits
return 2
- def default_currency_digits(self, cursor, user, context=None):
+ def default_currency_digits(self):
company_obj = self.pool.get('company.company')
- if context is None:
- context = {}
- company = None
- if context.get('company'):
- company = company_obj.browse(cursor, user, context['company'],
- context=context)
+ company = Transaction().context.get('company')
+ if company:
+ company = company_obj.browse(company)
return company.currency.digits
return 2
@@ -114,47 +105,40 @@ class EmployeeCostPrice(ModelSQL, ModelView):
]
self._order.insert(0, ('date', 'DESC'))
- def default_date(self, cursor, user, context=None):
+ def default_date(self):
date_obj = self.pool.get('ir.date')
- return date_obj.today(cursor, user, context=context)
+ return date_obj.today()
- def delete(self, cursor, user, ids, context=None):
- self.pool.get('company.employee').clear(cursor)
- return super(EmployeeCostPrice , self).delete(cursor, user, ids,
- context=context)
+ def delete(self, ids):
+ self.pool.get('company.employee').clear.reset()
+ return super(EmployeeCostPrice , self).delete(ids)
- def create(self, cursor, user, vals, context=None):
- self.pool.get('company.employee').clear(cursor)
- return super(EmployeeCostPrice , self).create(cursor, user, vals,
- context=context)
+ def create(self, vals):
+ self.pool.get('company.employee').clear.reset()
+ return super(EmployeeCostPrice , self).create(vals)
- def write(self, cursor, user, ids, vals, context=None):
- self.pool.get('company.employee').clear(cursor)
- return super(EmployeeCostPrice , self).write(cursor, user, ids, vals,
- context=context)
+ def write(self, ids, vals):
+ self.pool.get('company.employee').clear.reset()
+ return super(EmployeeCostPrice , self).write(ids, vals)
- def get_currency_digits(self, cursor, user, ids, name, context=None):
+ def get_currency_digits(self, ids, name):
res = {}
- for costprice in self.browse(cursor, user, ids, context=context):
+ for costprice in self.browse(ids):
res[costprice.id] = costprice.employee.company.currency.digits
return res
- def on_change_with_currency_digits(self, cursor, user, vals, context=None):
+ def on_change_with_currency_digits(self, vals):
company_obj = self.pool.get('company.employee')
if vals.get('employee'):
- employee = employee_obj.browse(cursor, user, vals['employee'],
- context=context)
+ employee = employee_obj.browse(vals['employee'])
return employee.company.currency.digits
return 2
- def default_currency_digits(self, cursor, user, context=None):
+ def default_currency_digits(self):
company_obj = self.pool.get('company.company')
- if context is None:
- context = {}
- company = None
- if context.get('company'):
- company = company_obj.browse(cursor, user, context['company'],
- context=context)
+ company = Transaction().context.get('company')
+ if company:
+ company = company_obj.browse(company)
return company.currency.digits
return 2
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index 03ee364..7476a5e 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -25,7 +25,7 @@ class ProjectRevenueTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('project_revenue'))
+ test_view('project_revenue')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index b0799a9..4487d22 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project-revenue
-Version: 1.6.0
+Version: 1.8.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index d11ae60..96c66f8 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_project >= 1.6, < 1.7
-trytond_timesheet >= 1.6, < 1.7
-trytond_company >= 1.6, < 1.7
-trytond_product >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_project >= 1.8, < 1.9
+trytond_timesheet >= 1.8, < 1.9
+trytond_company >= 1.8, < 1.9
+trytond_product >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/work.py b/work.py
index c8c2e39..eba37fa 100644
--- a/work.py
+++ b/work.py
@@ -1,28 +1,29 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-
+from __future__ import with_statement
+from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Not, Equal, Eval
-from decimal import Decimal
+from trytond.transaction import Transaction
+
class TimesheetLine(ModelSQL, ModelView):
_name = 'timesheet.line'
- def compute_cost(self, cursor, user, line, context=None):
+ def compute_cost(self, line):
employee_obj = self.pool.get('company.employee')
currency_obj = self.pool.get('currency.currency')
- cost_price = employee_obj.compute_cost_price(cursor, user,
- line.employee.id, date=line.date, context=context)
+ cost_price = employee_obj.compute_cost_price(line.employee.id,
+ date=line.date)
line_company = line.employee.company
work_company = line.work.company
if line_company.id != work_company.id and\
line_company.currency.id != work_company.currency.id:
- cost_price = currency_obj.compute(cursor, user,
- line_company.currency, cost_price,
- work_company.currency, context=context)
+ cost_price = currency_obj.compute(line_company.currency,
+ cost_price, work_company.currency)
return Decimal(str(line.hours)) * cost_price
@@ -53,24 +54,23 @@ class Work(ModelSQL, ModelView):
currency_digits = fields.Function(fields.Integer('Currency Digits',
on_change_with=['company']), 'get_currency_digits')
- def get_cost(self, cursor, user, ids, name, context=None):
+ def get_cost(self, ids, name):
timesheet_line_obj = self.pool.get('timesheet.line')
- all_ids = self.search(cursor, user, [
+ all_ids = self.search([
('parent', 'child_of', ids),
- ('active', '=', True)], context=context) + ids
+ ('active', '=', True)]) + ids
all_ids = list(set(all_ids))
res = {}
id2work = {}
leafs = set()
- for work in self.browse(cursor, user, all_ids, context=context):
+ for work in self.browse(all_ids):
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
res[work.id] = Decimal('0')
for ts_line in work.timesheet_lines:
- res[work.id] += timesheet_line_obj.compute_cost(cursor, user,
- ts_line, context=context)
+ res[work.id] += timesheet_line_obj.compute_cost(ts_line)
while leafs:
parents = set()
@@ -89,15 +89,15 @@ class Work(ModelSQL, ModelView):
return res
- def get_revenue(self, cursor, user, ids, name, context=None):
- all_ids = self.search(cursor, user, [
+ def get_revenue(self, ids, name):
+ all_ids = self.search([
('parent', 'child_of', ids),
- ('active', '=', True)], context=context) + ids
+ ('active', '=', True)]) + ids
all_ids = list(set(all_ids))
res = {}
id2work = {}
leafs = set()
- for work in self.browse(cursor, user, all_ids, context=context):
+ for work in self.browse(all_ids):
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
@@ -124,32 +124,28 @@ class Work(ModelSQL, ModelView):
return res
- def get_currency_digits(self, cursor, user, ids, name, context=None):
+ def get_currency_digits(self, ids, name):
res = {}
- for work in self.browse(cursor, user, ids, context=context):
+ for work in self.browse(ids):
res[work.id] = work.company.currency.digits
return res
- def on_change_with_currency_digits(self, cursor, user, vals, context=None):
+ def on_change_with_currency_digits(self, vals):
company_obj = self.pool.get('company.company')
if vals.get('company'):
- company = company_obj.browse(cursor, user, vals['company'],
- context=context)
+ company = company_obj.browse(vals['company'])
return company.currency.digits
return 2
- def default_currency_digits(self, cursor, user, context=None):
+ def default_currency_digits(self):
company_obj = self.pool.get('company.company')
- if context is None:
- context = {}
- company = None
- if context.get('company'):
- company = company_obj.browse(cursor, user, context['company'],
- context=context)
+ company = Transaction().context.get('company')
+ if company:
+ company = company_obj.browse(company)
return company.currency.digits
return 2
- def on_change_product(self, cursor, user, vals, context=None):
+ def on_change_product(self, vals):
product_obj = self.pool.get('product.product')
user_obj = self.pool.get('res.user')
company_obj = self.pool.get('company.company')
@@ -159,31 +155,27 @@ class Work(ModelSQL, ModelView):
if not vals.get('product'):
return {}
- ctx = context and context.copy() or {}
+ context = {}
- product = product_obj.browse(cursor, user, vals['product'],
- context=context)
+ product = product_obj.browse(vals['product'])
if vals.get('party'):
- ctx2['customer'] = vals['party']
+ context['customer'] = vals['party']
- uom_id = model_data_obj.get_id(cursor, user, 'product', 'uom_hour',
- context=context)
- hour_uom = uom_obj.browse(cursor, user, uom_id, context=context)
+ uom_id = model_data_obj.get_id('product', 'uom_hour')
+ hour_uom = uom_obj.browse(uom_id)
- list_price = uom_obj.compute_price(cursor, user,
- product.default_uom, product.list_price, hour_uom,
- context=ctx)
+ with Transaction().set_context(context):
+ list_price = uom_obj.compute_price(product.default_uom,
+ product.list_price, hour_uom)
if vals.get('company'):
- user_record = user_obj.browse(cursor, user, user, context=context)
- if user_record.company.id != vals['company']:
- company = company_obj.browse(cursor, user, vals['company'],
- context=context)
- if user_record.company.currency.id != company.currency.id:
- list_price = currency_obj.compute(cursor, user,
- user_record.company.currency, list_price,
- company.currency, context=context)
+ user = user_obj.browse(Transaction().user)
+ if user.company.id != vals['company']:
+ company = company_obj.browse(vals['company'])
+ if user.company.currency.id != company.currency.id:
+ list_price = currency_obj.compute(user.company.currency,
+ list_price, company.currency)
return {'list_price': list_price}
Work()
commit d764e3481045cd2f623e703bbf5be26adc98b8df
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 2 14:27:14 2010 +0100
Switching to source format 3.0 (quilt).
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
commit bc8e58bcecfc9ec645af1b42aa35fdcac5176b9a
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:05:32 2010 +0200
Updating to standards version 3.9.1.
diff --git a/debian/control b/debian/control
index 2e4dc72..3c4a55d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
commit 73844f2a5cefb28bb32ec30a10d96112966b30e8
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:04:05 2010 +0200
Updating to debhelper version 8.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 2b37139..2e4dc72 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
commit 32bca8bba6381e8ace18b288af5d18cfcf4fae54
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 28 20:35:30 2010 +0200
Updating standards version to 3.9.0.
diff --git a/debian/control b/debian/control
index 71acc90..2b37139 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
commit 1bbf952702ddfb26e82b131fbd21f72a2a70750d
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 21:12:45 2010 +0200
Releasing debian version 1.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index 2d17721..d0dd7dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project-revenue (1.6.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 1.6.0.
+ * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz> Thu, 13 May 2010 21:12:26 +0200
+
tryton-modules-project-revenue (1.4.0-2) unstable; urgency=low
* Making depends versioned for tryton 1.4.
commit 4fb9813869e3c91d09fcd08838cf46c5ab9ef6f9
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 21:12:15 2010 +0200
Updating depends.
diff --git a/debian/control b/debian/control
index f74c56b..71acc90 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-reve
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-company (>= 1.4), tryton-modules-product (>= 1.4),
- tryton-modules-project (>= 1.4), tryton-modules-timesheet (>= 1.4),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ tryton-modules-company (>= 1.6), tryton-modules-product (>= 1.6),
+ tryton-modules-project (>= 1.6), tryton-modules-timesheet (>= 1.6),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Revenue Module)
commit e19752e73422538736b4917298fb9822c54d01f8
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 20:41:35 2010 +0200
Merging upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..6175416 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.6.0 - 2010-05-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/MANIFEST.in b/MANIFEST.in
index b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 102090a..cdd7ae5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project_revenue
-Version: 1.4.0
+Version: 1.6.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 96ec65e..eed514e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Ingresos por proyectos',
'name_es_ES': 'Beneficio de proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/es_CO.csv b/es_CO.csv
index 4ca86d3..4583b7d 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -1,13 +1,24 @@
type,name,res_id,src,value,fuzzy
-error,project_revenue.service,0,You can have only once the same product by employee!,Solamente puede tener un mismo producto por empleado!,0
-error,project_revenue.service,0,You must use a product with UOM of time!,Debe usar un producto con UdM de tiempo!,0
-error,timesheet.line,0,You can not use a product that is not an employee services!,No puede usar un producto que no sea un servicio de empleado!,0
-field,"company.employee,services",0,Services,Servicios,0
-field,"project_revenue.service,employee",0,Employee,Empleado,0
-field,"project_revenue.service,product",0,Product,Producto,0
-field,"project_revenue.service,sequence",0,Sequence,Secuencia,0
-field,"timesheet.line,product",0,Service,Servicio,0
-help,"company.employee,services",0,Services allowed to use in timesheets.,Servicios permitidos a usarse en las hojas de tiempo. ,0
-help,"project_revenue.service,sequence",0,Use to order Services,Usar para ordenar Servicios,0
+error,company.employee_cost_price,0,A employee can only have one cost price by date!,,0
+field,"company.employee,cost_price",0,Cost Price,Precio de Costo,1
+field,"company.employee_cost_price,cost_price",0,Cost Price,Precio de Costo,1
+field,"company.employee_cost_price,currency_digits",0,Currency Digits,Gestión de Moneda,1
+field,"company.employee_cost_price,date",0,Date,Fecha,1
+field,"company.employee_cost_price,employee",0,Employee,Empleado,1
+field,"company.employee_cost_price,rec_name",0,Name,Nombre de Contacto,1
+field,"company.employee,cost_prices",0,Cost Prices,,0
+field,"company.employee,currency_digits",0,Currency Digits,Gestión de Moneda,1
+field,"project.work,cost",0,Cost,,0
+field,"project.work,currency_digits",0,Currency Digits,Gestión de Moneda,1
+field,"project.work,list_price",0,List Price,Precio de Lista,1
+field,"project.work,product",0,Product,Productos,1
+field,"project.work,revenue",0,Revenue,Ingresos,1
+help,"company.employee,cost_price",0,Hourly cost price for this Employee,,0
+help,"company.employee_cost_price,cost_price",0,Hourly cost price,,0
+help,"company.employee,cost_prices",0,List of hourly cost price over time,,0
+model,"company.employee_cost_price,name",0,Employee Cost Price,,0
+view,company.employee,0,Cost,,0
view,company.employee,0,Services,Servicios,0
-view,project_revenue.service,0,Service,Servicio,0
+view,company.employee_cost_price,0,Cost Prices,,0
+view,project.work,0,Cost,,0
+view,project.work,0,Revenue,Ingresos,1
diff --git a/service.py b/service.py
index 688ee4f..cf40c1b 100644
--- a/service.py
+++ b/service.py
@@ -3,21 +3,21 @@
"Service"
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.cacheable import Cacheable
+from trytond.pyson import Eval
class Employee(ModelSQL, ModelView, Cacheable):
_name = 'company.employee'
- cost_price = fields.Function('get_cost_price', string='Cost Price',
- type='numeric', digits="(16, currency_digits)",
- depends=['currency_digits'],
- help="Hourly cost price for this Employee")
+ cost_price = fields.Function(fields.Numeric('Cost Price',
+ digits=(16, Eval('currency_digits', 2)), depends=['currency_digits'],
+ 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")
- currency_digits = fields.Function('get_currency_digits', type='integer',
- string='Currency Digits', on_change_with=['company'])
+ currency_digits = fields.Function(fields.Integer('Currency Digits',
+ on_change_with=['company']), 'get_currency_digits')
- def get_cost_price(self, cursor, user, ids, name, arg, context=None):
+ def get_cost_price(self, cursor, user, ids, name, context=None):
'''
Return the cost price at the date given in the context or the
current date
@@ -64,14 +64,13 @@ class Employee(ModelSQL, ModelView, Cacheable):
break
return cost
- def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ def get_currency_digits(self, cursor, user, ids, name, context=None):
res = {}
for employee in self.browse(cursor, user, ids, context=context):
res[employee.id] = employee.company.currency.digits
return res
- def on_change_with_currency_digits(self, cursor, user, ids, vals,
- context=None):
+ def on_change_with_currency_digits(self, cursor, user, vals, context=None):
company_obj = self.pool.get('company.company')
if vals.get('company'):
company = company_obj.browse(cursor, user, vals['company'],
@@ -99,12 +98,13 @@ class EmployeeCostPrice(ModelSQL, ModelView):
_description = __doc__
_rec_name = 'date'
date = fields.Date('Date', required=True, select=1)
- cost_price = fields.Numeric('Cost Price', digits="(16, currency_digits)",
+ cost_price = fields.Numeric('Cost Price',
+ digits=(16, Eval('currency_digits', 2)),
required=True, depends=['currency_digits'],
help="Hourly cost price")
employee = fields.Many2One('company.employee', 'Employee')
- currency_digits = fields.Function('get_currency_digits', type='integer',
- string='Currency Digits', on_change_with=['employee'])
+ currency_digits = fields.Function(fields.Integer('Currency Digits',
+ on_change_with=['employee']), 'get_currency_digits')
def __init__(self):
super(EmployeeCostPrice, self).__init__()
@@ -133,14 +133,13 @@ class EmployeeCostPrice(ModelSQL, ModelView):
return super(EmployeeCostPrice , self).write(cursor, user, ids, vals,
context=context)
- def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ def get_currency_digits(self, cursor, user, ids, name, context=None):
res = {}
for costprice in self.browse(cursor, user, ids, context=context):
res[costprice.id] = costprice.employee.company.currency.digits
return res
- def on_change_with_currency_digits(self, cursor, user, ids, vals,
- context=None):
+ def on_change_with_currency_digits(self, cursor, user, vals, context=None):
company_obj = self.pool.get('company.employee')
if vals.get('employee'):
employee = employee_obj.browse(cursor, user, vals['employee'],
diff --git a/setup.py b/setup.py
index 22b6788..1fb9243 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_project_revenue',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_project_revenue',
package_dir={'trytond.modules.project_revenue': '.'},
packages=[
'trytond.modules.project_revenue',
+ 'trytond.modules.project_revenue.tests',
],
package_data={
'trytond.modules.project_revenue': info.get('xml', []) \
@@ -53,4 +57,6 @@ setup(name='trytond_project_revenue',
[trytond.modules]
project_revenue = trytond.modules.project_revenue
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 9be3adc..7e7ed9e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_project_revenue import *
+from test_project_revenue import suite
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index 2d8683a..03ee364 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class ProjectRevenueTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class ProjectRevenueTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('project_revenue'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(ProjectRevenueTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ ProjectRevenueTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteProjectRevenue = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteProjectRevenue])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 8e0148e..b0799a9 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project-revenue
-Version: 1.4.0
+Version: 1.6.0
Summary: Add product on timesheet lines.
Define allowed services for each employees.
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index 3e3fb55..56eb7fc 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -15,8 +15,8 @@ work.xml
./__tryton__.py
./service.py
./work.py
-tests/__init__.py
-tests/test_project_revenue.py
+./tests/__init__.py
+./tests/test_project_revenue.py
trytond_project_revenue.egg-info/PKG-INFO
trytond_project_revenue.egg-info/SOURCES.txt
trytond_project_revenue.egg-info/dependency_links.txt
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 6e93d24..d11ae60 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,6 +1,5 @@
-trytond_project
-trytond_timesheet
-trytond_company
-trytond_product
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_project >= 1.6, < 1.7
+trytond_timesheet >= 1.6, < 1.7
+trytond_company >= 1.6, < 1.7
+trytond_product >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/work.py b/work.py
index f66694c..c8c2e39 100644
--- a/work.py
+++ b/work.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Not, Equal, Eval
from decimal import Decimal
class TimesheetLine(ModelSQL, ModelView):
@@ -33,24 +34,26 @@ class Work(ModelSQL, ModelView):
product = fields.Many2One('product.product', 'Product',
states={
- 'invisible': "type!= 'task'"
+ 'invisible': Not(Equal(Eval('type'), 'task')),
}, on_change=['product', 'party', 'hours', 'company'],
depends=['type', 'party', 'hours', 'company'])
- list_price = fields.Numeric('List Price', digits="(16, currency_digits)",
+ list_price = fields.Numeric('List Price',
+ digits=(16, Eval('currency_digits', 2)),
states={
- 'invisible': "type!= 'task'"
+ 'invisible': Not(Equal(Eval('type'), 'task')),
}, depends=['type', 'currency_digits'])
- revenue = fields.Function('get_revenue', type='numeric',
- string='Revenue', digits="(16, currency_digits)",
- states={
- 'invisible': "type!= 'project'"
- }, depends=['type', 'currency_digits'])
- cost = fields.Function('get_cost', string='Cost', type='numeric',
- digits="(16, currency_digits)", depends=['currency_digits'])
- currency_digits = fields.Function('get_currency_digits', type='integer',
- string='Currency Digits', on_change_with=['company'])
-
- def get_cost(self, cursor, user, ids, name, arg, context=None):
+ revenue = fields.Function(fields.Numeric('Revenue',
+ digits=(16, Eval('currency_digits', 2)),
+ states={
+ 'invisible': Not(Equal(Eval('type'), 'project')),
+ }, depends=['type', 'currency_digits']), 'get_revenue')
+ cost = fields.Function(fields.Numeric('Cost',
+ digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']),
+ 'get_cost')
+ currency_digits = fields.Function(fields.Integer('Currency Digits',
+ on_change_with=['company']), 'get_currency_digits')
+
+ def get_cost(self, cursor, user, ids, name, context=None):
timesheet_line_obj = self.pool.get('timesheet.line')
all_ids = self.search(cursor, user, [
('parent', 'child_of', ids),
@@ -86,7 +89,7 @@ class Work(ModelSQL, ModelView):
return res
- def get_revenue(self, cursor, user, ids, name, arg, context=None):
+ def get_revenue(self, cursor, user, ids, name, context=None):
all_ids = self.search(cursor, user, [
('parent', 'child_of', ids),
('active', '=', True)], context=context) + ids
@@ -121,14 +124,13 @@ class Work(ModelSQL, ModelView):
return res
- def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ def get_currency_digits(self, cursor, user, ids, name, context=None):
res = {}
for work in self.browse(cursor, user, ids, context=context):
res[work.id] = work.company.currency.digits
return res
- def on_change_with_currency_digits(self, cursor, user, ids, vals,
- context=None):
+ def on_change_with_currency_digits(self, cursor, user, vals, context=None):
company_obj = self.pool.get('company.company')
if vals.get('company'):
company = company_obj.browse(cursor, user, vals['company'],
@@ -147,7 +149,7 @@ class Work(ModelSQL, ModelView):
return company.currency.digits
return 2
- def on_change_product(self, cursor, user, ids, vals, context=None):
+ def on_change_product(self, cursor, user, vals, context=None):
product_obj = self.pool.get('product.product')
user_obj = self.pool.get('res.user')
company_obj = self.pool.get('company.company')
@@ -165,15 +167,9 @@ class Work(ModelSQL, ModelView):
if vals.get('party'):
ctx2['customer'] = vals['party']
- model_data_ids = model_data_obj.search(cursor, user, [
- ('fs_id', '=', 'uom_hour'),
- ('module', '=', 'product'),
- ('model', '=', 'product.uom'),
- ], limit=1, context=context)
- model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
- context=context)
- hour_uom = uom_obj.browse(cursor, user, model_data.db_id,
+ uom_id = model_data_obj.get_id(cursor, user, 'product', 'uom_hour',
context=context)
+ hour_uom = uom_obj.browse(cursor, user, uom_id, context=context)
list_price = uom_obj.compute_price(cursor, user,
product.default_uom, product.list_price, hour_uom,
commit 06ed97922f26a2230a45ce69c4da3f14c16b19af
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 14:31:33 2010 +0200
Adding Dm-Upload-Allowed in control in preparation for Mathias.
diff --git a/debian/control b/debian/control
index 40c2c91..f74c56b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
commit 6a81c732f36762dec89f1c249aaa834394dfd99a
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:47:20 2010 +0100
Releasing debian version 1.4.0-2.
diff --git a/debian/changelog b/debian/changelog
index a88485b..2d17721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project-revenue (1.4.0-2) unstable; urgency=low
+
+ * Making depends versioned for tryton 1.4.
+ * Adding explicit debian source version 1.0 until switch to 3.0.
+ * Updating year in copyright file.
+ * Removing unneeded python-all-dev from build-depends.
+ * Updating to standards 3.8.4.
+ * Updating README.source.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Feb 2010 10:47:18 +0100
+
tryton-modules-project-revenue (1.4.0-1) unstable; urgency=low
* Initial release.
commit d5f51626fc2f6d05a51cd83104249ac5c4dad7b5
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:47:03 2010 +0100
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index dcc7ba3..18b6b24 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -32,6 +32,6 @@ upstream source. Changes, if any, are stored in the source package as diffs in
debian/diff and are applied during the build. Current modifications can be
applied to the source tree with:
- $ quilt push -a
+ $ QUILT_PATCHES=debian/patches quilt push -a
More information about Quilt can be found in the quilt package.
commit b435e6240b7f60fa08133b456665601c05f06b46
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jan 28 07:53:22 2010 +0100
Updating to standards 3.8.4.
diff --git a/debian/control b/debian/control
index 8ada6f0..40c2c91 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
commit 55b7888baa3c19e095c0e7e4fd7a16bfb8ff268a
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 25 10:12:28 2010 +0100
Removing unneeded python-all-dev from build-depends.
diff --git a/debian/control b/debian/control
index 56365e5..8ada6f0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends:
- debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
commit ec71bd3bb567ee5eca790c7b31852e8dbe8c1d95
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 2 11:35:32 2010 +0100
Updating year in copyright file.
diff --git a/debian/copyright b/debian/copyright
index e0f3213..ef904bc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit 191e1d92f238dfc44c02350c478ed6320603bd29
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 12 10:06:38 2009 +0100
Adding explicit debian source version 1.0 until switch to 3.0.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit 8db023962bd190c3370399f18fa4f479987ec945
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 4 12:22:20 2009 +0100
Making depends versioned for tryton 1.4.
diff --git a/debian/control b/debian/control
index 24cffcc..56365e5 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,9 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-reve
Package: tryton-modules-project-revenue
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-company,
- tryton-modules-product, tryton-modules-project, tryton-modules-timesheet,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ tryton-modules-company (>= 1.4), tryton-modules-product (>= 1.4),
+ tryton-modules-project (>= 1.4), tryton-modules-timesheet (>= 1.4),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Revenue Module)
commit e8155cd9f5acfca8d9df05ca6048db395c2a6861
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:55 2009 +0200
Adding debian version 1.4.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..2afd2a7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2008 Cédric Krier.
+Copyright (C) 2008 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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..2f5b09a
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,33 @@
+Installing trytond_project_revenue
+==================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_project (http://www.tryton.org/)
+ * trytond_timesheet (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+ * trytond_product (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_project_revenue 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://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name project_revenue.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..102090a
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_project_revenue
+Version: 1.4.0
+Summary: Add product on timesheet lines.
+Define allowed services for each employees.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..91c2dd4
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_project_revenue
+=======================
+
+The project_revenue module of the Tryton application platform.
+See __tryton__.py
+
+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 --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..5e44e6e
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,5 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from service import *
+from work import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..96ec65e
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,47 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Project Revenue',
+ 'name_de_DE': 'Projekte Ertrag',
+ 'name_es_CO': 'Ingresos por proyectos',
+ 'name_es_ES': 'Beneficio de proyecto',
+ 'name_fr_FR': 'Revenu des projets',
+ 'version': '1.4.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Add product on timesheet lines.
+Define allowed services for each employees.
+''',
+ 'description_de_DE': '''Projektmodul Ertrag:
+ - Ermöglicht das Hinzufügen von Artikeln zu Zeitpositionen.
+ - Ermöglicht die Definition von Dienstleistungen, die für einen Mitarbeiter verwendet werden können.
+''',
+ 'description_es_CO':''' - Se añade el producto a las tarjetas de registro de tiempos.
+ - Se define por empleado los servicios que tiene autorizados.
+''',
+ 'description_es_ES':'''Beneficio de proyecto:
+ - Añade productos a las líneas de los partes de trabajo.
+ - Define servicios permitidos por cada empleado.
+''',
+ 'description_fr_FR':'''Ajoute le produit sur la ligne de présence.
+Défini par employé quels services sont autorisés.
+''',
+ 'depends': [
+ 'ir',
+ 'project',
+ 'timesheet',
+ 'company',
+ 'product',
+ ],
+ 'xml': [
+ 'service.xml',
+ 'work.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..e59977e
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,24 @@
+type,name,res_id,src,value,fuzzy
+error,company.employee_cost_price,0,A employee can only have one cost price by date!,Einem Mitarbeiter kann nur ein Kostenpreis pro Datum zugeordnet werden!,0
+field,"company.employee,cost_price",0,Cost Price,Kostenpreis,0
+field,"company.employee_cost_price,cost_price",0,Cost Price,Einkaufspreis,0
+field,"company.employee_cost_price,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"company.employee_cost_price,date",0,Date,Datum,0
+field,"company.employee_cost_price,employee",0,Employee,Mitarbeiter,0
+field,"company.employee_cost_price,rec_name",0,Name,Name,0
+field,"company.employee,cost_prices",0,Cost Prices,Kostenpreise,0
+field,"company.employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"project.work,cost",0,Cost,Kosten,0
+field,"project.work,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"project.work,list_price",0,List Price,Listenpreis,0
+field,"project.work,product",0,Product,Artikel,0
+field,"project.work,revenue",0,Revenue,Ertrag,0
+help,"company.employee,cost_price",0,Hourly cost price for this Employee,Kostenpreis pro Stunde für diesen Mitarbeiter,0
+help,"company.employee_cost_price,cost_price",0,Hourly cost price,Kostenpreis pro Stunde,0
+help,"company.employee,cost_prices",0,List of hourly cost price over time,Liste der Kostenpreise pro Stunde über die Zeit,0
+model,"company.employee_cost_price,name",0,Employee Cost Price,Mitarbeiter Kostenpreis,0
+view,company.employee,0,Cost,Kosten,0
+view,company.employee,0,Services,Leistungen,0
+view,company.employee_cost_price,0,Cost Prices,Kostenpreise,0
+view,project.work,0,Cost,Kosten,0
+view,project.work,0,Revenue,Ertrag,0
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..dcc7ba3
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..a88485b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-project-revenue (1.4.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 20 Oct 2009 12:49:12 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..24cffcc
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,28 @@
+Source: tryton-modules-project-revenue
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Build-Depends:
+ debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Standards-Version: 3.8.3
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
+
+Package: tryton-modules-project-revenue
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-company,
+ tryton-modules-product, tryton-modules-project, tryton-modules-timesheet,
+ python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Project Revenue Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
+ .
+ This module adds the possibility to add products on timesheet lines and define
+ allowed services for each employee.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e0f3213
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Upstream-Contact: Tryton project <tryton at googlegroups.com>
+Upstream-Homepage: http://downloads.tryton.org/
+Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer-Homepage: http://tryton.debian-maintainers.org/
+
+Files: *
+Copyright:
+ (C) 2008 Cedric Krier
+ (C) 2008 B2CK SPRL
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..8b253bc
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..000210b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..4ca86d3
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,13 @@
+type,name,res_id,src,value,fuzzy
+error,project_revenue.service,0,You can have only once the same product by employee!,Solamente puede tener un mismo producto por empleado!,0
+error,project_revenue.service,0,You must use a product with UOM of time!,Debe usar un producto con UdM de tiempo!,0
+error,timesheet.line,0,You can not use a product that is not an employee services!,No puede usar un producto que no sea un servicio de empleado!,0
+field,"company.employee,services",0,Services,Servicios,0
+field,"project_revenue.service,employee",0,Employee,Empleado,0
+field,"project_revenue.service,product",0,Product,Producto,0
+field,"project_revenue.service,sequence",0,Sequence,Secuencia,0
+field,"timesheet.line,product",0,Service,Servicio,0
+help,"company.employee,services",0,Services allowed to use in timesheets.,Servicios permitidos a usarse en las hojas de tiempo. ,0
+help,"project_revenue.service,sequence",0,Use to order Services,Usar para ordenar Servicios,0
+view,company.employee,0,Services,Servicios,0
+view,project_revenue.service,0,Service,Servicio,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..dc3272c
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,24 @@
+type,name,res_id,src,value,fuzzy
+error,company.employee_cost_price,0,A employee can only have one cost price by date!,Un empleado solo puede tener un precio de coste por fecha,0
+field,"company.employee,cost_price",0,Cost Price,Precio de coste,0
+field,"company.employee_cost_price,cost_price",0,Cost Price,Precio de coste,0
+field,"company.employee_cost_price,currency_digits",0,Currency Digits,Decimales de la divisa,0
+field,"company.employee_cost_price,date",0,Date,Fecha,0
+field,"company.employee_cost_price,employee",0,Employee,Empleado,0
+field,"company.employee_cost_price,rec_name",0,Name,Nombre,0
+field,"company.employee,cost_prices",0,Cost Prices,Precios de coste,0
+field,"company.employee,currency_digits",0,Currency Digits,Decimales de la divisa,0
+field,"project.work,cost",0,Cost,Coste,0
+field,"project.work,currency_digits",0,Currency Digits,Decimales de la divisa,0
+field,"project.work,list_price",0,List Price,Precio de lista,0
+field,"project.work,product",0,Product,Producto,0
+field,"project.work,revenue",0,Revenue,Beneficio,0
+help,"company.employee,cost_price",0,Hourly cost price for this Employee,Precio de coste por hora para este empleado,0
+help,"company.employee_cost_price,cost_price",0,Hourly cost price,Precio de coste por hora,0
+help,"company.employee,cost_prices",0,List of hourly cost price over time,Lista de precio de coste por hora a través del tiempo,0
+model,"company.employee_cost_price,name",0,Employee Cost Price,Precio de coste del empleado,0
+view,company.employee,0,Cost,Coste,0
+view,company.employee,0,Services,Servicios,0
+view,company.employee_cost_price,0,Cost Prices,Precios de coste,0
+view,project.work,0,Cost,Coste,0
+view,project.work,0,Revenue,Beneficio,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..52e846b
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,24 @@
+type,name,res_id,src,value,fuzzy
+error,company.employee_cost_price,0,A employee can only have one cost price by date!,Un employé ne peut avoir qu'un seul prix de revient par date !,0
+field,"company.employee,cost_price",0,Cost Price,Prix de Revient,0
+field,"company.employee_cost_price,cost_price",0,Cost Price,Prix de Revient,0
+field,"company.employee_cost_price,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"company.employee_cost_price,date",0,Date,Date,0
+field,"company.employee_cost_price,employee",0,Employee,Employé,0
+field,"company.employee_cost_price,rec_name",0,Name,Nom,0
+field,"company.employee,cost_prices",0,Cost Prices,Prix de revient,0
+field,"company.employee,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"project.work,cost",0,Cost,Coût,0
+field,"project.work,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"project.work,list_price",0,List Price,Prix Listé,0
+field,"project.work,product",0,Product,Produit,0
+field,"project.work,revenue",0,Revenue,Revenu,0
+help,"company.employee,cost_price",0,Hourly cost price for this Employee,Prix de revient horaire de cet employé,0
+help,"company.employee_cost_price,cost_price",0,Hourly cost price,Prix de revient horaire,0
+help,"company.employee,cost_prices",0,List of hourly cost price over time,Liste du prix de revient horaire au cours du temps,0
+model,"company.employee_cost_price,name",0,Employee Cost Price,Prix de revient de l'employé,0
+view,company.employee,0,Cost,Coût,0
+view,company.employee,0,Services,Services,0
+view,company.employee_cost_price,0,Cost Prices,Prix de revient,0
+view,project.work,0,Cost,Coût,0
+view,project.work,0,Revenue,Revenu,0
diff --git a/service.py b/service.py
new file mode 100644
index 0000000..688ee4f
--- /dev/null
+++ b/service.py
@@ -0,0 +1,162 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Service"
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.model.cacheable import Cacheable
+
+
+class Employee(ModelSQL, ModelView, Cacheable):
+ _name = 'company.employee'
+
+ cost_price = fields.Function('get_cost_price', string='Cost Price',
+ type='numeric', digits="(16, currency_digits)",
+ depends=['currency_digits'],
+ help="Hourly cost price for this Employee")
+ cost_prices = fields.One2Many('company.employee_cost_price', 'employee',
+ 'Cost Prices', help="List of hourly cost price over time")
+ currency_digits = fields.Function('get_currency_digits', type='integer',
+ string='Currency Digits', on_change_with=['company'])
+
+ def get_cost_price(self, cursor, user, ids, name, arg, context=None):
+ '''
+ Return the cost price at the date given in the context or the
+ current date
+ '''
+
+ res = {}
+ if context is None:
+ context = {}
+ ctx_date = context.get('date', None)
+
+ for employee_id in ids:
+ res[employee_id] = self.compute_cost_price(cursor, user,
+ employee_id, ctx_date, context=context)
+ return res
+
+ def compute_cost_price(self, cursor, user, employee_id, date=None,
+ context=None):
+ date_obj = self.pool.get('ir.date')
+ cost_price_obj = self.pool.get('company.employee_cost_price')
+
+ # Get from cache employee costs or fetch them from the db
+ employee_costs = self.get(cursor, employee_id)
+ if employee_costs is None:
+ cost_price_ids = cost_price_obj.search(cursor, user, [
+ ('employee', '=', employee_id),
+ ], order=[('date', 'ASC')])
+ cost_prices = cost_price_obj.browse(
+ cursor, user, cost_price_ids, context=context)
+
+ employee_costs = []
+ for cost_price in cost_prices:
+ employee_costs.append(
+ (cost_price.date, cost_price.cost_price))
+ self.add(cursor, employee_id, employee_costs)
+
+ if date is None:
+ date = date_obj.today(cursor, user, context=context)
+ # compute the cost price for the given date
+ cost = 0
+ if employee_costs and date >= employee_costs[0][0]:
+ for edate, ecost in employee_costs:
+ if date >= edate:
+ cost = ecost
+ break
+ return cost
+
+ def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ for employee in self.browse(cursor, user, ids, context=context):
+ res[employee.id] = employee.company.currency.digits
+ return res
+
+ def on_change_with_currency_digits(self, cursor, user, ids, vals,
+ context=None):
+ company_obj = self.pool.get('company.company')
+ if vals.get('company'):
+ company = company_obj.browse(cursor, user, vals['company'],
+ context=context)
+ return company.currency.digits
+ return 2
+
+ def default_currency_digits(self, cursor, user, context=None):
+ company_obj = self.pool.get('company.company')
+ if context is None:
+ context = {}
+ company = None
+ if context.get('company'):
+ company = company_obj.browse(cursor, user, context['company'],
+ context=context)
+ return company.currency.digits
+ return 2
+
+Employee()
+
+
+class EmployeeCostPrice(ModelSQL, ModelView):
+ 'Employee Cost Price'
+ _name = 'company.employee_cost_price'
+ _description = __doc__
+ _rec_name = 'date'
+ date = fields.Date('Date', required=True, select=1)
+ cost_price = fields.Numeric('Cost Price', digits="(16, currency_digits)",
+ required=True, depends=['currency_digits'],
+ help="Hourly cost price")
+ employee = fields.Many2One('company.employee', 'Employee')
+ currency_digits = fields.Function('get_currency_digits', type='integer',
+ string='Currency Digits', on_change_with=['employee'])
+
+ def __init__(self):
+ super(EmployeeCostPrice, self).__init__()
+ self._sql_constraints = [
+ ('date_cost_price_uniq', 'UNIQUE(date, cost_price)',
+ 'A employee can only have one cost price by date!'),
+ ]
+ self._order.insert(0, ('date', 'DESC'))
+
+ def default_date(self, cursor, user, context=None):
+ date_obj = self.pool.get('ir.date')
+ return date_obj.today(cursor, user, context=context)
+
+ def delete(self, cursor, user, ids, context=None):
+ self.pool.get('company.employee').clear(cursor)
+ return super(EmployeeCostPrice , self).delete(cursor, user, ids,
+ context=context)
+
+ def create(self, cursor, user, vals, context=None):
+ self.pool.get('company.employee').clear(cursor)
+ return super(EmployeeCostPrice , self).create(cursor, user, vals,
+ context=context)
+
+ def write(self, cursor, user, ids, vals, context=None):
+ self.pool.get('company.employee').clear(cursor)
+ return super(EmployeeCostPrice , self).write(cursor, user, ids, vals,
+ context=context)
+
+ def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ for costprice in self.browse(cursor, user, ids, context=context):
+ res[costprice.id] = costprice.employee.company.currency.digits
+ return res
+
+ def on_change_with_currency_digits(self, cursor, user, ids, vals,
+ context=None):
+ company_obj = self.pool.get('company.employee')
+ if vals.get('employee'):
+ employee = employee_obj.browse(cursor, user, vals['employee'],
+ context=context)
+ return employee.company.currency.digits
+ return 2
+
+ def default_currency_digits(self, cursor, user, context=None):
+ company_obj = self.pool.get('company.company')
+ if context is None:
+ context = {}
+ company = None
+ if context.get('company'):
+ company = company_obj.browse(cursor, user, context['company'],
+ context=context)
+ return company.currency.digits
+ return 2
+
+EmployeeCostPrice()
diff --git a/service.xml b/service.xml
new file mode 100644
index 0000000..d549d50
--- /dev/null
+++ b/service.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="cost_price_view_form">
+ <field name="model">company.employee_cost_price</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Cost Prices" col="2">
+ <label name="date"/>
+ <field name="date"/>
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+ <label name="employee"/>
+ <field name="employee"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="cost_price_view_tree">
+ <field name="model">company.employee_cost_price</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Cost Prices">
+ <field name="date"/>
+ <field name="cost_price"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+
+ <record model="ir.ui.view" id="employee_view_form">
+ <field name="model">company.employee</field>
+ <field name="inherit" ref="company.employee_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/notebook/page[@id="general"]"
+ position="after">
+ <page string="Cost" id="cost_prices">
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+ <field name="cost_prices" colspan="4"/>
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..22b6788
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_project_revenue',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.project_revenue': '.'},
+ packages=[
+ 'trytond.modules.project_revenue',
+ ],
+ package_data={
+ 'trytond.modules.project_revenue': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'Intended Audience :: Manufacturing',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: German',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ project_revenue = trytond.modules.project_revenue
+ """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..9be3adc
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_project_revenue import *
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
new file mode 100644
index 0000000..2d8683a
--- /dev/null
+++ b/tests/test_project_revenue.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class ProjectRevenueTestCase(unittest.TestCase):
+ '''
+ Test ProjectRevenue module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('project_revenue')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('project_revenue'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(ProjectRevenueTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteProjectRevenue = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteProjectRevenue])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
new file mode 100644
index 0000000..8e0148e
--- /dev/null
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-project-revenue
+Version: 1.4.0
+Summary: Add product on timesheet lines.
+Define allowed services for each employees.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
new file mode 100644
index 0000000..3e3fb55
--- /dev/null
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -0,0 +1,26 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+service.xml
+setup.py
+work.xml
+./__init__.py
+./__tryton__.py
+./service.py
+./work.py
+tests/__init__.py
+tests/test_project_revenue.py
+trytond_project_revenue.egg-info/PKG-INFO
+trytond_project_revenue.egg-info/SOURCES.txt
+trytond_project_revenue.egg-info/dependency_links.txt
+trytond_project_revenue.egg-info/entry_points.txt
+trytond_project_revenue.egg-info/not-zip-safe
+trytond_project_revenue.egg-info/requires.txt
+trytond_project_revenue.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_project_revenue.egg-info/dependency_links.txt b/trytond_project_revenue.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_project_revenue.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_project_revenue.egg-info/entry_points.txt b/trytond_project_revenue.egg-info/entry_points.txt
new file mode 100644
index 0000000..b32c903
--- /dev/null
+++ b/trytond_project_revenue.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ project_revenue = trytond.modules.project_revenue
+
\ No newline at end of file
diff --git a/trytond_project_revenue.egg-info/not-zip-safe b/trytond_project_revenue.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_project_revenue.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
new file mode 100644
index 0000000..6e93d24
--- /dev/null
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -0,0 +1,6 @@
+trytond_project
+trytond_timesheet
+trytond_company
+trytond_product
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_project_revenue.egg-info/top_level.txt b/trytond_project_revenue.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_project_revenue.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
diff --git a/work.py b/work.py
new file mode 100644
index 0000000..f66694c
--- /dev/null
+++ b/work.py
@@ -0,0 +1,193 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from trytond.model import ModelView, ModelSQL, fields
+from decimal import Decimal
+
+class TimesheetLine(ModelSQL, ModelView):
+ _name = 'timesheet.line'
+
+ def compute_cost(self, cursor, user, line, context=None):
+ employee_obj = self.pool.get('company.employee')
+ currency_obj = self.pool.get('currency.currency')
+
+ cost_price = employee_obj.compute_cost_price(cursor, user,
+ line.employee.id, date=line.date, context=context)
+
+ line_company = line.employee.company
+ work_company = line.work.company
+ if line_company.id != work_company.id and\
+ line_company.currency.id != work_company.currency.id:
+
+ cost_price = currency_obj.compute(cursor, user,
+ line_company.currency, cost_price,
+ work_company.currency, context=context)
+
+ return Decimal(str(line.hours)) * cost_price
+
+TimesheetLine()
+
+class Work(ModelSQL, ModelView):
+ 'Work Effort'
+ _name = 'project.work'
+
+ product = fields.Many2One('product.product', 'Product',
+ states={
+ 'invisible': "type!= 'task'"
+ }, on_change=['product', 'party', 'hours', 'company'],
+ depends=['type', 'party', 'hours', 'company'])
+ list_price = fields.Numeric('List Price', digits="(16, currency_digits)",
+ states={
+ 'invisible': "type!= 'task'"
+ }, depends=['type', 'currency_digits'])
+ revenue = fields.Function('get_revenue', type='numeric',
+ string='Revenue', digits="(16, currency_digits)",
+ states={
+ 'invisible': "type!= 'project'"
+ }, depends=['type', 'currency_digits'])
+ cost = fields.Function('get_cost', string='Cost', type='numeric',
+ digits="(16, currency_digits)", depends=['currency_digits'])
+ currency_digits = fields.Function('get_currency_digits', type='integer',
+ string='Currency Digits', on_change_with=['company'])
+
+ def get_cost(self, cursor, user, ids, name, arg, context=None):
+ timesheet_line_obj = self.pool.get('timesheet.line')
+ all_ids = self.search(cursor, user, [
+ ('parent', 'child_of', ids),
+ ('active', '=', True)], context=context) + ids
+ all_ids = list(set(all_ids))
+ res = {}
+ id2work = {}
+ leafs = set()
+ for work in self.browse(cursor, user, all_ids, context=context):
+ id2work[work.id] = work
+ if not work.children:
+ leafs.add(work.id)
+
+ res[work.id] = Decimal('0')
+ for ts_line in work.timesheet_lines:
+ res[work.id] += timesheet_line_obj.compute_cost(cursor, user,
+ ts_line, context=context)
+
+ while leafs:
+ parents = set()
+ for work_id in leafs:
+ work = id2work[work_id]
+ if not work.active:
+ continue
+ if work.parent and work.parent.id in res:
+ res[work.parent.id] += res[work_id]
+ parents.add(work.parent.id)
+ leafs = parents
+
+ for id in all_ids:
+ if id not in ids:
+ del res[id]
+
+ return res
+
+ def get_revenue(self, cursor, user, ids, name, arg, context=None):
+ all_ids = self.search(cursor, user, [
+ ('parent', 'child_of', ids),
+ ('active', '=', True)], context=context) + ids
+ all_ids = list(set(all_ids))
+ res = {}
+ id2work = {}
+ leafs = set()
+ for work in self.browse(cursor, user, all_ids, context=context):
+ id2work[work.id] = work
+ if not work.children:
+ leafs.add(work.id)
+
+ if work.type == 'task':
+ res[work.id] = work.list_price * Decimal(str(work.total_effort))
+ else:
+ res[work.id] = Decimal('0')
+
+ while leafs:
+ parents = set()
+ for work_id in leafs:
+ work = id2work[work_id]
+ if not work.active:
+ continue
+ if work.parent and work.parent.id in res:
+ res[work.parent.id] += res[work_id]
+ parents.add(work.parent.id)
+ leafs = parents
+
+ for id in all_ids:
+ if id not in ids:
+ del res[id]
+
+ return res
+
+ def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ for work in self.browse(cursor, user, ids, context=context):
+ res[work.id] = work.company.currency.digits
+ return res
+
+ def on_change_with_currency_digits(self, cursor, user, ids, vals,
+ context=None):
+ company_obj = self.pool.get('company.company')
+ if vals.get('company'):
+ company = company_obj.browse(cursor, user, vals['company'],
+ context=context)
+ return company.currency.digits
+ return 2
+
+ def default_currency_digits(self, cursor, user, context=None):
+ company_obj = self.pool.get('company.company')
+ if context is None:
+ context = {}
+ company = None
+ if context.get('company'):
+ company = company_obj.browse(cursor, user, context['company'],
+ context=context)
+ return company.currency.digits
+ return 2
+
+ def on_change_product(self, cursor, user, ids, vals, context=None):
+ product_obj = self.pool.get('product.product')
+ user_obj = self.pool.get('res.user')
+ company_obj = self.pool.get('company.company')
+ model_data_obj = self.pool.get('ir.model.data')
+ uom_obj = self.pool.get('product.uom')
+
+ if not vals.get('product'):
+ return {}
+
+ ctx = context and context.copy() or {}
+
+ product = product_obj.browse(cursor, user, vals['product'],
+ context=context)
+
+ if vals.get('party'):
+ ctx2['customer'] = vals['party']
+
+ model_data_ids = model_data_obj.search(cursor, user, [
+ ('fs_id', '=', 'uom_hour'),
+ ('module', '=', 'product'),
+ ('model', '=', 'product.uom'),
+ ], limit=1, context=context)
+ model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
+ context=context)
+ hour_uom = uom_obj.browse(cursor, user, model_data.db_id,
+ context=context)
+
+ list_price = uom_obj.compute_price(cursor, user,
+ product.default_uom, product.list_price, hour_uom,
+ context=ctx)
+
+ if vals.get('company'):
+ user_record = user_obj.browse(cursor, user, user, context=context)
+ if user_record.company.id != vals['company']:
+ company = company_obj.browse(cursor, user, vals['company'],
+ context=context)
+ if user_record.company.currency.id != company.currency.id:
+ list_price = currency_obj.compute(cursor, user,
+ user_record.company.currency, list_price,
+ company.currency, context=context)
+
+ return {'list_price': list_price}
+Work()
diff --git a/work.xml b/work.xml
new file mode 100644
index 0000000..0cf92f5
--- /dev/null
+++ b/work.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record model="ir.ui.view" id="work_view_form">
+ <field name="model">project.work</field>
+ <field name="inherit" ref="project.work_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/form/notebook/page[@id="general"]/label[@name="hours"]" position="replace"/>
+
+ <xpath expr="/form/notebook/page[@id="general"]/field[@name="hours"]" position="replace">
+ <group colspan="2" col="2" id="cost">
+ <separator string="Cost" id="cost" colspan="2"/>
+ <label name="cost"/>
+ <field name="cost"/>
+ <label name="hours"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ </group>
+ </xpath>
+
+ <xpath expr="/form/notebook/page[@id="general"]/group[@id="effort"]" position="replace">
+ <group colspan="2" col="2" id="revenue">
+ <separator string="Revenue" id="revenue" colspan="2"/>
+ <label name="revenue"/>
+ <field name="revenue"/>
+ <label name="product"/>
+ <field name="product"/>
+ <label name="list_price"/>
+ <field name="list_price"/>
+ <label name="effort"/>
+ <field name="effort" widget="float_time" float_time="company_work_time"/>
+ <label name="total_effort"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ </group>
+ </xpath>
+
+ <xpath expr="/form/notebook/page[@id="children"]/field[@name="children"]/tree/field[@name="total_effort"]" position="after">
+ <field name="product"/>
+ <field name="list_price"/>
+ <field name="revenue"/>
+ <field name="cost"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="work_view_tree">
+ <field name="model">project.work</field>
+ <field name="inherit" ref="project.work_view_tree"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/tree/field[@name="total_effort"]" position="after">
+ <field name="product"/>
+ <field name="list_price"/>
+ <field name="revenue"/>
+ <field name="cost"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="work_view_tree2">
+ <field name="model">project.work</field>
+ <field name="inherit" ref="project.work_view_tree2"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/tree/field[@name="total_effort"]" position="after">
+ <field name="product"/>
+ <field name="list_price"/>
+ <field name="cost"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="work_view_tree3">
+ <field name="model">project.work</field>
+ <field name="inherit" ref="project.work_view_tree3"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/tree/field[@name="total_effort"]" position="after">
+ <field name="revenue"/>
+ <field name="cost"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ </data>
+</tryton>
--
tryton-modules-project-revenue
More information about the tryton-debian-vcs
mailing list