VAT number correction

Update #31
mwolff44 · Nov 5, 2014 · 2f1d342 · 2f1d342
1 parent 09a4d04
commit 2f1d342
Show file tree

Hide file tree

Showing 6 changed files with 2,040 additions and 4 deletions.
diff --git a/pyfreebill/admin.py b/pyfreebill/admin.py
@@ -225,7 +225,7 @@ class CompanyAdmin(admin.ModelAdmin):
 
     search_fields = ['^name', ]
     prepopulated_fields = {'slug': ('name',)}
-    readonly_fields = ('customer_balance', 'supplier_balance')
+    readonly_fields = ('customer_balance', 'supplier_balance', 'vat_number_validated')
     fieldsets = (
         ('General', {
             'fields': (('name', 'nickname'),

diff --git a/pyfreebill/migrations/0066_auto__add_taxes__add_services.py b/pyfreebill/migrations/0066_auto__add_taxes__add_services.py
diff --git a/pyfreebill/migrations/0067_auto__add_subscriptions__add_field_services_type_service.py b/pyfreebill/migrations/0067_auto__add_subscriptions__add_field_services_type_service.py
diff --git a/...migrations/0068_auto__del_taxes__del_services__del_subscriptions__add_field_company_va.py b/...migrations/0068_auto__del_taxes__del_services__del_subscriptions__add_field_company_va.py
diff --git a/pyfreebill/models.py b/pyfreebill/models.py
@@ -162,6 +162,13 @@ class Meta:
         verbose_name = _(u"Company")
         verbose_name_plural = _(u"Companies")
 
+    def clean(self):
+        if self.vat_number:
+            try:
+                vatnumber.check_vies(self.vat_number)
+            except Exception, e:
+                raise ValidationError("""Wrong VAT number - validation made throw VIES services. %s""") % e
+
     def save(self, *args, **kwargs):
         if self.vat_number:
             try:

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -34,15 +34,16 @@ django-system-monitor==0.5
 django-tables2==0.15.0
 django-templated-email==0.4.9
 GeoIP==1.3.2
-netaddr==0.7.12
+netaddr>=0.7.12
 netifaces==0.10.4
-psutil==2.1.1
+psutil>=2.1.1
 psycopg2==2.5.4
 python-memcached==1.53
 raven>=3
 requests==2.4.0
 pytz>=2014.4
+suds>=0.4
 switch2bill-common==2.8.5
+vatnumber>=1.2
 wsgiref==0.1.2
 yawd-admin==0.7.0
-vatnumber>=1.2