[tryton-debian-vcs] tryton-modules-calendar-scheduling branch upstream updated. upstream/3.0.0-1-g1f0cd6e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:06:44 UTC 2014
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-scheduling.git;a=commitdiff;h=upstream/3.0.0-1-g1f0cd6e
commit 1f0cd6e5ff3edf29ee337ddf9c722cb7723765f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:21:28 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index dfdbcce..cd6ec8d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a005001..9d9d0a6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2014 Cédric Krier.
Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2013 B2CK SPRL.
+Copyright (C) 2009-2014 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 e1bc701..3b17b87 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_calendar_scheduling
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_calendar (http://www.tryton.org/)
* pywebdav 0.9.8 or later (http://sourceforge.net/projects/pywebdav/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 18ce53c..4cf1634 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,9 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index d18b489..8b7b867 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_calendar_scheduling
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add scheduling support on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_calendar_scheduling
===========================
@@ -44,6 +44,7 @@ Description: trytond_calendar_scheduling
http://www.tryton.org/
+Keywords: tryton calendar scheduling caldav
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -64,6 +65,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 588e318..01d1f79 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,7 +10,6 @@ from .res import *
def register():
Pool.register(
Event,
- Attendee,
EventAttendee,
User,
module='calendar_scheduling', type_='model')
diff --git a/calendar_.py b/calendar_.py
index 433c120..3b719aa 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -9,7 +9,7 @@ from trytond.tools import get_smtp_server
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
-__all__ = ['Event', 'Attendee', 'EventAttendee']
+__all__ = ['Event', 'EventAttendee']
__metaclass__ = PoolMeta
@@ -310,38 +310,36 @@ class Event:
return events
@classmethod
- def write(cls, events, values):
+ def write(cls, *args):
Attendee = Pool().get('calendar.event.attendee')
if Transaction().user == 0:
# user is 0 means write is triggered by another one
- super(Event, cls).write(events, values)
+ super(Event, cls).write(*args)
return
- if not values or not events:
- super(Event, cls).write(events, values)
- return
-
- event_edited = False
- for k in values:
- if k != 'attendees':
- event_edited = True
- break
-
- # store old attendee info
- event2former_emails = {}
- former_organiser_mail = {}
- former_organiser_lang = {}
- for event in events:
- to_notify, owner = event.attendees_to_notify()
- event2former_emails[event.id] = [a.email for a in to_notify]
- former_organiser_mail[event.id] = owner and owner.email
- former_organiser_lang[event.id] = owner and owner.language \
- and owner.language.code
-
- super(Event, cls).write(events, values)
-
- for event in events:
+ actions = iter(args)
+ for events, values in zip(actions, actions):
+ event_edited = False
+ for k in values:
+ if k != 'attendees':
+ event_edited = True
+ break
+
+ # store old attendee info
+ event2former_emails = {}
+ former_organiser_mail = {}
+ former_organiser_lang = {}
+ for event in events:
+ to_notify, owner = event.attendees_to_notify()
+ event2former_emails[event.id] = [a.email for a in to_notify]
+ former_organiser_mail[event.id] = owner and owner.email
+ former_organiser_lang[event.id] = owner and owner.language \
+ and owner.language.code
+
+ super(Event, cls).write(*args)
+
+ for event in sum(args[::2], []):
current_attendees, owner = event.attendees_to_notify()
owner_email = owner and owner.email
current_emails = [a.email for a in current_attendees]
@@ -470,8 +468,7 @@ class Event:
event.send_msg(owner_email, attendee_emails, msg, 'cancel')
-class Attendee:
- __name__ = 'calendar.attendee'
+class AttendeeMixin:
schedule_status = fields.Selection([
('', ''),
('1.0', '1.0'),
@@ -496,7 +493,7 @@ class Attendee:
@classmethod
def attendee2values(cls, attendee):
- values = super(Attendee, cls).attendee2values(attendee)
+ values = super(AttendeeMixin, cls).attendee2values(attendee)
if hasattr(attendee, 'schedule_status'):
if attendee.schedule_status in dict(
cls.schedule_status.selection):
@@ -507,7 +504,7 @@ class Attendee:
return values
def attendee2attendee(self):
- attendee = super(Attendee, self).attendee2attendee()
+ attendee = super(AttendeeMixin, self).attendee2attendee()
if self.schedule_status:
if hasattr(attendee, 'schedule_status_param'):
@@ -539,7 +536,8 @@ class Attendee:
return attendee
-class EventAttendee:
+class EventAttendee(AttendeeMixin, object):
+ __metaclass__ = PoolMeta
__name__ = 'calendar.event.attendee'
@classmethod
@@ -718,25 +716,26 @@ class EventAttendee:
return organizer
@classmethod
- def write(cls, attendees, values):
+ def write(cls, *args):
Event = Pool().get('calendar.event')
if Transaction().user == 0:
# user is 0 means write is triggered by another one
- super(EventAttendee, cls).write(attendees, values)
- return
-
- if 'status' not in values:
- super(EventAttendee, cls).write(attendees, values)
+ super(EventAttendee, cls).write(*args)
return
+ actions = iter(args)
+ status_attendees = []
att2status = {}
- for attendee in attendees:
- att2status[attendee.id] = attendee.status
+ for attendees, values in zip(actions, actions):
+ if 'status' in values:
+ status_attendees += attendees
+ for attendee in attendees:
+ att2status[attendee.id] = attendee.status
- super(EventAttendee, cls).write(attendees, values)
+ super(EventAttendee, cls).write(*args)
- for attendee in attendees:
+ for attendee in status_attendees:
owner = attendee.event.calendar.owner
if not owner or not owner.calendar_email_notification_partstat:
continue
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 10b46c4..0eba911 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -94,6 +94,16 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Състояние на график"
+#, fuzzy
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Пълномощник на графика"
+
+#, fuzzy
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Състояние на график"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Отказани покани"
@@ -162,6 +172,69 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Клиент"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Няма"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Сървър"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Известяване за събитие от календар"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index edcbe69..e51db07 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -96,6 +96,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Estat de la planificació"
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agent del planificador"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Estat de la planificació"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Invitacions cancel·lades"
@@ -164,6 +172,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Cap"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Notificacions per correu electrònic del calendari"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 6ae5eeb..ebc3872 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -94,6 +94,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr ""
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr ""
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr ""
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr ""
@@ -162,6 +170,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr ""
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr ""
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 002b5bb..ffa0dc8 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -106,6 +106,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Terminplaner Status"
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Terminplaner Agent"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Terminplaner Status"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Absagen von Einladungen"
@@ -174,6 +182,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Keiner"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Server"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Kalender E-Mail Benachrichtigungen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index c3b4f9c..28178b8 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -96,6 +96,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Estado de la planificación"
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agente del planificador"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Estado de la planificación"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Invitaciones canceladas"
@@ -164,6 +172,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Notificaciones por correo electrónico del calendario"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index fc4bab5..cd1e67f 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -88,11 +88,19 @@ msgstr "Usted fue invitado al siguiente evento."
msgctxt "field:calendar.event,organizer_schedule_agent:"
msgid "Schedule Agent"
-msgstr "Agente de Programación"
+msgstr "Agente de Planeación"
msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
-msgstr "Estado de programación"
+msgstr "Estado de Planeación"
+
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agente de Planeación"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Estado de Planeación"
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
@@ -162,6 +170,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Notificaciones de Calendario por Email"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 93501eb..139d946 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -96,6 +96,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Estado de la planificación"
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agente de la planificación"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Estado de la planificación"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Invitaciones canceladas"
@@ -164,6 +172,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Notificaciones por correo electrónico del calendario"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 2c8a3a7..73ea093 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -100,6 +100,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Statut de planification"
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agent de planification"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Statut de planification"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Invitations annulées"
@@ -168,6 +176,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Aucun"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Notifications calendrier par Email"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 1141fde..96b3cbe 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -94,6 +94,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr ""
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr ""
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr ""
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr ""
@@ -163,6 +171,59 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr ""
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Geen"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr ""
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index eec390b..e7f397a 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -100,6 +100,16 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Статус расписания"
+#, fuzzy
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Расписание агента"
+
+#, fuzzy
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Статус расписания"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Отменено приглашения"
@@ -168,6 +178,61 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr ""
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Клиент"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Отсутствует"
+
+#, fuzzy
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Сервер"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr ""
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Уведомление по почте"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 4682e3b..8fece6e 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -100,6 +100,14 @@ msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
msgstr "Status razporejanja"
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Odjemalec razporejanja"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Status razporejanja"
+
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
msgstr "Preklicana povabila"
@@ -168,6 +176,58 @@ msgctxt "selection:calendar.event,organizer_schedule_status:"
msgid "5.3"
msgstr "5.3"
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Odjemalec"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Brez"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Strežnik"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
msgstr "Sporočila"
diff --git a/setup.py b/setup.py
index d562854..dab81d2 100644
--- a/setup.py
+++ b/setup.py
@@ -11,33 +11,51 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
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)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_calendar_scheduling'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
requires = ['PyWebDAV >= 0.9.8']
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))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
-setup(name='trytond_calendar_scheduling',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to add scheduling support on CalDAV',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton calendar scheduling caldav',
package_dir={'trytond.modules.calendar_scheduling': '.'},
packages=[
'trytond.modules.calendar_scheduling',
@@ -67,7 +85,6 @@ setup(name='trytond_calendar_scheduling',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
diff --git a/tests/scenario_calendar_scheduling.py b/tests/scenario_calendar_scheduling.py
index 0fea3c5..cbd6bea 100644
--- a/tests/scenario_calendar_scheduling.py
+++ b/tests/scenario_calendar_scheduling.py
@@ -1,7 +1,7 @@
#!/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 optparse import OptionParser
+from argparse import ArgumentParser
from urlparse import urlparse
import unittest
import sys
@@ -67,12 +67,12 @@ class TestCase(unittest.TestCase):
parent=self.calendar).save()
if __name__ == '__main__':
- parser = OptionParser()
- parser.add_option('--xmlrpc', dest='xmlrpc', metavar='URL',
+ parser = ArgumentParser()
+ parser.add_argument('--xmlrpc', dest='xmlrpc', metavar='URL',
help='use trytond XML-RPC at URL')
- parser.add_option('--url', dest='url', metavar='URL',
+ parser.add_argument('--url', dest='url', metavar='URL',
help='use calendar at URL')
- (options, args) = parser.parse_args()
+ options = parser.parse_args()
config = config.set_xmlrpc(options.xmlrpc)
xmlrpc_user = urlparse(options.xmlrpc).username
user = urlparse(options.url).username
diff --git a/tests/test_calendar_scheduling.py b/tests/test_calendar_scheduling.py
index af9ffd8..642599e 100644
--- a/tests/test_calendar_scheduling.py
+++ b/tests/test_calendar_scheduling.py
@@ -1,37 +1,22 @@
-#!/usr/bin/env python
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-
-import sys
-import os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-
import unittest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import test_view, test_depends
class CalendarSchedulingTestCase(unittest.TestCase):
- '''
- Test CalendarScheduling module.
- '''
+ 'Test CalendarScheduling module'
def setUp(self):
trytond.tests.test_tryton.install_module('calendar_scheduling')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('calendar_scheduling')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
CalendarSchedulingTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 8265cdd..7de8f30 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
calendar
ir
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 75933a7..568f636 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-calendar-scheduling
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add scheduling support on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_calendar_scheduling
===========================
@@ -44,6 +44,7 @@ Description: trytond_calendar_scheduling
http://www.tryton.org/
+Keywords: tryton calendar scheduling caldav
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -64,6 +65,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 410d67c..3929ab0 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,6 +1,6 @@
PyWebDAV >= 0.9.8
-trytond_calendar >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
+trytond_calendar >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
[test]
caldav
\ No newline at end of file
--
tryton-modules-calendar-scheduling
More information about the tryton-debian-vcs
mailing list