elmau
/
empresa-libre
6
5
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'develop' 

Fix - Issue #191
This commit is contained in:
Mauricio Baeza 2018-02-20 11:03:40 -06:00
parent eedd253e6a 952782f430
commit 07d51db625
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,

12
source/static/js/controller/invoices.js
View File

@ -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<BR><BR>'
msg += 'El Tipo de Comprobante es Traslado, el total será puesto a 0 (Cero), asegurate de que sea el tipo de comprobante correcto<BR><BR>'
}
msg += '¿Estás seguro de timbrar esta factura?<BR><BR>'
@ -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(){
}

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

@ -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"},