[tryton-debian-vcs] tryton-modules-project-revenue branch debian updated. debian/4.0.1-1-3-g28ab73d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 16:03:19 UTC 2016
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=debian/4.0.1-1-3-g28ab73d
commit 28ab73d32d4e84acb2373d8ba3a0d7fc8f60d9cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 6 10:58:22 2016 +0100
Releasing debian version 4.2.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 64a6b71..c27535a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project-revenue (4.2.0-1) unstable; urgency=medium
+
+ * Updating to Standards-Version: 3.9.8, no changes needed.
+ * Merging upstream version 4.2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 05 Dec 2016 15:31:28 +0100
+
tryton-modules-project-revenue (4.0.1-1) unstable; urgency=medium
* Updating signing-key.asc with the actual upstream maintainer keys.
commit 3bfcc8249d803b2a9564e8d6e6a2df6bddb87aca
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:37 2016 +0100
Merging upstream version 4.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1a16e08..4ac278d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 4.0.1 - 2016-05-11
+Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
Version 4.0.0 - 2016-05-02
diff --git a/INSTALL b/INSTALL
index 75ade06..04b0425 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,7 +27,7 @@ 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://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index b7a644e..7b68409 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module to add revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_project_revenue
=======================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 91%
rename from locale/bg_BG.po
rename to locale/bg.po
index 5817efd..e1c2538 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -26,10 +26,12 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Приход"
+#, fuzzy
msgctxt "field:purchase.line,work:"
msgid "Work Effort"
-msgstr ""
+msgstr "Дейност"
+#, fuzzy
msgctxt "view:project.work:"
msgid "Purchases"
-msgstr ""
+msgstr "Покупки"
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 100%
rename from locale/ca_ES.po
rename to locale/ca.po
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 100%
copy from locale/cs_CZ.po
copy to locale/cs.po
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 100%
rename from locale/de_DE.po
rename to locale/de.po
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 100%
rename from locale/es_ES.po
rename to locale/es.po
diff --git a/locale/cs_CZ.po b/locale/es_419.po
similarity index 93%
rename from locale/cs_CZ.po
rename to locale/es_419.po
index 281d93e..60561da 100644
--- a/locale/cs_CZ.po
+++ b/locale/es_419.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:project.work,cost:"
msgid "Cost"
-msgstr ""
+msgstr "Costo"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
@@ -28,7 +28,7 @@ msgstr ""
msgctxt "field:purchase.line,work:"
msgid "Work Effort"
-msgstr ""
+msgstr "Esfuerzo de trabajo"
msgctxt "view:project.work:"
msgid "Purchases"
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index bc5b3ab..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:project.work,cost:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "field:project.work,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de moneda"
-
-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,purchase_lines:"
-msgid "Purchase Lines"
-msgstr "Líneas de compra"
-
-msgctxt "field:project.work,revenue:"
-msgid "Revenue"
-msgstr "Ingresos"
-
-msgctxt "field:purchase.line,work:"
-msgid "Work Effort"
-msgstr "Actividades"
-
-msgctxt "view:project.work:"
-msgid "Purchases"
-msgstr "Compras"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index 802ec5c..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:project.work,cost:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "field:project.work,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de Moneda"
-
-msgctxt "field:project.work,list_price:"
-msgid "List Price"
-msgstr "Precio de Venta"
-
-msgctxt "field:project.work,product:"
-msgid "Product"
-msgstr "Producto"
-
-msgctxt "field:project.work,purchase_lines:"
-msgid "Purchase Lines"
-msgstr "Líneas de Compra"
-
-msgctxt "field:project.work,revenue:"
-msgid "Revenue"
-msgstr "Ingresos"
-
-msgctxt "field:purchase.line,work:"
-msgid "Work Effort"
-msgstr "Esfuerzo de Trabajo"
-
-msgctxt "view:project.work:"
-msgid "Purchases"
-msgstr "Compras"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index 2b4655e..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:project.work,cost:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "field:project.work,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de moneda"
-
-msgctxt "field:project.work,list_price:"
-msgid "List Price"
-msgstr "Precio de venta"
-
-msgctxt "field:project.work,product:"
-msgid "Product"
-msgstr "Producto"
-
-msgctxt "field:project.work,purchase_lines:"
-msgid "Purchase Lines"
-msgstr "Líneas de compra"
-
-msgctxt "field:project.work,revenue:"
-msgid "Revenue"
-msgstr "Ingresos"
-
-msgctxt "field:purchase.line,work:"
-msgid "Work Effort"
-msgstr "Esfuerzo de trabajo"
-
-msgctxt "view:project.work:"
-msgid "Purchases"
-msgstr "Compras"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 100%
rename from locale/fr_FR.po
rename to locale/fr.po
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 281d93e..555b228 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -2,21 +2,24 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:project.work,cost:"
msgid "Cost"
-msgstr ""
+msgstr "Költség"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,list_price:"
msgid "List Price"
-msgstr ""
+msgstr "Árlista szerinti ár"
+#, fuzzy
msgctxt "field:project.work,product:"
msgid "Product"
-msgstr ""
+msgstr "Termék"
msgctxt "field:project.work,purchase_lines:"
msgid "Purchase Lines"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 281d93e..0f76862 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -6,25 +6,28 @@ msgctxt "field:project.work,cost:"
msgid "Cost"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr ""
+msgstr "posizioni valuta"
msgctxt "field:project.work,list_price:"
msgid "List Price"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,product:"
msgid "Product"
-msgstr ""
+msgstr "Prodotto"
msgctxt "field:project.work,purchase_lines:"
msgid "Purchase Lines"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,revenue:"
msgid "Revenue"
-msgstr ""
+msgstr "Ricavo"
msgctxt "field:purchase.line,work:"
msgid "Work Effort"
diff --git a/locale/es_MX.po b/locale/lo.po
similarity index 69%
rename from locale/es_MX.po
rename to locale/lo.po
index ca8f08d..5a6c91d 100644
--- a/locale/es_MX.po
+++ b/locale/lo.po
@@ -4,32 +4,37 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:project.work,cost:"
msgid "Cost"
-msgstr "Coste"
+msgstr ""
+#, fuzzy
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr "ໂຕເລກສະກຸນເງິນ"
+#, fuzzy
msgctxt "field:project.work,list_price:"
msgid "List Price"
-msgstr "Precio de venta"
+msgstr "ລາຍການລາຄາ"
+#, fuzzy
msgctxt "field:project.work,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "ຜະລິດຕະພັນ"
msgctxt "field:project.work,purchase_lines:"
msgid "Purchase Lines"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,revenue:"
msgid "Revenue"
-msgstr "Ingresos"
+msgstr "ລາຍຮັບ"
msgctxt "field:purchase.line,work:"
msgid "Work Effort"
msgstr ""
+#, fuzzy
msgctxt "view:project.work:"
msgid "Purchases"
-msgstr ""
+msgstr "ການຈັດຊື້"
diff --git a/locale/lo_LA.po b/locale/lt.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 100%
rename from locale/nl_NL.po
rename to locale/nl.po
diff --git a/locale/lt_LT.po b/locale/pl.po
similarity index 100%
rename from locale/lt_LT.po
rename to locale/pl.po
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 89%
rename from locale/ru_RU.po
rename to locale/ru.po
index 7d8b25d..ab482ce 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -26,10 +26,12 @@ msgctxt "field:project.work,revenue:"
msgid "Revenue"
msgstr "Доходы"
+#, fuzzy
msgctxt "field:purchase.line,work:"
msgid "Work Effort"
-msgstr ""
+msgstr "Рабочие затраты"
+#, fuzzy
msgctxt "view:project.work:"
msgid "Purchases"
-msgstr ""
+msgstr "Покупки"
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 100%
rename from locale/sl_SI.po
rename to locale/sl.po
diff --git a/setup.py b/setup.py
index e09e99b..ca15223 100644
--- a/setup.py
+++ b/setup.py
@@ -90,6 +90,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/tryton.cfg b/tryton.cfg
index 9a4f27b..48b95d3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.2.0
depends:
ir
project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index cdbbe8d..93e056a 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: 4.0.1
+Version: 4.2.0
Summary: Tryton module to add revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_project_revenue
=======================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index 1722c0b..cf3e9f0 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -14,25 +14,23 @@ work.xml
./tryton.cfg
./work.py
./work.xml
-./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_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/fr.po
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
-./locale/lo_LA.po
-./locale/lt_LT.po
-./locale/nl_NL.po
+./locale/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
./locale/zh_CN.po
./tests/__init__.py
./tests/test_project_revenue.py
@@ -42,25 +40,23 @@ work.xml
./view/work_list.xml
./view/work_list_children.xml
./view/work_tree.xml
-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_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/fr.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
-locale/lo_LA.po
-locale/lt_LT.po
-locale/nl_NL.po
+locale/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
trytond_project_revenue.egg-info/PKG-INFO
trytond_project_revenue.egg-info/SOURCES.txt
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index a238334..ad61052 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,7 +1,7 @@
python-sql
-trytond_project >= 4.0, < 4.1
-trytond_timesheet >= 4.0, < 4.1
-trytond_timesheet_cost >= 4.0, < 4.1
-trytond_company >= 4.0, < 4.1
-trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_project >= 4.2, < 4.3
+trytond_timesheet >= 4.2, < 4.3
+trytond_timesheet_cost >= 4.2, < 4.3
+trytond_company >= 4.2, < 4.3
+trytond_product >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
diff --git a/work.py b/work.py
index 0f10634..6a41b72 100644
--- a/work.py
+++ b/work.py
@@ -72,7 +72,8 @@ class Work:
for sub_ids in grouped_slice(work_ids):
red_sql = reduce_ids(table.id, sub_ids)
cursor.execute(*table.join(work,
- condition=table.work == work.id
+ condition=(
+ Concat(cls.__name__ + ',', table.id) == work.origin)
).join(line, condition=line.work == work.id
).select(table.id, Sum(line.cost_price * line.duration),
where=red_sql,
--
tryton-modules-project-revenue
More information about the tryton-debian-vcs
mailing list