categulario
/
empresa-libre
forked from elmau/empresa-libre
1
0
Fork 0
Code Pull Requests Activity

Agregar columna método de pago al listado de facturas

This commit is contained in:
El Mau 2022-01-22 20:17:42 -06:00
parent dbc8717575
commit 7bcf6d6e3c
3 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/app/models/main.py
View File

@ -4518,6 +4518,7 @@ class Facturas(BaseModel):
(True, 'Si'), (True, 'Si'),
(False, 'No'), (False, 'No'),
)).alias('paid'), )).alias('paid'),
Facturas.metodo_pago,
Facturas.total, Facturas.total,
Facturas.moneda.alias('currency'), Facturas.moneda.alias('currency'),
Facturas.total_mn, Facturas.total_mn,

70
source/app/settings.py
View File

@ -256,38 +256,38 @@ DEFAULT_GLOBAL = {
'clave_sat': '01010101', 'clave_sat': '01010101',
} }
# ~ TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"> TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}">
# ~ <Folios> <Folios>
# ~ <Folio UUID="{uuid}" Motivo="{motivo}"{folio}/> <Folio UUID="{uuid}" Motivo="{motivo}"{folio}/>
# ~ </Folios> </Folios>
# ~ <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
# ~ <SignedInfo> <SignedInfo>
# ~ <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
# ~ <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /> <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
# ~ <Reference URI=""> <Reference URI="">
# ~ <Transforms> <Transforms>
# ~ <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /> <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
# ~ </Transforms> </Transforms>
# ~ <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /> <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
# ~ <DigestValue/> <DigestValue/>
# ~ </Reference> </Reference>
# ~ </SignedInfo> </SignedInfo>
# ~ <SignatureValue/> <SignatureValue/>
# ~ <KeyInfo> <KeyInfo>
# ~ <X509Data> <X509Data>
# ~ <X509IssuerSerial> <X509IssuerSerial>
# ~ <X509IssuerName/> <X509IssuerName/>
# ~ <X509SerialNumber/> <X509SerialNumber/>
# ~ </X509IssuerSerial> </X509IssuerSerial>
# ~ <X509Certificate/> <X509Certificate/>
# ~ </X509Data> </X509Data>
# ~ <KeyValue> <KeyValue>
# ~ <RSAKeyValue> <RSAKeyValue>
# ~ <Modulus/> <Modulus/>
# ~ <Exponent/> <Exponent/>
# ~ </RSAKeyValue> </RSAKeyValue>
# ~ </KeyValue> </KeyValue>
# ~ </KeyInfo> </KeyInfo>
# ~ </Signature> </Signature>
# ~ </Cancelacion>""" </Cancelacion>"""
TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion>""" # ~ TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion>"""

2
source/static/js/ui/invoices.js
View File

@ -258,6 +258,8 @@ var grid_invoices_cols = [
adjust: "data", sort:"string"}, adjust: "data", sort:"string"},
{id: "paid", header: ["Pagada", {content: "selectFilter"}], {id: "paid", header: ["Pagada", {content: "selectFilter"}],
adjust: "data", sort:"string"}, adjust: "data", sort:"string"},
{id: 'metodo_pago', header: ['Método de Pago', {content: 'selectFilter'}],
adjust: 'data', hidden: true},
{id: 'total', header: ['Total', {content: 'numberFilter'}], {id: 'total', header: ['Total', {content: 'numberFilter'}],
width: 125, sort: 'int', format: webix.i18n.priceFormat, css: 'right', width: 125, sort: 'int', format: webix.i18n.priceFormat, css: 'right',
hidden: true}, hidden: true},