cli permite generar NominaIndividual

FossilOrigin-Name: c30edea460eb16340183c373ed448e3719e2277550882db2d2daafe7bd4bca7e

facho/cli.py

@@ -271,6 +271,46 @@ def generate_invoice(private_key, passphrase, scriptname, generate=False, ssl=Tr
         else:
             DIANWrite(xml, output)
 
+@click.command()
+@click.option('--private-key', type=click.Path(exists=True))
+@click.option('--passphrase')
+@click.option('--ssl/--no-ssl', default=False)
+@click.option('--sign/--no-sign', default=False)
+@click.option('--use-cache-policy/--no-use-cache-policy', default=False)
+@click.argument('scriptname', type=click.Path(exists=True), required=True)
+@click.argument('output', required=True)
+def generate_nomina(private_key, passphrase, scriptname, ssl=True, sign=False, use_cache_policy=False, output=None):
+    """
+    imprime xml en pantalla.
+    SCRIPTNAME espera
+     def nomina() -> fe.nomina.NominaIndividual
+     def extensions(fe.nomina.NominaIndividual): -> List[facho.FachoXMLExtension]
+    """
+
+    if not ssl:
+        disable_ssl()
+
+    import importlib.util
+
+    spec = importlib.util.spec_from_file_location('nomina', scriptname)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+
+    from facho.fe.form_xml import DIANWriteSigned, DIANWrite
+    import facho.fe
+
+    nomina = module.nomina()
+
+    xml = nomina.toFachoXML()
+
+    extensions = module.extensions(nomina)
+    for extension in extensions:
+        xml.add_extension(extension)
+
+    if sign:
+        DIANWriteSigned(xml, output, private_key, passphrase, use_cache_policy, dian_signer=facho.fe.nomina.DianXMLExtensionSigner)
+    else:
+        DIANWrite(xml, output)
 
 @click.command()
 @click.option('--private-key', type=click.Path(exists=True))
@@ -307,6 +347,7 @@ main.add_command(soap_get_status)
 main.add_command(soap_get_status_zip)
 main.add_command(soap_get_numbering_range)
 main.add_command(generate_invoice)
+main.add_command(generate_nomina)
 main.add_command(validate_invoice)
 main.add_command(sign_xml)
 main.add_command(sign_verify_xml)

facho/fe/fe.py

@@ -301,14 +301,17 @@ class DianXMLExtensionSigner:
             self._passphrase = passphrase.encode('utf-8')
             
         return self
-    
+
+    def _element_extension_content(self, fachoxml):
+        return fachoxml.builder.xpath(fachoxml.root, './ext:UBLExtensions/ext:UBLExtension[2]/ext:ExtensionContent')
+
     def sign_xml_string(self, document):
         xml = LXMLBuilder.from_string(document)
         signature = self.sign_xml_element(xml)
 
         fachoxml = FachoXML(xml,nsmap=NAMESPACES)
         #DIAN 1.7.-2020: FAB01
-        extcontent = fachoxml.builder.xpath(fachoxml.root, './ext:UBLExtensions/ext:UBLExtension[2]/ext:ExtensionContent')
+        extcontent = self._element_extension_content(fachoxml)
         fachoxml.append_element(extcontent, signature)
 
         return fachoxml.tostring(xml_declaration=True, encoding='UTF-8')
@@ -372,7 +375,7 @@ class DianXMLExtensionSigner:
 
     def build(self, fachoxml):
         signature = self.sign_xml_element(fachoxml.root)
-        extcontent = fachoxml.builder.xpath(fachoxml.root, './ext:UBLExtensions/ext:UBLExtension[2]/ext:ExtensionContent')
+        extcontent = self._element_extension_content(fachoxml)
         fachoxml.append_element(extcontent, signature)
 
         

facho/fe/form_xml/utils.py

@@ -8,8 +8,12 @@ def DIANWrite(xml, filename):
         f.write(document)
 
         
-def DIANWriteSigned(xml, filename, private_key, passphrase, use_cache_policy=False):
+def DIANWriteSigned(xml, filename, private_key, passphrase, use_cache_policy=False, dian_signer=None):
     document = xml.tostring(xml_declaration=True, encoding='UTF-8').encode('utf-8')
-    signer = fe.DianXMLExtensionSigner(private_key, passphrase=passphrase, mockpolicy=use_cache_policy)
+    if dian_signer is None:
+        dian_signer = fe.DianXMLExtensionSigner
+
+    signer = dian_signer(private_key, passphrase=passphrase, mockpolicy=use_cache_policy)
+
     with open(filename, 'w') as f:
         f.write(signer.sign_xml_string(document))

facho/fe/nomina/__init__.py

@@ -177,11 +177,9 @@ class DianXMLExtensionSigner(fe.DianXMLExtensionSigner):
     def __init__(self, pkcs12_path, passphrase=None, mockpolicy=False):
         super().__init__(pkcs12_path, passphrase=passphrase, mockpolicy=mockpolicy)
 
-    def build(self, fachoxml):
-        signature = self.sign_xml_element(fachoxml.root)
-        xpath = fachoxml.xpath_from_root('/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent')
-        extcontent = fachoxml.get_element(xpath)
-        fachoxml.append_element(extcontent, signature)
+    def _element_extension_content(self, fachoxml):
+        return fachoxml.builder.xpath(fachoxml.root, './ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent')
+
 
 class DIANNominaXML:
     def __init__(self, tag_document):