mas pruebas y algunos pequenos cambios

FossilOrigin-Name: 02bc90719bb17216a749568086887a7d27878fdbd81febfb88a9fb1e68aa8205

facho/fe/model/__init__.py

@@ -227,15 +227,18 @@ class LegalMonetaryTotal(model.Model):
         self.payable_amount = self.tax_inclusive_amount + self.charge_total_amount
 
 
+class DIANExtensionContent(model.Model):
+    __name__ = 'ExtensionContent'
+    
+    dian = fields.Many2One(dian.DianExtensions, name='DianExtensions', namespace='sts')
+
 class DIANExtension(model.Model):
     __name__ = 'UBLExtension'
 
-    _content = fields.Many2One(Element, name='ExtensionContent', namespace='ext')
-
-    dian = fields.Many2One(dian.DianExtensions, name='DianExtensions', namespace='sts')
+    content = fields.Many2One(DIANExtensionContent, namespace='ext')
 
     def __default_get__(self, name, value):
-        return self.dian
+        return self.content.dian
 
 class UBLExtension(model.Model):
     __name__ = 'UBLExtension'
@@ -250,16 +253,7 @@ class UBLExtensions(model.Model):
 
 class Invoice(model.Model):
     __name__ = 'Invoice'
-    __namespace__ = {
-        'cac': 'urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2',
-        'cbc': 'urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2',
-        'cdt': 'urn:DocumentInformation:names:specification:ubl:colombia:schema:xsd:DocumentInformationAggregateComponents-1',
-        'ext': 'urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2',
-        'sts': 'http://www.dian.gov.co/contratos/facturaelectronica/v1/Structures',
-        'xades': 'http://uri.etsi.org/01903/v1.3.2#',
-        'ds': 'http://www.w3.org/2000/09/xmldsig#'
-    }
-
+    __namespace__ = fe.NAMESPACES
 
     _ubl_extensions = fields.Many2One(UBLExtensions, namespace='ext')
     dian = fields.Virtual(getter='get_dian_extension')
@@ -284,6 +278,7 @@ class Invoice(model.Model):
     taxtotal_03 = fields.Many2One(TaxTotal)
 
     def __setup__(self):
+        self._namespace_prefix = 'fe'
         # Se requieren minimo estos impuestos para
         # validar el cufe
         self._subtotal_01 = self.taxtotal_01.subtotals.create()
@@ -351,3 +346,10 @@ class Invoice(model.Model):
 
     def get_dian_extension(self, name, _value):
         return self._ubl_extensions.dian
+
+    def to_xml(self, **kw):
+        # al generar documento el namespace
+        # se hace respecto a la raiz
+        return super().to_xml(**kw)\
+            .replace("fe:", "")\
+            .replace("xmlns:fe", "xmlns")

facho/fe/model/dian.py

@@ -2,6 +2,19 @@ import facho.model as model
 import facho.model.fields as fields
 from .common import *
 
+class DIANElement(Element):
+    """
+    Elemento que contiene atributos por defecto.
+    
+    Puede extender esta clase y modificar los atributos nuevamente
+    """
+    __name__ = 'DIANElement'
+    
+    scheme_id = fields.Attribute('schemeID', default='4')
+    scheme_name = fields.Attribute('schemeName', default='31')
+    scheme_agency_name = fields.Attribute('schemeAgencyName', default='CO, DIAN (Dirección de Impuestos y Aduanas Nacionales)')
+    scheme_agency_id = fields.Attribute('schemeAgencyID', default='195')
+    
 class SoftwareProvider(model.Model):
     __name__ = 'SoftwareProvider'
 
@@ -26,10 +39,18 @@ class InvoiceControl(model.Model):
     authorization = fields.Many2One(Element, name='InvoiceAuthorization', namespace='sts')
     period = fields.Many2One(Period, name='AuthorizationPeriod', namespace='sts')
     invoices = fields.Many2One(AuthorizedInvoices, namespace='sts')
+
+class AuthorizationProvider(model.Model):
+    __name__ = 'AuthorizationProvider'
+
+
+    id = fields.Many2One(DIANElement, name='AuthorizationProviderID', namespace='sts', default='800197268')
     
 class DianExtensions(model.Model):
     __name__ = 'DianExtensions'
 
+    authorization_provider = fields.Many2One(AuthorizationProvider, namespace='sts', create=True)
+
     software_security_code = fields.Many2One(Element, name='SoftwareSecurityCode', namespace='sts')
     software_provider = fields.Many2One(SoftwareProvider, namespace='sts')
     source = fields.Many2One(InvoiceSource, namespace='sts')