diff --git a/source/app/models/main.py b/source/app/models/main.py
index cb19171..7c5b5dc 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -3656,9 +3656,9 @@ class Facturas(BaseModel):
cantidad = float(product['cantidad'])
valor_unitario = float(product['valor_unitario'])
descuento = float(product['descuento'])
- if tipo_comprobante == 'T':
- valor_unitario = 0.0
- descuento = 0.0
+ # ~ if tipo_comprobante == 'T':
+ # ~ valor_unitario = 0.0
+ # ~ descuento = 0.0
precio_final = valor_unitario - descuento
importe = round(cantidad * precio_final, DECIMALES)
@@ -3852,6 +3852,10 @@ class Facturas(BaseModel):
if invoice.descuento:
comprobante['Descuento'] = FORMAT.format(invoice.descuento)
+ if invoice.tipo_comprobante == 'T':
+ comprobante['SubTotal'] = '0.0'
+ comprobante['Total'] = '0.0'
+
if invoice.tipo_relacion:
relacionados = {
'tipo': invoice.tipo_relacion,
diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js
index 775fb9f..2f88823 100644
--- a/source/static/js/controller/invoices.js
+++ b/source/static/js/controller/invoices.js
@@ -38,6 +38,7 @@ var invoices_controllers = {
$$('filter_month').attachEvent('onChange', filter_month_change)
$$('filter_dates').attachEvent('onChange', filter_dates_change)
$$('cmd_prefactura').attachEvent('onItemClick', cmd_prefactura_click)
+ $$('cmd_preinvoice_generate_delete').attachEvent('onItemClick', cmd_preinvoice_generate_delete_click)
$$('cmd_cfdi_relacionados').attachEvent('onItemClick', cmd_cfdi_relacionados_click)
$$('lst_metodo_pago').attachEvent('onChange', lst_metodo_pago_change)
$$('lst_moneda').attachEvent('onChange', lst_moneda_change)
@@ -658,7 +659,7 @@ function cmd_timbrar_click(id, e, node){
}
if(tipo_comprobante == 'T'){
- msg += 'El Tipo de Comprobante es Traslado, todos los importes serán puesto a 0 (Cero), asegurate de que sea el tipo de comprobante correcto
'
+ msg += 'El Tipo de Comprobante es Traslado, el total será puesto a 0 (Cero), asegurate de que sea el tipo de comprobante correcto
'
}
msg += '¿Estás seguro de timbrar esta factura?
'
@@ -1564,7 +1565,7 @@ function refacturar_preinvoice(id){
}
-function cmd_facturar_preinvoice_click(id, e, node){
+function cmd_facturar_preinvoice_click(){
var grid = $$('grid_preinvoices')
if(grid.count() == 0){
@@ -2059,4 +2060,11 @@ function cmd_invoice_verify_sat_click(){
var values = data.json()
window.open(values.url, '_blank')
})
+}
+
+
+function cmd_preinvoice_generate_delete_click(){
+
+
+
}
\ No newline at end of file
diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js
index 0aa4c86..3180945 100644
--- a/source/static/js/ui/invoices.js
+++ b/source/static/js/ui/invoices.js
@@ -560,6 +560,8 @@ var controls_generate = [
var toolbar_preinvoices = [
{view: 'button', id: 'cmd_facturar_preinvoice', label: 'Facturar',
type: 'iconButton', autowidth: true, icon: 'pencil'},
+ {view: 'button', id: 'cmd_preinvoice_generate_delete', label: 'Facturar y Eliminar',
+ type: 'iconButton', autowidth: true, icon: 'pencil', hidden: true},
{},
{view: "button", id: "cmd_delete_preinvoice", label: "Eliminar",
type: "iconButton", autowidth: true, icon: "minus"},