OneTeam/oc-facho
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

improv

Browse Source 
FossilOrigin-Name: ea916d6740bcb359fdd6e8685743b2a103e1ef5d36339784e7a4a5717ccf7046
This commit is contained in:
bit4bit@riseup.net
2020-06-13 16:28:44 +00:00
parent 84faced29b
commit bd4f2b494e
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
facho/facho.py
View File

@@ -142,10 +142,15 @@ class FachoXML:
elem = self.find_or_create_element('/' + root_tag + xpath) elem = self.find_or_create_element('/' + root_tag + xpath)
self.builder.append(elem, new_element) self.builder.append(elem, new_element)
def fragment(self, xpath, append=False): def fragment(self, xpath, append=False, append_not_exists=False):
nodes = xpath.split('/') nodes = xpath.split('/')
nodes.pop() nodes.pop()
root_prefix = '/'.join(nodes) root_prefix = '/'.join(nodes)
parent = None
if append_not_exists:
parent = self.get_element(xpath)
if parent is None:
parent = self.find_or_create_element(xpath, append=append) parent = self.find_or_create_element(xpath, append=append)
return FachoXML(parent, nsmap=self.nsmap, fragment_prefix=root_prefix) return FachoXML(parent, nsmap=self.nsmap, fragment_prefix=root_prefix)
@@ -208,6 +213,10 @@ class FachoXML:
self.builder.set_attribute(elem, k, v) self.builder.set_attribute(elem, k, v)
return elem return elem
def get_element(self, xpath):
xpath = self.fragment_prefix + self._normalize_xpath(xpath)
return self.builder.xpath(self.root, xpath)
def get_element_text(self, xpath, format_=str): def get_element_text(self, xpath, format_=str):
xpath = self.fragment_prefix + self._normalize_xpath(xpath) xpath = self.fragment_prefix + self._normalize_xpath(xpath)
elem = self.builder.xpath(self.root, xpath) elem = self.builder.xpath(self.root, xpath)

10
facho/fe/fe.py
View File

@@ -136,12 +136,13 @@ class DianXMLExtensionSoftwareSecurityCode(FachoXMLExtension):
self.pin = pin self.pin = pin
self.invoice_ident = invoice_ident self.invoice_ident = invoice_ident
def build(self, fachoxml): def build(self, fexml):
dian_path = '/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/sts:DianExtensions/sts:SoftwareSecurityCode' dian_path = '/fe:Invoice/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/sts:DianExtensions/sts:SoftwareSecurityCode'
code = str(self.id_software) + str(self.pin) + str(self.invoice_ident) code = str(self.id_software) + str(self.pin) + str(self.invoice_ident)
m = hashlib.sha384() m = hashlib.sha384()
m.update(code.encode('utf-8')) m.update(code.encode('utf-8'))
return dian_path, m.hexdigest() fexml.set_element(dian_path, m.hexdigest())
return '', []
class DianXMLExtensionSigner(FachoXMLExtension): class DianXMLExtensionSigner(FachoXMLExtension):
@@ -226,8 +227,7 @@ class DianXMLExtensionSigner(FachoXMLExtension):
#xmlsig take parent root #xmlsig take parent root
fachoxml.root.remove(signature) fachoxml.root.remove(signature)
ublextension = fachoxml.fragment('/fe:Invoice/ext:UBLExtensions/ext:UBLExtension', append_not_exists=True)
ublextension = fachoxml.fragment('/fe:Invoice/ext:UBLExtensions/ext:UBLExtension', append=True)
extcontent = ublextension.find_or_create_element('/ext:UBLExtension:/ext:ExtensionContent') extcontent = ublextension.find_or_create_element('/ext:UBLExtension:/ext:ExtensionContent')
fachoxml.append_element(extcontent, signature) fachoxml.append_element(extcontent, signature)

12
tests/test_fe_form.py
View File

@@ -77,18 +77,12 @@ def test_invoicesimple_build(simple_invoice):
assert invoice_validator.validate(simple_invoice) == True assert invoice_validator.validate(simple_invoice) == True
xml = form.DIANInvoiceXML(simple_invoice) xml = form.DIANInvoiceXML(simple_invoice)
supplier_name = xml.get_element_text('/fe:Invoice/fe:AccountingSupplierParty/fe:Party/cac:PartyName/cbc:Name') supplier_name = xml.get_element_text('/fe:Invoice/cac:AccountingSupplierParty/cac:Party/cac:PartyName/cbc:Name')
assert supplier_name == simple_invoice.invoice_supplier.name assert supplier_name == simple_invoice.invoice_supplier.name
supplier_identification_number = xml.get_element_text('/fe:Invoice/fe:AccountingSupplierParty/fe:Party/cac:PartyIdentification/cbc:ID') customer_name = xml.get_element_text('/fe:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PartyName/cbc:Name')
assert int(supplier_identification_number) == simple_invoice.invoice_supplier.ident
customer_name = xml.get_element_text('/fe:Invoice/fe:AccountingCustomerParty/fe:Party/cac:PartyName/cbc:Name')
assert customer_name == simple_invoice.invoice_customer.name assert customer_name == simple_invoice.invoice_customer.name
customer_identification_number = xml.get_element_text('/fe:Invoice/fe:AccountingCustomerParty/fe:Party/cac:PartyIdentification/cbc:ID')
assert int(customer_identification_number) == simple_invoice.invoice_customer.ident
def test_invoicesimple_build_with_cufe(simple_invoice): def test_invoicesimple_build_with_cufe(simple_invoice):
invoice_validator = form.DianResolucion0001Validator() invoice_validator = form.DianResolucion0001Validator()
@@ -130,7 +124,7 @@ def test_invoicesimple_zip(simple_invoice):
def test_bug_cbcid_empty_on_invoice_line(simple_invoice): def test_bug_cbcid_empty_on_invoice_line(simple_invoice):
xml_invoice = form.DIANInvoiceXML(simple_invoice) xml_invoice = form.DIANInvoiceXML(simple_invoice)
cbc_id = xml_invoice.get_element_text('/fe:Invoice/fe:InvoiceLine[1]/cbc:ID', format_=int) cbc_id = xml_invoice.get_element_text('/fe:Invoice/cac:InvoiceLine[1]/cbc:ID', format_=int)
assert cbc_id == 1 assert cbc_id == 1
def test_invoice_line_count_numeric(simple_invoice): def test_invoice_line_count_numeric(simple_invoice):