[tryton-debian-vcs] tryton-modules-project branch debian updated. debian/4.4.1-3-5-gb45bd86
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:02:26 UTC 2017
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.git;a=commitdiff;h=debian/4.4.1-3-5-gb45bd86
commit b45bd8663f7ed51f7ff670775d9877583aaeea45
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 16:24:52 2017 +0100
Releasing debian version 4.6.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 7772f20..ad750cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project (4.6.0-1) unstable; urgency=medium
+
+ * Bump the Standards-Version to 4.1.0, no changes needed.
+ * Bump the Standards-Version to 4.1.1, no changes needed.
+ * Merging upstream version 4.6.0.
+ * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 07 Nov 2017 10:20:21 +0100
+
tryton-modules-project (4.4.1-3) unstable; urgency=medium
* Switch to Python3.
commit 402c3b1654e6c84c5c5161ae25836875afbb6996
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 10:16:46 2017 +0100
Use https in the watch file.
diff --git a/debian/watch b/debian/watch
index 7b6380e..6bb661f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_project-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_project-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit c6a5b8c4c1dcd1ae5f1f59b107baca2699b27db1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:07 2017 +0100
Merging upstream version 4.6.0.
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+ hg:
+ image: plugins/hg
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: sqlite
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: postgresql
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: sqlite
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: postgresql
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: sqlite
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: postgresql
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: sqlite
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index e13f9d3..598fa4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 4.4.1 - 2017-08-08
+Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
+* Add sequence attribute on tree views
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 8d5ff8a..03119bc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
+include *.fodt
include locale/*.po
include doc/*
include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index f09abe8..4ef305e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 4.4.1
+Version: 4.6.0
Summary: Tryton module with projects
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.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_project
===============
@@ -70,9 +70,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/bg.po b/locale/bg.po
index ff521e5..aa8746a 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -69,8 +69,8 @@ msgid "Progress"
msgstr ""
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work,right:"
@@ -259,9 +259,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Наследници"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "Основен"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Наследници"
diff --git a/locale/ca.po b/locale/ca.po
index cbaeadd..ee230a2 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Progress"
msgstr "Progrés"
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:project.work,right:"
msgid "Right"
@@ -255,9 +255,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Fills"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "General"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Fills"
diff --git a/locale/cs.po b/locale/cs.po
index 76f2039..05d5cee 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -67,10 +67,9 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
@@ -254,9 +253,5 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "General"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 4d71fd4..3e6d084 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Progress"
msgstr "Fortschritt"
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
@@ -259,9 +259,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Untergeordnet (Projekte/Aufgaben)"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "Allgemein"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Untergeordnet (Projekte/Aufgaben)"
diff --git a/locale/es.po b/locale/es.po
index f430bdb..bcc7875 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Progress"
msgstr "Progreso"
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:project.work,right:"
msgid "Right"
@@ -255,9 +255,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Hijos"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "General"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Hijos"
diff --git a/locale/es_419.po b/locale/es_419.po
index e634697..e09df8b 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -67,7 +67,7 @@ msgid "Progress"
msgstr ""
msgctxt "field:project.work,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:project.work,right:"
@@ -257,9 +257,5 @@ msgid "%"
msgstr ""
msgctxt "view:project.work:"
-msgid "Children"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "General"
msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 9936c66..4294ad0 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Progress"
msgstr "Progression"
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:project.work,right:"
msgid "Right"
@@ -255,9 +255,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Enfants"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "General"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Enfants"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index f0d420d..ec56d18 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -75,10 +75,9 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
@@ -274,11 +273,11 @@ msgctxt "view:project.work:"
msgid "%"
msgstr "%"
+msgctxt "view:project.work:"
+msgid "General"
+msgstr ""
+
#, fuzzy
msgctxt "view:project.work:"
msgid "Children"
msgstr "Gyermek (csomag)"
-
-msgctxt "view:project.work:"
-msgid "General"
-msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 02761d4..4fb49ee 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -76,10 +76,9 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work,right:"
@@ -275,10 +274,10 @@ msgstr "%"
#, fuzzy
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Figlio"
+msgid "General"
+msgstr "Generale"
#, fuzzy
msgctxt "view:project.work:"
-msgid "General"
-msgstr "Generale"
+msgid "Children"
+msgstr "Figlio"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 86f0d7e..7e01b97 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -67,7 +67,7 @@ msgid "Progress"
msgstr ""
msgctxt "field:project.work,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:project.work,right:"
@@ -256,9 +256,5 @@ msgid "%"
msgstr ""
msgctxt "view:project.work:"
-msgid "Children"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "General"
msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index 3909401..d74e44e 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -75,10 +75,9 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
@@ -276,10 +275,10 @@ msgstr "%"
#, fuzzy
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "ໝວດຍ່ອຍ"
+msgid "General"
+msgstr "ທົ່ວໄປ"
#, fuzzy
msgctxt "view:project.work:"
-msgid "General"
-msgstr "ທົ່ວໄປ"
+msgid "Children"
+msgstr "ໝວດຍ່ອຍ"
diff --git a/locale/lt.po b/locale/lt.po
index 76f2039..05d5cee 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -67,10 +67,9 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
@@ -254,9 +253,5 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "General"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index c2dea18..34ed27f 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -76,10 +76,9 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work,right:"
@@ -281,10 +280,10 @@ msgstr "%"
#, fuzzy
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Onderliggende niveaus"
+msgid "General"
+msgstr "Algemeen"
#, fuzzy
msgctxt "view:project.work:"
-msgid "General"
-msgstr "Algemeen"
+msgid "Children"
+msgstr "Onderliggende niveaus"
diff --git a/locale/pl.po b/locale/pl.po
index 2a23d1e..c2864ee 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -44,9 +44,8 @@ msgstr "ID"
msgctxt "field:project.work,left:"
msgid "Left"
-msgstr ""
+msgstr "W lewo"
-#, fuzzy
msgctxt "field:project.work,name:"
msgid "Name"
msgstr "Nazwa"
@@ -68,16 +67,16 @@ msgid "Progress"
msgstr "Postęp"
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:project.work,right:"
msgid "Right"
-msgstr ""
+msgstr "W prawo"
msgctxt "field:project.work,sequence:"
msgid "Sequence"
-msgstr "Kolejność"
+msgstr "Sekwencja"
msgctxt "field:project.work,state:"
msgid "State"
@@ -165,35 +164,35 @@ msgstr ""
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
msgctxt "model:ir.action.act_window.domain,name:act_project_form_done"
msgid "Done"
-msgstr "Gotowe"
+msgstr "Wykonano"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr "Otworzone"
+msgstr "Otworzono"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
-msgstr "Gotowe"
+msgstr "Wykonano"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr "Otworzone"
+msgstr "Otworzono"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
-msgstr "Gotowe"
+msgstr "Wykonano"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
-msgstr "Otworzone"
+msgstr "Otworzono"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
@@ -217,11 +216,11 @@ msgstr "Zadania"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
#, fuzzy
msgctxt "model:project.work,name:"
@@ -230,15 +229,15 @@ msgstr "Works Efforts"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
-msgstr "Administracja ustawieniami projektów"
+msgstr "Administracja projektem"
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Gotowe"
+msgstr "Wykonano"
msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr "Otworzone"
+msgstr "Otworzono"
msgctxt "selection:project.work,type:"
msgid "Project"
@@ -253,9 +252,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Elementy podrzędne"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "Ogólne"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Elementy podrzędne"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b28f0d5..7f7d24b 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Progress"
msgstr "Progresso"
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:project.work,right:"
msgid "Right"
@@ -255,9 +255,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Filhos"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "Geral"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Filhos"
diff --git a/locale/ru.po b/locale/ru.po
index d829184..45fd5dc 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -68,8 +68,8 @@ msgid "Progress"
msgstr ""
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work,right:"
@@ -258,9 +258,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Подчиненый"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "Основной"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Подчиненый"
diff --git a/locale/sl.po b/locale/sl.po
index d35c984..4ddc9b5 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Progress"
msgstr "Napredek"
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
@@ -255,9 +255,9 @@ msgid "%"
msgstr "%"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Podnaloge"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "Splošno"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Podnaloge"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index d1f9e51..26d44ec 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -72,10 +72,9 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
@@ -270,10 +269,10 @@ msgstr "%"
#, fuzzy
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "子项"
+msgid "General"
+msgstr "基本"
#, fuzzy
msgctxt "view:project.work:"
-msgid "General"
-msgstr "基本"
+msgid "Children"
+msgstr "子项"
diff --git a/setup.py b/setup.py
index 5ccd60a..d892c23 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,8 @@ setup(name=name,
],
package_data={
'trytond.modules.project': (info.get('xml', [])
- + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'icons/*.svg']),
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'icons/*.svg',
+ '*.fodt']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -97,9 +98,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index a4faaa4..6a264e6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.1
+version=4.6.0
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index ec16f1f..a218488 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-project
-Version: 4.4.1
+Version: 4.6.0
Summary: Tryton module with projects
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.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_project
===============
@@ -70,9 +70,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index 4f8730a..3c0b46c 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -1,13 +1,20 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+party.py
project.xml
setup.py
+timesheet.py
timesheet.xml
+tox.ini
tryton.cfg
+work.py
work.xml
./__init__.py
./party.py
@@ -64,6 +71,8 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/test_project.py
trytond_project.egg-info/PKG-INFO
trytond_project.egg-info/SOURCES.txt
trytond_project.egg-info/dependency_links.txt
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index a2972d3..a2a0201 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,5 +1,5 @@
python-sql >= 0.4
-trytond_company_work_time >= 4.4, < 4.5
-trytond_party >= 4.4, < 4.5
-trytond_timesheet >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_company_work_time >= 4.6, < 4.7
+trytond_party >= 4.6, < 4.7
+trytond_timesheet >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/view/work_form.xml b/view/work_form.xml
index d9ec388..15e31e2 100644
--- a/view/work_form.xml
+++ b/view/work_form.xml
@@ -48,8 +48,8 @@ this repository contains the full copyright notices and license terms. -->
</group>
</group>
</page>
- <page string="Children" id="children">
- <field name="children" colspan="4"
+ <page name="children" col="1">
+ <field name="children"
view_ids="project.work_view_list_children"/>
</page>
</notebook>
diff --git a/view/work_list.xml b/view/work_list.xml
index 7788b9e..da9b7fc 100644
--- a/view/work_list.xml
+++ b/view/work_list.xml
@@ -1,7 +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>
+<tree sequence="sequence">
<field name="rec_name"/>
<field name="timesheet_duration"/>
<field name="total_effort"/>
diff --git a/view/work_list_children.xml b/view/work_list_children.xml
index 6debde3..cf25fac 100644
--- a/view/work_list_children.xml
+++ b/view/work_list_children.xml
@@ -1,7 +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>
+<tree sequence="sequence">
<field name="name"/>
<field name="timesheet_duration"/>
<field name="total_effort"/>
diff --git a/view/work_tree.xml b/view/work_tree.xml
index 1b78d7f..e4aef5a 100644
--- a/view/work_tree.xml
+++ b/view/work_tree.xml
@@ -1,7 +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>
+<tree sequence="sequence">
<field name="name"/>
<field name="timesheet_duration"/>
<field name="total_effort"/>
diff --git a/view/work_tree_simple.xml b/view/work_tree_simple.xml
index 590b9a7..33bb2ad 100644
--- a/view/work_tree_simple.xml
+++ b/view/work_tree_simple.xml
@@ -1,7 +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>
+<tree sequence="sequence">
<field name="name"/>
<field name="type"/>
<field name="state"/>
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list