MsgHeader and Envelope attribute namespacing

Author: mohanjith

finvoice/soap/envelope.py

@@ -1003,7 +1003,8 @@ def exportChildren(self, outfile, level, namespace_='SOAP-ENV:', name_='Body', f
         else:
             eol_ = ''
         for obj_ in self.anytypeobjs_:
-            obj_.export(outfile, level, namespace_, pretty_print=pretty_print)
+            # Children can be of any namespace so don't include namespace
+            obj_.export(outfile, level, pretty_print=pretty_print)
     def exportLiteral(self, outfile, level, name_='Body'):
         level += 1
         already_processed = set()

finvoice/soap/msgheader.py

@@ -182,7 +182,7 @@ def gds_format_datetime(self, input_data, input_name=''):
                     input_data.day,
                     input_data.hour,
                     input_data.minute,
-                    input_data.second
+                    input_data.second,
                 )
             else:
                 _svalue = '%04d-%02d-%02dT%02d:%02d:%02d.%s' % (
@@ -692,10 +692,10 @@ def export(self, outfile, level, namespace_='eb:', name_='Manifest', namespacede
     def exportAttributes(self, outfile, level, already_processed, namespace_='eb:', name_='Manifest'):
         if self.version is not None and 'version' not in already_processed:
             already_processed.add('version')
-            outfile.write(' version=%s' % (self.gds_format_string(quote_attrib(self.version).encode(ExternalEncoding), input_name='version'), ))
+            outfile.write(' eb:version=%s' % (self.gds_format_string(quote_attrib(self.version).encode(ExternalEncoding), input_name='version'), ))
         if self.id is not None and 'id' not in already_processed:
             already_processed.add('id')
-            outfile.write(' id=%s' % (self.gds_format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), ))
+            outfile.write(' eb:id=%s' % (self.gds_format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), ))
     def exportChildren(self, outfile, level, namespace_='eb:', name_='Manifest', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
@@ -886,13 +886,13 @@ def exportAttributes(self, outfile, level, already_processed, namespace_='eb:',
             outfile.write(' role=%s' % (self.gds_format_string(quote_attrib(self.role).encode(ExternalEncoding), input_name='role'), ))
         if self.href is not None and 'href' not in already_processed:
             already_processed.add('href')
-            outfile.write(' href=%s' % (self.gds_format_string(quote_attrib(self.href).encode(ExternalEncoding), input_name='href'), ))
+            outfile.write(' xlink:href=%s' % (self.gds_format_string(quote_attrib(self.href).encode(ExternalEncoding), input_name='href'), ))
         if self.type_ is not None and 'type_' not in already_processed:
             already_processed.add('type_')
             outfile.write(' type=%s' % (self.gds_format_string(quote_attrib(self.type_).encode(ExternalEncoding), input_name='type'), ))
         if self.id is not None and 'id' not in already_processed:
             already_processed.add('id')
-            outfile.write(' id=%s' % (self.gds_format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), ))
+            outfile.write(' eb:id=%s' % (self.gds_format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), ))
     def exportChildren(self, outfile, level, namespace_='eb:', name_='Reference', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
@@ -1053,10 +1053,10 @@ def export(self, outfile, level, namespace_='eb:', name_='Schema', namespacedef_
     def exportAttributes(self, outfile, level, already_processed, namespace_='eb:', name_='Schema'):
         if self.version is not None and 'version' not in already_processed:
             already_processed.add('version')
-            outfile.write(' version=%s' % (quote_attrib(self.version), ))
+            outfile.write(' eb:version=%s' % (quote_attrib(self.version), ))
         if self.location is not None and 'location' not in already_processed:
             already_processed.add('location')
-            outfile.write(' location=%s' % (self.gds_format_string(quote_attrib(self.location).encode(ExternalEncoding), input_name='location'), ))
+            outfile.write(' eb:location=%s' % (self.gds_format_string(quote_attrib(self.location).encode(ExternalEncoding), input_name='location'), ))
     def exportChildren(self, outfile, level, namespace_='eb:', name_='Schema', fromsubclass_=False, pretty_print=True):
         pass
     def exportLiteral(self, outfile, level, name_='Schema'):
@@ -1195,13 +1195,13 @@ def export(self, outfile, level, namespace_='eb:', name_='MessageHeader', namesp
     def exportAttributes(self, outfile, level, already_processed, namespace_='eb:', name_='MessageHeader'):
         if self.mustUnderstand is not None and 'mustUnderstand' not in already_processed:
             already_processed.add('mustUnderstand')
-            outfile.write(' mustUnderstand=%s' % (self.gds_format_string(quote_attrib(self.mustUnderstand).encode(ExternalEncoding), input_name='mustUnderstand'), ))
+            outfile.write(' SOAP-ENV:mustUnderstand=%s' % (self.gds_format_string(quote_attrib(self.mustUnderstand).encode(ExternalEncoding), input_name='mustUnderstand'), ))
         if self.version is not None and 'version' not in already_processed:
             already_processed.add('version')
-            outfile.write(' version=%s' % (self.gds_format_string(quote_attrib(self.version).encode(ExternalEncoding), input_name='version'), ))
+            outfile.write(' eb:version=%s' % (self.gds_format_string(quote_attrib(self.version).encode(ExternalEncoding), input_name='version'), ))
         if self.id is not None and 'id' not in already_processed:
             already_processed.add('id')
-            outfile.write(' id=%s' % (self.gds_format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), ))
+            outfile.write(' eb:id=%s' % (self.gds_format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), ))
     def exportChildren(self, outfile, level, namespace_='eb:', name_='MessageHeader', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'

samples/senderinfo.py

@@ -27,9 +27,12 @@
 
 from finvoice.soap.envelope import Envelope, Header, Body
 from finvoice.soap.msgheader import MessageHeader, From, To, PartyId, Service, MessageData
+from finvoice.soap.msgheader import Manifest, Reference, Schema
+
+from pytz import reference
 
 # Date
-nowDate = date( "CCYYMMDD", datetime.datetime.today().date().strftime("%Y%m%d") )
+nowDate = date( "CCYYMMDD", datetime.datetime.now( reference.LocalTimezone() ).date().strftime("%Y%m%d") )
 
 # Seller Postal Address
 # SellerStreetName=None, SellerTownName=None, SellerPostCodeIdentifier=None, CountryCode=None, CountryName=None, SellerPostOfficeBoxIdentifier=None
@@ -136,17 +139,29 @@
 messageHeader.set_Service( Service( None, "Routing" ) )
 messageHeader.set_Action( "ProcessInvoice" )
 
-msgData = MessageData( _messageId, datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S%z") )
+_now = datetime.datetime.now( reference.LocalTimezone() )
+_nowS = datetime.datetime( _now.year, _now.month, _now.day, _now.hour, _now.minute, _now.second, 0, _now.tzinfo )
+msgData = MessageData( _messageId + '/1', _nowS )
 
 messageHeader.set_MessageData( msgData )
 
 # messageHeader.export( sys.stdout, 0, namespace_='eb:', name_='MessageHeader', namespacedef_='xmlns:eb="http://www.oasis-open.org/committees/ebxml-msg/schema/msg-header-2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.oasis-open.org/committees/ebxml-msg/schema/msg-header-2_0.xsd msg-header-2_0.xsd"', pretty_print=True )
 
 envelope.set_Header( header )
 
+manifest = Manifest( "2.0", "Manifest" )
+reference = Reference( None, _messageId, None, "FinvoiceSenderInfo" )
+manifest.add_Reference( reference )
+reference.add_Schema( Schema( "2.0", "http://www.pankkiyhdistys.fi/verkkolasku/finvoice/FinvoiceSenderInfo.xsd" ) )
+
+body = Body( )
+body.add_anytypeobjs_( manifest )
+
+envelope.set_Body( body )
+
 envelope.export( sys.stdout, 0, pretty_print=True )
 
 encodingHeader = '<?xml version="1.0" encoding="' + ExternalEncoding + '" ?>\n'
-#sys.stdout.write( encodingHeader )
-#sys.stdout.write( '<?xml-stylesheet type="text/xsl" href="FinvoiceSenderInfo.xsl"?>\n' )
-#senderInfo.export( sys.stdout, 0, name_='FinvoiceSenderInfo', namespacedef_='xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FinvoiceSenderInfo.xsd"', pretty_print=True )
+sys.stdout.write( encodingHeader )
+sys.stdout.write( '<?xml-stylesheet type="text/xsl" href="FinvoiceSenderInfo.xsl"?>\n' )
+senderInfo.export( sys.stdout, 0, name_='FinvoiceSenderInfo', namespacedef_='xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FinvoiceSenderInfo.xsd"', pretty_print=True )