[tryton-debian-vcs] tryton-modules-party-vcarddav branch debian created. 7bd5ef1fd496881ceebb8c85617698d45cb37140
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:04:17 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-party-vcarddav.git;a=commitdiff;h=7bd5ef1fd496881ceebb8c85617698d45cb37140
commit 7bd5ef1fd496881ceebb8c85617698d45cb37140
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:17 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 69eff4d..d1c7990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-party-vcarddav (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.
+ * Adding python-sql to Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:23 +0100
+
tryton-modules-party-vcarddav (2.8.0-3) unstable; urgency=low
* Removing pydist-overrides, it is no more needed.
commit 8ae5300ef82e07c2514cc4d07c708ee237cd7500
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 17:43:05 2013 +0100
Adding python-sql to Depends.
diff --git a/debian/control b/debian/control
index dd488cf..65a59eb 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
tryton-modules-party (>= ${version:major}), python-vobject, python-webdav,
- python-pkg-resources
+ python-sql, python-pkg-resources
Description: Tryton Application Platform (Party CardDAV 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 7e97dc6b2d1de29efbbbda1032d1b94a6415aeae
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 a94cd3c..dd488cf 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-party-vcarddav.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 409e54845466d3a021d48982d53565667035088a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 1b3e84a..a94cd3c 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-party-vcarddav.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-party-vcarddav.git
commit cb75fcc4b21f80262a55b63fdc6c379814e929b7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:25 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7f34659..7d5a2bd 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/INSTALL b/INSTALL
index 1a36e89..4ece669 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,6 +9,7 @@ Prerequisites
* trytond_party (http://www.tryton.org/)
* vobject 0.8.0 or later (http://vobject.skyhouseconsulting.com/)
* pywebdav 0.9.8 or later (http://sourceforge.net/projects/pywebdav/)
+ * python-sql (http://code.google.com/p/python-sql/)
Installation
------------
diff --git a/PKG-INFO b/PKG-INFO
index 0fc8a56..e02ee4f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_party_vcarddav
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for CardDAV
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_party_vcarddav
======================
@@ -61,6 +61,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/es_ES.po b/locale/es_ES.po
index e1adc11..1ada398 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:ir.action.report:"
msgid "Invalid email definition on report \"%s\"."
msgstr ""
-"La definición de correo electrónico sobre el informe \"%s\", no es correcta."
+"La definición de correo electrónico sobre el informe \"%s\" no es correcta."
msgctxt "error:party.party:"
msgid "The UUID of the party must be unique."
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..cb74981
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:"
+msgid "The UUID of the party must be unique."
+msgstr "UUID stranke mora biti edinstven."
+
+msgctxt "field:party.party,uuid:"
+msgid "UUID"
+msgstr "UUID"
+
+msgctxt "field:party.party,vcard:"
+msgid "VCard"
+msgstr "VCard"
+
+msgctxt "help:party.party,uuid:"
+msgid "Universally Unique Identifier"
+msgstr "Vsesplošno edinstven identifikator"
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr "VCard"
diff --git a/party.py b/party.py
index 63712b7..2a9e860 100644
--- a/party.py
+++ b/party.py
@@ -5,7 +5,7 @@ import vobject
from trytond.model import fields
from trytond.report import Report
-from trytond.backend import TableHandler, FIELDS
+from trytond import backend
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
@@ -29,18 +29,21 @@ class Party:
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
+ sql_table = cls.__table__()
if not table.column_exist('uuid'):
table.add_raw_column('uuid',
- FIELDS[cls.uuid._type].sql_type(cls.uuid),
- FIELDS[cls.uuid._type].sql_format, None, None)
- cursor.execute('SELECT id FROM "' + cls._table + '"')
+ cls.uuid.sql_type(),
+ cls.uuid.sql_format, None, None)
+ cursor.execute(*sql_table.select(sql_table.id))
for id, in cursor.fetchall():
- cursor.execute('UPDATE "' + cls._table + '" '
- 'SET "uuid" = %s WHERE id = %s',
- (cls.default_uuid(), id))
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.uuid],
+ values=[cls.default_uuid()],
+ where=sql_table.id == id))
super(Party, cls).__register__(module_name)
@staticmethod
diff --git a/setup.py b/setup.py
index b853d85..f188b3b 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ 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', 'PyWebDAV >= 0.9.8']
+requires = ['vobject >= 0.8.0', 'PyWebDAV >= 0.9.8', 'python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -63,6 +63,7 @@ setup(name='trytond_party_vcarddav',
'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 273c8c4..802b318 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
party
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 7789dea..b08822f 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-party-vcarddav
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for CardDAV
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_party_vcarddav
======================
@@ -61,6 +61,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_party_vcarddav.egg-info/SOURCES.txt b/trytond_party_vcarddav.egg-info/SOURCES.txt
index 6f88556..61ff6d3 100644
--- a/trytond_party_vcarddav.egg-info/SOURCES.txt
+++ b/trytond_party_vcarddav.egg-info/SOURCES.txt
@@ -22,6 +22,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_party_vcarddav.egg-info/PKG-INFO
trytond_party_vcarddav.egg-info/SOURCES.txt
trytond_party_vcarddav.egg-info/dependency_links.txt
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 583404b..085c9e7 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,5 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.8
-trytond_party >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_party >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index 9749c7a..fdab179 100644
--- a/webdav.py
+++ b/webdav.py
@@ -2,6 +2,10 @@
#this repository contains the full copyright notices and license terms.
from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
from pywebdav.lib.constants import COLLECTION, OBJECT
+from sql.functions import Extract
+from sql.aggregate import Max
+from sql.conditionals import Coalesce
+
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
from trytond.cache import Cache
@@ -170,6 +174,7 @@ class Collection:
@classmethod
def get_creationdate(cls, uri, cache=None):
Party = Pool().get('party.party')
+ party = Party.__table__()
party_id = cls.vcard(uri)
cursor = Transaction().cursor
@@ -189,11 +194,10 @@ class Collection:
res = None
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, '
- 'EXTRACT(epoch FROM create_date) '
- 'FROM "' + Party._table + '" '
- 'WHERE ' + red_sql, red_ids)
+ red_sql = reduce_ids(party.id, sub_ids)
+ cursor.execute(*party.select(party.id,
+ Extract('EPOCH', party.create_date),
+ where=red_sql))
for party_id2, date in cursor.fetchall():
if party_id2 == party_id:
res = date
@@ -210,6 +214,9 @@ class Collection:
Party = pool.get('party.party')
Address = pool.get('party.address')
ContactMechanism = pool.get('party.contact_mechanism')
+ party = Party.__table__()
+ address = Address.__table__()
+ contact_mechanism = ContactMechanism.__table__()
cursor = Transaction().cursor
@@ -227,21 +234,21 @@ class Collection:
res = None
for i in range(0, len(ids), cursor.IN_MAX):
sub_ids = ids[i:i + cursor.IN_MAX]
- red_sql, red_ids = reduce_ids('p.id', sub_ids)
- cursor.execute('SELECT p.id, '
- 'MAX(EXTRACT(epoch FROM '
- 'COALESCE(p.write_date, p.create_date))), '
- 'MAX(EXTRACT(epoch FROM '
- 'COALESCE(a.write_date, a.create_date))), '
- 'MAX(EXTRACT(epoch FROM '
- 'COALESCE(c.write_date, c.create_date))) '
- 'FROM "' + Party._table + '" p '
- 'LEFT JOIN "' + Address._table + '" a '
- 'ON p.id = a.party '
- 'LEFT JOIN "' + ContactMechanism._table + '" c '
- 'ON p.id = c.party '
- 'WHERE ' + red_sql + ' '
- 'GROUP BY p.id', red_ids)
+ red_sql = reduce_ids(party.id, sub_ids)
+ cursor.execute(*party.join(address, 'LEFT',
+ condition=party.id == address.party
+ ).join(contact_mechanism, 'LEFT',
+ condition=party.id == contact_mechanism.party
+ ).select(party.id,
+ Max(Extract('EPOCH', Coalesce(party.write_date,
+ party.create_date))),
+ Max(Extract('EPOCH', Coalesce(address.write_date,
+ address.create_date))),
+ Max(Extract('EPOCH', Coalesce(
+ contact_mechanism.write_date,
+ contact_mechanism.create_date))),
+ where=red_sql,
+ group_by=party.id))
for party_id2, date_p, date_a, date_c in cursor.fetchall():
date = max(date_p, date_a, date_c)
if party_id2 == party_id:
commit 85441a141b9b486c8368bf251fca8c16c87d4ace
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:20:57 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index fc0f2b8..69eff4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-vcarddav (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:33:03 +0200
+
tryton-modules-party-vcarddav (2.8.0-2) unstable; urgency=low
* Adding doc/ to docs file.
commit 8294cd9d05a6e59e5d47daf04d2807192e5ab6c2
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 a5d2768f56405c0220cde1d6e1e58c4334e9067c
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 d94f103..0000000
--- a/debian/pydist-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-vobject python-vobject
-PyWebDAV python-webdav
-
commit cae6546b58c25103ec5bf521ae5ab31c59843779
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:30 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index a7fc343..fc0f2b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-vcarddav (2.8.0-2) unstable; urgency=low
+
+ * Adding doc/ to docs file.
+ * Simplifying package layout by renaming <pkg_name>.docs to docs.
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:26:44 +0200
+
tryton-modules-party-vcarddav (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 4a96d76e64fbbc86b4835e8ae888074cee5d4ebe
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 60e2e30a369e60adc4da968cdbce8411e687e746
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:01:48 2013 +0200
Simplifying package layout by renaming <pkg_name>.docs to docs.
Thanks to Andreas Tille for this proposal. Since tryton module packages
will most probably stay simple binary packages this change simplifies the
package layout.
diff --git a/debian/tryton-modules-party-vcarddav.docs b/debian/docs
similarity index 100%
rename from debian/tryton-modules-party-vcarddav.docs
rename to debian/docs
commit ae79511575434d6955a076c1fd8790f0c784b17d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 14 18:54:41 2013 +0200
Adding doc/ to docs file.
diff --git a/debian/tryton-modules-party-vcarddav.docs b/debian/tryton-modules-party-vcarddav.docs
new file mode 100644
index 0000000..a2e6bd4
--- /dev/null
+++ b/debian/tryton-modules-party-vcarddav.docs
@@ -0,0 +1 @@
+doc/
commit 378d2fac11ee37d6dde980154ba8f4f2c068a343
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:07 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 0692e9a..a7fc343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-vcarddav (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:20:21 +0200
+
tryton-modules-party-vcarddav (2.6.0-4) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704387).
commit 98673aa936593d89f31d4af9cda48e4b2e42ff9a
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 cbad1dd..c27df9a 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
- 2009-2012 Bertrand Chenal
- 2009-2012 B2CK SPRL
+Copyright: 2009-2013 Cédric Krier
+ 2009-2013 Bertrand Chenal
+ 2009-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit c41674b89261f8f77abe4ee82d4064a3c482428a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:36:44 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2a0dd2b..7f34659 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..a005001 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
-Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2013 Bertrand Chenal.
+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 728f9a4..0fc8a56 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_party_vcarddav
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module for CardDAV
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_party_vcarddav
======================
@@ -54,6 +54,7 @@ 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 :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index fbdab9b..52a3454 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr "UUID на партньор трабва да е уникален!"
+msgid "The UUID of the party must be unique."
+msgstr ""
msgctxt "field:party.party,uuid:"
msgid "UUID"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 27962bb..b22de37 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,9 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:ir.action.report:"
+msgid "Invalid email definition on report \"%s\"."
+msgstr ""
+"La definició del correu electrònic sobre l'informe \"%s\", no és correcta."
+
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr "L'UUID del tercer ha de ser únic."
+msgid "The UUID of the party must be unique."
+msgstr "El UUID del tercer ha de ser únic."
+
+msgctxt "error:webdav.collection:"
+msgid ""
+"You can not create a collection named \"%(parent)s\" in collection "
+"\"%(child)s\" because there is already a file with that name."
+msgstr ""
+"No podeu crear un directori amb el nom \"%(parent)s\" dins del directori "
+"\"%(child)s\" perquè ja existeix un altre amb aquest nom."
msgctxt "field:party.party,uuid:"
msgid "UUID"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 4cac0ef..de94f2b 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
+msgid "The UUID of the party must be unique."
msgstr ""
msgctxt "field:party.party,uuid:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 69e8741..7d81b41 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr "Die UUID für eine Partei kann nicht mehrfach vergeben werden!"
+msgid "The UUID of the party must be unique."
+msgstr "Die UUID einer Partei kann nur einmal vergeben werden."
msgctxt "field:party.party,uuid:"
msgid "UUID"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index a38c31f..24aab1a 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr "¡El UUID de la entidad debe ser único!"
+msgid "The UUID of the party must be unique."
+msgstr "El UUID de la entidad debe ser único."
msgctxt "field:party.party,uuid:"
msgid "UUID"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 02242b0..0ff1a0f 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr "¡La UUID del tercero debe ser único!"
+msgid "The UUID of the party must be unique."
+msgstr ""
msgctxt "field:party.party,uuid:"
msgid "UUID"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 7579bc1..e1adc11 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,10 +2,23 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:ir.action.report:"
+msgid "Invalid email definition on report \"%s\"."
+msgstr ""
+"La definición de correo electrónico sobre el informe \"%s\", no es correcta."
+
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
+msgid "The UUID of the party must be unique."
msgstr "El UUID del tercero debe ser único."
+msgctxt "error:webdav.collection:"
+msgid ""
+"You can not create a collection named \"%(parent)s\" in collection "
+"\"%(child)s\" because there is already a file with that name."
+msgstr ""
+"No puede crear un directorio con el nombre \"%(parent)s\" en el directorio "
+"\"%(child)s\" porque ya existe otro con ese nombre."
+
msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 3617a9d..b97725a 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,12 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr "L'UUID du tiers doit être unique !"
-
-msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr "L'UUID du tiers doit être unique !"
+msgid "The UUID of the party must be unique."
+msgstr "L'UUID du tiers doit être unique."
msgctxt "field:party.party,uuid:"
msgid "UUID"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 4cac0ef..de94f2b 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
+msgid "The UUID of the party must be unique."
msgstr ""
msgctxt "field:party.party,uuid:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index abbbe75..14b83db 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,22 +3,21 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
-msgid "The UUID of the party must be unique!"
-msgstr ""
+msgid "The UUID of the party must be unique."
+msgstr "UUID контрагента должен быть уникальным."
msgctxt "field:party.party,uuid:"
msgid "UUID"
-msgstr ""
+msgstr "UUID"
msgctxt "field:party.party,vcard:"
msgid "VCard"
-msgstr ""
+msgstr "VCard"
-#, fuzzy
msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Универсальный уникальный идентификатор"
+msgstr "Универсальный уникальный идентификатор (UUID)"
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
-msgstr ""
+msgstr "VCard"
diff --git a/party.py b/party.py
index 94aac3d..63712b7 100644
--- a/party.py
+++ b/party.py
@@ -24,7 +24,7 @@ class Party:
super(Party, cls).__setup__()
cls._sql_constraints += [
('uuid_uniq', 'UNIQUE(uuid)',
- 'The UUID of the party must be unique!'),
+ 'The UUID of the party must be unique.'),
]
@classmethod
@@ -48,13 +48,13 @@ class Party:
return str(uuid.uuid4())
@classmethod
- def create(cls, vals):
+ def create(cls, vlist):
Collection = Pool().get('webdav.collection')
- party = super(Party, cls).create(vals)
+ parties = super(Party, cls).create(vlist)
# Restart the cache for vcard
Collection._vcard_cache.clear()
- return party
+ return parties
@classmethod
def copy(cls, parties, default=None):
@@ -101,15 +101,22 @@ class Party:
if hasattr(vcard, 'uid'):
res['uuid'] = vcard.uid.value
res['addresses'] = []
+ to_create = []
for adr in vcard.contents.get('adr', []):
vals = Address.vcard2values(adr)
- res['addresses'].append(('create', vals))
+ to_create.append(vals)
+ if to_create:
+ res['addresses'].append(('create', to_create))
res['contact_mechanisms'] = []
+ to_create = []
for email in vcard.contents.get('email', []):
vals = {}
vals['type'] = 'email'
vals['value'] = email.value
- res['contact_mechanisms'].append(('create', vals))
+ to_create.append(vals)
+ if to_create:
+ res['contact_mechanisms'].append(('create', to_create))
+ to_create = []
for tel in vcard.contents.get('tel', []):
vals = {}
vals['type'] = 'phone'
@@ -117,7 +124,9 @@ class Party:
and 'cell' in tel.type_param.lower():
vals['type'] = 'mobile'
vals['value'] = tel.value
- res['contact_mechanisms'].append(('create', vals))
+ to_create.append(vals)
+ if to_create:
+ res['contact_mechanisms'].append(('create', to_create))
else:
i = 0
res['addresses'] = []
@@ -142,11 +151,14 @@ class Party:
new_addresses = vcard.contents.get('adr', [])[i:]
except IndexError:
new_addresses = []
+ to_create = []
for adr in new_addresses:
if not hasattr(adr, 'value'):
continue
vals = Address.vcard2values(adr)
- res['addresses'].append(('create', vals))
+ to_create.append(vals)
+ if to_create:
+ res['addresses'].append(('create', to_create))
i = 0
res['contact_mechanisms'] = []
@@ -168,13 +180,16 @@ class Party:
new_emails = vcard.contents.get('email', [])[i:]
except IndexError:
new_emails = []
+ to_create = []
for email in new_emails:
if not hasattr(email, 'value'):
continue
vals = {}
vals['type'] = 'email'
vals['value'] = email.value
- res['contact_mechanisms'].append(('create', vals))
+ to_create.append(vals)
+ if to_create:
+ res['contact_mechanisms'].append(('create', to_create))
i = 0
for cm in self.contact_mechanisms:
@@ -194,6 +209,7 @@ class Party:
new_tels = vcard.contents.get('tel', [])[i:]
except IndexError:
new_tels = []
+ to_create = []
for tel in new_tels:
if not hasattr(tel, 'value'):
continue
@@ -203,7 +219,9 @@ class Party:
and 'cell' in tel.type_param.lower():
vals['type'] = 'mobile'
vals['value'] = tel.value
- res['contact_mechanisms'].append(('create', vals))
+ to_create.append(vals)
+ if to_create:
+ res['contact_mechanisms'].append(('create', to_create))
if contact_mechanisms_todelete:
res['contact_mechanisms'].append(('delete',
@@ -271,7 +289,7 @@ class VCard(Report):
raise Exception('Error', 'Report (%s) not find!' % cls.__name__)
action_report = action_reports[0]
- parties = Party(ids)
+ parties = Party.browse(ids)
data = ''.join(cls.create_vcard(party).serialize()
for party in parties)
@@ -309,7 +327,7 @@ class VCard(Report):
if not hasattr(adr, 'value'):
adr.value = vobject.vcard.Address()
adr.value.street = address.street and address.street + (
- address.streetbis and (" " + address.streetbis) or '') or ''
+ address.streetbis and (" " + address.streetbis) or '') or ''
adr.value.city = address.city or ''
if address.subdivision:
adr.value.region = address.subdivision.name or ''
diff --git a/setup.py b/setup.py
index 495c64c..b853d85 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = ['vobject >= 0.8.0', '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))
+ (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_party_vcarddav',
version=info.get('version', '0.0.1'),
@@ -36,15 +36,15 @@ setup(name='trytond_party_vcarddav',
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.party_vcarddav': '.'},
packages=[
'trytond.modules.party_vcarddav',
],
package_data={
- 'trytond.modules.party_vcarddav': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.party_vcarddav': (info.get('xml', [])
+ + ['tryton.cfg', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_party_vcarddav',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index e9fe934..273c8c4 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
party
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 4ec2583..7789dea 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-party-vcarddav
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module for CardDAV
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_party_vcarddav
======================
@@ -54,6 +54,7 @@ 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 :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 83ba174..583404b 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,4 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.8
-trytond_party >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_party >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index ee65adf..9749c7a 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,6 +1,7 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
+from pywebdav.lib.constants import COLLECTION, OBJECT
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
from trytond.cache import Cache
@@ -153,7 +154,6 @@ class Collection:
@classmethod
def get_resourcetype(cls, uri, cache=None):
- from DAV.constants import COLLECTION, OBJECT
party_id = cls.vcard(uri)
if party_id:
return OBJECT
@@ -190,10 +190,10 @@ class Collection:
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, ' \
- 'EXTRACT(epoch FROM create_date) ' \
- 'FROM "' + Party._table + '" ' \
- 'WHERE ' + red_sql, red_ids)
+ cursor.execute('SELECT id, '
+ 'EXTRACT(epoch FROM create_date) '
+ 'FROM "' + Party._table + '" '
+ 'WHERE ' + red_sql, red_ids)
for party_id2, date in cursor.fetchall():
if party_id2 == party_id:
res = date
@@ -262,7 +262,7 @@ class Collection:
if party_id:
val = Vcard.execute([party_id],
{'id': party_id, 'ids': [party_id]})
- return val[1]
+ return str(val[1])
return super(Collection, cls).get_data(uri, cache=cache)
@classmethod
@@ -285,7 +285,7 @@ class Collection:
vcard = vobject.readOne(data)
values = Party().vcard2values(vcard)
try:
- party_id = Party.create(values)
+ party_id, = Party.create([values])
except Exception:
raise DAV_Forbidden
party = Party(party_id)
commit 5d2a2f8b9ce6a0b120b2b6134d5df344de40d517
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:46 2013 +0200
Releasing debian version 2.6.0-4.
diff --git a/debian/changelog b/debian/changelog
index f31146a..0692e9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-vcarddav (2.6.0-4) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704387).
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:07:33 +0200
+
tryton-modules-party-vcarddav (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit d37782f34ca5383461c72b4f8b01bdc403d497ee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 686b6b8..1b3e84a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-party (>= 2.6), python-vobject, python-webdav,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}), python-vobject, python-webdav,
python-pkg-resources
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
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 52b9fb31a4371b0b8915aad0b25a663a9290189b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:33:18 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704387).
diff --git a/debian/control b/debian/control
index 94cab7d..686b6b8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-party-vcarddav
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 8cbb5549e1a0200a7895ad11ab013f1b1e84dad8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:04:08 2013 +0100
Releasing debian version 2.6.0-3.
diff --git a/debian/changelog b/debian/changelog
index 6e8b7fe..f31146a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-vcarddav (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:51 +0100
+
tryton-modules-party-vcarddav (2.6.0-2) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit 1991b6fe305918a3a7c6450c712b8014dd6a332b
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..2b7ded5
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_party_vcarddav-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 3ae07b141dd2988abd8f33042dc0b8945ecc19d1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:10 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index 2120ad6..94cab7d 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-party-vcarddav.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-party-vcarddav.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-party-vcarddav.git
X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
commit c667125a7441bed44c16bb73ef4e6199ae25bdb5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:43 2013 +0100
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 193b9bd..6e8b7fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-vcarddav (2.6.0-2) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:40:59 +0100
+
tryton-modules-party-vcarddav (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit 21c7bca03bd2cd24c18dadd7ac06aa3cdf8bef1e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:20 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 99aff32..cbad1dd 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:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit df647f2c5d9066c43f505bb2f2c35ab32ae504b3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:33 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 6c9b9c7..2120ad6 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-party-vcarddav.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-party-vcarddav.git
commit c67f19f1944aa0baaae2b7b7b9e1b7eae1c456d2
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 1fe8bca..6c9b9c7 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 9d2b0a2e51c945e8628bad588c1066f3306f88f1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:02:01 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index af6f193..193b9bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-vcarddav (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:42 +0200
+
tryton-modules-party-vcarddav (2.4.1-2) experimental; urgency=low
[ Daniel Baumann ]
commit 186fe8c152a9f5c5dc575ac957b54f3cc20d7e12
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 0e962f1..1fe8bca 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
- tryton-modules-party (>= 2.4), python-vobject, python-webdav,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-party (>= 2.6), python-vobject, python-webdav,
python-pkg-resources
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
commit 5b3acfbbde90db6f46a0598845caeefeca643b8e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:37 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index e6fec4c..2a0dd2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.4.1 - 2012-09-02
+Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
Version 2.4.0 - 2012-04-24
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 9dc963c..728f9a4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,49 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 2.4.1
-Summary: Add CardDAV on parties
+Version: 2.6.0
+Summary: Tryton module for CardDAV
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_party_vcarddav
+ ======================
+
+ The party_vcarddav 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 82686c6..ee29b01 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,19 @@
#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 . import carddav
from .webdav import *
from .party import *
+
+
+def register():
+ Pool.register(
+ Collection,
+ Party,
+ Address,
+ ActionReport,
+ module='party_vcarddav', type_='model')
+ Pool.register(
+ VCard,
+ module='party_vcarddav', type_='report')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 14f9973..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,46 +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': 'Party - vCardDAV',
- 'name_bg_BG': 'Фирма - vCardDAV',
- 'name_ca_ES': 'Tercers - vCardDAV',
- 'name_de_DE': 'Parteien vCardDAV',
- 'name_es_AR': 'Entidad - vCardDAV',
- 'name_es_CO': 'vCardDAV de Compañía',
- 'name_es_ES': 'Tercero - vCardDAV',
- 'name_fr_FR': 'Tiers - vCardDAV',
- 'version': '2.4.1',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': 'Add CardDAV on parties',
- 'description_bg_BG': 'Добавя към партньор поддръжка на CardDAV',
- 'description_ca_ES': 'Afegeix suport per CardDAV als Tercers',
- 'description_de_DE': 'Ermöglicht CardDAV für Parteien',
- 'description_es_AR': 'Añade soporte de CardDAV para entidades',
- 'description_es_CO': 'Soporte de CardDAV para terceros',
- 'description_es_ES': 'Añade soporte de CardDAV para terceros',
- 'description_fr_FR': 'Ajoute le support CardDAV pour les tiers',
- 'depends': [
- 'ir',
- 'res',
- 'party',
- 'webdav',
- ],
- 'xml': [
- 'party.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/carddav.py b/carddav.py
index f8c37dc..58b8b0d 100644
--- a/carddav.py
+++ b/carddav.py
@@ -38,16 +38,15 @@ def _get_carddav_address_data(self, uri):
raise DAV_NotFound
pool = Pool(Transaction().cursor.database_name)
try:
- collection_obj = pool.get('webdav.collection')
+ Collection = pool.get('webdav.collection')
except KeyError:
raise DAV_NotFound
try:
- res = collection_obj.get_address_data(dburi, cache=CACHE)
+ return Collection.get_address_data(dburi, cache=CACHE)
except DAV_Error:
raise
except Exception:
raise DAV_Error(500)
- return res
TrytonDAVInterface._get_carddav_address_data = _get_carddav_address_data
TrytonDAVInterface._get_carddav_addressbook_data = _get_carddav_address_data
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 59fa348..27962bb 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
-msgstr "L'UUID del tercer ha de ser únic"
+msgstr "L'UUID del tercer ha de ser únic."
msgctxt "field:party.party,uuid:"
msgid "UUID"
@@ -16,7 +16,7 @@ msgstr "vCard"
msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Identificador universal únic"
+msgstr "Identificador universal únic."
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index c6b26fd..a38c31f 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -16,7 +16,7 @@ msgstr "VCard"
msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Identificador universal único"
+msgstr "Identificador Universal Único"
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 6130afe..02242b0 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
-msgstr "¡La UUID del tercero debe ser única!"
+msgstr "¡La UUID del tercero debe ser único!"
msgctxt "field:party.party,uuid:"
msgid "UUID"
diff --git a/party.py b/party.py
index 74d2a12..94aac3d 100644
--- a/party.py
+++ b/party.py
@@ -1,98 +1,95 @@
#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 copy
import uuid
-from trytond.model import ModelSQL, ModelView, fields
+import vobject
+
+from trytond.model import fields
from trytond.report import Report
from trytond.backend import TableHandler, FIELDS
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+
+__all__ = ['Party', 'Address', 'ActionReport', 'VCard']
+__metaclass__ = PoolMeta
-class Party(ModelSQL, ModelView):
- _name = 'party.party'
+class Party:
+ __name__ = 'party.party'
uuid = fields.Char('UUID', required=True,
help='Universally Unique Identifier')
vcard = fields.Binary('VCard')
- def __init__(self):
- super(Party, self).__init__()
- self._sql_constraints += [
- ('uuid_uniq', 'UNIQUE(uuid)',
- 'The UUID of the party must be unique!'),
- ]
+ @classmethod
+ def __setup__(cls):
+ super(Party, cls).__setup__()
+ cls._sql_constraints += [
+ ('uuid_uniq', 'UNIQUE(uuid)',
+ 'The UUID of the party must be unique!'),
+ ]
- def init(self, module_name):
+ @classmethod
+ def __register__(cls, module_name):
cursor = Transaction().cursor
- table = TableHandler(cursor, self, module_name)
+ table = TableHandler(cursor, cls, module_name)
if not table.column_exist('uuid'):
table.add_raw_column('uuid',
- FIELDS[self.uuid._type].sql_type(self.uuid),
- FIELDS[self.uuid._type].sql_format, None, None)
- cursor.execute('SELECT id FROM "' + self._table + '"')
+ FIELDS[cls.uuid._type].sql_type(cls.uuid),
+ FIELDS[cls.uuid._type].sql_format, None, None)
+ cursor.execute('SELECT id FROM "' + cls._table + '"')
for id, in cursor.fetchall():
- cursor.execute('UPDATE "' + self._table + '" ' \
- 'SET "uuid" = %s WHERE id = %s',
- (self.default_uuid(), id))
- super(Party, self).init(module_name)
+ cursor.execute('UPDATE "' + cls._table + '" '
+ 'SET "uuid" = %s WHERE id = %s',
+ (cls.default_uuid(), id))
+ super(Party, cls).__register__(module_name)
- def default_uuid(self):
+ @staticmethod
+ def default_uuid():
return str(uuid.uuid4())
- def create(self, vals):
- collection_obj = Pool().get('webdav.collection')
+ @classmethod
+ def create(cls, vals):
+ Collection = Pool().get('webdav.collection')
- res = super(Party, self).create(vals)
+ party = super(Party, cls).create(vals)
# Restart the cache for vcard
- collection_obj.vcard.reset()
- return res
-
- def copy(self, ids, default=None):
- int_id = isinstance(ids, (int, long))
- if int_id:
- ids = [ids]
+ Collection._vcard_cache.clear()
+ return party
+ @classmethod
+ def copy(cls, parties, default=None):
if default is None:
default = {}
-
- new_ids = []
- for party_id in ids:
+ new_parties = []
+ for party in parties:
current_default = default.copy()
- current_default['uuid'] = self.default_uuid()
- new_id = super(Party, self).copy(party_id, default=current_default)
- new_ids.append(new_id)
-
- if int_id:
- return new_ids[0]
- return new_ids
+ current_default['uuid'] = cls.default_uuid()
+ new_party, = super(Party, cls).copy([party],
+ default=current_default)
+ new_parties.append(new_party)
+ return new_parties
- def write(self, ids, vals):
- collection_obj = Pool().get('webdav.collection')
+ @classmethod
+ def write(cls, parties, vals):
+ Collection = Pool().get('webdav.collection')
- res = super(Party, self).write(ids, vals)
+ super(Party, cls).write(parties, vals)
# Restart the cache for vcard
- collection_obj.vcard.reset()
- return res
+ Collection._vcard_cache.clear()
- def delete(self, ids):
- collection_obj = Pool().get('webdav.collection')
+ @classmethod
+ def delete(cls, parties):
+ Collection = Pool().get('webdav.collection')
- res = super(Party, self).delete(ids)
+ super(Party, cls).delete(parties)
# Restart the cache for vcard
- collection_obj.vcard.reset()
- return res
+ Collection._vcard_cache.clear()
- def vcard2values(self, party_id, vcard):
+ def vcard2values(self, vcard):
'''
Convert vcard to values for create or write
-
- :param party_id: the party id for write or None for create
- :param vcard: a vcard instance of vobject
- :return: a dictionary with values
'''
- import vobject
- address_obj = Pool().get('party.address')
+ Address = Pool().get('party.address')
res = {}
res['name'] = vcard.fn.value
@@ -100,12 +97,12 @@ class Party(ModelSQL, ModelView):
vcard.add('n')
vcard.n.value = vobject.vcard.Name(vcard.fn.value)
res['vcard'] = vcard.serialize()
- if not party_id:
+ if not self.id:
if hasattr(vcard, 'uid'):
res['uuid'] = vcard.uid.value
res['addresses'] = []
for adr in vcard.contents.get('adr', []):
- vals = address_obj.vcard2values(adr)
+ vals = Address.vcard2values(adr)
res['addresses'].append(('create', vals))
res['contact_mechanisms'] = []
for email in vcard.contents.get('email', []):
@@ -122,11 +119,10 @@ class Party(ModelSQL, ModelView):
vals['value'] = tel.value
res['contact_mechanisms'].append(('create', vals))
else:
- party = self.browse(party_id)
i = 0
res['addresses'] = []
addresses_todelete = []
- for address in party.addresses:
+ for address in self.addresses:
try:
adr = vcard.contents.get('adr', [])[i]
except IndexError:
@@ -137,8 +133,8 @@ class Party(ModelSQL, ModelView):
addresses_todelete.append(address.id)
i += 1
continue
- vals = address_obj.vcard2values(adr)
- res['addresses'].append(('write', address.id, vals))
+ vals = Address.vcard2values(adr)
+ res['addresses'].append(('write', [address.id], vals))
i += 1
if addresses_todelete:
res['addresses'].append(('delete', addresses_todelete))
@@ -149,13 +145,13 @@ class Party(ModelSQL, ModelView):
for adr in new_addresses:
if not hasattr(adr, 'value'):
continue
- vals = address_obj.vcard2values(adr)
+ vals = Address.vcard2values(adr)
res['addresses'].append(('create', vals))
i = 0
res['contact_mechanisms'] = []
contact_mechanisms_todelete = []
- for cm in party.contact_mechanisms:
+ for cm in self.contact_mechanisms:
if cm.type != 'email':
continue
try:
@@ -181,7 +177,7 @@ class Party(ModelSQL, ModelView):
res['contact_mechanisms'].append(('create', vals))
i = 0
- for cm in party.contact_mechanisms:
+ for cm in self.contact_mechanisms:
if cm.type not in ('phone', 'mobile'):
continue
try:
@@ -214,89 +210,79 @@ class Party(ModelSQL, ModelView):
contact_mechanisms_todelete))
return res
-Party()
-
-class Address(ModelSQL, ModelView):
- _name = 'party.address'
+class Address:
+ __name__ = 'party.address'
def vcard2values(self, adr):
'''
Convert adr from vcard to values for create or write
-
- :param adr: a adr from vcard instance of vobject
- :return: a dictionary with values
'''
- country_obj = Pool().get('country.country')
- subdivision_obj = Pool().get('country.subdivision')
+ pool = Pool()
+ Country = pool.get('country.country')
+ Subdivision = pool.get('country.subdivision')
vals = {}
vals['street'] = adr.value.street or ''
vals['city'] = adr.value.city or ''
vals['zip'] = adr.value.code or ''
if adr.value.country:
- country_ids = country_obj.search([
- ('rec_name', '=', adr.value.country),
- ], limit=1)
- if country_ids:
- vals['country'] = country_ids[0]
+ countries = Country.search([
+ ('rec_name', '=', adr.value.country),
+ ], limit=1)
+ if countries:
+ country, = countries
+ vals['country'] = country.id
if adr.value.region:
- subdivision_ids = subdivision_obj.search([
+ subdivisions = Subdivision.search([
('rec_name', '=', adr.value.region),
- ('country', '=', country_ids[0]),
+ ('country', '=', country.id),
], limit=1)
- if subdivision_ids:
- vals['subdivision'] = subdivision_ids[0]
+ if subdivisions:
+ subdivision, = subdivisions
+ vals['subdivision'] = subdivision.id
return vals
-Address()
-
-class ActionReport(ModelSQL, ModelView):
- _name = 'ir.action.report'
+class ActionReport:
+ __name__ = 'ir.action.report'
- def __init__(self):
- super(ActionReport, self).__init__()
+ @classmethod
+ def __setup__(cls):
+ super(ActionReport, cls).__setup__()
new_ext = ('vcf', 'VCard file')
- if new_ext not in self.extension.selection:
- self.extension = copy.copy(self.extension)
- self.extension.selection = copy.copy(self.extension.selection)
- self.extension.selection.append(new_ext)
- self._reset_columns()
-
-ActionReport()
+ if new_ext not in cls.extension.selection:
+ cls.extension.selection.append(new_ext)
class VCard(Report):
- _name = 'party_vcarddav.party.vcard'
+ __name__ = 'party_vcarddav.party.vcard'
- def execute(self, ids, datas):
- party_obj = Pool().get('party.party')
- action_report_obj = Pool().get('ir.action.report')
+ @classmethod
+ def execute(cls, ids, data):
+ pool = Pool()
+ Party = pool.get('party.party')
+ ActionReport = pool.get('ir.action.report')
- action_report_ids = action_report_obj.search([
- ('report_name', '=', self._name)
- ])
- if not action_report_ids:
- raise Exception('Error', 'Report (%s) not find!' % self._name)
- action_report = action_report_obj.browse(action_report_ids[0])
+ action_reports = ActionReport.search([
+ ('report_name', '=', cls.__name__)
+ ])
+ if not action_reports:
+ raise Exception('Error', 'Report (%s) not find!' % cls.__name__)
+ action_report = action_reports[0]
- parties = party_obj.browse(ids)
+ parties = Party(ids)
- data = ''.join(self.create_vcard(party).serialize()
+ data = ''.join(cls.create_vcard(party).serialize()
for party in parties)
return ('vcf', buffer(data), False, action_report.name)
- def create_vcard(self, party):
+ @classmethod
+ def create_vcard(cls, party):
'''
Return a vcard instance of vobject for the party
-
- :param party: a BrowseRecord of party.party
- :return: a vcard instance of vobject
'''
- import vobject
-
if party.vcard:
vcard = vobject.readOne(str(party.vcard))
else:
@@ -387,5 +373,3 @@ class VCard(Report):
vcard.contents['tel'].remove(tel)
return vcard
-
-VCard()
diff --git a/setup.py b/setup.py
index a321362..495c64c 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_party_vcarddav',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module for CardDAV',
+ 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.party_vcarddav': '.'},
packages=[
'trytond.modules.party_vcarddav',
- ],
+ ],
package_data={
'trytond.modules.party_vcarddav': 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_party_vcarddav',
'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_party_vcarddav',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..e9fe934
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,9 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ party
+ res
+ webdav
+xml:
+ party.xml
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 9e669c8..4ec2583 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,13 +1,49 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 2.4.1
-Summary: Add CardDAV on parties
+Version: 2.6.0
+Summary: Tryton module for CardDAV
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_party_vcarddav
+ ======================
+
+ The party_vcarddav 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_party_vcarddav.egg-info/SOURCES.txt b/trytond_party_vcarddav.egg-info/SOURCES.txt
index 82f82db..6f88556 100644
--- a/trytond_party_vcarddav.egg-info/SOURCES.txt
+++ b/trytond_party_vcarddav.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
party.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./carddav.py
./party.py
./webdav.py
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 6e82de2..83ba174 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,4 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.8
-trytond_party >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_party >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index 3c7f3de..ee65adf 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,53 +1,56 @@
#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 pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
-from trytond.model import ModelView, ModelSQL
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
from trytond.cache import Cache
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['Collection']
+__metaclass__ = PoolMeta
-CARDDAV_NS = 'urn:ietf:params:xml:ns:carddav'
+CARDDAV_NS = 'urn:ietf:params:xml:ns:carddav'
-class Collection(ModelSQL, ModelView):
- _name = "webdav.collection"
+class Collection:
+ __name__ = "webdav.collection"
+ _vcard_cache = Cache('webdav.collection.vcard', context=False)
- @Cache('webdav_collection.vcard')
- def vcard(self, uri):
+ @classmethod
+ def vcard(cls, uri):
'''
Return party ids of the vcard in uri or False
-
- :param uri: the uri
- :return: party id
- or None if there is no party
- or False if not in Contacts
'''
- party_obj = Pool().get('party.party')
+ Party = Pool().get('party.party')
+ party_id = cls._vcard_cache.get(uri, -1)
+ if party_id != -1:
+ return party_id
if uri and uri.startswith('Contacts/'):
uuid = uri[9:-4]
- party_ids = party_obj.search([
- ('uuid', '=', uuid),
- ], limit=1)
- if party_ids:
- return party_ids[0]
- return None
- if uri == 'Contacts':
- return None
- return False
-
- def _carddav_filter_domain(self, filter):
+ parties = Party.search([
+ ('uuid', '=', uuid),
+ ], limit=1)
+ if parties:
+ party_id = parties[0].id
+ else:
+ party_id = None
+ elif uri == 'Contacts':
+ party_id = None
+ else:
+ party_id = False
+ cls._vcard_cache.set(uri, party_id)
+ return party_id
+
+ @classmethod
+ def _carddav_filter_domain(cls, filter):
'''
Return a domain for the carddav filter
-
- :param filter: the DOM Element of filter
- :return: a list for domain
'''
- address_obj = Pool().get('party.address')
- contact_mechanism_obj = Pool().get('party.contact_mechanism')
+ pool = Pool()
+ Address = pool.get('party.address')
+ ContactMechanism = pool.get('party.contact_mechanism')
res = []
if not filter:
@@ -110,60 +113,64 @@ class Collection(ModelSQL, ModelView):
res2.append((field, 'not ilike', value))
if name == 'adr':
domain = res2
- address_ids = address_obj.search(domain)
- res = [('addresses', 'in', address_ids)]
+ addresses = Address.search(domain)
+ res = [('addresses', 'in', [a.id for a in addresses])]
elif name in ('mail', 'tel'):
if name == 'mail':
type = ['email']
else:
type = ['phone', 'mobile']
domain = [('type', 'in', type), res2]
- contact_mechanism_ids = contact_mechanism_obj.search(
- domain)
+ contact_mechanisms = ContactMechanism.search(
+ domain)
res2 = [
- ('contact_mechanisms', 'in', contact_mechanism_ids)
+ ('contact_mechanisms', 'in',
+ [c.id for c in contact_mechanisms])
]
res.append(res2)
return res
- def get_childs(self, uri, filter=None, cache=None):
- party_obj = Pool().get('party.party')
+ @classmethod
+ def get_childs(cls, uri, filter=None, cache=None):
+ Party = Pool().get('party.party')
if uri in ('Contacts', 'Contacts/'):
- domain = self._carddav_filter_domain(filter)
- party_ids = party_obj.search(domain)
- parties = party_obj.browse(party_ids)
+ domain = cls._carddav_filter_domain(filter)
+ parties = Party.search(domain)
if cache is not None:
cache.setdefault('_contact', {})
- for party_id in party_ids:
- cache['_contact'][party_id] = {}
+ for party in parties:
+ cache['_contact'][party.id] = {}
return [x.uuid + '.vcf' for x in parties]
- party_id = self.vcard(uri)
+ party_id = cls.vcard(uri)
if party_id or party_id is None:
return []
- res = super(Collection, self).get_childs(uri, filter=filter,
+ res = super(Collection, cls).get_childs(uri, filter=filter,
cache=cache)
if not uri and not filter:
res.append('Contacts')
return res
- def get_resourcetype(self, uri, cache=None):
+ @classmethod
+ def get_resourcetype(cls, uri, cache=None):
from DAV.constants import COLLECTION, OBJECT
- party_id = self.vcard(uri)
+ party_id = cls.vcard(uri)
if party_id:
return OBJECT
elif party_id is None:
return COLLECTION
- return super(Collection, self).get_resourcetype(uri, cache=cache)
+ return super(Collection, cls).get_resourcetype(uri, cache=cache)
- def get_contenttype(self, uri, cache=None):
- if self.vcard(uri):
+ @classmethod
+ def get_contenttype(cls, uri, cache=None):
+ if cls.vcard(uri):
return 'text/x-vcard'
- return super(Collection, self).get_contenttype(uri, cache=cache)
+ return super(Collection, cls).get_contenttype(uri, cache=cache)
- def get_creationdate(self, uri, cache=None):
- party_obj = Pool().get('party.party')
- party_id = self.vcard(uri)
+ @classmethod
+ def get_creationdate(cls, uri, cache=None):
+ Party = Pool().get('party.party')
+ party_id = cls.vcard(uri)
cursor = Transaction().cursor
@@ -185,7 +192,7 @@ class Collection(ModelSQL, ModelView):
red_sql, red_ids = reduce_ids('id', sub_ids)
cursor.execute('SELECT id, ' \
'EXTRACT(epoch FROM create_date) ' \
- 'FROM "' + party_obj._table + '" ' \
+ 'FROM "' + Party._table + '" ' \
'WHERE ' + red_sql, red_ids)
for party_id2, date in cursor.fetchall():
if party_id2 == party_id:
@@ -195,17 +202,18 @@ class Collection(ModelSQL, ModelView):
cache['_contact'][party_id2]['creationdate'] = date
if res is not None:
return res
- return super(Collection, self).get_creationdate(uri, cache=cache)
+ return super(Collection, cls).get_creationdate(uri, cache=cache)
- def get_lastmodified(self, uri, cache=None):
+ @classmethod
+ def get_lastmodified(cls, uri, cache=None):
pool = Pool()
- party_obj = pool.get('party.party')
- address_obj = pool.get('party.address')
- contact_mechanism_obj = pool.get('party.contact_mechanism')
+ Party = pool.get('party.party')
+ Address = pool.get('party.address')
+ ContactMechanism = pool.get('party.contact_mechanism')
cursor = Transaction().cursor
- party_id = self.vcard(uri)
+ party_id = cls.vcard(uri)
if party_id:
if cache is not None:
cache.setdefault('_contact', {})
@@ -227,10 +235,10 @@ class Collection(ModelSQL, ModelView):
'COALESCE(a.write_date, a.create_date))), '
'MAX(EXTRACT(epoch FROM '
'COALESCE(c.write_date, c.create_date))) '
- 'FROM "' + party_obj._table + '" p '
- 'LEFT JOIN "' + address_obj._table + '" a '
+ 'FROM "' + Party._table + '" p '
+ 'LEFT JOIN "' + Address._table + '" a '
'ON p.id = a.party '
- 'LEFT JOIN "' + contact_mechanism_obj._table + '" c '
+ 'LEFT JOIN "' + ContactMechanism._table + '" c '
'ON p.id = c.party '
'WHERE ' + red_sql + ' '
'GROUP BY p.id', red_ids)
@@ -243,93 +251,98 @@ class Collection(ModelSQL, ModelView):
cache['_contact'][party_id2]['lastmodified'] = date
if res is not None:
return res
- return super(Collection, self).get_lastmodified(uri, cache=cache)
+ return super(Collection, cls).get_lastmodified(uri, cache=cache)
- def get_data(self, uri, cache=None):
- vcard_obj = Pool().get('party_vcarddav.party.vcard', type='report')
- party_id = self.vcard(uri)
+ @classmethod
+ def get_data(cls, uri, cache=None):
+ Vcard = Pool().get('party_vcarddav.party.vcard', type='report')
+ party_id = cls.vcard(uri)
if party_id is None:
raise DAV_NotFound
if party_id:
- val = vcard_obj.execute([party_id],
- {'id': party_id, 'ids': [party_id]},
- )
+ val = Vcard.execute([party_id],
+ {'id': party_id, 'ids': [party_id]})
return val[1]
- return super(Collection, self).get_data(uri, cache=cache)
+ return super(Collection, cls).get_data(uri, cache=cache)
- def get_address_data(self, uri, cache=None):
- vcard_obj = Pool().get('party_vcarddav.party.vcard', type='report')
- party_id = self.vcard(uri)
+ @classmethod
+ def get_address_data(cls, uri, cache=None):
+ Vcard = Pool().get('party_vcarddav.party.vcard', type='report')
+ party_id = cls.vcard(uri)
if not party_id:
raise DAV_NotFound
- return vcard_obj.execute([party_id],
+ return Vcard.execute([party_id],
{'id': party_id, 'ids': [party_id]},
).decode('utf-8')
- def put(self, uri, data, content_type, cache=None):
+ @classmethod
+ def put(cls, uri, data, content_type, cache=None):
import vobject
- party_obj = Pool().get('party.party')
+ Party = Pool().get('party.party')
- party_id = self.vcard(uri)
+ party_id = cls.vcard(uri)
if party_id is None:
vcard = vobject.readOne(data)
- values = party_obj.vcard2values(None, vcard)
+ values = Party().vcard2values(vcard)
try:
- party_id = party_obj.create(values)
+ party_id = Party.create(values)
except Exception:
raise DAV_Forbidden
- party = party_obj.browse(party_id)
+ party = Party(party_id)
return (Transaction().cursor.database_name + '/Contacts/' +
party.uuid + '.vcf')
if party_id:
+ party = Party(party_id)
vcard = vobject.readOne(data)
- values = party_obj.vcard2values(party_id, vcard)
+ values = party.vcard2values(vcard)
try:
- party_obj.write(party_id, values)
+ Party.write([party], values)
except Exception:
raise DAV_Forbidden
return
- return super(Collection, self).put(uri, data, content_type,
+ return super(Collection, cls).put(uri, data, content_type,
cache=cache)
- def mkcol(self, uri, cache=None):
- party_id = self.vcard(uri)
+ @classmethod
+ def mkcol(cls, uri, cache=None):
+ party_id = cls.vcard(uri)
if party_id is None:
raise DAV_Forbidden
if party_id:
raise DAV_Forbidden
- return super(Collection, self).mkcol(uri, cache=cache)
+ return super(Collection, cls).mkcol(uri, cache=cache)
- def rmcol(self, uri, cache=None):
- party_id = self.vcard(uri)
+ @classmethod
+ def rmcol(cls, uri, cache=None):
+ party_id = cls.vcard(uri)
if party_id is None:
raise DAV_Forbidden
if party_id:
raise DAV_Forbidden
- return super(Collection, self).rmcol(uri, cache=cache)
+ return super(Collection, cls).rmcol(uri, cache=cache)
- def rm(self, uri, cache=None):
- party_obj = Pool().get('party.party')
+ @classmethod
+ def rm(cls, uri, cache=None):
+ Party = Pool().get('party.party')
- party_id = self.vcard(uri)
+ party_id = cls.vcard(uri)
if party_id is None:
raise DAV_Forbidden
if party_id:
try:
- party_obj.delete(party_id)
+ Party.delete([Party(party_id)])
except Exception:
raise DAV_Forbidden
return 200
- return super(Collection, self).rm(uri, cache=cache)
+ return super(Collection, cls).rm(uri, cache=cache)
- def exists(self, uri, cache=None):
- party_id = self.vcard(uri)
+ @classmethod
+ def exists(cls, uri, cache=None):
+ party_id = cls.vcard(uri)
if party_id is None or party_id:
if party_id:
return 1
if uri in ('Contacts', 'Contacts/'):
return 1
return 0
- return super(Collection, self).exists(uri, cache=cache)
-
-Collection()
+ return super(Collection, cls).exists(uri, cache=cache)
commit 188b74c87c758ac6ea14942a4b2ce55da601a13c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:21 2012 +0200
Releasing debian version 2.4.1-2.
diff --git a/debian/changelog b/debian/changelog
index 2e12885..af6f193 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-party-vcarddav (2.4.1-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: #687742).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 17 Sep 2012 16:47:48 +0200
+
tryton-modules-party-vcarddav (2.4.1-1) experimental; urgency=low
* Merging upstream version 2.4.1.
commit 5ae09c77c5f6c93b46f6c92f0693711057e14837
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index dce9c79..0e962f1 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-party-vcarddav.git
commit 55586425dad127d55454e8979d5df03864ed66e9
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 0916706f58b1d0fe5985abc77db85daaf87531fa
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 3ec403d..99aff32 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) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit e1f66ccd6844b813ef05b3f9ee1b198f93b6630a
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 758dcb7..dce9c79 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-party-vcarddav.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-party-vcarddav.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-party-vcarddav.git
X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
commit 1b4232c8e2590212f4f33aba4097a0b0401b0ffc
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 846bf06..758dcb7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-party-vcarddav
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 e93b436cbf15b4c39bb01a9b7171e6ad23bc0b53
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 14:27:42 2012 +0200
Releasing debian version 2.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index cd974ca..2e12885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-party-vcarddav (2.4.1-1) experimental; urgency=low
+
+ * Merging upstream version 2.4.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Sep 2012 13:19:34 +0200
+
tryton-modules-party-vcarddav (2.4.0-1) experimental; urgency=low
* Merging upstream version 2.4.0.
commit e4a636965d0e6306e2c40e572041b17cb9792fd4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 13:16:47 2012 +0200
Merging upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 15c3081..e6fec4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 87aca61..9dc963c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 2.4.0
+Version: 2.4.1
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index fd27138..14f9973 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_es_CO': 'vCardDAV de Compañía',
'name_es_ES': 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version': '2.4.0',
+ 'version': '2.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/party.py b/party.py
index 58c50ce..74d2a12 100644
--- a/party.py
+++ b/party.py
@@ -1,6 +1,5 @@
#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 base64
import copy
import uuid
from trytond.model import ModelSQL, ModelView, fields
@@ -50,11 +49,23 @@ class Party(ModelSQL, ModelView):
return res
def copy(self, ids, default=None):
+ int_id = isinstance(ids, (int, long))
+ if int_id:
+ ids = [ids]
+
if default is None:
default = {}
- default = default.copy()
- default['uuid'] = self.default_uuid()
- return super(Party, self).copy(ids, default=default)
+
+ new_ids = []
+ for party_id in ids:
+ current_default = default.copy()
+ current_default['uuid'] = self.default_uuid()
+ new_id = super(Party, self).copy(party_id, default=current_default)
+ new_ids.append(new_id)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
def write(self, ids, vals):
collection_obj = Pool().get('webdav.collection')
@@ -275,7 +286,7 @@ class VCard(Report):
data = ''.join(self.create_vcard(party).serialize()
for party in parties)
- return ('vcf', base64.encodestring(data), False, action_report.name)
+ return ('vcf', buffer(data), False, action_report.name)
def create_vcard(self, party):
'''
@@ -287,7 +298,7 @@ class VCard(Report):
import vobject
if party.vcard:
- vcard = vobject.readOne(party.vcard)
+ vcard = vobject.readOne(str(party.vcard))
else:
vcard = vobject.vCard()
if not hasattr(vcard, 'n'):
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 86d6550..9e669c8 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 2.4.0
+Version: 2.4.1
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/webdav.py b/webdav.py
index 144748f..3c7f3de 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,6 +1,5 @@
#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 base64
from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
from trytond.model import ModelView, ModelSQL
from trytond.tools import reduce_ids
@@ -255,7 +254,7 @@ class Collection(ModelSQL, ModelView):
val = vcard_obj.execute([party_id],
{'id': party_id, 'ids': [party_id]},
)
- return base64.decodestring(val[1])
+ return val[1]
return super(Collection, self).get_data(uri, cache=cache)
def get_address_data(self, uri, cache=None):
@@ -263,11 +262,9 @@ class Collection(ModelSQL, ModelView):
party_id = self.vcard(uri)
if not party_id:
raise DAV_NotFound
- val = vcard_obj.execute([party_id],
- {'id': party_id, 'ids': [party_id]},
- )
- res = base64.decodestring(val[1])
- return res.decode('utf-8')
+ return vcard_obj.execute([party_id],
+ {'id': party_id, 'ids': [party_id]},
+ ).decode('utf-8')
def put(self, uri, data, content_type, cache=None):
import vobject
commit 6094d82cd7e7f4eab03383e8076a8acb046cfdad
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:44:04 2012 +0200
Releasing debian version 2.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index 7a37a18..cd974ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-party-vcarddav (2.4.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.4.0.
+ * Updating Copyright.
+ * Removing patch 01-support-pywebdav-0.9.8, went upstream.
+ * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:30:50 +0200
+
tryton-modules-party-vcarddav (2.2.0-2) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 19f96e6872daf595ab412fb71e1745e6eef5ba0a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 19:11:44 2012 +0200
Bumping versioned tryton depends to 2.4.
diff --git a/debian/control b/debian/control
index 86c0788..846bf06 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
- tryton-modules-party (>= 2.2), python-vobject, python-webdav,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ tryton-modules-party (>= 2.4), python-vobject, python-webdav,
python-pkg-resources
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
commit b4f8262fdcf1b71e54fcb4a0f6f39329f5cb96a4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 00:45:35 2012 +0200
Removing patch 01-support-pywebdav-0.9.8, went upstream.
diff --git a/debian/patches/01-support-pywebdav-0.9.8 b/debian/patches/01-support-pywebdav-0.9.8
deleted file mode 100644
index d32dd6b..0000000
--- a/debian/patches/01-support-pywebdav-0.9.8
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Mathias Behrle <mathiasb at m9s.biz>
-Description: Support new structure of pywebdav > 0.9.4.1.
---- tryton-modules-party-vcarddav.orig/carddav.py 2012-01-02 12:49:50.708128811 +0100
-+++ tryton-modules-party-vcarddav/carddav.py 2012-03-26 16:07:58.090847515 +0200
-@@ -1,7 +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 DAV import propfind
--from DAV.errors import *
-+try:
-+ from DAV import propfind
-+ from DAV.errors import *
-+except ImportError:
-+ from pywebdav.lib import propfind
-+ from pywebdav.lib.errors import *
- from trytond.protocols.webdav import TrytonDAVInterface, CACHE
- from trytond.pool import Pool
- from trytond.transaction import Transaction
---- tryton-modules-party-vcarddav.orig/webdav.py 2012-01-02 12:49:50.712128604 +0100
-+++ tryton-modules-party-vcarddav/webdav.py 2012-03-26 16:09:34.807554228 +0200
-@@ -2,7 +2,10 @@
- #this repository contains the full copyright notices and license terms.
- import base64
- import urlparse
--from DAV.errors import DAV_NotFound, DAV_Forbidden
-+try:
-+ from DAV.errors import DAV_NotFound, DAV_Forbidden
-+except ImportError:
-+ from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
- from trytond.model import ModelView, ModelSQL
- from trytond.tools import reduce_ids
- from trytond.transaction import Transaction
-@@ -148,7 +151,10 @@
- return res
-
- def get_resourcetype(self, uri, cache=None):
-- from DAV.constants import COLLECTION, OBJECT
-+ try:
-+ from DAV.constants import COLLECTION, OBJECT
-+ except ImportError:
-+ from pywebdav.lib.constants import COLLECTION, OBJECT
- party_id = self.vcard(uri)
- if party_id:
- return OBJECT
diff --git a/debian/patches/series b/debian/patches/series
index 138cbbb..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01-support-pywebdav-0.9.8
commit 61a13508667c5a5cd4eb44292e9788108a4e8d6a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:13 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 31cd674..3ec403d 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 aa4123ab76518207aab3bfb35746085704e0de33
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:48 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 06decad..15c3081 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 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 6db776c..1a36e89 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,11 +4,11 @@ Installing trytond_party_vcarddav
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_party (http://www.tryton.org/)
* vobject 0.8.0 or later (http://vobject.skyhouseconsulting.com/)
- * pywebdav 0.9.3 or later (http://sourceforge.net/projects/pywebdav/)
+ * pywebdav 0.9.8 or later (http://sourceforge.net/projects/pywebdav/)
Installation
------------
diff --git a/PKG-INFO b/PKG-INFO
index c00e768..87aca61 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 2.2.0
+Version: 2.4.0
Summary: Add CardDAV on parties
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 a021c2f..82686c6 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import carddav
-from webdav import *
-from party import *
+from . import carddav
+from .webdav import *
+from .party import *
diff --git a/__tryton__.py b/__tryton__.py
index d6dce77..fd27138 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,35 +2,41 @@
#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' : 'Party - vCardDAV',
+ 'name': 'Party - vCardDAV',
'name_bg_BG': 'Фирма - vCardDAV',
+ 'name_ca_ES': 'Tercers - vCardDAV',
'name_de_DE': 'Parteien vCardDAV',
- 'name_es_CO' : 'vCardDAV de Compañía',
- 'name_es_ES' : 'Tercero - vCardDAV',
+ 'name_es_AR': 'Entidad - vCardDAV',
+ 'name_es_CO': 'vCardDAV de Compañía',
+ 'name_es_ES': 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '2.2.0',
- 'author' : 'B2CK',
+ 'version': '2.4.0',
+ 'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': 'Add CardDAV on parties',
'description_bg_BG': 'Добавя към партньор поддръжка на CardDAV',
+ 'description_ca_ES': 'Afegeix suport per CardDAV als Tercers',
'description_de_DE': 'Ermöglicht CardDAV für Parteien',
+ 'description_es_AR': 'Añade soporte de CardDAV para entidades',
'description_es_CO': 'Soporte de CardDAV para terceros',
'description_es_ES': 'Añade soporte de CardDAV para terceros',
'description_fr_FR': 'Ajoute le support CardDAV pour les tiers',
- 'depends' : [
+ 'depends': [
'ir',
'res',
'party',
'webdav',
],
- 'xml' : [
+ 'xml': [
'party.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/carddav.py b/carddav.py
index 5bd9863..f8c37dc 100644
--- a/carddav.py
+++ b/carddav.py
@@ -1,13 +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 DAV import propfind
-from DAV.errors import *
+from pywebdav.lib import propfind
+from pywebdav.lib.errors import DAV_NotFound, DAV_Error
from trytond.protocols.webdav import TrytonDAVInterface, CACHE
from trytond.pool import Pool
from trytond.transaction import Transaction
-_TRYTON_RELOAD = False
-
TrytonDAVInterface.PROPS['urn:ietf:params:xml:ns:carddav'] = (
'address-data',
'addressbook-data',
@@ -16,6 +14,7 @@ TrytonDAVInterface.M_NS['urn:ietf:params:xml:ns:carddav'] = '_get_carddav'
_mk_prop_response = propfind.PROPFIND.mk_prop_response
+
def mk_prop_response(self, uri, good_props, bad_props, doc):
res = _mk_prop_response(self, uri, good_props, bad_props, doc)
dbname, uri = TrytonDAVInterface.get_dburi(uri)
@@ -32,6 +31,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
propfind.PROPFIND.mk_prop_response = mk_prop_response
+
def _get_carddav_address_data(self, uri):
dbname, dburi = self._get_dburi(uri)
if not dbname:
@@ -43,7 +43,7 @@ def _get_carddav_address_data(self, uri):
raise DAV_NotFound
try:
res = collection_obj.get_address_data(dburi, cache=CACHE)
- except (DAV_Error, DAV_NotFound, DAV_Secret, DAV_Forbidden):
+ except DAV_Error:
raise
except Exception:
raise DAV_Error(500)
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 60fcc7f..fbdab9b 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
msgstr "UUID на партньор трабва да е уникален!"
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr "VCard"
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr "Универсален иникален идентификатор"
diff --git a/locale/es_ES.po b/locale/ca_ES.po
similarity index 50%
copy from locale/es_ES.po
copy to locale/ca_ES.po
index 77b22bc..59fa348 100644
--- a/locale/es_ES.po
+++ b/locale/ca_ES.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
-msgstr "El UUID del tercero debe ser único"
+msgstr "L'UUID del tercer ha de ser únic"
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
-msgstr "VCard"
+msgstr "vCard"
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Identificador universal único"
+msgstr "Identificador universal únic"
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
-msgstr "VCard"
+msgstr "vCard"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 05af030..4cac0ef 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
msgstr ""
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr ""
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr ""
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6165913..69e8741 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
msgstr "Die UUID für eine Partei kann nicht mehrfach vergeben werden!"
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr "VCard"
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr "Universally Unique Identifier"
diff --git a/locale/es_ES.po b/locale/es_AR.po
similarity index 64%
copy from locale/es_ES.po
copy to locale/es_AR.po
index 77b22bc..c6b26fd 100644
--- a/locale/es_ES.po
+++ b/locale/es_AR.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
-msgstr "El UUID del tercero debe ser único"
+msgstr "¡El UUID de la entidad debe ser único!"
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr "VCard"
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr "Identificador universal único"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 1ce74cf..6130afe 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
msgstr "¡La UUID del tercero debe ser única!"
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr "VCard"
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr "Identificador Único Universal"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 77b22bc..7579bc1 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,21 +2,21 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
-msgstr "El UUID del tercero debe ser único"
+msgstr "El UUID del tercero debe ser único."
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr "VCard"
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Identificador universal único"
+msgstr "Identificador universal único."
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index d911b1e..3617a9d 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,19 +2,23 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
msgstr "L'UUID du tiers doit être unique !"
-msgctxt "field:party.party,uuid:0"
+msgctxt "error:party.party:"
+msgid "The UUID of the party must be unique!"
+msgstr "L'UUID du tiers doit être unique !"
+
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr "UUID"
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr "VCard"
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr "Identificateur unique universel"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 05af030..4cac0ef 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
msgstr ""
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr ""
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr ""
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 08774e3..abbbe75 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,20 +2,20 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
msgid "The UUID of the party must be unique!"
msgstr ""
-msgctxt "field:party.party,uuid:0"
+msgctxt "field:party.party,uuid:"
msgid "UUID"
msgstr ""
-msgctxt "field:party.party,vcard:0"
+msgctxt "field:party.party,vcard:"
msgid "VCard"
msgstr ""
#, fuzzy
-msgctxt "help:party.party,uuid:0"
+msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
msgstr "Универсальный уникальный идентификатор"
diff --git a/party.py b/party.py
index c3f8fd0..58c50ce 100644
--- a/party.py
+++ b/party.py
@@ -272,7 +272,8 @@ class VCard(Report):
parties = party_obj.browse(ids)
- data = ''.join(self.create_vcard(party).serialize() for party in parties)
+ data = ''.join(self.create_vcard(party).serialize()
+ for party in parties)
return ('vcf', base64.encodestring(data), False, action_report.name)
diff --git a/setup.py b/setup.py
index bad90eb..a321362 100644
--- a/setup.py
+++ b/setup.py
@@ -10,9 +10,9 @@ 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', 'PyWebDAV >= 0.9.3']
+requires = ['vobject >= 0.8.0', 'PyWebDAV >= 0.9.8']
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_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 23e55a0..86d6550 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 2.2.0
+Version: 2.4.0
Summary: Add CardDAV on parties
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_party_vcarddav.egg-info/SOURCES.txt b/trytond_party_vcarddav.egg-info/SOURCES.txt
index 66fee8f..82f82db 100644
--- a/trytond_party_vcarddav.egg-info/SOURCES.txt
+++ b/trytond_party_vcarddav.egg-info/SOURCES.txt
@@ -13,8 +13,10 @@ setup.py
./webdav.py
doc/index.rst
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_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 8e9bc42..6e82de2 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,4 @@
vobject >= 0.8.0
-PyWebDAV >= 0.9.3
-trytond_party >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+PyWebDAV >= 0.9.8
+trytond_party >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index 68a6156..144748f 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,8 +1,7 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
import base64
-import urlparse
-from DAV.errors import DAV_NotFound, DAV_Forbidden
+from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
from trytond.model import ModelView, ModelSQL
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
@@ -78,13 +77,15 @@ class Collection(ModelSQL, ModelView):
field = 'value'
if field:
res2 = []
- if prop.hasAttribute('test') \
- and prop.addressbook_filter.getAttribute('test') == 'allof':
+ if (prop.hasAttribute('test')
+ and (prop.addressbook_filter.getAttribute('test')
+ == 'allof')):
res2.append('AND')
else:
res2.append('OR')
- if prop.getElementsByTagNameNS(CARDDAV_NS, 'is-not-defined'):
- res2.append((field, '=', False))
+ if prop.getElementsByTagNameNS(CARDDAV_NS,
+ 'is-not-defined'):
+ res2.append((field, '=', None))
for text_match in prop.getElementsByTagNameNS(CARDDAV_NS,
'text-match'):
value = text_match.firstChild.data
@@ -220,20 +221,20 @@ class Collection(ModelSQL, ModelView):
for i in range(0, len(ids), cursor.IN_MAX):
sub_ids = ids[i:i + cursor.IN_MAX]
red_sql, red_ids = reduce_ids('p.id', sub_ids)
- cursor.execute('SELECT p.id, ' \
- 'MAX(EXTRACT(epoch FROM ' \
- 'COALESCE(p.write_date, p.create_date))), ' \
- 'MAX(EXTRACT(epoch FROM ' \
- 'COALESCE(a.write_date, a.create_date))), ' \
- 'MAX(EXTRACT(epoch FROM ' \
- 'COALESCE(c.write_date, c.create_date))) ' \
- 'FROM "' + party_obj._table + '" p ' \
- 'LEFT JOIN "' + address_obj._table + '" a ' \
- 'ON p.id = a.party ' \
- 'LEFT JOIN "' + contact_mechanism_obj._table + '" c ' \
- 'ON p.id = c.party ' \
- 'WHERE ' + red_sql + ' ' \
- 'GROUP BY p.id', red_ids)
+ cursor.execute('SELECT p.id, '
+ 'MAX(EXTRACT(epoch FROM '
+ 'COALESCE(p.write_date, p.create_date))), '
+ 'MAX(EXTRACT(epoch FROM '
+ 'COALESCE(a.write_date, a.create_date))), '
+ 'MAX(EXTRACT(epoch FROM '
+ 'COALESCE(c.write_date, c.create_date))) '
+ 'FROM "' + party_obj._table + '" p '
+ 'LEFT JOIN "' + address_obj._table + '" a '
+ 'ON p.id = a.party '
+ 'LEFT JOIN "' + contact_mechanism_obj._table + '" c '
+ 'ON p.id = c.party '
+ 'WHERE ' + red_sql + ' '
+ 'GROUP BY p.id', red_ids)
for party_id2, date_p, date_a, date_c in cursor.fetchall():
date = max(date_p, date_a, date_c)
if party_id2 == party_id:
@@ -291,7 +292,8 @@ class Collection(ModelSQL, ModelView):
except Exception:
raise DAV_Forbidden
return
- return super(Collection, self).put(uri, data, content_type, cache=cache)
+ return super(Collection, self).put(uri, data, content_type,
+ cache=cache)
def mkcol(self, uri, cache=None):
party_id = self.vcard(uri)
commit 8bd7db07720faa9cb9d9a76ac78f1d12a14db0ce
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 27 11:05:29 2012 +0200
Releasing debian version 2.2.0-2.
diff --git a/debian/changelog b/debian/changelog
index 8ca7f0c..7a37a18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-party-vcarddav (2.2.0-2) unstable; 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.
+ * Adding patch to support new structure of pywebdav > 0.9.4.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 27 Mar 2012 10:37:37 +0200
+
tryton-modules-party-vcarddav (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit 1e875ebbc6c4831320de02a39554bf33c3afa684
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 27 10:33:43 2012 +0200
Adding patch to support new structure of pywebdav > 0.9.4.1.
diff --git a/debian/patches/01-support-pywebdav-0.9.8 b/debian/patches/01-support-pywebdav-0.9.8
new file mode 100644
index 0000000..d32dd6b
--- /dev/null
+++ b/debian/patches/01-support-pywebdav-0.9.8
@@ -0,0 +1,44 @@
+Author: Mathias Behrle <mathiasb at m9s.biz>
+Description: Support new structure of pywebdav > 0.9.4.1.
+--- tryton-modules-party-vcarddav.orig/carddav.py 2012-01-02 12:49:50.708128811 +0100
++++ tryton-modules-party-vcarddav/carddav.py 2012-03-26 16:07:58.090847515 +0200
+@@ -1,7 +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 DAV import propfind
+-from DAV.errors import *
++try:
++ from DAV import propfind
++ from DAV.errors import *
++except ImportError:
++ from pywebdav.lib import propfind
++ from pywebdav.lib.errors import *
+ from trytond.protocols.webdav import TrytonDAVInterface, CACHE
+ from trytond.pool import Pool
+ from trytond.transaction import Transaction
+--- tryton-modules-party-vcarddav.orig/webdav.py 2012-01-02 12:49:50.712128604 +0100
++++ tryton-modules-party-vcarddav/webdav.py 2012-03-26 16:09:34.807554228 +0200
+@@ -2,7 +2,10 @@
+ #this repository contains the full copyright notices and license terms.
+ import base64
+ import urlparse
+-from DAV.errors import DAV_NotFound, DAV_Forbidden
++try:
++ from DAV.errors import DAV_NotFound, DAV_Forbidden
++except ImportError:
++ from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
+ from trytond.model import ModelView, ModelSQL
+ from trytond.tools import reduce_ids
+ from trytond.transaction import Transaction
+@@ -148,7 +151,10 @@
+ return res
+
+ def get_resourcetype(self, uri, cache=None):
+- from DAV.constants import COLLECTION, OBJECT
++ try:
++ from DAV.constants import COLLECTION, OBJECT
++ except ImportError:
++ from pywebdav.lib.constants import COLLECTION, OBJECT
+ party_id = self.vcard(uri)
+ if party_id:
+ return OBJECT
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..138cbbb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-support-pywebdav-0.9.8
commit ec89773bb79f9d3c934f5537c97814ab66d09394
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:18 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index c905bbf..31cd674 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 ff7f23a18d84c1f9c4f368ca2f824f92b38a498e
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 6d5ec8c..c905bbf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,9 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit bfea7c2887c4b3b757cc664bae967714699e68ea
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 6da6058..6d5ec8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
License: GPL-3+
License: GPL-3+
commit 6c1348c00c453090d77682c49a1436d7b4e5469f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:02 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index 6a6900e..86c0788 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-party-vcarddav.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
commit 522e049f47938cc957e36bbc49e8797fccd490be
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:09:35 2011 +0100
Releasing debian version 2.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index d187774..8ca7f0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-party-vcarddav (2.2.0-1) unstable; urgency=low
+
+ * Bumping X-Python-Version to >=2.6.
+ * Updating versioned tryton depends to 2.2.
+ * Merging upstream version 2.2.0.
+ * Removing deprecated XB-Python-Version for dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 14:01:31 +0100
+
tryton-modules-party-vcarddav (2.0.0-2) unstable; urgency=low
[ Daniel Baumann ]
commit 5b85b821040a6e7d40fb21c528fc523de34b53c8
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 1f67c97..6a6900e 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-party-vcarddav.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
Architecture: all
commit df4ad2b904cdd517bec4165525037eac1a18882a
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 b66fb25..1f67c97 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.5
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- tryton-modules-party (>= 2.0), python-vobject, python-webdav,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ tryton-modules-party (>= 2.2), python-vobject, python-webdav,
python-pkg-resources
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
commit 182f4a8e7ef90a6be4a1ff17437e9228f6be5d67
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:59 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 154bd85..06decad 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 dcb2afa..32879df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index d184866..c00e768 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,28 +1,31 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 2.0.0
+Version: 2.2.0
Summary: Add CardDAV on parties
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 cdd395b..d6dce77 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_CO' : 'vCardDAV de Compañía',
'name_es_ES' : 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '2.0.0',
+ 'version' : '2.2.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -28,10 +28,13 @@
'party.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index c815f2e..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.party,0,The UUID of the party must be unique!,UUID на партньор трабва да е уникален!,0
-field,"party.party,uuid",0,UUID,UUID,0
-field,"party.party,vcard",0,VCard,VCard,0
-help,"party.party,uuid",0,Universally Unique Identifier,Универсален иникален идентификатор,0
-model,"ir.action,name",report_party_vcard,VCard,VCard,0
-selection,"ir.action.report,extension",0,VCard file,VCard файл,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 093552c..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.party,0,The UUID of the party must be unique!,Die UUID für eine Partei kann nicht mehrfach vergeben werden!,0
-field,"party.party,uuid",0,UUID,UUID,0
-field,"party.party,vcard",0,VCard,VCard,0
-help,"party.party,uuid",0,Universally Unique Identifier,Universally Unique Identifier,0
-model,"ir.action,name",report_party_vcard,VCard,VCard,0
-selection,"ir.action.report,extension",0,VCard file,VCard Datei,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index df05f1b..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.party,0,The UUID of the party must be unique!,¡La UUID del tercero debe ser única!,0
-field,"party.party,uuid",0,UUID,UUID,0
-field,"party.party,vcard",0,VCard,VCard,0
-help,"party.party,uuid",0,Universally Unique Identifier,Identificador Único Universal,0
-model,"ir.action,name",report_party_vcard,VCard,VCard,0
-selection,"ir.action.report,extension",0,VCard file,Archivo VCard,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 3224334..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.party,0,The UUID of the party must be unique!,El UUID del tercero debe ser único,0
-field,"party.party,uuid",0,UUID,UUID,0
-field,"party.party,vcard",0,VCard,VCard,0
-help,"party.party,uuid",0,Universally Unique Identifier,Identificador universal único,0
-model,"ir.action,name",report_party_vcard,VCard,VCard,0
-selection,"ir.action.report,extension",0,VCard file,Archivo VCard,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 6845ba2..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.party,0,The UUID of the party must be unique!,L'UUID du tiers doit être unique !,0
-field,"party.party,uuid",0,UUID,UUID,0
-field,"party.party,vcard",0,VCard,VCard,0
-help,"party.party,uuid",0,Universally Unique Identifier,Identificateur unique universel,0
-model,"ir.action,name",report_party_vcard,VCard,VCard,0
-selection,"ir.action.report,extension",0,VCard file,Fichier VCard,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..60fcc7f
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr "UUID на партньор трабва да е уникален!"
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr "UUID"
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr "VCard"
+
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr "Универсален иникален идентификатор"
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr "VCard"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..05af030
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr ""
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr ""
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr ""
+
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..6165913
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr "Die UUID für eine Partei kann nicht mehrfach vergeben werden!"
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr "UUID"
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr "VCard"
+
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr "Universally Unique Identifier"
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr "VCard"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..1ce74cf
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr "¡La UUID del tercero debe ser única!"
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr "UUID"
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr "VCard"
+
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr "Identificador Único Universal"
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr "VCard"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..77b22bc
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr "El UUID del tercero debe ser único"
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr "UUID"
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr "VCard"
+
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr "Identificador universal único"
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr "VCard"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..d911b1e
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr "L'UUID du tiers doit être unique !"
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr "UUID"
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr "VCard"
+
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr "Identificateur unique universel"
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr "VCard"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..05af030
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr ""
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr ""
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr ""
+
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..08774e3
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,24 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.party:0"
+msgid "The UUID of the party must be unique!"
+msgstr ""
+
+msgctxt "field:party.party,uuid:0"
+msgid "UUID"
+msgstr ""
+
+msgctxt "field:party.party,vcard:0"
+msgid "VCard"
+msgstr ""
+
+#, fuzzy
+msgctxt "help:party.party,uuid:0"
+msgid "Universally Unique Identifier"
+msgstr "Универсальный уникальный идентификатор"
+
+msgctxt "model:ir.action,name:report_party_vcard"
+msgid "VCard"
+msgstr ""
diff --git a/party.py b/party.py
index ad90956..c3f8fd0 100644
--- a/party.py
+++ b/party.py
@@ -7,6 +7,7 @@ from trytond.model import ModelSQL, ModelView, fields
from trytond.report import Report
from trytond.backend import TableHandler, FIELDS
from trytond.transaction import Transaction
+from trytond.pool import Pool
class Party(ModelSQL, ModelView):
@@ -41,15 +42,22 @@ class Party(ModelSQL, ModelView):
return str(uuid.uuid4())
def create(self, vals):
- collection_obj = self.pool.get('webdav.collection')
+ collection_obj = Pool().get('webdav.collection')
res = super(Party, self).create(vals)
# Restart the cache for vcard
collection_obj.vcard.reset()
return res
+ def copy(self, ids, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default['uuid'] = self.default_uuid()
+ return super(Party, self).copy(ids, default=default)
+
def write(self, ids, vals):
- collection_obj = self.pool.get('webdav.collection')
+ collection_obj = Pool().get('webdav.collection')
res = super(Party, self).write(ids, vals)
# Restart the cache for vcard
@@ -57,7 +65,7 @@ class Party(ModelSQL, ModelView):
return res
def delete(self, ids):
- collection_obj = self.pool.get('webdav.collection')
+ collection_obj = Pool().get('webdav.collection')
res = super(Party, self).delete(ids)
# Restart the cache for vcard
@@ -73,7 +81,7 @@ class Party(ModelSQL, ModelView):
:return: a dictionary with values
'''
import vobject
- address_obj = self.pool.get('party.address')
+ address_obj = Pool().get('party.address')
res = {}
res['name'] = vcard.fn.value
@@ -208,8 +216,8 @@ class Address(ModelSQL, ModelView):
:param adr: a adr from vcard instance of vobject
:return: a dictionary with values
'''
- country_obj = self.pool.get('country.country')
- subdivision_obj = self.pool.get('country.subdivision')
+ country_obj = Pool().get('country.country')
+ subdivision_obj = Pool().get('country.subdivision')
vals = {}
vals['street'] = adr.value.street or ''
@@ -252,8 +260,8 @@ class VCard(Report):
_name = 'party_vcarddav.party.vcard'
def execute(self, ids, datas):
- party_obj = self.pool.get('party.party')
- action_report_obj = self.pool.get('ir.action.report')
+ party_obj = Pool().get('party.party')
+ action_report_obj = Pool().get('ir.action.report')
action_report_ids = action_report_obj.search([
('report_name', '=', self._name)
diff --git a/party.xml b/party.xml
index e034ae1..bde84d1 100644
--- a/party.xml
+++ b/party.xml
@@ -13,7 +13,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.keyword" id="create_vcard_keyword">
<field name="keyword">form_print</field>
- <field name="model">party.party,0</field>
+ <field name="model">party.party,-1</field>
<field name="action" ref="report_party_vcard"/>
</record>
diff --git a/setup.py b/setup.py
index b4f2f36..bad90eb 100644
--- a/setup.py
+++ b/setup.py
@@ -38,18 +38,21 @@ setup(name='trytond_party_vcarddav',
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',
@@ -61,4 +64,6 @@ setup(name='trytond_party_vcarddav',
[trytond.modules]
party_vcarddav = trytond.modules.party_vcarddav
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 3449cd2..23e55a0 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,28 +1,31 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 2.0.0
+Version: 2.2.0
Summary: Add CardDAV on parties
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_party_vcarddav.egg-info/SOURCES.txt b/trytond_party_vcarddav.egg-info/SOURCES.txt
index 9679a02..66fee8f 100644
--- a/trytond_party_vcarddav.egg-info/SOURCES.txt
+++ b/trytond_party_vcarddav.egg-info/SOURCES.txt
@@ -4,11 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
party.xml
setup.py
./__init__.py
@@ -17,6 +12,14 @@ setup.py
./party.py
./webdav.py
doc/index.rst
+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_party_vcarddav.egg-info/PKG-INFO
trytond_party_vcarddav.egg-info/SOURCES.txt
trytond_party_vcarddav.egg-info/dependency_links.txt
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index b5d5b03..8e9bc42 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,4 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.3
-trytond_party >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_party >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index ec35b22..68a6156 100644
--- a/webdav.py
+++ b/webdav.py
@@ -7,6 +7,7 @@ from trytond.model import ModelView, ModelSQL
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
from trytond.cache import Cache
+from trytond.pool import Pool
CARDDAV_NS = 'urn:ietf:params:xml:ns:carddav'
@@ -26,7 +27,7 @@ class Collection(ModelSQL, ModelView):
or None if there is no party
or False if not in Contacts
'''
- party_obj = self.pool.get('party.party')
+ party_obj = Pool().get('party.party')
if uri and uri.startswith('Contacts/'):
uuid = uri[9:-4]
@@ -47,8 +48,8 @@ class Collection(ModelSQL, ModelView):
:param filter: the DOM Element of filter
:return: a list for domain
'''
- address_obj = self.pool.get('party.address')
- contact_mechanism_obj = self.pool.get('party.contact_mechanism')
+ address_obj = Pool().get('party.address')
+ contact_mechanism_obj = Pool().get('party.contact_mechanism')
res = []
if not filter:
@@ -126,7 +127,7 @@ class Collection(ModelSQL, ModelView):
return res
def get_childs(self, uri, filter=None, cache=None):
- party_obj = self.pool.get('party.party')
+ party_obj = Pool().get('party.party')
if uri in ('Contacts', 'Contacts/'):
domain = self._carddav_filter_domain(filter)
@@ -161,7 +162,7 @@ class Collection(ModelSQL, ModelView):
return super(Collection, self).get_contenttype(uri, cache=cache)
def get_creationdate(self, uri, cache=None):
- party_obj = self.pool.get('party.party')
+ party_obj = Pool().get('party.party')
party_id = self.vcard(uri)
cursor = Transaction().cursor
@@ -197,9 +198,10 @@ class Collection(ModelSQL, ModelView):
return super(Collection, self).get_creationdate(uri, cache=cache)
def get_lastmodified(self, uri, cache=None):
- party_obj = self.pool.get('party.party')
- address_obj = self.pool.get('party.address')
- contact_mechanism_obj = self.pool.get('party.contact_mechanism')
+ pool = Pool()
+ party_obj = pool.get('party.party')
+ address_obj = pool.get('party.address')
+ contact_mechanism_obj = pool.get('party.contact_mechanism')
cursor = Transaction().cursor
@@ -244,7 +246,7 @@ class Collection(ModelSQL, ModelView):
return super(Collection, self).get_lastmodified(uri, cache=cache)
def get_data(self, uri, cache=None):
- vcard_obj = self.pool.get('party_vcarddav.party.vcard', type='report')
+ vcard_obj = Pool().get('party_vcarddav.party.vcard', type='report')
party_id = self.vcard(uri)
if party_id is None:
raise DAV_NotFound
@@ -256,7 +258,7 @@ class Collection(ModelSQL, ModelView):
return super(Collection, self).get_data(uri, cache=cache)
def get_address_data(self, uri, cache=None):
- vcard_obj = self.pool.get('party_vcarddav.party.vcard', type='report')
+ vcard_obj = Pool().get('party_vcarddav.party.vcard', type='report')
party_id = self.vcard(uri)
if not party_id:
raise DAV_NotFound
@@ -268,7 +270,7 @@ class Collection(ModelSQL, ModelView):
def put(self, uri, data, content_type, cache=None):
import vobject
- party_obj = self.pool.get('party.party')
+ party_obj = Pool().get('party.party')
party_id = self.vcard(uri)
if party_id is None:
@@ -308,7 +310,7 @@ class Collection(ModelSQL, ModelView):
return super(Collection, self).rmcol(uri, cache=cache)
def rm(self, uri, cache=None):
- party_obj = self.pool.get('party.party')
+ party_obj = Pool().get('party.party')
party_id = self.vcard(uri)
if party_id is None:
commit 46703acaceaced7e06482fa2f52e5836ffe80080
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 12:26:58 2011 +0200
Removing deprecated XB-Python-Version for dh_python2.
diff --git a/debian/control b/debian/control
index 7e8edff..b66fb25 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
tryton-modules-party (>= 2.0), python-vobject, python-webdav,
python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Party CardDAV 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 4b8b26cb449f7cc5895d2a4d71801b803c245563
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:19:33 2011 +0200
Releasing debian version 2.0.0-2.
diff --git a/debian/changelog b/debian/changelog
index 964c8db..d187774 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-party-vcarddav (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:19:28 +0200
+
tryton-modules-party-vcarddav (2.0.0-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit d47f828adf0d3ee412d41d9452908968b44fc835
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 20:08:44 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index 924c7f6..7e8edff 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-party-vcarddav.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
+X-Python-Version: >= 2.5
Package: tryton-modules-party-vcarddav
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..d94f103
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,3 @@
+vobject python-vobject
+PyWebDAV python-webdav
+
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 7715b23aaf642fce798e772be73dd144080fe079
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 77cbaf7..924c7f6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-party-vcarddav
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 be3546cab7bf53d15ad3427ca9ea99ac756a97e5
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 04f8161..6da6058 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) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
+
+License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@@ -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 ed702de0acf74df773e04c5291d8e9c544eddc57
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:55 2011 +0200
Adding options for source package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit d80001327d455f432bb81568a6fa28726cc53e79
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 229804b78d45372f311b324e2dff67544fc6a5cc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:04 2011 +0200
Releasing debian version 2.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index dfe8876..964c8db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-party-vcarddav (2.0.0-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+ * Updating Copyright.
+ * Updating versioned tryton depends to 2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:34:53 +0200
+
tryton-modules-party-vcarddav (1.8.0-2) unstable; urgency=low
* Changing my email address.
commit 0fc36c4995e01b44daaa43eb13e333c6758336e7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:21:34 2011 +0200
Updating versioned tryton depends to 2.0.
diff --git a/debian/control b/debian/control
index afe2117..77cbaf7 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcardd
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
- tryton-modules-party (>= 1.8), python-vobject, python-webdav,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ tryton-modules-party (>= 2.0), python-vobject, python-webdav,
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Party CardDAV Module)
commit 252e67aac8c77b54311fff780e5b659648890f5b
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 213e426..04f8161 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 09844488e13ff3cdbe051c6d1f4fcac5a9f8ca5e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:52 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 3ecb7d4..154bd85 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 46f18bc..d184866 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 1.8.0
+Version: 2.0.0
Summary: Add CardDAV on parties
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,13 @@ 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 :: 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 1133f31..cdd395b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,15 +3,17 @@
#this repository contains the full copyright notices and license terms.
{
'name' : 'Party - vCardDAV',
+ 'name_bg_BG': 'Фирма - vCardDAV',
'name_de_DE': 'Parteien vCardDAV',
'name_es_CO' : 'vCardDAV de Compañía',
'name_es_ES' : 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '1.8.0',
+ 'version' : '2.0.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': 'Add CardDAV on parties',
+ 'description_bg_BG': 'Добавя към партньор поддръжка на CardDAV',
'description_de_DE': 'Ermöglicht CardDAV für Parteien',
'description_es_CO': 'Soporte de CardDAV para terceros',
'description_es_ES': 'Añade soporte de CardDAV para terceros',
@@ -26,6 +28,7 @@
'party.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..c815f2e
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,7 @@
+type,name,res_id,src,value,fuzzy
+error,party.party,0,The UUID of the party must be unique!,UUID на партньор трабва да е уникален!,0
+field,"party.party,uuid",0,UUID,UUID,0
+field,"party.party,vcard",0,VCard,VCard,0
+help,"party.party,uuid",0,Universally Unique Identifier,Универсален иникален идентификатор,0
+model,"ir.action,name",report_party_vcard,VCard,VCard,0
+selection,"ir.action.report,extension",0,VCard file,VCard файл,0
diff --git a/setup.py b/setup.py
index e783a55..b4f2f36 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_party_vcarddav',
'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 :: 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_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index bae6d25..3449cd2 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 1.8.0
+Version: 2.0.0
Summary: Add CardDAV on parties
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,13 @@ 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 :: 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_party_vcarddav.egg-info/SOURCES.txt b/trytond_party_vcarddav.egg-info/SOURCES.txt
index 8b4f60c..9679a02 100644
--- a/trytond_party_vcarddav.egg-info/SOURCES.txt
+++ b/trytond_party_vcarddav.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 9bd5493..b5d5b03 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,4 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.3
-trytond_party >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_party >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 7a3837bbda2f71cb64980324864e336c88ebb0e6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:54 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index dff533d..afe2117 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-party-vcarddav.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
commit 37b95b2cf37bd40e528bfe1be2e2c6f177e06d18
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:11:51 2011 +0100
Releasing debian version 1.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index af55efb..dfe8876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-vcarddav (1.8.0-2) unstable; urgency=low
+
+ * Changing my email address.
+ * Setting minimal Python version to 2.5.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:11:33 +0100
+
tryton-modules-party-vcarddav (1.8.0-1) experimental; urgency=low
* Wrapping depends.
commit bb5b9c7780759b2f70bac2a8f3ee122c63aac546
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:43 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 489b0a2..213e426 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) 2009-2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit a4b7540a0f327b1a3c061b62ae64cd6f04c4997c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 15 17:27:19 2011 +0100
Setting minimal Python version to 2.5.
diff --git a/debian/pyversions b/debian/pyversions
index 8b253bc..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.5-
commit c980115484c8beb6e046d4e885e3a8059fd02ec0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 11:48:55 2010 +0100
Changing my email address.
diff --git a/debian/control b/debian/control
index 28ee591..dff533d 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 96c13eb3964d1351442d55d3a6e6b5bccc71c119
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Nov 12 13:05:24 2010 +0100
Releasing debian version 1.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 04425cd..af55efb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-party-vcarddav (1.8.0-1) experimental; urgency=low
+
+ * Wrapping depends.
+ * Updating standards version to 3.9.0.
+ * Updating to debhelper version 8.
+ * Updating to standards version 3.9.1.
+ * Switching to source format 3.0 (quilt).
+ * Merging upstream version 1.8.0.
+ * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 12 Nov 2010 13:05:22 +0100
+
tryton-modules-party-vcarddav (1.6.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit 5a365d1d9b2355cb6746c4c0b9500bb5296385c8
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 b3d9ded..28ee591 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcardd
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-party (>= 1.6), python-vobject, python-webdav,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ tryton-modules-party (>= 1.8), python-vobject, python-webdav,
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Party CardDAV Module)
commit 725b320f09b0703bcc453e57e2e255e812db243b
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:13:25 2010 +0100
Merging upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 71af51b..3ecb7d4 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-11
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 6ff6e0e..46f18bc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 1.6.0
+Version: 1.8.0
Summary: Add CardDAV on parties
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 430cfab..1133f31 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO' : 'vCardDAV de Compañía',
'name_es_ES' : 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '1.6.0',
+ 'version' : '1.8.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/carddav.py b/carddav.py
index 9cf5c18..5bd9863 100644
--- a/carddav.py
+++ b/carddav.py
@@ -1,11 +1,12 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-_TRYTON_RELOAD = False
-
from DAV import propfind
from DAV.errors import *
-from trytond.protocols.webdav import TrytonDAVInterface, USER_ID, CACHE, DATABASE
+from trytond.protocols.webdav import TrytonDAVInterface, CACHE
from trytond.pool import Pool
+from trytond.transaction import Transaction
+
+_TRYTON_RELOAD = False
TrytonDAVInterface.PROPS['urn:ietf:params:xml:ns:carddav'] = (
'address-data',
@@ -35,18 +36,16 @@ def _get_carddav_address_data(self, uri):
dbname, dburi = self._get_dburi(uri)
if not dbname:
raise DAV_NotFound
- cursor = DATABASE['cursor']
- pool = Pool(DATABASE['dbname'])
+ pool = Pool(Transaction().cursor.database_name)
try:
collection_obj = pool.get('webdav.collection')
except KeyError:
raise DAV_NotFound
try:
- res = collection_obj.get_address_data(cursor, int(USER_ID), dburi,
- cache=CACHE)
+ res = collection_obj.get_address_data(dburi, cache=CACHE)
except (DAV_Error, DAV_NotFound, DAV_Secret, DAV_Forbidden):
raise
- except:
+ except Exception:
raise DAV_Error(500)
return res
diff --git a/party.py b/party.py
index f01170b..ad90956 100644
--- a/party.py
+++ b/party.py
@@ -1,11 +1,12 @@
#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, ModelView, fields
-from trytond.report import Report
-from trytond.backend import TableHandler, FIELDS
import base64
import copy
import uuid
+from trytond.model import ModelSQL, ModelView, fields
+from trytond.report import Report
+from trytond.backend import TableHandler, FIELDS
+from trytond.transaction import Transaction
class Party(ModelSQL, ModelView):
@@ -16,12 +17,13 @@ class Party(ModelSQL, ModelView):
def __init__(self):
super(Party, self).__init__()
- self._sql_constraints = [
+ self._sql_constraints += [
('uuid_uniq', 'UNIQUE(uuid)',
'The UUID of the party must be unique!'),
]
- def init(self, cursor, module_name):
+ def init(self, module_name):
+ cursor = Transaction().cursor
table = TableHandler(cursor, self, module_name)
if not table.column_exist('uuid'):
@@ -32,45 +34,42 @@ class Party(ModelSQL, ModelView):
for id, in cursor.fetchall():
cursor.execute('UPDATE "' + self._table + '" ' \
'SET "uuid" = %s WHERE id = %s',
- (self.default_uuid(cursor, 0), id))
- super(Party, self).init(cursor, module_name)
+ (self.default_uuid(), id))
+ super(Party, self).init(module_name)
- def default_uuid(self, cursor, user, context=None):
+ def default_uuid(self):
return str(uuid.uuid4())
- def create(self, cursor, user, vals, context=None):
+ def create(self, vals):
collection_obj = self.pool.get('webdav.collection')
- res = super(Party, self).create(cursor, user, vals, context=context)
+ res = super(Party, self).create(vals)
# Restart the cache for vcard
- collection_obj.vcard(cursor.dbname)
+ collection_obj.vcard.reset()
return res
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
collection_obj = self.pool.get('webdav.collection')
- res = super(Party, self).write(cursor, user, ids, vals, context=context)
+ res = super(Party, self).write(ids, vals)
# Restart the cache for vcard
- collection_obj.vcard(cursor.dbname)
+ collection_obj.vcard.reset()
return res
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
collection_obj = self.pool.get('webdav.collection')
- res = super(Party, self).delete(cursor, user, ids, context=context)
+ res = super(Party, self).delete(ids)
# Restart the cache for vcard
- collection_obj.vcard(cursor.dbname)
+ collection_obj.vcard.reset()
return res
- def vcard2values(self, cursor, user, party_id, vcard, context=None):
+ def vcard2values(self, party_id, vcard):
'''
Convert vcard to values for create or write
- :param cursor: the database cursor
- :param user: the user id
:param party_id: the party id for write or None for create
:param vcard: a vcard instance of vobject
- :param context: the context
:return: a dictionary with values
'''
import vobject
@@ -87,8 +86,7 @@ class Party(ModelSQL, ModelView):
res['uuid'] = vcard.uid.value
res['addresses'] = []
for adr in vcard.contents.get('adr', []):
- vals = address_obj.vcard2values(cursor, user, adr,
- context=context)
+ vals = address_obj.vcard2values(adr)
res['addresses'].append(('create', vals))
res['contact_mechanisms'] = []
for email in vcard.contents.get('email', []):
@@ -105,7 +103,7 @@ class Party(ModelSQL, ModelView):
vals['value'] = tel.value
res['contact_mechanisms'].append(('create', vals))
else:
- party = self.browse(cursor, user, party_id, context=context)
+ party = self.browse(party_id)
i = 0
res['addresses'] = []
addresses_todelete = []
@@ -120,8 +118,7 @@ class Party(ModelSQL, ModelView):
addresses_todelete.append(address.id)
i += 1
continue
- vals = address_obj.vcard2values(cursor, user, adr,
- context=context)
+ vals = address_obj.vcard2values(adr)
res['addresses'].append(('write', address.id, vals))
i += 1
if addresses_todelete:
@@ -133,8 +130,7 @@ class Party(ModelSQL, ModelView):
for adr in new_addresses:
if not hasattr(adr, 'value'):
continue
- vals = address_obj.vcard2values(cursor, user, adr,
- context=context)
+ vals = address_obj.vcard2values(adr)
res['addresses'].append(('create', vals))
i = 0
@@ -205,14 +201,11 @@ Party()
class Address(ModelSQL, ModelView):
_name = 'party.address'
- def vcard2values(self, cursor, user, adr, context=None):
+ def vcard2values(self, adr):
'''
Convert adr from vcard to values for create or write
- :param cursor: the database cursor
- :param user: the user id
:param adr: a adr from vcard instance of vobject
- :param context: the context
:return: a dictionary with values
'''
country_obj = self.pool.get('country.country')
@@ -223,17 +216,16 @@ class Address(ModelSQL, ModelView):
vals['city'] = adr.value.city or ''
vals['zip'] = adr.value.code or ''
if adr.value.country:
- country_ids = country_obj.search(cursor, user, [
+ country_ids = country_obj.search([
('rec_name', '=', adr.value.country),
- ], limit=1, context=context)
+ ], limit=1)
if country_ids:
vals['country'] = country_ids[0]
if adr.value.region:
- subdivision_ids = subdivision_obj.search(cursor,
- user, [
- ('rec_name', '=', adr.value.region),
- ('country', '=', country_ids[0]),
- ], limit=1, context=context)
+ subdivision_ids = subdivision_obj.search([
+ ('rec_name', '=', adr.value.region),
+ ('country', '=', country_ids[0]),
+ ], limit=1)
if subdivision_ids:
vals['subdivision'] = subdivision_ids[0]
return vals
@@ -259,22 +251,18 @@ ActionReport()
class VCard(Report):
_name = 'party_vcarddav.party.vcard'
- def execute(self, cursor, user, ids, datas, context=None):
+ def execute(self, ids, datas):
party_obj = self.pool.get('party.party')
action_report_obj = self.pool.get('ir.action.report')
- if context is None:
- context = {}
-
- action_report_ids = action_report_obj.search(cursor, user, [
+ action_report_ids = action_report_obj.search([
('report_name', '=', self._name)
- ], context=context)
+ ])
if not action_report_ids:
raise Exception('Error', 'Report (%s) not find!' % self._name)
- action_report = action_report_obj.browse(cursor, user,
- action_report_ids[0], context=context)
+ action_report = action_report_obj.browse(action_report_ids[0])
- parties = party_obj.browse(cursor, user, ids, context=context)
+ parties = party_obj.browse(ids)
data = ''.join(self.create_vcard(party).serialize() for party in parties)
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 50416be..bae6d25 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 1.6.0
+Version: 1.8.0
Summary: Add CardDAV on parties
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_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index c8729a4..9bd5493 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,4 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.3
-trytond_party >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_party >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index e16f5ec..ec35b22 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,10 +1,13 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL
-from trytond.tools import Cache, reduce_ids
-from DAV.errors import DAV_NotFound, DAV_Forbidden
import base64
import urlparse
+from DAV.errors import DAV_NotFound, DAV_Forbidden
+from trytond.model import ModelView, ModelSQL
+from trytond.tools import reduce_ids
+from trytond.transaction import Transaction
+from trytond.cache import Cache
+
CARDDAV_NS = 'urn:ietf:params:xml:ns:carddav'
@@ -14,14 +17,11 @@ class Collection(ModelSQL, ModelView):
_name = "webdav.collection"
@Cache('webdav_collection.vcard')
- def vcard(self, cursor, user, uri, context=None):
+ def vcard(self, uri):
'''
Return party ids of the vcard in uri or False
- :param cursor: the database cursor
- :param user: the user id
:param uri: the uri
- :param context: the context
:return: party id
or None if there is no party
or False if not in Contacts
@@ -30,9 +30,9 @@ class Collection(ModelSQL, ModelView):
if uri and uri.startswith('Contacts/'):
uuid = uri[9:-4]
- party_ids = party_obj.search(cursor, user, [
+ party_ids = party_obj.search([
('uuid', '=', uuid),
- ], limit=1, context=context)
+ ], limit=1)
if party_ids:
return party_ids[0]
return None
@@ -40,15 +40,11 @@ class Collection(ModelSQL, ModelView):
return None
return False
- def _carddav_filter_domain(self, cursor, user, filter, context=None):
+ def _carddav_filter_domain(self, filter):
'''
Return a domain for the carddav filter
- :param cursor: the database cursor
- :param user: the user id
:param filter: the DOM Element of filter
- :param context: the context
-
:return: a list for domain
'''
address_obj = self.pool.get('party.address')
@@ -113,8 +109,7 @@ class Collection(ModelSQL, ModelView):
res2.append((field, 'not ilike', value))
if name == 'adr':
domain = res2
- address_ids = address_obj.search(cursor, user, domain,
- context=context)
+ address_ids = address_obj.search(domain)
res = [('addresses', 'in', address_ids)]
elif name in ('mail', 'tel'):
if name == 'mail':
@@ -122,54 +117,55 @@ class Collection(ModelSQL, ModelView):
else:
type = ['phone', 'mobile']
domain = [('type', 'in', type), res2]
- contact_mechanism_ids = contact_mechanism_obj.search(cursor,
- user, domain, context=context)
- res2 = [('contact_mechanisms', 'in', contact_mechanism_ids)]
+ contact_mechanism_ids = contact_mechanism_obj.search(
+ domain)
+ res2 = [
+ ('contact_mechanisms', 'in', contact_mechanism_ids)
+ ]
res.append(res2)
return res
- def get_childs(self, cursor, user, uri, filter=None, context=None,
- cache=None):
+ def get_childs(self, uri, filter=None, cache=None):
party_obj = self.pool.get('party.party')
if uri in ('Contacts', 'Contacts/'):
- domain = self._carddav_filter_domain(cursor, user, filter,
- context=context)
- party_ids = party_obj.search(cursor, user, domain, context=context)
- parties = party_obj.browse(cursor, user, party_ids, context=context)
+ domain = self._carddav_filter_domain(filter)
+ party_ids = party_obj.search(domain)
+ parties = party_obj.browse(party_ids)
if cache is not None:
cache.setdefault('_contact', {})
for party_id in party_ids:
cache['_contact'][party_id] = {}
return [x.uuid + '.vcf' for x in parties]
- party_id = self.vcard(cursor, user, uri, context=context)
+ party_id = self.vcard(uri)
if party_id or party_id is None:
return []
- res = super(Collection, self).get_childs(cursor, user, uri,
- filter=filter, context=context, cache=cache)
+ res = super(Collection, self).get_childs(uri, filter=filter,
+ cache=cache)
if not uri and not filter:
res.append('Contacts')
return res
- def get_resourcetype(self, cursor, user, uri, context=None, cache=None):
+ def get_resourcetype(self, uri, cache=None):
from DAV.constants import COLLECTION, OBJECT
- party_id = self.vcard(cursor, user, uri, context=context)
+ party_id = self.vcard(uri)
if party_id:
return OBJECT
elif party_id is None:
return COLLECTION
- return super(Collection, self).get_resourcetype(cursor, user, uri,
- context=context, cache=cache)
+ return super(Collection, self).get_resourcetype(uri, cache=cache)
- def get_contenttype(self, cursor, user, uri, context=None, cache=None):
- if self.vcard(cursor, user, uri, context=context):
+ def get_contenttype(self, uri, cache=None):
+ if self.vcard(uri):
return 'text/x-vcard'
- return super(Collection, self).get_contenttype(cursor, user, uri,
- context=context, cache=cache)
+ return super(Collection, self).get_contenttype(uri, cache=cache)
- def get_creationdate(self, cursor, user, uri, context=None, cache=None):
+ def get_creationdate(self, uri, cache=None):
party_obj = self.pool.get('party.party')
- party_id = self.vcard(cursor, user, uri, context=context)
+ party_id = self.vcard(uri)
+
+ cursor = Transaction().cursor
+
if party_id is None:
raise DAV_NotFound
if party_id:
@@ -198,15 +194,16 @@ class Collection(ModelSQL, ModelView):
cache['_contact'][party_id2]['creationdate'] = date
if res is not None:
return res
- return super(Collection, self).get_creationdate(cursor, user, uri,
- context=context, cache=cache)
+ return super(Collection, self).get_creationdate(uri, cache=cache)
- def get_lastmodified(self, cursor, user, uri, context=None, cache=None):
+ def get_lastmodified(self, uri, cache=None):
party_obj = self.pool.get('party.party')
address_obj = self.pool.get('party.address')
contact_mechanism_obj = self.pool.get('party.contact_mechanism')
- party_id = self.vcard(cursor, user, uri, context=context)
+ cursor = Transaction().cursor
+
+ party_id = self.vcard(uri)
if party_id:
if cache is not None:
cache.setdefault('_contact', {})
@@ -244,104 +241,94 @@ class Collection(ModelSQL, ModelView):
cache['_contact'][party_id2]['lastmodified'] = date
if res is not None:
return res
- return super(Collection, self).get_lastmodified(cursor, user, uri,
- context=context, cache=cache)
+ return super(Collection, self).get_lastmodified(uri, cache=cache)
- def get_data(self, cursor, user, uri, context=None, cache=None):
+ def get_data(self, uri, cache=None):
vcard_obj = self.pool.get('party_vcarddav.party.vcard', type='report')
- party_id = self.vcard(cursor, user, uri, context=context)
+ party_id = self.vcard(uri)
if party_id is None:
raise DAV_NotFound
if party_id:
- val = vcard_obj.execute(cursor, user, [party_id],
+ val = vcard_obj.execute([party_id],
{'id': party_id, 'ids': [party_id]},
- context=context)
+ )
return base64.decodestring(val[1])
- return super(Collection, self).get_data(cursor, user, uri,
- context=context, cache=cache)
+ return super(Collection, self).get_data(uri, cache=cache)
- def get_address_data(self, cursor, user, uri, context=None, cache=None):
+ def get_address_data(self, uri, cache=None):
vcard_obj = self.pool.get('party_vcarddav.party.vcard', type='report')
- party_id = self.vcard(cursor, user, uri, context=context)
+ party_id = self.vcard(uri)
if not party_id:
raise DAV_NotFound
- val = vcard_obj.execute(cursor, user, [party_id],
+ val = vcard_obj.execute([party_id],
{'id': party_id, 'ids': [party_id]},
- context=context)
+ )
res = base64.decodestring(val[1])
return res.decode('utf-8')
- def put(self, cursor, user, uri, data, content_type, context=None,
- cache=None):
+ def put(self, uri, data, content_type, cache=None):
import vobject
party_obj = self.pool.get('party.party')
- party_id = self.vcard(cursor, user, uri, context=context)
+ party_id = self.vcard(uri)
if party_id is None:
vcard = vobject.readOne(data)
- values = party_obj.vcard2values(cursor, user, None, vcard,
- context=context)
+ values = party_obj.vcard2values(None, vcard)
try:
- party_id = party_obj.create(cursor, user, values,
- context=context)
- except:
+ party_id = party_obj.create(values)
+ except Exception:
raise DAV_Forbidden
- party = party_obj.browse(cursor, user, party_id, context=context)
- return cursor.database_name + '/Contacts/' + party.uuid + '.vcf'
+ party = party_obj.browse(party_id)
+ return (Transaction().cursor.database_name + '/Contacts/' +
+ party.uuid + '.vcf')
if party_id:
vcard = vobject.readOne(data)
- values = party_obj.vcard2values(cursor, user, party_id, vcard,
- context=context)
+ values = party_obj.vcard2values(party_id, vcard)
try:
- party_obj.write(cursor, user, party_id, values, context=context)
- except:
+ party_obj.write(party_id, values)
+ except Exception:
raise DAV_Forbidden
return
- return super(Collection, self).put(cursor, user, uri, data,
- content_type, context=context)
+ return super(Collection, self).put(uri, data, content_type, cache=cache)
- def mkcol(self, cursor, user, uri, context=None, cache=None):
- party_id = self.vcard(cursor, user, uri, context=context)
+ def mkcol(self, uri, cache=None):
+ party_id = self.vcard(uri)
if party_id is None:
raise DAV_Forbidden
if party_id:
raise DAV_Forbidden
- return super(Collection, self).mkcol(cursor, user, uri, context=context,
- cache=cache)
+ return super(Collection, self).mkcol(uri, cache=cache)
- def rmcol(self, cursor, user, uri, context=None, cache=None):
- party_id = self.vcard(cursor, user, uri, context=context)
+ def rmcol(self, uri, cache=None):
+ party_id = self.vcard(uri)
if party_id is None:
raise DAV_Forbidden
if party_id:
raise DAV_Forbidden
- return super(Collection, self).rmcol(cursor, user, uri, context=context,
- cache=cache)
+ return super(Collection, self).rmcol(uri, cache=cache)
- def rm(self, cursor, user, uri, context=None, cache=None):
+ def rm(self, uri, cache=None):
party_obj = self.pool.get('party.party')
- party_id = self.vcard(cursor, user, uri, context=context)
+ party_id = self.vcard(uri)
if party_id is None:
raise DAV_Forbidden
if party_id:
try:
- party_obj.delete(cursor, user, party_id, context=context)
- except:
+ party_obj.delete(party_id)
+ except Exception:
raise DAV_Forbidden
return 200
- return super(Collection, self).rm(cursor, user, uri, context=context,
- cache=cache)
+ return super(Collection, self).rm(uri, cache=cache)
- def exists(self, cursor, user, uri, context=None, cache=None):
- party_id = self.vcard(cursor, user, uri, context=context)
+ def exists(self, uri, cache=None):
+ party_id = self.vcard(uri)
if party_id is None or party_id:
if party_id:
return 1
if uri in ('Contacts', 'Contacts/'):
return 1
return 0
- return super(Collection, self).exists(cursor, user, uri, context=context,
- cache=cache)
+ return super(Collection, self).exists(uri, cache=cache)
Collection()
commit c2045841fd9ced19dddf02f4d01c5867299c3f02
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 2 14:27:00 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 37507c86e1daa863ea9b35eb2b2246217622fdf9
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 6093dcd..b3d9ded 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-party-vcarddav.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
commit bd78e09cdb471abd92025dfdfb4ddd19f2b78c99
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:04:05 2010 +0200
Updating to debhelper version 8.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 1d32912..6093dcd 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-party-vcarddav.git
commit 3f7449cecd6fc7d2854a24bb431573f6daabd5df
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 28 20:35:30 2010 +0200
Updating standards version to 3.9.0.
diff --git a/debian/control b/debian/control
index 90b992c..1d32912 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-party-vcarddav.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
commit 520ffa5a6950ce0d9131b373ea07c0972fdaf7c4
Author: Daniel Baumann <daniel at debian.org>
Date: Sat May 15 12:52:50 2010 +0200
Wrapping depends.
diff --git a/debian/control b/debian/control
index c9163f8..90b992c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-party (>= 1.6), python-vobject, python-webdav, python-pkg-resources
+ tryton-modules-party (>= 1.6), python-vobject, python-webdav,
+ python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
commit 651d9de8a13c17b6b464858e626dec253921fab8
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 17:12:38 2010 +0200
Releasing debian version 1.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index a6f6214..04425cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-party-vcarddav (1.6.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 1.6.0.
+ * Updating copyright.
+ * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz> Wed, 12 May 2010 17:11:56 +0200
+
tryton-modules-party-vcarddav (1.4.1-2) unstable; urgency=low
* Updating year in copyright file.
commit cd290a2fe1da27cfa2cef75e1427719b67b81941
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 17:10:09 2010 +0200
Updating depends.
diff --git a/debian/control b/debian/control
index 9a2037e..c9163f8 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcardd
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-party (>= 1.4), python-vobject (>= 0.8.1c-1),
- python-webdav, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ tryton-modules-party (>= 1.6), python-vobject, python-webdav, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
commit 543fc7e0570c31f8da40d5fd8e944a716efc0622
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 17:06:45 2010 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index dad4d26..489b0a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2009 Cedric Krier
- (C) 2009 Bertrand Chenal
- (C) 2009 B2CK SPRL
+ (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
commit 6ff88b3c78f5ae5fc618eb4f94e7e5ada3af73f0
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 17:05:20 2010 +0200
Merging upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8ce1b25..71af51b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 1.4.1 - 2009-11-24
-* Some bug fixes (see mercurial logs for details)
+Version 1.6.0 - 2010-05-11
+* Bug fixes (see mercurial logs for details)
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a474ed..6e6811c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009 Cédric Krier.
-Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009 B2CK SPRL.
+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
diff --git a/MANIFEST.in b/MANIFEST.in
index b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 1055a36..6ff6e0e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 1.4.1
+Version: 1.6.0
Summary: Add CardDAV on parties
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 0e3e43f..430cfab 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO' : 'vCardDAV de Compañía',
'name_es_ES' : 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '1.4.1',
+ 'version' : '1.6.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/fr_FR.csv b/fr_FR.csv
index 466babf..6845ba2 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,7 +1,7 @@
type,name,res_id,src,value,fuzzy
-error,party.party,0,The UUID of the party must be unique!,,0
-field,"party.party,uuid",0,UUID,,0
-field,"party.party,vcard",0,VCard,,0
-help,"party.party,uuid",0,Universally Unique Identifier,,0
-model,"ir.action,name",report_party_vcard,VCard,,0
-selection,"ir.action.report,extension",0,VCard file,,0
+error,party.party,0,The UUID of the party must be unique!,L'UUID du tiers doit être unique !,0
+field,"party.party,uuid",0,UUID,UUID,0
+field,"party.party,vcard",0,VCard,VCard,0
+help,"party.party,uuid",0,Universally Unique Identifier,Identificateur unique universel,0
+model,"ir.action,name",report_party_vcard,VCard,VCard,0
+selection,"ir.action.report,extension",0,VCard file,Fichier VCard,0
diff --git a/setup.py b/setup.py
index 784f6e9..e783a55 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+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', 'PyWebDAV >= 0.9.3']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_party_vcarddav',
version=info.get('version', '0.0.1'),
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index cb6ea2c..50416be 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 1.4.1
+Version: 1.6.0
Summary: Add CardDAV on parties
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_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index fcef744..c8729a4 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,5 +1,4 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.3
-trytond_party
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_party >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index df760df..e16f5ec 100644
--- a/webdav.py
+++ b/webdav.py
@@ -13,6 +13,7 @@ class Collection(ModelSQL, ModelView):
_name = "webdav.collection"
+ @Cache('webdav_collection.vcard')
def vcard(self, cursor, user, uri, context=None):
'''
Return party ids of the vcard in uri or False
@@ -39,8 +40,6 @@ class Collection(ModelSQL, ModelView):
return None
return False
- vcard = Cache('webdav_collection.vcard')(vcard)
-
def _carddav_filter_domain(self, cursor, user, filter, context=None):
'''
Return a domain for the carddav filter
commit 3e0cdfb5fff4dc1928198bcb0977585bd7ccd961
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 6654abb..9a2037e 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 b065d077836c81598a3dbaf0a43e749a2460f7b7
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:39:12 2010 +0100
Releasing debian version 1.4.1-2.
diff --git a/debian/changelog b/debian/changelog
index 03c0132..a6f6214 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-vcarddav (1.4.1-2) unstable; urgency=low
+
+ * Updating year in copyright file.
+ * Removing unneeded python-all-dev from build-depends.
+ * Updating to standards 3.8.4.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Feb 2010 10:39:09 +0100
+
tryton-modules-party-vcarddav (1.4.1-1) unstable; urgency=low
[ Mathias Behrle ]
commit 44bf586c104bd2acad3406bd4cdcce927f2e821b
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jan 28 07:53:21 2010 +0100
Updating to standards 3.8.4.
diff --git a/debian/control b/debian/control
index 52b9469..6654abb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-party-vcarddav.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
commit 2df4e83b5f34b69a2fdf66495feb606925ffc4fa
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 25 10:12:28 2010 +0100
Removing unneeded python-all-dev from build-depends.
diff --git a/debian/control b/debian/control
index 02e0804..52b9469 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends:
- debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-party-vcarddav.git
commit b234f0b4c38e2732bf1f0823426f8460fcb023d5
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 2 11:35:24 2010 +0100
Updating year in copyright file.
diff --git a/debian/copyright b/debian/copyright
index 2eed23b..dad4d26 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) 2009 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit f7821f22c252edc03998db2e272e9903c02edf14
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:11:09 2009 +0100
Releasing debian version 1.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index be460d3..03c0132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+tryton-modules-party-vcarddav (1.4.1-1) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Improving package long description.
+
+ [ Daniel Baumann ]
+ * Making depends versioned for tryton 1.4.
+
+ [ Mathias Behrle ]
+ * Adding versioned depend for python-vobject.
+
+ [ Daniel Baumann ]
+ * Merging upstream version 1.4.1.
+ * Updating README.source.
+ * Adding explicit debian source version 1.0 until switch to 3.0.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 25 Nov 2009 13:10:59 +0100
+
tryton-modules-party-vcarddav (1.4.0-1) unstable; urgency=low
* Initial release.
commit 8d2589baef6d60eab51496766c825018eed4c9fa
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:10:42 2009 +0100
Adding explicit debian source version 1.0 until switch to 3.0.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit 21c5655a781af8cc6647c9b8a8571c8b941aad28
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:10:32 2009 +0100
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index dcc7ba3..18b6b24 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -32,6 +32,6 @@ upstream source. Changes, if any, are stored in the source package as diffs in
debian/diff and are applied during the build. Current modifications can be
applied to the source tree with:
- $ quilt push -a
+ $ QUILT_PATCHES=debian/patches quilt push -a
More information about Quilt can be found in the quilt package.
commit b406e52acb8e233a8b98d87721c94c8d57c536c7
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:10:21 2009 +0100
Merging upstream version 1.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..8ce1b25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.1 - 2009-11-24
+* Some bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/INSTALL b/INSTALL
index 05cadc4..6db776c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ Prerequisites
* Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
- * vobject (http://vobject.skyhouseconsulting.com/)
+ * vobject 0.8.0 or later (http://vobject.skyhouseconsulting.com/)
* pywebdav 0.9.3 or later (http://sourceforge.net/projects/pywebdav/)
Installation
diff --git a/PKG-INFO b/PKG-INFO
index 2e5b2d4..1055a36 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 1.4.0
+Version: 1.4.1
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index d479a81..0e3e43f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO' : 'vCardDAV de Compañía',
'name_es_ES' : 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '1.4.0',
+ 'version' : '1.4.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/carddav.py b/carddav.py
index bd1eb02..9cf5c18 100644
--- a/carddav.py
+++ b/carddav.py
@@ -33,9 +33,14 @@ propfind.PROPFIND.mk_prop_response = mk_prop_response
def _get_carddav_address_data(self, uri):
dbname, dburi = self._get_dburi(uri)
+ if not dbname:
+ raise DAV_NotFound
cursor = DATABASE['cursor']
pool = Pool(DATABASE['dbname'])
- collection_obj = pool.get('webdav.collection')
+ try:
+ collection_obj = pool.get('webdav.collection')
+ except KeyError:
+ raise DAV_NotFound
try:
res = collection_obj.get_address_data(cursor, int(USER_ID), dburi,
cache=CACHE)
diff --git a/setup.py b/setup.py
index e4d9f50..784f6e9 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ import re
info = eval(file('__tryton__.py').read())
-requires = ['vobject', 'PyWebDAV >= 0.9.3']
+requires = ['vobject >= 0.8.0', 'PyWebDAV >= 0.9.3']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
requires.append('trytond_' + dep)
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 4140bda..cb6ea2c 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 1.4.0
+Version: 1.4.1
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 8550012..fcef744 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,4 +1,4 @@
-vobject
+vobject >= 0.8.0
PyWebDAV >= 0.9.3
trytond_party
trytond >= 1.4
commit 30988f664745c35a1a3be500cf5469b56084fdaa
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu Nov 5 14:09:37 2009 +0100
Adding versioned depend for python-vobject.
diff --git a/debian/control b/debian/control
index e0a93da..02e0804 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-party (>= 1.4), python-vobject, python-webdav,
- python-pkg-resources
+ tryton-modules-party (>= 1.4), python-vobject (>= 0.8.1c-1),
+ python-webdav, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
commit 697940f6a8cadd8c3697cac3e360c28604e6ed5e
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 4 12:22:20 2009 +0100
Making depends versioned for tryton 1.4.
diff --git a/debian/control b/debian/control
index 6b39460..e0a93da 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,9 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcardd
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-party,
- python-vobject, python-webdav, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ tryton-modules-party (>= 1.4), python-vobject, python-webdav,
+ python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
commit 252738eaad90adca24e45c19e8387cf7af7ba23c
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue Oct 20 14:34:02 2009 +0200
Improving package long description.
diff --git a/debian/control b/debian/control
index 299ef57..6b39460 100644
--- a/debian/control
+++ b/debian/control
@@ -23,4 +23,4 @@ Description: Tryton Application Platform (Party CardDAV Module)
and using PostgreSQL as database engine. It is the core base of a complete
business solution.
.
- This module adds CardDAV on parties.
+ This module adds support for CardDAV on parties.
commit 3303ab4075398cbe1c03a389a6f1f1b1953ea5da
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:51 2009 +0200
Adding debian version 1.4.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..3a474ed
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2009 Cédric Krier.
+Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2009 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..05cadc4
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,32 @@
+Installing trytond_party_vcarddav
+=================================
+
+Prerequisites
+-------------
+
+ * Python 2.5 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_party (http://www.tryton.org/)
+ * vobject (http://vobject.skyhouseconsulting.com/)
+ * pywebdav 0.9.3 or later (http://sourceforge.net/projects/pywebdav/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_party_vcarddav 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 party_vcarddav.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..2e5b2d4
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_party_vcarddav
+Version: 1.4.0
+Summary: Add CardDAV on parties
+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..bb295c0
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_party_vcarddav
+======================
+
+The party_vcarddav 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..a021c2f
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,6 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import carddav
+from webdav import *
+from party import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..d479a81
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,34 @@
+# -*- 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' : 'Party - vCardDAV',
+ 'name_de_DE': 'Parteien vCardDAV',
+ 'name_es_CO' : 'vCardDAV de Compañía',
+ 'name_es_ES' : 'Tercero - vCardDAV',
+ 'name_fr_FR': 'Tiers - vCardDAV',
+ 'version' : '1.4.0',
+ 'author' : 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': 'Add CardDAV on parties',
+ 'description_de_DE': 'Ermöglicht CardDAV für Parteien',
+ 'description_es_CO': 'Soporte de CardDAV para terceros',
+ 'description_es_ES': 'Añade soporte de CardDAV para terceros',
+ 'description_fr_FR': 'Ajoute le support CardDAV pour les tiers',
+ 'depends' : [
+ 'ir',
+ 'res',
+ 'party',
+ 'webdav',
+ ],
+ 'xml' : [
+ 'party.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/carddav.py b/carddav.py
new file mode 100644
index 0000000..bd1eb02
--- /dev/null
+++ b/carddav.py
@@ -0,0 +1,49 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+_TRYTON_RELOAD = False
+
+from DAV import propfind
+from DAV.errors import *
+from trytond.protocols.webdav import TrytonDAVInterface, USER_ID, CACHE, DATABASE
+from trytond.pool import Pool
+
+TrytonDAVInterface.PROPS['urn:ietf:params:xml:ns:carddav'] = (
+ 'address-data',
+ 'addressbook-data',
+ )
+TrytonDAVInterface.M_NS['urn:ietf:params:xml:ns:carddav'] = '_get_carddav'
+
+_mk_prop_response = propfind.PROPFIND.mk_prop_response
+
+def mk_prop_response(self, uri, good_props, bad_props, doc):
+ res = _mk_prop_response(self, uri, good_props, bad_props, doc)
+ dbname, uri = TrytonDAVInterface.get_dburi(uri)
+ if uri in ('Contacts', 'Contacts/'):
+ ad = doc.createElement('addressbook')
+ ad.setAttribute('xmlns', 'urn:ietf:params:xml:ns:carddav')
+ vc = doc.createElement('vcard-collection')
+ vc.setAttribute('xmlns', 'http://groupdav.org/')
+ cols = res.getElementsByTagName('D:collection')
+ if cols:
+ cols[0].parentNode.appendChild(ad)
+ cols[0].parentNode.appendChild(vc)
+ return res
+
+propfind.PROPFIND.mk_prop_response = mk_prop_response
+
+def _get_carddav_address_data(self, uri):
+ dbname, dburi = self._get_dburi(uri)
+ cursor = DATABASE['cursor']
+ pool = Pool(DATABASE['dbname'])
+ collection_obj = pool.get('webdav.collection')
+ try:
+ res = collection_obj.get_address_data(cursor, int(USER_ID), dburi,
+ cache=CACHE)
+ except (DAV_Error, DAV_NotFound, DAV_Secret, DAV_Forbidden):
+ raise
+ except:
+ raise DAV_Error(500)
+ return res
+
+TrytonDAVInterface._get_carddav_address_data = _get_carddav_address_data
+TrytonDAVInterface._get_carddav_addressbook_data = _get_carddav_address_data
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..093552c
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,7 @@
+type,name,res_id,src,value,fuzzy
+error,party.party,0,The UUID of the party must be unique!,Die UUID für eine Partei kann nicht mehrfach vergeben werden!,0
+field,"party.party,uuid",0,UUID,UUID,0
+field,"party.party,vcard",0,VCard,VCard,0
+help,"party.party,uuid",0,Universally Unique Identifier,Universally Unique Identifier,0
+model,"ir.action,name",report_party_vcard,VCard,VCard,0
+selection,"ir.action.report,extension",0,VCard file,VCard Datei,0
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..dcc7ba3
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..be460d3
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-party-vcarddav (1.4.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 20 Oct 2009 12:36:30 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..299ef57
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: tryton-modules-party-vcarddav
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Build-Depends:
+ debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Standards-Version: 3.8.3
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-party-vcarddav.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
+
+Package: tryton-modules-party-vcarddav
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-party,
+ python-vobject, python-webdav, python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Party CardDAV 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 CardDAV on parties.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..2eed23b
--- /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 Cedric Krier
+ (C) 2009 Bertrand Chenal
+ (C) 2009 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) 2009 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..8b253bc
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..000210b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..9bedc54
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,18 @@
+Party - vCardDAV Module
+#######################
+
+The Party - vCardDAV module provide a new report on parties and
+provide a CardDAV interface over WebDAV.
+
+The *VCard* report on parties allow to generate a vCard_ file
+containing contact informations that can be re-imported in other
+programs like mail clients.
+
+The CardDAV interface is available at
+``http://server_url:8080/dbname/Contacts/`` for all softwares that
+support the `CardDAV protocol`_, this brings a two-way synchronisation of
+contacts.
+
+
+.. _vCard: http://en.wikipedia.org/wiki/Vcard
+.. _CardDAV protocol: http://www.vcarddav.org/wiki
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..df05f1b
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,7 @@
+type,name,res_id,src,value,fuzzy
+error,party.party,0,The UUID of the party must be unique!,¡La UUID del tercero debe ser única!,0
+field,"party.party,uuid",0,UUID,UUID,0
+field,"party.party,vcard",0,VCard,VCard,0
+help,"party.party,uuid",0,Universally Unique Identifier,Identificador Único Universal,0
+model,"ir.action,name",report_party_vcard,VCard,VCard,0
+selection,"ir.action.report,extension",0,VCard file,Archivo VCard,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..3224334
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,7 @@
+type,name,res_id,src,value,fuzzy
+error,party.party,0,The UUID of the party must be unique!,El UUID del tercero debe ser único,0
+field,"party.party,uuid",0,UUID,UUID,0
+field,"party.party,vcard",0,VCard,VCard,0
+help,"party.party,uuid",0,Universally Unique Identifier,Identificador universal único,0
+model,"ir.action,name",report_party_vcard,VCard,VCard,0
+selection,"ir.action.report,extension",0,VCard file,Archivo VCard,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..466babf
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,7 @@
+type,name,res_id,src,value,fuzzy
+error,party.party,0,The UUID of the party must be unique!,,0
+field,"party.party,uuid",0,UUID,,0
+field,"party.party,vcard",0,VCard,,0
+help,"party.party,uuid",0,Universally Unique Identifier,,0
+model,"ir.action,name",report_party_vcard,VCard,,0
+selection,"ir.action.report,extension",0,VCard file,,0
diff --git a/party.py b/party.py
new file mode 100644
index 0000000..f01170b
--- /dev/null
+++ b/party.py
@@ -0,0 +1,383 @@
+#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, ModelView, fields
+from trytond.report import Report
+from trytond.backend import TableHandler, FIELDS
+import base64
+import copy
+import uuid
+
+
+class Party(ModelSQL, ModelView):
+ _name = 'party.party'
+ uuid = fields.Char('UUID', required=True,
+ help='Universally Unique Identifier')
+ vcard = fields.Binary('VCard')
+
+ def __init__(self):
+ super(Party, self).__init__()
+ self._sql_constraints = [
+ ('uuid_uniq', 'UNIQUE(uuid)',
+ 'The UUID of the party must be unique!'),
+ ]
+
+ def init(self, cursor, module_name):
+ table = TableHandler(cursor, self, module_name)
+
+ if not table.column_exist('uuid'):
+ table.add_raw_column('uuid',
+ FIELDS[self.uuid._type].sql_type(self.uuid),
+ FIELDS[self.uuid._type].sql_format, None, None)
+ cursor.execute('SELECT id FROM "' + self._table + '"')
+ for id, in cursor.fetchall():
+ cursor.execute('UPDATE "' + self._table + '" ' \
+ 'SET "uuid" = %s WHERE id = %s',
+ (self.default_uuid(cursor, 0), id))
+ super(Party, self).init(cursor, module_name)
+
+ def default_uuid(self, cursor, user, context=None):
+ return str(uuid.uuid4())
+
+ def create(self, cursor, user, vals, context=None):
+ collection_obj = self.pool.get('webdav.collection')
+
+ res = super(Party, self).create(cursor, user, vals, context=context)
+ # Restart the cache for vcard
+ collection_obj.vcard(cursor.dbname)
+ return res
+
+ def write(self, cursor, user, ids, vals, context=None):
+ collection_obj = self.pool.get('webdav.collection')
+
+ res = super(Party, self).write(cursor, user, ids, vals, context=context)
+ # Restart the cache for vcard
+ collection_obj.vcard(cursor.dbname)
+ return res
+
+ def delete(self, cursor, user, ids, context=None):
+ collection_obj = self.pool.get('webdav.collection')
+
+ res = super(Party, self).delete(cursor, user, ids, context=context)
+ # Restart the cache for vcard
+ collection_obj.vcard(cursor.dbname)
+ return res
+
+ def vcard2values(self, cursor, user, party_id, vcard, context=None):
+ '''
+ Convert vcard to values for create or write
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param party_id: the party id for write or None for create
+ :param vcard: a vcard instance of vobject
+ :param context: the context
+ :return: a dictionary with values
+ '''
+ import vobject
+ address_obj = self.pool.get('party.address')
+
+ res = {}
+ res['name'] = vcard.fn.value
+ if not hasattr(vcard, 'n'):
+ vcard.add('n')
+ vcard.n.value = vobject.vcard.Name(vcard.fn.value)
+ res['vcard'] = vcard.serialize()
+ if not party_id:
+ if hasattr(vcard, 'uid'):
+ res['uuid'] = vcard.uid.value
+ res['addresses'] = []
+ for adr in vcard.contents.get('adr', []):
+ vals = address_obj.vcard2values(cursor, user, adr,
+ context=context)
+ res['addresses'].append(('create', vals))
+ res['contact_mechanisms'] = []
+ for email in vcard.contents.get('email', []):
+ vals = {}
+ vals['type'] = 'email'
+ vals['value'] = email.value
+ res['contact_mechanisms'].append(('create', vals))
+ for tel in vcard.contents.get('tel', []):
+ vals = {}
+ vals['type'] = 'phone'
+ if hasattr(tel, 'type_param') \
+ and 'cell' in tel.type_param.lower():
+ vals['type'] = 'mobile'
+ vals['value'] = tel.value
+ res['contact_mechanisms'].append(('create', vals))
+ else:
+ party = self.browse(cursor, user, party_id, context=context)
+ i = 0
+ res['addresses'] = []
+ addresses_todelete = []
+ for address in party.addresses:
+ try:
+ adr = vcard.contents.get('adr', [])[i]
+ except IndexError:
+ addresses_todelete.append(address.id)
+ i += 1
+ continue
+ if not hasattr(adr, 'value'):
+ addresses_todelete.append(address.id)
+ i += 1
+ continue
+ vals = address_obj.vcard2values(cursor, user, adr,
+ context=context)
+ res['addresses'].append(('write', address.id, vals))
+ i += 1
+ if addresses_todelete:
+ res['addresses'].append(('delete', addresses_todelete))
+ try:
+ new_addresses = vcard.contents.get('adr', [])[i:]
+ except IndexError:
+ new_addresses = []
+ for adr in new_addresses:
+ if not hasattr(adr, 'value'):
+ continue
+ vals = address_obj.vcard2values(cursor, user, adr,
+ context=context)
+ res['addresses'].append(('create', vals))
+
+ i = 0
+ res['contact_mechanisms'] = []
+ contact_mechanisms_todelete = []
+ for cm in party.contact_mechanisms:
+ if cm.type != 'email':
+ continue
+ try:
+ email = vcard.contents.get('email', [])[i]
+ except IndexError:
+ contact_mechanisms_todelete.append(cm.id)
+ i += 1
+ continue
+ vals = {}
+ vals['value'] = email.value
+ res['contact_mechanisms'].append(('write', cm.id, vals))
+ i += 1
+ try:
+ new_emails = vcard.contents.get('email', [])[i:]
+ except IndexError:
+ new_emails = []
+ for email in new_emails:
+ if not hasattr(email, 'value'):
+ continue
+ vals = {}
+ vals['type'] = 'email'
+ vals['value'] = email.value
+ res['contact_mechanisms'].append(('create', vals))
+
+ i = 0
+ for cm in party.contact_mechanisms:
+ if cm.type not in ('phone', 'mobile'):
+ continue
+ try:
+ tel = vcard.contents.get('tel', [])[i]
+ except IndexError:
+ contact_mechanisms_todelete.append(cm.id)
+ i += 1
+ continue
+ vals = {}
+ vals['value'] = tel.value
+ res['contact_mechanisms'].append(('write', cm.id, vals))
+ i += 1
+ try:
+ new_tels = vcard.contents.get('tel', [])[i:]
+ except IndexError:
+ new_tels = []
+ for tel in new_tels:
+ if not hasattr(tel, 'value'):
+ continue
+ vals = {}
+ vals['type'] = 'phone'
+ if hasattr(tel, 'type_param') \
+ and 'cell' in tel.type_param.lower():
+ vals['type'] = 'mobile'
+ vals['value'] = tel.value
+ res['contact_mechanisms'].append(('create', vals))
+
+ if contact_mechanisms_todelete:
+ res['contact_mechanisms'].append(('delete',
+ contact_mechanisms_todelete))
+ return res
+
+Party()
+
+
+class Address(ModelSQL, ModelView):
+ _name = 'party.address'
+
+ def vcard2values(self, cursor, user, adr, context=None):
+ '''
+ Convert adr from vcard to values for create or write
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param adr: a adr from vcard instance of vobject
+ :param context: the context
+ :return: a dictionary with values
+ '''
+ country_obj = self.pool.get('country.country')
+ subdivision_obj = self.pool.get('country.subdivision')
+
+ vals = {}
+ vals['street'] = adr.value.street or ''
+ vals['city'] = adr.value.city or ''
+ vals['zip'] = adr.value.code or ''
+ if adr.value.country:
+ country_ids = country_obj.search(cursor, user, [
+ ('rec_name', '=', adr.value.country),
+ ], limit=1, context=context)
+ if country_ids:
+ vals['country'] = country_ids[0]
+ if adr.value.region:
+ subdivision_ids = subdivision_obj.search(cursor,
+ user, [
+ ('rec_name', '=', adr.value.region),
+ ('country', '=', country_ids[0]),
+ ], limit=1, context=context)
+ if subdivision_ids:
+ vals['subdivision'] = subdivision_ids[0]
+ return vals
+
+Address()
+
+
+class ActionReport(ModelSQL, ModelView):
+ _name = 'ir.action.report'
+
+ def __init__(self):
+ super(ActionReport, self).__init__()
+ new_ext = ('vcf', 'VCard file')
+ if new_ext not in self.extension.selection:
+ self.extension = copy.copy(self.extension)
+ self.extension.selection = copy.copy(self.extension.selection)
+ self.extension.selection.append(new_ext)
+ self._reset_columns()
+
+ActionReport()
+
+
+class VCard(Report):
+ _name = 'party_vcarddav.party.vcard'
+
+ def execute(self, cursor, user, ids, datas, context=None):
+ party_obj = self.pool.get('party.party')
+ action_report_obj = self.pool.get('ir.action.report')
+
+ if context is None:
+ context = {}
+
+ action_report_ids = action_report_obj.search(cursor, user, [
+ ('report_name', '=', self._name)
+ ], context=context)
+ if not action_report_ids:
+ raise Exception('Error', 'Report (%s) not find!' % self._name)
+ action_report = action_report_obj.browse(cursor, user,
+ action_report_ids[0], context=context)
+
+ parties = party_obj.browse(cursor, user, ids, context=context)
+
+ data = ''.join(self.create_vcard(party).serialize() for party in parties)
+
+ return ('vcf', base64.encodestring(data), False, action_report.name)
+
+ def create_vcard(self, party):
+ '''
+ Return a vcard instance of vobject for the party
+
+ :param party: a BrowseRecord of party.party
+ :return: a vcard instance of vobject
+ '''
+ import vobject
+
+ if party.vcard:
+ vcard = vobject.readOne(party.vcard)
+ else:
+ vcard = vobject.vCard()
+ if not hasattr(vcard, 'n'):
+ vcard.add('n')
+ if not vcard.n.value:
+ vcard.n.value = vobject.vcard.Name(party.name)
+ if not hasattr(vcard, 'fn'):
+ vcard.add('fn')
+ vcard.fn.value = party.full_name
+ if not hasattr(vcard, 'uid'):
+ vcard.add('uid')
+ vcard.uid.value = party.uuid
+
+ i = 0
+ for address in party.addresses:
+ try:
+ adr = vcard.contents.get('adr', [])[i]
+ except IndexError:
+ adr = None
+ if not adr:
+ adr = vcard.add('adr')
+ if not hasattr(adr, 'value'):
+ adr.value = vobject.vcard.Address()
+ adr.value.street = address.street and address.street + (
+ address.streetbis and (" " + address.streetbis) or '') or ''
+ adr.value.city = address.city or ''
+ if address.subdivision:
+ adr.value.region = address.subdivision.name or ''
+ adr.value.code = address.zip or ''
+ if address.country:
+ adr.value.country = address.country.name or ''
+ i += 1
+ try:
+ older_addresses = vcard.contents.get('adr', [])[i:]
+ except IndexError:
+ older_addresses = []
+ for adr in older_addresses:
+ vcard.contents['adr'].remove(adr)
+
+ email_count = 0
+ tel_count = 0
+ for cm in party.contact_mechanisms:
+ if cm.type == 'email':
+ try:
+ email = vcard.contents.get('email', [])[email_count]
+ except IndexError:
+ email = None
+ if not email:
+ email = vcard.add('email')
+ email.value = cm.value
+ if not hasattr(email, 'type_param'):
+ email.type_param = 'internet'
+ elif 'internet' not in email.type_param.lower():
+ email.type_param += ',internet'
+ email_count += 1
+ elif cm.type in ('phone', 'mobile'):
+ try:
+ tel = vcard.contents.get('tel', [])[tel_count]
+ except IndexError:
+ tel = None
+ if not tel:
+ tel = vcard.add('tel')
+ tel.value = cm.value
+ if cm.type == 'mobile':
+ if not hasattr(tel, 'type_param'):
+ tel.type_param = 'cell'
+ elif 'cell' not in tel.type_param.lower():
+ tel.type_param += ',cell'
+ else:
+ if not hasattr(tel, 'type_param'):
+ tel.type_param = 'voice'
+ tel_count += 1
+
+ try:
+ older_emails = vcard.contents.get('email', [])[email_count:]
+ except IndexError:
+ older_emails = []
+ for email in older_emails:
+ vcard.contents['email'].remove(email)
+
+ try:
+ older_tels = vcard.contents.get('tel', [])[tel_count:]
+ except IndexError:
+ older_tels = []
+ for tel in older_tels:
+ vcard.contents['tel'].remove(tel)
+
+ return vcard
+
+VCard()
diff --git a/party.xml b/party.xml
new file mode 100644
index 0000000..e034ae1
--- /dev/null
+++ b/party.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record model="ir.action.report" id="report_party_vcard">
+ <field name="name">VCard</field>
+ <field name="model">party.party</field>
+ <field name="report_name">party_vcarddav.party.vcard</field>
+ <field name="extension">vcf</field>
+ </record>
+
+ <record model="ir.action.keyword" id="create_vcard_keyword">
+ <field name="keyword">form_print</field>
+ <field name="model">party.party,0</field>
+ <field name="action" ref="report_party_vcard"/>
+ </record>
+
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..e4d9f50
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = ['vobject', 'PyWebDAV >= 0.9.3']
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_party_vcarddav',
+ 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.party_vcarddav': '.'},
+ packages=[
+ 'trytond.modules.party_vcarddav',
+ ],
+ package_data={
+ 'trytond.modules.party_vcarddav': 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]
+ party_vcarddav = trytond.modules.party_vcarddav
+ """,
+)
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
new file mode 100644
index 0000000..4140bda
--- /dev/null
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-party-vcarddav
+Version: 1.4.0
+Summary: Add CardDAV on parties
+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_party_vcarddav.egg-info/SOURCES.txt b/trytond_party_vcarddav.egg-info/SOURCES.txt
new file mode 100644
index 0000000..8b4f60c
--- /dev/null
+++ b/trytond_party_vcarddav.egg-info/SOURCES.txt
@@ -0,0 +1,25 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+party.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./carddav.py
+./party.py
+./webdav.py
+doc/index.rst
+trytond_party_vcarddav.egg-info/PKG-INFO
+trytond_party_vcarddav.egg-info/SOURCES.txt
+trytond_party_vcarddav.egg-info/dependency_links.txt
+trytond_party_vcarddav.egg-info/entry_points.txt
+trytond_party_vcarddav.egg-info/not-zip-safe
+trytond_party_vcarddav.egg-info/requires.txt
+trytond_party_vcarddav.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_party_vcarddav.egg-info/dependency_links.txt b/trytond_party_vcarddav.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_party_vcarddav.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_party_vcarddav.egg-info/entry_points.txt b/trytond_party_vcarddav.egg-info/entry_points.txt
new file mode 100644
index 0000000..5e682c5
--- /dev/null
+++ b/trytond_party_vcarddav.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ party_vcarddav = trytond.modules.party_vcarddav
+
\ No newline at end of file
diff --git a/trytond_party_vcarddav.egg-info/not-zip-safe b/trytond_party_vcarddav.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_party_vcarddav.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
new file mode 100644
index 0000000..8550012
--- /dev/null
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -0,0 +1,5 @@
+vobject
+PyWebDAV >= 0.9.3
+trytond_party
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_party_vcarddav.egg-info/top_level.txt b/trytond_party_vcarddav.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_party_vcarddav.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
diff --git a/webdav.py b/webdav.py
new file mode 100644
index 0000000..df760df
--- /dev/null
+++ b/webdav.py
@@ -0,0 +1,348 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelView, ModelSQL
+from trytond.tools import Cache, reduce_ids
+from DAV.errors import DAV_NotFound, DAV_Forbidden
+import base64
+import urlparse
+
+CARDDAV_NS = 'urn:ietf:params:xml:ns:carddav'
+
+
+class Collection(ModelSQL, ModelView):
+
+ _name = "webdav.collection"
+
+ def vcard(self, cursor, user, uri, context=None):
+ '''
+ Return party ids of the vcard in uri or False
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param uri: the uri
+ :param context: the context
+ :return: party id
+ or None if there is no party
+ or False if not in Contacts
+ '''
+ party_obj = self.pool.get('party.party')
+
+ if uri and uri.startswith('Contacts/'):
+ uuid = uri[9:-4]
+ party_ids = party_obj.search(cursor, user, [
+ ('uuid', '=', uuid),
+ ], limit=1, context=context)
+ if party_ids:
+ return party_ids[0]
+ return None
+ if uri == 'Contacts':
+ return None
+ return False
+
+ vcard = Cache('webdav_collection.vcard')(vcard)
+
+ def _carddav_filter_domain(self, cursor, user, filter, context=None):
+ '''
+ Return a domain for the carddav filter
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param filter: the DOM Element of filter
+ :param context: the context
+
+ :return: a list for domain
+ '''
+ address_obj = self.pool.get('party.address')
+ contact_mechanism_obj = self.pool.get('party.contact_mechanism')
+
+ res = []
+ if not filter:
+ return []
+ if filter.localName == 'addressbook-query':
+ addressbook_filter = filter.getElementsByTagNameNS(
+ 'urn:ietf:params:xml:ns:carddav', 'filter')[0]
+ if addressbook_filter.hasAttribute('test') \
+ and addressbook_filter.getAttribute('test') == 'allof':
+ res.append('AND')
+ else:
+ res.append('OR')
+
+ for prop in addressbook_filter.childNodes:
+ name = prop.getAttribute('name').lower()
+ field = None
+ if name == 'fn':
+ field = 'rec_name'
+ if name == 'n':
+ field = 'name'
+ if name == 'uid':
+ field = 'uid'
+ if name == 'adr':
+ field = 'rec_name'
+ if name in ('mail', 'tel'):
+ field = 'value'
+ if field:
+ res2 = []
+ if prop.hasAttribute('test') \
+ and prop.addressbook_filter.getAttribute('test') == 'allof':
+ res2.append('AND')
+ else:
+ res2.append('OR')
+ if prop.getElementsByTagNameNS(CARDDAV_NS, 'is-not-defined'):
+ res2.append((field, '=', False))
+ for text_match in prop.getElementsByTagNameNS(CARDDAV_NS,
+ 'text-match'):
+ value = text_match.firstChild.data
+ negate = False
+ if text_match.hasAttribute('negate-condition') \
+ and text_match.getAttribute(
+ 'negate-condition') == 'yes':
+ negate = True
+ type = 'contains'
+ if text_match.hasAttribute('match-type'):
+ type = text_match.getAttribute('match-type')
+ if type == 'equals':
+ pass
+ elif type in ('contains', 'substring'):
+ value = '%' + value + '%'
+ elif type == 'starts-with':
+ value = value + '%'
+ elif type == 'ends-with':
+ value = '%' + value
+ if not negate:
+ res2.append((field, 'ilike', value))
+ else:
+ res2.append((field, 'not ilike', value))
+ if name == 'adr':
+ domain = res2
+ address_ids = address_obj.search(cursor, user, domain,
+ context=context)
+ res = [('addresses', 'in', address_ids)]
+ elif name in ('mail', 'tel'):
+ if name == 'mail':
+ type = ['email']
+ else:
+ type = ['phone', 'mobile']
+ domain = [('type', 'in', type), res2]
+ contact_mechanism_ids = contact_mechanism_obj.search(cursor,
+ user, domain, context=context)
+ res2 = [('contact_mechanisms', 'in', contact_mechanism_ids)]
+ res.append(res2)
+ return res
+
+ def get_childs(self, cursor, user, uri, filter=None, context=None,
+ cache=None):
+ party_obj = self.pool.get('party.party')
+
+ if uri in ('Contacts', 'Contacts/'):
+ domain = self._carddav_filter_domain(cursor, user, filter,
+ context=context)
+ party_ids = party_obj.search(cursor, user, domain, context=context)
+ parties = party_obj.browse(cursor, user, party_ids, context=context)
+ if cache is not None:
+ cache.setdefault('_contact', {})
+ for party_id in party_ids:
+ cache['_contact'][party_id] = {}
+ return [x.uuid + '.vcf' for x in parties]
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id or party_id is None:
+ return []
+ res = super(Collection, self).get_childs(cursor, user, uri,
+ filter=filter, context=context, cache=cache)
+ if not uri and not filter:
+ res.append('Contacts')
+ return res
+
+ def get_resourcetype(self, cursor, user, uri, context=None, cache=None):
+ from DAV.constants import COLLECTION, OBJECT
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id:
+ return OBJECT
+ elif party_id is None:
+ return COLLECTION
+ return super(Collection, self).get_resourcetype(cursor, user, uri,
+ context=context, cache=cache)
+
+ def get_contenttype(self, cursor, user, uri, context=None, cache=None):
+ if self.vcard(cursor, user, uri, context=context):
+ return 'text/x-vcard'
+ return super(Collection, self).get_contenttype(cursor, user, uri,
+ context=context, cache=cache)
+
+ def get_creationdate(self, cursor, user, uri, context=None, cache=None):
+ party_obj = self.pool.get('party.party')
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id is None:
+ raise DAV_NotFound
+ if party_id:
+ if cache is not None:
+ cache.setdefault('_contact', {})
+ ids = cache['_contact'].keys()
+ if party_id not in ids:
+ ids.append(party_id)
+ elif 'creationdate' in cache['_contact'][party_id]:
+ return cache['_contact'][party_id]['creationdate']
+ else:
+ ids = [party_id]
+ res = None
+ 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, ' \
+ 'EXTRACT(epoch FROM create_date) ' \
+ 'FROM "' + party_obj._table + '" ' \
+ 'WHERE ' + red_sql, red_ids)
+ for party_id2, date in cursor.fetchall():
+ if party_id2 == party_id:
+ res = date
+ if cache is not None:
+ cache['_contact'].setdefault(party_id2, {})
+ cache['_contact'][party_id2]['creationdate'] = date
+ if res is not None:
+ return res
+ return super(Collection, self).get_creationdate(cursor, user, uri,
+ context=context, cache=cache)
+
+ def get_lastmodified(self, cursor, user, uri, context=None, cache=None):
+ party_obj = self.pool.get('party.party')
+ address_obj = self.pool.get('party.address')
+ contact_mechanism_obj = self.pool.get('party.contact_mechanism')
+
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id:
+ if cache is not None:
+ cache.setdefault('_contact', {})
+ ids = cache['_contact'].keys()
+ if party_id not in ids:
+ ids.append(party_id)
+ elif 'lastmodified' in cache['_contact'][party_id]:
+ return cache['_contact'][party_id]['lastmodified']
+ else:
+ ids = [party_id]
+ res = None
+ for i in range(0, len(ids), cursor.IN_MAX):
+ sub_ids = ids[i:i + cursor.IN_MAX]
+ red_sql, red_ids = reduce_ids('p.id', sub_ids)
+ cursor.execute('SELECT p.id, ' \
+ 'MAX(EXTRACT(epoch FROM ' \
+ 'COALESCE(p.write_date, p.create_date))), ' \
+ 'MAX(EXTRACT(epoch FROM ' \
+ 'COALESCE(a.write_date, a.create_date))), ' \
+ 'MAX(EXTRACT(epoch FROM ' \
+ 'COALESCE(c.write_date, c.create_date))) ' \
+ 'FROM "' + party_obj._table + '" p ' \
+ 'LEFT JOIN "' + address_obj._table + '" a ' \
+ 'ON p.id = a.party ' \
+ 'LEFT JOIN "' + contact_mechanism_obj._table + '" c ' \
+ 'ON p.id = c.party ' \
+ 'WHERE ' + red_sql + ' ' \
+ 'GROUP BY p.id', red_ids)
+ for party_id2, date_p, date_a, date_c in cursor.fetchall():
+ date = max(date_p, date_a, date_c)
+ if party_id2 == party_id:
+ res = date
+ if cache is not None:
+ cache['_contact'].setdefault(party_id2, {})
+ cache['_contact'][party_id2]['lastmodified'] = date
+ if res is not None:
+ return res
+ return super(Collection, self).get_lastmodified(cursor, user, uri,
+ context=context, cache=cache)
+
+ def get_data(self, cursor, user, uri, context=None, cache=None):
+ vcard_obj = self.pool.get('party_vcarddav.party.vcard', type='report')
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id is None:
+ raise DAV_NotFound
+ if party_id:
+ val = vcard_obj.execute(cursor, user, [party_id],
+ {'id': party_id, 'ids': [party_id]},
+ context=context)
+ return base64.decodestring(val[1])
+ return super(Collection, self).get_data(cursor, user, uri,
+ context=context, cache=cache)
+
+ def get_address_data(self, cursor, user, uri, context=None, cache=None):
+ vcard_obj = self.pool.get('party_vcarddav.party.vcard', type='report')
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if not party_id:
+ raise DAV_NotFound
+ val = vcard_obj.execute(cursor, user, [party_id],
+ {'id': party_id, 'ids': [party_id]},
+ context=context)
+ res = base64.decodestring(val[1])
+ return res.decode('utf-8')
+
+ def put(self, cursor, user, uri, data, content_type, context=None,
+ cache=None):
+ import vobject
+ party_obj = self.pool.get('party.party')
+
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id is None:
+ vcard = vobject.readOne(data)
+ values = party_obj.vcard2values(cursor, user, None, vcard,
+ context=context)
+ try:
+ party_id = party_obj.create(cursor, user, values,
+ context=context)
+ except:
+ raise DAV_Forbidden
+ party = party_obj.browse(cursor, user, party_id, context=context)
+ return cursor.database_name + '/Contacts/' + party.uuid + '.vcf'
+ if party_id:
+ vcard = vobject.readOne(data)
+ values = party_obj.vcard2values(cursor, user, party_id, vcard,
+ context=context)
+ try:
+ party_obj.write(cursor, user, party_id, values, context=context)
+ except:
+ raise DAV_Forbidden
+ return
+ return super(Collection, self).put(cursor, user, uri, data,
+ content_type, context=context)
+
+ def mkcol(self, cursor, user, uri, context=None, cache=None):
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id is None:
+ raise DAV_Forbidden
+ if party_id:
+ raise DAV_Forbidden
+ return super(Collection, self).mkcol(cursor, user, uri, context=context,
+ cache=cache)
+
+ def rmcol(self, cursor, user, uri, context=None, cache=None):
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id is None:
+ raise DAV_Forbidden
+ if party_id:
+ raise DAV_Forbidden
+ return super(Collection, self).rmcol(cursor, user, uri, context=context,
+ cache=cache)
+
+ def rm(self, cursor, user, uri, context=None, cache=None):
+ party_obj = self.pool.get('party.party')
+
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id is None:
+ raise DAV_Forbidden
+ if party_id:
+ try:
+ party_obj.delete(cursor, user, party_id, context=context)
+ except:
+ raise DAV_Forbidden
+ return 200
+ return super(Collection, self).rm(cursor, user, uri, context=context,
+ cache=cache)
+
+ def exists(self, cursor, user, uri, context=None, cache=None):
+ party_id = self.vcard(cursor, user, uri, context=context)
+ if party_id is None or party_id:
+ if party_id:
+ return 1
+ if uri in ('Contacts', 'Contacts/'):
+ return 1
+ return 0
+ return super(Collection, self).exists(cursor, user, uri, context=context,
+ cache=cache)
+
+Collection()
--
tryton-modules-party-vcarddav
More information about the tryton-debian-vcs
mailing list