Encoding fixes

mohanjith · mohanjith · commit 36f413a87e4c · 2014-07-11T16:07:19.000+03:00
diff --git a/docs/Finvoice_2_0_implementation_guidelines.pdf b/docs/Finvoice_2_0_implementation_guidelines.pdf
diff --git a/finvoice/finvoice.py b/finvoice/finvoice.py
@@ -394,7 +394,7 @@ def gds_reverse_node_mapping(cls, mapping):
 # Globals
 #
 
-ExternalEncoding = 'iso8859-15'
+ExternalEncoding = 'iso-8859-15'
 Tag_pattern_ = re_.compile(r'({.*})?(.*)')
 String_cleanup_pat_ = re_.compile(r"[\n\r\s]+")
 Namespace_extract_pat_ = re_.compile(r'{(.*)}(.*)')
diff --git a/finvoice/finvoice201.py b/finvoice/finvoice201.py
@@ -391,7 +391,7 @@ def gds_reverse_node_mapping(cls, mapping):
 # Globals
 #
 
-ExternalEncoding = 'ascii'
+ExternalEncoding = 'iso-8859-15'
 Tag_pattern_ = re_.compile(r'({.*})?(.*)')
 String_cleanup_pat_ = re_.compile(r"[\n\r\s]+")
 Namespace_extract_pat_ = re_.compile(r'{(.*)}(.*)')
diff --git a/finvoice/finvoice201subs.py b/finvoice/finvoice201subs.py
@@ -82,7 +82,7 @@ def parsexml_(*args, **kwargs):
 # Globals
 #
 
-ExternalEncoding = 'ascii'
+ExternalEncoding = 'iso-8859-15'
 
 #
 # Data representation classes
diff --git a/finvoice/finvoicesubs.py b/finvoice/finvoicesubs.py
@@ -86,7 +86,7 @@ def parsexml_(*args, **kwargs):
 # Globals
 #
 
-ExternalEncoding = 'iso8859-15'
+ExternalEncoding = 'iso-8859-15'
 
 #
 # Data representation classes
diff --git a/finvoice/soap/envelope.py b/finvoice/soap/envelope.py
@@ -391,7 +391,7 @@ def gds_reverse_node_mapping(cls, mapping):
 # Globals
 #
 
-ExternalEncoding = 'ISO-8859-15'
+ExternalEncoding = 'iso-8859-15'
 Tag_pattern_ = re_.compile(r'({.*})?(.*)')
 String_cleanup_pat_ = re_.compile(r"[\n\r\s]+")
 Namespace_extract_pat_ = re_.compile(r'{(.*)}(.*)')
diff --git a/finvoice/soap/envelopesubs.py b/finvoice/soap/envelopesubs.py
@@ -82,7 +82,7 @@ def parsexml_(*args, **kwargs):
 # Globals
 #
 
-ExternalEncoding = 'ISO-8859-15'
+ExternalEncoding = 'iso-8859-15'
 
 #
 # Data representation classes
diff --git a/finvoice/soap/msgheader.py b/finvoice/soap/msgheader.py
@@ -391,7 +391,7 @@ def gds_reverse_node_mapping(cls, mapping):
 # Globals
 #
 
-ExternalEncoding = 'ISO-8859-15'
+ExternalEncoding = 'iso-8859-15'
 Tag_pattern_ = re_.compile(r'({.*})?(.*)')
 String_cleanup_pat_ = re_.compile(r"[\n\r\s]+")
 Namespace_extract_pat_ = re_.compile(r'{(.*)}(.*)')
diff --git a/finvoice/soap/msgheadersubs.py b/finvoice/soap/msgheadersubs.py
@@ -82,7 +82,7 @@ def parsexml_(*args, **kwargs):
 # Globals
 #
 
-ExternalEncoding = 'ISO-8859-15'
+ExternalEncoding = 'iso-8859-15'
 
 #
 # Data representation classes
diff --git a/finvoice/tieke/members.py b/finvoice/tieke/members.py
@@ -18,7 +18,7 @@
 ##
 
 class MemberLists:
