[tryton-debian-vcs] tryton-modules-calendar branch upstream-2.6 updated. upstream/2.6.2-1-gd80614d

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 11 18:48:13 UTC 2013


The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=upstream/2.6.2-1-gd80614d

commit d80614dce7d7a1c88680e2a5dfb1b4ec462769d8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:23:16 2013 +0100

    Adding upstream version 2.6.3.

diff --git a/CHANGELOG b/CHANGELOG
index ffa7322..9ef7a0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.2 - 2013-05-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c3673f6..0518659 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/calendar_.py b/calendar_.py
index 8dc2fce..ee470fc 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -792,7 +792,7 @@ class Event(ModelSQL, ModelView):
         Alarm = pool.get('calendar.event.alarm')
         Rdate = pool.get('calendar.event.rdate')
         Exdate = pool.get('calendar.event.exdate')
-        Rrule = pool.get('calendar.rrule')
+        Rrule = pool.get('calendar.event.rrule')
         Exrule = pool.get('calendar.event.exrule')
 
         vevents = []
diff --git a/tryton.cfg b/tryton.cfg
index b334dad..15fed43 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.2
+version=2.6.3
 depends:
     ir
     res
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index ee96ee8..0151ace 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-calendar
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-calendar



More information about the tryton-debian-vcs mailing list