[tryton-debian-vcs] tryton-modules-party-siret branch debian created. 8a1cd67e0862ea0efe112449a8135576d5e437d7

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:03:53 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-siret.git;a=commitdiff;h=8a1cd67e0862ea0efe112449a8135576d5e437d7
commit 8a1cd67e0862ea0efe112449a8135576d5e437d7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 25 20:30:16 2013 +0100

    Releasing debian version 3.0.0-1.

diff --git a/debian/changelog b/debian/changelog
index 58bb8c2..c6d78be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-siret (3.0.0-1) unstable; urgency=low
+
+  * Merging upstream version 3.0.0.
+  * Updating to standards version 3.9.5, no changes needed.
+  * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 25 Nov 2013 17:54:20 +0100
+
 tryton-modules-party-siret (2.8.0-3) unstable; urgency=low
 
   * Adapting the rules file to work also with git-buildpackage.
commit e541b3c902c4eb12500599534e91fb271b87740e
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 7dddc78..9d3145c 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-siret.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 e591c89fe6e4e53e60e8e68900fc5beed87c4b76
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 6c10fe3..7dddc78 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-siret.git
 Vcs-Git: git://debian.tryton.org/packages/tryton-modules-party-siret.git
commit eea5e3e5d6507caa13aacbc4809a54c6aa35874d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 17:27:24 2013 +0100

    Merging upstream version 3.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 1b44c3e..5392b24 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 04fe9d6..0fb465c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_party_siret
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add SIRET/SIREN on parties
 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_siret
         ===================
         
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/address.py b/address.py
index 29cd393..81a0245 100644
--- a/address.py
+++ b/address.py
@@ -21,7 +21,8 @@ class Address:
     def __setup__(cls):
         super(Address, cls).__setup__()
         cls._error_messages.update({
-                'invalid_siret': ('Invalid SIRET number "%(siret)s" on address '
+                'invalid_siret': (
+                    'Invalid SIRET number "%(siret)s" on address '
                     '"%(address)s"'),
                 })
 
diff --git a/locale/es_ES.po b/locale/es_ES.po
index c62da38..0d00641 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,13 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
 msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
-msgstr ""
-"El número SIREN \"%(siren)s\" sobre la dirección \"%(address)s\", no es "
-"correcto."
+msgstr "El número SIREN \"%(siren)s\" de la dirección \"%(address)s\" no es correcto."
 
 msgctxt "error:party.party:"
 msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
-msgstr "El número SIREN \"%(siren)s\" del tercero \"%(party)s\", no es correcto."
+msgstr "El número SIREN \"%(siren)s\" del tercero \"%(party)s\" no es correcto."
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/es_ES.po b/locale/sl_SI.po
similarity index 72%
copy from locale/es_ES.po
copy to locale/sl_SI.po
index c62da38..c96a045 100644
--- a/locale/es_ES.po
+++ b/locale/sl_SI.po
@@ -4,13 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
 msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
-msgstr ""
-"El número SIREN \"%(siren)s\" sobre la dirección \"%(address)s\", no es "
-"correcto."
+msgstr "Neveljavna SIRET številka \"%(siret)s\" za naslov \"%(address)s\""
 
 msgctxt "error:party.party:"
 msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
-msgstr "El número SIREN \"%(siren)s\" del tercero \"%(party)s\", no es correcto."
+msgstr "Neveljavna SIREN številka \"%(siren)s\" za stranko \"%(party)s\"."
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/setup.py b/setup.py
index c09790f..ce5a102 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(name='trytond_party_siret',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Russian',
+        'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 420b981..1faa664 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
 #this repository contains the full copyright notices and license terms.
 
 from .test_party_siret import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 3a56145..af0ce34 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_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 2e82929..5f3b699 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-party-siret
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add SIRET/SIREN on parties
 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_siret
         ===================
         
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_party_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index 2af146e..e4545db 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
 locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
+locale/sl_SI.po
 trytond_party_siret.egg-info/PKG-INFO
 trytond_party_siret.egg-info/SOURCES.txt
 trytond_party_siret.egg-info/dependency_links.txt
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index c3d1451..d3ca374 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_party >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_party >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 0210f3b87633b8a648269d909069eade4639d5af
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 db5a7d1..58bb8c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-party-siret (2.8.0-3) unstable; urgency=low
+
+  * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 06 Aug 2013 13:33:01 +0200
+
 tryton-modules-party-siret (2.8.0-2) unstable; urgency=low
 
   * Removing needless empty line in rules.
commit 9813a82403e76da8b211237c8a2523eb5ed9ca44
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 af46b753830acf2c79074194cb34b99f19101d3d
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 021d3cd..db5a7d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-party-siret (2.8.0-2) unstable; urgency=low
+
+  * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Fri, 31 May 2013 17:26:41 +0200
+
 tryton-modules-party-siret (2.8.0-1) experimental; urgency=low
 
   * Merging upstream version 2.8.0.
commit 034ffcd5280f285558378d992d715389d29846be
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 f894355079b6e93f131de6774f91bb5fbb2e54e9
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 6faeaca..021d3cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-siret (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:19 +0200
+
 tryton-modules-party-siret (2.6.0-4) experimental; urgency=low
 
   * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704386).
commit c7baf4c68e63495c3eaed7cd49887d1de9c4541b
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 2d5877a..1d8bf5c 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: 2010-2012 Cédric Krier
-           2010-2012 Bertrand Chenal
-           2010-2012 B2CK SPRL
+Copyright: 2010-2013 Cédric Krier
+           2010-2013 Bertrand Chenal
+           2010-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 84e0d890e7f9d8fb2698895e653f2b9f160085da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 2 00:36:41 2013 +0200

    Merging upstream version 2.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index e76ed4a..1b44c3e 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 bc36354..9d413dd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2010-2012 Cédric Krier.
-Copyright (C) 2010-2012 Bertrand Chenal.
-Copyright (C) 2010-2012 B2CK SPRL.
+Copyright (C) 2010-2013 Cédric Krier.
+Copyright (C) 2010-2013 Bertrand Chenal.
+Copyright (C) 2010-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/MANIFEST.in b/MANIFEST.in
index 97a9596..2569955 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 30f3c6f..04fe9d6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_party_siret
-Version: 2.6.0
+Version: 2.8.0
 Summary: Tryton module to add SIRET/SIREN on parties
 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_siret
         ===================
         
@@ -53,6 +53,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/address.py b/address.py
index e89ae00..29cd393 100644
--- a/address.py
+++ b/address.py
@@ -20,17 +20,21 @@ class Address:
     @classmethod
     def __setup__(cls):
         super(Address, cls).__setup__()
-        cls._constraints += [
-            ('check_siret', 'invalid_siret'),
-            ]
         cls._error_messages.update({
-                'invalid_siret': 'Invalid SIRET number!',
+                'invalid_siret': ('Invalid SIRET number "%(siret)s" on address '
+                    '"%(address)s"'),
                 })
 
     def get_siret(self, name):
         if self.party.siren and self.siret_nic:
             return self.party.siren + self.siret_nic
 
+    @classmethod
+    def validate(cls, addresses):
+        super(Address, cls).validate(addresses)
+        for address in addresses:
+            address.check_siret()
+
     def check_siret(self):
         '''
         Check validity of SIRET
@@ -38,5 +42,7 @@ class Address:
         if self.siret:
             if (len(self.siret) != 14
                     or not luhn.validate(self.siret)):
-                return False
-        return True
+                self.raise_user_error('invalid_siret', {
+                        'siret': self.siret,
+                        'address': self.rec_name,
+                        })
diff --git a/address.xml b/address.xml
index a23bec5..1e8b443 100644
--- a/address.xml
+++ b/address.xml
@@ -6,36 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="address_view_tree">
             <field name="model">party.address</field>
             <field name="inherit" ref="party.address_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name="subdivision"]"
-                        position="after">
-                        <field name="siret"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">address_tree</field>
         </record>
         <record model="ir.ui.view" id="address_view_form">
             <field name="model">party.address</field>
             <field name="inherit" ref="party.address_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/field[@name="subdivision"]"
-                        position="after">
-                        <newline/>
-                        <label name="siret"/>
-                        <field name="siret"/>
-                        <label name="siret_nic"/>
-                        <field name="siret_nic"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">address_form</field>
         </record>
     </data>
 </tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index abb6b9e..d4c61ec 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "Грешен SIRET номер!"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr ""
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "Грешен SIREN номер!"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr ""
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 53250dc..d999920 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "El número SIRET no és vàlid"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr "Número SIREN \"%(siren)s\" de l'adreça \"%(address)s\", no és correcte."
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "El número SIREN no és vàlid"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr "Número SIREN \"%(siren)s\" del tercer \"%(party)s\", no és correcte."
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index be49b86..022df11 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,11 +3,11 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
 msgstr ""
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
 msgstr ""
 
 msgctxt "field:party.address,siret:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 55aa592..039dc46 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "Ungültige SIRET-Nummer!"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr "Ungültige SIRET Nummer \"%(siret)s\" in Adresse \"%(address)s\""
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "Ungültige SIREN-Nummer!"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr "Ungültige SIREN Nummer \"%(siren)s\" in Partei \"%(party)s\"."
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 591bb3d..f23d3b2 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,12 +3,15 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "¡El número SIRET no es válido!"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr ""
+"El número SIREN «%(siren)s» sobre la dirección «%(address)s», no es "
+"correcto."
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "¡El número SIREN no es válido!"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr ""
+"El número SIREN «%(siren)s» de la entidad «%(party)s», no es correcto."
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 3d29194..d4c61ec 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "Número SIRET inválido!"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr ""
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "Número SIREN inválido!"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr ""
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 95a271d..c62da38 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,12 +3,14 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "El número SIRET no es válido."
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr ""
+"El número SIREN \"%(siren)s\" sobre la dirección \"%(address)s\", no es "
+"correcto."
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "El número SIREN no es válido."
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr "El número SIREN \"%(siren)s\" del tercero \"%(party)s\", no es correcto."
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f41a5aa..427f958 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,20 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "Numéro SIRET non valide !"
-
-msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
-msgstr "Numéro SIRET non valide !"
-
-msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "Numéro SIREN non valide !"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr "Le numéro de siret \"%(siret)s\" sur l'adresse \"%(address)s\" est invalide."
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
-msgstr "Numéro SIREN non valide !"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr "Les numéro de SIREN \"%(siren)s\" sur le tiers %(party)s est invalide."
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index be49b86..022df11 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,11 +3,11 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
 msgstr ""
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
 msgstr ""
 
 msgctxt "field:party.address,siret:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index be49b86..022df11 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,11 +3,11 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
-msgid "Invalid SIRET number!"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
 msgstr ""
 
 msgctxt "error:party.party:"
-msgid "Invalid SIREN number!"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
 msgstr ""
 
 msgctxt "field:party.address,siret:"
diff --git a/party.py b/party.py
index 3af710e..621377b 100644
--- a/party.py
+++ b/party.py
@@ -19,18 +19,24 @@ class Party:
     @classmethod
     def __setup__(cls):
         super(Party, cls).__setup__()
-        cls._constraints += [
-            ('check_siren', 'invalid_siren'),
-            ]
         cls._error_messages.update({
-                'invalid_siren': 'Invalid SIREN number!',
+                'invalid_siren': ('Invalid SIREN number "%(siren)s" on party '
+                    '"%(party)s".'),
                 })
 
+    @classmethod
+    def validate(cls, parties):
+        super(Party, cls).validate(parties)
+        for party in parties:
+            party.check_siren()
+
     def check_siren(self):
         '''
         Check validity of SIREN
         '''
         if self.siren:
             if len(self.siren) != 9 or not luhn.validate(self.siren):
-                return False
-        return True
+                self.raise_user_error('invalid_siren', {
+                        'siren': self.siren,
+                        'party': self.rec_name,
+                        })
diff --git a/party.xml b/party.xml
index 1123e6c..85f3072 100644
--- a/party.xml
+++ b/party.xml
@@ -6,34 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="party_view_tree">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name="vat_code"]"
-                        position="after">
-                        <field name="siren"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_tree</field>
         </record>
         <record model="ir.ui.view" id="party_view_form">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/group[@id="checkboxes"]"
-                        position="after">
-                        <label name="siren"/>
-                        <field name="siren"/>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_form</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index ed752dd..c09790f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
 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_siret',
     version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_party_siret',
     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_siret': '.'},
     packages=[
         'trytond.modules.party_siret',
         'trytond.modules.party_siret.tests',
         ],
     package_data={
-        'trytond.modules.party_siret': info.get('xml', []) \
-            + ['tryton.cfg', 'locale/*.po'],
+        'trytond.modules.party_siret': (info.get('xml', [])
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -57,6 +57,7 @@ setup(name='trytond_party_siret',
         '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 c6ee119..3a56145 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_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 7eff61f..2e82929 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-party-siret
-Version: 2.6.0
+Version: 2.8.0
 Summary: Tryton module to add SIRET/SIREN on parties
 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_siret
         ===================
         
@@ -53,6 +53,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_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index 93aaa66..2af146e 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -30,4 +30,8 @@ trytond_party_siret.egg-info/dependency_links.txt
 trytond_party_siret.egg-info/entry_points.txt
 trytond_party_siret.egg-info/not-zip-safe
 trytond_party_siret.egg-info/requires.txt
-trytond_party_siret.egg-info/top_level.txt
\ No newline at end of file
+trytond_party_siret.egg-info/top_level.txt
+view/address_form.xml
+view/address_tree.xml
+view/party_form.xml
+view/party_tree.xml
\ No newline at end of file
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index d6d840f..c3d1451 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-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/view/address_form.xml b/view/address_form.xml
new file mode 100644
index 0000000..2a9537c
--- /dev/null
+++ b/view/address_form.xml
@@ -0,0 +1,12 @@
+<?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. -->
+<data>
+    <xpath expr="/form/field[@name='subdivision']" position="after">
+        <newline/>
+        <label name="siret"/>
+        <field name="siret"/>
+        <label name="siret_nic"/>
+        <field name="siret_nic"/>
+    </xpath>
+</data>
diff --git a/view/address_tree.xml b/view/address_tree.xml
new file mode 100644
index 0000000..72867e1
--- /dev/null
+++ b/view/address_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/tree/field[@name='subdivision']" position="after">
+        <field name="siret"/>
+    </xpath>
+</data>
diff --git a/view/party_form.xml b/view/party_form.xml
new file mode 100644
index 0000000..b256385
--- /dev/null
+++ b/view/party_form.xml
@@ -0,0 +1,10 @@
+<?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. -->
+<data>
+    <xpath expr="/form/group[@id='checkboxes']" position="after">
+        <label name="siren"/>
+        <field name="siren"/>
+        <newline/>
+    </xpath>
+</data>
diff --git a/view/party_tree.xml b/view/party_tree.xml
new file mode 100644
index 0000000..551c8ad
--- /dev/null
+++ b/view/party_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/tree/field[@name='vat_code']" position="after">
+        <field name="siren"/>
+    </xpath>
+</data>
commit 315aba4a89ebb3a93c12bcba426bbbbf96b7a96e
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 131c660..6faeaca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-siret (2.6.0-4) experimental; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704386).
+  * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 27 Apr 2013 15:07:28 +0200
+
 tryton-modules-party-siret (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit dff25d4b2cb235695d3baeb49319eb85731959ae
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 e453f5a..6c10fe3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-party-siret
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-party (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Party SIRET/SIREN Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit 91fb4a79b686f6e26eebb74cf5e8894accd35b58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Apr 21 23:32:58 2013 +0200

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

diff --git a/debian/control b/debian/control
index 7ba168a..e453f5a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-party-siret
 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 57fc1c8b6fd8542848b33f14c4028e41ac523df6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Mar 23 15:04:07 2013 +0100

    Releasing debian version 2.6.0-3.

diff --git a/debian/changelog b/debian/changelog
index 9cadcd1..131c660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-siret (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:49 +0100
+
 tryton-modules-party-siret (2.6.0-2) experimental; urgency=low
 
   * Removing obsolete Dm-Upload-Allowed
commit b313924288545dce78ab940f8f06e50e26136fb6
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..a7849f2
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_party_siret-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit da50331a8002414f89225a97ff1edcd23ba5bcfb
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 fc5ca4f..7ba168a 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-siret.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-party-siret.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-party-siret.git
 X-Python-Version: >= 2.6
 
 Package: tryton-modules-party-siret
commit 1fa5866e184728aa71d79b2671acdafb52bfd66d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Feb 17 13:50:42 2013 +0100

    Releasing debian version 2.6.0-2.

diff --git a/debian/changelog b/debian/changelog
index 667a3a6..9cadcd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-siret (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:51 +0100
+
 tryton-modules-party-siret (2.6.0-1) experimental; urgency=low
 
   * Merging upstream version 2.6.0.
commit 4ca85041ee988b19fa1cad3b700308b1b5ca03d3
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 31d618a..2d5877a 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:
-           2010-2012 Cedric Krier
+Copyright: 2010-2012 Cédric Krier
            2010-2012 Bertrand Chenal
            2010-2012 B2CK SPRL
 License: GPL-3+
@@ -10,7 +9,7 @@ License: GPL-3+
 Files: debian/*
 Copyright:
            2010-2012 Daniel Baumann <daniel at debian.org>
-           2012 Mathias Behrle <mathiasb at m9s.biz>
+           2012-2013 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
commit 33adcf9fa0ae6e1006484ca4b2202cd96bffe256
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Feb 15 19:28:32 2013 +0100

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

diff --git a/debian/control b/debian/control
index d5e97ab..fc5ca4f 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-siret.git
 Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-party-siret.git
commit 3a6126eab9a18452cf5145a843ac886f42631deb
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 7531869..d5e97ab 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 0264bd15b2176acd9382390c526d62c6b87e91fa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Oct 24 22:02:00 2012 +0200

    Releasing debian version 2.6.0-1.

diff --git a/debian/changelog b/debian/changelog
index ab36246..667a3a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-siret (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:39 +0200
+
 tryton-modules-party-siret (2.4.0-2) experimental; urgency=low
 
   [ Daniel Baumann ]
commit 9a9501f73a5616620727afc427ddd27d46910972
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 74be8b7..7531869 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-party-siret
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
- tryton-modules-party (>= 2.4), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-party (>= 2.6), python-pkg-resources
 Description: Tryton Application Platform (Party SIRET/SIREN 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 5e8866441ffc921835545e3f771025f96458eac7
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 c7dad5f..e76ed4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.4.0 - 2012-04-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
 include COPYRIGHT
 include CHANGELOG
 include LICENSE
+include tryton.cfg
 include *.xml
 include *.odt
 include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index bb44cc0..30f3c6f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,19 +1,48 @@
 Metadata-Version: 1.0
 Name: trytond_party_siret
-Version: 2.4.0
-Summary: 
-Add SIRET/SIREN number fields on party.
-    These numbers are used in France, for geographical identification of
-    enterprises:
-    - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
-    - SIRET (Systeme d'Identification du Repertoire des ETablissements)
-
+Version: 2.6.0
+Summary: Tryton module to add SIRET/SIREN on parties
 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_siret
+        ===================
+        
+        The party_siret module of the Tryton application platform.
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/README b/README
index c54e018..f290c37 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_party_siret
 ===================
 
 The party_siret module of the Tryton application platform.
-See __tryton__.py
 
 Installing
 ----------
diff --git a/__init__.py b/__init__.py
index 67253be..f375af1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +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.pool import Pool
 from .party import *
 from .address import *
+
+
+def register():
+    Pool.register(
+        Party,
+        Address,
+        module='party_siret', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 4be07e7..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,95 +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 - Siret',
-    'name_bg_BG': 'Партньор - SIRET',
-    'name_ca_ES': 'Tercers - SIRET',
-    'name_de_DE': 'Parteien - SIRET',
-    'name_es_AR': 'Entidades - SIRET',
-    'name_es_CO': 'Terceros - SIRET',
-    'name_es_ES': 'Terceros - SIRET',
-    'name_fr_FR': 'Tiers - Siret',
-    'version': '2.4.0',
-    'author': 'B2CK',
-    'email': 'info at b2ck.com',
-    'website': 'http://www.tryton.org/',
-    'description': '''
-Add SIRET/SIREN number fields on party.
-    These numbers are used in France, for geographical identification of
-    enterprises:
-    - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
-    - SIRET (Systeme d'Identification du Repertoire des ETablissements)
-''',
-    'description_bg_BG': '''
-Добавя SIRET/SIREN полета към партньор.
-    SIRET/SIREN са френски еквивалент на БУЛСТАТ и служат географско
-    идентифициране на фирма:
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
-''',
-    'description_ca_ES': '''
-Afegeix camps pels números SIRET/SIREN a Tercers.
-
-Aquests números s'utilitzen a França per la identificació d'empreses (SIREN)
-així com la seva ubicació geogràfica (SIRET):
-
-- SIREN (Système d’Identification du Répertoire des ENtreprises)
-- SIRET (Système d’Identification du Répertoire des ETablissements)
-''',
-    'description_de_DE': '''
-Fügt ein Feld für die SIRET/SIREN-Nummer bei Parteien hinzu.
-    Diese Nummern dienen in Frankreich der Identifikation und geographischen
-    Zuordnung von Unternehmen:
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
-''',
-    'description_es_AR': '''
-Añade campos para los números SIRET/SIREN en Entidades.
-    Estos números son utilizados en Francia, para la identificación de
-    empresas (SIREN) así como su ubicación geográfica (SIRET).
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
-''',
-    'description_es_CO': '''
-Añade campos para los números SIRET/SIREN en Terceros.
-    Estos números son utilizados en Francia, para la identificación de
-    empresas (SIREN) así como su ubicación geográfica (SIRET).
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
-''',
-    'description_es_ES': '''
-Añade campos para los números SIRET/SIREN en Terceros.
-    Estos números son utilizados en Francia, para la identificación de
-    empresas (SIREN) así como su ubicación geográfica (SIRET).
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
-''',
-    'description_fr_FR': '''
-Ajoute les champs numéro SIRET/SIREN sur les tiers.
-    Ces numéros sont utilisés en France, pour l'identification géographique des
-    entreprises :
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
-''',
-    'depends': [
-        'ir',
-        'party',
-    ],
-    'xml': [
-        'party.xml',
-        'address.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/address.py b/address.py
index 49b3b37..e89ae00 100644
--- a/address.py
+++ b/address.py
@@ -1,44 +1,42 @@
 #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 Model, fields
+from trytond.model import fields
 from trytond.pyson import Eval
+from trytond.pool import PoolMeta
 from . import luhn
 
+__all__ = ['Address']
+__metaclass__ = PoolMeta
 
-class Address(Model):
-    _name = 'party.address'
+
+class Address:
+    __name__ = 'party.address'
 
     siret_nic = fields.Char('SIRET NIC', select=True, states={
             'readonly': ~Eval('active', True),
             }, size=5, depends=['active'])
     siret = fields.Function(fields.Char('SIRET'), 'get_siret')
 
-    def __init__(self):
-        super(Address, self).__init__()
-        self._constraints += [
+    @classmethod
+    def __setup__(cls):
+        super(Address, cls).__setup__()
+        cls._constraints += [
             ('check_siret', 'invalid_siret'),
-        ]
-        self._error_messages.update({
-            'invalid_siret': 'Invalid SIRET number!',
-        })
+            ]
+        cls._error_messages.update({
+                'invalid_siret': 'Invalid SIRET number!',
+                })
 
-    def get_siret(self, ids, name):
-        res = {}
-        for address in self.browse(ids):
-            if address.party.siren and address.siret_nic:
-                res[address.id] = address.party.siren + address.siret_nic
-            else:
-                res[address.id] = ''
-        return res
+    def get_siret(self, name):
+        if self.party.siren and self.siret_nic:
+            return self.party.siren + self.siret_nic
 
-    def check_siret(self, ids):
+    def check_siret(self):
         '''
         Check validity of SIRET
         '''
-        for address in self.browse(ids):
-            if address.siret:
-                if len(address.siret) != 14 or not luhn.validate(address.siret):
-                    return False
+        if self.siret:
+            if (len(self.siret) != 14
+                    or not luhn.validate(self.siret)):
+                return False
         return True
-
-Address()
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index eb18b63..53250dc 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,11 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
-msgstr "El nombre SIRET no és vàlid"
+msgstr "El número SIRET no és vàlid"
 
 msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
-msgstr "El nombre SIREN no és vàlid"
+msgstr "El número SIREN no és vàlid"
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 04163d2..3d29194 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -12,12 +12,12 @@ msgstr "Número SIREN inválido!"
 
 msgctxt "field:party.address,siret:"
 msgid "SIRET"
-msgstr ""
+msgstr "SIRET"
 
 msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
-msgstr ""
+msgstr "SIRET NIC"
 
 msgctxt "field:party.party,siren:"
 msgid "SIREN"
-msgstr ""
+msgstr "SIREN"
diff --git a/party.py b/party.py
index 7a4eaa8..3af710e 100644
--- a/party.py
+++ b/party.py
@@ -1,35 +1,36 @@
 #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 Model, fields
+from trytond.model import fields
 from trytond.pyson import Eval
+from trytond.pool import PoolMeta
 from . import luhn
 
+__all__ = ['Party']
+__metaclass__ = PoolMeta
 
-class Party(Model):
-    _name = 'party.party'
+
+class Party:
+    __name__ = 'party.party'
 
     siren = fields.Char('SIREN', select=True, states={
             'readonly': ~Eval('active', True),
             }, size=9, depends=['active'])
 
-    def __init__(self):
-        super(Party, self).__init__()
-        self._constraints += [
+    @classmethod
+    def __setup__(cls):
+        super(Party, cls).__setup__()
+        cls._constraints += [
             ('check_siren', 'invalid_siren'),
-        ]
-        self._error_messages.update({
-            'invalid_siren': 'Invalid SIREN number!',
-        })
+            ]
+        cls._error_messages.update({
+                'invalid_siren': 'Invalid SIREN number!',
+                })
 
-    def check_siren(self, ids):
+    def check_siren(self):
         '''
         Check validity of SIREN
         '''
-        for party in self.browse(ids):
-            if party.siren:
-                if len(party.siren) != 9 or not luhn.validate(party.siren):
-                    return False
-            print party.addresses
+        if self.siren:
+            if len(self.siren) != 9 or not luhn.validate(self.siren):
+                return False
         return True
-
-Party()
diff --git a/setup.py b/setup.py
index 317e48e..ed752dd 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,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
 
 setup(name='trytond_party_siret',
     version=info.get('version', '0.0.1'),
-    description=info.get('description', ''),
-    author=info.get('author', ''),
-    author_email=info.get('email', ''),
-    url=info.get('website', ''),
+    description='Tryton module to add SIRET/SIREN on parties',
+    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_siret': '.'},
     packages=[
         'trytond.modules.party_siret',
         'trytond.modules.party_siret.tests',
-    ],
+        ],
     package_data={
         'trytond.modules.party_siret': info.get('xml', []) \
-                + info.get('translation', []),
-    },
+            + ['tryton.cfg', 'locale/*.po'],
+        },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_party_siret',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
-    ],
+        ],
     license='GPL-3',
     install_requires=requires,
     zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_party_siret',
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
-)
+    )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..c6ee119
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,8 @@
+[tryton]
+version=2.6.0
+depends:
+    ir
+    party
+xml:
+    party.xml
+    address.xml
diff --git a/trytond_party_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 60c2dcf..7eff61f 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,19 +1,48 @@
 Metadata-Version: 1.0
 Name: trytond-party-siret
-Version: 2.4.0
-Summary: 
-Add SIRET/SIREN number fields on party.
-    These numbers are used in France, for geographical identification of
-    enterprises:
-    - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
-    - SIRET (Systeme d'Identification du Repertoire des ETablissements)
-
+Version: 2.6.0
+Summary: Tryton module to add SIRET/SIREN on parties
 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_siret
+        ===================
+        
+        The party_siret module of the Tryton application platform.
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/trytond_party_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index 28fb22d..93aaa66 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -7,8 +7,8 @@ README
 address.xml
 party.xml
 setup.py
+tryton.cfg
 ./__init__.py
-./__tryton__.py
 ./address.py
 ./luhn.py
 ./party.py
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index bc115a3..d6d840f 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-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
commit 53f13411f398f89e383020a985cd785d4a916a90
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 18 16:07:21 2012 +0200

    Releasing debian version 2.4.0-2.

diff --git a/debian/changelog b/debian/changelog
index 871a952..ab36246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-party-siret (2.4.0-2) experimental; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating maintainers field.
+  * Updating vcs fields.
+  * Correcting copyright file to match format version 1.0.
+  * Switching to xz compression.
+  * Updating to debhelper version 9.
+
+  [ Mathias Behrle ]
+  * Merging branch debian-wheezy-2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 18 Sep 2012 13:39:21 +0200
+
 tryton-modules-party-siret (2.4.0-1) experimental; urgency=low
 
   * Updating to Standards-Version: 3.9.3, no changes needed.
commit 98919a5516763ba929dad8cd027dddeb6d70f9ea
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 aa94dec..74be8b7 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-siret.git
commit 010f51b1119e83e767d7adad4d32d3cea5b64941
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 3229dec9558acc69cd25c24232766b99036cd606
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 f47f92b..31d618a 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) 2010-2012 Cedric Krier
- (C) 2010-2012 Bertrand Chenal
- (C) 2010-2012 B2CK SPRL
+           2010-2012 Cedric Krier
+           2010-2012 Bertrand Chenal
+           2010-2012 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
 Copyright:
- (C) 2010-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+           2010-2012 Daniel Baumann <daniel at debian.org>
+           2012 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
commit 90d5b23bfa35e85aafc2266c28f57b1b3ed0c794
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 43b91b1..aa94dec 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-siret.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-party-siret.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-party-siret.git
 X-Python-Version: >= 2.6
 
 Package: tryton-modules-party-siret
commit d3666620d55d861d9bf680f0a51807e946fe0e50
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 e0a2842..43b91b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: tryton-modules-party-siret
 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 6b1875d564964e11b8dfe1372150ad420a98d64c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 28 12:44:03 2012 +0200

    Releasing debian version 2.4.0-1.

diff --git a/debian/changelog b/debian/changelog
index 64b0477..871a952 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-party-siret (2.4.0-1) experimental; urgency=low
+
+  * Updating to Standards-Version: 3.9.3, no changes needed.
+  * Updating year in copyright.
+  * Adding myself to copyright.
+  * Adding Format header for DEP5.
+  * Merging upstream version 2.4.0.
+  * Updating Copyright.
+  * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 26 Apr 2012 19:30:43 +0200
+
 tryton-modules-party-siret (2.2.0-1) unstable; urgency=low
 
   * Bumping X-Python-Version to >=2.6.
commit 6d4c76febe3949cac1890d6561b1cf003238664c
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 b8c6cf4..e0a2842 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-party-siret
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
- tryton-modules-party (>= 2.2), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ tryton-modules-party (>= 2.4), python-pkg-resources
 Description: Tryton Application Platform (Party SIRET/SIREN 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 53f9700920b41a2f38b9b3e82beeebede79d70bd
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 7bbc9fb..f47f92b 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) 2010-2011Cedric Krier
- (C) 2010-2011Bertrand Chenal
- (C) 2010-2011B2CK SPRL
+ (C) 2010-2012 Cedric Krier
+ (C) 2010-2012 Bertrand Chenal
+ (C) 2010-2012 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit f9c3b4ab610fde4affbb7ceb1daff5756a275b44
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 24 19:30:47 2012 +0200

    Merging upstream version 2.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index 235fcce..c7dad5f 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 b088e8e..bc36354 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2010-2011 Cédric Krier.
-Copyright (C) 2010-2011 Bertrand Chenal.
-Copyright (C) 2010-2011 B2CK SPRL.
+Copyright (C) 2010-2012 Cédric Krier.
+Copyright (C) 2010-2012 Bertrand Chenal.
+Copyright (C) 2010-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 0092492..ac15260 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_party_siret
 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/)
 
diff --git a/PKG-INFO b/PKG-INFO
index c07078d..bb44cc0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_party_siret
-Version: 2.2.0
+Version: 2.4.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,7 +12,7 @@ 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 52ae9d5..67253be 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +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.
 
-from party import *
-from address import *
+from .party import *
+from .address import *
diff --git a/__tryton__.py b/__tryton__.py
index 37c3ed0..4be07e7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,14 +2,16 @@
 #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 - Siret',
-    'name_bg_BG' : 'Партньор - SIRET',
-    'name_de_DE' : 'Parteien - SIRET',
-    'name_es_CO' : 'Terceros - SIRET',
+    'name': 'Party - Siret',
+    'name_bg_BG': 'Партньор - SIRET',
+    'name_ca_ES': 'Tercers - SIRET',
+    'name_de_DE': 'Parteien - SIRET',
+    'name_es_AR': 'Entidades - SIRET',
+    'name_es_CO': 'Terceros - SIRET',
     'name_es_ES': 'Terceros - SIRET',
     'name_fr_FR': 'Tiers - Siret',
-    'version' : '2.2.0',
-    'author' : 'B2CK',
+    'version': '2.4.0',
+    'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
     'description': '''
@@ -19,28 +21,44 @@ Add SIRET/SIREN number fields on party.
     - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
     - SIRET (Systeme d'Identification du Repertoire des ETablissements)
 ''',
-    'description_bg_BG' : '''
+    'description_bg_BG': '''
 Добавя SIRET/SIREN полета към партньор.
     SIRET/SIREN са френски еквивалент на БУЛСТАТ и служат географско
     идентифициране на фирма:
     - SIREN (Système d’Identification du Répertoire des ENtreprises)
     - SIRET (Système d’Identification du Répertoire des ETablissements)
 ''',
-    'description_de_DE' : '''
+    'description_ca_ES': '''
+Afegeix camps pels números SIRET/SIREN a Tercers.
+
+Aquests números s'utilitzen a França per la identificació d'empreses (SIREN)
+així com la seva ubicació geogràfica (SIRET):
+
+- SIREN (Système d’Identification du Répertoire des ENtreprises)
+- SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
+    'description_de_DE': '''
 Fügt ein Feld für die SIRET/SIREN-Nummer bei Parteien hinzu.
     Diese Nummern dienen in Frankreich der Identifikation und geographischen
     Zuordnung von Unternehmen:
     - SIREN (Système d’Identification du Répertoire des ENtreprises)
     - SIRET (Système d’Identification du Répertoire des ETablissements)
 ''',
-    'description_es_CO' : '''
+    'description_es_AR': '''
+Añade campos para los números SIRET/SIREN en Entidades.
+    Estos números son utilizados en Francia, para la identificación de
+    empresas (SIREN) así como su ubicación geográfica (SIRET).
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
+    'description_es_CO': '''
 Añade campos para los números SIRET/SIREN en Terceros.
     Estos números son utilizados en Francia, para la identificación de
     empresas (SIREN) así como su ubicación geográfica (SIRET).
     - SIREN (Système d’Identification du Répertoire des ENtreprises)
     - SIRET (Système d’Identification du Répertoire des ETablissements)
 ''',
-    'description_es_ES' : '''
+    'description_es_ES': '''
 Añade campos para los números SIRET/SIREN en Terceros.
     Estos números son utilizados en Francia, para la identificación de
     empresas (SIREN) así como su ubicación geográfica (SIRET).
@@ -54,18 +72,20 @@ Ajoute les champs numéro SIRET/SIREN sur les tiers.
     - SIREN (Système d’Identification du Répertoire des ENtreprises)
     - SIRET (Système d’Identification du Répertoire des ETablissements)
 ''',
-    'depends' : [
+    'depends': [
         'ir',
         'party',
     ],
-    'xml' : [
+    'xml': [
         'party.xml',
         'address.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/address.py b/address.py
index 3200bc1..49b3b37 100644
--- a/address.py
+++ b/address.py
@@ -2,13 +2,13 @@
 #this repository contains the full copyright notices and license terms.
 from trytond.model import Model, fields
 from trytond.pyson import Eval
-import luhn
+from . import luhn
 
 
 class Address(Model):
     _name = 'party.address'
 
-    siret_nic = fields.Char('SIRET NIC', select=1, states={
+    siret_nic = fields.Char('SIRET NIC', select=True, states={
             'readonly': ~Eval('active', True),
             }, size=5, depends=['active'])
     siret = fields.Function(fields.Char('SIRET'), 'get_siret')
@@ -36,8 +36,9 @@ class Address(Model):
         Check validity of SIRET
         '''
         for address in self.browse(ids):
-            if address.siret and not luhn.validate(address.siret):
-                return False
+            if address.siret:
+                if len(address.siret) != 14 or not luhn.validate(address.siret):
+                    return False
         return True
 
 Address()
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index be07322..abb6b9e 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,22 +2,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
 msgstr "Грешен SIRET номер!"
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
 msgstr "Грешен SIREN номер!"
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr "SIRET"
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr "SIRET NIC"
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr "SIREN"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..eb18b63
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:"
+msgid "Invalid SIRET number!"
+msgstr "El nombre SIRET no és vàlid"
+
+msgctxt "error:party.party:"
+msgid "Invalid SIREN number!"
+msgstr "El nombre SIREN no és vàlid"
+
+msgctxt "field:party.address,siret:"
+msgid "SIRET"
+msgstr "SIRET"
+
+msgctxt "field:party.address,siret_nic:"
+msgid "SIRET NIC"
+msgstr "SIRET NIC"
+
+msgctxt "field:party.party,siren:"
+msgid "SIREN"
+msgstr "SIREN"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index c5d0d0c..be49b86 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,22 +2,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
 msgstr ""
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
 msgstr ""
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr ""
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr ""
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 4a3b893..55aa592 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,22 +2,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
 msgstr "Ungültige SIRET-Nummer!"
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
 msgstr "Ungültige SIREN-Nummer!"
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr "SIRET"
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr "SIRET NIC"
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr "SIREN"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..591bb3d
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:"
+msgid "Invalid SIRET number!"
+msgstr "¡El número SIRET no es válido!"
+
+msgctxt "error:party.party:"
+msgid "Invalid SIREN number!"
+msgstr "¡El número SIREN no es válido!"
+
+msgctxt "field:party.address,siret:"
+msgid "SIRET"
+msgstr "SIRET"
+
+msgctxt "field:party.address,siret_nic:"
+msgid "SIRET NIC"
+msgstr "SIRET NIC"
+
+msgctxt "field:party.party,siren:"
+msgid "SIREN"
+msgstr "SIREN"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 8dcfd0c..04163d2 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,22 +2,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
 msgstr "Número SIRET inválido!"
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
 msgstr "Número SIREN inválido!"
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr ""
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr ""
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr ""
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 69ef6af..95a271d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,22 +2,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
-msgstr "El número SIRET no es válido"
+msgstr "El número SIRET no es válido."
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
-msgstr "El número SIREN no es válido"
+msgstr "El número SIREN no es válido."
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr "SIRET"
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr "SIRET NIC"
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr "SIREN"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 86de679..f41a5aa 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
 msgstr "Numéro SIRET non valide !"
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.address:"
+msgid "Invalid SIRET number!"
+msgstr "Numéro SIRET non valide !"
+
+msgctxt "error:party.party:"
+msgid "Invalid SIREN number!"
+msgstr "Numéro SIREN non valide !"
+
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
 msgstr "Numéro SIREN non valide !"
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr "SIRET"
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr "SIRET NIC"
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr "SIREN"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index c5d0d0c..be49b86 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,22 +2,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
 msgstr ""
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
 msgstr ""
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr ""
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr ""
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index c5d0d0c..be49b86 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,22 +2,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:party.address:0"
+msgctxt "error:party.address:"
 msgid "Invalid SIRET number!"
 msgstr ""
 
-msgctxt "error:party.party:0"
+msgctxt "error:party.party:"
 msgid "Invalid SIREN number!"
 msgstr ""
 
-msgctxt "field:party.address,siret:0"
+msgctxt "field:party.address,siret:"
 msgid "SIRET"
 msgstr ""
 
-msgctxt "field:party.address,siret_nic:0"
+msgctxt "field:party.address,siret_nic:"
 msgid "SIRET NIC"
 msgstr ""
 
-msgctxt "field:party.party,siren:0"
+msgctxt "field:party.party,siren:"
 msgid "SIREN"
 msgstr ""
diff --git a/luhn.py b/luhn.py
index f2ab11f..47fa362 100644
--- a/luhn.py
+++ b/luhn.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.
 
+
 def validate(value):
     """
     Validate value with Luhn algorithm
diff --git a/party.py b/party.py
index d9a34e6..7a4eaa8 100644
--- a/party.py
+++ b/party.py
@@ -2,13 +2,13 @@
 #this repository contains the full copyright notices and license terms.
 from trytond.model import Model, fields
 from trytond.pyson import Eval
-import luhn
+from . import luhn
 
 
 class Party(Model):
     _name = 'party.party'
 
-    siren = fields.Char('SIREN', select=1, states={
+    siren = fields.Char('SIREN', select=True, states={
             'readonly': ~Eval('active', True),
             }, size=9, depends=['active'])
 
@@ -26,8 +26,10 @@ class Party(Model):
         Check validity of SIREN
         '''
         for party in self.browse(ids):
-            if party.siren and not luhn.validate(party.siren):
-                return False
+            if party.siren:
+                if len(party.siren) != 9 or not luhn.validate(party.siren):
+                    return False
+            print party.addresses
         return True
 
 Party()
diff --git a/setup.py b/setup.py
index ad08ce5..317e48e 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
 
 requires = []
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
                 (dep, major_version, minor_version, major_version,
                     minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index a42d4f9..420b981 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from test_party_siret import suite
+from .test_party_siret import suite
diff --git a/tests/test_party_siret.py b/tests/test_party_siret.py
index d4685d7..ffb086b 100644
--- a/tests/test_party_siret.py
+++ b/tests/test_party_siret.py
@@ -2,7 +2,8 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-import sys, os
+import sys
+import os
 DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
     '..', '..', '..', '..', '..', 'trytond')))
 if os.path.isdir(DIR):
diff --git a/trytond_party_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 0619d59..60c2dcf 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-party-siret
-Version: 2.2.0
+Version: 2.4.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,7 +12,7 @@ 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_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index 9cbbabe..28fb22d 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -15,8 +15,10 @@ setup.py
 ./tests/__init__.py
 ./tests/test_party_siret.py
 locale/bg_BG.po
+locale/ca_ES.po
 locale/cs_CZ.po
 locale/de_DE.po
+locale/es_AR.po
 locale/es_CO.po
 locale/es_ES.po
 locale/fr_FR.po
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index fdfb37d..bc115a3 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_party >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_party >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 0d69f6181d8e70686915b93cabe3eacc70789532
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 bb1fdbf..7bbc9fb 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) 2010-2011Cedric Krier
commit ed22b78a7eb2aa870c12302bf8e256445bed1c97
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 0a4cdd8..bb1fdbf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,9 @@ Copyright:
 License: GPL-3+
 
 Files: debian/*
-Copyright: (C) 2010-2012 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2010-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
commit f353e09f09d81ab34a738e53ebb8c9c8a4403cda
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 6b29cb4..0a4cdd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright:
 License: GPL-3+
 
 Files: debian/*
-Copyright: (C) 2010-2011 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2010-2012 Daniel Baumann <daniel at debian.org>
 License: GPL-3+
 
 License: GPL-3+
commit 2793d8f78e5f4acf5baf2278d650842ecd359b59
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Feb 24 13:47:01 2012 +0100

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

diff --git a/debian/control b/debian/control
index ae24627..b8c6cf4 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-siret.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
commit 9d20eec25f16925c768675ba446f68ce7e6b0119
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 26 18:09:34 2011 +0100

    Releasing debian version 2.2.0-1.

diff --git a/debian/changelog b/debian/changelog
index beb2235..64b0477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-party-siret (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:25 +0100
+
 tryton-modules-party-siret (2.0.0-2) unstable; urgency=low
 
   [ Daniel Baumann ]
commit 30de43f84cf66101c84e64b2dc8ecbcb9a8987f7
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 36af8df..ae24627 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-siret.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
 
 Package: tryton-modules-party-siret
 Architecture: all
commit 17592068a67cd795b30f3aeec9a5453458bfa1f9
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 ef6ff12..36af8df 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.5
 Package: tryton-modules-party-siret
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- tryton-modules-party (>= 2.0), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ tryton-modules-party (>= 2.2), python-pkg-resources
 Description: Tryton Application Platform (Party SIRET/SIREN 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 386fccbe3b67fcebc46757e038503a61183caf81
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 31 16:20:58 2011 +0100

    Merging upstream version 2.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index 6fb2f4e..235fcce 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 317a700..c07078d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_party_siret
-Version: 2.0.0
+Version: 2.2.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,23 +12,26 @@ 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 446f3f7..37c3ed0 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
     'name_es_CO' : 'Terceros - SIRET',
     'name_es_ES': 'Terceros - SIRET',
     'name_fr_FR': 'Tiers - Siret',
-    'version' : '2.0.0',
+    'version' : '2.2.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -63,10 +63,13 @@ Ajoute les champs numéro SIRET/SIREN sur les tiers.
         'address.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/address.py b/address.py
index e7e69c8..3200bc1 100644
--- a/address.py
+++ b/address.py
@@ -1,7 +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 trytond.model import Model, fields
-from trytond.pyson import Not, Bool, Eval
+from trytond.pyson import Eval
 import luhn
 
 
@@ -9,8 +9,8 @@ class Address(Model):
     _name = 'party.address'
 
     siret_nic = fields.Char('SIRET NIC', select=1, states={
-        'readonly': Not(Bool(Eval('active'))),
-        }, size=5)
+            'readonly': ~Eval('active', True),
+            }, size=5, depends=['active'])
     siret = fields.Function(fields.Char('SIRET'), 'get_siret')
 
     def __init__(self):
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index df4ea4b..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.address,0,Invalid SIRET number!,Грешен SIRET номер!,0
-error,party.party,0,Invalid SIREN number!,Грешен SIREN номер!,0
-field,"party.address,siret",0,SIRET,SIRET,0
-field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
-field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 92f661f..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.address,0,Invalid SIRET number!,Ungültige SIRET-Nummer!,0
-error,party.party,0,Invalid SIREN number!,Ungültige SIREN-Nummer!,0
-field,"party.address,siret",0,SIRET,SIRET,0
-field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
-field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 3dd2eca..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.address,0,Invalid SIRET number!,Número SIRET inválido!,0
-error,party.party,0,Invalid SIREN number!,Número SIREN inválido!,0
-field,"party.address,siret",0,SIRET,,0
-field,"party.address,siret_nic",0,SIRET NIC,,0
-field,"party.party,siren",0,SIREN,,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 6b3daf4..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.address,0,Invalid SIRET number!,El número SIRET no es válido,0
-error,party.party,0,Invalid SIREN number!,El número SIREN no es válido,0
-field,"party.address,siret",0,SIRET,SIRET,0
-field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
-field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index ead3b51..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,party.address,0,Invalid SIRET number!,Numéro SIRET non valide !,0
-error,party.party,0,Invalid SIREN number!,Numéro SIREN non valide !,0
-field,"party.address,siret",0,SIRET,SIRET,0
-field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
-field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..be07322
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr "Грешен SIRET номер!"
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr "Грешен SIREN номер!"
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr "SIRET"
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr "SIRET NIC"
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr "SIREN"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..c5d0d0c
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr ""
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr ""
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr ""
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr ""
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..4a3b893
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr "Ungültige SIRET-Nummer!"
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr "Ungültige SIREN-Nummer!"
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr "SIRET"
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr "SIRET NIC"
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr "SIREN"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..8dcfd0c
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr "Número SIRET inválido!"
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr "Número SIREN inválido!"
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr ""
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr ""
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr ""
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..69ef6af
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr "El número SIRET no es válido"
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr "El número SIREN no es válido"
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr "SIRET"
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr "SIRET NIC"
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr "SIREN"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..86de679
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr "Numéro SIRET non valide !"
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr "Numéro SIREN non valide !"
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr "SIRET"
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr "SIRET NIC"
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr "SIREN"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..c5d0d0c
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr ""
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr ""
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr ""
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr ""
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..c5d0d0c
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,23 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:0"
+msgid "Invalid SIRET number!"
+msgstr ""
+
+msgctxt "error:party.party:0"
+msgid "Invalid SIREN number!"
+msgstr ""
+
+msgctxt "field:party.address,siret:0"
+msgid "SIRET"
+msgstr ""
+
+msgctxt "field:party.address,siret_nic:0"
+msgid "SIRET NIC"
+msgstr ""
+
+msgctxt "field:party.party,siren:0"
+msgid "SIREN"
+msgstr ""
diff --git a/party.py b/party.py
index b9fd5ff..d9a34e6 100644
--- a/party.py
+++ b/party.py
@@ -1,7 +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 trytond.model import Model, fields
-from trytond.pyson import Not, Bool, Eval
+from trytond.pyson import Eval
 import luhn
 
 
@@ -9,8 +9,8 @@ class Party(Model):
     _name = 'party.party'
 
     siren = fields.Char('SIREN', select=1, states={
-        'readonly': Not(Bool(Eval('active'))),
-        }, size=9)
+            'readonly': ~Eval('active', True),
+            }, size=9, depends=['active'])
 
     def __init__(self):
         super(Party, self).__init__()
diff --git a/party.xml b/party.xml
index d473063..1123e6c 100644
--- a/party.xml
+++ b/party.xml
@@ -12,7 +12,7 @@ this repository contains the full copyright notices and license terms. -->
                     <xpath
                         expr="/tree/field[@name="vat_code"]"
                         position="after">
-                        <field name="siren" select="2"/>
+                        <field name="siren"/>
                     </xpath>
                 </data>
                 ]]>
diff --git a/setup.py b/setup.py
index fd49203..ad08ce5 100644
--- a/setup.py
+++ b/setup.py
@@ -39,18 +39,21 @@ setup(name='trytond_party_siret',
     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',
diff --git a/tests/test_party_siret.py b/tests/test_party_siret.py
index a9cf340..d4685d7 100644
--- a/tests/test_party_siret.py
+++ b/tests/test_party_siret.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
 
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
 from trytond.modules.party_siret import luhn
 
 
@@ -28,6 +28,12 @@ class PartySiretTestCase(unittest.TestCase):
         '''
         test_view('party_siret')
 
+    def test0006depends(self):
+        '''
+        Test depends.
+        '''
+        test_depends()
+
     def test0010luhn(self):
         '''
         Test luhn.
diff --git a/trytond_party_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 2718af5..0619d59 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-party-siret
-Version: 2.0.0
+Version: 2.2.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,23 +12,26 @@ 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_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index 6577fee..9cbbabe 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -5,11 +5,6 @@ LICENSE
 MANIFEST.in
 README
 address.xml
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
 party.xml
 setup.py
 ./__init__.py
@@ -19,6 +14,14 @@ setup.py
 ./party.py
 ./tests/__init__.py
 ./tests/test_party_siret.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
 trytond_party_siret.egg-info/PKG-INFO
 trytond_party_siret.egg-info/SOURCES.txt
 trytond_party_siret.egg-info/dependency_links.txt
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index 8605932..fdfb37d 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-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
commit 0b61c08637573162d7f77c8f0180941cfd9c465f
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 9da362f..ef6ff12 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: all
 Depends:
  ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
  tryton-modules-party (>= 2.0), python-pkg-resources
-XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Party SIRET/SIREN 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 489162c8bcf1ae2c74ae9c1969d7d73f3566af2c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 14 01:19:25 2011 +0200

    Releasing debian version 2.0.0-2.

diff --git a/debian/changelog b/debian/changelog
index 09b9f97..beb2235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-party-siret (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:20 +0200
+
 tryton-modules-party-siret (2.0.0-1) unstable; urgency=low
 
   * Updating to standards version 3.9.2.
commit d61e3a1fbf30a1bb1c501d7af3eaf53d30a04eb0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 13 20:28:23 2011 +0200

    Moving from deprecated python-support to dh_python2.

diff --git a/debian/control b/debian/control
index 9b452b3..9da362f 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-siret.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
+X-Python-Version: >= 2.5
 
 Package: tryton-modules-party-siret
 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/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 b00251b54197ed66e5fb2c7545daefa4b2b7f4b1
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 ad32c26..9b452b3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-party-siret
 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 9fe38e72aa2827e1b45d17f8e38c5258f2354d74
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 a67f506..6b29cb4 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) 2010-2011Cedric Krier
  (C) 2010-2011Bertrand Chenal
  (C) 2010-2011B2CK SPRL
 License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: debian/*
 Copyright: (C) 2010-2011 Daniel Baumann <daniel at debian.org>
 License: GPL-3+
+
+License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
@@ -41,5 +23,5 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-3 file.
commit 5ab0fea7a5aa7cd8245c929b9ef28cc2a4b8e71b
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 b580159bc7b7d051f4bf5d4e738cd10e95c367a3
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 c551ca7af8f8d3209ec3ae6eabbc6331f89114ec
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 e664617..09b9f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-party-siret (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:47 +0200
+
 tryton-modules-party-siret (1.8.0-2) unstable; urgency=low
 
   * Changing my email address.
commit 97e40049e4f404346cd87d1133ee64e3358a3ba0
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 0d5ff10..ad32c26 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.
 Package: tryton-modules-party-siret
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
- tryton-modules-party (>= 1.8), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ tryton-modules-party (>= 2.0), python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Party SIRET/SIREN Module)
  Tryton is a high-level general purpose application platform written in Python
commit d45cd8b47d590c657ad798c9e57e42026c721fef
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 37d9b18..a67f506 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
 
 Files: *
 Copyright:
- (C) 2010 Cedric Krier
- (C) 2010 Bertrand Chenal
- (C) 2010 B2CK SPRL
+ (C) 2010-2011Cedric Krier
+ (C) 2010-2011Bertrand Chenal
+ (C) 2010-2011B2CK 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 0b130a14cdbd10a825369bab53c7e87606a40cba
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue May 24 19:12:51 2011 +0200

    Merging upstream version 2.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index b0edc74..6fb2f4e 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 0982dbc..b088e8e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2010 Cédric Krier.
-Copyright (C) 2010 Bertrand Chenal.
-Copyright (C) 2010 B2CK SPRL.
+Copyright (C) 2010-2011 Cédric Krier.
+Copyright (C) 2010-2011 Bertrand Chenal.
+Copyright (C) 2010-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 38a1c77..317a700 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_party_siret
-Version: 1.8.0
+Version: 2.0.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,7 +12,7 @@ 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
@@ -22,10 +22,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 3222f91..446f3f7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,12 @@
 #this repository contains the full copyright notices and license terms.
 {
     'name' : 'Party - Siret',
+    'name_bg_BG' : 'Партньор - SIRET',
     'name_de_DE' : 'Parteien - SIRET',
     'name_es_CO' : 'Terceros - SIRET',
     'name_es_ES': 'Terceros - SIRET',
     'name_fr_FR': 'Tiers - Siret',
-    'version' : '1.8.0',
+    'version' : '2.0.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -18,6 +19,13 @@ Add SIRET/SIREN number fields on party.
     - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
     - SIRET (Systeme d'Identification du Repertoire des ETablissements)
 ''',
+    'description_bg_BG' : '''
+Добавя SIRET/SIREN полета към партньор.
+    SIRET/SIREN са френски еквивалент на БУЛСТАТ и служат географско
+    идентифициране на фирма:
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
     'description_de_DE' : '''
 Fügt ein Feld für die SIRET/SIREN-Nummer bei Parteien hinzu.
     Diese Nummern dienen in Frankreich der Identifikation und geographischen
@@ -55,6 +63,7 @@ Ajoute les champs numéro SIRET/SIREN sur les tiers.
         'address.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..df4ea4b
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+error,party.address,0,Invalid SIRET number!,Грешен SIRET номер!,0
+error,party.party,0,Invalid SIREN number!,Грешен SIREN номер!,0
+field,"party.address,siret",0,SIRET,SIRET,0
+field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
+field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/party.xml b/party.xml
index 0b4e474..d473063 100644
--- a/party.xml
+++ b/party.xml
@@ -25,7 +25,7 @@ this repository contains the full copyright notices and license terms. -->
                 <![CDATA[
                 <data>
                     <xpath
-                        expr="/form/field[@name="active"]"
+                        expr="/form/group[@id="checkboxes"]"
                         position="after">
                         <label name="siren"/>
                         <field name="siren"/>
diff --git a/setup.py b/setup.py
index 81af77d..fd49203 100644
--- a/setup.py
+++ b/setup.py
@@ -44,12 +44,15 @@ setup(name='trytond_party_siret',
         '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_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index f745349..2718af5 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-party-siret
-Version: 1.8.0
+Version: 2.0.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,7 +12,7 @@ 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
@@ -22,10 +22,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_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index 2973ec9..6577fee 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
 MANIFEST.in
 README
 address.xml
+bg_BG.csv
 de_DE.csv
 es_CO.csv
 es_ES.csv
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index c6b61af..8605932 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-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 00501baca20ca106d2f272de76b285f655e48ea5
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 ae633e1..0d5ff10 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-siret.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
commit f5476ad9f16a0b734f20d3090609fec79cbba9b7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 15 13:11:31 2011 +0100

    Releasing debian version 1.8.0-2.

diff --git a/debian/changelog b/debian/changelog
index 3a7e01d..e664617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-siret (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:18 +0100
+
 tryton-modules-party-siret (1.8.0-1) experimental; urgency=low
 
   * Updating standards version to 3.9.0.
commit a415b8240ae941a7c15843fca8ee8a2effed8d0f
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 4ee008c..37d9b18 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ License: GPL-3+
  can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: debian/*
-Copyright: (C) 2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2010-2011 Daniel Baumann <daniel at debian.org>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
commit c707f72e78b378381d076ec0c5ac247d8b6864e8
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 1b7747d8ff64bcb7ca5caedc266d0d7298ab1708
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 2d030d0..ae633e1 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 0fcf8fe120e261af009167890cb06ed5816adad3
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Nov 12 13:05:06 2010 +0100

    Releasing debian version 1.8.0-1.

diff --git a/debian/changelog b/debian/changelog
index 16eb84f..3a7e01d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-party-siret (1.8.0-1) experimental; urgency=low
+
+  * Updating standards version to 3.9.0.
+  * Updating to debhelper version 8.
+  * Updating to standards version 3.9.1.
+  * Switching to source format 3.0 (quilt).
+  * Merging upstream version 1.8.0.
+  * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org>  Fri, 12 Nov 2010 13:05:03 +0100
+
 tryton-modules-party-siret (1.6.0-1) unstable; urgency=low
 
   [ Daniel Baumann ]
commit 89f815d1b32f89864f429a0a1d36aa29015d9e1d
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 19082fc..2d030d0 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.
 Package: tryton-modules-party-siret
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-party (>= 1.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ tryton-modules-party (>= 1.8), python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Party SIRET/SIREN Module)
  Tryton is a high-level general purpose application platform written in Python
commit e2abcb905126d21c4cac9bcfc2c02510d1401bb7
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Nov 4 20:13:24 2010 +0100

    Merging upstream version 1.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index 51442dd..b0edc74 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/INSTALL b/INSTALL
index 5c8b982..0092492 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_party_siret
 Prerequisites
 -------------
 
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_party (http://www.tryton.org/)
 
diff --git a/PKG-INFO b/PKG-INFO
index f44d8d1..38a1c77 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_party_siret
-Version: 1.6.0
+Version: 1.8.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,7 +12,7 @@ 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 d649ee7..3222f91 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO' : 'Terceros - SIRET',
     'name_es_ES': 'Terceros - SIRET',
     'name_fr_FR': 'Tiers - Siret',
-    'version' : '1.6.0',
+    'version' : '1.8.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/address.py b/address.py
index 5e2021d..e7e69c8 100644
--- a/address.py
+++ b/address.py
@@ -22,20 +22,20 @@ class Address(Model):
             'invalid_siret': 'Invalid SIRET number!',
         })
 
-    def get_siret(self, cursor, user, ids, name, context=None):
+    def get_siret(self, ids, name):
         res = {}
-        for address in self.browse(cursor, user, ids, context=context):
+        for address in self.browse(ids):
             if address.party.siren and address.siret_nic:
                 res[address.id] = address.party.siren + address.siret_nic
             else:
                 res[address.id] = ''
         return res
 
-    def check_siret(self, cursor, user, ids):
+    def check_siret(self, ids):
         '''
         Check validity of SIRET
         '''
-        for address in self.browse(cursor, user, ids):
+        for address in self.browse(ids):
             if address.siret and not luhn.validate(address.siret):
                 return False
         return True
diff --git a/party.py b/party.py
index ee8cf0f..b9fd5ff 100644
--- a/party.py
+++ b/party.py
@@ -21,11 +21,11 @@ class Party(Model):
             'invalid_siren': 'Invalid SIREN number!',
         })
 
-    def check_siren(self, cursor, user, ids):
+    def check_siren(self, ids):
         '''
         Check validity of SIREN
         '''
-        for party in self.browse(cursor, user, ids):
+        for party in self.browse(ids):
             if party.siren and not luhn.validate(party.siren):
                 return False
         return True
diff --git a/tests/test_party_siret.py b/tests/test_party_siret.py
index 7b4952b..a9cf340 100644
--- a/tests/test_party_siret.py
+++ b/tests/test_party_siret.py
@@ -26,7 +26,7 @@ class PartySiretTestCase(unittest.TestCase):
         '''
         Test views.
         '''
-        self.assertRaises(Exception, test_view('party_siret'))
+        test_view('party_siret')
 
     def test0010luhn(self):
         '''
diff --git a/trytond_party_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 01dd9a5..f745349 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-party-siret
-Version: 1.6.0
+Version: 1.8.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
@@ -12,7 +12,7 @@ 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_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index 54dc4b7..c6b61af 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-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
commit 83847723b97456fe462cf7cc4af45652f9fbdb5d
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 2 14:26:58 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 5708746ef8c8a077e3902f88fe0f5b07a7a9de34
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 a6b0e82..19082fc 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-siret.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
commit a55c41715ff711e299d7766146dc74f3c370a45c
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 74c5e74..a6b0e82 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-siret.git
commit fe2584f9b36f7359c798bf17bd521e9507de255d
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 17c1897..74c5e74 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-siret.git
 Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
commit f166bae170e92b9a6f45d69354e5c2615167d5fd
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Wed May 12 13:40:13 2010 +0200

    Releasing debian version 1.6.0-1.

diff --git a/debian/changelog b/debian/changelog
index 6c41a11..16eb84f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-party-siret (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 depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>  Wed, 12 May 2010 13:39:43 +0200
+
 tryton-modules-party-siret (1.4.0-1) unstable; urgency=low
 
   * Initial release.
commit 071a6c722e4d633f463bbce00a8f5b4d228d0344
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Wed May 12 13:39:25 2010 +0200

    Updating depends.

diff --git a/debian/control b/debian/control
index 2e70d63..17c1897 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.
 Package: tryton-modules-party-siret
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-party (>= 1.4), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ tryton-modules-party (>= 1.6), python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: Tryton Application Platform (Party SIRET/SIREN Module)
  Tryton is a high-level general purpose application platform written in Python
commit de47935a7e5c2dd85b04e5ca1e89bb64a97f1da0
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Wed May 12 13:35:49 2010 +0200

    Merging upstream version 1.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 0d1d17e..51442dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.6.0 - 2010-05-11
+* Bug fixes (see mercurial logs for details)
+
 Version 1.4.0 - 2010-03-11
 * Initial release
diff --git a/MANIFEST.in b/MANIFEST.in
index 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 a50e894..f44d8d1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,18 +1,18 @@
 Metadata-Version: 1.0
 Name: trytond_party_siret
-Version: 1.4.0
+Version: 1.6.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
     enterprises:
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
+    - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
+    - SIRET (Systeme d'Identification du Repertoire des ETablissements)
 
 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 04ed5c5..d649ee7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO' : 'Terceros - SIRET',
     'name_es_ES': 'Terceros - SIRET',
     'name_fr_FR': 'Tiers - Siret',
-    'version' : '1.4.0',
+    'version' : '1.6.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -15,8 +15,8 @@
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
     enterprises:
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
+    - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
+    - SIRET (Systeme d'Identification du Repertoire des ETablissements)
 ''',
     'description_de_DE' : '''
 Fügt ein Feld für die SIRET/SIREN-Nummer bei Parteien hinzu.
diff --git a/address.py b/address.py
index 75a0464..5e2021d 100644
--- a/address.py
+++ b/address.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 trytond.model import Model, fields
+from trytond.pyson import Not, Bool, Eval
 import luhn
 
 
@@ -8,9 +9,9 @@ class Address(Model):
     _name = 'party.address'
 
     siret_nic = fields.Char('SIRET NIC', select=1, states={
-        'readonly': "active == False",
+        'readonly': Not(Bool(Eval('active'))),
         }, size=5)
-    siret = fields.Function('get_siret', type='char', string='SIRET')
+    siret = fields.Function(fields.Char('SIRET'), 'get_siret')
 
     def __init__(self):
         super(Address, self).__init__()
@@ -21,7 +22,7 @@ class Address(Model):
             'invalid_siret': 'Invalid SIRET number!',
         })
 
-    def get_siret(self, cursor, user, ids, name, arg, context=None):
+    def get_siret(self, cursor, user, ids, name, context=None):
         res = {}
         for address in self.browse(cursor, user, ids, context=context):
             if address.party.siren and address.siret_nic:
diff --git a/party.py b/party.py
index 8037101..ee8cf0f 100644
--- a/party.py
+++ b/party.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 trytond.model import Model, fields
+from trytond.pyson import Not, Bool, Eval
 import luhn
 
 
@@ -8,7 +9,7 @@ class Party(Model):
     _name = 'party.party'
 
     siren = fields.Char('SIREN', select=1, states={
-        'readonly': "active == False",
+        'readonly': Not(Bool(Eval('active'))),
         }, size=9)
 
     def __init__(self):
diff --git a/setup.py b/setup.py
index be65c2f..81af77d 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,7 @@ setup(name='trytond_party_siret',
     package_dir={'trytond.modules.party_siret': '.'},
     packages=[
         'trytond.modules.party_siret',
+        'trytond.modules.party_siret.tests',
     ],
     package_data={
         'trytond.modules.party_siret': info.get('xml', []) \
@@ -58,4 +59,6 @@ setup(name='trytond_party_siret',
     [trytond.modules]
     party_siret = trytond.modules.party_siret
     """,
+    test_suite='tests',
+    test_loader='trytond.test_loader:Loader',
 )
diff --git a/tests/__init__.py b/tests/__init__.py
index 216af80..a42d4f9 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from test_party_siret import *
+from test_party_siret import suite
diff --git a/tests/test_party_siret.py b/tests/test_party_siret.py
index 9f7d4d0..7b4952b 100644
--- a/tests/test_party_siret.py
+++ b/tests/test_party_siret.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
 
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
 from trytond.modules.party_siret import luhn
 
 
@@ -58,11 +58,10 @@ class PartySiretTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(PartySiretTestCase)
+    suite = trytond.tests.test_tryton.suite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+        PartySiretTestCase))
+    return suite
 
 if __name__ == '__main__':
-    suiteTrytond = trytond.tests.test_tryton.suite()
-    suitePartySiret = suite()
-    alltests = unittest.TestSuite([suiteTrytond, suitePartySiret])
-    unittest.TextTestRunner(verbosity=2).run(alltests)
-    SOCK.disconnect()
+    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_party_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 49a114b..01dd9a5 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,18 +1,18 @@
 Metadata-Version: 1.0
 Name: trytond-party-siret
-Version: 1.4.0
+Version: 1.6.0
 Summary: 
 Add SIRET/SIREN number fields on party.
     These numbers are used in France, for geographical identification of
     enterprises:
-    - SIREN (Système d’Identification du Répertoire des ENtreprises)
-    - SIRET (Système d’Identification du Répertoire des ETablissements)
+    - SIREN (Systeme d'Identification du Repertoire des ENtreprises)
+    - SIRET (Systeme d'Identification du Repertoire des ETablissements)
 
 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_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index d413971..2973ec9 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -16,8 +16,8 @@ setup.py
 ./address.py
 ./luhn.py
 ./party.py
-tests/__init__.py
-tests/test_party_siret.py
+./tests/__init__.py
+./tests/test_party_siret.py
 trytond_party_siret.egg-info/PKG-INFO
 trytond_party_siret.egg-info/SOURCES.txt
 trytond_party_siret.egg-info/dependency_links.txt
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index e06aa0c..54dc4b7 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_party >= 1.4, < 1.5
-trytond >= 1.4, < 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
commit aedf531fad8653294491f069991cd3e705d00d66
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 a872813..2e70d63 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 993623b9aff6505564ea2316975e2ba458f1f610
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 14 13:48:51 2010 +0100

    Adding debian version 1.4.0-1.

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..0d1d17e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2010-03-11
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..0982dbc
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2010 Cédric Krier.
+Copyright (C) 2010 Bertrand Chenal.
+Copyright (C) 2010 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..5c8b982
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,30 @@
+Installing trytond_party_siret
+==============================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_party (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_party_siret 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_siret.
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..a50e894
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,31 @@
+Metadata-Version: 1.0
+Name: trytond_party_siret
+Version: 1.4.0
+Summary: 
+Add SIRET/SIREN number fields on party.
+    These numbers are used in France, for geographical identification of
+    enterprises:
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+
+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..c54e018
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_party_siret
+===================
+
+The party_siret 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..52ae9d5
--- /dev/null
+++ b/__init__.py
@@ -0,0 +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.
+
+from party import *
+from address import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..04ed5c5
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,63 @@
+# -*- 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 - Siret',
+    'name_de_DE' : 'Parteien - SIRET',
+    'name_es_CO' : 'Terceros - SIRET',
+    'name_es_ES': 'Terceros - SIRET',
+    'name_fr_FR': 'Tiers - Siret',
+    'version' : '1.4.0',
+    'author' : 'B2CK',
+    'email': 'info at b2ck.com',
+    'website': 'http://www.tryton.org/',
+    'description': '''
+Add SIRET/SIREN number fields on party.
+    These numbers are used in France, for geographical identification of
+    enterprises:
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
+    'description_de_DE' : '''
+Fügt ein Feld für die SIRET/SIREN-Nummer bei Parteien hinzu.
+    Diese Nummern dienen in Frankreich der Identifikation und geographischen
+    Zuordnung von Unternehmen:
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
+    'description_es_CO' : '''
+Añade campos para los números SIRET/SIREN en Terceros.
+    Estos números son utilizados en Francia, para la identificación de
+    empresas (SIREN) así como su ubicación geográfica (SIRET).
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
+    'description_es_ES' : '''
+Añade campos para los números SIRET/SIREN en Terceros.
+    Estos números son utilizados en Francia, para la identificación de
+    empresas (SIREN) así como su ubicación geográfica (SIRET).
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
+    'description_fr_FR': '''
+Ajoute les champs numéro SIRET/SIREN sur les tiers.
+    Ces numéros sont utilisés en France, pour l'identification géographique des
+    entreprises :
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+''',
+    'depends' : [
+        'ir',
+        'party',
+    ],
+    'xml' : [
+        'party.xml',
+        'address.xml',
+    ],
+    'translation': [
+        'de_DE.csv',
+        'es_CO.csv',
+        'es_ES.csv',
+        'fr_FR.csv',
+    ],
+}
diff --git a/address.py b/address.py
new file mode 100644
index 0000000..75a0464
--- /dev/null
+++ b/address.py
@@ -0,0 +1,42 @@
+#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 Model, fields
+import luhn
+
+
+class Address(Model):
+    _name = 'party.address'
+
+    siret_nic = fields.Char('SIRET NIC', select=1, states={
+        'readonly': "active == False",
+        }, size=5)
+    siret = fields.Function('get_siret', type='char', string='SIRET')
+
+    def __init__(self):
+        super(Address, self).__init__()
+        self._constraints += [
+            ('check_siret', 'invalid_siret'),
+        ]
+        self._error_messages.update({
+            'invalid_siret': 'Invalid SIRET number!',
+        })
+
+    def get_siret(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for address in self.browse(cursor, user, ids, context=context):
+            if address.party.siren and address.siret_nic:
+                res[address.id] = address.party.siren + address.siret_nic
+            else:
+                res[address.id] = ''
+        return res
+
+    def check_siret(self, cursor, user, ids):
+        '''
+        Check validity of SIRET
+        '''
+        for address in self.browse(cursor, user, ids):
+            if address.siret and not luhn.validate(address.siret):
+                return False
+        return True
+
+Address()
diff --git a/address.xml b/address.xml
new file mode 100644
index 0000000..a23bec5
--- /dev/null
+++ b/address.xml
@@ -0,0 +1,41 @@
+<?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.ui.view" id="address_view_tree">
+            <field name="model">party.address</field>
+            <field name="inherit" ref="party.address_view_tree"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <data>
+                    <xpath
+                        expr="/tree/field[@name="subdivision"]"
+                        position="after">
+                        <field name="siret"/>
+                    </xpath>
+                </data>
+                ]]>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="address_view_form">
+            <field name="model">party.address</field>
+            <field name="inherit" ref="party.address_view_form"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <data>
+                    <xpath
+                        expr="/form/field[@name="subdivision"]"
+                        position="after">
+                        <newline/>
+                        <label name="siret"/>
+                        <field name="siret"/>
+                        <label name="siret_nic"/>
+                        <field name="siret_nic"/>
+                    </xpath>
+                </data>
+                ]]>
+            </field>
+        </record>
+    </data>
+</tryton>
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..92f661f
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+error,party.address,0,Invalid SIRET number!,Ungültige SIRET-Nummer!,0
+error,party.party,0,Invalid SIREN number!,Ungültige SIREN-Nummer!,0
+field,"party.address,siret",0,SIRET,SIRET,0
+field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
+field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..18b6b24
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+  $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+  $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+  $ QUILT_PATCHES=debian/patches quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..6c41a11
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-party-siret (1.4.0-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org>  Sun, 14 Mar 2010 13:49:47 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..a872813
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,31 @@
+Source: tryton-modules-party-siret
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
+Standards-Version: 3.8.4
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-party-siret.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-siret.git
+
+Package: tryton-modules-party-siret
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ tryton-modules-party (>= 1.4), python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Party SIRET/SIREN 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 SIRET/SIREN number fields on party.
+ .
+ These numbers are used in France, for geographical identification of
+ enterprises:
+ .
+  * SIREN (Système d’Identification du Répertoire des ENtreprises)
+  * SIRET (Système d’Identification du Répertoire des ETablissements)
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..4ee008c
--- /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) 2010 Cedric Krier
+ (C) 2010 Bertrand Chenal
+ (C) 2010 B2CK SPRL
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2010 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..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/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..3dd2eca
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+error,party.address,0,Invalid SIRET number!,Número SIRET inválido!,0
+error,party.party,0,Invalid SIREN number!,Número SIREN inválido!,0
+field,"party.address,siret",0,SIRET,,0
+field,"party.address,siret_nic",0,SIRET NIC,,0
+field,"party.party,siren",0,SIREN,,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..6b3daf4
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+error,party.address,0,Invalid SIRET number!,El número SIRET no es válido,0
+error,party.party,0,Invalid SIREN number!,El número SIREN no es válido,0
+field,"party.address,siret",0,SIRET,SIRET,0
+field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
+field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..ead3b51
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+error,party.address,0,Invalid SIRET number!,Numéro SIRET non valide !,0
+error,party.party,0,Invalid SIREN number!,Numéro SIREN non valide !,0
+field,"party.address,siret",0,SIRET,SIRET,0
+field,"party.address,siret_nic",0,SIRET NIC,SIRET NIC,0
+field,"party.party,siren",0,SIREN,SIREN,0
diff --git a/luhn.py b/luhn.py
new file mode 100644
index 0000000..f2ab11f
--- /dev/null
+++ b/luhn.py
@@ -0,0 +1,17 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+def validate(value):
+    """
+    Validate value with Luhn algorithm
+    :param value: the value
+    :return: a boolean
+    """
+    if not isinstance(value, basestring):
+        value = str(value)
+    try:
+        evens = sum(int(x) for x in value[-1::-2])
+        odds = sum(sum(divmod(int(x) * 2, 10)) for x in value[-2::-2])
+        return (evens + odds) % 10 == 0
+    except ValueError:
+        return False
diff --git a/party.py b/party.py
new file mode 100644
index 0000000..8037101
--- /dev/null
+++ b/party.py
@@ -0,0 +1,32 @@
+#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 Model, fields
+import luhn
+
+
+class Party(Model):
+    _name = 'party.party'
+
+    siren = fields.Char('SIREN', select=1, states={
+        'readonly': "active == False",
+        }, size=9)
+
+    def __init__(self):
+        super(Party, self).__init__()
+        self._constraints += [
+            ('check_siren', 'invalid_siren'),
+        ]
+        self._error_messages.update({
+            'invalid_siren': 'Invalid SIREN number!',
+        })
+
+    def check_siren(self, cursor, user, ids):
+        '''
+        Check validity of SIREN
+        '''
+        for party in self.browse(cursor, user, ids):
+            if party.siren and not luhn.validate(party.siren):
+                return False
+        return True
+
+Party()
diff --git a/party.xml b/party.xml
new file mode 100644
index 0000000..0b4e474
--- /dev/null
+++ b/party.xml
@@ -0,0 +1,39 @@
+<?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.ui.view" id="party_view_tree">
+            <field name="model">party.party</field>
+            <field name="inherit" ref="party.party_view_tree"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <data>
+                    <xpath
+                        expr="/tree/field[@name="vat_code"]"
+                        position="after">
+                        <field name="siren" select="2"/>
+                    </xpath>
+                </data>
+                ]]>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="party_view_form">
+            <field name="model">party.party</field>
+            <field name="inherit" ref="party.party_view_form"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <data>
+                    <xpath
+                        expr="/form/field[@name="active"]"
+                        position="after">
+                        <label name="siren"/>
+                        <field name="siren"/>
+                        <newline/>
+                    </xpath>
+                </data>
+                ]]>
+            </field>
+        </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..be65c2f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup
+import re
+
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
+
+requires = []
+for dep in info.get('depends', []):
+    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+        requires.append('trytond_%s >= %s.%s, < %s.%s' %
+                (dep, major_version, minor_version, major_version,
+                    minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+        (major_version, minor_version, major_version, minor_version + 1))
+
+setup(name='trytond_party_siret',
+    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_siret': '.'},
+    packages=[
+        'trytond.modules.party_siret',
+    ],
+    package_data={
+        'trytond.modules.party_siret': 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_siret = trytond.modules.party_siret
+    """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..216af80
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_party_siret import *
diff --git a/tests/test_party_siret.py b/tests/test_party_siret.py
new file mode 100644
index 0000000..9f7d4d0
--- /dev/null
+++ b/tests/test_party_siret.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+    '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+    sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.modules.party_siret import luhn
+
+
+class PartySiretTestCase(unittest.TestCase):
+    '''
+    Test PartySiret module.
+    '''
+
+    def setUp(self):
+        trytond.tests.test_tryton.install_module('party_siret')
+
+    def test0005views(self):
+        '''
+        Test views.
+        '''
+        self.assertRaises(Exception, test_view('party_siret'))
+
+    def test0010luhn(self):
+        '''
+        Test luhn.
+        '''
+        values = (
+                (4111111111111111, True),
+                ('4111111111111111', True),
+                (4222222222222, True),
+                (378734493671000, True),
+                (5424000000000015, True),
+                (5555555555554444, True),
+                (1008, True),
+                ('0000001008', True),
+                ('000000001008', True),
+                (4012888888881881, True),
+                (1234567890123456789012345678909, True),
+                (4111111111211111, False),
+                (42222222222224, False),
+                (100, False),
+                ('100', False),
+                ('0000100', False),
+                ('abc', False),
+                (None, False),
+                (object(), False),
+            )
+        for value, test in values:
+            self.assert_(luhn.validate(value) == test)
+
+
+def suite():
+    return unittest.TestLoader().loadTestsFromTestCase(PartySiretTestCase)
+
+if __name__ == '__main__':
+    suiteTrytond = trytond.tests.test_tryton.suite()
+    suitePartySiret = suite()
+    alltests = unittest.TestSuite([suiteTrytond, suitePartySiret])
+    unittest.TextTestRunner(verbosity=2).run(alltests)
+    SOCK.disconnect()
diff --git a/trytond_party_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
new file mode 100644
index 0000000..49a114b
--- /dev/null
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -0,0 +1,31 @@
+Metadata-Version: 1.0
+Name: trytond-party-siret
+Version: 1.4.0
+Summary: 
+Add SIRET/SIREN number fields on party.
+    These numbers are used in France, for geographical identification of
+    enterprises:
+    - SIREN (Système d’Identification du Répertoire des ENtreprises)
+    - SIRET (Système d’Identification du Répertoire des ETablissements)
+
+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_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
new file mode 100644
index 0000000..d413971
--- /dev/null
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -0,0 +1,27 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+address.xml
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+party.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./address.py
+./luhn.py
+./party.py
+tests/__init__.py
+tests/test_party_siret.py
+trytond_party_siret.egg-info/PKG-INFO
+trytond_party_siret.egg-info/SOURCES.txt
+trytond_party_siret.egg-info/dependency_links.txt
+trytond_party_siret.egg-info/entry_points.txt
+trytond_party_siret.egg-info/not-zip-safe
+trytond_party_siret.egg-info/requires.txt
+trytond_party_siret.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_party_siret.egg-info/dependency_links.txt b/trytond_party_siret.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_party_siret.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_party_siret.egg-info/entry_points.txt b/trytond_party_siret.egg-info/entry_points.txt
new file mode 100644
index 0000000..7b655c4
--- /dev/null
+++ b/trytond_party_siret.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+    [trytond.modules]
+    party_siret = trytond.modules.party_siret
+    
\ No newline at end of file
diff --git a/trytond_party_siret.egg-info/not-zip-safe b/trytond_party_siret.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_party_siret.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
new file mode 100644
index 0000000..e06aa0c
--- /dev/null
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -0,0 +1,2 @@
+trytond_party >= 1.4, < 1.5
+trytond >= 1.4, < 1.5
\ No newline at end of file
diff --git a/trytond_party_siret.egg-info/top_level.txt b/trytond_party_siret.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_party_siret.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
-- 
tryton-modules-party-siret



More information about the tryton-debian-vcs mailing list