[tryton-debian-vcs] tryton-modules-calendar-classification branch debian created. e6dd97962ca7caf46c1cb6527002ab4f4698b383

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:59:37 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-calendar-classification.git;a=commitdiff;h=e6dd97962ca7caf46c1cb6527002ab4f4698b383
commit e6dd97962ca7caf46c1cb6527002ab4f4698b383
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 25 20:30:08 2013 +0100

    Releasing debian version 3.0.0-1.

diff --git a/debian/changelog b/debian/changelog
index 81572c6..5930e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-calendar-classification (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:53:40 +0100
+
 tryton-modules-calendar-classification (2.8.0-3) unstable; urgency=low
 
   * Removing pydist-overrides, it is no more needed.
commit 189614cd22b7780d21cb77c8e9d56f46c2b187e8
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 0e4c3d5..0c777b1 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-calendar-classification.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 e76756daf05de98a015e7806bff1ee5fd6c0e0da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 19:14:20 2013 +0100

    Updating to standards version 3.9.5, no changes needed.

diff --git a/debian/control b/debian/control
index 8b345bf..0e4c3d5 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-calendar-classification.git
 Vcs-Git: git://debian.tryton.org/packages/tryton-modules-calendar-classification.git
commit 1b0b2d7ac4e24f9ae966063573884eb57327d48e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 17:26:34 2013 +0100

    Merging upstream version 3.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index b82e27d..8376d07 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 c38777f..8a69a7d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_calendar_classification
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add classification access to events
 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_calendar_classification
         ===============================
         
@@ -60,6 +60,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/calendar_.py b/calendar_.py
index c0dfd8c..bef4230 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -24,7 +24,7 @@ class Event:
 
     @classmethod
     def search(cls, domain, offset=0, limit=None, order=None, count=False,
-            query_string=False):
+            query=False):
         if Transaction().user:
             domain = domain[:]
             domain = [domain,
@@ -40,7 +40,7 @@ class Event:
                     ],
                 ]
         return super(Event, cls).search(domain, offset=offset, limit=limit,
-            order=order, count=count, query_string=query_string)
+            order=order, count=count, query=query)
 
     @classmethod
     def create(cls, vlist):
@@ -89,19 +89,19 @@ class Event:
     def read(cls, ids, fields_names=None):
         Rule = Pool().get('ir.rule')
         cursor = Transaction().cursor
+        table = cls.__table__()
         if len(set(ids)) != cls.search([('id', 'in', ids)],
                 count=True):
             cls.raise_user_error('access_error', cls.__doc__)
 
         writable_ids = []
-        domain1, domain2 = Rule.domain_get(cls.__name__, mode='write')
-        if domain1:
+        domain = Rule.domain_get(cls.__name__, mode='write')
+        if domain:
             for i in range(0, len(ids), cursor.IN_MAX):
                 sub_ids = ids[i:i + cursor.IN_MAX]
-                red_sql, red_ids = reduce_ids('id', sub_ids)
-                cursor.execute('SELECT id FROM "' + cls._table + '" '
-                    'WHERE ' + red_sql + ' AND (' + domain1 + ')',
-                    red_ids + domain2)
+                red_sql = reduce_ids(table.id, sub_ids)
+                cursor.execute(*table.select(table.id,
+                        where=red_sql & table.id.in_(domain)))
                 writable_ids.extend(x[0] for x in cursor.fetchall())
         else:
             writable_ids = ids
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index d0b9c6d..4b684c3 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -7,13 +7,5 @@ msgid "Busy"
 msgstr "Occupé"
 
 msgctxt "error:calendar.event:"
-msgid "Busy"
-msgstr "Occupé"
-
-msgctxt "error:calendar.event:"
-msgid "Free"
-msgstr "Libre"
-
-msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Libre"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..e9ceab5
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:"
+msgid "Busy"
+msgstr "Zasedeno"
+
+msgctxt "error:calendar.event:"
+msgid "Free"
+msgstr "Prosto"
diff --git a/setup.py b/setup.py
index 356c0d7..7467f5c 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_calendar_classification',
         '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/tryton.cfg b/tryton.cfg
index c636627..484a029 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=3.0.0
 depends:
     calendar
     ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 7749c45..e7abb11 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-calendar-classification
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add classification access to events
 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_calendar_classification
         ===============================
         
@@ -60,6 +60,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_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index e73b944..ff569b1 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -18,6 +18,7 @@ locale/es_ES.po
 locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
+locale/sl_SI.po
 trytond_calendar_classification.egg-info/PKG-INFO
 trytond_calendar_classification.egg-info/SOURCES.txt
 trytond_calendar_classification.egg-info/dependency_links.txt
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index 7a60220..b9ade18 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_calendar >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit e6fe215eee4d23575025ebc9208afbf0bd1807a7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 6 16:20:47 2013 +0200

    Releasing debian version 2.8.0-3.

