From 3938bd8fedffad90ae6e940b8d45b9674460e2d5 Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Tue, 18 Dec 2018 11:54:27 +0100
Subject: [PATCH] advanced error-handling at UID-check

---
 .../dp_custom/models/res_partner.py              | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py
index 53d1e676..29ebe1e6 100644
--- a/ext/custom-addons/dp_custom/models/res_partner.py
+++ b/ext/custom-addons/dp_custom/models/res_partner.py
@@ -107,6 +107,8 @@ class Partner(models.Model):
                     result = stdnum_vat.check_vies_approx(vat_country+vat_number,"ATU54619104")
                 except Exception as ex:
                     # Avoid blocking the client when the service is unreachable/unavailable
+                    raise Warning(
+                        _("UID-Prüfung: %s Service ist nicht verfügbar") % record.vat)
                     return {}
 
                 if not result['valid']:
@@ -116,10 +118,16 @@ class Partner(models.Model):
                             _("UID-INVALID: Die UID '%s' ist ungültig oder hat ein falsches Format") % record.vat)
 
                 record.date_vat_check = fields.Date.today()
-                msg_post = result['countryCode']+result['vatNumber']+'<br>'\
-                           +result['traderName']+'<br>'+result['traderCompanyType']+'<br>'+result['traderAddress']\
-                           +'<br>Abfrage-Nr: '+result['requestIdentifier']
-                record.message_post(body='<b>UID-Nr geprüft:</b><br>%s' % msg_post)
+
+                myresult= dict(result)
+                msg_post = ('<b>UID-Nr geprüft:</b><br>%s%s<br>%s<br>%s<br>%s<br>Abfrage-Nr: %s<br>Valid: %s') % \
+                           (myresult.get('countryCode',''),myresult.get('vatNumber','')\
+                           ,myresult.get('traderName','k.A.')\
+                           ,myresult.get('traderCompanyType','k.A.')\
+                           ,myresult.get('traderAddress','k.A.')\
+                           ,myresult.get('requestIdentifier','k.A.')\
+                           ,myresult.get('valid', 'k.A.'))
+                record.message_post(body=msg_post)
 
     @api.multi
     @api.constrains('is_company', 'vat')