[tryton-debian-vcs] tryton-modules-ldap-connection branch debian created. ba113783e165ff4d08a86fd7eef46cb2bbb5b28b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:03:07 UTC 2013
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-connection.git;a=commitdiff;h=ba113783e165ff4d08a86fd7eef46cb2bbb5b28b
commit ba113783e165ff4d08a86fd7eef46cb2bbb5b28b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:15 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 2484fff..ee461e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-ldap-connection (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:15 +0100
+
tryton-modules-ldap-connection (2.8.0-3) unstable; urgency=low
* Removing pydist-overrides, it is no more needed.
commit da552f71590c5ec76d1c0e90957598bc6d15c254
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 3b1c8b7..f66bd0c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-connection.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 77549c520d47384682aa1d2fa3d53fc631e3758e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index f79cf4a..3b1c8b7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-connection.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-ldap-connection.git
commit 46b27035374b286ccd1f31ee9108389f11887087
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:21 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 5b6b16a..38379c2 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)
diff --git a/PKG-INFO b/PKG-INFO
index 508a056..a9ab577 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_ldap_connection
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add LDAP connection
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_ldap_connection
=======================
@@ -59,6 +59,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/locale/fr_FR.po b/locale/fr_FR.po
index 46e1c67..774c53c 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -107,14 +107,6 @@ msgid "Never"
msgstr "Aucune"
msgctxt "selection:ldap.connection,secure:"
-msgid "Never"
-msgstr "Aucune"
-
-msgctxt "selection:ldap.connection,secure:"
-msgid "SSL"
-msgstr "SSL"
-
-msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr "SSL"
@@ -122,14 +114,6 @@ msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "selection:ldap.connection,secure:"
-msgid "TLS"
-msgstr "TLS"
-
-msgctxt "view:ldap.connection:"
-msgid "LDAP Connection"
-msgstr "Connexion LDAP"
-
msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr "Connexion LDAP"
@@ -138,10 +122,6 @@ msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr "_Test connexion"
-msgctxt "view:ldap.connection:"
-msgid "_Test Connection"
-msgstr "_Test connexion"
-
msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
msgstr "Test de connexion réussi"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 68%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index 46e1c67..9bcd539 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -8,19 +8,19 @@ msgstr "Active Directory"
msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
-msgstr "Bind DN"
+msgstr "DN"
msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
-msgstr "Mot de passe du lien"
+msgstr "Geslo"
msgctxt "field:ldap.connection,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Ustvarjeno"
msgctxt "field:ldap.connection,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Ustvaril"
msgctxt "field:ldap.connection,id:"
msgid "ID"
@@ -28,19 +28,19 @@ msgstr "ID"
msgctxt "field:ldap.connection,port:"
msgid "Port"
-msgstr "Port"
+msgstr "Vrata"
msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:ldap.connection,secure:"
msgid "Secure"
-msgstr "Sécurité"
+msgstr "Varna povezava"
msgctxt "field:ldap.connection,server:"
msgid "Server"
-msgstr "Serveur"
+msgstr "Strežnik"
msgctxt "field:ldap.connection,uri:"
msgid "URI"
@@ -48,11 +48,11 @@ msgstr "URI"
msgctxt "field:ldap.connection,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Zapisano"
msgctxt "field:ldap.connection,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Zapisal"
msgctxt "field:ldap.test_connection.result,id:"
msgid "ID"
@@ -60,31 +60,31 @@ msgstr "ID"
msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
-msgstr "DN LDAP utilisé pour le bind"
+msgstr "LDAP DN za povezavo"
msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
-msgstr "Mot de passe LDAP utilisé pour le lien"
+msgstr "LDAP geslo za povezavo"
msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
-msgstr "Port serveur LDAP"
+msgstr "Vrata LDAP strežnika"
msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
-msgstr "Connexion LDAP sécurisée"
+msgstr "LDAP varna povezava"
msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
-msgstr "Nom du serveur LDAP"
+msgstr "Ime LDAP strežnika"
msgctxt "model:ir.action,name:act_connection_form"
msgid "Connection"
-msgstr "Connexion"
+msgstr "Povezava"
msgctxt "model:ir.action,name:wizard_test_connection"
msgid "Test LDAP Connection"
-msgstr "Test connexion LDAP"
+msgstr "Preizkus LDAP povezave"
msgctxt "model:ir.ui.menu,name:menu_administration"
msgid "LDAP"
@@ -92,27 +92,19 @@ msgstr "LDAP"
msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
-msgstr "Connexion"
+msgstr "Povezava"
msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
-msgstr "Connexion LDAP"
+msgstr "LDAP povezava"
msgctxt "model:ldap.test_connection.result,name:"
msgid "Test Connection"
-msgstr "Test de connexion"
+msgstr "Preizkus povezave"
msgctxt "selection:ldap.connection,secure:"
msgid "Never"
-msgstr "Aucune"
-
-msgctxt "selection:ldap.connection,secure:"
-msgid "Never"
-msgstr "Aucune"
-
-msgctxt "selection:ldap.connection,secure:"
-msgid "SSL"
-msgstr "SSL"
+msgstr "Nikoli"
msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
@@ -122,34 +114,22 @@ msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "selection:ldap.connection,secure:"
-msgid "TLS"
-msgstr "TLS"
-
-msgctxt "view:ldap.connection:"
-msgid "LDAP Connection"
-msgstr "Connexion LDAP"
-
msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
-msgstr "Connexion LDAP"
-
-msgctxt "view:ldap.connection:"
-msgid "_Test Connection"
-msgstr "_Test connexion"
+msgstr "LDAP povezava"
msgctxt "view:ldap.connection:"
msgid "_Test Connection"
-msgstr "_Test connexion"
+msgstr "_Preizkus povezave"
msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr "Test de connexion réussi"
+msgstr "Uspešen preizkus povezave!"
msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
-msgstr "Test connexion LDAP"
+msgstr "Preizkus LDAP povezave"
msgctxt "wizard_button:ldap.test_connection,result,end:"
msgid "Close"
-msgstr "Fermer"
+msgstr "Zapri"
diff --git a/setup.py b/setup.py
index 974ed7b..ac9d5de 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_ldap_connection',
'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 68bb457..66b663e 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_ldap_connection import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 540ffd0..7b48603 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_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 8fc6225..1806706 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-ldap-connection
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add LDAP connection
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_ldap_connection
=======================
@@ -59,6 +59,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_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index 1b21b9b..59c4337 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -21,6 +21,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_ldap_connection.egg-info/PKG-INFO
trytond_ldap_connection.egg-info/SOURCES.txt
trytond_ldap_connection.egg-info/dependency_links.txt
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index 52f768e..a428f45 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit b41565e697e79ab637e35d23d1fe420fdff96882
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:20:55 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index e26d7d7..2484fff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-ldap-connection (2.8.0-3) unstable; urgency=low
+
+ * Removing pydist-overrides, it is no more needed.
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:32:58 +0200
+
tryton-modules-ldap-connection (2.8.0-2) unstable; urgency=low
* Removing needless empty line in rules.
commit 9f03935859c14460042361771a46b1642b3fe482
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 8ab708d99019149f8a28b274e8d3a3b406065d16
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 14:04:41 2013 +0200
Removing pydist-overrides, it is no more needed.
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
deleted file mode 100644
index 7d7185d..0000000
--- a/debian/pydist-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-python_ldap python-ldap
-
commit 8c76a4054875d5264906d77a1a31f48f7d0b6b04
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:29 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index a2d7511..e26d7d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-ldap-connection (2.8.0-2) unstable; urgency=low
+
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:26:37 +0200
+
tryton-modules-ldap-connection (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 4c0638606ee99315bca5bd5de6a99f56cd94bdf1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit ebaa4e7778f4128c3b09a5dc0db11eb6b46a50bd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:06 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index d215228..a2d7511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-ldap-connection (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:20:15 +0200
+
tryton-modules-ldap-connection (2.6.0-4) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704384).
commit 261b12a93499d0d2f817034bac4450f8498cdaa9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:10 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 6e5645d..585e7d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2006-2012 Cédric Krier
+Copyright: 2006-2013 Cédric Krier
2009-2012 Bertrand Chenal
- 2009-2012 B2CK SPRL
+ 2009-2013 B2CK SPRL
2008 Josh Dukes
2008 Micro-Vu
2008-2010 Udo Spallek
commit ec908ddb92163d3d8b2bb3652b4054bae0276932
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:36:33 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index dccdbd1..5b6b16a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* 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 759731a..4c82393 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2012 Cédric Krier.
+Copyright (C) 2006-2013 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 B2CK SPRL.
Copyright (C) 2008 Josh Dukes.
Copyright (C) 2008 Micro-Vu.
Copyright (C) 2008-2010 Udo Spallek.
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 4687c60..508a056 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_ldap_connection
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add LDAP connection
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_ldap_connection
=======================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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/connection.xml b/connection.xml
index 88e06bb..a715d97 100644
--- a/connection.xml
+++ b/connection.xml
@@ -15,15 +15,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="test_connection_result_form">
<field name="model">ldap.test_connection.result</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Test LDAP Connection">
- <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
- <label string="Test Connection Succeed!" id="succeed"
- yalign="0.0" xalign="0.0" xexpand="1"/>
- </form>
- ]]>
- </field>
+ <field name="name">test_connection_result_form</field>
</record>
<record model="ir.action.wizard" id="wizard_test_connection">
@@ -35,28 +27,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="connection_view_form">
<field name="model">ldap.connection</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="LDAP Connection" col="6">
- <label name="server"/>
- <field name="server"/>
- <label name="port"/>
- <field name="port"/>
- <label name="secure"/>
- <field name="secure"/>
- <label name="bind_dn"/>
- <field name="bind_dn"/>
- <label name="bind_pass"/>
- <field name="bind_pass" widget="sha"/>
- <label name="active_directory"/>
- <field name="active_directory"/>
- <group colspan="6" id="buttons">
- <button name="test_connection"
- string="_Test Connection"/>
- </group>
- </form>
- ]]>
- </field>
+ <field name="name">connection_form</field>
</record>
<record model="ir.action.act_window" id="act_connection_form">
<field name="name">Connection</field>
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index adaa17f..f4f09e8 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -18,10 +18,9 @@ msgctxt "field:ldap.connection,create_date:"
msgid "Create Date"
msgstr "Data creació"
-#, fuzzy
msgctxt "field:ldap.connection,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:ldap.connection,id:"
msgid "ID"
@@ -37,7 +36,7 @@ msgstr "Nom"
msgctxt "field:ldap.connection,secure:"
msgid "Secure"
-msgstr "Segura"
+msgstr "Seguretat"
msgctxt "field:ldap.connection,server:"
msgid "Server"
@@ -85,7 +84,7 @@ msgstr "Connexió"
msgctxt "model:ir.action,name:wizard_test_connection"
msgid "Test LDAP Connection"
-msgstr "Provar connexió LDAP"
+msgstr "Prova connexió LDAP"
msgctxt "model:ir.ui.menu,name:menu_administration"
msgid "LDAP"
@@ -121,18 +120,16 @@ msgstr "Connexió LDAP"
msgctxt "view:ldap.connection:"
msgid "_Test Connection"
-msgstr "_Provar connexió"
+msgstr "_Prova connexió"
msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr "Provar connexió LDAP"
+msgstr "La prova de connexió s'ha realitzat amb èxit"
-#, fuzzy
msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
-msgstr "Provar connexió LDAP"
+msgstr "Prova connexió LDAP"
-#, fuzzy
msgctxt "wizard_button:ldap.test_connection,result,end:"
msgid "Close"
-msgstr "Tancat"
+msgstr "Tanca"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index b48b3a5..5a1924f 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -36,7 +36,7 @@ msgstr "Nombre"
msgctxt "field:ldap.connection,secure:"
msgid "Secure"
-msgstr "Segura"
+msgstr "Seguridad"
msgctxt "field:ldap.connection,server:"
msgid "Server"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 28eef5a..4c8e68a 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -36,7 +36,7 @@ msgstr "Nombre"
msgctxt "field:ldap.connection,secure:"
msgid "Secure"
-msgstr "Segura"
+msgstr "Seguridad"
msgctxt "field:ldap.connection,server:"
msgid "Server"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 65248fb..b477102 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -14,17 +14,20 @@ msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr ""
+#, fuzzy
msgctxt "field:ldap.connection,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:ldap.connection,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
+#, fuzzy
msgctxt "field:ldap.connection,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:ldap.connection,port:"
msgid "Port"
@@ -48,17 +51,20 @@ msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr ""
+#, fuzzy
msgctxt "field:ldap.connection,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:ldap.connection,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
+#, fuzzy
msgctxt "field:ldap.test_connection.result,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
diff --git a/setup.py b/setup.py
index 5166b02..974ed7b 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = ['python-ldap']
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_ldap_connection',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_ldap_connection',
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.ldap_connection': '.'},
packages=[
'trytond.modules.ldap_connection',
'trytond.modules.ldap_connection.tests',
],
package_data={
- 'trytond.modules.ldap_connection': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.ldap_connection': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_ldap_connection',
'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',
@@ -67,8 +68,8 @@ setup(name='trytond_ldap_connection',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- 'Topic :: System :: Systems Administration ' \
- ':: Authentication/Directory :: LDAP',
+ ('Topic :: System :: Systems Administration '
+ ':: Authentication/Directory :: LDAP'),
],
license='GPL-3',
install_requires=requires,
diff --git a/tryton.cfg b/tryton.cfg
index e333cab..540ffd0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
res
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 41fa219..8fc6225 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-ldap-connection
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add LDAP connection
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_ldap_connection
=======================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index 10dcac6..1b21b9b 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -27,4 +27,6 @@ trytond_ldap_connection.egg-info/dependency_links.txt
trytond_ldap_connection.egg-info/entry_points.txt
trytond_ldap_connection.egg-info/not-zip-safe
trytond_ldap_connection.egg-info/requires.txt
-trytond_ldap_connection.egg-info/top_level.txt
\ No newline at end of file
+trytond_ldap_connection.egg-info/top_level.txt
+view/connection_form.xml
+view/test_connection_result_form.xml
\ No newline at end of file
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index 4b532c0..52f768e 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-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/connection_form.xml b/view/connection_form.xml
new file mode 100644
index 0000000..bb5fa0c
--- /dev/null
+++ b/view/connection_form.xml
@@ -0,0 +1,20 @@
+<?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="LDAP Connection" col="6">
+ <label name="server"/>
+ <field name="server"/>
+ <label name="port"/>
+ <field name="port"/>
+ <label name="secure"/>
+ <field name="secure"/>
+ <label name="bind_dn"/>
+ <field name="bind_dn"/>
+ <label name="bind_pass"/>
+ <field name="bind_pass" widget="sha"/>
+ <label name="active_directory"/>
+ <field name="active_directory"/>
+ <group colspan="6" id="buttons">
+ <button name="test_connection" string="_Test Connection"/>
+ </group>
+</form>
diff --git a/view/test_connection_result_form.xml b/view/test_connection_result_form.xml
new file mode 100644
index 0000000..51897c7
--- /dev/null
+++ b/view/test_connection_result_form.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. -->
+<form string="Test LDAP Connection">
+ <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+ <label string="Test Connection Succeed!" id="succeed"
+ yalign="0.0" xalign="0.0" xexpand="1"/>
+</form>
commit c552a86b9a6584c376a91510e1c1da98646f7bfe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:45 2013 +0200
Releasing debian version 2.6.0-4.
diff --git a/debian/changelog b/debian/changelog
index 67d4b6f..d215228 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-ldap-connection (2.6.0-4) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704384).
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:07:20 +0200
+
tryton-modules-ldap-connection (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 57938ebeb26a33c2bb37b0fb6530b08acb173367
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index f18c964..f79cf4a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6), python-ldap,
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ python-ldap, python-pkg-resources
Description: Tryton Application Platform (LDAP Connection Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit 6fec2bf63920e3fc593f70aadb01e54fe8c87c08
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:32:16 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704384).
diff --git a/debian/control b/debian/control
index 861e000..f18c964 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-ldap-connection
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 64867bf4977be5931320ea37e3a1d152a673ea1b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:04:06 2013 +0100
Releasing debian version 2.6.0-3.
diff --git a/debian/changelog b/debian/changelog
index 8de669c..67d4b6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-ldap-connection (2.6.0-3) experimental; urgency=low
+
+ * Updating Vcs-Git to correct address.
+ * Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 Mar 2013 14:00:45 +0100
+
tryton-modules-ldap-connection (2.6.0-2) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit 891605c35069abe9afa80481cb31dde62e2941f4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 13:52:32 2013 +0100
Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a1d41f4
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_ldap_connection-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit d8dd9a3ae2a52b118d346fcbbc9c3db61d3382cc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:10 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index 8fe0274..861e000 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-connection.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-ldap-connection.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-ldap-connection.git
X-Python-Version: >= 2.6
Package: tryton-modules-ldap-connection
commit 35589d572243f9651ea45868599e881dca4b7b3c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:42 2013 +0100
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 651a3fc..8de669c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-ldap-connection (2.6.0-2) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:40:21 +0100
+
tryton-modules-ldap-connection (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit c9d70652017bc25ef0381891d0afd8589ba99f47
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:19 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 1ee5cda..6e5645d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2006-2012 Cedric Krier
+Copyright: 2006-2012 Cédric Krier
2009-2012 Bertrand Chenal
2009-2012 B2CK SPRL
2008 Josh Dukes
@@ -14,7 +13,7 @@ License: GPL-3+
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 05c1b4472d101188d96313ab79fc8c2de8eacfeb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:32 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 44cd56c..8fe0274 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-connection.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-ldap-connection.git
commit 51397a9cd21cf03e86e1459f6ff9856067b8d4d0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 13 21:37:13 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 3deffbb..44cd56c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
commit 1dea3f19c0cd782be9cac5e6e811c12c91685109
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:01:59 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index f5990ac..651a3fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-ldap-connection (2.6.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.6.0.
+ * Bumping versioned tryton depends to 2.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 24 Oct 2012 14:24:35 +0200
+
tryton-modules-ldap-connection (2.4.0-2) experimental; urgency=low
[ Daniel Baumann ]
commit 513a6a1f19c3bf1398b5e0373ea0d4b7bc3d7848
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:59:46 2012 +0200
Bumping versioned tryton depends to 2.6.
diff --git a/debian/control b/debian/control
index f84b307..3deffbb 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ X-Python-Version: >= 2.6
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4), python-ldap,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6), python-ldap,
python-pkg-resources
Description: Tryton Application Platform (LDAP Connection Module)
Tryton is a high-level general purpose application platform written in Python
commit 935a8251e49cd6aca26c17438c8bd036ac50668a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:36 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 61b60fd..dccdbd1 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-24
* 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 9813c28..4687c60 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond_ldap_connection
-Version: 2.4.0
-Summary: Add basic support for LDAP connection.
+Version: 2.6.0
+Summary: Tryton module to add LDAP connection
Home-page: http://www.tryton.org/
-Author: B2CK, Josh Dukes & Udo Spallek
-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_ldap_connection
+ =======================
+
+ The ldap_connection 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 183934f..c19c493 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_ldap_connection
=======================
The ldap_connection module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index d490977..fc4661b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +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 .connection import *
+
+
+def register():
+ Pool.register(
+ Connection,
+ TestConnectionResult,
+ module='ldap_connection', type_='model')
+ Pool.register(
+ TestConnection,
+ module='ldap_connection', type_='wizard')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index dbacc47..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,45 +0,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.
-{
- 'name': 'LDAP Connection',
- 'name_bg_BG': 'LDAP свързване',
- 'name_ca_ES': 'Connexió LDAP',
- 'name_de_DE': 'LDAP Verbindung',
- 'name_es_AR': 'Conexión LDAP',
- 'name_es_CO': 'Conexión LDAP',
- 'name_es_ES': 'Conexión LDAP',
- 'name_fr_FR': 'Connexion LDAP',
- 'version': '2.4.0',
- 'author': 'B2CK, Josh Dukes & Udo Spallek',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Add basic support for LDAP connection.''',
- 'description_bg_BG': 'Предоставя базова връзка с LDAP.',
- 'description_ca_ES': 'Afegeix suport bàsic per connexions LDAP.',
- 'description_de_DE': '''LDAP Verbindung
- - Fügt Basisunterstützung für Verbindungen zu einem LDAP-Server hinzu
-''',
- 'description_es_AR': 'Añade soporte básico para conexiones LDAP.',
- 'description_es_CO': 'Añade soporte básico para conexiones LDAP.',
- 'description_es_ES': 'Añade soporte básico para conexiones LDAP.',
- 'description_fr_FR': '''Ajoute le support de base pour les connexions LDAP''',
- 'depends': [
- 'ir',
- 'res',
- ],
- 'xml': [
- 'connection.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/connection.py b/connection.py
index 887d509..0cbc5ca 100644
--- a/connection.py
+++ b/connection.py
@@ -7,13 +7,13 @@ from trytond.pyson import Bool, Eval
from trytond.pool import Pool
from trytond.transaction import Transaction
+__all__ = ['Connection', 'TestConnectionResult', 'TestConnection']
+
class Connection(ModelSingleton, ModelSQL, ModelView):
"LDAP Connection"
- _description = __doc__
- _name = 'ldap.connection'
+ __name__ = 'ldap.connection'
_rec_name = 'server'
-
server = fields.Char('Server', required=True, help='LDAP server name')
port = fields.Integer('Port', required=True, help='LDAP server port')
secure = fields.Selection([
@@ -31,64 +31,68 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
uri = fields.Function(fields.Char('URI'), 'get_uri')
active_directory = fields.Boolean('Active Directory')
- def default_port(self):
+ @classmethod
+ def __setup__(cls):
+ super(Connection, cls).__setup__()
+ cls._buttons.update({
+ 'test_connection': {},
+ })
+
+ @staticmethod
+ def default_port():
return 389
- def default_secure(self):
+ @staticmethod
+ def default_secure():
return 'never'
- def default_active_directory(self):
+ @staticmethod
+ def default_active_directory():
return False
- def on_change_secure(self, values):
+ def on_change_secure(self):
res = {}
- if values.get('secure') in ('never', 'tls'):
+ if self.secure in ('never', 'tls'):
res['port'] = self.default_port()
- elif values.get('secure') == 'ssl':
+ elif self.secure == 'ssl':
res['port'] = 636
return res
- def get_uri(self, ids, name):
- res = {}
- for connection in self.browse(ids):
- res[connection.id] = \
- (connection.secure == 'ssl' and 'ldaps' or 'ldap') + \
- '://%s:%s/' % (connection.server, connection.port)
- return res
+ def get_uri(self, name):
+ return ((self.secure == 'ssl' and 'ldaps' or 'ldap') +
+ '://%s:%s/' % (self.server, self.port))
- def write(self, ids, values):
+ @classmethod
+ @ModelView.button_action('ldap_connection.wizard_test_connection')
+ def test_connection(cls, connections):
+ pass
+
+ @classmethod
+ def write(cls, connections, values):
if 'bind_dn' in values and not values['bind_dn']:
values = values.copy()
values['bind_pass'] = None
- return super(Connection, self).write(ids, values)
-
-Connection()
+ return super(Connection, cls).write(connections, values)
class TestConnectionResult(ModelView):
'Test Connection'
- _description = __doc__
- _name = 'ldap.test_connection.result'
-
-TestConnectionResult()
+ __name__ = 'ldap.test_connection.result'
class TestConnection(Wizard):
"Test LDAP Connection"
- _description = __doc__
- _name = 'ldap.test_connection'
+ __name__ = 'ldap.test_connection'
start_state = 'test'
-
test = StateTransition()
result = StateView('ldap.test_connection.result',
'ldap_connection.test_connection_result_form', [
Button('Close', 'end', 'tryton-close'),
])
- def transition_test(self, session):
- connection_obj = Pool().get('ldap.connection')
- connection_id = Transaction().context.get('active_id')
- connection = connection_obj.browse(connection_id)
+ def transition_test(self):
+ Connection = Pool().get('ldap.connection')
+ connection = Connection(Transaction().context.get('active_id'))
con = ldap.initialize(connection.uri)
if connection.secure == 'tls':
con.start_tls_s()
@@ -97,5 +101,3 @@ class TestConnection(Wizard):
else:
con.simple_bind_s()
return 'result'
-
-TestConnection()
diff --git a/connection.xml b/connection.xml
index 5fef98c..88e06bb 100644
--- a/connection.xml
+++ b/connection.xml
@@ -51,8 +51,8 @@ this repository contains the full copyright notices and license terms. -->
<label name="active_directory"/>
<field name="active_directory"/>
<group colspan="6" id="buttons">
- <button name="%(wizard_test_connection)d"
- string="_Test Connection" type="action"/>
+ <button name="test_connection"
+ string="_Test Connection"/>
</group>
</form>
]]>
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 2899db4..adaa17f 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -16,7 +16,7 @@ msgstr "Contrasenya d'enllaç"
msgctxt "field:ldap.connection,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
#, fuzzy
msgctxt "field:ldap.connection,create_uid:"
@@ -25,7 +25,7 @@ msgstr "Crear usuari"
msgctxt "field:ldap.connection,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:ldap.connection,port:"
msgid "Port"
@@ -49,15 +49,15 @@ msgstr "URI"
msgctxt "field:ldap.connection,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:ldap.connection,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:ldap.test_connection.result,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
@@ -101,7 +101,7 @@ msgstr "Connexió LDAP"
msgctxt "model:ldap.test_connection.result,name:"
msgid "Test Connection"
-msgstr ""
+msgstr "Test connexió"
msgctxt "selection:ldap.connection,secure:"
msgid "Never"
@@ -125,7 +125,7 @@ msgstr "_Provar connexió"
msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr ""
+msgstr "Provar connexió LDAP"
#, fuzzy
msgctxt "view:ldap.test_connection.result:"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index d51300a..b4a4595 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -16,16 +16,15 @@ msgstr "Contraseña de enlace"
msgctxt "field:ldap.connection,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:ldap.connection,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:ldap.connection,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:ldap.connection,port:"
msgid "Port"
@@ -49,15 +48,15 @@ msgstr "URI"
msgctxt "field:ldap.connection,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:ldap.connection,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:ldap.test_connection.result,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
@@ -101,7 +100,7 @@ msgstr "Conexión LDAP"
msgctxt "model:ldap.test_connection.result,name:"
msgid "Test Connection"
-msgstr ""
+msgstr "Test de Conexión"
msgctxt "selection:ldap.connection,secure:"
msgid "Never"
@@ -125,14 +124,12 @@ msgstr "_Probar conexión"
msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr ""
+msgstr "Test de Conexión Exitosa!"
-#, fuzzy
msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr "Probar conexión LDAP"
-#, fuzzy
msgctxt "wizard_button:ldap.test_connection,result,end:"
msgid "Close"
msgstr "Cerrar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 10ff83b..46e1c67 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -8,7 +8,7 @@ msgstr "Active Directory"
msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
-msgstr "Lien DN"
+msgstr "Bind DN"
msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
@@ -60,7 +60,7 @@ msgstr "ID"
msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
-msgstr "DN LDAP utilisé pour le lien"
+msgstr "DN LDAP utilisé pour le bind"
msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
diff --git a/setup.py b/setup.py
index b89e1c7..5166b02 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(file('__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_ldap_connection',
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 to add LDAP connection',
+ 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.ldap_connection': '.'},
packages=[
'trytond.modules.ldap_connection',
'trytond.modules.ldap_connection.tests',
- ],
+ ],
package_data={
'trytond.modules.ldap_connection': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -56,8 +67,9 @@ setup(name='trytond_ldap_connection',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- 'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
- ],
+ 'Topic :: System :: Systems Administration ' \
+ ':: Authentication/Directory :: LDAP',
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +79,4 @@ setup(name='trytond_ldap_connection',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..e333cab
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,7 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ res
+xml:
+ connection.xml
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 722c1fc..41fa219 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond-ldap-connection
-Version: 2.4.0
-Summary: Add basic support for LDAP connection.
+Version: 2.6.0
+Summary: Tryton module to add LDAP connection
Home-page: http://www.tryton.org/
-Author: B2CK, Josh Dukes & Udo Spallek
-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_ldap_connection
+ =======================
+
+ The ldap_connection 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_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index 0f24620..10dcac6 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
connection.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./connection.py
./tests/__init__.py
./tests/test_ldap_connection.py
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index 5fe3fda..4b532c0 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit d925afd685028323f8f03ed48ff9df0be9b2d076
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:21 2012 +0200
Releasing debian version 2.4.0-2.
diff --git a/debian/changelog b/debian/changelog
index 3997ebb..f5990ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-ldap-connection (2.4.0-2) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ [ Mathias Behrle ]
+ * Merging branch debian-wheezy-2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 18 Sep 2012 13:38:39 +0200
+
tryton-modules-ldap-connection (2.4.0-1) experimental; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit b3d4d5d83bff13f2c5308b4a661b52c3e2810cea
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index d1c0f45..f84b307 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-connection.git
commit 8ac5df4402cf28d99f38a02ac869840e8289a185
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 410c8822b47f90ab697abea17c2387bd07fef926
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 1bb0186..1ee5cda 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,19 +2,19 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2006-2012 Cedric Krier
- (C) 2009-2012 Bertrand Chenal
- (C) 2009-2012 B2CK SPRL
- (C) 2008 Josh Dukes
- (C) 2008 Micro-Vu
- (C) 2008-2010 Udo Spallek
- (C) 2008-2010 virtual things
+ 2006-2012 Cedric Krier
+ 2009-2012 Bertrand Chenal
+ 2009-2012 B2CK SPRL
+ 2008 Josh Dukes
+ 2008 Micro-Vu
+ 2008-2010 Udo Spallek
+ 2008-2010 virtual things
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 23b7ed90e05cb684d9d6964fc2c5cd908cf835d5
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 2c1dc56..d1c0f45 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-connection.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-ldap-connection.git
X-Python-Version: >= 2.6
Package: tryton-modules-ldap-connection
commit cbb117f43ae9cf511fe49367da1c993941dd4bcb
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:30 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 7c4cd84..2c1dc56 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-ldap-connection
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 01b13397197d651a780823f95c792679d24b6536
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:44:02 2012 +0200
Releasing debian version 2.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index 54cef6a..3997ebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-ldap-connection (2.4.0-1) experimental; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.4.0.
+ * Updating Copyright.
+ * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:30:27 +0200
+
tryton-modules-ldap-connection (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit a10d1293b1a4d96915693fcbc7ec029bd528ee78
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 19:11:44 2012 +0200
Bumping versioned tryton depends to 2.4.
diff --git a/debian/control b/debian/control
index 1e010b4..7c4cd84 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ X-Python-Version: >= 2.6
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2), python-ldap,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4), python-ldap,
python-pkg-resources
Description: Tryton Application Platform (LDAP Connection Module)
Tryton is a high-level general purpose application platform written in Python
commit 0ec3124415e317413bbaf70001ecf3e6dde1e172
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:13 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index c828b37..1bb0186 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2006-2011 Cedric Krier
- (C) 2009-2011 Bertrand Chenal
- (C) 2009-2011 B2CK SPRL
+ (C) 2006-2012 Cedric Krier
+ (C) 2009-2012 Bertrand Chenal
+ (C) 2009-2012 B2CK SPRL
(C) 2008 Josh Dukes
(C) 2008 Micro-Vu
(C) 2008-2010 Udo Spallek
commit c39600f1f940763252437fd4c5648f0635894d62
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:46 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index b2ab89c..61b60fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-24
+* 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 a31001a..759731a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2006-2012 Cédric Krier.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2012 B2CK SPRL.
Copyright (C) 2008 Josh Dukes.
Copyright (C) 2008 Micro-Vu.
Copyright (C) 2008-2010 Udo Spallek.
diff --git a/INSTALL b/INSTALL
index 7e1d112..895eb90 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_ldap_connection
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* python-ldap (http://python-ldap.sourceforge.net/)
diff --git a/PKG-INFO b/PKG-INFO
index de6afa7..9813c28 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_connection
-Version: 2.2.0
+Version: 2.4.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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 744206e..d490977 100644
--- a/__init__.py
+++ b/__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 connection import *
+from .connection import *
diff --git a/__tryton__.py b/__tryton__.py
index c075fed..dbacc47 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,20 +2,24 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'LDAP Connection',
- 'name_bg_BG' : 'LDAP свързване',
- 'name_de_DE' : 'LDAP Verbindung',
+ 'name_bg_BG': 'LDAP свързване',
+ 'name_ca_ES': 'Connexió LDAP',
+ 'name_de_DE': 'LDAP Verbindung',
+ 'name_es_AR': 'Conexión LDAP',
'name_es_CO': 'Conexión LDAP',
'name_es_ES': 'Conexión LDAP',
- 'name_fr_FR' : 'Connexion LDAP',
- 'version': '2.2.0',
+ 'name_fr_FR': 'Connexion LDAP',
+ 'version': '2.4.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Add basic support for LDAP connection.''',
'description_bg_BG': 'Предоставя базова връзка с LDAP.',
- 'description_de_DE' : '''LDAP Verbindung
+ 'description_ca_ES': 'Afegeix suport bàsic per connexions LDAP.',
+ 'description_de_DE': '''LDAP Verbindung
- Fügt Basisunterstützung für Verbindungen zu einem LDAP-Server hinzu
''',
+ 'description_es_AR': 'Añade soporte básico para conexiones LDAP.',
'description_es_CO': 'Añade soporte básico para conexiones LDAP.',
'description_es_ES': 'Añade soporte básico para conexiones LDAP.',
'description_fr_FR': '''Ajoute le support de base pour les connexions LDAP''',
@@ -28,8 +32,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/connection.py b/connection.py
index c43a200..887d509 100644
--- a/connection.py
+++ b/connection.py
@@ -2,9 +2,10 @@
#this repository contains the full copyright notices and license terms.
import ldap
from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
-from trytond.wizard import Wizard
+from trytond.wizard import Wizard, StateTransition, StateView, Button
from trytond.pyson import Bool, Eval
from trytond.pool import Pool
+from trytond.transaction import Transaction
class Connection(ModelSingleton, ModelSQL, ModelView):
@@ -58,42 +59,36 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
def write(self, ids, values):
if 'bind_dn' in values and not values['bind_dn']:
values = values.copy()
- values['bind_pass'] = False
+ values['bind_pass'] = None
return super(Connection, self).write(ids, values)
Connection()
-class TestConnectionInit(ModelView):
- 'Test Connection - Init'
+class TestConnectionResult(ModelView):
+ 'Test Connection'
_description = __doc__
- _name = 'ldap.test_connection.init'
+ _name = 'ldap.test_connection.result'
-TestConnectionInit()
+TestConnectionResult()
class TestConnection(Wizard):
"Test LDAP Connection"
_description = __doc__
_name = 'ldap.test_connection'
- states = {
- 'init': {
- 'actions': ['_test'],
- 'result': {
- 'type': 'form',
- 'object': 'ldap.test_connection.init',
- 'state': [
- ('end', 'Ok', 'tryton-ok', True),
- ],
- },
- },
- }
-
- def _test(self, data):
+ start_state = 'test'
+
+ test = StateTransition()
+ result = StateView('ldap.test_connection.result',
+ 'ldap_connection.test_connection_result_form', [
+ Button('Close', 'end', 'tryton-close'),
+ ])
+
+ def transition_test(self, session):
connection_obj = Pool().get('ldap.connection')
- connection_ids = connection_obj.search([],
- limit=1)
- connection = connection_obj.browse(connection_ids[0])
+ connection_id = Transaction().context.get('active_id')
+ connection = connection_obj.browse(connection_id)
con = ldap.initialize(connection.uri)
if connection.secure == 'tls':
con.start_tls_s()
@@ -101,6 +96,6 @@ class TestConnection(Wizard):
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
else:
con.simple_bind_s()
- return {}
+ return 'result'
TestConnection()
diff --git a/connection.xml b/connection.xml
index 3282c66..5fef98c 100644
--- a/connection.xml
+++ b/connection.xml
@@ -12,8 +12,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="res.group_admin"/>
</record>
- <record model="ir.ui.view" id="test_connection_init_form">
- <field name="model">ldap.test_connection.init</field>
+ <record model="ir.ui.view" id="test_connection_result_form">
+ <field name="model">ldap.test_connection.result</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 985eb21..c3f1714 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,55 +2,79 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr "Активна директория"
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr "DN"
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr "Парола"
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr "Порт"
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr "Кодирана"
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr "Сървър"
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr "URI"
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
msgstr "Използван LDAP DN "
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
msgstr "LDAP парола за свързване"
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
msgstr "Порт на LDAP сървъра"
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
msgstr "Кодирана LDAP връзка"
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
msgstr "Име на LDAP сървър"
@@ -70,42 +94,42 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr "Връзка"
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr "LDAP свързване"
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
-msgstr "Начало на тестово свързване"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
+msgstr "Изпробване на връзката"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr "Никога"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr "SSL"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr "LDAP свързване"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr "Тестово свързване"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
msgstr "Тестовото свързване успешно!"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr "Тестово LDAP свързване"
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
-msgstr "Добре"
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Затваряне"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..2899db4
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,138 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:"
+msgid "Active Directory"
+msgstr "Directori actiu"
+
+msgctxt "field:ldap.connection,bind_dn:"
+msgid "Bind DN"
+msgstr "DN d'enllaç"
+
+msgctxt "field:ldap.connection,bind_pass:"
+msgid "Bind Pass"
+msgstr "Contrasenya d'enllaç"
+
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "field:ldap.connection,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:ldap.connection,secure:"
+msgid "Secure"
+msgstr "Segura"
+
+msgctxt "field:ldap.connection,server:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "field:ldap.connection,uri:"
+msgid "URI"
+msgstr "URI"
+
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:"
+msgid "LDAP DN used to bind"
+msgstr "DN LDAP utilitzat per enllaçar"
+
+msgctxt "help:ldap.connection,bind_pass:"
+msgid "LDAP password used to bind"
+msgstr "Contrasenya LDAP utilitzada per enllaçar"
+
+msgctxt "help:ldap.connection,port:"
+msgid "LDAP server port"
+msgstr "Port del servidor LDAP"
+
+msgctxt "help:ldap.connection,secure:"
+msgid "LDAP secure connection"
+msgstr "Connexió LDAP segura"
+
+msgctxt "help:ldap.connection,server:"
+msgid "LDAP server name"
+msgstr "Nom del servidor LDAP"
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr "Connexió"
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr "Provar connexió LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr "LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr "Connexió"
+
+msgctxt "model:ldap.connection,name:"
+msgid "LDAP Connection"
+msgstr "Connexió LDAP"
+
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:"
+msgid "Never"
+msgstr "Mai"
+
+msgctxt "selection:ldap.connection,secure:"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:"
+msgid "LDAP Connection"
+msgstr "Connexió LDAP"
+
+msgctxt "view:ldap.connection:"
+msgid "_Test Connection"
+msgstr "_Provar connexió"
+
+msgctxt "view:ldap.test_connection.result:"
+msgid "Test Connection Succeed!"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:ldap.test_connection.result:"
+msgid "Test LDAP Connection"
+msgstr "Provar connexió LDAP"
+
+#, fuzzy
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Tancat"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index ecacf88..e8b5bdf 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,55 +2,79 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr ""
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr ""
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr ""
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr ""
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr ""
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr ""
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr ""
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
msgstr ""
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
msgstr ""
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
msgstr ""
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
msgstr ""
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
msgstr ""
@@ -70,42 +94,42 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr ""
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr ""
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr ""
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
msgstr ""
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr ""
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 95b5eb3..9a2eba9 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,55 +2,79 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr "Active Directory"
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr "Bind DN"
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr "Bind Passwort"
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr "Port"
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr "Sicherheit"
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr "Server"
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr "URI"
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
msgstr "LDAP DN für die Verbindung"
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
msgstr "LDAP Passwort für die Verbindung"
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
msgstr "Passwort für den LDAP-Server"
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
msgstr "Sicherheit für die Verbindung zum LDAP-Server"
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
msgstr "Name des LDAP-Servers"
@@ -70,42 +94,42 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr "Verbindung"
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr "LDAP Verbindung"
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
-msgstr "Verbindungstest Init"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
+msgstr "Verbindungstest"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr "Keine"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr "SSL"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr "LDAP Verbindung"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr "Verbindungs_test"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
msgstr "Verbindungstest erfolgreich!"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr "Verbindungstest LDAP"
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
-msgstr "OK"
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Schließen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..b48b3a5
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,135 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:"
+msgid "Active Directory"
+msgstr "Directorio activo"
+
+msgctxt "field:ldap.connection,bind_dn:"
+msgid "Bind DN"
+msgstr "DN de enlace"
+
+msgctxt "field:ldap.connection,bind_pass:"
+msgid "Bind Pass"
+msgstr "Contraseña de enlace"
+
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:ldap.connection,port:"
+msgid "Port"
+msgstr "Puerto"
+
+msgctxt "field:ldap.connection,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:ldap.connection,secure:"
+msgid "Secure"
+msgstr "Segura"
+
+msgctxt "field:ldap.connection,server:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "field:ldap.connection,uri:"
+msgid "URI"
+msgstr "URI"
+
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "help:ldap.connection,bind_dn:"
+msgid "LDAP DN used to bind"
+msgstr "DN LDAP utilizado para enlazar"
+
+msgctxt "help:ldap.connection,bind_pass:"
+msgid "LDAP password used to bind"
+msgstr "Contraseña LDAP utilizada para enlazar"
+
+msgctxt "help:ldap.connection,port:"
+msgid "LDAP server port"
+msgstr "Puerto del servidor LDAP"
+
+msgctxt "help:ldap.connection,secure:"
+msgid "LDAP secure connection"
+msgstr "Conexión LDAP segura"
+
+msgctxt "help:ldap.connection,server:"
+msgid "LDAP server name"
+msgstr "Nombre del servidor LDAP"
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr "Probar conexión LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr "LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "model:ldap.connection,name:"
+msgid "LDAP Connection"
+msgstr "Conexión LDAP"
+
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
+msgstr "Probar conexión"
+
+msgctxt "selection:ldap.connection,secure:"
+msgid "Never"
+msgstr "Nunca"
+
+msgctxt "selection:ldap.connection,secure:"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:"
+msgid "LDAP Connection"
+msgstr "Conexión LDAP"
+
+msgctxt "view:ldap.connection:"
+msgid "_Test Connection"
+msgstr "_Probar conexión"
+
+msgctxt "view:ldap.test_connection.result:"
+msgid "Test Connection Succeed!"
+msgstr "¡Prueba de conexión correcta!"
+
+msgctxt "view:ldap.test_connection.result:"
+msgid "Test LDAP Connection"
+msgstr "Probar conexión LDAP"
+
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Cerrar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 20e835c..d51300a 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,55 +2,80 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr "Directorio activo"
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr "DN de enlace"
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr "Contraseña de enlace"
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr "Puerto"
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr "Segura"
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr "Servidor"
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr "URI"
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
msgstr "DN LDAP usado para enlazar"
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
msgstr "Contraseña LDAP usada para enlazar"
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
msgstr "Puerto del servidor LDAP"
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
msgstr "Conexión LDAP segura"
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
msgstr "Nombre del servidor LDAP"
@@ -70,42 +95,44 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr "Conexión"
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr "Conexión LDAP"
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
-msgstr "Prueba de conexión - Iniciar"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
+msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr "Nunca"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr "SSL"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr "Conexión LDAP"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr "_Probar conexión"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr "El test de conexión finalizó correctamente"
+msgstr ""
-msgctxt "view:ldap.test_connection.init:0"
+#, fuzzy
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr "Probar conexión LDAP"
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
-msgstr "Aceptar"
+#, fuzzy
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Cerrar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1356e18..28eef5a 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,57 +2,81 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr "Directorio activo"
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr "DN de enlace"
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr "Contraseña de enlace"
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr "Puerto"
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr "Segura"
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr "Servidor"
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr "URI"
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
-msgstr "DN LDAP utilizado para enlazar"
+msgstr "DN LDAP utilizado para enlazar."
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
-msgstr "Contraseña LDAP utilizada para enlazar"
+msgstr "Contraseña LDAP utilizada para enlazar."
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
-msgstr "Puerto del servidor LDAP"
+msgstr "Puerto del servidor LDAP."
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
-msgstr "Conexión LDAP segura"
+msgstr "Conexión LDAP segura."
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
-msgstr "Nombre del servidor LDAP"
+msgstr "Nombre del servidor LDAP."
msgctxt "model:ir.action,name:act_connection_form"
msgid "Connection"
@@ -70,42 +94,42 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr "Conexión"
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr "Conexión LDAP"
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
-msgstr "Test de conexión - Inicializar"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
+msgstr "Test conexión"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr "Nunca"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr "SSL"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr "Conexión LDAP"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr "_Probar conexión"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr "El test de conexión finalizó correctamente"
+msgstr "El test de conexión se ha realizado correctamente."
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
-msgstr "Prueba la conexión LDAP"
+msgstr "Probar conexión LDAP"
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
-msgstr "Aceptar"
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Cerrar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8b26dab..10ff83b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,55 +2,79 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr "Active Directory"
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr "Lien DN"
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr "Mot de passe du lien"
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr "Port"
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr "Sécurité"
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr "Serveur"
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr "URI"
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
msgstr "DN LDAP utilisé pour le lien"
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
msgstr "Mot de passe LDAP utilisé pour le lien"
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
msgstr "Port serveur LDAP"
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
msgstr "Connexion LDAP sécurisée"
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
msgstr "Nom du serveur LDAP"
@@ -70,42 +94,62 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr "Connexion"
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr "Connexion LDAP"
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
-msgstr "Test connexion - Init"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
+msgstr "Test de connexion"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr "Aucune"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
+msgid "Never"
+msgstr "Aucune"
+
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr "SSL"
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "view:ldap.connection:0"
+msgctxt "selection:ldap.connection,secure:"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:"
+msgid "LDAP Connection"
+msgstr "Connexion LDAP"
+
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr "Connexion LDAP"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
+msgid "_Test Connection"
+msgstr "_Test connexion"
+
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr "_Test connexion"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr "Test connexion réussi !"
+msgstr "Test de connexion réussi"
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr "Test connexion LDAP"
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
-msgstr "Ok"
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Fermer"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index d00cc66..c24071c 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,56 +2,80 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr ""
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr ""
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr ""
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr ""
#, fuzzy
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr ""
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr ""
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr ""
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
msgstr ""
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
msgstr ""
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
msgstr ""
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
msgstr ""
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
msgstr ""
@@ -71,43 +95,43 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr ""
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr ""
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr ""
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
msgstr ""
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr ""
#, fuzzy
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
-msgstr "Oké"
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Sluiten"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 67d6b24..65248fb 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,57 +2,81 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:ldap.connection,active_directory:0"
+msgctxt "field:ldap.connection,active_directory:"
msgid "Active Directory"
msgstr ""
-msgctxt "field:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
msgstr ""
-msgctxt "field:ldap.connection,bind_pass:0"
+msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
msgstr ""
-msgctxt "field:ldap.connection,port:0"
+msgctxt "field:ldap.connection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ldap.connection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:"
msgid "Port"
msgstr ""
#, fuzzy
-msgctxt "field:ldap.connection,rec_name:0"
+msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:ldap.connection,secure:0"
+msgctxt "field:ldap.connection,secure:"
msgid "Secure"
msgstr ""
#, fuzzy
-msgctxt "field:ldap.connection,server:0"
+msgctxt "field:ldap.connection,server:"
msgid "Server"
msgstr "Сервер"
-msgctxt "field:ldap.connection,uri:0"
+msgctxt "field:ldap.connection,uri:"
msgid "URI"
msgstr ""
-msgctxt "help:ldap.connection,bind_dn:0"
+msgctxt "field:ldap.connection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ldap.connection,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ldap.test_connection.result,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
msgstr ""
-msgctxt "help:ldap.connection,bind_pass:0"
+msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
msgstr ""
-msgctxt "help:ldap.connection,port:0"
+msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
msgstr ""
-msgctxt "help:ldap.connection,secure:0"
+msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
msgstr ""
-msgctxt "help:ldap.connection,server:0"
+msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
msgstr ""
@@ -72,43 +96,43 @@ msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
msgstr ""
-msgctxt "model:ldap.connection,name:0"
+msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
msgstr ""
-msgctxt "model:ldap.test_connection.init,name:0"
-msgid "Test Connection - Init"
+msgctxt "model:ldap.test_connection.result,name:"
+msgid "Test Connection"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "Never"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr ""
-msgctxt "selection:ldap.connection,secure:0"
+msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr ""
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
msgstr ""
-msgctxt "view:ldap.test_connection.init:0"
+msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
msgstr ""
#, fuzzy
-msgctxt "wizard_button:ldap.test_connection,init,end:0"
-msgid "Ok"
-msgstr "Ок"
+msgctxt "wizard_button:ldap.test_connection,result,end:"
+msgid "Close"
+msgstr "Закрыть"
diff --git a/setup.py b/setup.py
index bba0bd5..b89e1c7 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = ['python-ldap']
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 6b1fb81..68bb457 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_ldap_connection import suite
+from .test_ldap_connection import suite
diff --git a/tests/test_ldap_connection.py b/tests/test_ldap_connection.py
index d6722a0..3a0971f 100644
--- a/tests/test_ldap_connection.py
+++ b/tests/test_ldap_connection.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 LDAPConnectionTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 156a059..722c1fc 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-connection
-Version: 2.2.0
+Version: 2.4.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index 5373dd0..0f24620 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -12,8 +12,10 @@ setup.py
./tests/__init__.py
./tests/test_ldap_connection.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_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index d533bb3..5fe3fda 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 59ffd8a1ead83039c3fedd7bf0214765fa13d953
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:18 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index 33bee30..c828b37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,5 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
Files: *
Copyright:
(C) 2006-2011 Cedric Krier
commit b0a92a06b46e0399f35a7d7db14995ca6857540a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:09:12 2012 +0100
Adding myself to copyright.
diff --git a/debian/copyright b/debian/copyright
index dfd1fe3..33bee30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,9 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 45c8377b866fe4f0951dcae36e9f65184a48c7db
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:01:03 2012 +0100
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 85d9bd1..dfd1fe3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
License: GPL-3+
License: GPL-3+
commit d9070d709f382ab7ff13259ad8e9363db5293b99
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:01 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index 0cb93fb..1e010b4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
commit 01cc6b7530a53688c4685d5696413ab5193a87a0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:09:32 2011 +0100
Releasing debian version 2.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index c4900ea..54cef6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-ldap-connection (2.2.0-1) unstable; urgency=low
+
+ * Bumping X-Python-Version to >=2.6.
+ * Updating versioned tryton depends to 2.2.
+ * Merging upstream version 2.2.0.
+ * Removing deprecated XB-Python-Version for dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 14:01:19 +0100
+
tryton-modules-ldap-connection (2.0.0-2) unstable; urgency=low
[ Daniel Baumann ]
commit 8209cb2abe72e701506ad39d1cb600d6920e880f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Dec 17 13:59:42 2011 +0100
Bumping X-Python-Version to >=2.6.
diff --git a/debian/control b/debian/control
index 212f98b..0cb93fb 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-modules-ldap-connection
Architecture: all
commit 62ca06dbb3a9d09c63d5c56cd3426ac9f451c9cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:19:31 2011 +0100
Updating versioned tryton depends to 2.2.
diff --git a/debian/control b/debian/control
index c8f0188..212f98b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ X-Python-Version: >= 2.5
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0), python-ldap,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2), python-ldap,
python-pkg-resources
Description: Tryton Application Platform (LDAP Connection Module)
Tryton is a high-level general purpose application platform written in Python
commit 16f97621868345146c6455bf0172b74c40dd65fb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:56 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index cd4ca4e..b2ab89c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+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)
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 3039f0e..de6afa7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,27 +1,30 @@
Metadata-Version: 1.0
Name: trytond_ldap_connection
-Version: 2.0.0
+Version: 2.2.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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 :: Financial and Insurance Industry
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
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 94ae0aa..c075fed 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Conexión LDAP',
'name_es_ES': 'Conexión LDAP',
'name_fr_FR' : 'Connexion LDAP',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -27,10 +27,13 @@
'connection.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.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 d5c50d2..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"ldap.connection,active_directory",0,Active Directory,Активна директория,0
-field,"ldap.connection,bind_dn",0,Bind DN,DN,0
-field,"ldap.connection,bind_pass",0,Bind Pass,Парола,0
-field,"ldap.connection,port",0,Port,Порт,0
-field,"ldap.connection,rec_name",0,Name,Име,0
-field,"ldap.connection,secure",0,Secure,Кодирана,0
-field,"ldap.connection,server",0,Server,Сървър,0
-field,"ldap.connection,uri",0,URI,URI,0
-help,"ldap.connection,bind_dn",0,LDAP DN used to bind,Използван LDAP DN ,0
-help,"ldap.connection,bind_pass",0,LDAP password used to bind,LDAP парола за свързване,0
-help,"ldap.connection,port",0,LDAP server port,Порт на LDAP сървъра,0
-help,"ldap.connection,secure",0,LDAP secure connection,Кодирана LDAP връзка,0
-help,"ldap.connection,server",0,LDAP server name,Име на LDAP сървър,0
-model,"ir.action,name",act_connection_form,Connection,Връзка,0
-model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Тестово LDAP свързване,0
-model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
-model,"ir.ui.menu,name",menu_connection,Connection,Връзка,0
-model,"ldap.connection,name",0,LDAP Connection,LDAP свързване,0
-model,"ldap.test_connection.init,name",0,Test Connection - Init,Начало на тестово свързване,0
-selection,"ldap.connection,secure",0,Never,Никога,0
-selection,"ldap.connection,secure",0,SSL,SSL,0
-selection,"ldap.connection,secure",0,TLS,TLS,0
-view,ldap.connection,0,LDAP Connection,LDAP свързване,0
-view,ldap.connection,0,_Test Connection,Тестово свързване,0
-view,ldap.test_connection.init,0,Test Connection Succeed!,Тестовото свързване успешно!,0
-view,ldap.test_connection.init,0,Test LDAP Connection,Тестово LDAP свързване,0
-wizard_button,"ldap.test_connection,init,end",0,Ok,Добре,0
diff --git a/connection.py b/connection.py
index 2226a81..c43a200 100644
--- a/connection.py
+++ b/connection.py
@@ -3,7 +3,8 @@
import ldap
from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
from trytond.wizard import Wizard
-from trytond.pyson import Bool, Not, Eval
+from trytond.pyson import Bool, Eval
+from trytond.pool import Pool
class Connection(ModelSingleton, ModelSQL, ModelView):
@@ -22,9 +23,10 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
help='LDAP secure connection')
bind_dn = fields.Char('Bind DN', help='LDAP DN used to bind')
bind_pass = fields.Char('Bind Pass', states={
- 'required': Bool(Eval('bind_dn')),
- 'readonly': Not(Bool(Eval('bind_dn'))),
- }, help='LDAP password used to bind')
+ 'required': Bool(Eval('bind_dn')),
+ 'readonly': ~Eval('bind_dn'),
+ }, help='LDAP password used to bind',
+ depends=['bind_dn'])
uri = fields.Function(fields.Char('URI'), 'get_uri')
active_directory = fields.Boolean('Active Directory')
@@ -88,7 +90,7 @@ class TestConnection(Wizard):
}
def _test(self, data):
- connection_obj = self.pool.get('ldap.connection')
+ connection_obj = Pool().get('ldap.connection')
connection_ids = connection_obj.search([],
limit=1)
connection = connection_obj.browse(connection_ids[0])
diff --git a/connection.xml b/connection.xml
index 202cc0a..3282c66 100644
--- a/connection.xml
+++ b/connection.xml
@@ -5,7 +5,12 @@ this repository contains the full copyright notices and license terms. -->
<data>
<menuitem name="LDAP" id="menu_administration"
- parent="ir.menu_administration" groups="res.group_admin"/>
+ parent="ir.menu_administration"/>
+ <record model="ir.ui.menu-res.group"
+ id="menu_administration_group_admin">
+ <field name="menu" ref="menu_administration"/>
+ <field name="group" ref="res.group_admin"/>
+ </record>
<record model="ir.ui.view" id="test_connection_init_form">
<field name="model">ldap.test_connection.init</field>
@@ -13,7 +18,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<form string="Test LDAP Connection">
- <label string="Test Connection Succeed!" id="succeed"/>
+ <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+ <label string="Test Connection Succeed!" id="succeed"
+ yalign="0.0" xalign="0.0" xexpand="1"/>
</form>
]]>
</field>
@@ -43,7 +50,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="bind_pass" widget="sha"/>
<label name="active_directory"/>
<field name="active_directory"/>
- <separator id="buttons" colspan="6"/>
<group colspan="6" id="buttons">
<button name="%(wizard_test_connection)d"
string="_Test Connection" type="action"/>
@@ -62,7 +68,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_window" ref="act_connection_form"/>
</record>
<menuitem parent="menu_administration" action="act_connection_form"
- id="menu_connection" icon="tryton-list" groups="res.group_admin"/>
+ id="menu_connection" icon="tryton-list"/>
+ <record model="ir.ui.menu-res.group"
+ id="menu_connection_group_admin">
+ <field name="menu" ref="menu_connection"/>
+ <field name="group" ref="res.group_admin"/>
+ </record>
<record model="ir.model.access" id="access_ldap_connection">
<field name="model" search="[('model', '=', 'ldap.connection')]"/>
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index ea0bd3d..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"ldap.connection,active_directory",0,Active Directory,Active Directory,0
-field,"ldap.connection,bind_dn",0,Bind DN,Bind DN,0
-field,"ldap.connection,bind_pass",0,Bind Pass,Bind Passwort,0
-field,"ldap.connection,port",0,Port,Port,0
-field,"ldap.connection,rec_name",0,Name,Name,0
-field,"ldap.connection,secure",0,Secure,Sicherheit,0
-field,"ldap.connection,server",0,Server,Server,0
-field,"ldap.connection,uri",0,URI,URI,0
-help,"ldap.connection,bind_dn",0,LDAP DN used to bind,LDAP DN für die Verbindung,0
-help,"ldap.connection,bind_pass",0,LDAP password used to bind,LDAP Passwort für die Verbindung,0
-help,"ldap.connection,port",0,LDAP server port,Passwort für den LDAP-Server,0
-help,"ldap.connection,secure",0,LDAP secure connection,Sicherheit für die Verbindung zum LDAP-Server,0
-help,"ldap.connection,server",0,LDAP server name,Name des LDAP-Servers,0
-model,"ir.action,name",act_connection_form,Connection,Verbindung,0
-model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Verbindungstest LDAP,0
-model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
-model,"ir.ui.menu,name",menu_connection,Connection,Verbindung,0
-model,"ldap.connection,name",0,LDAP Connection,LDAP Verbindung,0
-model,"ldap.test_connection.init,name",0,Test Connection - Init,Verbindungstest - Init,0
-selection,"ldap.connection,secure",0,Never,Keine,0
-selection,"ldap.connection,secure",0,SSL,SSL,0
-selection,"ldap.connection,secure",0,TLS,TLS,0
-view,ldap.connection,0,LDAP Connection,LDAP Verbindung,0
-view,ldap.connection,0,_Test Connection,Verbindungs_test,0
-view,ldap.test_connection.init,0,Test Connection Succeed!,Verbindungstest erfolgreich!,0
-view,ldap.test_connection.init,0,Test LDAP Connection,Verbindungstest LDAP,0
-wizard_button,"ldap.test_connection,init,end",0,Ok,OK,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index a18f027..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"ldap.connection,active_directory",0,Active Directory,Directorio activo,0
-field,"ldap.connection,bind_dn",0,Bind DN,DN de enlace,0
-field,"ldap.connection,bind_pass",0,Bind Pass,Contraseña de enlace,0
-field,"ldap.connection,port",0,Port,Puerto,0
-field,"ldap.connection,rec_name",0,Name,Nombre,0
-field,"ldap.connection,secure",0,Secure,Segura,0
-field,"ldap.connection,server",0,Server,Servidor,0
-field,"ldap.connection,uri",0,URI,URI,0
-help,"ldap.connection,bind_dn",0,LDAP DN used to bind,DN LDAP usado para enlazar,0
-help,"ldap.connection,bind_pass",0,LDAP password used to bind,Contraseña LDAP usada para enlazar,0
-help,"ldap.connection,port",0,LDAP server port,Puerto del servidor LDAP,0
-help,"ldap.connection,secure",0,LDAP secure connection,Conexión LDAP segura,0
-help,"ldap.connection,server",0,LDAP server name,Nombre del servidor LDAP,0
-model,"ir.action,name",act_connection_form,Connection,Conexión,0
-model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Probar conexión LDAP,0
-model,"ir.ui.menu,name",menu_connection,Connection,Conexión,0
-model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
-model,"ldap.connection,name",0,LDAP Connection,Conexión LDAP,0
-model,"ldap.test_connection.init,name",0,Test Connection - Init,Prueba de conexión - Iniciar,0
-selection,"ldap.connection,secure",0,Never,Nunca,0
-selection,"ldap.connection,secure",0,SSL,SSL,0
-selection,"ldap.connection,secure",0,TLS,TLS,0
-view,ldap.connection,0,LDAP Connection,Conexión LDAP,0
-view,ldap.connection,0,_Test Connection,_Probar conexión,0
-view,ldap.test_connection.init,0,Test Connection Succeed!,El test de conexión finalizó correctamente,0
-view,ldap.test_connection.init,0,Test LDAP Connection,Probar conexión LDAP,0
-wizard_button,"ldap.test_connection,init,end",0,Ok,Aceptar,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index cbfaa32..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"ldap.connection,active_directory",0,Active Directory,Directorio activo,0
-field,"ldap.connection,bind_dn",0,Bind DN,DN de enlace,0
-field,"ldap.connection,bind_pass",0,Bind Pass,Contraseña de enlace,0
-field,"ldap.connection,port",0,Port,Puerto,0
-field,"ldap.connection,rec_name",0,Name,Nombre,0
-field,"ldap.connection,secure",0,Secure,Segura,0
-field,"ldap.connection,server",0,Server,Servidor,0
-field,"ldap.connection,uri",0,URI,URI,0
-help,"ldap.connection,bind_dn",0,LDAP DN used to bind,DN LDAP utilizado para enlazar,0
-help,"ldap.connection,bind_pass",0,LDAP password used to bind,Contraseña LDAP utilizada para enlazar,0
-help,"ldap.connection,port",0,LDAP server port,Puerto del servidor LDAP,0
-help,"ldap.connection,secure",0,LDAP secure connection,Conexión LDAP segura,0
-help,"ldap.connection,server",0,LDAP server name,Nombre del servidor LDAP,0
-model,"ir.action,name",act_connection_form,Connection,Conexión,0
-model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Probar conexión LDAP,0
-model,"ir.ui.menu,name",menu_connection,Connection,Conexión,0
-model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
-model,"ldap.connection,name",0,LDAP Connection,Conexión LDAP,0
-model,"ldap.test_connection.init,name",0,Test Connection - Init,Test de conexión - Inicializar,0
-selection,"ldap.connection,secure",0,Never,Nunca,0
-selection,"ldap.connection,secure",0,SSL,SSL,0
-selection,"ldap.connection,secure",0,TLS,TLS,0
-view,ldap.connection,0,LDAP Connection,Conexión LDAP,0
-view,ldap.connection,0,_Test Connection,_Probar conexión,0
-view,ldap.test_connection.init,0,Test Connection Succeed!,El test de conexión finalizó correctamente,0
-view,ldap.test_connection.init,0,Test LDAP Connection,Prueba la conexión LDAP,0
-wizard_button,"ldap.test_connection,init,end",0,Ok,Aceptar,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 22c9227..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"ldap.connection,active_directory",0,Active Directory,Active Directory,0
-field,"ldap.connection,bind_dn",0,Bind DN,Lien DN,0
-field,"ldap.connection,bind_pass",0,Bind Pass,Mot de passe du lien,0
-field,"ldap.connection,port",0,Port,Port,0
-field,"ldap.connection,rec_name",0,Name,Nom,0
-field,"ldap.connection,secure",0,Secure,Sécurité,0
-field,"ldap.connection,server",0,Server,Serveur,0
-field,"ldap.connection,uri",0,URI,URI,0
-help,"ldap.connection,bind_dn",0,LDAP DN used to bind,DN LDAP utilisé pour le lien,0
-help,"ldap.connection,bind_pass",0,LDAP password used to bind,Mot de passe LDAP utilisé pour le lien,0
-help,"ldap.connection,port",0,LDAP server port,Port serveur LDAP,0
-help,"ldap.connection,secure",0,LDAP secure connection,Connexion LDAP sécurisée,0
-help,"ldap.connection,server",0,LDAP server name,Nom du serveur LDAP,0
-model,"ir.action,name",act_connection_form,Connection,Connexion,0
-model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Test connexion LDAP,0
-model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
-model,"ir.ui.menu,name",menu_connection,Connection,Connexion,0
-model,"ldap.connection,name",0,LDAP Connection,Connexion LDAP,0
-model,"ldap.test_connection.init,name",0,Test Connection - Init,Test connexion - Init,0
-selection,"ldap.connection,secure",0,Never,Aucune,0
-selection,"ldap.connection,secure",0,SSL,SSL,0
-selection,"ldap.connection,secure",0,TLS,TLS,0
-view,ldap.connection,0,LDAP Connection,Connexion LDAP,0
-view,ldap.connection,0,_Test Connection,_Test connexion,0
-view,ldap.test_connection.init,0,Test Connection Succeed!,Test connexion réussi !,0
-view,ldap.test_connection.init,0,Test LDAP Connection,Test connexion LDAP,0
-wizard_button,"ldap.test_connection,init,end",0,Ok,Ok,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..985eb21
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,111 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr "Активна директория"
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr "DN"
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr "Парола"
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr "Порт"
+
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr "Кодирана"
+
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr "Сървър"
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr "URI"
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr "Използван LDAP DN "
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr "LDAP парола за свързване"
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr "Порт на LDAP сървъра"
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr "Кодирана LDAP връзка"
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr "Име на LDAP сървър"
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr "Връзка"
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr "Тестово LDAP свързване"
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr "LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr "Връзка"
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr "LDAP свързване"
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr "Начало на тестово свързване"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr "Никога"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr "LDAP свързване"
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr "Тестово свързване"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr "Тестовото свързване успешно!"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr "Тестово LDAP свързване"
+
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr "Добре"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..ecacf88
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,111 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr ""
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr ""
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr ""
+
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr ""
+
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr ""
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr ""
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr ""
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr ""
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr ""
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr ""
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr ""
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr ""
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr ""
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr ""
+
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..95b5eb3
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,111 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr "Active Directory"
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr "Bind DN"
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr "Bind Passwort"
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr "Sicherheit"
+
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr "Server"
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr "URI"
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr "LDAP DN für die Verbindung"
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr "LDAP Passwort für die Verbindung"
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr "Passwort für den LDAP-Server"
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr "Sicherheit für die Verbindung zum LDAP-Server"
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr "Name des LDAP-Servers"
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr "Verbindung"
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr "Verbindungstest LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr "LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr "Verbindung"
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr "LDAP Verbindung"
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr "Verbindungstest Init"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr "Keine"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr "LDAP Verbindung"
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr "Verbindungs_test"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr "Verbindungstest erfolgreich!"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr "Verbindungstest LDAP"
+
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr "OK"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..20e835c
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,111 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr "Directorio activo"
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr "DN de enlace"
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr "Contraseña de enlace"
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr "Puerto"
+
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr "Segura"
+
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr "URI"
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr "DN LDAP usado para enlazar"
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr "Contraseña LDAP usada para enlazar"
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr "Puerto del servidor LDAP"
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr "Conexión LDAP segura"
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr "Nombre del servidor LDAP"
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr "Probar conexión LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr "LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr "Conexión LDAP"
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr "Prueba de conexión - Iniciar"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr "Nunca"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr "Conexión LDAP"
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr "_Probar conexión"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr "El test de conexión finalizó correctamente"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr "Probar conexión LDAP"
+
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr "Aceptar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..1356e18
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,111 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr "Directorio activo"
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr "DN de enlace"
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr "Contraseña de enlace"
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr "Puerto"
+
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr "Segura"
+
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr "URI"
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr "DN LDAP utilizado para enlazar"
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr "Contraseña LDAP utilizada para enlazar"
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr "Puerto del servidor LDAP"
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr "Conexión LDAP segura"
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr "Nombre del servidor LDAP"
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr "Probar conexión LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr "LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr "Conexión LDAP"
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr "Test de conexión - Inicializar"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr "Nunca"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr "Conexión LDAP"
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr "_Probar conexión"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr "El test de conexión finalizó correctamente"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr "Prueba la conexión LDAP"
+
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr "Aceptar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..8b26dab
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,111 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr "Active Directory"
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr "Lien DN"
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr "Mot de passe du lien"
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr "Sécurité"
+
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr "URI"
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr "DN LDAP utilisé pour le lien"
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr "Mot de passe LDAP utilisé pour le lien"
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr "Port serveur LDAP"
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr "Connexion LDAP sécurisée"
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr "Nom du serveur LDAP"
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr "Connexion"
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr "Test connexion LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr "LDAP"
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr "Connexion"
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr "Connexion LDAP"
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr "Test connexion - Init"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr "Aucune"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr "SSL"
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr "TLS"
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr "Connexion LDAP"
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr "_Test connexion"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr "Test connexion réussi !"
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr "Test connexion LDAP"
+
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr "Ok"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..d00cc66
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,113 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr ""
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr ""
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr ""
+
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr ""
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr ""
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr ""
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr ""
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr ""
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr ""
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr ""
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr ""
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr ""
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr "Oké"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..67d6b24
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,114 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:ldap.connection,active_directory:0"
+msgid "Active Directory"
+msgstr ""
+
+msgctxt "field:ldap.connection,bind_dn:0"
+msgid "Bind DN"
+msgstr ""
+
+msgctxt "field:ldap.connection,bind_pass:0"
+msgid "Bind Pass"
+msgstr ""
+
+msgctxt "field:ldap.connection,port:0"
+msgid "Port"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:ldap.connection,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:ldap.connection,secure:0"
+msgid "Secure"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:ldap.connection,server:0"
+msgid "Server"
+msgstr "Сервер"
+
+msgctxt "field:ldap.connection,uri:0"
+msgid "URI"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_dn:0"
+msgid "LDAP DN used to bind"
+msgstr ""
+
+msgctxt "help:ldap.connection,bind_pass:0"
+msgid "LDAP password used to bind"
+msgstr ""
+
+msgctxt "help:ldap.connection,port:0"
+msgid "LDAP server port"
+msgstr ""
+
+msgctxt "help:ldap.connection,secure:0"
+msgid "LDAP secure connection"
+msgstr ""
+
+msgctxt "help:ldap.connection,server:0"
+msgid "LDAP server name"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_connection_form"
+msgid "Connection"
+msgstr ""
+
+msgctxt "model:ir.action,name:wizard_test_connection"
+msgid "Test LDAP Connection"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_administration"
+msgid "LDAP"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_connection"
+msgid "Connection"
+msgstr ""
+
+msgctxt "model:ldap.connection,name:0"
+msgid "LDAP Connection"
+msgstr ""
+
+msgctxt "model:ldap.test_connection.init,name:0"
+msgid "Test Connection - Init"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "Never"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "SSL"
+msgstr ""
+
+msgctxt "selection:ldap.connection,secure:0"
+msgid "TLS"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "LDAP Connection"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "_Test Connection"
+msgstr ""
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test Connection Succeed!"
+msgstr ""
+
+msgctxt "view:ldap.test_connection.init:0"
+msgid "Test LDAP Connection"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:ldap.test_connection,init,end:0"
+msgid "Ok"
+msgstr "Ок"
diff --git a/setup.py b/setup.py
index 675727f..bba0bd5 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,20 @@ setup(name='trytond_ldap_connection',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'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',
'Natural Language :: German',
+ '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 8d9e5fb..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/test_ldap_connection.py b/tests/test_ldap_connection.py
index b707b3f..d6722a0 100644
--- a/tests/test_ldap_connection.py
+++ b/tests/test_ldap_connection.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 LDAPConnectionTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class LDAPConnectionTestCase(unittest.TestCase):
'''
test_view('ldap_connection')
+ 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_ldap_connection.pyc b/tests/test_ldap_connection.pyc
deleted file mode 100644
index 9413216..0000000
Binary files a/tests/test_ldap_connection.pyc and /dev/null differ
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 83116fc..156a059 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,27 +1,30 @@
Metadata-Version: 1.0
Name: trytond-ldap-connection
-Version: 2.0.0
+Version: 2.2.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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 :: Financial and Insurance Industry
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
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_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index ef9e734..5373dd0 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -4,22 +4,21 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
connection.xml
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
setup.py
./__init__.py
./__tryton__.py
./connection.py
./tests/__init__.py
./tests/test_ldap_connection.py
-tests/__init__.py
-tests/__init__.pyc
-tests/test_ldap_connection.py
-tests/test_ldap_connection.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_ldap_connection.egg-info/PKG-INFO
trytond_ldap_connection.egg-info/SOURCES.txt
trytond_ldap_connection.egg-info/dependency_links.txt
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index 296296a..d533bb3 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 32c06ab27f3016827eee7251e8782c6f268ebb41
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 12:26:58 2011 +0200
Removing deprecated XB-Python-Version for dh_python2.
diff --git a/debian/control b/debian/control
index ea3acd5..c8f0188 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0), python-ldap,
python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (LDAP Connection Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit ac89d7ffeb9bc1695576c2ea9c351a12517cd728
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:17:50 2011 +0200
Releasing debian version 2.0.0-2.
diff --git a/debian/changelog b/debian/changelog
index ee23630..c4900ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-ldap-connection (2.0.0-2) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing for new source package version obsoleted README.source file.
+ * Adding options for source package.
+ * Compacting copyright file.
+ * Not wrapping uploaders field, it does not exceed 80 chars.
+
+ [ Mathias Behrle ]
+ * Moving from deprecated python-support to dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 14 Jul 2011 01:17:46 +0200
+
tryton-modules-ldap-connection (2.0.0-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit 3654d409cd63d7b87cd17bbf597cfa765a6d43ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 20:23:39 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index 6c746fb..ea3acd5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
+X-Python-Version: >= 2.5
Package: tryton-modules-ldap-connection
Architecture: all
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..7d7185d
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,2 @@
+python_ldap python-ldap
+
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit 5e1a54d1f37e3fca088f45300f5764fe698ae352
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 16:01:11 2011 +0200
Not wrapping uploaders field, it does not exceed 80 chars.
diff --git a/debian/control b/debian/control
index d809ef9..6c746fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-ldap-connection
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders:
- Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.2
commit 89db431d15cf83145d0cccc128b7706f65c0fe55
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:54:39 2011 +0200
Compacting copyright file.
diff --git a/debian/copyright b/debian/copyright
index 3c2c1b9..85d9bd1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,3 @@
-Upstream-Contact: Tryton project <tryton at googlegroups.com>
-Upstream-Homepage: http://downloads.tryton.org/
-Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Maintainer-Homepage: http://tryton.debian-maintainers.org/
-
Files: *
Copyright:
(C) 2006-2011 Cedric Krier
@@ -13,25 +8,12 @@ Copyright:
(C) 2008-2010 Udo Spallek
(C) 2008-2010 virtual things
License: GPL-3+
- 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/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
+
+License: GPL-3+
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
@@ -45,5 +27,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
commit cf4ff20322438366082af5456b1e5b76d77d5051
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:55 2011 +0200
Adding options for source package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit a93a1087db2c87352cafc253ce0fe9660b4e646c
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:02 2011 +0200
Removing for new source package version obsoleted README.source file.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b24..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-Package Repositories
---------------------
-
-Backports for the current stable debian distribution as well as snapshots of
-unreleased versions may be available in repositories listed on the maintainers
-homepage. The current URL of the maintainer homepage can be seen in
-debian/copyright.
-
-
-Source Access
--------------
-
-You can obtain the sources of this package with:
-
- $ apt-get source ${PACKAGE}
-
-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
-
-This package is maintained with the Git version control system. The current git
-source tree can be obtained with:
-
- $ git clone ${GIT_URI}
-
-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
-repository. The current Git URI can be seen in debian/control in the extracted
-package sources.
-
-More information about Git can be found in the git-core package.
-
-This package may use the Quilt patch system to manage all modifications to the
-upstream source. Changes, if any, are stored in the source package as diffs in
-debian/diff and are applied during the build. Current modifications can be
-applied to the source tree with:
-
- $ QUILT_PATCHES=debian/patches quilt push -a
-
-More information about Quilt can be found in the quilt package.
commit 1c769c55c344a905ba8bc7a45ca688db30e831b7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:03 2011 +0200
Releasing debian version 2.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 383df41..ee23630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-ldap-connection (2.0.0-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+ * Updating Copyright.
+ * Updating versioned tryton depends to 2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:34:37 +0200
+
tryton-modules-ldap-connection (1.8.0-2) unstable; urgency=low
* Changing my email address.
commit fc74e8cdcbf88f1f8a12492ecea3342b4e568fb4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:21:34 2011 +0200
Updating versioned tryton depends to 2.0.
diff --git a/debian/control b/debian/control
index a0e7220..d809ef9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connect
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8), python-ldap,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0), python-ldap,
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (LDAP Connection Module)
commit 38cc9af1a7257c80aa758bae38cd28cdcb8dad32
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 20:40:03 2011 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 72e5b36..3c2c1b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2006-2010 Cedric Krier
- (C) 2009-2010 Bertrand Chenal
- (C) 2009-2010 B2CK SPRL
+ (C) 2006-2011 Cedric Krier
+ (C) 2009-2011 Bertrand Chenal
+ (C) 2009-2011 B2CK SPRL
(C) 2008 Josh Dukes
(C) 2008 Micro-Vu
(C) 2008-2010 Udo Spallek
commit 989834976105c1c89d0858273c3072d966fcd69a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:50 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index baf643a..cd4ca4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-26
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3cbd8f2..a31001a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2010 Cédric Krier.
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2006-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 B2CK SPRL.
Copyright (C) 2008 Josh Dukes.
Copyright (C) 2008 Micro-Vu.
Copyright (C) 2008-2010 Udo Spallek.
diff --git a/PKG-INFO b/PKG-INFO
index a4c62be..3039f0e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_connection
-Version: 1.8.0
+Version: 2.0.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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
@@ -15,11 +15,14 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
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: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/__tryton__.py b/__tryton__.py
index ea06c97..94ae0aa 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,15 +2,17 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'LDAP Connection',
+ 'name_bg_BG' : 'LDAP свързване',
'name_de_DE' : 'LDAP Verbindung',
'name_es_CO': 'Conexión LDAP',
'name_es_ES': 'Conexión LDAP',
'name_fr_FR' : 'Connexion LDAP',
- 'version': '1.8.0',
+ 'version': '2.0.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Add basic support for LDAP connection.''',
+ 'description_bg_BG': 'Предоставя базова връзка с LDAP.',
'description_de_DE' : '''LDAP Verbindung
- Fügt Basisunterstützung für Verbindungen zu einem LDAP-Server hinzu
''',
@@ -25,6 +27,7 @@
'connection.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..d5c50d2
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+field,"ldap.connection,active_directory",0,Active Directory,Активна директория,0
+field,"ldap.connection,bind_dn",0,Bind DN,DN,0
+field,"ldap.connection,bind_pass",0,Bind Pass,Парола,0
+field,"ldap.connection,port",0,Port,Порт,0
+field,"ldap.connection,rec_name",0,Name,Име,0
+field,"ldap.connection,secure",0,Secure,Кодирана,0
+field,"ldap.connection,server",0,Server,Сървър,0
+field,"ldap.connection,uri",0,URI,URI,0
+help,"ldap.connection,bind_dn",0,LDAP DN used to bind,Използван LDAP DN ,0
+help,"ldap.connection,bind_pass",0,LDAP password used to bind,LDAP парола за свързване,0
+help,"ldap.connection,port",0,LDAP server port,Порт на LDAP сървъра,0
+help,"ldap.connection,secure",0,LDAP secure connection,Кодирана LDAP връзка,0
+help,"ldap.connection,server",0,LDAP server name,Име на LDAP сървър,0
+model,"ir.action,name",act_connection_form,Connection,Връзка,0
+model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Тестово LDAP свързване,0
+model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
+model,"ir.ui.menu,name",menu_connection,Connection,Връзка,0
+model,"ldap.connection,name",0,LDAP Connection,LDAP свързване,0
+model,"ldap.test_connection.init,name",0,Test Connection - Init,Начало на тестово свързване,0
+selection,"ldap.connection,secure",0,Never,Никога,0
+selection,"ldap.connection,secure",0,SSL,SSL,0
+selection,"ldap.connection,secure",0,TLS,TLS,0
+view,ldap.connection,0,LDAP Connection,LDAP свързване,0
+view,ldap.connection,0,_Test Connection,Тестово свързване,0
+view,ldap.test_connection.init,0,Test Connection Succeed!,Тестовото свързване успешно!,0
+view,ldap.test_connection.init,0,Test LDAP Connection,Тестово LDAP свързване,0
+wizard_button,"ldap.test_connection,init,end",0,Ok,Добре,0
diff --git a/connection.xml b/connection.xml
index d5f8cde..202cc0a 100644
--- a/connection.xml
+++ b/connection.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
<data>
<menuitem name="LDAP" id="menu_administration"
- parent="ir.menu_administration"/>
+ parent="ir.menu_administration" groups="res.group_admin"/>
<record model="ir.ui.view" id="test_connection_init_form">
<field name="model">ldap.test_connection.init</field>
@@ -55,7 +55,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_connection_form">
<field name="name">Connection</field>
<field name="res_model">ldap.connection</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_connection_form_view1">
<field name="sequence" eval="10"/>
@@ -63,7 +62,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_window" ref="act_connection_form"/>
</record>
<menuitem parent="menu_administration" action="act_connection_form"
- id="menu_connection" icon="tryton-list"/>
+ id="menu_connection" icon="tryton-list" groups="res.group_admin"/>
<record model="ir.model.access" id="access_ldap_connection">
<field name="model" search="[('model', '=', 'ldap.connection')]"/>
diff --git a/setup.py b/setup.py
index 69f584e..675727f 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_ldap_connection',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'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',
'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
],
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index a359d23..83116fc 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-connection
-Version: 1.8.0
+Version: 2.0.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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
@@ -15,11 +15,14 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
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: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/trytond_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index 7b7d7c2..ef9e734 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
connection.xml
de_DE.csv
es_CO.csv
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index 09d91c7..296296a 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit d58966ee2e5c1c2d339f7faedcf4a916befafbf7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:54 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index 58b9aa6..a0e7220 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
commit 5046487e43d37b38443b2b32d20085478185630f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:11:01 2011 +0100
Releasing debian version 1.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index f4c9d8f..383df41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-ldap-connection (1.8.0-2) unstable; urgency=low
+
+ * Changing my email address.
+ * Setting minimal Python version to 2.5.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:10:50 +0100
+
tryton-modules-ldap-connection (1.8.0-1) experimental; urgency=low
* Updating standards version to 3.9.0.
commit 0360f26c41aa7cce65689b8060cf8ff90c43d9ba
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:43 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 8f472b8..72e5b36 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,7 +30,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit 0d44267d6c40e44db0bd4a7b3e14b55b0c59552e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 15 17:27:18 2011 +0100
Setting minimal Python version to 2.5.
diff --git a/debian/pyversions b/debian/pyversions
index 8b253bc..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.5-
commit b489cd389cbd53fe1e794dbd63b3020a963f1b8f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 11:48:55 2010 +0100
Changing my email address.
diff --git a/debian/control b/debian/control
index d7004a7..58b9aa6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+ Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.1
commit a6dd6d0351274def828edc0263c037271466478a
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Nov 12 13:04:35 2010 +0100
Releasing debian version 1.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 26a6dd0..f4c9d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-ldap-connection (1.8.0-1) experimental; urgency=low
+
+ * Updating standards version to 3.9.0.
+ * Updating to debhelper version 8.
+ * Updating to standards version 3.9.1.
+ * Switching to source format 3.0 (quilt).
+ * Merging upstream version 1.8.0.
+ * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 12 Nov 2010 13:02:34 +0100
+
tryton-modules-ldap-connection (1.6.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit dd1ce3e8c851546e9ffa66dcdc98a715bf51d689
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:16:01 2010 +0100
Updating versioned tryton depends to 1.8.
diff --git a/debian/control b/debian/control
index 61290a4..d7004a7 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connect
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6), python-ldap,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8), python-ldap,
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (LDAP Connection Module)
commit 074c7f9441dc96a7ba952e96b6eee4d2b548848b
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:13:24 2010 +0100
Merging upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index c1777ea..baf643a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-09
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index e92dcde..7e1d112 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_ldap_connection
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* python-ldap (http://python-ldap.sourceforge.net/)
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 33aa503..a4c62be 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_connection
-Version: 1.6.0
+Version: 1.8.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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 dfd542c..ea06c97 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Conexión LDAP',
'name_es_ES': 'Conexión LDAP',
'name_fr_FR' : 'Connexion LDAP',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/connection.py b/connection.py
index bd539a7..2226a81 100644
--- a/connection.py
+++ b/connection.py
@@ -1,9 +1,9 @@
#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 ldap
from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
from trytond.wizard import Wizard
from trytond.pyson import Bool, Not, Eval
-import ldap
class Connection(ModelSingleton, ModelSQL, ModelView):
@@ -28,37 +28,36 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
uri = fields.Function(fields.Char('URI'), 'get_uri')
active_directory = fields.Boolean('Active Directory')
- def default_port(self, cursor, user, context=None):
+ def default_port(self):
return 389
- def default_secure(self, cursor, user, context=None):
+ def default_secure(self):
return 'never'
- def default_active_directory(self, cursor, user, context=None):
+ def default_active_directory(self):
return False
- def on_change_secure(self, cursor, user, values, context=None):
+ def on_change_secure(self, values):
res = {}
if values.get('secure') in ('never', 'tls'):
- res['port'] = self.default_port(cursor, user, context=context)
+ res['port'] = self.default_port()
elif values.get('secure') == 'ssl':
res['port'] = 636
return res
- def get_uri(self, cursor, user, ids, name, context=None):
+ def get_uri(self, ids, name):
res = {}
- for connection in self.browse(cursor, user, ids, context=context):
+ for connection in self.browse(ids):
res[connection.id] = \
(connection.secure == 'ssl' and 'ldaps' or 'ldap') + \
'://%s:%s/' % (connection.server, connection.port)
return res
- def write(self, cursor, user, ids, values, context=None):
+ def write(self, ids, values):
if 'bind_dn' in values and not values['bind_dn']:
values = values.copy()
values['bind_pass'] = False
- return super(Connection, self).write(cursor, user, ids, values,
- context=context)
+ return super(Connection, self).write(ids, values)
Connection()
@@ -88,12 +87,11 @@ class TestConnection(Wizard):
},
}
- def _test(self, cursor, user, data, context=None):
+ def _test(self, data):
connection_obj = self.pool.get('ldap.connection')
- connection_ids = connection_obj.search(cursor, user, [],
- limit=1, context=context)
- connection = connection_obj.browse(cursor, user, connection_ids[0],
- context=context)
+ connection_ids = connection_obj.search([],
+ limit=1)
+ connection = connection_obj.browse(connection_ids[0])
con = ldap.initialize(connection.uri)
if connection.secure == 'tls':
con.start_tls_s()
diff --git a/de_DE.csv b/de_DE.csv
index 7b9cc5f..ea0bd3d 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -14,8 +14,8 @@ help,"ldap.connection,secure",0,LDAP secure connection,Sicherheit für die Verbi
help,"ldap.connection,server",0,LDAP server name,Name des LDAP-Servers,0
model,"ir.action,name",act_connection_form,Connection,Verbindung,0
model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Verbindungstest LDAP,0
-model,"ir.ui.menu,name",menu_connection,Connection,Verbindung,0
model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
+model,"ir.ui.menu,name",menu_connection,Connection,Verbindung,0
model,"ldap.connection,name",0,LDAP Connection,LDAP Verbindung,0
model,"ldap.test_connection.init,name",0,Test Connection - Init,Verbindungstest - Init,0
selection,"ldap.connection,secure",0,Never,Keine,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 865ade0..22c9227 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -14,8 +14,8 @@ help,"ldap.connection,secure",0,LDAP secure connection,Connexion LDAP sécurisé
help,"ldap.connection,server",0,LDAP server name,Nom du serveur LDAP,0
model,"ir.action,name",act_connection_form,Connection,Connexion,0
model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Test connexion LDAP,0
-model,"ir.ui.menu,name",menu_connection,Connection,Connexion,0
model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
+model,"ir.ui.menu,name",menu_connection,Connection,Connexion,0
model,"ldap.connection,name",0,LDAP Connection,Connexion LDAP,0
model,"ldap.test_connection.init,name",0,Test Connection - Init,Test connexion - Init,0
selection,"ldap.connection,secure",0,Never,Aucune,0
diff --git a/tests/test_ldap_connection.py b/tests/test_ldap_connection.py
index 61fbae6..b707b3f 100644
--- a/tests/test_ldap_connection.py
+++ b/tests/test_ldap_connection.py
@@ -25,7 +25,7 @@ class LDAPConnectionTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('ldap_connection'))
+ test_view('ldap_connection')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/tests/test_ldap_connection.pyc b/tests/test_ldap_connection.pyc
index 1c87147..9413216 100644
Binary files a/tests/test_ldap_connection.pyc and b/tests/test_ldap_connection.pyc differ
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 1e9bfd9..a359d23 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-connection
-Version: 1.6.0
+Version: 1.8.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index f7b2460..09d91c7 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit d83164b0d2b6d1fa4f1319ffe7b1ed2127d1e2d8
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 2 14:26:53 2010 +0100
Switching to source format 3.0 (quilt).
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
commit 7dccb3868f2d51bb94739e93b60dd1c2621d89a0
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:05:32 2010 +0200
Updating to standards version 3.9.1.
diff --git a/debian/control b/debian/control
index cb0fe4a..61290a4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
commit ab6a50cb7cf12ab7b04e1ed0473810fbabba0344
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:04:05 2010 +0200
Updating to debhelper version 8.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 4be92c9..cb0fe4a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
commit 7f719380d87eaadbf84f941888cbdc658ccdc2b7
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 28 20:35:30 2010 +0200
Updating standards version to 3.9.0.
diff --git a/debian/control b/debian/control
index 7f4a2eb..4be92c9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
commit 6c2687f5b455c5b0f20faf35817e88d09d29d3ca
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:13:50 2010 +0200
Releasing debian version 1.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index c9af008..26a6dd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-ldap-connection (1.6.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 1.6.0.
+ * Updating copyright.
+ * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz> Tue, 11 May 2010 00:13:22 +0200
+
tryton-modules-ldap-connection (1.4.0-2) unstable; urgency=low
* Making depends versioned for tryton 1.4.
commit 96ddf60aa577a5b8910663919fd83a2a24911729
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:12:29 2010 +0200
Updating depends.
diff --git a/debian/control b/debian/control
index 5db9f28..7f4a2eb 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connect
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4), python-ldap,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6), python-ldap,
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (LDAP Connection Module)
commit 297aa4ff12ae14a40d3f5e8dc48a737b78da1040
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:11:47 2010 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 67c6891..8f472b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,13 +5,13 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2006-2009 Cedric Krier
- (C) 2009 Bertrand Chenal
- (C) 2009 B2CK SPRL
+ (C) 2006-2010 Cedric Krier
+ (C) 2009-2010 Bertrand Chenal
+ (C) 2009-2010 B2CK SPRL
(C) 2008 Josh Dukes
(C) 2008 Micro-Vu
- (C) 2008 Udo Spallek
- (C) 2008 virtual things
+ (C) 2008-2010 Udo Spallek
+ (C) 2008-2010 virtual things
License: GPL-3+
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
commit c63d3c2bf8bfc47bea76b52d62d7a2854fe53944
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:08:01 2010 +0200
Merging upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..c1777ea 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 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index b0e7567..3cbd8f2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,10 +1,10 @@
-Copyright (C) 2006-2009 Cédric Krier.
-Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2006-2010 Cédric Krier.
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 B2CK SPRL.
Copyright (C) 2008 Josh Dukes.
Copyright (C) 2008 Micro-Vu.
-Copyright (C) 2008 Udo Spallek.
-Copyright (C) 2008 virtual things.
+Copyright (C) 2008-2010 Udo Spallek.
+Copyright (C) 2008-2010 virtual things.
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 9d5b455..33aa503 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_connection
-Version: 1.4.0
+Version: 1.6.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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 3bce63c..dfd542c 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Conexión LDAP',
'name_es_ES': 'Conexión LDAP',
'name_fr_FR' : 'Connexion LDAP',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/connection.py b/connection.py
index d5dc8e9..bd539a7 100644
--- a/connection.py
+++ b/connection.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
from trytond.wizard import Wizard
+from trytond.pyson import Bool, Not, Eval
import ldap
@@ -21,10 +22,10 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
help='LDAP secure connection')
bind_dn = fields.Char('Bind DN', help='LDAP DN used to bind')
bind_pass = fields.Char('Bind Pass', states={
- 'required': "bool(bind_dn)",
- 'readonly': "not bool(bind_dn)",
+ 'required': Bool(Eval('bind_dn')),
+ 'readonly': Not(Bool(Eval('bind_dn'))),
}, help='LDAP password used to bind')
- uri = fields.Function('get_uri', type='char', string='URI')
+ uri = fields.Function(fields.Char('URI'), 'get_uri')
active_directory = fields.Boolean('Active Directory')
def default_port(self, cursor, user, context=None):
@@ -36,7 +37,7 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
def default_active_directory(self, cursor, user, context=None):
return False
- def on_change_secure(self, cursor, user, ids, values, context=None):
+ def on_change_secure(self, cursor, user, values, context=None):
res = {}
if values.get('secure') in ('never', 'tls'):
res['port'] = self.default_port(cursor, user, context=context)
@@ -44,7 +45,7 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
res['port'] = 636
return res
- def get_uri(self, cursor, user, ids, name, arg, context=None):
+ def get_uri(self, cursor, user, ids, name, context=None):
res = {}
for connection in self.browse(cursor, user, ids, context=context):
res[connection.id] = \
diff --git a/setup.py b/setup.py
index 7bfc3c3..69f584e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#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, find_packages
+from setuptools import setup
import re
info = eval(file('__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 = ['python-ldap']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ 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_ldap_connection',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_ldap_connection',
package_dir={'trytond.modules.ldap_connection': '.'},
packages=[
'trytond.modules.ldap_connection',
+ 'trytond.modules.ldap_connection.tests',
],
package_data={
'trytond.modules.ldap_connection': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_ldap_connection',
[trytond.modules]
ldap_connection = trytond.modules.ldap_connection
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 421e9df..6b1fb81 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_ldap_connection import *
+from test_ldap_connection import suite
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
new file mode 100644
index 0000000..8d9e5fb
Binary files /dev/null and b/tests/__init__.pyc differ
diff --git a/tests/test_ldap_connection.py b/tests/test_ldap_connection.py
index 8245b55..61fbae6 100644
--- a/tests/test_ldap_connection.py
+++ b/tests/test_ldap_connection.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 LDAPConnectionTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class LDAPConnectionTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('ldap_connection'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(LDAPConnectionTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ LDAPConnectionTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteLDAPConnection = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteLDAPConnection])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tests/test_ldap_connection.pyc b/tests/test_ldap_connection.pyc
new file mode 100644
index 0000000..1c87147
Binary files /dev/null and b/tests/test_ldap_connection.pyc differ
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 595f673..1e9bfd9 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-connection
-Version: 1.4.0
+Version: 1.6.0
Summary: Add basic support for LDAP connection.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
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_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index d3ea856..7b7d7c2 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -13,8 +13,12 @@ setup.py
./__init__.py
./__tryton__.py
./connection.py
+./tests/__init__.py
+./tests/test_ldap_connection.py
tests/__init__.py
+tests/__init__.pyc
tests/test_ldap_connection.py
+tests/test_ldap_connection.pyc
trytond_ldap_connection.egg-info/PKG-INFO
trytond_ldap_connection.egg-info/SOURCES.txt
trytond_ldap_connection.egg-info/dependency_links.txt
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index 3072a8f..f7b2460 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,3 +1,2 @@
python-ldap
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 05705918324c134c8e5bbc3fed3c3ac20f78e27a
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 14:31:33 2010 +0200
Adding Dm-Upload-Allowed in control in preparation for Mathias.
diff --git a/debian/control b/debian/control
index b814f29..5db9f28 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
commit 9e674a3337db448d13e090265f437a71bdc1dada
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:36:35 2010 +0100
Releasing debian version 1.4.0-2.
diff --git a/debian/changelog b/debian/changelog
index 2f036f8..c9af008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-ldap-connection (1.4.0-2) unstable; urgency=low
+
+ * Making depends versioned for tryton 1.4.
+ * Adding explicit debian source version 1.0 until switch to 3.0.
+ * Updating year in copyright file.
+ * Removing unneeded python-all-dev from build-depends.
+ * Updating to standards 3.8.4.
+ * Updating README.source.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Feb 2010 10:35:32 +0100
+
tryton-modules-ldap-connection (1.4.0-1) unstable; urgency=low
* Initial release.
commit eacd9d83e0c9eeb4d59123c84c66b418bfa55f3c
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:35:08 2010 +0100
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index dcc7ba3..18b6b24 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -32,6 +32,6 @@ upstream source. Changes, if any, are stored in the source package as diffs in
debian/diff and are applied during the build. Current modifications can be
applied to the source tree with:
- $ quilt push -a
+ $ QUILT_PATCHES=debian/patches quilt push -a
More information about Quilt can be found in the quilt package.
commit 3a684027c4e5f388880ebee6952abaf7faa9683b
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jan 28 07:53:21 2010 +0100
Updating to standards 3.8.4.
diff --git a/debian/control b/debian/control
index 2e5e14d..b814f29 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
commit 2afea68c9011f1aad593e42e62893606faced49f
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 25 10:12:27 2010 +0100
Removing unneeded python-all-dev from build-depends.
diff --git a/debian/control b/debian/control
index e90e12f..2e5e14d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends:
- debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
commit fb25b57da706d164b77f8ed670fd443b14473210
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 2 11:35:22 2010 +0100
Updating year in copyright file.
diff --git a/debian/copyright b/debian/copyright
index a651208..67c6891 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,7 +30,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit 4933d4eccaae3dd43d1bc3c60c380edfd8e36507
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 12 10:06:31 2009 +0100
Adding explicit debian source version 1.0 until switch to 3.0.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit fd55f15a6d4b6828fe24b0ce5ae9a9c9ac210e6e
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 4 12:22:20 2009 +0100
Making depends versioned for tryton 1.4.
diff --git a/debian/control b/debian/control
index 0bab9cc..e90e12f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connect
Package: tryton-modules-ldap-connection
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server, python-ldap,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4), python-ldap,
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (LDAP Connection Module)
commit babbbb88f8973a9d80f79d5ab381923aa85ad33b
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:50 2009 +0200
Adding debian version 1.4.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..b0e7567
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,20 @@
+Copyright (C) 2006-2009 Cédric Krier.
+Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2008 Josh Dukes.
+Copyright (C) 2008 Micro-Vu.
+Copyright (C) 2008 Udo Spallek.
+Copyright (C) 2008 virtual things.
+
+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..e92dcde
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,30 @@
+Installing trytond_ldap_connection
+==================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * python-ldap (http://python-ldap.sourceforge.net/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_ldap_connection 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 ldap_connection.
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..9d5b455
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_ldap_connection
+Version: 1.4.0
+Summary: Add basic support for LDAP connection.
+Home-page: http://www.tryton.org/
+Author: B2CK, Josh Dukes & Udo Spallek
+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 :: Financial and Insurance Industry
+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
+Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/README b/README
new file mode 100644
index 0000000..183934f
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_ldap_connection
+=======================
+
+The ldap_connection 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..744206e
--- /dev/null
+++ b/__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 connection import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..3bce63c
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,33 @@
+#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': 'LDAP Connection',
+ 'name_de_DE' : 'LDAP Verbindung',
+ 'name_es_CO': 'Conexión LDAP',
+ 'name_es_ES': 'Conexión LDAP',
+ 'name_fr_FR' : 'Connexion LDAP',
+ 'version': '1.4.0',
+ 'author': 'B2CK, Josh Dukes & Udo Spallek',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Add basic support for LDAP connection.''',
+ 'description_de_DE' : '''LDAP Verbindung
+ - Fügt Basisunterstützung für Verbindungen zu einem LDAP-Server hinzu
+''',
+ 'description_es_CO': 'Añade soporte básico para conexiones LDAP.',
+ 'description_es_ES': 'Añade soporte básico para conexiones LDAP.',
+ 'description_fr_FR': '''Ajoute le support de base pour les connexions LDAP''',
+ 'depends': [
+ 'ir',
+ 'res',
+ ],
+ 'xml': [
+ 'connection.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/connection.py b/connection.py
new file mode 100644
index 0000000..d5dc8e9
--- /dev/null
+++ b/connection.py
@@ -0,0 +1,105 @@
+#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, ModelSingleton, fields
+from trytond.wizard import Wizard
+import ldap
+
+
+class Connection(ModelSingleton, ModelSQL, ModelView):
+ "LDAP Connection"
+ _description = __doc__
+ _name = 'ldap.connection'
+ _rec_name = 'server'
+
+ server = fields.Char('Server', required=True, help='LDAP server name')
+ port = fields.Integer('Port', required=True, help='LDAP server port')
+ secure = fields.Selection([
+ ('never', 'Never'),
+ ('ssl', 'SSL'),
+ ('tls', 'TLS'),
+ ], 'Secure', on_change=['secure'], required=True,
+ help='LDAP secure connection')
+ bind_dn = fields.Char('Bind DN', help='LDAP DN used to bind')
+ bind_pass = fields.Char('Bind Pass', states={
+ 'required': "bool(bind_dn)",
+ 'readonly': "not bool(bind_dn)",
+ }, help='LDAP password used to bind')
+ uri = fields.Function('get_uri', type='char', string='URI')
+ active_directory = fields.Boolean('Active Directory')
+
+ def default_port(self, cursor, user, context=None):
+ return 389
+
+ def default_secure(self, cursor, user, context=None):
+ return 'never'
+
+ def default_active_directory(self, cursor, user, context=None):
+ return False
+
+ def on_change_secure(self, cursor, user, ids, values, context=None):
+ res = {}
+ if values.get('secure') in ('never', 'tls'):
+ res['port'] = self.default_port(cursor, user, context=context)
+ elif values.get('secure') == 'ssl':
+ res['port'] = 636
+ return res
+
+ def get_uri(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ for connection in self.browse(cursor, user, ids, context=context):
+ res[connection.id] = \
+ (connection.secure == 'ssl' and 'ldaps' or 'ldap') + \
+ '://%s:%s/' % (connection.server, connection.port)
+ return res
+
+ def write(self, cursor, user, ids, values, context=None):
+ if 'bind_dn' in values and not values['bind_dn']:
+ values = values.copy()
+ values['bind_pass'] = False
+ return super(Connection, self).write(cursor, user, ids, values,
+ context=context)
+
+Connection()
+
+
+class TestConnectionInit(ModelView):
+ 'Test Connection - Init'
+ _description = __doc__
+ _name = 'ldap.test_connection.init'
+
+TestConnectionInit()
+
+
+class TestConnection(Wizard):
+ "Test LDAP Connection"
+ _description = __doc__
+ _name = 'ldap.test_connection'
+ states = {
+ 'init': {
+ 'actions': ['_test'],
+ 'result': {
+ 'type': 'form',
+ 'object': 'ldap.test_connection.init',
+ 'state': [
+ ('end', 'Ok', 'tryton-ok', True),
+ ],
+ },
+ },
+ }
+
+ def _test(self, cursor, user, data, context=None):
+ connection_obj = self.pool.get('ldap.connection')
+ connection_ids = connection_obj.search(cursor, user, [],
+ limit=1, context=context)
+ connection = connection_obj.browse(cursor, user, connection_ids[0],
+ context=context)
+ con = ldap.initialize(connection.uri)
+ if connection.secure == 'tls':
+ con.start_tls_s()
+ if connection.bind_dn:
+ con.simple_bind_s(connection.bind_dn, connection.bind_pass)
+ else:
+ con.simple_bind_s()
+ return {}
+
+TestConnection()
diff --git a/connection.xml b/connection.xml
new file mode 100644
index 0000000..d5f8cde
--- /dev/null
+++ b/connection.xml
@@ -0,0 +1,85 @@
+<?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>
+
+ <menuitem name="LDAP" id="menu_administration"
+ parent="ir.menu_administration"/>
+
+ <record model="ir.ui.view" id="test_connection_init_form">
+ <field name="model">ldap.test_connection.init</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Test LDAP Connection">
+ <label string="Test Connection Succeed!" id="succeed"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.action.wizard" id="wizard_test_connection">
+ <field name="name">Test LDAP Connection</field>
+ <field name="wiz_name">ldap.test_connection</field>
+ <field name="model">ldap.connection</field>
+ </record>
+
+ <record model="ir.ui.view" id="connection_view_form">
+ <field name="model">ldap.connection</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="LDAP Connection" col="6">
+ <label name="server"/>
+ <field name="server"/>
+ <label name="port"/>
+ <field name="port"/>
+ <label name="secure"/>
+ <field name="secure"/>
+ <label name="bind_dn"/>
+ <field name="bind_dn"/>
+ <label name="bind_pass"/>
+ <field name="bind_pass" widget="sha"/>
+ <label name="active_directory"/>
+ <field name="active_directory"/>
+ <separator id="buttons" colspan="6"/>
+ <group colspan="6" id="buttons">
+ <button name="%(wizard_test_connection)d"
+ string="_Test Connection" type="action"/>
+ </group>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_connection_form">
+ <field name="name">Connection</field>
+ <field name="res_model">ldap.connection</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_connection_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="connection_view_form"/>
+ <field name="act_window" ref="act_connection_form"/>
+ </record>
+ <menuitem parent="menu_administration" action="act_connection_form"
+ id="menu_connection" icon="tryton-list"/>
+
+ <record model="ir.model.access" id="access_ldap_connection">
+ <field name="model" search="[('model', '=', 'ldap.connection')]"/>
+ <field name="perm_read" eval="False"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_ldap_connection_admin">
+ <field name="model" search="[('model', '=', 'ldap.connection')]"/>
+ <field name="group" ref="res.group_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ </data>
+</tryton>
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..7b9cc5f
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+field,"ldap.connection,active_directory",0,Active Directory,Active Directory,0
+field,"ldap.connection,bind_dn",0,Bind DN,Bind DN,0
+field,"ldap.connection,bind_pass",0,Bind Pass,Bind Passwort,0
+field,"ldap.connection,port",0,Port,Port,0
+field,"ldap.connection,rec_name",0,Name,Name,0
+field,"ldap.connection,secure",0,Secure,Sicherheit,0
+field,"ldap.connection,server",0,Server,Server,0
+field,"ldap.connection,uri",0,URI,URI,0
+help,"ldap.connection,bind_dn",0,LDAP DN used to bind,LDAP DN für die Verbindung,0
+help,"ldap.connection,bind_pass",0,LDAP password used to bind,LDAP Passwort für die Verbindung,0
+help,"ldap.connection,port",0,LDAP server port,Passwort für den LDAP-Server,0
+help,"ldap.connection,secure",0,LDAP secure connection,Sicherheit für die Verbindung zum LDAP-Server,0
+help,"ldap.connection,server",0,LDAP server name,Name des LDAP-Servers,0
+model,"ir.action,name",act_connection_form,Connection,Verbindung,0
+model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Verbindungstest LDAP,0
+model,"ir.ui.menu,name",menu_connection,Connection,Verbindung,0
+model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
+model,"ldap.connection,name",0,LDAP Connection,LDAP Verbindung,0
+model,"ldap.test_connection.init,name",0,Test Connection - Init,Verbindungstest - Init,0
+selection,"ldap.connection,secure",0,Never,Keine,0
+selection,"ldap.connection,secure",0,SSL,SSL,0
+selection,"ldap.connection,secure",0,TLS,TLS,0
+view,ldap.connection,0,LDAP Connection,LDAP Verbindung,0
+view,ldap.connection,0,_Test Connection,Verbindungs_test,0
+view,ldap.test_connection.init,0,Test Connection Succeed!,Verbindungstest erfolgreich!,0
+view,ldap.test_connection.init,0,Test LDAP Connection,Verbindungstest LDAP,0
+wizard_button,"ldap.test_connection,init,end",0,Ok,OK,0
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..dcc7ba3
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2f036f8
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-ldap-connection (1.4.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 20 Oct 2009 12:33:13 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..0bab9cc
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: tryton-modules-ldap-connection
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Build-Depends:
+ debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Standards-Version: 3.8.3
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-ldap-connection.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-ldap-connection.git
+
+Package: tryton-modules-ldap-connection
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server, python-ldap,
+ python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (LDAP Connection Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
+ .
+ This module adds basic support for LDAP connections.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..a651208
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,49 @@
+Upstream-Contact: Tryton project <tryton at googlegroups.com>
+Upstream-Homepage: http://downloads.tryton.org/
+Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer-Homepage: http://tryton.debian-maintainers.org/
+
+Files: *
+Copyright:
+ (C) 2006-2009 Cedric Krier
+ (C) 2009 Bertrand Chenal
+ (C) 2009 B2CK SPRL
+ (C) 2008 Josh Dukes
+ (C) 2008 Micro-Vu
+ (C) 2008 Udo Spallek
+ (C) 2008 virtual things
+License: GPL-3+
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..8b253bc
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..000210b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..a18f027
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+field,"ldap.connection,active_directory",0,Active Directory,Directorio activo,0
+field,"ldap.connection,bind_dn",0,Bind DN,DN de enlace,0
+field,"ldap.connection,bind_pass",0,Bind Pass,Contraseña de enlace,0
+field,"ldap.connection,port",0,Port,Puerto,0
+field,"ldap.connection,rec_name",0,Name,Nombre,0
+field,"ldap.connection,secure",0,Secure,Segura,0
+field,"ldap.connection,server",0,Server,Servidor,0
+field,"ldap.connection,uri",0,URI,URI,0
+help,"ldap.connection,bind_dn",0,LDAP DN used to bind,DN LDAP usado para enlazar,0
+help,"ldap.connection,bind_pass",0,LDAP password used to bind,Contraseña LDAP usada para enlazar,0
+help,"ldap.connection,port",0,LDAP server port,Puerto del servidor LDAP,0
+help,"ldap.connection,secure",0,LDAP secure connection,Conexión LDAP segura,0
+help,"ldap.connection,server",0,LDAP server name,Nombre del servidor LDAP,0
+model,"ir.action,name",act_connection_form,Connection,Conexión,0
+model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Probar conexión LDAP,0
+model,"ir.ui.menu,name",menu_connection,Connection,Conexión,0
+model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
+model,"ldap.connection,name",0,LDAP Connection,Conexión LDAP,0
+model,"ldap.test_connection.init,name",0,Test Connection - Init,Prueba de conexión - Iniciar,0
+selection,"ldap.connection,secure",0,Never,Nunca,0
+selection,"ldap.connection,secure",0,SSL,SSL,0
+selection,"ldap.connection,secure",0,TLS,TLS,0
+view,ldap.connection,0,LDAP Connection,Conexión LDAP,0
+view,ldap.connection,0,_Test Connection,_Probar conexión,0
+view,ldap.test_connection.init,0,Test Connection Succeed!,El test de conexión finalizó correctamente,0
+view,ldap.test_connection.init,0,Test LDAP Connection,Probar conexión LDAP,0
+wizard_button,"ldap.test_connection,init,end",0,Ok,Aceptar,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..cbfaa32
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+field,"ldap.connection,active_directory",0,Active Directory,Directorio activo,0
+field,"ldap.connection,bind_dn",0,Bind DN,DN de enlace,0
+field,"ldap.connection,bind_pass",0,Bind Pass,Contraseña de enlace,0
+field,"ldap.connection,port",0,Port,Puerto,0
+field,"ldap.connection,rec_name",0,Name,Nombre,0
+field,"ldap.connection,secure",0,Secure,Segura,0
+field,"ldap.connection,server",0,Server,Servidor,0
+field,"ldap.connection,uri",0,URI,URI,0
+help,"ldap.connection,bind_dn",0,LDAP DN used to bind,DN LDAP utilizado para enlazar,0
+help,"ldap.connection,bind_pass",0,LDAP password used to bind,Contraseña LDAP utilizada para enlazar,0
+help,"ldap.connection,port",0,LDAP server port,Puerto del servidor LDAP,0
+help,"ldap.connection,secure",0,LDAP secure connection,Conexión LDAP segura,0
+help,"ldap.connection,server",0,LDAP server name,Nombre del servidor LDAP,0
+model,"ir.action,name",act_connection_form,Connection,Conexión,0
+model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Probar conexión LDAP,0
+model,"ir.ui.menu,name",menu_connection,Connection,Conexión,0
+model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
+model,"ldap.connection,name",0,LDAP Connection,Conexión LDAP,0
+model,"ldap.test_connection.init,name",0,Test Connection - Init,Test de conexión - Inicializar,0
+selection,"ldap.connection,secure",0,Never,Nunca,0
+selection,"ldap.connection,secure",0,SSL,SSL,0
+selection,"ldap.connection,secure",0,TLS,TLS,0
+view,ldap.connection,0,LDAP Connection,Conexión LDAP,0
+view,ldap.connection,0,_Test Connection,_Probar conexión,0
+view,ldap.test_connection.init,0,Test Connection Succeed!,El test de conexión finalizó correctamente,0
+view,ldap.test_connection.init,0,Test LDAP Connection,Prueba la conexión LDAP,0
+wizard_button,"ldap.test_connection,init,end",0,Ok,Aceptar,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..865ade0
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+field,"ldap.connection,active_directory",0,Active Directory,Active Directory,0
+field,"ldap.connection,bind_dn",0,Bind DN,Lien DN,0
+field,"ldap.connection,bind_pass",0,Bind Pass,Mot de passe du lien,0
+field,"ldap.connection,port",0,Port,Port,0
+field,"ldap.connection,rec_name",0,Name,Nom,0
+field,"ldap.connection,secure",0,Secure,Sécurité,0
+field,"ldap.connection,server",0,Server,Serveur,0
+field,"ldap.connection,uri",0,URI,URI,0
+help,"ldap.connection,bind_dn",0,LDAP DN used to bind,DN LDAP utilisé pour le lien,0
+help,"ldap.connection,bind_pass",0,LDAP password used to bind,Mot de passe LDAP utilisé pour le lien,0
+help,"ldap.connection,port",0,LDAP server port,Port serveur LDAP,0
+help,"ldap.connection,secure",0,LDAP secure connection,Connexion LDAP sécurisée,0
+help,"ldap.connection,server",0,LDAP server name,Nom du serveur LDAP,0
+model,"ir.action,name",act_connection_form,Connection,Connexion,0
+model,"ir.action,name",wizard_test_connection,Test LDAP Connection,Test connexion LDAP,0
+model,"ir.ui.menu,name",menu_connection,Connection,Connexion,0
+model,"ir.ui.menu,name",menu_administration,LDAP,LDAP,0
+model,"ldap.connection,name",0,LDAP Connection,Connexion LDAP,0
+model,"ldap.test_connection.init,name",0,Test Connection - Init,Test connexion - Init,0
+selection,"ldap.connection,secure",0,Never,Aucune,0
+selection,"ldap.connection,secure",0,SSL,SSL,0
+selection,"ldap.connection,secure",0,TLS,TLS,0
+view,ldap.connection,0,LDAP Connection,Connexion LDAP,0
+view,ldap.connection,0,_Test Connection,_Test connexion,0
+view,ldap.test_connection.init,0,Test Connection Succeed!,Test connexion réussi !,0
+view,ldap.test_connection.init,0,Test LDAP Connection,Test connexion LDAP,0
+wizard_button,"ldap.test_connection,init,end",0,Ok,Ok,0
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..7bfc3c3
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,58 @@
+#!/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, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = ['python-ldap']
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_ldap_connection',
+ 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.ldap_connection': '.'},
+ packages=[
+ 'trytond.modules.ldap_connection',
+ ],
+ package_data={
+ 'trytond.modules.ldap_connection': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ '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',
+ 'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ ldap_connection = trytond.modules.ldap_connection
+ """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..421e9df
--- /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_ldap_connection import *
diff --git a/tests/test_ldap_connection.py b/tests/test_ldap_connection.py
new file mode 100644
index 0000000..8245b55
--- /dev/null
+++ b/tests/test_ldap_connection.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 LDAPConnectionTestCase(unittest.TestCase):
+ '''
+ Test LDAPConnection module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('ldap_connection')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('ldap_connection'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(LDAPConnectionTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteLDAPConnection = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteLDAPConnection])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
new file mode 100644
index 0000000..595f673
--- /dev/null
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-ldap-connection
+Version: 1.4.0
+Summary: Add basic support for LDAP connection.
+Home-page: http://www.tryton.org/
+Author: B2CK, Josh Dukes & Udo Spallek
+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 :: Financial and Insurance Industry
+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
+Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/trytond_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
new file mode 100644
index 0000000..d3ea856
--- /dev/null
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -0,0 +1,24 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+connection.xml
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+setup.py
+./__init__.py
+./__tryton__.py
+./connection.py
+tests/__init__.py
+tests/test_ldap_connection.py
+trytond_ldap_connection.egg-info/PKG-INFO
+trytond_ldap_connection.egg-info/SOURCES.txt
+trytond_ldap_connection.egg-info/dependency_links.txt
+trytond_ldap_connection.egg-info/entry_points.txt
+trytond_ldap_connection.egg-info/not-zip-safe
+trytond_ldap_connection.egg-info/requires.txt
+trytond_ldap_connection.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_ldap_connection.egg-info/dependency_links.txt b/trytond_ldap_connection.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_ldap_connection.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_ldap_connection.egg-info/entry_points.txt b/trytond_ldap_connection.egg-info/entry_points.txt
new file mode 100644
index 0000000..93d95f4
--- /dev/null
+++ b/trytond_ldap_connection.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ ldap_connection = trytond.modules.ldap_connection
+
\ No newline at end of file
diff --git a/trytond_ldap_connection.egg-info/not-zip-safe b/trytond_ldap_connection.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_ldap_connection.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
new file mode 100644
index 0000000..3072a8f
--- /dev/null
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -0,0 +1,3 @@
+python-ldap
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_ldap_connection.egg-info/top_level.txt b/trytond_ldap_connection.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_ldap_connection.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-ldap-connection
More information about the tryton-debian-vcs
mailing list