[tryton-debian-vcs] tryton-modules-project-revenue branch debian updated. debian/3.2.0-1-5-g3f37707
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:17:24 UTC 2014
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/3.2.0-1-5-g3f37707
commit 3f37707ceb7fac6f00535678c396fa11763f1736
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:06 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 3cc9feb..a6009fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-project-revenue (3.4.0-1) unstable; urgency=medium
+
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:19 +0200
+
tryton-modules-project-revenue (3.2.0-1) unstable; urgency=medium
* Merging upstream version 3.2.0.
commit 4ace4e6c80a882430dcf5ebdc91e049f37c3f702
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:18 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index b602191..2e31877 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 0806b73..64ecad7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 3.2.0
+Version: 3.4.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_project_revenue
=======================
diff --git a/locale/es_EC.po b/locale/es_EC.po
new file mode 100644
index 0000000..557d5bf
--- /dev/null
+++ b/locale/es_EC.po
@@ -0,0 +1,31 @@
+#
+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,revenue:"
+msgid "Revenue"
+msgstr "Ingresos"
+
+msgctxt "view:project.work:"
+msgid "Cost"
+msgstr "Costo"
+
+msgctxt "view:project.work:"
+msgid "Revenue"
+msgstr "Ingresos"
diff --git a/tryton.cfg b/tryton.cfg
index 458b898..c384263 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
ir
project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index af0cb0b..b7935ec 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: 3.2.0
+Version: 3.4.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_project_revenue
=======================
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index ad0fd51..349dfa7 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -8,15 +8,33 @@ setup.py
tryton.cfg
work.xml
./__init__.py
+./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/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
./tests/test_project_revenue.py
+./view/work_form.xml
+./view/work_list2.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/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 76139b4..b5c100b 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_project >= 3.2, < 3.3
-trytond_timesheet >= 3.2, < 3.3
-trytond_timesheet_cost >= 3.2, < 3.3
-trytond_company >= 3.2, < 3.3
-trytond_product >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_project >= 3.4, < 3.5
+trytond_timesheet >= 3.4, < 3.5
+trytond_timesheet_cost >= 3.4, < 3.5
+trytond_company >= 3.4, < 3.5
+trytond_product >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/work.py b/work.py
index 01facb1..3d4664d 100644
--- a/work.py
+++ b/work.py
@@ -7,7 +7,7 @@ from trytond.model import fields
from trytond.pyson import Eval, Id
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
-from trytond.tools import reduce_ids
+from trytond.tools import reduce_ids, grouped_slice
__all__ = ['Work']
__metaclass__ = PoolMeta
@@ -46,7 +46,6 @@ class Work:
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]),
@@ -60,8 +59,7 @@ class Work:
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]
+ for sub_ids in grouped_slice(timesheet_work_ids):
red_sql = reduce_ids(table_w.id, sub_ids)
cursor.execute(*table_w.join(table_c,
condition=(table_c.left >= table_w.left)
--
tryton-modules-project-revenue
More information about the tryton-debian-vcs
mailing list