Merge pull request #1 from zgypa/master

add dateutil requirement in setup.py

Author: ralic

PyFePA/fepa.py

@@ -27,7 +27,7 @@
 TD = ['TD{:0=2d}'.format(td) for td in range(1, 6)]
 TR = ['RT01','RT01']
 TC = ['TC{:0=2d}'.format(tc) for tc in range(1,22)]
-NT = ['NT{:0=2d}'.format(nt) for nt in range(1,7)]
+NT = ['N{:0=1d}'.format(nt) for nt in range(1,8)]
 TCP = ('SC', 'PR', 'AB', 'AC')
 SM = ('SC', 'MG')
 TP = ('TP01', 'TP02', 'TP03')

PyFePA/fields.py

@@ -18,6 +18,7 @@
 import datetime
 import importlib
 import dateutil.parser
+from decimal import Decimal
 
 
 class FieldType(object):
@@ -141,7 +142,7 @@ def validate(self, value):
             if super(FieldDecimal,self).validate(value):
                 return value
             elif self.minlen <= len('{:.2f}'.format(float(value))) <= self.maxlen:
-                return float(value)
+                return Decimal(value).quantize(Decimal('.01'))
         except(ValueError, TypeError):
             print('DEBUG- ', value)
             return False
@@ -155,7 +156,7 @@ def __init__(self, **kwargs):
 
     @classmethod
     def tostring(cls,value):
-        return '{:.2f}'.format(float(value))
+        return unicode(Decimal(value).quantize(Decimal('.01')))
 
 
 class FieldDate(FieldType):

PyFePA/serializer.py

@@ -146,6 +146,8 @@ def serializexml(invoice_part,tagname):
                 for t in taglist[k]['value']:
                     fe.append(serializexml(t, taglist[k]['tag']))
         elif taglist[k]['type'] == 'S' and taglist[k]['value'] is not None:
+            if type(taglist[k]['value']) != unicode:
+                taglist[k]['value'] = unicode(taglist[k]['value'])
             (ElementTree.SubElement(fe, taglist[k]['tag'])).text = taglist[k]['value']
         elif taglist[k]['type'] == 'O' and taglist[k]['value'] is not None:
             fe.append(serializexml(taglist[k]['value'],taglist[k]['tag']))