[tryton-debian-vcs] tryton-modules-dashboard branch upstream created. 39085c6996398bfea13a31bb9a4ea333a4da9328
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:02:05 UTC 2013
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=39085c6996398bfea13a31bb9a4ea333a4da9328
commit 39085c6996398bfea13a31bb9a4ea333a4da9328
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:18 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 758786e..34f8523 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)
* Filter action based on usage "dashboard"
diff --git a/PKG-INFO b/PKG-INFO
index e250673..c583ef9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for dashboard
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_dashboard
=================
@@ -58,6 +58,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/dashboard.py b/dashboard.py
index ed89c82..406fe05 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pyson import Eval
__all__ = ['DashboardAction']
@@ -13,9 +13,7 @@ class DashboardAction(ModelSQL, ModelView):
__name__ = "dashboard.action"
user = fields.Many2One('res.user', 'User', required=True,
select=True)
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
act_window = fields.Many2One('ir.action.act_window', 'Action',
required=True, ondelete='CASCADE', domain=[
('res_model', '!=', None),
@@ -35,6 +33,7 @@ class DashboardAction(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -42,3 +41,8 @@ class DashboardAction(ModelSQL, ModelView):
# Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
+
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 5e8bc47..929bf0b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -63,14 +63,6 @@ msgid "Square"
msgstr "Carré"
msgctxt "selection:res.user,dashboard_layout:"
-msgid "Square"
-msgstr "Carré"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Bottom"
-msgstr "Pile bas"
-
-msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Pile bas"
@@ -79,14 +71,6 @@ msgid "Stack Left"
msgstr "Pile gauche"
msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Left"
-msgstr "Pile gauche"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Right"
-msgstr "Pile droite"
-
-msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "Pile droite"
@@ -94,14 +78,6 @@ msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "Pile haut"
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Top"
-msgstr "Pile haut"
-
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Action"
-msgstr "Action tableau de bord"
-
msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Action tableau de bord"
@@ -110,14 +86,6 @@ msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Actions tableau de bord"
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
-
-msgctxt "view:res.user:"
-msgid "Dashboard"
-msgstr "Tableau de bord"
-
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Tableau de bord"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 54%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index 5e8bc47..9972b2f 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:dashboard.action,act_window:"
msgid "Action"
-msgstr "Action"
+msgstr "Ukrep"
msgctxt "field:dashboard.action,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Ustvarjeno"
msgctxt "field:dashboard.action,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Ustvaril"
msgctxt "field:dashboard.action,id:"
msgid "ID"
@@ -20,104 +20,72 @@ msgstr "ID"
msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
-msgstr "Séquence"
+msgstr "Zap.št."
msgctxt "field:dashboard.action,user:"
msgid "User"
-msgstr "Utilisateur"
+msgstr "Uporabnik"
msgctxt "field:dashboard.action,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Zapisano"
msgctxt "field:dashboard.action,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Zapisal"
msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
+msgstr "Ukrepi delovne table"
msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
-msgstr "Mise en page de tableau de bord"
+msgstr "Razporeditev delovne table"
msgctxt "model:dashboard.action,name:"
msgid "Dashboard Action"
-msgstr "Action tableau de bord"
+msgstr "Ukrep delovne table"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Delovna tabla"
msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Delovna tabla"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
-msgstr "Carré"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Square"
-msgstr "Carré"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Bottom"
-msgstr "Pile bas"
+msgstr "Kvadrat"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
-msgstr "Pile bas"
+msgstr "Zloženo spodaj"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
-msgstr "Pile gauche"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Left"
-msgstr "Pile gauche"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Right"
-msgstr "Pile droite"
+msgstr "Zloženo levo"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
-msgstr "Pile droite"
+msgstr "Zloženo desno"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
-msgstr "Pile haut"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Top"
-msgstr "Pile haut"
-
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Action"
-msgstr "Action tableau de bord"
+msgstr "Zloženo na vrhu"
msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
-msgstr "Action tableau de bord"
+msgstr "Ukrep delovne table"
msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
-
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
-
-msgctxt "view:res.user:"
-msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Ukrepi delovne table"
msgctxt "view:res.user:"
msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Delovna tabla"
diff --git a/res.py b/res.py
index b3aeb50..bb0e3e8 100644
--- a/res.py
+++ b/res.py
@@ -1,7 +1,7 @@
#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 fields
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.transaction import Transaction
from trytond.pool import PoolMeta
@@ -31,8 +31,11 @@ class User:
@classmethod
def __register__(cls, module_name):
- super(User, cls).__register__(module_name)
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+
+ super(User, cls).__register__(module_name)
+
table = TableHandler(cursor, cls, module_name)
# Migration from 1.6
diff --git a/setup.py b/setup.py
index f708acf..c31ad41 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_dashboard',
'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 36d6daf..5ec8ff9 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_dashboard import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index a786003..25d3a0e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
res
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 8b3b10f..adc12d2 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module for dashboard
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_dashboard
=================
@@ -58,6 +58,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_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index 74b218f..6e08af5 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -25,6 +25,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_dashboard.egg-info/PKG-INFO
trytond_dashboard.egg-info/SOURCES.txt
trytond_dashboard.egg-info/dependency_links.txt
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index 4cdf1bd..b44584b 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 2b1b4477e42cb4dd4e14e6dcccf890840871e23d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:36:22 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index f052393..758786e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 2.6.1 - 2013-02-12
+Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
+* Filter action based on usage "dashboard"
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 39f9196..a005001 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Copyright (C) 2009-2013 Cédric Krier.
-Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2013 Bertrand Chenal.
Copyright (C) 2009-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
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 13da5e2..e250673 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 2.6.1
+Version: 2.8.0
Summary: Tryton module for dashboard
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_dashboard
=================
@@ -51,6 +51,7 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
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/dashboard.py b/dashboard.py
index 81927a2..ed89c82 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -20,6 +20,7 @@ class DashboardAction(ModelSQL, ModelView):
required=True, ondelete='CASCADE', domain=[
('res_model', '!=', None),
('res_model', '!=', ''),
+ ('usage', '=', 'dashboard'),
# XXX copy ir.action rule to prevent access rule error
['OR',
('groups', 'in', Eval('context', {}).get('groups', [])),
diff --git a/dashboard.xml b/dashboard.xml
index 32ba29f..6dd2537 100644
--- a/dashboard.xml
+++ b/dashboard.xml
@@ -7,47 +7,21 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="action_view_form">
<field name="model">dashboard.action</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Dashboard Action">
- <label name="user"/>
- <field name="user"/>
- <newline/>
- <label name="act_window"/>
- <field name="act_window" widget="selection"/>
- <label name="sequence"/>
- <field name="sequence"/>
- </form>
- ]]>
- </field>
+ <field name="name">action_form</field>
</record>
<record model="ir.ui.view" id="action_view_tree">
<field name="model">dashboard.action</field>
<field name="type">tree</field>
<field name="priority" eval="10"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Dashboard Actions">
- <field name="user"/>
- <field name="sequence"/>
- <field name="act_window"/>
- </tree>
- ]]>
- </field>
+ <field name="name">action_tree</field>
</record>
<record model="ir.ui.view" id="action_view_tree_sequence">
<field name="model">dashboard.action</field>
<field name="type">tree</field>
<field name="priority" eval="20"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Dashboard Actions" sequence="sequence">
- <field name="act_window" expand="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">action_tree_sequence</field>
</record>
</data>
diff --git a/ir.py b/ir.py
index 5847b1e..9f1f9fe 100644
--- a/ir.py
+++ b/ir.py
@@ -23,7 +23,6 @@ class View:
models_data = ModelData.search([
('fs_id', '=', 'view_dashboard'),
('module', '=', 'dashboard'),
- ('inherit', '=', None),
], limit=1)
if not models_data:
return 0
diff --git a/ir.xml b/ir.xml
index 554a3c7..c0de838 100644
--- a/ir.xml
+++ b/ir.xml
@@ -7,12 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="view_dashboard">
<field name="model"></field>
<field name="type">board</field>
- <field name="arch" type="xml">
- <![CDATA[
- <board string="Dashboard">
- </board>
- ]]>
- </field>
+ <field name="name">dashboard</field>
</record>
<record model="ir.action.act_window" id="act_dashboard">
<field name="name">Dashboard</field>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 087d288..5317efc 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -80,10 +80,6 @@ msgid "Stack Top"
msgstr "Подравнени отгоре"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Табло"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Действие на таблото"
@@ -94,11 +90,3 @@ msgstr "Действия на табло"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Табло"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Действие на таблото"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Действия на табло"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 2a7a8ec..4036385 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -46,10 +46,9 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Organització de l'escriptori"
-#, fuzzy
msgctxt "model:dashboard.action,name:"
msgid "Dashboard Action"
-msgstr "dashboard.action"
+msgstr "Acció de l'escriptori"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
@@ -80,10 +79,6 @@ msgid "Stack Top"
msgstr "De baix a dalt"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Escriptori"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Acció de l'escriptori"
@@ -94,11 +89,3 @@ msgstr "Accions de l'escriptori"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Escriptori"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Acció de l'escriptori"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Accions de l'escriptori"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 76627f3..65a252d 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -89,11 +89,3 @@ msgstr ""
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr ""
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr ""
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index e762305..b9425d4 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -79,10 +79,6 @@ msgid "Stack Top"
msgstr "Stapel oben"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Dashboard"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Dashboard Aktion"
@@ -93,11 +89,3 @@ msgstr "Dashboard Aktionen"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Dashboard"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Dashboard Aktion"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Dashboard Aktionen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 86901b1..ef5a861 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -79,10 +79,6 @@ msgid "Stack Top"
msgstr "De abajo a arriba"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Tablero"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Acción del tablero"
@@ -93,11 +89,3 @@ msgstr "Acciones del tablero"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Tablero"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Acción del tablero"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Acciones del tablero"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 947b400..11cbed4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -80,10 +80,6 @@ msgid "Stack Top"
msgstr "A la Cima"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Escritorio"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Acción del Escritorio"
@@ -94,11 +90,3 @@ msgstr "Acción del Escritorio"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Escritorio"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Acción del Escritorio"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Acción del Escritorio"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 43d613e..793f9ec 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -46,7 +46,6 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Organización del escritorio"
-#, fuzzy
msgctxt "model:dashboard.action,name:"
msgid "Dashboard Action"
msgstr "Acción del escritorio"
@@ -80,10 +79,6 @@ msgid "Stack Top"
msgstr "De abajo a arriba"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Escritorio"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Acción del escritorio"
@@ -94,11 +89,3 @@ msgstr "Acciones del escritorio"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Escritorio"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Acción del escritorio"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Acciones del escritorio"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8128c3c..5e8bc47 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -99,10 +99,6 @@ msgid "Stack Top"
msgstr "Pile haut"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Tableau de bord"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Action tableau de bord"
@@ -125,11 +121,3 @@ msgstr "Tableau de bord"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Tableau de bord"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Action tableau de bord"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index d5d16f1..b4e7875 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -80,10 +80,6 @@ msgid "Stack Top"
msgstr "Stapel boven"
msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Prikbord"
-
-msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Prikbord actie"
@@ -94,11 +90,3 @@ msgstr "Prikbord acties"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Prikbord"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Prikbord actie"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Prikbord acties"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index de993a4..65ae553 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -8,15 +8,15 @@ msgstr "Действие"
msgctxt "field:dashboard.action,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:dashboard.action,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:dashboard.action,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
@@ -24,7 +24,7 @@ msgstr "Наименование"
msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
msgctxt "field:dashboard.action,user:"
msgid "User"
@@ -32,11 +32,11 @@ msgstr "Пользователь"
msgctxt "field:dashboard.action,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:dashboard.action,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
@@ -46,10 +46,9 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Расположение на панели"
-#, fuzzy
msgctxt "model:dashboard.action,name:"
msgid "Dashboard Action"
-msgstr "Панель действий"
+msgstr "Панель действия"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
@@ -65,23 +64,19 @@ msgstr "Квадрат"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
-msgstr "Стек Нижний"
+msgstr "Выровнять вниз"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
-msgstr "Стек слева"
+msgstr "Выровнять влево"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
-msgstr "Стек справа"
+msgstr "Выровнять вправо"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
-msgstr "Стек сверху"
-
-msgctxt "view:dashboard.action:"
-msgid "Dashboard"
-msgstr "Информационная панель"
+msgstr "Выровнять вверх"
msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
@@ -94,11 +89,3 @@ msgstr "Панель действий"
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Информационная панель"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Action"
-msgstr "Действия панели"
-
-msgctxt "view:res.user:"
-msgid "Dashboard Actions"
-msgstr "Действия панели"
diff --git a/res.xml b/res.xml
index 45ae887..7904b50 100644
--- a/res.xml
+++ b/res.xml
@@ -8,40 +8,14 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">res.user</field>
<field name="type">form</field>
<field name="inherit" ref="res.user_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/notebook" position="inside">
- <page string="Dashboard" id="dashboard" col="2">
- <label name="dashboard_layout"/>
- <field name="dashboard_layout"/>
- <field name="dashboard_actions" colspan="2"
- view_ids="dashboard.action_view_tree_sequence"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">user_form</field>
</record>
<record model="ir.ui.view" id="user_view_form_preferences">
<field name="model">res.user</field>
<field name="type">form</field>
<field name="inherit" ref="res.user_view_form_preferences"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/notebook" position="inside">
- <page string="Dashboard" id="dashboard" col="2">
- <label name="dashboard_layout"/>
- <field name="dashboard_layout"/>
- <field name="dashboard_actions" colspan="2"
- view_ids="dashboard.action_view_tree_sequence"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">user_form_preferences</field>
</record>
</data>
diff --git a/setup.py b/setup.py
index d3da261..f708acf 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = ['lxml']
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_dashboard',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_dashboard',
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.dashboard': '.'},
packages=[
'trytond.modules.dashboard',
'trytond.modules.dashboard.tests',
],
package_data={
- 'trytond.modules.dashboard': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.dashboard': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -55,6 +55,7 @@ setup(name='trytond_dashboard',
'Intended Audience :: Legal Industry',
'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/tryton.cfg b/tryton.cfg
index 5e72448..a786003 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.8.0
depends:
ir
res
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 7f779d9..8b3b10f 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: 2.6.1
+Version: 2.8.0
Summary: Tryton module for dashboard
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_dashboard
=================
@@ -51,6 +51,7 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
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_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index c01fed2..74b218f 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -31,4 +31,10 @@ trytond_dashboard.egg-info/dependency_links.txt
trytond_dashboard.egg-info/entry_points.txt
trytond_dashboard.egg-info/not-zip-safe
trytond_dashboard.egg-info/requires.txt
-trytond_dashboard.egg-info/top_level.txt
\ No newline at end of file
+trytond_dashboard.egg-info/top_level.txt
+view/action_form.xml
+view/action_tree.xml
+view/action_tree_sequence.xml
+view/dashboard.xml
+view/user_form.xml
+view/user_form_preferences.xml
\ No newline at end of file
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index d785fec..4cdf1bd 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/action_form.xml b/view/action_form.xml
new file mode 100644
index 0000000..8eafbc5
--- /dev/null
+++ b/view/action_form.xml
@@ -0,0 +1,12 @@
+<?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="Dashboard Action">
+ <label name="user"/>
+ <field name="user"/>
+ <newline/>
+ <label name="act_window"/>
+ <field name="act_window" widget="selection"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+</form>
diff --git a/view/action_tree.xml b/view/action_tree.xml
new file mode 100644
index 0000000..ea37df2
--- /dev/null
+++ b/view/action_tree.xml
@@ -0,0 +1,8 @@
+<?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="Dashboard Actions">
+ <field name="user"/>
+ <field name="sequence"/>
+ <field name="act_window"/>
+</tree>
diff --git a/view/action_tree_sequence.xml b/view/action_tree_sequence.xml
new file mode 100644
index 0000000..2978752
--- /dev/null
+++ b/view/action_tree_sequence.xml
@@ -0,0 +1,6 @@
+<?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="Dashboard Actions" sequence="sequence">
+ <field name="act_window" expand="1"/>
+</tree>
diff --git a/view/dashboard.xml b/view/dashboard.xml
new file mode 100644
index 0000000..9ca6f3c
--- /dev/null
+++ b/view/dashboard.xml
@@ -0,0 +1,5 @@
+<?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. -->
+<board string="Dashboard">
+</board>
diff --git a/view/user_form.xml b/view/user_form.xml
new file mode 100644
index 0000000..43053b2
--- /dev/null
+++ b/view/user_form.xml
@@ -0,0 +1,13 @@
+<?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" position="inside">
+ <page string="Dashboard" id="dashboard" col="2">
+ <label name="dashboard_layout"/>
+ <field name="dashboard_layout"/>
+ <field name="dashboard_actions" colspan="2"
+ view_ids="dashboard.action_view_tree_sequence"/>
+ </page>
+ </xpath>
+</data>
diff --git a/view/user_form_preferences.xml b/view/user_form_preferences.xml
new file mode 100644
index 0000000..43053b2
--- /dev/null
+++ b/view/user_form_preferences.xml
@@ -0,0 +1,13 @@
+<?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" position="inside">
+ <page string="Dashboard" id="dashboard" col="2">
+ <label name="dashboard_layout"/>
+ <field name="dashboard_layout"/>
+ <field name="dashboard_actions" colspan="2"
+ view_ids="dashboard.action_view_tree_sequence"/>
+ </page>
+ </xpath>
+</data>
commit 5b85114d4b6c6303820b0827d7b348b0616ba949
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 20:50:42 2013 +0100
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index cf6b4da..f052393 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-02-12
+* 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 8ad4b79..39f9196 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-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/PKG-INFO b/PKG-INFO
index d776f0c..13da5e2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/dashboard.py b/dashboard.py
index 52b830f..81927a2 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -3,6 +3,7 @@
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
from trytond.backend import TableHandler
+from trytond.pyson import Eval
__all__ = ['DashboardAction']
@@ -19,6 +20,11 @@ class DashboardAction(ModelSQL, ModelView):
required=True, ondelete='CASCADE', domain=[
('res_model', '!=', None),
('res_model', '!=', ''),
+ # XXX copy ir.action rule to prevent access rule error
+ ['OR',
+ ('groups', 'in', Eval('context', {}).get('groups', [])),
+ ('groups', '=', None),
+ ],
])
@classmethod
diff --git a/tryton.cfg b/tryton.cfg
index 9bc4e7d..5e72448 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
ir
res
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index a29001c..7f779d9 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-dashboard
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
commit e410909e08e62dc23a0cb52da2a6058e168af7f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:35 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index a751c50..cf6b4da 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-23
* 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 8419d51..d776f0c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,15 +1,48 @@
Metadata-Version: 1.0
Name: trytond_dashboard
-Version: 2.4.0
-Summary: Dashboard:
- - Allow to create a personalized dashboard.
-
+Version: 2.6.0
+Summary: Tryton module for dashboard
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_dashboard
+ =================
+
+ The dashboard 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 04e7777..d0c54bd 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_dashboard
=================
The dashboard module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 4f8bd9d..a23e5e7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +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 .dashboard import *
from .res import *
from .ir import *
+
+
+def register():
+ Pool.register(
+ DashboardAction,
+ User,
+ View,
+ module='dashboard', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 04afeed..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-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.
-{
- 'name': 'Dashboard',
- 'name_bg_BG': 'Табло',
- 'name_ca_ES': 'Escriptori',
- 'name_de_DE': 'Dashboard',
- 'name_es_AR': 'Tablero',
- 'name_es_CO': 'Escritorio',
- 'name_es_ES': 'Escritorio',
- 'name_fr_FR': 'Tableau de bord',
- 'name_nl_NL': 'Prikbord',
- 'name_ru_RU': 'Информационная панель',
- 'version': '2.4.0',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Dashboard:
- - Allow to create a personalized dashboard.
-''',
- 'description_bg_BG': '''Табло:
- - Позволява създаване на перосонализирани табла.
-''',
- 'description_ca_ES': '''Escriptori:
- - Permet la creació d'una pàgina d'inici personalitzada per usuari.
-''',
- 'description_de_DE': '''Dashboard:
- - Ermöglicht die Einrichtung einer personalisierten Startseite.
-''',
- 'description_es_AR': '''Tablero:
- - Permite la creación de una página de inicio personalizada.
-''',
- 'description_es_CO': '''Escritorio:
- - Permite la creación de una página de inicio personalizada.
-''',
- 'description_es_ES': '''Escritorio:
- - Permite la creación de una página de inicio personalizada.
-''',
- 'description_fr_FR': '''Tableau de bord
- - Permet de créer un tableau de bord personalisé.
-''',
- 'description_nl_NL': '''Prikbord:
- - Maakt een persoonlijk prikbord mogelijk.
-''',
- 'description_ru_RU': '''Информационная панель:
- - позволяет создавать персональные панели.
-''',
- 'depends': [
- 'ir',
- 'res',
- ],
- 'xml': [
- 'dashboard.xml',
- 'res.xml',
- 'ir.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/dashboard.py b/dashboard.py
index 83eb03a..52b830f 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -1,23 +1,37 @@
#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 trytond.transaction import Transaction
+from trytond.backend import TableHandler
+
+__all__ = ['DashboardAction']
class DashboardAction(ModelSQL, ModelView):
"Dashboard Action"
- _name = "dashboard.action"
-
+ __name__ = "dashboard.action"
user = fields.Many2One('res.user', 'User', required=True,
select=True)
- sequence = fields.Integer('Sequence', required=True)
+ sequence = fields.Integer('Sequence',
+ order_field='(%(table)s.sequence IS NULL) %(order)s, '
+ '%(table)s.sequence %(order)s')
act_window = fields.Many2One('ir.action.act_window', 'Action',
required=True, ondelete='CASCADE', domain=[
('res_model', '!=', None),
('res_model', '!=', ''),
])
- def __init__(self):
- super(DashboardAction, self).__init__()
- self._order.insert(0, ('sequence', 'ASC'))
+ @classmethod
+ def __setup__(cls):
+ super(DashboardAction, cls).__setup__()
+ cls._order.insert(0, ('sequence', 'ASC'))
+
+ @classmethod
+ def __register__(cls, module_name):
+ cursor = Transaction().cursor
+ table = TableHandler(cursor, cls, module_name)
+
+ super(DashboardAction, cls).__register__(module_name)
-DashboardAction()
+ # Migration from 2.4: drop required on sequence
+ table.not_null_action('sequence', action='remove')
diff --git a/ir.py b/ir.py
index cd310da..5847b1e 100644
--- a/ir.py
+++ b/ir.py
@@ -2,67 +2,62 @@
#this repository contains the full copyright notices and license terms.
import math
from lxml import etree
-from trytond.model import Model
from trytond.transaction import Transaction
from trytond.cache import Cache
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['View']
+__metaclass__ = PoolMeta
-class View(Model):
- _name = 'ir.ui.view'
- def dashboard_id(self):
+class View:
+ __name__ = 'ir.ui.view'
+ _dashboard_cache = Cache('ir.ui.view.dashboard_id')
+
+ @staticmethod
+ def dashboard_id():
'''
Return the database id of view_dashboard
-
- :param user: the user id
- :return: an integer
'''
- model_data_obj = Pool().get('ir.model.data')
- model_data_ids = model_data_obj.search([
- ('fs_id', '=', 'view_dashboard'),
- ('module', '=', 'dashboard'),
- ('inherit', '=', None),
- ], limit=1)
- if not model_data_ids:
+ ModelData = Pool().get('ir.model.data')
+ models_data = ModelData.search([
+ ('fs_id', '=', 'view_dashboard'),
+ ('module', '=', 'dashboard'),
+ ('inherit', '=', None),
+ ], limit=1)
+ if not models_data:
return 0
- model_data = model_data_obj.browse(model_data_ids[0])
+ model_data, = models_data
return model_data.db_id
- dashboard_id = Cache('ir.ui.view.dashboard_id')(dashboard_id)
-
- def _dashboard_element_action(self, action):
+ @staticmethod
+ def _dashboard_element_action(action):
'''
Return etree Element for the given dashboard action.
-
- :param action: a BrowseRecord of dashboard.action
- :return: an etree Element
'''
return etree.Element('action', {
- 'name': str(action.act_window.id),
- })
+ 'name': str(action.act_window.id),
+ })
- def dashboard_view(self, arch):
+ @classmethod
+ def dashboard_view(cls, arch):
'''
Add action to view arch of dashboard
-
- :param arch: a string with the xml arch of dashboard
- :return: a string with the new xml arch
'''
- user_obj = Pool().get('res.user')
+ User = Pool().get('res.user')
tree = etree.fromstring(arch)
root = tree.getroottree().getroot()
- user = user_obj.browse(Transaction().user)
+ user = User(Transaction().user)
if user.dashboard_layout == 'square':
root.set('col', str(int(math.ceil(math.sqrt(
len(user.dashboard_actions))))))
for action in user.dashboard_actions:
- root.append(self._dashboard_element_action(action))
+ root.append(cls._dashboard_element_action(action))
elif user.dashboard_layout == 'stack_right':
group = None
root.set('col', '2')
for action in user.dashboard_actions:
- element = self._dashboard_element_action(action)
+ element = cls._dashboard_element_action(action)
if group is None:
root.append(element)
group = etree.Element('group', {
@@ -83,7 +78,7 @@ class View(Model):
root.append(group)
first = True
for action in user.dashboard_actions:
- element = self._dashboard_element_action(action)
+ element = cls._dashboard_element_action(action)
if first:
first = False
root.append(element)
@@ -98,7 +93,7 @@ class View(Model):
root.append(group)
first = True
for action in user.dashboard_actions:
- element = self._dashboard_element_action(action)
+ element = cls._dashboard_element_action(action)
if first:
first = False
root.append(element)
@@ -112,7 +107,7 @@ class View(Model):
})
first = True
for action in user.dashboard_actions:
- element = self._dashboard_element_action(action)
+ element = cls._dashboard_element_action(action)
if first:
first = False
root.append(element)
@@ -122,23 +117,19 @@ class View(Model):
arch = etree.tostring(tree, encoding='utf-8')
return arch
- def read(self, ids, fields_names=None):
- res = super(View, self).read(ids, fields_names=fields_names)
+ @classmethod
+ def read(cls, ids, fields_names=None):
+ res = super(View, cls).read(ids, fields_names=fields_names)
if Transaction().user == 0:
return res
- dashboard_id = self.dashboard_id()
+ dashboard_id = cls.dashboard_id()
if not dashboard_id:
# Restart the cache
- self.dashboard_id.reset()
+ cls._dashboard_cache.clear()
if fields_names is None \
or 'arch' in fields_names:
- if isinstance(ids, (int, long)):
- if dashboard_id == ids:
- res['arch'] = self.dashboard_view(res['arch'])
- elif dashboard_id in ids:
+ if dashboard_id in ids:
for res2 in res:
if res2['id'] == dashboard_id:
- res2['arch'] = self.dashboard_view(res2['arch'])
+ res2['arch'] = cls.dashboard_view(res2['arch'])
return res
-
-View()
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 263102a..087d288 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -46,9 +46,10 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Подреждане на табло"
+#, fuzzy
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
-msgstr ""
+msgid "Dashboard Action"
+msgstr "Действие на таблото"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index a6eb0c1..2a7a8ec 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -8,16 +8,15 @@ msgstr "Acció"
msgctxt "field:dashboard.action,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:dashboard.action,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:dashboard.action,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
@@ -33,11 +32,11 @@ msgstr "Usuari"
msgctxt "field:dashboard.action,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:dashboard.action,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
@@ -47,15 +46,15 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Organització de l'escriptori"
+#, fuzzy
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
+msgid "Dashboard Action"
msgstr "dashboard.action"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
msgstr "Escriptori"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Escriptori"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index a881cce..76627f3 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -47,7 +47,7 @@ msgid "Dashboard Layout"
msgstr ""
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
+msgid "Dashboard Action"
msgstr ""
msgctxt "model:ir.action,name:act_dashboard"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index cdd4a16..e762305 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -47,7 +47,7 @@ msgid "Dashboard Layout"
msgstr "Dashboard Anordnung"
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
+msgid "Dashboard Action"
msgstr "Dashboard Aktion"
msgctxt "model:ir.action,name:act_dashboard"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index c25d447..86901b1 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -47,8 +47,8 @@ msgid "Dashboard Layout"
msgstr "Organización del tablero"
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
-msgstr "dashboard.action"
+msgid "Dashboard Action"
+msgstr "Acción del tablero"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index c263b44..947b400 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,122 +2,103 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Acción"
msgctxt "field:dashboard.action,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:dashboard.action,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:dashboard.action,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Nombre de Contacto"
-#, fuzzy
msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-#, fuzzy
msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Usuario"
msgctxt "field:dashboard.action,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:dashboard.action,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
-#, fuzzy
msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Acciones del Escritorio"
-#, fuzzy
msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Diseño del Escritorio"
+#, fuzzy
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
-msgstr ""
+msgid "Dashboard Action"
+msgstr "Acción"
-#, fuzzy
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
msgstr "Escritorio"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Escritorio"
-#, fuzzy
msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Cuadrado"
-#, fuzzy
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Al Fondo"
-#, fuzzy
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "A la Izquierda"
-#, fuzzy
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "A la Derecha"
-#, fuzzy
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "A la Cima"
-#, fuzzy
msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Escritorio"
-#, fuzzy
msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Acción del Escritorio"
-#, fuzzy
msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Acción del Escritorio"
-#, fuzzy
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Escritorio"
-#, fuzzy
msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Acción del Escritorio"
-#, fuzzy
msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Acción del Escritorio"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index d6bc68d..43d613e 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -46,8 +46,9 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Organización del escritorio"
+#, fuzzy
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
+msgid "Dashboard Action"
msgstr "Acción del escritorio"
msgctxt "model:ir.action,name:act_dashboard"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 81470f4..8128c3c 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -47,7 +47,7 @@ msgid "Dashboard Layout"
msgstr "Mise en page de tableau de bord"
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
+msgid "Dashboard Action"
msgstr "Action tableau de bord"
msgctxt "model:ir.action,name:act_dashboard"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 1633428..d5d16f1 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -46,9 +46,10 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Prikbord indeling"
+#, fuzzy
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
-msgstr ""
+msgid "Dashboard Action"
+msgstr "Prikbord actie"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index ce3154b..de993a4 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -46,8 +46,9 @@ msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Расположение на панели"
+#, fuzzy
msgctxt "model:dashboard.action,name:"
-msgid "dashboard.action"
+msgid "Dashboard Action"
msgstr "Панель действий"
msgctxt "model:ir.action,name:act_dashboard"
diff --git a/res.py b/res.py
index d16899b..b3aeb50 100644
--- a/res.py
+++ b/res.py
@@ -1,13 +1,16 @@
#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 Model, fields
+from trytond.model import fields
from trytond.backend import TableHandler
from trytond.transaction import Transaction
+from trytond.pool import PoolMeta
+__all__ = ['User']
+__metaclass__ = PoolMeta
-class User(Model):
- _name = "res.user"
+class User:
+ __name__ = "res.user"
dashboard_layout = fields.Selection([
('square', 'Square'),
('stack_right', 'Stack Right'),
@@ -18,22 +21,23 @@ class User(Model):
dashboard_actions = fields.One2Many('dashboard.action', 'user',
'Dashboard Actions')
- def __init__(self):
- super(User, self).__init__()
- self._preferences_fields += [
+ @classmethod
+ def __setup__(cls):
+ super(User, cls).__setup__()
+ cls._preferences_fields += [
'dashboard_layout',
'dashboard_actions',
- ]
+ ]
- def init(self, module_name):
- super(User, self).init(module_name)
+ @classmethod
+ def __register__(cls, module_name):
+ super(User, cls).__register__(module_name)
cursor = Transaction().cursor
- table = TableHandler(cursor, self, module_name)
+ table = TableHandler(cursor, cls, module_name)
# Migration from 1.6
table.not_null_action('dashboard_layout', action='remove')
- def default_dashboard_layout(self):
+ @staticmethod
+ def default_dashboard_layout():
return 'square'
-
-User()
diff --git a/setup.py b/setup.py
index 863db06..d3da261 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_dashboard',
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 for dashboard',
+ 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.dashboard': '.'},
packages=[
'trytond.modules.dashboard',
'trytond.modules.dashboard.tests',
- ],
+ ],
package_data={
'trytond.modules.dashboard': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -55,7 +66,7 @@ setup(name='trytond_dashboard',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -65,4 +76,4 @@ setup(name='trytond_dashboard',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..9bc4e7d
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,9 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ res
+xml:
+ dashboard.xml
+ res.xml
+ ir.xml
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 17d12c8..a29001c 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,15 +1,48 @@
Metadata-Version: 1.0
Name: trytond-dashboard
-Version: 2.4.0
-Summary: Dashboard:
- - Allow to create a personalized dashboard.
-
+Version: 2.6.0
+Summary: Tryton module for dashboard
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_dashboard
+ =================
+
+ The dashboard 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_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index 435b9ef..c01fed2 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -8,8 +8,8 @@ dashboard.xml
ir.xml
res.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./dashboard.py
./ir.py
./res.py
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index f54923e..d785fec 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit ad57fa45e9008f9e29f82cd35ef6e7ba67a7c388
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:45 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8633802..a751c50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..8ad4b79 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-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 63a221b..7119442 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_dashboard
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* lxml (http://codespeak.net/lxml/)
* trytond (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index efc2fa7..8419d51 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_dashboard
-Version: 2.2.0
+Version: 2.4.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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 d8a2b38..4f8bd9d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +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 dashboard import *
-from res import *
-from ir import *
+from .dashboard import *
+from .res import *
+from .ir import *
diff --git a/__tryton__.py b/__tryton__.py
index 2c11a66..04afeed 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,13 +4,15 @@
{
'name': 'Dashboard',
'name_bg_BG': 'Табло',
+ 'name_ca_ES': 'Escriptori',
'name_de_DE': 'Dashboard',
+ 'name_es_AR': 'Tablero',
'name_es_CO': 'Escritorio',
'name_es_ES': 'Escritorio',
'name_fr_FR': 'Tableau de bord',
'name_nl_NL': 'Prikbord',
'name_ru_RU': 'Информационная панель',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -20,9 +22,15 @@
'description_bg_BG': '''Табло:
- Позволява създаване на перосонализирани табла.
''',
+ 'description_ca_ES': '''Escriptori:
+ - Permet la creació d'una pàgina d'inici personalitzada per usuari.
+''',
'description_de_DE': '''Dashboard:
- Ermöglicht die Einrichtung einer personalisierten Startseite.
''',
+ 'description_es_AR': '''Tablero:
+ - Permite la creación de una página de inicio personalizada.
+''',
'description_es_CO': '''Escritorio:
- Permite la creación de una página de inicio personalizada.
''',
@@ -49,8 +57,10 @@
],
'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/dashboard.py b/dashboard.py
index 9cd4a62..83eb03a 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -8,11 +8,11 @@ class DashboardAction(ModelSQL, ModelView):
_name = "dashboard.action"
user = fields.Many2One('res.user', 'User', required=True,
- select=1)
- sequence = fields.Integer('Sequence')
+ select=True)
+ sequence = fields.Integer('Sequence', required=True)
act_window = fields.Many2One('ir.action.act_window', 'Action',
required=True, ondelete='CASCADE', domain=[
- ('res_model', '!=', False),
+ ('res_model', '!=', None),
('res_model', '!=', ''),
])
diff --git a/dashboard.xml b/dashboard.xml
index 36cfccf..32ba29f 100644
--- a/dashboard.xml
+++ b/dashboard.xml
@@ -12,10 +12,11 @@ this repository contains the full copyright notices and license terms. -->
<form string="Dashboard Action">
<label name="user"/>
<field name="user"/>
+ <newline/>
+ <label name="act_window"/>
+ <field name="act_window" widget="selection"/>
<label name="sequence"/>
<field name="sequence"/>
- <label name="act_window"/>
- <field name="act_window"/>
</form>
]]>
</field>
@@ -24,6 +25,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="action_view_tree">
<field name="model">dashboard.action</field>
<field name="type">tree</field>
+ <field name="priority" eval="10"/>
<field name="arch" type="xml">
<![CDATA[
<tree string="Dashboard Actions">
@@ -35,5 +37,18 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
+ <record model="ir.ui.view" id="action_view_tree_sequence">
+ <field name="model">dashboard.action</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="20"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Dashboard Actions" sequence="sequence">
+ <field name="act_window" expand="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
</data>
</tryton>
diff --git a/ir.py b/ir.py
index 97f2282..cd310da 100644
--- a/ir.py
+++ b/ir.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
import math
from lxml import etree
-from trytond.model import Model, fields
+from trytond.model import Model
from trytond.transaction import Transaction
from trytond.cache import Cache
from trytond.pool import Pool
@@ -22,7 +22,7 @@ class View(Model):
model_data_ids = model_data_obj.search([
('fs_id', '=', 'view_dashboard'),
('module', '=', 'dashboard'),
- ('inherit', '=', False),
+ ('inherit', '=', None),
], limit=1)
if not model_data_ids:
return 0
@@ -66,16 +66,20 @@ class View(Model):
if group is None:
root.append(element)
group = etree.Element('group', {
- 'col': '1',
- })
+ 'col': '1',
+ 'yexpand': '1',
+ 'yfill': '1',
+ })
root.append(group)
else:
group.append(element)
elif user.dashboard_layout == 'stack_left':
root.set('col', '2')
group = etree.Element('group', {
- 'col': '1',
- })
+ 'col': '1',
+ 'yexpand': '1',
+ 'yfill': '1',
+ })
root.append(group)
first = True
for action in user.dashboard_actions:
@@ -88,9 +92,9 @@ class View(Model):
elif user.dashboard_layout == 'stack_top':
root.set('col', '1')
group = etree.Element('group', {
- 'col': str(len(user.dashboard_actions) - 1),
- 'expand': '1',
- })
+ 'col': str(len(user.dashboard_actions) - 1),
+ 'xexpand': '1',
+ })
root.append(group)
first = True
for action in user.dashboard_actions:
@@ -103,9 +107,9 @@ class View(Model):
elif user.dashboard_layout == 'stack_bottom':
root.set('col', '1')
group = etree.Element('group', {
- 'col': str(len(user.dashboard_actions) - 1),
- 'expand': '1',
- })
+ 'col': str(len(user.dashboard_actions) - 1),
+ 'xexpand': '1',
+ })
first = True
for action in user.dashboard_actions:
element = self._dashboard_element_action(action)
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 58e8015..263102a 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,31 +2,51 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Действие"
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Последователност"
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Потребител"
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Действия на табло"
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Подреждане на табло"
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
msgstr ""
@@ -38,46 +58,46 @@ msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Табло"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Каре"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Подравнени отдолу"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "Подарнение отляво"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "Подравнение отдясно"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "Подравнени отгоре"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Табло"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Действие на таблото"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Действия на табло"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Табло"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Действие на таблото"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Действия на табло"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..a6eb0c1
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,105 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:"
+msgid "Action"
+msgstr "Acció"
+
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:dashboard.action,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:dashboard.action,sequence:"
+msgid "Sequence"
+msgstr "Seqüència"
+
+msgctxt "field:dashboard.action,user:"
+msgid "User"
+msgstr "Usuari"
+
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:res.user,dashboard_actions:"
+msgid "Dashboard Actions"
+msgstr "Accions de l'escriptori"
+
+msgctxt "field:res.user,dashboard_layout:"
+msgid "Dashboard Layout"
+msgstr "Organització de l'escriptori"
+
+msgctxt "model:dashboard.action,name:"
+msgid "dashboard.action"
+msgstr "dashboard.action"
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Escriptori"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Escriptori"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Square"
+msgstr "Ajustat"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Bottom"
+msgstr "De dalt a baix"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Left"
+msgstr "De dreta a esquerra"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Right"
+msgstr "D'esquerra a dreta"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Top"
+msgstr "De baix a dalt"
+
+msgctxt "view:dashboard.action:"
+msgid "Dashboard"
+msgstr "Escriptori"
+
+msgctxt "view:dashboard.action:"
+msgid "Dashboard Action"
+msgstr "Acció de l'escriptori"
+
+msgctxt "view:dashboard.action:"
+msgid "Dashboard Actions"
+msgstr "Accions de l'escriptori"
+
+msgctxt "view:res.user:"
+msgid "Dashboard"
+msgstr "Escriptori"
+
+msgctxt "view:res.user:"
+msgid "Dashboard Action"
+msgstr "Acció de l'escriptori"
+
+msgctxt "view:res.user:"
+msgid "Dashboard Actions"
+msgstr "Accions de l'escriptori"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 3faeda9..a881cce 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,31 +2,51 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr ""
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr ""
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr ""
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr ""
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr ""
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
msgstr ""
@@ -38,42 +58,42 @@ msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr ""
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr ""
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr ""
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr ""
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr ""
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr ""
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr ""
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr ""
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr ""
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr ""
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 677980f..cdd4a16 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,31 +2,51 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Aktion"
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Reihenfolge"
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Benutzer"
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Dashboard Aktionen"
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Dashboard Anordnung"
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
msgstr "Dashboard Aktion"
@@ -38,46 +58,46 @@ msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Dashboard"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Rechtecke"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Stapel unten"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "Stapel links"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "Stapel rechts"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "Stapel oben"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Dashboard"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Dashboard Aktion"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Dashboard Aktionen"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Dashboard"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Dashboard Aktion"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Dashboard Aktionen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..c25d447
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,103 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:"
+msgid "Action"
+msgstr "Acción"
+
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:dashboard.action,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:dashboard.action,sequence:"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:dashboard.action,user:"
+msgid "User"
+msgstr "Usuario"
+
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:res.user,dashboard_actions:"
+msgid "Dashboard Actions"
+msgstr "Acciones del tablero"
+
+msgctxt "field:res.user,dashboard_layout:"
+msgid "Dashboard Layout"
+msgstr "Organización del tablero"
+
+msgctxt "model:dashboard.action,name:"
+msgid "dashboard.action"
+msgstr "dashboard.action"
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Tablero"
+
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Tablero"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Square"
+msgstr "Ajustado"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Bottom"
+msgstr "De arriba a abajo"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Left"
+msgstr "De derecha a izquierda"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Right"
+msgstr "De izquierda a derecha"
+
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Top"
+msgstr "De abajo a arriba"
+
+msgctxt "view:dashboard.action:"
+msgid "Dashboard"
+msgstr "Tablero"
+
+msgctxt "view:dashboard.action:"
+msgid "Dashboard Action"
+msgstr "Acción del tablero"
+
+msgctxt "view:dashboard.action:"
+msgid "Dashboard Actions"
+msgstr "Acciones del tablero"
+
+msgctxt "view:res.user:"
+msgid "Dashboard"
+msgstr "Tablero"
+
+msgctxt "view:res.user:"
+msgid "Dashboard Action"
+msgstr "Acción del tablero"
+
+msgctxt "view:res.user:"
+msgid "Dashboard Actions"
+msgstr "Acciones del tablero"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 4e07230..c263b44 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,36 +3,57 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
#, fuzzy
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Acción"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Nombre de Contacto"
#, fuzzy
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Secuencia"
#, fuzzy
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Usuario"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Acciones del Escritorio"
#, fuzzy
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Diseño del Escritorio"
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
msgstr ""
@@ -47,56 +68,56 @@ msgid "Dashboard"
msgstr "Escritorio"
#, fuzzy
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Cuadrado"
#, fuzzy
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Al Fondo"
#, fuzzy
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "A la Izquierda"
#, fuzzy
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "A la Derecha"
#, fuzzy
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "A la Cima"
#, fuzzy
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Escritorio"
#, fuzzy
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Acción del Escritorio"
#, fuzzy
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Acción del Escritorio"
#, fuzzy
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Escritorio"
#, fuzzy
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Acción del Escritorio"
#, fuzzy
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Acción del Escritorio"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 54336e3..d6bc68d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,83 +2,102 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Acción"
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Usuario"
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Acciones del escritorio"
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Organización del escritorio"
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
-msgstr "dashboard.action"
+msgstr "Acción del escritorio"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
msgstr "Escritorio"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Escritorio"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Ajustado"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "De arriba a abajo"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "De derecha a izquierda"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "De izquierda a derecha"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "De abajo a arriba"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Escritorio"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Acción del escritorio"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Acciones del escritorio"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Escritorio"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Acción del escritorio"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Acciones del escritorio"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 81628fc..81470f4 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,31 +2,51 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Action"
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Séquence"
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Utilisateur"
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Actions tableau de bord"
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Mise en page de tableau de bord"
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
msgstr "Action tableau de bord"
@@ -38,46 +58,78 @@ msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Tableau de bord"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Square"
+msgstr "Carré"
+
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Carré"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Pile bas"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Bottom"
+msgstr "Pile bas"
+
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "Pile gauche"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Left"
+msgstr "Pile gauche"
+
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "Pile droite"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Right"
+msgstr "Pile droite"
+
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "Pile haut"
-msgctxt "view:dashboard.action:0"
+msgctxt "selection:res.user,dashboard_layout:"
+msgid "Stack Top"
+msgstr "Pile haut"
+
+msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Tableau de bord"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
+msgid "Dashboard Action"
+msgstr "Action tableau de bord"
+
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Action tableau de bord"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
+msgid "Dashboard Actions"
+msgstr "Actions tableau de bord"
+
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Actions tableau de bord"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
+msgid "Dashboard"
+msgstr "Tableau de bord"
+
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Tableau de bord"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Action tableau de bord"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Actions tableau de bord"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index a1699ad..1633428 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,31 +2,51 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Actie"
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Reeks"
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Gebruiker"
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Prikbord acties"
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Prikbord indeling"
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
msgstr ""
@@ -38,46 +58,46 @@ msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Prikbord"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Rechthoek"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Stapel onder"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "Stapel links"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "Stapel rechts"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "Stapel boven"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Prikbord"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Prikbord actie"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Prikbord acties"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Prikbord"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Prikbord actie"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Prikbord acties"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index efdfc80..ce3154b 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,31 +2,51 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:dashboard.action,act_window:0"
+msgctxt "field:dashboard.action,act_window:"
msgid "Action"
msgstr "Действие"
-msgctxt "field:dashboard.action,rec_name:0"
+msgctxt "field:dashboard.action,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:dashboard.action,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:dashboard.action,sequence:0"
+msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
msgstr "Последовательность"
-msgctxt "field:dashboard.action,user:0"
+msgctxt "field:dashboard.action,user:"
msgid "User"
msgstr "Пользователь"
-msgctxt "field:res.user,dashboard_actions:0"
+msgctxt "field:dashboard.action,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:dashboard.action,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
msgstr "Панель действий"
-msgctxt "field:res.user,dashboard_layout:0"
+msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
msgstr "Расположение на панели"
-msgctxt "model:dashboard.action,name:0"
+msgctxt "model:dashboard.action,name:"
msgid "dashboard.action"
msgstr "Панель действий"
@@ -38,46 +58,46 @@ msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
msgstr "Информационная панель"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
msgstr "Квадрат"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Стек Нижний"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
msgstr "Стек слева"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "Стек справа"
-msgctxt "selection:res.user,dashboard_layout:0"
+msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "Стек сверху"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard"
msgstr "Информационная панель"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Панель действия"
-msgctxt "view:dashboard.action:0"
+msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Панель действий"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Информационная панель"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Action"
msgstr "Действия панели"
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
msgid "Dashboard Actions"
msgstr "Действия панели"
diff --git a/res.xml b/res.xml
index 75d8c47..45ae887 100644
--- a/res.xml
+++ b/res.xml
@@ -15,16 +15,8 @@ this repository contains the full copyright notices and license terms. -->
<page string="Dashboard" id="dashboard" col="2">
<label name="dashboard_layout"/>
<field name="dashboard_layout"/>
- <field name="dashboard_actions" colspan="2">
- <tree string="Dashboard Actions"
- sequence="sequence" fill="1">
- <field name="act_window"/>
- </tree>
- <form string="Dashboard Action">
- <label name="act_window"/>
- <field name="act_window"/>
- </form>
- </field>
+ <field name="dashboard_actions" colspan="2"
+ view_ids="dashboard.action_view_tree_sequence"/>
</page>
</xpath>
</data>
@@ -43,16 +35,8 @@ this repository contains the full copyright notices and license terms. -->
<page string="Dashboard" id="dashboard" col="2">
<label name="dashboard_layout"/>
<field name="dashboard_layout"/>
- <field name="dashboard_actions" colspan="2">
- <tree string="Dashboard Actions"
- sequence="sequence" fill="1">
- <field name="act_window"/>
- </tree>
- <form string="Dashboard Action">
- <label name="act_window"/>
- <field name="act_window" widget="selection"/>
- </form>
- </field>
+ <field name="dashboard_actions" colspan="2"
+ view_ids="dashboard.action_view_tree_sequence"/>
</page>
</xpath>
</data>
diff --git a/setup.py b/setup.py
index 349717c..863db06 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = ['lxml']
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 81bf105..36d6daf 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_dashboard import suite
+from .test_dashboard import suite
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
index eec04a2..597a8ce 100644
--- a/tests/test_dashboard.py
+++ b/tests/test_dashboard.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 DashboardTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 500ec9b..17d12c8 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-dashboard
-Version: 2.2.0
+Version: 2.4.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index 317c8c9..435b9ef 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -16,8 +16,10 @@ setup.py
./tests/__init__.py
./tests/test_dashboard.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_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index 0860245..f54923e 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit fa3b1f290882b71a68d88e0f08de595ad8dbf66a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:53 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2ed245e..8633802 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
-Version 2.0.0 - 2010-04-26
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
+Version 2.0.0 - 2011-04-26
* Bug fixes (see mercurial logs for details)
Version 1.8.0 - 2010-11-01
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 e0e6bc1..efc2fa7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_dashboard
-Version: 2.0.0
+Version: 2.2.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -8,15 +8,17 @@ 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 :: Legal Industry
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
@@ -24,7 +26,6 @@ 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 313bd30..2c11a66 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_fr_FR': 'Tableau de bord',
'name_nl_NL': 'Prikbord',
'name_ru_RU': 'Информационная панель',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -48,12 +48,13 @@
'ir.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
- 'nl_NL.csv',
- 'ru_RU.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 f87bdd2..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"dashboard.action,act_window",0,Action,Действие,0
-field,"dashboard.action,rec_name",0,Name,Име,0
-field,"dashboard.action,sequence",0,Sequence,Последователност,0
-field,"dashboard.action,user",0,User,Потребител,0
-field,"res.user,dashboard_actions",0,Dashboard Actions,Действия на табло,0
-field,"res.user,dashboard_layout",0,Dashboard Layout,Подреждане на табло,0
-model,"dashboard.action,name",0,dashboard.action,,0
-model,"ir.action,name",act_dashboard,Dashboard,Табло,0
-model,"ir.ui.menu,name",menu_dashboard,Dashboard,Табло,0
-selection,"res.user,dashboard_layout",0,Square,Каре,0
-selection,"res.user,dashboard_layout",0,Stack Bottom,Подравнени отдолу,0
-selection,"res.user,dashboard_layout",0,Stack Left,Подарнение отляво,0
-selection,"res.user,dashboard_layout",0,Stack Right,Подравнение отдясно,0
-selection,"res.user,dashboard_layout",0,Stack Top,Подравнени отгоре,0
-view,dashboard.action,0,Dashboard,Табло,0
-view,dashboard.action,0,Dashboard Action,Действие на таблото,0
-view,dashboard.action,0,Dashboard Actions,Действия на табло,0
-view,res.user,0,Dashboard,Табло,0
-view,res.user,0,Dashboard Action,Действие на таблото,0
-view,res.user,0,Dashboard Actions,Действия на табло,0
diff --git a/dashboard.xml b/dashboard.xml
index 00071cc..36cfccf 100644
--- a/dashboard.xml
+++ b/dashboard.xml
@@ -27,9 +27,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Dashboard Actions">
- <field name="user" select="1"/>
+ <field name="user"/>
<field name="sequence"/>
- <field name="act_window" select="1"/>
+ <field name="act_window"/>
</tree>
]]>
</field>
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 48ddca8..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"dashboard.action,act_window",0,Action,Aktion,0
-field,"dashboard.action,rec_name",0,Name,Name,0
-field,"dashboard.action,sequence",0,Sequence,Reihenfolge,0
-field,"dashboard.action,user",0,User,Benutzer,0
-field,"res.user,dashboard_actions",0,Dashboard Actions,Dashboard Aktionen,0
-field,"res.user,dashboard_layout",0,Dashboard Layout,Dashboard Anordnung,0
-model,"dashboard.action,name",0,dashboard.action,Dashboard Aktion,0
-model,"ir.action,name",act_dashboard,Dashboard,Dashboard,0
-model,"ir.ui.menu,name",menu_dashboard,Dashboard,Dashboard,0
-selection,"res.user,dashboard_layout",0,Square,Rechtecke,0
-selection,"res.user,dashboard_layout",0,Stack Bottom,Stapel unten,0
-selection,"res.user,dashboard_layout",0,Stack Left,Stapel links,0
-selection,"res.user,dashboard_layout",0,Stack Right,Stapel rechts,0
-selection,"res.user,dashboard_layout",0,Stack Top,Stapel oben,0
-view,dashboard.action,0,Dashboard,Dashboard,0
-view,dashboard.action,0,Dashboard Action,Dashboard Aktion,0
-view,dashboard.action,0,Dashboard Actions,Dashboard Aktionen,0
-view,res.user,0,Dashboard,Dashboard,0
-view,res.user,0,Dashboard Action,Dashboard Aktion,0
-view,res.user,0,Dashboard Actions,Dashboard Aktionen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 136b2ba..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,20 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"dashboard.action,act_window",0,Action,Acción,1
-field,"dashboard.action,rec_name",0,Name,Nombre de Contacto,1
-field,"dashboard.action,sequence",0,Sequence,Secuencia,1
-field,"dashboard.action,user",0,User,Usuario,1
-field,"res.user,dashboard_actions",0,Dashboard Actions,Acciones del Escritorio,1
-field,"res.user,dashboard_layout",0,Dashboard Layout,Diseño del Escritorio,1
-model,"dashboard.action,name",0,dashboard.action,,0
-model,"ir.action,name",act_dashboard,Dashboard,Escritorio,1
-selection,"res.user,dashboard_layout",0,Square,Cuadrado,1
-selection,"res.user,dashboard_layout",0,Stack Bottom,Al Fondo,1
-selection,"res.user,dashboard_layout",0,Stack Left,A la Izquierda,1
-selection,"res.user,dashboard_layout",0,Stack Right,A la Derecha,1
-selection,"res.user,dashboard_layout",0,Stack Top,A la Cima,1
-view,dashboard.action,0,Dashboard,Escritorio,1
-view,dashboard.action,0,Dashboard Action,Acción del Escritorio,1
-view,dashboard.action,0,Dashboard Actions,Acción del Escritorio,1
-view,res.user,0,Dashboard,Escritorio,1
-view,res.user,0,Dashboard Action,Acción del Escritorio,1
-view,res.user,0,Dashboard Actions,Acción del Escritorio,1
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 60048e1..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,20 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"dashboard.action,act_window",0,Action,Acción,0
-field,"dashboard.action,rec_name",0,Name,Nombre,0
-field,"dashboard.action,sequence",0,Sequence,Secuencia,0
-field,"dashboard.action,user",0,User,Usuario,0
-field,"res.user,dashboard_actions",0,Dashboard Actions,Acciones del escritorio,0
-field,"res.user,dashboard_layout",0,Dashboard Layout,Organización del escritorio,0
-model,"dashboard.action,name",0,dashboard.action,dashboard.action,0
-model,"ir.action,name",act_dashboard,Dashboard,Escritorio,0
-selection,"res.user,dashboard_layout",0,Square,Ajustado,0
-selection,"res.user,dashboard_layout",0,Stack Bottom,De arriba a abajo,0
-selection,"res.user,dashboard_layout",0,Stack Left,De derecha a izquierda,0
-selection,"res.user,dashboard_layout",0,Stack Right,De izquierda a derecha,0
-selection,"res.user,dashboard_layout",0,Stack Top,De abajo a arriba,0
-view,dashboard.action,0,Dashboard,Escritorio,0
-view,dashboard.action,0,Dashboard Action,Acción del escritorio,0
-view,dashboard.action,0,Dashboard Actions,Acciones del escritorio,0
-view,res.user,0,Dashboard,Escritorio,0
-view,res.user,0,Dashboard Action,Acción del escritorio,0
-view,res.user,0,Dashboard Actions,Acciones del escritorio,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 851b005..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"dashboard.action,act_window",0,Action,Action,0
-field,"dashboard.action,rec_name",0,Name,Nom,0
-field,"dashboard.action,sequence",0,Sequence,Séquence,0
-field,"dashboard.action,user",0,User,Utilisateur,0
-field,"res.user,dashboard_actions",0,Dashboard Actions,Actions tableau de bord,0
-field,"res.user,dashboard_layout",0,Dashboard Layout,Mise en page de tableau de bord,0
-model,"dashboard.action,name",0,dashboard.action,Action tableau de bord,0
-model,"ir.action,name",act_dashboard,Dashboard,Tableau de bord,0
-model,"ir.ui.menu,name",menu_dashboard,Dashboard,Tableau de bord,0
-selection,"res.user,dashboard_layout",0,Square,Carré,0
-selection,"res.user,dashboard_layout",0,Stack Bottom,Pile bas,0
-selection,"res.user,dashboard_layout",0,Stack Left,Pile gauche,0
-selection,"res.user,dashboard_layout",0,Stack Right,Pile droite,0
-selection,"res.user,dashboard_layout",0,Stack Top,Pile haut,0
-view,dashboard.action,0,Dashboard,Tableau de bord,0
-view,dashboard.action,0,Dashboard Action,Action tableau de bord,0
-view,dashboard.action,0,Dashboard Actions,Actions tableau de bord,0
-view,res.user,0,Dashboard,Tableau de bord,0
-view,res.user,0,Dashboard Action,Action tableau de bord,0
-view,res.user,0,Dashboard Actions,Actions tableau de bord,0
diff --git a/ir.py b/ir.py
index a7630ba..97f2282 100644
--- a/ir.py
+++ b/ir.py
@@ -5,6 +5,7 @@ from lxml import etree
from trytond.model import Model, fields
from trytond.transaction import Transaction
from trytond.cache import Cache
+from trytond.pool import Pool
class View(Model):
@@ -17,7 +18,7 @@ class View(Model):
:param user: the user id
:return: an integer
'''
- model_data_obj = self.pool.get('ir.model.data')
+ model_data_obj = Pool().get('ir.model.data')
model_data_ids = model_data_obj.search([
('fs_id', '=', 'view_dashboard'),
('module', '=', 'dashboard'),
@@ -48,7 +49,7 @@ class View(Model):
:param arch: a string with the xml arch of dashboard
:return: a string with the new xml arch
'''
- user_obj = self.pool.get('res.user')
+ user_obj = Pool().get('res.user')
tree = etree.fromstring(arch)
root = tree.getroottree().getroot()
user = user_obj.browse(Transaction().user)
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..58e8015
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,83 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr "Действие"
+
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr "Последователност"
+
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr "Потребител"
+
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr "Действия на табло"
+
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr "Подреждане на табло"
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Табло"
+
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Табло"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr "Каре"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr "Подравнени отдолу"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr "Подарнение отляво"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr "Подравнение отдясно"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr "Подравнени отгоре"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard"
+msgstr "Табло"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr "Действие на таблото"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr "Действия на табло"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr "Табло"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr "Действие на таблото"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr "Действия на табло"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..3faeda9
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,79 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr ""
+
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr ""
+
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr ""
+
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr ""
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr ""
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr ""
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr ""
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr ""
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr ""
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr ""
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr ""
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..677980f
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,83 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr "Aktion"
+
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr "Reihenfolge"
+
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr "Benutzer"
+
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr "Dashboard Aktionen"
+
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr "Dashboard Anordnung"
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr "Dashboard Aktion"
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr "Rechtecke"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr "Stapel unten"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr "Stapel links"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr "Stapel rechts"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr "Stapel oben"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr "Dashboard Aktion"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr "Dashboard Aktionen"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr "Dashboard Aktion"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr "Dashboard Aktionen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..4e07230
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,102 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+#, fuzzy
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr "Acción"
+
+#, fuzzy
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+#, fuzzy
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr "Usuario"
+
+#, fuzzy
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr "Acciones del Escritorio"
+
+#, fuzzy
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr "Diseño del Escritorio"
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+#, fuzzy
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr "Cuadrado"
+
+#, fuzzy
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr "Al Fondo"
+
+#, fuzzy
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr "A la Izquierda"
+
+#, fuzzy
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr "A la Derecha"
+
+#, fuzzy
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr "A la Cima"
+
+#, fuzzy
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+#, fuzzy
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr "Acción del Escritorio"
+
+#, fuzzy
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr "Acción del Escritorio"
+
+#, fuzzy
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+#, fuzzy
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr "Acción del Escritorio"
+
+#, fuzzy
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr "Acción del Escritorio"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..54336e3
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,84 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr "Acción"
+
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr "Usuario"
+
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr "Acciones del escritorio"
+
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr "Organización del escritorio"
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr "dashboard.action"
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr "Ajustado"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr "De arriba a abajo"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr "De derecha a izquierda"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr "De izquierda a derecha"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr "De abajo a arriba"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr "Acción del escritorio"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr "Acciones del escritorio"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr "Escritorio"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr "Acción del escritorio"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr "Acciones del escritorio"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..81628fc
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,83 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr "Action"
+
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr "Séquence"
+
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr "Utilisateur"
+
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr "Actions tableau de bord"
+
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr "Mise en page de tableau de bord"
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr "Action tableau de bord"
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Tableau de bord"
+
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Tableau de bord"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr "Carré"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr "Pile bas"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr "Pile gauche"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr "Pile droite"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr "Pile haut"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard"
+msgstr "Tableau de bord"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr "Action tableau de bord"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr "Actions tableau de bord"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr "Tableau de bord"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr "Action tableau de bord"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr "Actions tableau de bord"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..a1699ad
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,83 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr "Actie"
+
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr "Reeks"
+
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr "Gebruiker"
+
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr "Prikbord acties"
+
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr "Prikbord indeling"
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Prikbord"
+
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Prikbord"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr "Rechthoek"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr "Stapel onder"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr "Stapel links"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr "Stapel rechts"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr "Stapel boven"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard"
+msgstr "Prikbord"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr "Prikbord actie"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr "Prikbord acties"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr "Prikbord"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr "Prikbord actie"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr "Prikbord acties"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..efdfc80
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,83 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:dashboard.action,act_window:0"
+msgid "Action"
+msgstr "Действие"
+
+msgctxt "field:dashboard.action,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:dashboard.action,sequence:0"
+msgid "Sequence"
+msgstr "Последовательность"
+
+msgctxt "field:dashboard.action,user:0"
+msgid "User"
+msgstr "Пользователь"
+
+msgctxt "field:res.user,dashboard_actions:0"
+msgid "Dashboard Actions"
+msgstr "Панель действий"
+
+msgctxt "field:res.user,dashboard_layout:0"
+msgid "Dashboard Layout"
+msgstr "Расположение на панели"
+
+msgctxt "model:dashboard.action,name:0"
+msgid "dashboard.action"
+msgstr "Панель действий"
+
+msgctxt "model:ir.action,name:act_dashboard"
+msgid "Dashboard"
+msgstr "Информационная панель"
+
+msgctxt "model:ir.ui.menu,name:menu_dashboard"
+msgid "Dashboard"
+msgstr "Информационная панель"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Square"
+msgstr "Квадрат"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Bottom"
+msgstr "Стек Нижний"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Left"
+msgstr "Стек слева"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Right"
+msgstr "Стек справа"
+
+msgctxt "selection:res.user,dashboard_layout:0"
+msgid "Stack Top"
+msgstr "Стек сверху"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard"
+msgstr "Информационная панель"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Action"
+msgstr "Панель действия"
+
+msgctxt "view:dashboard.action:0"
+msgid "Dashboard Actions"
+msgstr "Панель действий"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard"
+msgstr "Информационная панель"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Action"
+msgstr "Действия панели"
+
+msgctxt "view:res.user:0"
+msgid "Dashboard Actions"
+msgstr "Действия панели"
diff --git a/nl_NL.csv b/nl_NL.csv
deleted file mode 100644
index 24cbb36..0000000
--- a/nl_NL.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"dashboard.action,act_window",0,Action,Actie,0
-field,"dashboard.action,rec_name",0,Name,Naam,0
-field,"dashboard.action,sequence",0,Sequence,Reeks,0
-field,"dashboard.action,user",0,User,Gebruiker,0
-field,"res.user,dashboard_actions",0,Dashboard Actions,Prikbord acties,0
-field,"res.user,dashboard_layout",0,Dashboard Layout,Prikbord indeling,0
-model,"dashboard.action,name",0,dashboard.action,,0
-model,"ir.action,name",act_dashboard,Dashboard,Prikbord,0
-model,"ir.ui.menu,name",menu_dashboard,Dashboard,Prikbord,0
-selection,"res.user,dashboard_layout",0,Square,Rechthoek,0
-selection,"res.user,dashboard_layout",0,Stack Bottom,Stapel onder,0
-selection,"res.user,dashboard_layout",0,Stack Left,Stapel links,0
-selection,"res.user,dashboard_layout",0,Stack Right,Stapel rechts,0
-selection,"res.user,dashboard_layout",0,Stack Top,Stapel boven,0
-view,dashboard.action,0,Dashboard,Prikbord,0
-view,dashboard.action,0,Dashboard Action,Prikbord actie,0
-view,dashboard.action,0,Dashboard Actions,Prikbord acties,0
-view,res.user,0,Dashboard,Prikbord,0
-view,res.user,0,Dashboard Action,Prikbord actie,0
-view,res.user,0,Dashboard Actions,Prikbord acties,0
diff --git a/res.xml b/res.xml
index 46a6a4a..75d8c47 100644
--- a/res.xml
+++ b/res.xml
@@ -18,7 +18,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="dashboard_actions" colspan="2">
<tree string="Dashboard Actions"
sequence="sequence" fill="1">
- <field name="act_window" select="1"/>
+ <field name="act_window"/>
</tree>
<form string="Dashboard Action">
<label name="act_window"/>
@@ -46,7 +46,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="dashboard_actions" colspan="2">
<tree string="Dashboard Actions"
sequence="sequence" fill="1">
- <field name="act_window" select="1"/>
+ <field name="act_window"/>
</tree>
<form string="Dashboard Action">
<label name="act_window"/>
diff --git a/ru_RU.csv b/ru_RU.csv
deleted file mode 100644
index 8a9c76f..0000000
--- a/ru_RU.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"dashboard.action,act_window",0,Action,Действие,0
-field,"dashboard.action,rec_name",0,Name,Наименование,0
-field,"dashboard.action,sequence",0,Sequence,Последовательность,0
-field,"dashboard.action,user",0,User,Пользователь,0
-field,"res.user,dashboard_actions",0,Dashboard Actions,Панель действий,0
-field,"res.user,dashboard_layout",0,Dashboard Layout,Расположение на панели,0
-model,"dashboard.action,name",0,dashboard.action,Панель действий,0
-model,"ir.action,name",act_dashboard,Dashboard,Информационная панель,0
-model,"ir.ui.menu,name",menu_dashboard,Dashboard,Информационная панель,0
-selection,"res.user,dashboard_layout",0,Square,Квадрат,0
-selection,"res.user,dashboard_layout",0,Stack Bottom,Стек Нижний,0
-selection,"res.user,dashboard_layout",0,Stack Left,Стек слева,0
-selection,"res.user,dashboard_layout",0,Stack Right,Стек справа,0
-selection,"res.user,dashboard_layout",0,Stack Top,Стек сверху,0
-view,dashboard.action,0,Dashboard,Информационная панель,0
-view,dashboard.action,0,Dashboard Action,Панель действия,0
-view,dashboard.action,0,Dashboard Actions,Панель действий,0
-view,res.user,0,Dashboard,Информационная панель,0
-view,res.user,0,Dashboard Action,Действия панели,0
-view,res.user,0,Dashboard Actions,Действия панели,0
diff --git a/setup.py b/setup.py
index 9fb47ce..349717c 100644
--- a/setup.py
+++ b/setup.py
@@ -39,10 +39,12 @@ setup(name='trytond_dashboard',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
@@ -50,7 +52,6 @@ setup(name='trytond_dashboard',
'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/__init__.pyc b/tests/__init__.pyc
deleted file mode 100644
index f135a2c..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
index c1ab3f2..eec04a2 100644
--- a/tests/test_dashboard.py
+++ b/tests/test_dashboard.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 DashboardTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class DashboardTestCase(unittest.TestCase):
'''
test_view('dashboard')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/tests/test_dashboard.pyc b/tests/test_dashboard.pyc
deleted file mode 100644
index 2323b21..0000000
Binary files a/tests/test_dashboard.pyc and /dev/null differ
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 04a3487..500ec9b 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-dashboard
-Version: 2.0.0
+Version: 2.2.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -8,15 +8,17 @@ 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 :: Legal Industry
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
@@ -24,7 +26,6 @@ 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_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index 25afbde..317c8c9 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -4,16 +4,9 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
dashboard.xml
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
ir.xml
-nl_NL.csv
res.xml
-ru_RU.csv
setup.py
./__init__.py
./__tryton__.py
@@ -22,10 +15,14 @@ setup.py
./res.py
./tests/__init__.py
./tests/test_dashboard.py
-tests/__init__.py
-tests/__init__.pyc
-tests/test_dashboard.py
-tests/test_dashboard.pyc
+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_dashboard.egg-info/PKG-INFO
trytond_dashboard.egg-info/SOURCES.txt
trytond_dashboard.egg-info/dependency_links.txt
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index 756191d..0860245 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 5022a6f57c873b46a7b2ae4d89fb3a96906a8433
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:48 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8be7c7f..2ed245e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2010-04-26
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
* Remove required on dashboard_layout to allow XML user creation
diff --git a/COPYRIGHT b/COPYRIGHT
index 6e6811c..1245dd5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2010 Cédric Krier.
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-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 d391555..e0e6bc1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_dashboard
-Version: 1.8.0
+Version: 2.0.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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
@@ -16,10 +16,15 @@ Classifier: Environment :: Plugins
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+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
+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 b0d7587..313bd30 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -1,18 +1,25 @@
+# -*- coding: utf-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.
{
'name': 'Dashboard',
+ 'name_bg_BG': 'Табло',
'name_de_DE': 'Dashboard',
'name_es_CO': 'Escritorio',
'name_es_ES': 'Escritorio',
'name_fr_FR': 'Tableau de bord',
- 'version': '1.8.0',
+ 'name_nl_NL': 'Prikbord',
+ 'name_ru_RU': 'Информационная панель',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Dashboard:
- Allow to create a personalized dashboard.
''',
+ 'description_bg_BG': '''Табло:
+ - Позволява създаване на перосонализирани табла.
+''',
'description_de_DE': '''Dashboard:
- Ermöglicht die Einrichtung einer personalisierten Startseite.
''',
@@ -25,6 +32,12 @@
'description_fr_FR': '''Tableau de bord
- Permet de créer un tableau de bord personalisé.
''',
+ 'description_nl_NL': '''Prikbord:
+ - Maakt een persoonlijk prikbord mogelijk.
+''',
+ 'description_ru_RU': '''Информационная панель:
+ - позволяет создавать персональные панели.
+''',
'depends': [
'ir',
'res',
@@ -35,9 +48,12 @@
'ir.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
+ 'nl_NL.csv',
+ 'ru_RU.csv',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..f87bdd2
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,21 @@
+type,name,res_id,src,value,fuzzy
+field,"dashboard.action,act_window",0,Action,Действие,0
+field,"dashboard.action,rec_name",0,Name,Име,0
+field,"dashboard.action,sequence",0,Sequence,Последователност,0
+field,"dashboard.action,user",0,User,Потребител,0
+field,"res.user,dashboard_actions",0,Dashboard Actions,Действия на табло,0
+field,"res.user,dashboard_layout",0,Dashboard Layout,Подреждане на табло,0
+model,"dashboard.action,name",0,dashboard.action,,0
+model,"ir.action,name",act_dashboard,Dashboard,Табло,0
+model,"ir.ui.menu,name",menu_dashboard,Dashboard,Табло,0
+selection,"res.user,dashboard_layout",0,Square,Каре,0
+selection,"res.user,dashboard_layout",0,Stack Bottom,Подравнени отдолу,0
+selection,"res.user,dashboard_layout",0,Stack Left,Подарнение отляво,0
+selection,"res.user,dashboard_layout",0,Stack Right,Подравнение отдясно,0
+selection,"res.user,dashboard_layout",0,Stack Top,Подравнени отгоре,0
+view,dashboard.action,0,Dashboard,Табло,0
+view,dashboard.action,0,Dashboard Action,Действие на таблото,0
+view,dashboard.action,0,Dashboard Actions,Действия на табло,0
+view,res.user,0,Dashboard,Табло,0
+view,res.user,0,Dashboard Action,Действие на таблото,0
+view,res.user,0,Dashboard Actions,Действия на табло,0
diff --git a/dashboard.py b/dashboard.py
index 6982be9..9cd4a62 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -11,7 +11,10 @@ class DashboardAction(ModelSQL, ModelView):
select=1)
sequence = fields.Integer('Sequence')
act_window = fields.Many2One('ir.action.act_window', 'Action',
- required=True)
+ required=True, ondelete='CASCADE', domain=[
+ ('res_model', '!=', False),
+ ('res_model', '!=', ''),
+ ])
def __init__(self):
super(DashboardAction, self).__init__()
diff --git a/ir.xml b/ir.xml
index a46cb47..554a3c7 100644
--- a/ir.xml
+++ b/ir.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
<data>
<record model="ir.ui.view" id="view_dashboard">
- <field name="model">dashboard.action</field>
+ <field name="model"></field>
<field name="type">board</field>
<field name="arch" type="xml">
<![CDATA[
@@ -16,9 +16,8 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.action.act_window" id="act_dashboard">
<field name="name">Dashboard</field>
- <field name="res_model">dashboard.action</field>
+ <field name="res_model"></field>
<field name="type">ir.action.act_window</field>
- <field name="view_type">board</field>
</record>
<record model="ir.action.act_window.view" id="act_dashboard_view1">
<field name="sequence" eval="1"/>
diff --git a/nl_NL.csv b/nl_NL.csv
new file mode 100644
index 0000000..24cbb36
--- /dev/null
+++ b/nl_NL.csv
@@ -0,0 +1,21 @@
+type,name,res_id,src,value,fuzzy
+field,"dashboard.action,act_window",0,Action,Actie,0
+field,"dashboard.action,rec_name",0,Name,Naam,0
+field,"dashboard.action,sequence",0,Sequence,Reeks,0
+field,"dashboard.action,user",0,User,Gebruiker,0
+field,"res.user,dashboard_actions",0,Dashboard Actions,Prikbord acties,0
+field,"res.user,dashboard_layout",0,Dashboard Layout,Prikbord indeling,0
+model,"dashboard.action,name",0,dashboard.action,,0
+model,"ir.action,name",act_dashboard,Dashboard,Prikbord,0
+model,"ir.ui.menu,name",menu_dashboard,Dashboard,Prikbord,0
+selection,"res.user,dashboard_layout",0,Square,Rechthoek,0
+selection,"res.user,dashboard_layout",0,Stack Bottom,Stapel onder,0
+selection,"res.user,dashboard_layout",0,Stack Left,Stapel links,0
+selection,"res.user,dashboard_layout",0,Stack Right,Stapel rechts,0
+selection,"res.user,dashboard_layout",0,Stack Top,Stapel boven,0
+view,dashboard.action,0,Dashboard,Prikbord,0
+view,dashboard.action,0,Dashboard Action,Prikbord actie,0
+view,dashboard.action,0,Dashboard Actions,Prikbord acties,0
+view,res.user,0,Dashboard,Prikbord,0
+view,res.user,0,Dashboard Action,Prikbord actie,0
+view,res.user,0,Dashboard Actions,Prikbord acties,0
diff --git a/ru_RU.csv b/ru_RU.csv
new file mode 100644
index 0000000..8a9c76f
--- /dev/null
+++ b/ru_RU.csv
@@ -0,0 +1,21 @@
+type,name,res_id,src,value,fuzzy
+field,"dashboard.action,act_window",0,Action,Действие,0
+field,"dashboard.action,rec_name",0,Name,Наименование,0
+field,"dashboard.action,sequence",0,Sequence,Последовательность,0
+field,"dashboard.action,user",0,User,Пользователь,0
+field,"res.user,dashboard_actions",0,Dashboard Actions,Панель действий,0
+field,"res.user,dashboard_layout",0,Dashboard Layout,Расположение на панели,0
+model,"dashboard.action,name",0,dashboard.action,Панель действий,0
+model,"ir.action,name",act_dashboard,Dashboard,Информационная панель,0
+model,"ir.ui.menu,name",menu_dashboard,Dashboard,Информационная панель,0
+selection,"res.user,dashboard_layout",0,Square,Квадрат,0
+selection,"res.user,dashboard_layout",0,Stack Bottom,Стек Нижний,0
+selection,"res.user,dashboard_layout",0,Stack Left,Стек слева,0
+selection,"res.user,dashboard_layout",0,Stack Right,Стек справа,0
+selection,"res.user,dashboard_layout",0,Stack Top,Стек сверху,0
+view,dashboard.action,0,Dashboard,Информационная панель,0
+view,dashboard.action,0,Dashboard Action,Панель действия,0
+view,dashboard.action,0,Dashboard Actions,Панель действий,0
+view,res.user,0,Dashboard,Информационная панель,0
+view,res.user,0,Dashboard Action,Действия панели,0
+view,res.user,0,Dashboard Actions,Действия панели,0
diff --git a/setup.py b/setup.py
index 6612a38..9fb47ce 100644
--- a/setup.py
+++ b/setup.py
@@ -42,12 +42,17 @@ setup(name='trytond_dashboard',
'Intended Audience :: Developers',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
+ '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',
+ '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_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 428592d..04a3487 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-dashboard
-Version: 1.8.0
+Version: 2.0.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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
@@ -16,10 +16,15 @@ Classifier: Environment :: Plugins
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+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
+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_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index 1551f5c..25afbde 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -4,13 +4,16 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
dashboard.xml
de_DE.csv
es_CO.csv
es_ES.csv
fr_FR.csv
ir.xml
+nl_NL.csv
res.xml
+ru_RU.csv
setup.py
./__init__.py
./__tryton__.py
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index b9b03a6..756191d 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 4838626cadd95e28f05394db38025865a9548011
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:19 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index c929537..8be7c7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+* Remove required on dashboard_layout to allow XML user creation
+
Version 1.6.0 - 2010-05-09
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index eabdbf4..63a221b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_dashboard
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* lxml (http://codespeak.net/lxml/)
* trytond (http://www.tryton.org/)
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 99dc863..d391555 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_dashboard
-Version: 1.6.0
+Version: 1.8.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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 e008e8e..b0d7587 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Escritorio',
'name_es_ES': 'Escritorio',
'name_fr_FR': 'Tableau de bord',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/fr_FR.csv b/fr_FR.csv
index 455a3b6..851b005 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -7,6 +7,7 @@ field,"res.user,dashboard_actions",0,Dashboard Actions,Actions tableau de bord,0
field,"res.user,dashboard_layout",0,Dashboard Layout,Mise en page de tableau de bord,0
model,"dashboard.action,name",0,dashboard.action,Action tableau de bord,0
model,"ir.action,name",act_dashboard,Dashboard,Tableau de bord,0
+model,"ir.ui.menu,name",menu_dashboard,Dashboard,Tableau de bord,0
selection,"res.user,dashboard_layout",0,Square,Carré,0
selection,"res.user,dashboard_layout",0,Stack Bottom,Pile bas,0
selection,"res.user,dashboard_layout",0,Stack Left,Pile gauche,0
diff --git a/ir.py b/ir.py
index 45450ce..a7630ba 100644
--- a/ir.py
+++ b/ir.py
@@ -1,78 +1,67 @@
#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 Model, fields
-from trytond.tools import Cache
-from lxml import etree
import math
+from lxml import etree
+from trytond.model import Model, fields
+from trytond.transaction import Transaction
+from trytond.cache import Cache
class View(Model):
_name = 'ir.ui.view'
- def dashboard_id(self, cursor, user, context=None):
+ def dashboard_id(self):
'''
Return the database id of view_dashboard
- :param cursor: the database cursor
:param user: the user id
- :param context: the context
:return: an integer
'''
model_data_obj = self.pool.get('ir.model.data')
- model_data_ids = model_data_obj.search(cursor, user, [
+ model_data_ids = model_data_obj.search([
('fs_id', '=', 'view_dashboard'),
('module', '=', 'dashboard'),
('inherit', '=', False),
- ], limit=1, context=context)
+ ], limit=1)
if not model_data_ids:
return 0
- model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
- context=context)
+ model_data = model_data_obj.browse(model_data_ids[0])
return model_data.db_id
dashboard_id = Cache('ir.ui.view.dashboard_id')(dashboard_id)
- def _dashboard_element_action(self, cursor, user, action,
- context=None):
+ def _dashboard_element_action(self, action):
'''
Return etree Element for the given dashboard action.
- :param cursor: the database cursor
- :param user: the user id
:param action: a BrowseRecord of dashboard.action
- :param context: the context
:return: an etree Element
'''
return etree.Element('action', {
'name': str(action.act_window.id),
})
- def dashboard_view(self, cursor, user_id, arch, context=None):
+ def dashboard_view(self, arch):
'''
Add action to view arch of dashboard
- :param cursor: the database cursor
- :param user_id: the user id
:param arch: a string with the xml arch of dashboard
- :param context: the context
:return: a string with the new xml arch
'''
user_obj = self.pool.get('res.user')
tree = etree.fromstring(arch)
root = tree.getroottree().getroot()
- user = user_obj.browse(cursor, user_id, user_id, context=context)
+ user = user_obj.browse(Transaction().user)
if user.dashboard_layout == 'square':
root.set('col', str(int(math.ceil(math.sqrt(
len(user.dashboard_actions))))))
for action in user.dashboard_actions:
- root.append(self._dashboard_element_action(cursor,
- user_id, action, context=context))
+ root.append(self._dashboard_element_action(action))
elif user.dashboard_layout == 'stack_right':
group = None
root.set('col', '2')
for action in user.dashboard_actions:
- element = self._dashboard_element_action(cursor,
- user_id, action, context=context)
+ element = self._dashboard_element_action(action)
if group is None:
root.append(element)
group = etree.Element('group', {
@@ -89,8 +78,7 @@ class View(Model):
root.append(group)
first = True
for action in user.dashboard_actions:
- element = self._dashboard_element_action(cursor,
- user_id, action, context=context)
+ element = self._dashboard_element_action(action)
if first:
first = False
root.append(element)
@@ -105,8 +93,7 @@ class View(Model):
root.append(group)
first = True
for action in user.dashboard_actions:
- element = self._dashboard_element_action(cursor,
- user_id, action, context=context)
+ element = self._dashboard_element_action(action)
if first:
first = False
root.append(element)
@@ -120,8 +107,7 @@ class View(Model):
})
first = True
for action in user.dashboard_actions:
- element = self._dashboard_element_action(cursor,
- user_id, action, context=context)
+ element = self._dashboard_element_action(action)
if first:
first = False
root.append(element)
@@ -131,26 +117,23 @@ class View(Model):
arch = etree.tostring(tree, encoding='utf-8')
return arch
- def read(self, cursor, user, ids, fields_names=None, context=None):
- res = super(View, self).read(cursor, user, ids,
- fields_names=fields_names, context=context)
- if user == 0:
+ def read(self, ids, fields_names=None):
+ res = super(View, self).read(ids, fields_names=fields_names)
+ if Transaction().user == 0:
return res
- dashboard_id = self.dashboard_id(cursor, user, context=context)
+ dashboard_id = self.dashboard_id()
if not dashboard_id:
# Restart the cache
- self.dashboard_id(cursor.dbname)
+ self.dashboard_id.reset()
if fields_names is None \
or 'arch' in fields_names:
- if isinstance(ids, (int, long)) \
- and dashboard_id == ids:
- res['arch'] = self.dashboard_view(cursor, user, res['arch'],
- context=context)
+ if isinstance(ids, (int, long)):
+ if dashboard_id == ids:
+ res['arch'] = self.dashboard_view(res['arch'])
elif dashboard_id in ids:
for res2 in res:
if res2['id'] == dashboard_id:
- res2['arch'] = self.dashboard_view(cursor, user,
- res2['arch'], context=context)
+ res2['arch'] = self.dashboard_view(res2['arch'])
return res
View()
diff --git a/res.py b/res.py
index 339b212..d16899b 100644
--- a/res.py
+++ b/res.py
@@ -1,6 +1,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.
from trytond.model import Model, fields
+from trytond.backend import TableHandler
+from trytond.transaction import Transaction
class User(Model):
@@ -12,7 +14,7 @@ class User(Model):
('stack_left', 'Stack Left'),
('stack_top', 'Stack Top'),
('stack_bottom', 'Stack Bottom'),
- ], string='Dashboard Layout', required=True)
+ ], string='Dashboard Layout')
dashboard_actions = fields.One2Many('dashboard.action', 'user',
'Dashboard Actions')
@@ -23,7 +25,15 @@ class User(Model):
'dashboard_actions',
]
- def default_dashboard_layout(self, cursor, user, context=None):
+ def init(self, module_name):
+ super(User, self).init(module_name)
+ cursor = Transaction().cursor
+ table = TableHandler(cursor, self, module_name)
+
+ # Migration from 1.6
+ table.not_null_action('dashboard_layout', action='remove')
+
+ def default_dashboard_layout(self):
return 'square'
User()
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
index ce3a0b6..c1ab3f2 100644
--- a/tests/test_dashboard.py
+++ b/tests/test_dashboard.py
@@ -25,7 +25,7 @@ class DashboardTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('dashboard'))
+ test_view('dashboard')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/tests/test_dashboard.pyc b/tests/test_dashboard.pyc
index 02c7487..2323b21 100644
Binary files a/tests/test_dashboard.pyc and b/tests/test_dashboard.pyc differ
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 27e49c9..428592d 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-dashboard
-Version: 1.6.0
+Version: 1.8.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index ce529a5..b9b03a6 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 5638f291b8340f9402d7a9ddfa7fd6271997dc22
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Mon May 10 23:21:51 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0d1d17e..c929537 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.6.0 - 2010-05-09
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2010-03-11
* Initial release
diff --git a/INSTALL b/INSTALL
index bedbec0..eabdbf4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,6 +5,7 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
+ * lxml (http://codespeak.net/lxml/)
* trytond (http://www.tryton.org/)
Installation
diff --git a/PKG-INFO b/PKG-INFO
index 749f54b..99dc863 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_dashboard
-Version: 1.4.0
+Version: 1.6.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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 39f1975..e008e8e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Escritorio',
'name_es_ES': 'Escritorio',
'name_fr_FR': 'Tableau de bord',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index fd903eb..48ddca8 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -7,6 +7,7 @@ field,"res.user,dashboard_actions",0,Dashboard Actions,Dashboard Aktionen,0
field,"res.user,dashboard_layout",0,Dashboard Layout,Dashboard Anordnung,0
model,"dashboard.action,name",0,dashboard.action,Dashboard Aktion,0
model,"ir.action,name",act_dashboard,Dashboard,Dashboard,0
+model,"ir.ui.menu,name",menu_dashboard,Dashboard,Dashboard,0
selection,"res.user,dashboard_layout",0,Square,Rechtecke,0
selection,"res.user,dashboard_layout",0,Stack Bottom,Stapel unten,0
selection,"res.user,dashboard_layout",0,Stack Left,Stapel links,0
diff --git a/ir.xml b/ir.xml
index c638833..a46cb47 100644
--- a/ir.xml
+++ b/ir.xml
@@ -26,5 +26,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_window" ref="act_dashboard"/>
</record>
+ <menuitem id="menu_dashboard" action="act_dashboard"
+ sequence="9"/>
+
</data>
</tryton>
diff --git a/setup.py b/setup.py
index 9f844b3..6612a38 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = []
+requires = ['lxml']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -30,6 +30,7 @@ setup(name='trytond_dashboard',
package_dir={'trytond.modules.dashboard': '.'},
packages=[
'trytond.modules.dashboard',
+ 'trytond.modules.dashboard.tests',
],
package_data={
'trytond.modules.dashboard': info.get('xml', []) \
@@ -56,4 +57,6 @@ setup(name='trytond_dashboard',
[trytond.modules]
dashboard = trytond.modules.dashboard
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 8be071b..81bf105 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_dashboard import *
+from test_dashboard import suite
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
index d42d48c..f135a2c 100644
Binary files a/tests/__init__.pyc and b/tests/__init__.pyc differ
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
index 030b7e7..ce3a0b6 100644
--- a/tests/test_dashboard.py
+++ b/tests/test_dashboard.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 DashboardTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class DashboardTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('dashboard'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(DashboardTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ DashboardTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteDashboard = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteDashboard])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tests/test_dashboard.pyc b/tests/test_dashboard.pyc
index a28621b..02c7487 100644
Binary files a/tests/test_dashboard.pyc and b/tests/test_dashboard.pyc differ
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 199c33f..27e49c9 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-dashboard
-Version: 1.4.0
+Version: 1.6.0
Summary: Dashboard:
- Allow to create a personalized dashboard.
@@ -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_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index 510c2b0..1551f5c 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -17,6 +17,8 @@ setup.py
./dashboard.py
./ir.py
./res.py
+./tests/__init__.py
+./tests/test_dashboard.py
tests/__init__.py
tests/__init__.pyc
tests/test_dashboard.py
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index 1f27225..ce529a5 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1 +1,2 @@
-trytond >= 1.4, < 1.5
\ No newline at end of file
+lxml
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 6a3d51f4e12d539c1c483edc2a6a1bf1c26e75e6
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 14 13:38:45 2010 +0100
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..0d1d17e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2010-03-11
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..6e6811c
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2009-2010 Cédric Krier.
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 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..bedbec0
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,29 @@
+Installing trytond_dashboard
+============================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_dashboard 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 dashboard.
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..749f54b
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_dashboard
+Version: 1.4.0
+Summary: Dashboard:
+ - Allow to create a personalized dashboard.
+
+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 :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+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: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..04e7777
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_dashboard
+=================
+
+The dashboard 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..d8a2b38
--- /dev/null
+++ b/__init__.py
@@ -0,0 +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 dashboard import *
+from res import *
+from ir import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..39f1975
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,43 @@
+#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': 'Dashboard',
+ 'name_de_DE': 'Dashboard',
+ 'name_es_CO': 'Escritorio',
+ 'name_es_ES': 'Escritorio',
+ 'name_fr_FR': 'Tableau de bord',
+ 'version': '1.4.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Dashboard:
+ - Allow to create a personalized dashboard.
+''',
+ 'description_de_DE': '''Dashboard:
+ - Ermöglicht die Einrichtung einer personalisierten Startseite.
+''',
+ 'description_es_CO': '''Escritorio:
+ - Permite la creación de una página de inicio personalizada.
+''',
+ 'description_es_ES': '''Escritorio:
+ - Permite la creación de una página de inicio personalizada.
+''',
+ 'description_fr_FR': '''Tableau de bord
+ - Permet de créer un tableau de bord personalisé.
+''',
+ 'depends': [
+ 'ir',
+ 'res',
+ ],
+ 'xml': [
+ 'dashboard.xml',
+ 'res.xml',
+ 'ir.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/dashboard.py b/dashboard.py
new file mode 100644
index 0000000..6982be9
--- /dev/null
+++ b/dashboard.py
@@ -0,0 +1,20 @@
+#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
+
+
+class DashboardAction(ModelSQL, ModelView):
+ "Dashboard Action"
+ _name = "dashboard.action"
+
+ user = fields.Many2One('res.user', 'User', required=True,
+ select=1)
+ sequence = fields.Integer('Sequence')
+ act_window = fields.Many2One('ir.action.act_window', 'Action',
+ required=True)
+
+ def __init__(self):
+ super(DashboardAction, self).__init__()
+ self._order.insert(0, ('sequence', 'ASC'))
+
+DashboardAction()
diff --git a/dashboard.xml b/dashboard.xml
new file mode 100644
index 0000000..00071cc
--- /dev/null
+++ b/dashboard.xml
@@ -0,0 +1,39 @@
+<?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="action_view_form">
+ <field name="model">dashboard.action</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Dashboard Action">
+ <label name="user"/>
+ <field name="user"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <label name="act_window"/>
+ <field name="act_window"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="action_view_tree">
+ <field name="model">dashboard.action</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Dashboard Actions">
+ <field name="user" select="1"/>
+ <field name="sequence"/>
+ <field name="act_window" select="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+ </data>
+</tryton>
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..fd903eb
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,20 @@
+type,name,res_id,src,value,fuzzy
+field,"dashboard.action,act_window",0,Action,Aktion,0
+field,"dashboard.action,rec_name",0,Name,Name,0
+field,"dashboard.action,sequence",0,Sequence,Reihenfolge,0
+field,"dashboard.action,user",0,User,Benutzer,0
+field,"res.user,dashboard_actions",0,Dashboard Actions,Dashboard Aktionen,0
+field,"res.user,dashboard_layout",0,Dashboard Layout,Dashboard Anordnung,0
+model,"dashboard.action,name",0,dashboard.action,Dashboard Aktion,0
+model,"ir.action,name",act_dashboard,Dashboard,Dashboard,0
+selection,"res.user,dashboard_layout",0,Square,Rechtecke,0
+selection,"res.user,dashboard_layout",0,Stack Bottom,Stapel unten,0
+selection,"res.user,dashboard_layout",0,Stack Left,Stapel links,0
+selection,"res.user,dashboard_layout",0,Stack Right,Stapel rechts,0
+selection,"res.user,dashboard_layout",0,Stack Top,Stapel oben,0
+view,dashboard.action,0,Dashboard,Dashboard,0
+view,dashboard.action,0,Dashboard Action,Dashboard Aktion,0
+view,dashboard.action,0,Dashboard Actions,Dashboard Aktionen,0
+view,res.user,0,Dashboard,Dashboard,0
+view,res.user,0,Dashboard Action,Dashboard Aktion,0
+view,res.user,0,Dashboard Actions,Dashboard Aktionen,0
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..136b2ba
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,20 @@
+type,name,res_id,src,value,fuzzy
+field,"dashboard.action,act_window",0,Action,Acción,1
+field,"dashboard.action,rec_name",0,Name,Nombre de Contacto,1
+field,"dashboard.action,sequence",0,Sequence,Secuencia,1
+field,"dashboard.action,user",0,User,Usuario,1
+field,"res.user,dashboard_actions",0,Dashboard Actions,Acciones del Escritorio,1
+field,"res.user,dashboard_layout",0,Dashboard Layout,Diseño del Escritorio,1
+model,"dashboard.action,name",0,dashboard.action,,0
+model,"ir.action,name",act_dashboard,Dashboard,Escritorio,1
+selection,"res.user,dashboard_layout",0,Square,Cuadrado,1
+selection,"res.user,dashboard_layout",0,Stack Bottom,Al Fondo,1
+selection,"res.user,dashboard_layout",0,Stack Left,A la Izquierda,1
+selection,"res.user,dashboard_layout",0,Stack Right,A la Derecha,1
+selection,"res.user,dashboard_layout",0,Stack Top,A la Cima,1
+view,dashboard.action,0,Dashboard,Escritorio,1
+view,dashboard.action,0,Dashboard Action,Acción del Escritorio,1
+view,dashboard.action,0,Dashboard Actions,Acción del Escritorio,1
+view,res.user,0,Dashboard,Escritorio,1
+view,res.user,0,Dashboard Action,Acción del Escritorio,1
+view,res.user,0,Dashboard Actions,Acción del Escritorio,1
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..60048e1
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,20 @@
+type,name,res_id,src,value,fuzzy
+field,"dashboard.action,act_window",0,Action,Acción,0
+field,"dashboard.action,rec_name",0,Name,Nombre,0
+field,"dashboard.action,sequence",0,Sequence,Secuencia,0
+field,"dashboard.action,user",0,User,Usuario,0
+field,"res.user,dashboard_actions",0,Dashboard Actions,Acciones del escritorio,0
+field,"res.user,dashboard_layout",0,Dashboard Layout,Organización del escritorio,0
+model,"dashboard.action,name",0,dashboard.action,dashboard.action,0
+model,"ir.action,name",act_dashboard,Dashboard,Escritorio,0
+selection,"res.user,dashboard_layout",0,Square,Ajustado,0
+selection,"res.user,dashboard_layout",0,Stack Bottom,De arriba a abajo,0
+selection,"res.user,dashboard_layout",0,Stack Left,De derecha a izquierda,0
+selection,"res.user,dashboard_layout",0,Stack Right,De izquierda a derecha,0
+selection,"res.user,dashboard_layout",0,Stack Top,De abajo a arriba,0
+view,dashboard.action,0,Dashboard,Escritorio,0
+view,dashboard.action,0,Dashboard Action,Acción del escritorio,0
+view,dashboard.action,0,Dashboard Actions,Acciones del escritorio,0
+view,res.user,0,Dashboard,Escritorio,0
+view,res.user,0,Dashboard Action,Acción del escritorio,0
+view,res.user,0,Dashboard Actions,Acciones del escritorio,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..455a3b6
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,20 @@
+type,name,res_id,src,value,fuzzy
+field,"dashboard.action,act_window",0,Action,Action,0
+field,"dashboard.action,rec_name",0,Name,Nom,0
+field,"dashboard.action,sequence",0,Sequence,Séquence,0
+field,"dashboard.action,user",0,User,Utilisateur,0
+field,"res.user,dashboard_actions",0,Dashboard Actions,Actions tableau de bord,0
+field,"res.user,dashboard_layout",0,Dashboard Layout,Mise en page de tableau de bord,0
+model,"dashboard.action,name",0,dashboard.action,Action tableau de bord,0
+model,"ir.action,name",act_dashboard,Dashboard,Tableau de bord,0
+selection,"res.user,dashboard_layout",0,Square,Carré,0
+selection,"res.user,dashboard_layout",0,Stack Bottom,Pile bas,0
+selection,"res.user,dashboard_layout",0,Stack Left,Pile gauche,0
+selection,"res.user,dashboard_layout",0,Stack Right,Pile droite,0
+selection,"res.user,dashboard_layout",0,Stack Top,Pile haut,0
+view,dashboard.action,0,Dashboard,Tableau de bord,0
+view,dashboard.action,0,Dashboard Action,Action tableau de bord,0
+view,dashboard.action,0,Dashboard Actions,Actions tableau de bord,0
+view,res.user,0,Dashboard,Tableau de bord,0
+view,res.user,0,Dashboard Action,Action tableau de bord,0
+view,res.user,0,Dashboard Actions,Actions tableau de bord,0
diff --git a/ir.py b/ir.py
new file mode 100644
index 0000000..45450ce
--- /dev/null
+++ b/ir.py
@@ -0,0 +1,156 @@
+#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 Model, fields
+from trytond.tools import Cache
+from lxml import etree
+import math
+
+
+class View(Model):
+ _name = 'ir.ui.view'
+
+ def dashboard_id(self, cursor, user, context=None):
+ '''
+ Return the database id of view_dashboard
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param context: the context
+ :return: an integer
+ '''
+ model_data_obj = self.pool.get('ir.model.data')
+ model_data_ids = model_data_obj.search(cursor, user, [
+ ('fs_id', '=', 'view_dashboard'),
+ ('module', '=', 'dashboard'),
+ ('inherit', '=', False),
+ ], limit=1, context=context)
+ if not model_data_ids:
+ return 0
+ model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
+ context=context)
+ return model_data.db_id
+
+ dashboard_id = Cache('ir.ui.view.dashboard_id')(dashboard_id)
+
+ def _dashboard_element_action(self, cursor, user, action,
+ context=None):
+ '''
+ Return etree Element for the given dashboard action.
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param action: a BrowseRecord of dashboard.action
+ :param context: the context
+ :return: an etree Element
+ '''
+ return etree.Element('action', {
+ 'name': str(action.act_window.id),
+ })
+
+ def dashboard_view(self, cursor, user_id, arch, context=None):
+ '''
+ Add action to view arch of dashboard
+
+ :param cursor: the database cursor
+ :param user_id: the user id
+ :param arch: a string with the xml arch of dashboard
+ :param context: the context
+ :return: a string with the new xml arch
+ '''
+ user_obj = self.pool.get('res.user')
+ tree = etree.fromstring(arch)
+ root = tree.getroottree().getroot()
+ user = user_obj.browse(cursor, user_id, user_id, context=context)
+ if user.dashboard_layout == 'square':
+ root.set('col', str(int(math.ceil(math.sqrt(
+ len(user.dashboard_actions))))))
+ for action in user.dashboard_actions:
+ root.append(self._dashboard_element_action(cursor,
+ user_id, action, context=context))
+ elif user.dashboard_layout == 'stack_right':
+ group = None
+ root.set('col', '2')
+ for action in user.dashboard_actions:
+ element = self._dashboard_element_action(cursor,
+ user_id, action, context=context)
+ if group is None:
+ root.append(element)
+ group = etree.Element('group', {
+ 'col': '1',
+ })
+ root.append(group)
+ else:
+ group.append(element)
+ elif user.dashboard_layout == 'stack_left':
+ root.set('col', '2')
+ group = etree.Element('group', {
+ 'col': '1',
+ })
+ root.append(group)
+ first = True
+ for action in user.dashboard_actions:
+ element = self._dashboard_element_action(cursor,
+ user_id, action, context=context)
+ if first:
+ first = False
+ root.append(element)
+ else:
+ group.append(element)
+ elif user.dashboard_layout == 'stack_top':
+ root.set('col', '1')
+ group = etree.Element('group', {
+ 'col': str(len(user.dashboard_actions) - 1),
+ 'expand': '1',
+ })
+ root.append(group)
+ first = True
+ for action in user.dashboard_actions:
+ element = self._dashboard_element_action(cursor,
+ user_id, action, context=context)
+ if first:
+ first = False
+ root.append(element)
+ else:
+ group.append(element)
+ elif user.dashboard_layout == 'stack_bottom':
+ root.set('col', '1')
+ group = etree.Element('group', {
+ 'col': str(len(user.dashboard_actions) - 1),
+ 'expand': '1',
+ })
+ first = True
+ for action in user.dashboard_actions:
+ element = self._dashboard_element_action(cursor,
+ user_id, action, context=context)
+ if first:
+ first = False
+ root.append(element)
+ else:
+ group.append(element)
+ root.append(group)
+ arch = etree.tostring(tree, encoding='utf-8')
+ return arch
+
+ def read(self, cursor, user, ids, fields_names=None, context=None):
+ res = super(View, self).read(cursor, user, ids,
+ fields_names=fields_names, context=context)
+ if user == 0:
+ return res
+ dashboard_id = self.dashboard_id(cursor, user, context=context)
+ if not dashboard_id:
+ # Restart the cache
+ self.dashboard_id(cursor.dbname)
+ if fields_names is None \
+ or 'arch' in fields_names:
+ if isinstance(ids, (int, long)) \
+ and dashboard_id == ids:
+ res['arch'] = self.dashboard_view(cursor, user, res['arch'],
+ context=context)
+ elif dashboard_id in ids:
+ for res2 in res:
+ if res2['id'] == dashboard_id:
+ res2['arch'] = self.dashboard_view(cursor, user,
+ res2['arch'], context=context)
+ return res
+
+View()
diff --git a/ir.xml b/ir.xml
new file mode 100644
index 0000000..c638833
--- /dev/null
+++ b/ir.xml
@@ -0,0 +1,30 @@
+<?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="view_dashboard">
+ <field name="model">dashboard.action</field>
+ <field name="type">board</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <board string="Dashboard">
+ </board>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_dashboard">
+ <field name="name">Dashboard</field>
+ <field name="res_model">dashboard.action</field>
+ <field name="type">ir.action.act_window</field>
+ <field name="view_type">board</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_dashboard_view1">
+ <field name="sequence" eval="1"/>
+ <field name="view" ref="view_dashboard"/>
+ <field name="act_window" ref="act_dashboard"/>
+ </record>
+
+ </data>
+</tryton>
diff --git a/res.py b/res.py
new file mode 100644
index 0000000..339b212
--- /dev/null
+++ b/res.py
@@ -0,0 +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 trytond.model import Model, fields
+
+
+class User(Model):
+ _name = "res.user"
+
+ dashboard_layout = fields.Selection([
+ ('square', 'Square'),
+ ('stack_right', 'Stack Right'),
+ ('stack_left', 'Stack Left'),
+ ('stack_top', 'Stack Top'),
+ ('stack_bottom', 'Stack Bottom'),
+ ], string='Dashboard Layout', required=True)
+ dashboard_actions = fields.One2Many('dashboard.action', 'user',
+ 'Dashboard Actions')
+
+ def __init__(self):
+ super(User, self).__init__()
+ self._preferences_fields += [
+ 'dashboard_layout',
+ 'dashboard_actions',
+ ]
+
+ def default_dashboard_layout(self, cursor, user, context=None):
+ return 'square'
+
+User()
diff --git a/res.xml b/res.xml
new file mode 100644
index 0000000..46a6a4a
--- /dev/null
+++ b/res.xml
@@ -0,0 +1,64 @@
+<?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="user_view_form">
+ <field name="model">res.user</field>
+ <field name="type">form</field>
+ <field name="inherit" ref="res.user_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/form/notebook" position="inside">
+ <page string="Dashboard" id="dashboard" col="2">
+ <label name="dashboard_layout"/>
+ <field name="dashboard_layout"/>
+ <field name="dashboard_actions" colspan="2">
+ <tree string="Dashboard Actions"
+ sequence="sequence" fill="1">
+ <field name="act_window" select="1"/>
+ </tree>
+ <form string="Dashboard Action">
+ <label name="act_window"/>
+ <field name="act_window"/>
+ </form>
+ </field>
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="user_view_form_preferences">
+ <field name="model">res.user</field>
+ <field name="type">form</field>
+ <field name="inherit" ref="res.user_view_form_preferences"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/form/notebook" position="inside">
+ <page string="Dashboard" id="dashboard" col="2">
+ <label name="dashboard_layout"/>
+ <field name="dashboard_layout"/>
+ <field name="dashboard_actions" colspan="2">
+ <tree string="Dashboard Actions"
+ sequence="sequence" fill="1">
+ <field name="act_window" select="1"/>
+ </tree>
+ <form string="Dashboard Action">
+ <label name="act_window"/>
+ <field name="act_window" widget="selection"/>
+ </form>
+ </field>
+ </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..9f844b3
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,59 @@
+#!/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
+import re
+
+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_%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_dashboard',
+ 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.dashboard': '.'},
+ packages=[
+ 'trytond.modules.dashboard',
+ ],
+ package_data={
+ 'trytond.modules.dashboard': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ dashboard = trytond.modules.dashboard
+ """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..8be071b
--- /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_dashboard import *
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
new file mode 100644
index 0000000..d42d48c
Binary files /dev/null and b/tests/__init__.pyc differ
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
new file mode 100644
index 0000000..030b7e7
--- /dev/null
+++ b/tests/test_dashboard.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 DashboardTestCase(unittest.TestCase):
+ '''
+ Test Dashboard module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('dashboard')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('dashboard'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(DashboardTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteDashboard = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteDashboard])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/tests/test_dashboard.pyc b/tests/test_dashboard.pyc
new file mode 100644
index 0000000..a28621b
Binary files /dev/null and b/tests/test_dashboard.pyc differ
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
new file mode 100644
index 0000000..199c33f
--- /dev/null
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-dashboard
+Version: 1.4.0
+Summary: Dashboard:
+ - Allow to create a personalized dashboard.
+
+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 :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+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: Topic :: Office/Business
diff --git a/trytond_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
new file mode 100644
index 0000000..510c2b0
--- /dev/null
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -0,0 +1,30 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+dashboard.xml
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+ir.xml
+res.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./dashboard.py
+./ir.py
+./res.py
+tests/__init__.py
+tests/__init__.pyc
+tests/test_dashboard.py
+tests/test_dashboard.pyc
+trytond_dashboard.egg-info/PKG-INFO
+trytond_dashboard.egg-info/SOURCES.txt
+trytond_dashboard.egg-info/dependency_links.txt
+trytond_dashboard.egg-info/entry_points.txt
+trytond_dashboard.egg-info/not-zip-safe
+trytond_dashboard.egg-info/requires.txt
+trytond_dashboard.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_dashboard.egg-info/dependency_links.txt b/trytond_dashboard.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_dashboard.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_dashboard.egg-info/entry_points.txt b/trytond_dashboard.egg-info/entry_points.txt
new file mode 100644
index 0000000..6502a5f
--- /dev/null
+++ b/trytond_dashboard.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ dashboard = trytond.modules.dashboard
+
\ No newline at end of file
diff --git a/trytond_dashboard.egg-info/not-zip-safe b/trytond_dashboard.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_dashboard.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
new file mode 100644
index 0000000..1f27225
--- /dev/null
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -0,0 +1 @@
+trytond >= 1.4, < 1.5
\ No newline at end of file
diff --git a/trytond_dashboard.egg-info/top_level.txt b/trytond_dashboard.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_dashboard.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-dashboard
More information about the tryton-debian-vcs
mailing list