[tryton-debian-vcs] tryton-modules-dashboard branch upstream updated. upstream/4.2.0-1-g46b6e2b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:33:41 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-dashboard.git;a=commitdiff;h=upstream/4.2.0-1-g46b6e2b
commit 46b6e2b429e8103bb1729b3a64cd55d53413ff40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:10 2017 +0200
Adding upstream version 4.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 24cf339..542bb8a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 163ea53..c2c9f7f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2016 Cédric Krier.
+Copyright (C) 2009-2017 Cédric Krier.
Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2016 B2CK SPRL.
+Copyright (C) 2009-2017 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 e8f08eb..ef9dff4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for dashboard
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_dashboard
=================
@@ -50,7 +50,7 @@ Classifier: Environment :: Plugins
Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/ir.py b/ir.py
index 6a321f7..c580e21 100644
--- a/ir.py
+++ b/ir.py
@@ -113,7 +113,7 @@ class View:
else:
group.append(element)
root.append(group)
- arch = etree.tostring(tree, encoding='utf-8')
+ arch = etree.tostring(tree, encoding='utf-8').decode('utf-8')
return arch
@classmethod
diff --git a/locale/es_419.po b/locale/es_419.po
index 773d755..69465cf 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -12,7 +12,7 @@ msgstr ""
msgctxt "field:dashboard.action,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:dashboard.action,id:"
msgid "ID"
@@ -36,11 +36,12 @@ msgstr ""
msgctxt "field:dashboard.action,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
+#, fuzzy
msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
-msgstr "Acciones del panel de control"
+msgstr "Acción del panel de control"
msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index d9438e3..0ccf668 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -64,11 +64,11 @@ msgstr "Quadrado"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
-msgstr "Empilhar no Fundo"
+msgstr "Empilhar Embaixo"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
-msgstr "Esquerda da Pilha"
+msgstr "Empilhar à Esquerda"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
diff --git a/setup.py b/setup.py
index eb1e7f3..6c386ce 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ setup(name=name,
'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
index cb7e322..c5d3940 100644
--- a/tests/test_dashboard.py
+++ b/tests/test_dashboard.py
@@ -2,13 +2,23 @@
# this repository contains the full copyright notices and license terms.
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.pool import Pool
class DashboardTestCase(ModuleTestCase):
'Test Dashboard module'
module = 'dashboard'
+ @with_transaction()
+ def test_view_read(self):
+ 'Test dashboard view read'
+ pool = Pool()
+ View = pool.get('ir.ui.view')
+ dashboard_id = View.dashboard_id()
+ result, = View.read([dashboard_id])
+ self.assertIn('board', result['arch'])
+
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/tryton.cfg b/tryton.cfg
index 8ae8baa..e21b4b6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
ir
res
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 206face..d80c929 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-dashboard
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for dashboard
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_dashboard
=================
@@ -50,7 +50,7 @@ Classifier: Environment :: Plugins
Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index 1784d54..539503e 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,3 +1,3 @@
lxml
python-sql >= 0.4
-trytond >= 4.2, < 4.3
+trytond >= 4.4, < 4.5
--
tryton-modules-dashboard
More information about the tryton-debian-vcs
mailing list