diff --git a/debian/changelog b/debian/changelog
index a62cd33..81572c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-classification (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:32 +0200
+
 tryton-modules-calendar-classification (2.8.0-2) unstable; urgency=low
 
   * Removing needless empty line in rules.
commit 2d613c05dcc64d3d2ce428217c29f6fbd6af65a8
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 b4f96a6e1014d4e433f089728897f420c769054a
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 488d2d9..0000000
--- a/debian/pydist-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-vobject python-vobject
-
commit 1a0274f701a0c8c8c68fa7439e077fcf971f56af
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 31 19:57:26 2013 +0200

    Releasing debian version 2.8.0-2.

diff --git a/debian/changelog b/debian/changelog
index b519839..a62cd33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-calendar-classification (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:17 +0200
+
 tryton-modules-calendar-classification (2.8.0-1) experimental; urgency=low
 
   * Merging upstream version 2.8.0.
commit 90fda7b3cb2f37a708d1d5f3ccfcf6623a062c88
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 db64c84ed15f5ee8a91072e904ca4f8ae45836e2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 2 17:27:03 2013 +0200

    Releasing debian version 2.8.0-1.

diff --git a/debian/changelog b/debian/changelog
index 433ec37..b519839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-classification (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:19:50 +0200
+
 tryton-modules-calendar-classification (2.6.0-4) experimental; urgency=low
 
   * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704374).
commit b4a8bf5a9c53c5f772973031e8990ac2fca919d8
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 deea7da..2c8f4b3 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: 2009-2012 Cédric Krier
+Copyright: 2009-2013 Cédric Krier
            2009-2012 Bertrand Chenal
-           2009-2012 B2CK SPRL
+           2009-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit ad7fae5b3dbb8390a7e5a3fad8aedc521a33fe79
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 2 00:35:32 2013 +0200

    Merging upstream version 2.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index 155813e..b82e27d 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 8ad4b79..39f9196 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 4ff2e12..c38777f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_calendar_classification
-Version: 2.6.0
+Version: 2.8.0
 Summary: Tryton module to add classification access to events
 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_calendar_classification
         ===============================
         
diff --git a/calendar_.py b/calendar_.py
index f84b064..c0dfd8c 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -43,11 +43,12 @@ class Event:
             order=order, count=count, query_string=query_string)
 
     @classmethod
-    def create(cls, values):
-        event = super(Event, cls).create(values)
-        if cls.search([('id', '=', event.id)], count=True) != 1:
+    def create(cls, vlist):
+        events = super(Event, cls).create(vlist)
+        if (cls.search([('id', 'in', [x.id for x in events])], count=True)
+                != len(events)):
             cls.raise_user_error('access_error', cls.__doc__)
-        return event
+        return events
 
     @classmethod
     def _clean_private(cls, record, transp):
diff --git a/setup.py b/setup.py
index c2165dd..356c0d7 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = ['vobject >= 0.8.0']
 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_calendar_classification',
     version=info.get('version', '0.0.1'),
@@ -36,15 +36,15 @@ setup(name='trytond_calendar_classification',
     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.calendar_classification': '.'},
     packages=[
         'trytond.modules.calendar_classification',
         ],
     package_data={
-        'trytond.modules.calendar_classification': info.get('xml', []) \
-            + ['tryton.cfg', 'locale/*.po'],
+        'trytond.modules.calendar_classification': (info.get('xml', [])
+            + ['tryton.cfg', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/tryton.cfg b/tryton.cfg
index 9a9e7df..c636627 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.8.0
 depends:
     calendar
     ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 4893a2a..7749c45 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-calendar-classification
-Version: 2.6.0
+Version: 2.8.0
 Summary: Tryton module to add classification access to events
 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_calendar_classification
         ===============================
         
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index 5de63b2..7a60220 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_calendar >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
commit c07318b4775920791661ad285e02511bb58dba3f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 18:44:42 2013 +0200

    Releasing debian version 2.6.0-4.

diff --git a/debian/changelog b/debian/changelog
index af2dc7b..433ec37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-classification (2.6.0-4) experimental; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704374).
+  * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 27 Apr 2013 15:06:11 +0200
+
 tryton-modules-calendar-classification (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit 6a8fa8672c9a1441730871e7aa3f49607ef08828
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:47 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 5b9d25d..8b345bf 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,9 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-calendar (>= 2.6), python-vobject, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-calendar (>= ${version:major}), python-vobject,
+ python-pkg-resources
 Description: Tryton Application Platform (Calendar Classification 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 fe27c03add5a5417b720cd12e02f3759a8d6a597
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Apr 21 23:28:47 2013 +0200

    Removing Daniel from Uploaders. Thanks for your work! (Closes: #704374).

diff --git a/debian/control b/debian/control
index a216656..5b9d25d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-calendar-classification
 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 94fc49af9951c0d2c651033736372d28bbce4245
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Mar 23 15:04:01 2013 +0100

    Releasing debian version 2.6.0-3.

diff --git a/debian/changelog b/debian/changelog
index f03ee6b..af2dc7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-classification (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:25 +0100
+
 tryton-modules-calendar-classification (2.6.0-2) experimental; urgency=low
 
   * Removing obsolete Dm-Upload-Allowed
commit 7ed2ffd9e3f722edb7be9b4c9ab86eaf2953696e
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..d2c922a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_calendar_classification-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit b097120bd8fd2d0d0a6dbc83588673631251ab88
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Feb 23 20:08:09 2013 +0100

    Updating Vcs-Git to correct address.

diff --git a/debian/control b/debian/control
index 8bdbedc..a216656 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-calendar-classification.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar-classification.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-calendar-classification.git
 X-Python-Version: >= 2.6
 
 Package: tryton-modules-calendar-classification
commit b56acf9337b3343b0f6b2fc4e3ba65e4740626fc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Feb 17 13:50:39 2013 +0100

    Releasing debian version 2.6.0-2.

diff --git a/debian/changelog b/debian/changelog
index 6f275c1..f03ee6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-calendar-classification (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:37:30 +0100
+
 tryton-modules-calendar-classification (2.6.0-1) experimental; urgency=low
 
   * Merging upstream version 2.6.0.
commit b71907584516d14b134680f94bd6d0f7d742acff
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 9712072..deea7da 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:
-           2009-2012 Cedric Krier
+Copyright: 2009-2012 Cédric Krier
            2009-2012 Bertrand Chenal
            2009-2012 B2CK SPRL
 License: GPL-3+
@@ -10,7 +9,7 @@ License: GPL-3+
 Files: debian/*
 Copyright:
            2010-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 6d57407a8ee7296c17c01eae6d13514685062c1b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Feb 15 19:28:27 2013 +0100

    Updating to Standards-Version: 3.9.4, no changes needed.

diff --git a/debian/control b/debian/control
index 81a7dea..8bdbedc 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-calendar-classification.git
 Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar-classification.git
commit 84fab36d4bd498d2dd0d35afcb151ca66050ef2e
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 a6cd1f8..81a7dea 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 c2f742c18bf6289b3b6e04b3254e6106f281792d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Oct 24 22:01:53 2012 +0200

    Releasing debian version 2.6.0-1.

diff --git a/debian/changelog b/debian/changelog
index 55514c5..6f275c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-classification (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:14 +0200
+
 tryton-modules-calendar-classification (2.4.2-2) experimental; urgency=low
 
   [ Daniel Baumann ]
commit 42276c9eb862c0ba16ba32b40a835c07be985b26
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 8e69bcb..a6cd1f8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
- tryton-modules-calendar (>= 2.4), python-vobject, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-calendar (>= 2.6), python-vobject, python-pkg-resources
 Description: Tryton Application Platform (Calendar Classification 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 8e57efd704bffcf7d679d8c0ebb7f4cf3d24b400
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 23 19:53:29 2012 +0200

    Merging upstream version 2.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 8e0ef47..155813e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,6 @@
-Version 2.4.2 - 2012-09-02
+Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
-Version 2.4.1 - 2012-04-24
-* Restore es_AR translation
-
 Version 2.4.0 - 2012-04-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f5d5fd..44969c7 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 52ec331..4ff2e12 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,49 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 2.4.2
-Summary: Handle classification of event
+Version: 2.6.0
+Summary: Tryton module to add classification access to events
 Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_calendar_classification
+        ===============================
+        
+        The calendar_classification 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/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/__init__.py b/__init__.py
index 168f13f..0597dab 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,11 @@
 #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 .calendar_ import *
+
+
+def register():
+    Pool.register(
+        Event,
+        module='calendar_classification', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 4017989..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
-    'name': 'Calendar Classification',
-    'name_bg_BG': 'Класификация за календар',
-    'name_ca_ES': 'classificació del calendari',
-    'name_de_DE': 'Kalender Klassifikation',
-    'name_es_AR': 'Clasificación del calendario',
-    'name_es_CO': 'Clasificación del calendario',
-    'name_es_ES': 'Clasificación del calendario',
-    'name_fr_FR': 'Classification calendrier',
-    'name_ru_RU': 'Классификация по календарю',
-    'version': '2.4.2',
-    'author': 'B2CK',
-    'email': 'info at b2ck.com',
-    'website': 'http://www.tryton.org/',
-    'description': 'Handle classification of event',
-    'description_bg_BG': 'Добавя класификация на събития в CalDAV',
-    'description_ca_ES': '''Gestiona la classificació dels esdeveniments al
-CalDAV.
-''',
-    'description_de_DE': '''
-    Fügt Unterstützung für die Klassifikation von Terminen in CalDAV hinzu.
-''',
-    'description_es_AR': 'Gestiona la clasificación de eventos en CalDAV',
-    'description_es_CO': 'Gestiona la clasificación de eventos en CalDAV',
-    'description_es_ES': 'Gestiona la clasificación de eventos en CalDAV',
-    'description_fr_FR': 'Gère la classification des évènements',
-    'description_ru_RU': 'Добавление классификации событий в CalDAV',
-    'depends': [
-        'ir',
-        'calendar',
-    ],
-    '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/calendar_.py b/calendar_.py
index 82537ef..f84b064 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -1,23 +1,29 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 import vobject
-from trytond.model import ModelSQL
+
 from trytond.tools import reduce_ids
 from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+
+
+__all__ = ['Event']
+__metaclass__ = PoolMeta
 
 
-class Event(ModelSQL):
-    _name = 'calendar.event'
+class Event:
+    __name__ = 'calendar.event'
 
-    def __init__(self):
-        super(Event, self).__init__()
-        self._error_messages.update({
+    @classmethod
+    def __setup__(cls):
+        super(Event, cls).__setup__()
+        cls._error_messages.update({
             'transparent': 'Free',
             'opaque': 'Busy',
             })
 
-    def search(self, domain, offset=0, limit=None, order=None, count=False,
+    @classmethod
+    def search(cls, domain, offset=0, limit=None, order=None, count=False,
             query_string=False):
         if Transaction().user:
             domain = domain[:]
@@ -33,23 +39,22 @@ class Event(ModelSQL):
                     ('classification', '!=', 'confidential'),
                     ],
                 ]
-        return super(Event, self).search(domain, offset=offset, limit=limit,
-                order=order, count=count, query_string=query_string)
+        return super(Event, cls).search(domain, offset=offset, limit=limit,
+            order=order, count=count, query_string=query_string)
 
-    def create(self, values):
-        new_id = super(Event, self).create(values)
-        if self.search([('id', '=', new_id)], count=True) != 1:
-            self.raise_user_error('access_error', self._description)
-        return new_id
+    @classmethod
+    def create(cls, values):
+        event = super(Event, cls).create(values)
+        if cls.search([('id', '=', event.id)], count=True) != 1:
+            cls.raise_user_error('access_error', cls.__doc__)
+        return event
 
-    def _clean_private(self, record, transp):
+    @classmethod
+    def _clean_private(cls, record, transp):
         '''
         Clean private record
-
-        :param record: a dictionary with record values
-        :param transp: the time transparency
         '''
-        summary = self.raise_user_error(transp, raise_exception=False)
+        summary = cls.raise_user_error(transp, raise_exception=False)
         if 'summary' in record:
             record['summary'] = summary
 
@@ -79,26 +84,23 @@ class Event(ModelSQL):
         if vevent:
             record['vevent'] = vevent.serialize()
 
-    def read(self, ids, fields_names=None):
-        rule_obj = Pool().get('ir.rule')
+    @classmethod
+    def read(cls, ids, fields_names=None):
+        Rule = Pool().get('ir.rule')
         cursor = Transaction().cursor
-        int_id = False
-        if isinstance(ids, (int, long)):
-            int_id = True
-            ids = [ids]
-        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+        if len(set(ids)) != cls.search([('id', 'in', ids)],
                 count=True):
-            self.raise_user_error('access_error', self._description)
+            cls.raise_user_error('access_error', cls.__doc__)
 
         writable_ids = []
-        domain1, domain2 = rule_obj.domain_get(self._name, mode='write')
+        domain1, domain2 = Rule.domain_get(cls.__name__, mode='write')
         if domain1:
             for i in range(0, len(ids), cursor.IN_MAX):
                 sub_ids = ids[i:i + cursor.IN_MAX]
                 red_sql, red_ids = reduce_ids('id', sub_ids)
-                cursor.execute('SELECT id FROM "' + self._table + '" ' \
-                        'WHERE ' + red_sql + ' AND (' + domain1 + ')',
-                        red_ids + domain2)
+                cursor.execute('SELECT id FROM "' + cls._table + '" '
+                    'WHERE ' + red_sql + ' AND (' + domain1 + ')',
+                    red_ids + domain2)
                 writable_ids.extend(x[0] for x in cursor.fetchall())
         else:
             writable_ids = ids
@@ -112,35 +114,28 @@ class Event(ModelSQL):
             if field not in fields_names:
                 fields_names.append(field)
                 to_remove.add(field)
-        res = super(Event, self).read(ids, fields_names=fields_names)
+        res = super(Event, cls).read(ids, fields_names=fields_names)
         for record in res:
             if record['classification'] == 'private' \
                     and record['id'] not in writable_ids:
-                self._clean_private(record, record['transp'])
+                cls._clean_private(record, record['transp'])
             for field in to_remove:
                 del record[field]
-        if int_id:
-            return res[0]
         return res
 
-    def write(self, ids, values):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+    @classmethod
+    def write(cls, events, values):
+        if len(set(events)) != cls.search([('id', 'in', map(int, events))],
                 count=True):
-            self.raise_user_error('access_error', self._description)
-        res = super(Event, self).write(ids, values)
-        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+            cls.raise_user_error('access_error', cls.__doc__)
+        super(Event, cls).write(events, values)
+        if len(set(events)) != cls.search([('id', 'in', map(int, events))],
                 count=True):
-            self.raise_user_error('access_error', self._description)
-        return res
+            cls.raise_user_error('access_error', cls.__doc__)
 
-    def delete(self, ids):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+    @classmethod
+    def delete(cls, events):
+        if len(set(events)) != cls.search([('id', 'in', map(int, events))],
                 count=True):
-            self.raise_user_error('access_error', self._description)
-        return super(Event, self).delete(ids)
-
-Event()
+            cls.raise_user_error('access_error', cls.__doc__)
+        super(Event, cls).delete(events)
diff --git a/locale/es_CO.po b/locale/es_CO.po
index a285e67..b8538d9 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,12 +2,10 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#, fuzzy
 msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr "Ocupado"
 
-#, fuzzy
 msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Libre"
diff --git a/setup.py b/setup.py
index 7577d55..c2165dd 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
 
 from setuptools import setup
 import re
+import os
+import ConfigParser
 
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+    if key in info:
+        info[key] = info[key].strip().splitlines()
 major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
@@ -21,20 +32,20 @@ requires.append('trytond >= %s.%s, < %s.%s' %
 
 setup(name='trytond_calendar_classification',
     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 classification access to events',
+    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.calendar_classification': '.'},
     packages=[
         'trytond.modules.calendar_classification',
-    ],
+        ],
     package_data={
         'trytond.modules.calendar_classification': info.get('xml', []) \
-                + info.get('translation', []),
-    },
+            + ['tryton.cfg', 'locale/*.po'],
+        },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -56,7 +67,7 @@ setup(name='trytond_calendar_classification',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
-    ],
+        ],
     license='GPL-3',
     install_requires=requires,
     zip_safe=False,
@@ -66,4 +77,4 @@ setup(name='trytond_calendar_classification',
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
-)
+    )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..9a9e7df
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,5 @@
+[tryton]
+version=2.6.0
+depends:
+    calendar
+    ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 42fadc6..4893a2a 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,13 +1,49 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 2.4.2
-Summary: Handle classification of event
+Version: 2.6.0
+Summary: Tryton module to add classification access to events
 Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_calendar_classification
+        ===============================
+        
+        The calendar_classification 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/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/trytond_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index 235c44b..e73b944 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -5,8 +5,8 @@ LICENSE
 MANIFEST.in
 README
 setup.py
+tryton.cfg
 ./__init__.py
-./__tryton__.py
 ./calendar_.py
 locale/bg_BG.po
 locale/ca_ES.po
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index 7fc77a0..5de63b2 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_calendar >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 1ad857b6b74e701be5c18566d8719357d98b04c7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 18 16:07:18 2012 +0200

    Releasing debian version 2.4.2-2.

diff --git a/debian/changelog b/debian/changelog
index 2cb2df4..55514c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-calendar-classification (2.4.2-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 (Closes: #687744).
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 17 Sep 2012 16:42:52 +0200
+
 tryton-modules-calendar-classification (2.4.2-1) experimental; urgency=low
 
   * Merging upstream version 2.4.2.
commit 143393928011efd462e3e6deb65461386807d1f0
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 30 18:02:28 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 fe38a6a..8e69bcb 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-calendar-classification.git
commit 7f80882129853eaceae24b21496285e912d6fe03
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 f4ef955a36e567754176e53dbeaa05535d72b5c6
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 30 17:50:23 2012 +0200

    Correcting copyright file to match format version 1.0.

diff --git a/debian/copyright b/debian/copyright
index 675d416..9712072 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright:
- (C) 2009-2012 Cedric Krier
- (C) 2009-2012 Bertrand Chenal
- (C) 2009-2012 B2CK SPRL
+           2009-2012 Cedric Krier
+           2009-2012 Bertrand Chenal
+           2009-2012 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
 Copyright:
- (C) 2010-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+           2010-2012 Daniel Baumann <daniel at debian.org>
+           2012 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
commit c58b3738b988edac3da6382f0350e535d73856d5
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 8f28b12..fe38a6a 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-calendar-classification.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-classification.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar-classification.git
 X-Python-Version: >= 2.6
 
 Package: tryton-modules-calendar-classification
commit a3e4b06bd3487d8b4851599acf18668dd946ec14
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 f2a80cf..8f28b12 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: tryton-modules-calendar-classification
 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 639da1fd27222a1773edadbaad6c6a82b1a67a36
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 11 14:28:53 2012 +0200

    Releasing debian version 2.4.2-1.

diff --git a/debian/changelog b/debian/changelog
index 23759c7..2cb2df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-calendar-classification (2.4.2-1) experimental; urgency=low
+
+  * Merging upstream version 2.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 11 Sep 2012 13:27:30 +0200
+
 tryton-modules-calendar-classification (2.4.1-1) experimental; urgency=low
 
   * Updating to Standards-Version: 3.9.3, no changes needed.
commit 378b582fd7b439efdea868e852e91aca0d83333b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 11 13:25:51 2012 +0200

    Merging upstream version 2.4.2.

diff --git a/CHANGELOG b/CHANGELOG
index 0b3f615..8e0ef47 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.2 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.4.1 - 2012-04-24
 * Restore es_AR translation
 
diff --git a/PKG-INFO b/PKG-INFO
index 20a245c..52ec331 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 2.4.1
+Version: 2.4.2
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 215c2c9..4017989 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -11,7 +11,7 @@
     'name_es_ES': 'Clasificación del calendario',
     'name_fr_FR': 'Classification calendrier',
     'name_ru_RU': 'Классификация по календарю',
-    'version': '2.4.1',
+    'version': '2.4.2',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar_.py b/calendar_.py
index e42a52c..82537ef 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -57,7 +57,7 @@ class Event(ModelSQL):
         if 'vevent' in record:
             vevent = record['vevent']
             if vevent:
-                vevent = vobject.readOne(vevent)
+                vevent = vobject.readOne(str(vevent))
                 if hasattr(vevent, 'summary'):
                     vevent.summary.value = summary
 
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 47100f1..42fadc6 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 2.4.1
+Version: 2.4.2
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
commit f8835d8f338c19d83ae55a652c4c428997826723
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 28 12:43:16 2012 +0200

    Releasing debian version 2.4.1-1.

diff --git a/debian/changelog b/debian/changelog
index f0c394f..23759c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-calendar-classification (2.4.1-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.
+  * Merging upstream version 2.4.1.
+  * Updating Copyright.
+  * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 26 Apr 2012 19:36:37 +0200
+
 tryton-modules-calendar-classification (2.2.0-1) unstable; urgency=low
 
   * Bumping X-Python-Version to >=2.6.
commit f44e3d0a07ade647dc82aaffb1dc9181bfe12f75
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 26 19:10:56 2012 +0200

    Bumping versioned tryton depends to 2.4.

diff --git a/debian/control b/debian/control
index db5c25d..f2a80cf 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
- tryton-modules-calendar (>= 2.2), python-vobject, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ tryton-modules-calendar (>= 2.4), python-vobject, python-pkg-resources
 Description: Tryton Application Platform (Calendar Classification 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 a6cb512322230654cc0cc1910cb2e17c3ebf7872
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 25 20:08:32 2012 +0200

    Updating Copyright.

diff --git a/debian/copyright b/debian/copyright
index 6f4de75..675d416 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) 2009-2011 Cedric Krier
- (C) 2009-2011 Bertrand Chenal
- (C) 2009-2011 B2CK SPRL
+ (C) 2009-2012 Cedric Krier
+ (C) 2009-2012 Bertrand Chenal
+ (C) 2009-2012 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 99f60e82d8ffec33079373527591ac950d829338
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 25 11:03:30 2012 +0200

    Merging upstream version 2.4.1.

diff --git a/CHANGELOG b/CHANGELOG
index 4bfd141..0b3f615 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-04-24
+* Restore es_AR translation
+
 Version 2.4.0 - 2012-04-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 2584514..20a245c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 2.4.0
+Version: 2.4.1
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 0099572..215c2c9 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -11,7 +11,7 @@
     'name_es_ES': 'Clasificación del calendario',
     'name_fr_FR': 'Classification calendrier',
     'name_ru_RU': 'Классификация по календарю',
-    'version': '2.4.0',
+    'version': '2.4.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 542f292..b8538d9 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -1,3 +1,11 @@
 # 
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:"
+msgid "Busy"
+msgstr "Ocupado"
+
+msgctxt "error:calendar.event:"
+msgid "Free"
+msgstr "Libre"
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 6841a9c..47100f1 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 2.4.0
+Version: 2.4.1
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
commit 97109eb3494f1fcbd5dc3b38b60e0cea58acbc1f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 24 19:30:39 2012 +0200

    Merging upstream version 2.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index cd6df99..4bfd141 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..8ad4b79 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2012 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 3657792..dc5fe4e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_calendar
 Prerequisites
 -------------
 
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_calendar (http://www.tryton.org/)
  * vobject >= 0.8.0 (http://vobject.skyhouseconsulting.com/)
diff --git a/PKG-INFO b/PKG-INFO
index 433407a..2584514 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 2.2.0
+Version: 2.4.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index d520dc7..168f13f 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 calendar import *
+from .calendar_ import *
diff --git a/__tryton__.py b/__tryton__.py
index 1c2675d..0099572 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,36 +2,44 @@
 #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' : 'Calendar Classification',
-    'name_bg_BG' : 'Класификация за календар',
-    'name_de_DE' : 'Kalender Klassifikation',
-    'name_es_CO' : 'Clasificación del calendario',
-    'name_es_ES' : 'Clasificación del calendario',
-    'name_fr_FR' : 'Classification calendrier',
-    'name_ru_RU' : 'Классификация по календарю',
-    'version' : '2.2.0',
-    'author' : 'B2CK',
+    'name': 'Calendar Classification',
+    'name_bg_BG': 'Класификация за календар',
+    'name_ca_ES': 'classificació del calendari',
+    'name_de_DE': 'Kalender Klassifikation',
+    'name_es_AR': 'Clasificación del calendario',
+    'name_es_CO': 'Clasificación del calendario',
+    'name_es_ES': 'Clasificación del calendario',
+    'name_fr_FR': 'Classification calendrier',
+    'name_ru_RU': 'Классификация по календарю',
+    'version': '2.4.0',
+    'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
     'description': 'Handle classification of event',
     'description_bg_BG': 'Добавя класификация на събития в CalDAV',
-    'description_de_DE' : '''
+    'description_ca_ES': '''Gestiona la classificació dels esdeveniments al
+CalDAV.
+''',
+    'description_de_DE': '''
     Fügt Unterstützung für die Klassifikation von Terminen in CalDAV hinzu.
 ''',
+    'description_es_AR': 'Gestiona la clasificación de eventos en CalDAV',
     'description_es_CO': 'Gestiona la clasificación de eventos en CalDAV',
     'description_es_ES': 'Gestiona la clasificación de eventos en CalDAV',
     'description_fr_FR': 'Gère la classification des évènements',
     'description_ru_RU': 'Добавление классификации событий в CalDAV',
-    'depends' : [
+    'depends': [
         'ir',
         'calendar',
     ],
-    'xml' : [
+    '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',
diff --git a/calendar.py b/calendar_.py
similarity index 91%
rename from calendar.py
rename to calendar_.py
index a6cca08..e42a52c 100644
--- a/calendar.py
+++ b/calendar_.py
@@ -22,16 +22,17 @@ class Event(ModelSQL):
         if Transaction().user:
             domain = domain[:]
             domain = [domain,
-                    ['OR',
-                        [
-                            ('classification', '=', 'confidential'),
-                            ['OR',
-                                ('calendar.owner', '=', Transaction().user),
-                                ('calendar.write_users', '=', Transaction().user),
+                ['OR',
+                    [
+                        ('classification', '=', 'confidential'),
+                        ['OR',
+                            ('calendar.owner', '=', Transaction().user),
+                            ('calendar.write_users', '=', Transaction().user),
                             ],
                         ],
-                        ('classification', '!=', 'confidential'),
-                    ]]
+                    ('classification', '!=', 'confidential'),
+                    ],
+                ]
         return super(Event, self).search(domain, offset=offset, limit=limit,
                 order=order, count=count, query_string=query_string)
 
@@ -63,7 +64,7 @@ class Event(ModelSQL):
         for field, value in (
                 ('description', ''),
                 ('categories', []),
-                ('location', False),
+                ('location', None),
                 ('status', ''),
                 ('organizer', ''),
                 ('attendees', []),
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 65bce12..c9c5853 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,10 +2,10 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr "Зает"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Свободен"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..95d1cbd
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:"
+msgid "Busy"
+msgstr "Ocupat"
+
+msgctxt "error:calendar.event:"
+msgid "Free"
+msgstr "Lliure"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 7fb7e86..824b918 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,10 +2,10 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index a9cefb7..c6300da 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,10 +2,10 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr "Beschäftigt"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Verfügbar"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..542f292
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,3 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index cfbe78b..a285e67 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,11 +3,11 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 #, fuzzy
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr "Ocupado"
 
 #, fuzzy
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Libre"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index b0aa48b..b8538d9 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,10 +2,10 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr "Ocupado"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Libre"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c7c27c1..d0b9c6d 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,10 +2,18 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr "Occupé"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
+msgid "Busy"
+msgstr "Occupé"
+
+msgctxt "error:calendar.event:"
+msgid "Free"
+msgstr "Libre"
+
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Libre"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 7fb7e86..824b918 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,10 +2,10 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 653c2b0..a8e5551 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,10 +2,10 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Busy"
 msgstr "Занят"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Free"
 msgstr "Свободно"
diff --git a/setup.py b/setup.py
index dacbed5..7577d55 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
 
 requires = ['vobject >= 0.8.0']
 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/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index d9e62ab..6841a9c 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 2.2.0
+Version: 2.4.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index 33c8160..235c44b 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -7,10 +7,12 @@ README
 setup.py
 ./__init__.py
 ./__tryton__.py
-./calendar.py
+./calendar_.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_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index aacb8bf..7fc77a0 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_calendar >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 36e3579543c49a6495572c5392ab557eeadd3468
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Mar 25 15:28:17 2012 +0200

    Adding Format header for DEP5.

diff --git a/debian/copyright b/debian/copyright
index 5294597..6f4de75 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) 2009-2011 Cedric Krier
commit 84d65c6cf7e9f71a0a7ca1c7bf798f225b1c334e
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 1ec0c67..5294597 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,9 @@ Copyright:
 License: GPL-3+
 
 Files: debian/*
-Copyright: (C) 2010-2012 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2010-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
commit 26ce4aa2d83a86468393e4db251e77a396026b11
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 aa5dfac..1ec0c67 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright:
 License: GPL-3+
 
 Files: debian/*
-Copyright: (C) 2010-2011 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2010-2012 Daniel Baumann <daniel at debian.org>
 License: GPL-3+
 
 License: GPL-3+
commit 8d8c6a3ab481ee5b94e318722d527f2e5ea08acf
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 bdc8df3..db5c25d 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-calendar-classification.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
commit 2b6b8590f6fb1d7def9921069e678ffc277fad5d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 26 18:09:29 2011 +0100

    Releasing debian version 2.2.0-1.

diff --git a/debian/changelog b/debian/changelog
index 18512d9..f0c394f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-calendar-classification (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:00:28 +0100
+
 tryton-modules-calendar-classification (2.0.0-2) unstable; urgency=low
 
   [ Daniel Baumann ]
commit 5e398eb3bb4173144c4dce8b7d54d37c59778632
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 2d749cd..bdc8df3 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-calendar-classification.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
 
 Package: tryton-modules-calendar-classification
 Architecture: all
commit 6ee770bba442bca31cc479555570099418a474a6
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 d8d3682..2d749cd 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.5
 Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- tryton-modules-calendar (>= 2.0), python-vobject, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ tryton-modules-calendar (>= 2.2), python-vobject, python-pkg-resources
 Description: Tryton Application Platform (Calendar Classification 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 74924a2966b9af4be855e430de6e2a674b80eefa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 31 16:20:42 2011 +0100

    Merging upstream version 2.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index b80feb2..cd6df99 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-27
 * Bug fixes (see mercurial logs for details)
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..7f5d5fd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,4 +6,4 @@ include CHANGELOG
 include LICENSE
 include *.xml
 include *.odt
-include *.csv
+include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index fb10901..433407a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,29 +1,31 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 2.0.0
+Version: 2.2.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 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 8005b6b..1c2675d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_ES' : 'Clasificación del calendario',
     'name_fr_FR' : 'Classification calendrier',
     'name_ru_RU' : 'Классификация по календарю',
-    'version' : '2.0.0',
+    'version' : '2.2.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -29,11 +29,13 @@
     'xml' : [
     ],
     'translation': [
-        'bg_BG.csv',
-        'de_DE.csv',
-        'es_CO.csv',
-        'es_ES.csv',
-        'fr_FR.csv',
-        'ru_RU.csv',
+        'locale/bg_BG.po',
+        'locale/cs_CZ.po',
+        'locale/de_DE.po',
+        'locale/es_CO.po',
+        'locale/es_ES.po',
+        'locale/fr_FR.po',
+        'locale/nl_NL.po',
+        'locale/ru_RU.po',
     ],
 }
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index c9c4350..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,Busy,Зает,0
-error,calendar.event,0,Free,Свободен,0
diff --git a/calendar.py b/calendar.py
index 458ccb0..a6cca08 100644
--- a/calendar.py
+++ b/calendar.py
@@ -4,6 +4,7 @@ import vobject
 from trytond.model import ModelSQL
 from trytond.tools import reduce_ids
 from trytond.transaction import Transaction
+from trytond.pool import Pool
 
 
 class Event(ModelSQL):
@@ -78,7 +79,7 @@ class Event(ModelSQL):
             record['vevent'] = vevent.serialize()
 
     def read(self, ids, fields_names=None):
-        rule_obj = self.pool.get('ir.rule')
+        rule_obj = Pool().get('ir.rule')
         cursor = Transaction().cursor
         int_id = False
         if isinstance(ids, (int, long)):
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index f9627ad..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,Busy,Beschäftigt,0
-error,calendar.event,0,Free,Verfügbar,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 5310311..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,Busy,Ocupado,1
-error,calendar.event,0,Free,Libre,1
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 0e4f645..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,Busy,Ocupado,0
-error,calendar.event,0,Free,Libre,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 55badd4..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,Busy,Occupé,0
-error,calendar.event,0,Free,Libre,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..65bce12
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr "Зает"
+
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr "Свободен"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..7fb7e86
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..a9cefb7
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr "Beschäftigt"
+
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr "Verfügbar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..cfbe78b
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,13 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+#, fuzzy
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr "Ocupado"
+
+#, fuzzy
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr "Libre"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..b0aa48b
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr "Ocupado"
+
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr "Libre"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..c7c27c1
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr "Occupé"
+
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr "Libre"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..7fb7e86
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..653c2b0
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Busy"
+msgstr "Занят"
+
+msgctxt "error:calendar.event:0"
+msgid "Free"
+msgstr "Свободно"
diff --git a/ru_RU.csv b/ru_RU.csv
deleted file mode 100644
index 7744fcf..0000000
--- a/ru_RU.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,Busy,Занят,0
-error,calendar.event,0,Free,Свободно,0
diff --git a/setup.py b/setup.py
index 63ac0a1..dacbed5 100644
--- a/setup.py
+++ b/setup.py
@@ -38,19 +38,21 @@ setup(name='trytond_calendar_classification',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
+        'Framework :: Tryton',
         'Intended Audience :: Developers',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'Intended Audience :: Manufacturing',
         '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',
@@ -62,4 +64,6 @@ setup(name='trytond_calendar_classification',
     [trytond.modules]
     calendar_classification = trytond.modules.calendar_classification
     """,
+    test_suite='tests',
+    test_loader='trytond.test_loader:Loader',
 )
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index c5618c8..d9e62ab 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,29 +1,31 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 2.0.0
+Version: 2.2.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 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_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index cffa467..33c8160 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -4,16 +4,18 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
-ru_RU.csv
 setup.py
 ./__init__.py
 ./__tryton__.py
 ./calendar.py
+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_calendar_classification.egg-info/PKG-INFO
 trytond_calendar_classification.egg-info/SOURCES.txt
 trytond_calendar_classification.egg-info/dependency_links.txt
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index 87bc699..aacb8bf 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_calendar >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 5e481040f6c332ebff12c5f3cf9c0e5e8c5bb287
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Jul 22 12:26:56 2011 +0200

    Removing deprecated XB-Python-Version for dh_python2.

diff --git a/debian/control b/debian/control
index 6f3ec00..d8d3682 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: all
 Depends:
  ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
  tryton-modules-calendar (>= 2.0), python-vobject, python-pkg-resources
-XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Calendar Classification 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 de5f42ac3faae574e81af63bd5d078802566a66e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 14 01:13:30 2011 +0200

    Releasing debian version 2.0.0-2.

diff --git a/debian/changelog b/debian/changelog
index 7afdaa8..18512d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-calendar-classification (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:13:25 +0200
+
 tryton-modules-calendar-classification (2.0.0-1) unstable; urgency=low
 
   * Updating to standards version 3.9.2.
commit 250eb699015fb440a0a5913d2854b64715bc8d6a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 13 20:19:24 2011 +0200

    Moving from deprecated python-support to dh_python2.

diff --git a/debian/control b/debian/control
index d847718..6f3ec00 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-calendar-classification.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
+X-Python-Version: >= 2.5
 
 Package: tryton-modules-calendar-classification
 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..488d2d9
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,2 @@
+vobject python-vobject
+
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 e9a4dd0327cfdb358a747c35ac59cd84e35df6d5
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 bacfa9c..d847718 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-calendar-classification
 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 74b680823469fb034c4e390ddfc915e12e6472f1
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 be80354..aa5dfac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,15 @@
-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) 2009-2011 Cedric Krier
  (C) 2009-2011 Bertrand Chenal
  (C) 2009-2011 B2CK SPRL
 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) 2010-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
@@ -41,5 +23,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 61415f24839ac1a3b474e415ad145dccac510adf
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jul 10 15:38:54 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 00ddab4558f50767d0b9becc92986461776123b8
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 86f057ffb0c24eb3e99e524e3836e04ce8a14615
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue May 24 21:40:01 2011 +0200

    Releasing debian version 2.0.0-1.

diff --git a/debian/changelog b/debian/changelog
index 1021bc8..7afdaa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-calendar-classification (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:32:33 +0200
+
 tryton-modules-calendar-classification (1.8.0-2) unstable; urgency=low
 
   * Changing my email address.
commit 3b9e5413566ffb06878943669076882d35755506
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue May 24 21:21:33 2011 +0200

    Updating versioned tryton depends to 2.0.

diff --git a/debian/control b/debian/control
index 20d0dbc..bacfa9c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-cla
 Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
- tryton-modules-calendar (>= 1.8), python-vobject, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ tryton-modules-calendar (>= 2.0), python-vobject, python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Calendar Classification Module)
  Tryton is a high-level general purpose application platform written in Python
commit 4baf36a5c6ee1a07ed3f4d78a91f6c1d8724d651
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 880dad0..be80354 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
 
 Files: *
 Copyright:
- (C) 2009-2010 Cedric Krier
- (C) 2009-2010 Bertrand Chenal
- (C) 2009-2010 B2CK SPRL
+ (C) 2009-2011 Cedric Krier
+ (C) 2009-2011 Bertrand Chenal
+ (C) 2009-2011 B2CK SPRL
 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 d273c392338f4cb44f75c2dfb9a2f2efabc1e743
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue May 24 19:12:44 2011 +0200

    Merging upstream version 2.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 9f67c3a..b80feb2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* 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 6e6811c..1245dd5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2010 Cédric Krier.
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 9fe2d9b..fb10901 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 1.8.0
+Version: 2.0.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -16,10 +16,14 @@ Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 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 :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 7865c15..8005b6b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,21 +3,25 @@
 #this repository contains the full copyright notices and license terms.
 {
     'name' : 'Calendar Classification',
+    'name_bg_BG' : 'Класификация за календар',
     'name_de_DE' : 'Kalender Klassifikation',
     'name_es_CO' : 'Clasificación del calendario',
     'name_es_ES' : 'Clasificación del calendario',
     'name_fr_FR' : 'Classification calendrier',
-    'version' : '1.8.0',
+    'name_ru_RU' : 'Классификация по календарю',
+    'version' : '2.0.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
     'description': 'Handle classification of event',
+    'description_bg_BG': 'Добавя класификация на събития в CalDAV',
     'description_de_DE' : '''
     Fügt Unterstützung für die Klassifikation von Terminen in CalDAV hinzu.
 ''',
     'description_es_CO': 'Gestiona la clasificación de eventos en CalDAV',
     'description_es_ES': 'Gestiona la clasificación de eventos en CalDAV',
     'description_fr_FR': 'Gère la classification des évènements',
+    'description_ru_RU': 'Добавление классификации событий в CalDAV',
     'depends' : [
         'ir',
         'calendar',
@@ -25,9 +29,11 @@
     'xml' : [
     ],
     'translation': [
+        'bg_BG.csv',
         'de_DE.csv',
         'es_CO.csv',
         'es_ES.csv',
         'fr_FR.csv',
+        'ru_RU.csv',
     ],
 }
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..c9c4350
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,Busy,Зает,0
+error,calendar.event,0,Free,Свободен,0
diff --git a/ru_RU.csv b/ru_RU.csv
new file mode 100644
index 0000000..7744fcf
--- /dev/null
+++ b/ru_RU.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,Busy,Занят,0
+error,calendar.event,0,Free,Свободно,0
diff --git a/setup.py b/setup.py
index f0b45e0..63ac0a1 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,16 @@ setup(name='trytond_calendar_classification',
         'Intended Audience :: Legal Industry',
         'Intended Audience :: Manufacturing',
         'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: Bulgarian',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
+        'Natural Language :: Russian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
     ],
     license='GPL-3',
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 96b512c..c5618c8 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 1.8.0
+Version: 2.0.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -16,10 +16,14 @@ Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 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 :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index 5ed63e2..cffa467 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -4,10 +4,12 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
+bg_BG.csv
 de_DE.csv
 es_CO.csv
 es_ES.csv
 fr_FR.csv
+ru_RU.csv
 setup.py
 ./__init__.py
 ./__tryton__.py
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index d9f58ad..87bc699 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_calendar >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 9cb1ab65c86188e6b208866785165bb414a88999
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 26 21:08:53 2011 +0200

    Updating to standards version 3.9.2.

diff --git a/debian/control b/debian/control
index 7f5e140..20d0dbc 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-calendar-classification.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
commit b39668744dc68eb5ef0031a84e9a61343f57379a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 15 13:08:06 2011 +0100

    Releasing debian version 1.8.0-2.

diff --git a/debian/changelog b/debian/changelog
index 7a1a6ba..1021bc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-classification (1.8.0-2) unstable; urgency=low
+
+  * Changing my email address.
+  * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 15 Feb 2011 13:07:47 +0100
+
 tryton-modules-calendar-classification (1.8.0-1) experimental; urgency=low
 
   * Updating standards version to 3.9.0.
commit e2e36f05ad80568701a03d5f70b351a77d29a044
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 15 12:38:41 2011 +0100

    Updating Copyright.

diff --git a/debian/copyright b/debian/copyright
index 9f839d5..880dad0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ License: GPL-3+
  can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: debian/*
-Copyright: (C) 2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2010-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 6a1750d3ad7f95dc5ee336116ae088f2d54359f0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 20 11:48:53 2010 +0100

    Changing my email address.

diff --git a/debian/control b/debian/control
index 2cbe415..7f5e140 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 10c0d1ed885bfa8bc489dc36ced734a5bca2bbdb
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Nov 12 12:57:04 2010 +0100

    Releasing debian version 1.8.0-1.

diff --git a/debian/changelog b/debian/changelog
index 16cef0c..7a1a6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-calendar-classification (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 12:56:54 +0100
+
 tryton-modules-calendar-classification (1.6.0-1) unstable; urgency=low
 
   [ Daniel Baumann ]
commit d0fe4bdc618fe0659104797a5227173188fb012f
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 a20f713..2cbe415 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-cla
 Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-calendar (>= 1.6), python-vobject, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ tryton-modules-calendar (>= 1.8), python-vobject, python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Calendar Classification Module)
  Tryton is a high-level general purpose application platform written in Python
commit e51e2370e0f09f72be02a6e076808ded215f33fc
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 6ad8d84..9f67c3a 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-10
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c71cbc0..9fe2d9b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 1.6.0
+Version: 1.8.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 046fc1a..7865c15 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO' : 'Clasificación del calendario',
     'name_es_ES' : 'Clasificación del calendario',
     'name_fr_FR' : 'Classification calendrier',
-    'version' : '1.6.0',
+    'version' : '1.8.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index 9e2c23c..458ccb0 100644
--- a/calendar.py
+++ b/calendar.py
@@ -1,8 +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 vobject
 from trytond.model import ModelSQL
 from trytond.tools import reduce_ids
-import vobject
+from trytond.transaction import Transaction
 
 
 class Event(ModelSQL):
@@ -15,45 +16,38 @@ class Event(ModelSQL):
             'opaque': 'Busy',
             })
 
-    def search(self, cursor, user, domain, offset=0, limit=None, order=None,
-            context=None, count=False, query_string=False):
-        if user:
+    def search(self, domain, offset=0, limit=None, order=None, count=False,
+            query_string=False):
+        if Transaction().user:
             domain = domain[:]
             domain = [domain,
                     ['OR',
                         [
                             ('classification', '=', 'confidential'),
                             ['OR',
-                                ('calendar.owner', '=', user),
-                                ('calendar.write_users', '=', user),
+                                ('calendar.owner', '=', Transaction().user),
+                                ('calendar.write_users', '=', Transaction().user),
                             ],
                         ],
                         ('classification', '!=', 'confidential'),
                     ]]
-        return super(Event, self).search(cursor, user, domain, offset=offset,
-                limit=limit, order=order, context=context, count=count,
-                query_string=query_string)
+        return super(Event, self).search(domain, offset=offset, limit=limit,
+                order=order, count=count, query_string=query_string)
 
-    def create(self, cursor, user, values, context=None):
-        new_id = super(Event, self).create(cursor, user, values, context=context)
-        if self.search(cursor, user,
-                [('id', '=', new_id)], context=context, count=True) != 1:
-            self.raise_user_error(cursor, 'access_error',
-                    self._description, context=context)
+    def create(self, values):
+        new_id = super(Event, self).create(values)
+        if self.search([('id', '=', new_id)], count=True) != 1:
+            self.raise_user_error('access_error', self._description)
         return new_id
 
-    def _clean_private(self, cursor, user, record, transp, context=None):
+    def _clean_private(self, record, transp):
         '''
         Clean private record
 
-        :param cursor: the database cursor
-        :param user: the user id
         :param record: a dictionary with record values
         :param transp: the time transparency
-        :param context: the context
         '''
-        summary = self.raise_user_error(cursor, transp, raise_exception=False,
-                context=context)
+        summary = self.raise_user_error(transp, raise_exception=False)
         if 'summary' in record:
             record['summary'] = summary
 
@@ -83,20 +77,19 @@ class Event(ModelSQL):
         if vevent:
             record['vevent'] = vevent.serialize()
 
-    def read(self, cursor, user, ids, fields_names=None, context=None):
+    def read(self, ids, fields_names=None):
         rule_obj = self.pool.get('ir.rule')
+        cursor = Transaction().cursor
         int_id = False
         if isinstance(ids, (int, long)):
             int_id = True
             ids = [ids]
-        if len({}.fromkeys(ids)) != self.search(cursor, user,
-                [('id', 'in', ids)], context=context, count=True):
-            self.raise_user_error(cursor, 'access_error',
-                    self._description, context=context)
+        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+                count=True):
+            self.raise_user_error('access_error', self._description)
 
         writable_ids = []
-        domain1, domain2 = rule_obj.domain_get(cursor, user, self._name,
-                mode='write', context=context)
+        domain1, domain2 = rule_obj.domain_get(self._name, mode='write')
         if domain1:
             for i in range(0, len(ids), cursor.IN_MAX):
                 sub_ids = ids[i:i + cursor.IN_MAX]
@@ -117,41 +110,35 @@ class Event(ModelSQL):
             if field not in fields_names:
                 fields_names.append(field)
                 to_remove.add(field)
-        res = super(Event, self).read(cursor, user, ids,
-                fields_names=fields_names, context=context)
+        res = super(Event, self).read(ids, fields_names=fields_names)
         for record in res:
             if record['classification'] == 'private' \
                     and record['id'] not in writable_ids:
-                self._clean_private(cursor, user, record, record['transp'],
-                        context=context)
+                self._clean_private(record, record['transp'])
             for field in to_remove:
                 del record[field]
         if int_id:
             return res[0]
         return res
 
-    def write(self, cursor, user, ids, values, context=None):
+    def write(self, ids, values):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if len({}.fromkeys(ids)) != self.search(cursor, user,
-                [('id', 'in', ids)], context=context, count=True):
-            self.raise_user_error(cursor, 'access_error',
-                    self._description, context=context)
-        res = super(Event, self).write(cursor, user, ids, values,
-                context=context)
-        if len({}.fromkeys(ids)) != self.search(cursor, user,
-                [('id', 'in', ids)], context=context, count=True):
-            self.raise_user_error(cursor, 'access_error',
-                    self._description, context=context)
+        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+                count=True):
+            self.raise_user_error('access_error', self._description)
+        res = super(Event, self).write(ids, values)
+        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+                count=True):
+            self.raise_user_error('access_error', self._description)
         return res
 
-    def delete(self, cursor, user, ids, context=None):
+    def delete(self, ids):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if len({}.fromkeys(ids)) != self.search(cursor, user,
-                [('id', 'in', ids)], context=context, count=True):
-            self.raise_user_error(cursor, 'access_error',
-                    self._description, context=context)
-        return super(Event, self).delete(cursor, user, ids, context=context)
+        if len({}.fromkeys(ids)) != self.search([('id', 'in', ids)],
+                count=True):
+            self.raise_user_error('access_error', self._description)
+        return super(Event, self).delete(ids)
 
 Event()
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 9edf751..96b512c 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 1.6.0
+Version: 1.8.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index c9868c7..d9f58ad 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_calendar >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 19dd1de4abeae1f9a5e17c8f1838073928f57a9f
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 2 14:26:31 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 12125fd89bf27d30531c09c51fbb535395cddedd
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 3bc7c97..a20f713 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-calendar-classification.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
commit 230d24100f35fdd8201e5d3dd27ac853e464fa57
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 30 01:04:04 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 2b04978..3bc7c97 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-calendar-classification.git
commit ee95daef6ab1da91523209af40d42f80bdc3e0ac
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 28 20:35:29 2010 +0200

    Updating standards version to 3.9.0.

diff --git a/debian/control b/debian/control
index 8fc7037..2b04978 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-calendar-classification.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
commit cc84b724e212a77b7ff3c5df534f304934d6ecc3
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Thu May 13 11:56:58 2010 +0200

    Releasing debian version 1.6.0-1.

diff --git a/debian/changelog b/debian/changelog
index 91d45c4..16cef0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-calendar-classification (1.6.0-1) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Adding depends to python-vobject.
+  * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+  [ Mathias Behrle ]
+  * Merging upstream version 1.6.0.
+  * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>  Thu, 13 May 2010 11:55:28 +0200
+
 tryton-modules-calendar-classification (1.4.0-1) unstable; urgency=low
 
   * Initial release.
commit b0d94d9781929d591b7c5a7ca39205b3c0564008
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Thu May 13 11:55:19 2010 +0200

    Updating depends.

diff --git a/debian/control b/debian/control
index 332b351..8fc7037 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-cla
 Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-calendar (>= 1.4), python-vobject (>= 0.8.1c-1),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ tryton-modules-calendar (>= 1.6), python-vobject, python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Calendar Classification Module)
  Tryton is a high-level general purpose application platform written in Python
commit 6cba570520b7c65207ef31376b3fa8bf1a24bfce
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Thu May 13 11:28:56 2010 +0200

    Merging upstream version 1.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 0d1d17e..6ad8d84 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.6.0 - 2010-05-10
+* Bug fixes (see mercurial logs for details)
+
 Version 1.4.0 - 2010-03-11
 * Initial release
diff --git a/MANIFEST.in b/MANIFEST.in
index c61b52d..5343ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,3 @@ include LICENSE
 include *.xml
 include *.odt
 include *.csv
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index e12540e..c71cbc0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_classification
-Version: 1.4.0
+Version: 1.6.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 08d931e..046fc1a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO' : 'Clasificación del calendario',
     'name_es_ES' : 'Clasificación del calendario',
     'name_fr_FR' : 'Classification calendrier',
-    'version' : '1.4.0',
+    'version' : '1.6.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index 2918352..9e2c23c 100644
--- a/calendar.py
+++ b/calendar.py
@@ -111,6 +111,7 @@ class Event(ModelSQL):
 
         if fields_names is None:
             fields_names = []
+        fields_names = fields_names[:]
         to_remove = set()
         for field in ('classification', 'calendar', 'transp'):
             if field not in fields_names:
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index e465068..9edf751 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-classification
-Version: 1.4.0
+Version: 1.6.0
 Summary: Handle classification of event
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index c6544f8..c9868c7 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
 vobject >= 0.8.0
-trytond_calendar >= 1.4, < 1.5
-trytond >= 1.4, < 1.5
\ No newline at end of file
+trytond_calendar >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 1ab9c67de196a59a7bb4da3f74496f84dff14b54
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 40db2de..332b351 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 66b9064fdb60a66e2c758c178ddd3abc9c3a4557
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 14 13:40:52 2010 +0100

    Adding depends to python-vobject.

diff --git a/debian/control b/debian/control
index ae629cf..40db2de 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Package: tryton-modules-calendar-classification
 Architecture: all
 Depends:
  ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-calendar (>= 1.4), python-pkg-resources
+ tryton-modules-calendar (>= 1.4), python-vobject (>= 0.8.1c-1),
+ python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Calendar Classification Module)
  Tryton is a high-level general purpose application platform written in Python
commit 353ff7c9c2c2b5ae6a6dd73102aaf14d00de744a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 14 13:32:02 2010 +0100

    Adding debian version 1.4.0-1.

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..0d1d17e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2010-03-11
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..6e6811c
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2009-2010 Cédric Krier.
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..3657792
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_calendar
+=================================
+
+Prerequisites
+-------------
+
+ * Python 2.5 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_calendar (http://www.tryton.org/)
+ * vobject >= 0.8.0 (http://vobject.skyhouseconsulting.com/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_calendar 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 calendar.
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..c61b52d
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,10 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..e12540e
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_calendar_classification
+Version: 1.4.0
+Summary: Handle classification of event
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..dcfe8a5
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_calendar_classification
+===============================
+
+The calendar_classification 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..d520dc7
--- /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 calendar import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..08d931e
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+    'name' : 'Calendar Classification',
+    'name_de_DE' : 'Kalender Klassifikation',
+    'name_es_CO' : 'Clasificación del calendario',
+    'name_es_ES' : 'Clasificación del calendario',
+    'name_fr_FR' : 'Classification calendrier',
+    'version' : '1.4.0',
+    'author' : 'B2CK',
+    'email': 'info at b2ck.com',
+    'website': 'http://www.tryton.org/',
+    'description': 'Handle classification of event',
+    'description_de_DE' : '''
+    Fügt Unterstützung für die Klassifikation von Terminen in CalDAV hinzu.
+''',
+    'description_es_CO': 'Gestiona la clasificación de eventos en CalDAV',
+    'description_es_ES': 'Gestiona la clasificación de eventos en CalDAV',
+    'description_fr_FR': 'Gère la classification des évènements',
+    'depends' : [
+        'ir',
+        'calendar',
+    ],
+    'xml' : [
+    ],
+    'translation': [
+        'de_DE.csv',
+        'es_CO.csv',
+        'es_ES.csv',
+        'fr_FR.csv',
+    ],
+}
diff --git a/calendar.py b/calendar.py
new file mode 100644
index 0000000..2918352
--- /dev/null
+++ b/calendar.py
@@ -0,0 +1,156 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelSQL
+from trytond.tools import reduce_ids
+import vobject
+
+
+class Event(ModelSQL):
+    _name = 'calendar.event'
+
+    def __init__(self):
+        super(Event, self).__init__()
+        self._error_messages.update({
+            'transparent': 'Free',
+            'opaque': 'Busy',
+            })
+
+    def search(self, cursor, user, domain, offset=0, limit=None, order=None,
+            context=None, count=False, query_string=False):
+        if user:
+            domain = domain[:]
+            domain = [domain,
+                    ['OR',
+                        [
+                            ('classification', '=', 'confidential'),
+                            ['OR',
+                                ('calendar.owner', '=', user),
+                                ('calendar.write_users', '=', user),
+                            ],
+                        ],
+                        ('classification', '!=', 'confidential'),
+                    ]]
+        return super(Event, self).search(cursor, user, domain, offset=offset,
+                limit=limit, order=order, context=context, count=count,
+                query_string=query_string)
+
+    def create(self, cursor, user, values, context=None):
+        new_id = super(Event, self).create(cursor, user, values, context=context)
+        if self.search(cursor, user,
+                [('id', '=', new_id)], context=context, count=True) != 1:
+            self.raise_user_error(cursor, 'access_error',
+                    self._description, context=context)
+        return new_id
+
+    def _clean_private(self, cursor, user, record, transp, context=None):
+        '''
+        Clean private record
+
+        :param cursor: the database cursor
+        :param user: the user id
+        :param record: a dictionary with record values
+        :param transp: the time transparency
+        :param context: the context
+        '''
+        summary = self.raise_user_error(cursor, transp, raise_exception=False,
+                context=context)
+        if 'summary' in record:
+            record['summary'] = summary
+
+        vevent = None
+        if 'vevent' in record:
+            vevent = record['vevent']
+            if vevent:
+                vevent = vobject.readOne(vevent)
+                if hasattr(vevent, 'summary'):
+                    vevent.summary.value = summary
+
+        for field, value in (
+                ('description', ''),
+                ('categories', []),
+                ('location', False),
+                ('status', ''),
+                ('organizer', ''),
+                ('attendees', []),
+                ('alarms', [])):
+            if field in record:
+                record[field] = value
+            if field + '.rec_name' in record:
+                record[field + '.rec_name'] = ''
+            if vevent:
+                if hasattr(vevent, field):
+                    delattr(vevent, field)
+        if vevent:
+            record['vevent'] = vevent.serialize()
+
+    def read(self, cursor, user, ids, fields_names=None, context=None):
+        rule_obj = self.pool.get('ir.rule')
+        int_id = False
+        if isinstance(ids, (int, long)):
+            int_id = True
+            ids = [ids]
+        if len({}.fromkeys(ids)) != self.search(cursor, user,
+                [('id', 'in', ids)], context=context, count=True):
+            self.raise_user_error(cursor, 'access_error',
+                    self._description, context=context)
+
+        writable_ids = []
+        domain1, domain2 = rule_obj.domain_get(cursor, user, self._name,
+                mode='write', context=context)
+        if domain1:
+            for i in range(0, len(ids), cursor.IN_MAX):
+                sub_ids = ids[i:i + cursor.IN_MAX]
+                red_sql, red_ids = reduce_ids('id', sub_ids)
+                cursor.execute('SELECT id FROM "' + self._table + '" ' \
+                        'WHERE ' + red_sql + ' AND (' + domain1 + ')',
+                        red_ids + domain2)
+                writable_ids.extend(x[0] for x in cursor.fetchall())
+        else:
+            writable_ids = ids
+        writable_ids = set(writable_ids)
+
+        if fields_names is None:
+            fields_names = []
+        to_remove = set()
+        for field in ('classification', 'calendar', 'transp'):
+            if field not in fields_names:
+                fields_names.append(field)
+                to_remove.add(field)
+        res = super(Event, self).read(cursor, user, ids,
+                fields_names=fields_names, context=context)
+        for record in res:
+            if record['classification'] == 'private' \
+                    and record['id'] not in writable_ids:
+                self._clean_private(cursor, user, record, record['transp'],
+                        context=context)
+            for field in to_remove:
+                del record[field]
+        if int_id:
+            return res[0]
+        return res
+
+    def write(self, cursor, user, ids, values, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if len({}.fromkeys(ids)) != self.search(cursor, user,
+                [('id', 'in', ids)], context=context, count=True):
+            self.raise_user_error(cursor, 'access_error',
+                    self._description, context=context)
+        res = super(Event, self).write(cursor, user, ids, values,
+                context=context)
+        if len({}.fromkeys(ids)) != self.search(cursor, user,
+                [('id', 'in', ids)], context=context, count=True):
+            self.raise_user_error(cursor, 'access_error',
+                    self._description, context=context)
+        return res
+
+    def delete(self, cursor, user, ids, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if len({}.fromkeys(ids)) != self.search(cursor, user,
+                [('id', 'in', ids)], context=context, count=True):
+            self.raise_user_error(cursor, 'access_error',
+                    self._description, context=context)
+        return super(Event, self).delete(cursor, user, ids, context=context)
+
+Event()
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..f9627ad
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,Busy,Beschäftigt,0
+error,calendar.event,0,Free,Verfügbar,0
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..18b6b24
--- /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_PATCHES=debian/patches 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..91d45c4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-calendar-classification (1.4.0-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org>  Sun, 14 Mar 2010 13:33:21 +0100
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..ae629cf
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,25 @@
+Source: tryton-modules-calendar-classification
+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-setuptools, python-support
+Standards-Version: 3.8.4
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-calendar-classification.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
+
+Package: tryton-modules-calendar-classification
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ tryton-modules-calendar (>= 1.4), python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Calendar Classification 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 the possibility to handle classification of an event.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..9f839d5
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,45 @@
+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) 2009-2010 Cedric Krier
+ (C) 2009-2010 Bertrand Chenal
+ (C) 2009-2010 B2CK SPRL
+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) 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
+ 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..b3dc41e
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.5-
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/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
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..5310311
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,Busy,Ocupado,1
+error,calendar.event,0,Free,Libre,1
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..0e4f645
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,Busy,Ocupado,0
+error,calendar.event,0,Free,Libre,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..55badd4
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,Busy,Occupé,0
+error,calendar.event,0,Free,Libre,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..f0b45e0
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup
+import re
+
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
+
+requires = ['vobject >= 0.8.0']
+for dep in info.get('depends', []):
+    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+        requires.append('trytond_%s >= %s.%s, < %s.%s' %
+                (dep, major_version, minor_version, major_version,
+                    minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+        (major_version, minor_version, major_version, minor_version + 1))
+
+setup(name='trytond_calendar_classification',
+    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.calendar_classification': '.'},
+    packages=[
+        'trytond.modules.calendar_classification',
+    ],
+    package_data={
+        'trytond.modules.calendar_classification': 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',
+        'Intended Audience :: Manufacturing',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: English',
+        'Natural Language :: French',
+        'Natural Language :: German',
+        'Natural Language :: Spanish',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Office/Business',
+    ],
+    license='GPL-3',
+    install_requires=requires,
+    zip_safe=False,
+    entry_points="""
+    [trytond.modules]
+    calendar_classification = trytond.modules.calendar_classification
+    """,
+)
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
new file mode 100644
index 0000000..e465068
--- /dev/null
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-calendar-classification
+Version: 1.4.0
+Summary: Handle classification of event
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
new file mode 100644
index 0000000..5ed63e2
--- /dev/null
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -0,0 +1,21 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+setup.py
+./__init__.py
+./__tryton__.py
+./calendar.py
+trytond_calendar_classification.egg-info/PKG-INFO
+trytond_calendar_classification.egg-info/SOURCES.txt
+trytond_calendar_classification.egg-info/dependency_links.txt
+trytond_calendar_classification.egg-info/entry_points.txt
+trytond_calendar_classification.egg-info/not-zip-safe
+trytond_calendar_classification.egg-info/requires.txt
+trytond_calendar_classification.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_calendar_classification.egg-info/dependency_links.txt b/trytond_calendar_classification.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_calendar_classification.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_calendar_classification.egg-info/entry_points.txt b/trytond_calendar_classification.egg-info/entry_points.txt
new file mode 100644
index 0000000..dfe9e98
--- /dev/null
+++ b/trytond_calendar_classification.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+    [trytond.modules]
+    calendar_classification = trytond.modules.calendar_classification
+    
\ No newline at end of file
diff --git a/trytond_calendar_classification.egg-info/not-zip-safe b/trytond_calendar_classification.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_calendar_classification.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
new file mode 100644
index 0000000..c6544f8
--- /dev/null
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -0,0 +1,3 @@
+vobject >= 0.8.0
+trytond_calendar >= 1.4, < 1.5
+trytond >= 1.4, < 1.5
\ No newline at end of file
diff --git a/trytond_calendar_classification.egg-info/top_level.txt b/trytond_calendar_classification.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_calendar_classification.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
-- 
tryton-modules-calendar-classification



More information about the tryton-debian-vcs mailing list