-	def get_BanksList():
+	def get_BanksList(self):
 		return [ 
 			'OKOYFIHH', # OP-Pohjola-ryhmä
 			'NDEAFIHH', # Nordea
@@ -30,7 +30,7 @@ def get_BanksList():
 			'SBANFIHH', # S-Pankki
 			'DNBAFIHX', # DnB NOR Bank
 		]
-	def get_ServicePorvidersList():
+	def get_ServicePorvidersList(self):
 		return [ 
 			'FIYAPSOL', # YAP Solutions Oy
 			'003723327487', # Apix Messaging Oy
@@ -49,4 +49,27 @@ def get_ServicePorvidersList():
 			'00885060259470028', # Tradeshift
 		]
 	def get_MembersList():
-		return self.get_BanksList() + self.get_MembersList()
+		return self.get_BanksList() + self.get_MembersList()
+
+class PrintServiceList:
+	def get_PrintServiceList(self):
+		return {
+			'NDEAFIHH': 'tulostukseen',
+			'PSPBFIHH': '003718062728810P',
+			'DABAFIHH': '003718062728810P',
+			'HELSFIHH': 'TULOSTUSPALVELU',
+			'OKOYFIHH': 'TULOSTUSPALVELU',
+			'003710948874': 'EKIRJE',
+			'003723327487': 'TULOSTUS',
+			'003721291126': 'PRINT',
+		}
+
+class PrintService():
+	def get_PrintService(self, member_id):
+		psl = PrintServiceList()
+		l = psl.get_PrintServiceList()
+		if (l[member_id]):
+			return l[member_id];
+		return ''
+
+
diff --git a/setup.py b/setup.py
@@ -9,5 +9,5 @@
 		author='Mohanjith Sudirikku Hannadige',
 		author_email='moha@mohanjith.net',
 		url='http://www.codemaster.fi/python/finvoice/',
-		packages=[ 'finvoice', 'finvoice.ack', 'finvoice.attachment', 'finvoice.receiver', 'finvoice.sender', 'finvoice.soap' ]
+		packages=[ 'finvoice', 'finvoice.ack', 'finvoice.attachment', 'finvoice.receiver', 'finvoice.sender', 'finvoice.soap', 'finvoice.tieke' ]
 )

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ def gds_reverse_node_mapping(cls, mapping):`
`394`	`394`	`# Globals`
`395`	`395`	`#`
`396`	`396`
`397`		`-ExternalEncoding = 'iso8859-15'`
	`397`	`+ExternalEncoding = 'iso-8859-15'`
`398`	`398`	`Tag_pattern_ = re_.compile(r'({.})?(.)')`
`399`	`399`	`String_cleanup_pat_ = re_.compile(r"[\n\r\s]+")`
`400`	`400`	`Namespace_extract_pat_ = re_.compile(r'{(.)}(.)')`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ def gds_reverse_node_mapping(cls, mapping):`
`391`	`391`	`# Globals`
`392`	`392`	`#`
`393`	`393`
`394`		`-ExternalEncoding = 'ascii'`
	`394`	`+ExternalEncoding = 'iso-8859-15'`
`395`	`395`	`Tag_pattern_ = re_.compile(r'({.})?(.)')`
`396`	`396`	`String_cleanup_pat_ = re_.compile(r"[\n\r\s]+")`
`397`	`397`	`Namespace_extract_pat_ = re_.compile(r'{(.)}(.)')`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ def parsexml_(args, *kwargs):`
`82`	`82`	`# Globals`
`83`	`83`	`#`
`84`	`84`
`85`		`-ExternalEncoding = 'ascii'`
	`85`	`+ExternalEncoding = 'iso-8859-15'`
`86`	`86`
`87`	`87`	`#`
`88`	`88`	`# Data representation classes`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ def parsexml_(args, *kwargs):`
`86`	`86`	`# Globals`
`87`	`87`	`#`
`88`	`88`
`89`		`-ExternalEncoding = 'iso8859-15'`
	`89`	`+ExternalEncoding = 'iso-8859-15'`
`90`	`90`
`91`	`91`	`#`
`92`	`92`	`# Data representation classes`