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

Merge branch 'develop' 

Agregar RFC desde script
This commit is contained in:
Mauricio Baeza 2017-12-31 17:32:44 -06:00
parent 448eeb653c 3e323678d7
commit 75d990d741
12 changed files with 346 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/app/controllers/main.py
View File

@ -13,7 +13,7 @@ class AppEmpresas(object):
@falcon.after(get_template)
def on_get(self, req, resp):
values = req.params
print ('V', values)
# ~ print ('V', values)
resp.status = falcon.HTTP_200
def on_post(self, req, resp):
@ -385,13 +385,13 @@ class AppDocumentos(object):
def __init__(self, db):
self._db = db
#~ self._not_json = True
def on_get(self, req, resp, type_doc, id_doc):
session = req.env['beaker.session']
req.context['result'], file_name, content_type = \
self._db.get_doc(type_doc, id_doc, session['rfc'])
resp.append_header('Content-Disposition',
'attachment; filename={}'.format(file_name))
if not type_doc in ('pdf', 'pre', 'tpdf'):
resp.append_header('Content-Disposition',
'attachment; filename={}'.format(file_name))
resp.content_type = content_type
resp.status = falcon.HTTP_200

94
source/app/controllers/util.py
View File

@ -269,7 +269,7 @@ def get_size(path):
def get_template(name, data={}):
#~ print ('NAME', name, data)
# ~ print ('NAME', name)
template = template_lookup.get_template(name)
return template.render(**data)
@ -774,18 +774,30 @@ class LIBO(object):
cell_6 = self._set_cell(v=importe, cell=cell_6, value=True)
return
def _add_totales(self, data):
currency = data['moneda']
value = data['total']
cell_value = self._set_cell('{total}', value, value=True)
if cell_value is None:
return False
cell_value.CellStyle = currency
return True
def _totales(self, data):
currency = data['moneda']
cell_title = self._set_cell('{subtotal.titulo}', 'SubTotal')
value = data['subtotal']
cell_value = self._set_cell('{subtotal}', value, value=True)
cell_value.CellStyle = currency
if not cell_value is None:
cell_value.CellStyle = currency
#~ Si encuentra el campo {total}, se asume que los totales e impuestos
#~ están declarados de forma independiente cada uno
#~ if self._add_totales(xml):
#~ return
if self._add_totales(data):
return
#~ Si no se encuentra, copia las celdas hacia abajo de
#~ {subtotal.titulo} y {subtotal}
@ -828,7 +840,7 @@ class LIBO(object):
return
def _timbre(self, data):
if self._es_pre:
if self._es_pre or self._is_ticket:
return
for k, v in data.items():
@ -863,6 +875,7 @@ class LIBO(object):
def _render(self, data):
self._set_search()
self._es_pre = data.pop('es_pre', False)
self._is_ticket = data.pop('is_ticket', False)
self._comprobante(data['comprobante'])
self._emisor(data['emisor'])
self._receptor(data['receptor'])
@ -910,6 +923,7 @@ def to_pdf(data, emisor_rfc):
if data['donativo']:
donativo = '_donativo'
name = '{}_{}{}.ods'.format(rfc.lower(), version, donativo)
print (name)
path = get_template_ods(name)
if path:
return app.pdf(path, data)
@ -1527,6 +1541,27 @@ def _backup_and_sync(rfc, data):
return
@run_in_thread
def _backup_companies():
_, filename = os.path.split(COMPANIES)
if SEAFILE_SERVER:
msg = '\tSincronizando backup RFCs...'
log.info(msg)
seafile = SeaFileAPI(
SEAFILE_SERVER['URL'],
SEAFILE_SERVER['USER'],
SEAFILE_SERVER['PASS'])
if seafile.is_connect:
msg = '\tSincronizando: {} '.format(filename)
log.info(msg)
seafile.update_file(
COMPANIES, SEAFILE_SERVER['REPO'], '/', SEAFILE_SERVER['PASS'])
msg = '\tRespaldo general de {} sincronizado'.format(filename)
log.info(msg)
return
def backup_dbs():
con = sqlite3.connect(COMPANIES)
cursor = con.cursor()
@ -1542,6 +1577,7 @@ def backup_dbs():
args = loads(data)
_backup_and_sync(rfc, args)
_backup_companies()
return
@ -1669,12 +1705,12 @@ class ImportFacturaLibreGambas(object):
('cfdifacturas', 'Facturas'),
('categorias', 'Categorias'),
('productos', 'Productos'),
('tickets', 'Tickets'),
# ~ ('tickets', 'Tickets'),
)
for source, target in tables:
data[target] = self._get_table(source)
data['Socios'] += self._clientes
# ~ data['Socios'] += self._clientes
return data
@ -1700,7 +1736,11 @@ class ImportFacturaLibreGambas(object):
('vendedor', 'vendedor'),
)
data = []
for row in rows:
totals = len(rows)
for i, row in enumerate(rows):
msg = '\tImportando ticket {} de {}'.format(i+1, totals)
log.info(msg)
new = {t: row[s] for s, t in fields}
new['notas'] = ''
@ -1785,13 +1825,24 @@ class ImportFacturaLibreGambas(object):
def _productos(self):
UNIDADES = {
'k': 'KGM',
'kg': 'KGM',
'kg.': 'KGM',
'pieza': 'H87',
'pza': 'H87',
'pz': 'H87',
'bulto': 'H87',
'b': 'H87',
'exb': 'H87',
'ex': 'H87',
'caja': 'XBX',
'c': 'XBX',
'rollo': 'XRO',
'tira': 'SR',
't': 'SR',
'cono': 'XAJ',
'paquete': 'XPK',
'pq': 'XPK',
}
sql = "SELECT * FROM productos"
self._cursor.execute(sql)
@ -1817,13 +1868,25 @@ class ImportFacturaLibreGambas(object):
FROM impuestos
WHERE id=%s
"""
for row in rows:
totals = len(rows)
for i, row in enumerate(rows):
msg = '\tImportando producto {} de {}'.format(i+1, totals)
log.info(msg)
new = {t: row[s] for s, t in fields}
u = new['unidad'].lower().strip()
if u in ('sin',):
continue
if not u:
u = 'pieza'
if not new['categoria']:
new['categoria'] = None
new['descripcion'] = ' '.join(new['descripcion'].split())
new['clave_sat'] = DEFAULT_SAT_PRODUCTO
new['unidad'] = UNIDADES.get(new['unidad'].lower(), new['unidad'])
new['unidad'] = UNIDADES.get(u, new['unidad'])
self._cursor.execute(sql, [row['id_impuesto1']])
impuestos = self._cursor.fetchall()
new['impuestos'] = tuple(impuestos)
@ -1989,7 +2052,11 @@ class ImportFacturaLibreGambas(object):
('cancelada', 'cancelada'),
)
data = []
for row in rows:
totals = len(rows)
for i, row in enumerate(rows):
msg = '\tImportando factura {} de {}'.format(i+1, totals)
log.info(msg)
new = {t: row[s] for s, t in fields}
for _, f in fields:
@ -2049,7 +2116,10 @@ class ImportFacturaLibreGambas(object):
sql1 = "SELECT correo FROM correos WHERE id_padre=%s"
sql2 = "SELECT telefono FROM telefonos WHERE id_padre=%s"
for row in rows:
totals = len(rows)
for i, row in enumerate(rows):
msg = '\tImportando cliente {} de {}'.format(i+1, totals)
log.info(msg)
new = {t: row[s] for s, t in fields}
new['slug'] = to_slug(new['nombre'])
new['es_cliente'] = True

18
source/app/models/db.py
View File

@ -31,6 +31,9 @@ class StorageEngine(object):
def _get_configtimbrar(self, values):
return main.config_timbrar()
def _get_configticket(self, values):
return main.config_ticket()
def _get_saldocuenta(self, values):
return main.CuentasBanco.get_saldo(values['id'])
@ -303,20 +306,7 @@ class StorageEngine(object):
return main.Folios.add(values)
def get_doc(self, type_doc, id, rfc):
if type_doc == 'xml':
data, file_name = main.Facturas.get_xml(id)
content_type = 'application/xml'
elif type_doc == 'pdf':
data, file_name = main.Facturas.get_pdf(id, rfc)
content_type = 'application/pdf'
elif type_doc == 'zip':
data, file_name = main.Facturas.get_zip(id, rfc)
content_type = 'application/octet-stream'
elif type_doc == 'pdf2':
data, file_name = main.PreFacturas.get_pdf(id)
content_type = 'application/pdf'
return data, file_name, content_type
return main.get_doc(type_doc, id, rfc)
def get_movimientosbanco(self, values):
return main.MovimientosBanco.get_(values)

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

@ -104,6 +104,26 @@ def validar_timbrar():
return {'ok': True, 'msg': msg}
def get_doc(type_doc, id, rfc):
types = {
'xml': 'application/xml',
'zip': 'application/octet-stream',
}
content_type = types.get(type_doc, 'application/pdf')
if type_doc == 'xml':
data, file_name = Facturas.get_xml(id)
elif type_doc == 'pdf':
data, file_name = Facturas.get_pdf(id, rfc)
elif type_doc == 'zip':
data, file_name = Facturas.get_zip(id, rfc)
elif type_doc == 'pre':
data, file_name = PreFacturas.get_pdf(id)
elif type_doc == 'tpdf':
data, file_name = Tickets.get_pdf(id)
return data, file_name, content_type
def config_main():
try:
obj = Emisor.select()[0]
@ -129,20 +149,25 @@ def config_timbrar():
except IndexError:
return {'cfdi_donativo': False}
mp = not util.get_bool(Configuracion.get_('chk_config_ocultar_metodo_pago'))
cp = not util.get_bool(
Configuracion.get_('chk_config_ocultar_condiciones_pago'))
conf = {
'cfdi_donativo': obj.es_ong,
'cfdi_anticipo': Configuracion.get_('chk_config_anticipo'),
'cfdi_ine': Configuracion.get_('chk_config_ine'),
'cfdi_metodo_pago': mp,
'cfdi_condicion_pago': cp,
'cfdi_ine': Configuracion.get_bool('chk_config_ine'),
'cfdi_metodo_pago': Configuracion.get_bool('chk_config_ocultar_metodo_pago'),
'cfdi_condicion_pago': Configuracion.get_bool('chk_config_ocultar_condiciones_pago'),
'cfdi_open_pdf': Configuracion.get_bool('chk_config_open_pdf'),
}
return conf
def config_ticket():
conf = {
'open_pdf': Configuracion.get_bool('chk_ticket_pdf_show'),
}
return conf
class Configuracion(BaseModel):
clave = TextField(unique=True)
valor = TextField(default='')
@ -217,12 +242,15 @@ class Configuracion(BaseModel):
'chk_config_ocultar_metodo_pago',
'chk_config_ocultar_condiciones_pago',
'chk_config_send_zip',
'chk_config_open_pdf',
'chk_config_anticipo',
'chk_config_cuenta_predial',
'chk_config_codigo_barras',
'chk_config_precio_con_impuestos',
'chk_config_ine',
'chk_config_edu',
'chk_usar_punto_de_venta',
'chk_ticket_pdf_show',
)
data = (Configuracion
.select()
@ -234,6 +262,7 @@ class Configuracion(BaseModel):
'chk_config_ocultar_condiciones_pago',
'chk_config_anticipo',
'chk_config_ine',
'chk_config_open_pdf',
)
data = (Configuracion
.select()
@ -3261,6 +3290,7 @@ class PreFacturas(BaseModel):
options = {
'para': obj.cliente.correo_facturas,
'copia': values['correo_copia'],
'confirmar': util.get_bool(values.get('correo_confirmacion', '0')),
'asunto': asunto,
'mensaje': util.make_info_mail(values['correo_mensaje'], fields),
'files': files,
@ -4243,6 +4273,61 @@ class Tickets(BaseModel):
data += [{'id': int(r.year), 'value': int(r.year)} for r in rows]
return tuple(data)
def _get_info_to_pdf(self, id):
data = {}
obj = Tickets.select().where(Tickets.id==id).dicts()[0]
formapago = SATFormaPago.get(SATFormaPago.key==obj['forma_pago'])
emisor = util.get_dict(Emisor.select().dicts()[0])
emisor['nointerior'] = emisor['no_interior']
emisor['noexterior'] = emisor['no_exterior']
emisor['codigopostal'] = emisor['codigo_postal']
data['is_ticket'] = True
data['cancelada'] = obj['cancelado']
data['donativo'] = ''
data['comprobante'] = obj
data['comprobante']['version'] = 'ticket'
data['comprobante']['folio'] = str(data['comprobante']['folio'])
data['comprobante']['seriefolio'] = '{}-{}'.format(
data['comprobante']['serie'], data['comprobante']['folio'])
data['comprobante']['fecha'] = str(data['comprobante']['fecha'])
# ~ data['comprobante']['lugarexpedicion'] = \
# ~ 'C.P. de Expedición: {}'.format(
# ~ data['comprobante']['lugar_expedicion'])
data['comprobante']['formadepago'] = str(formapago)
data['comprobante']['totalenletras'] = util.to_letters(
data['comprobante']['total'], 'peso')
data['emisor'] = emisor
data['receptor'] = {'nombre': 'Público en general'}
data['conceptos'] = TicketsDetalle.get_by_ticket(id)
data['totales'] = {}
data['totales']['total'] = str(data['comprobante']['total'])
data['totales']['subtotal'] = str(data['comprobante']['subtotal'])
data['totales']['moneda'] = 'peso'
data['totales']['traslados'] = ()
data['totales']['retenciones'] = ()
data['totales']['taxlocales'] = ()
data['timbre'] = {}
data['donataria'] = {}
data['ine'] = {}
# ~ if obj['descuento']:
# ~ data['totales']['descuento'] = float(obj['descuento'])
return data
@classmethod
def get_pdf(cls, id):
obj = Tickets.get(Tickets.id==id)
name = '{}{}.pdf'.format(obj.serie, obj.folio)
data = cls._get_info_to_pdf(cls, id)
doc = util.to_pdf(data, data['emisor']['rfc'])
return doc, name
class TicketsDetalle(BaseModel):
ticket = ForeignKeyField(Tickets)
@ -4262,6 +4347,35 @@ class TicketsDetalle(BaseModel):
class Meta:
order_by = ('ticket',)
def _with_tax(self, product):
precio_final = float(product.precio_final)
base = float(product.precio_final)
for tax in product.producto.impuestos:
impuesto_producto = round(float(tax.tasa) * base, DECIMALES)
precio_final += impuesto_producto
return precio_final
@classmethod
def get_by_ticket(cls, id):
data = []
productos = TicketsDetalle.select().where(TicketsDetalle.ticket==id)
for p in productos:
producto = {}
producto['noidentificacion'] = p.producto.clave
producto['descripcion'] = p.descripcion
producto['unidad'] = p.producto.unidad.name
producto['cantidad'] = str(p.cantidad)
price_with_tax = cls._with_tax(cls, p)
producto['valorunitario'] = str(price_with_tax)
importe = round(price_with_tax * float(p.cantidad), DECIMALES)
producto['importe'] = str(importe)
data.append(producto)
return data
class TicketsImpuestos(BaseModel):
ticket = ForeignKeyField(Tickets)
@ -4607,7 +4721,7 @@ def _iniciar_bd():
return
def _agregar_rfc():
def _agregar_rfc(no_bd):
rfc = input('Introduce el nuevo RFC: ').strip().upper()
if not rfc:
msg = 'El RFC es requerido'
@ -4627,7 +4741,11 @@ def _agregar_rfc():
args = opt.copy()
if conectar(args):
if _add_emisor(rfc, util.dumps(opt)) and _crear_tablas(rfc):
if _add_emisor(rfc, util.dumps(opt)):
if no_bd:
log.info('RFC agregado correctamente...')
return
_crear_tablas(rfc)
log.info('RFC agregado correctamente...')
return
@ -4746,7 +4864,10 @@ def _importar_valores(archivo='', rfc=''):
def _importar_socios(rows):
log.info('\tImportando Clientes...')
for row in rows:
totals = len(rows)
for i, row in enumerate(rows):
msg = '\tGuardando cliente {} de {}'.format(i+1, totals)
log.info(msg)
try:
with database_proxy.atomic() as txn:
Socios.create(**row)
@ -4769,7 +4890,11 @@ def _existe_factura(row):
def _importar_facturas(rows):
log.info('\tImportando Facturas...')
for row in rows:
totals = len(rows)
for i, row in enumerate(rows):
msg = '\tGuardando factura {} de {}'.format(i+1, totals)
log.info(msg)
try:
detalles = row.pop('detalles')
impuestos = row.pop('impuestos')
@ -5057,7 +5182,11 @@ def _importar_productos_gambas(rows):
'IVA': '002',
}
for row in rows:
totals = len(rows)
for i, row in enumerate(rows):
msg = '\tGuardando producto {} de {}'.format(i+1, totals)
log.info(msg)
source_taxes = row.pop('impuestos')
row['unidad'] = SATUnidades.get(SATUnidades.key==row['unidad'])
taxes = []
@ -5193,7 +5322,7 @@ help_lr = 'Listar RFCs'
is_flag=True, default=False)
@click.option('-cc', '--cambiar-contraseña', help=help_change_pass,
is_flag=True, default=False)
@click.option('-rfc', '--rfc', help=help_rfc, is_flag=True, default=False)
@click.option('-ar', '--agregar-rfc', help=help_rfc, is_flag=True, default=False)
@click.option('-br', '--borrar-rfc', help=help_br, is_flag=True, default=False)
@click.option('-lr', '--listar-rfc', help=help_lr, is_flag=True, default=False)
@click.option('-i', '--importar-valores', is_flag=True, default=False)
@ -5205,10 +5334,13 @@ help_lr = 'Listar RFCs'
@click.option('-gap', '--generar-archivo-productos', is_flag=True, default=False)
@click.option('-ip', '--importar-productos', is_flag=True, default=False)
@click.option('-bk', '--backup-dbs', is_flag=True, default=False)
def main(iniciar_bd, migrar_bd, nuevo_superusuario, cambiar_contraseña, rfc,
borrar_rfc, listar_rfc, importar_valores, archivo, conexion, factura_libre,
factura_libre_gambas, test, generar_archivo_productos, importar_productos,
backup_dbs):
@click.option('-n', '--no-bd', is_flag=True, default=False)
@click.option('-a', '--alta', is_flag=True, default=False)
@click.option('-r', '--rfc')
def main(iniciar_bd, migrar_bd, nuevo_superusuario, cambiar_contraseña,
agregar_rfc, borrar_rfc, listar_rfc, importar_valores, archivo, conexion,
factura_libre, factura_libre_gambas, test, generar_archivo_productos,
importar_productos, backup_dbs, no_bd, alta, rfc):
opt = locals()
@ -5216,6 +5348,13 @@ def main(iniciar_bd, migrar_bd, nuevo_superusuario, cambiar_contraseña, rfc,
_test()
sys.exit(0)
if opt['alta']:
if not opt['rfc']:
msg = 'Falta el RFC'
raise click.ClickException(msg)
empresa_agregar(opt['rfc'])
sys.exit(0)
if opt['iniciar_bd']:
_iniciar_bd()
sys.exit(0)
@ -5232,8 +5371,8 @@ def main(iniciar_bd, migrar_bd, nuevo_superusuario, cambiar_contraseña, rfc,
_cambiar_contraseña()
sys.exit(0)
if opt['rfc']:
_agregar_rfc()
if opt['agregar_rfc']:
_agregar_rfc(no_bd)
sys.exit(0)
if opt['borrar_rfc']:

BIN
source/db/cp.db
View File

Binary file not shown.

15
source/db/valores_iniciales.json
View File

@ -20,15 +20,18 @@
{
"tabla": "SATUnidades",
"datos": [
{"key": "HUR", "name": "Hora", "activo": true},
{"key": "H87", "name": "Pieza", "activo": true},
{"key": "E48", "name": "Servicio", "activo": true},
{"key": "E51", "name": "Trabajo", "activo": false},
{"key": "ACT", "name": "Actividad", "activo": false},
{"key": "KGM", "name": "Kilogramo", "activo": false},
{"key": "XBX", "name": "Caja", "activo": false},
{"key": "XAJ", "name": "Cono", "activo": false},
{"key": "HUR", "name": "Hora", "activo": true},
{"key": "KGM", "name": "Kilogramo", "activo": false},
{"key": "MTR", "name": "Metro", "activo": false},
{"key": "XPK", "name": "Paquete", "activo": false},
{"key": "H87", "name": "Pieza", "activo": true},
{"key": "XRO", "name": "Rollo", "activo": false},
{"key": "MTR", "name": "Metro", "activo": false}
{"key": "E48", "name": "Servicio", "activo": true},
{"key": "SR", "name": "Tira", "activo": false},
{"key": "E51", "name": "Trabajo", "activo": false}
]
},
{

3
source/static/js/controller/admin.js
View File

@ -53,12 +53,15 @@ var controllers = {
$$('chk_config_ocultar_metodo_pago').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_ocultar_condiciones_pago').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_send_zip').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_open_pdf').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_anticipo').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_ine').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_edu').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_cuenta_predial').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_codigo_barras').attachEvent('onItemClick', chk_config_item_click)
$$('chk_config_precio_con_impuestos').attachEvent('onItemClick', chk_config_item_click)
$$('chk_usar_punto_de_venta').attachEvent('onItemClick', chk_config_item_click)
$$('chk_ticket_pdf_show').attachEvent('onItemClick', chk_config_item_click)
$$('cmd_subir_bdfl').attachEvent('onItemClick', cmd_subir_bdfl_click)
$$('up_bdfl').attachEvent('onUploadComplete', up_bdfl_upload_complete)

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

@ -5,10 +5,38 @@ var result = false
var tipo_relacion = ''
var anticipo = false
var donativo = false
var cfg_invoice = new Object()
var invoices_controllers = {
init: function(){
//~ Invoices
$$('cmd_new_invoice').attachEvent("onItemClick", cmd_new_invoice_click)
$$('cmd_refacturar').attachEvent("onItemClick", cmd_refacturar_click)
$$('cmd_delete_invoice').attachEvent("onItemClick", cmd_delete_invoice_click)
$$('cmd_timbrar').attachEvent('onItemClick', cmd_timbrar_click)
$$('cmd_close_invoice').attachEvent('onItemClick', cmd_close_invoice_click)
$$('search_client_id').attachEvent('onKeyPress', search_client_id_key_press)
$$('grid_clients_found').attachEvent('onValueSuggest', grid_clients_found_click)
$$('search_product_id').attachEvent('onKeyPress', search_product_id_key_press)
$$('grid_products_found').attachEvent('onValueSuggest', grid_products_found_click)
$$('grid_details').attachEvent('onItemClick', grid_details_click)
$$('grid_details').attachEvent('onHeaderClick', grid_details_header_click)
$$('grid_details').attachEvent('onBeforeEditStart', grid_details_before_edit_start)
$$('grid_details').attachEvent('onBeforeEditStop', grid_details_before_edit_stop)
$$('cmd_invoice_timbrar').attachEvent('onItemClick', cmd_invoice_timbrar_click)
$$('cmd_invoice_sat').attachEvent('onItemClick', cmd_invoice_sat_click)
$$('cmd_invoice_cancelar').attachEvent('onItemClick', cmd_invoice_cancelar_click)
$$('grid_invoices').attachEvent('onItemClick', grid_invoices_click)
$$('filter_year').attachEvent('onChange', filter_year_change)
$$('filter_month').attachEvent('onChange', filter_month_change)
$$('filter_dates').attachEvent('onChange', filter_dates_change)
$$('cmd_prefactura').attachEvent('onItemClick', cmd_prefactura_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)
$$('lst_serie').attachEvent('onChange', lst_serie_change)
$$('cmd_cfdi_notes').attachEvent('onItemClick', cmd_cfdi_notes_click)
webix.extend($$('grid_invoices'), webix.ProgressBar)
@ -122,11 +150,12 @@ function default_config(){
show('chk_cfdi_donativo', values.cfdi_donativo)
show('lst_metodo_pago', values.cfdi_metodo_pago)
show('txt_condicion_pago', values.cfdi_condicion_pago)
if(!values.cfdi_ine || values.cfdi_ine == '0'){
if(!values.cfdi_ine){
$$('tv_invoice').getTabbar().hideOption('INE')
}else{
$$('tv_invoice').getTabbar().showOption('INE')
}
cfg_invoice['open_pdf'] = values.cfdi_open_pdf
})
}
@ -393,6 +422,9 @@ function send_timbrar(id){
//~ generar_anticipo_egreso(id)
//~ show('Generar egreso de anticipo')
}
if(cfg_invoice.open_pdf){
get_pdf(id)
}
}else{
webix.alert({
title: 'Error al Timbrar',
@ -1037,13 +1069,19 @@ function enviar_correo(row){
}
function get_pdf(id){
//~ location = '/doc/pdf/' + id
window.open('/doc/pdf/' + id, '_blank')
}
function grid_invoices_click(id, e, node){
var row = this.getItem(id)
if(id.column == 'xml'){
location = '/doc/xml/' + row.id
}else if(id.column == 'pdf'){
location = '/doc/pdf/' + row.id
get_pdf(row.id)
}else if(id.column == 'zip'){
location = '/doc/zip/' + row.id
}else if(id.column == 'email'){
@ -1431,7 +1469,7 @@ function enviar_prefactura(id){
text: msg,
callback:function(result){
if(result){
webix.ajax().post('/values/enviarprefac', {'id': id}, {
webix.ajax().post('/values/enviarprefac', {'id': id.row}, {
error:function(text, data, XmlHttpRequest){
msg = 'Ocurrio un error, consulta a soporte técnico'
msg_error(msg)
@ -1452,12 +1490,13 @@ function enviar_prefactura(id){
function grid_preinvoices_click(id, e, node){
var row = this.getItem(id)
//~ var row = this.getItem(id)
if(id.column == 'pdf'){
location = '/doc/pdf2/' + row.id
//~ location = '/doc/pre/' + row.id
window.open('/doc/pre/' + id, '_blank')
}else if(id.column == 'email'){
enviar_prefactura(row.id)
enviar_prefactura(id)
}
}

27
source/static/js/controller/main.js
View File

@ -33,33 +33,6 @@ var controllers = {
$$('menu_user').attachEvent('onMenuItemClick', menu_user_click);
configuracion_inicial()
//~ Invoices
$$('cmd_new_invoice').attachEvent("onItemClick", cmd_new_invoice_click)
$$('cmd_refacturar').attachEvent("onItemClick", cmd_refacturar_click)
$$('cmd_delete_invoice').attachEvent("onItemClick", cmd_delete_invoice_click)
$$('cmd_timbrar').attachEvent('onItemClick', cmd_timbrar_click)
$$('cmd_close_invoice').attachEvent('onItemClick', cmd_close_invoice_click)
$$('search_client_id').attachEvent('onKeyPress', search_client_id_key_press)
$$('grid_clients_found').attachEvent('onValueSuggest', grid_clients_found_click)
$$('search_product_id').attachEvent('onKeyPress', search_product_id_key_press)
$$('grid_products_found').attachEvent('onValueSuggest', grid_products_found_click)
$$('grid_details').attachEvent('onItemClick', grid_details_click)
$$('grid_details').attachEvent('onHeaderClick', grid_details_header_click)
$$('grid_details').attachEvent('onBeforeEditStart', grid_details_before_edit_start)
$$('grid_details').attachEvent('onBeforeEditStop', grid_details_before_edit_stop)
$$('cmd_invoice_timbrar').attachEvent('onItemClick', cmd_invoice_timbrar_click)
$$('cmd_invoice_sat').attachEvent('onItemClick', cmd_invoice_sat_click)
$$('cmd_invoice_cancelar').attachEvent('onItemClick', cmd_invoice_cancelar_click)
$$('grid_invoices').attachEvent('onItemClick', grid_invoices_click)
$$('filter_year').attachEvent('onChange', filter_year_change)
$$('filter_month').attachEvent('onChange', filter_month_change)
$$('filter_dates').attachEvent('onChange', filter_dates_change)
$$('cmd_prefactura').attachEvent('onItemClick', cmd_prefactura_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)
$$('lst_serie').attachEvent('onChange', lst_serie_change)
var tb_invoice = $$('tv_invoice').getTabbar()
tb_invoice.attachEvent('onChange', tb_invoice_change)
$$('prefilter_year').attachEvent('onChange', prefilter_year_change)

14
source/static/js/controller/products.js
View File

@ -16,7 +16,7 @@ var products_controllers = {
}
function configurar_productos(){
function configurar_productos(is_new){
webix.ajax().get('/config', {'fields': 'productos'}, {
error: function(text, data, xhr) {
msg = 'Error al consultar'
@ -29,7 +29,9 @@ function configurar_productos(){
show('codigo_barras', values.chk_config_codigo_barras)
show('precio_con_impuestos', values.chk_config_precio_con_impuestos)
$$('unidad').setValue(values.default_unidad)
$$('grid_product_taxes').select(values.default_tax)
if(is_new){
$$('grid_product_taxes').select(values.default_tax)
}
}
})
}
@ -44,12 +46,12 @@ function get_categorias(){
function cmd_new_product_click(id, e, node){
configurar_productos()
get_taxes()
configurar_productos(true)
$$('form_product').setValues({
id: 0, es_activo_producto: true})
add_config({'key': 'id_product', 'value': ''})
get_new_key()
get_taxes()
get_categorias()
$$('grid_products').clearSelection()
$$('unidad').getList().load('/values/unidades')
@ -58,7 +60,8 @@ function cmd_new_product_click(id, e, node){
function cmd_edit_product_click(){
configurar_productos()
get_taxes()
configurar_productos(false)
var grid = $$('grid_products')
var row = grid.getSelectedItem()
if(row == undefined){
@ -66,7 +69,6 @@ function cmd_edit_product_click(){
return
}
get_taxes()
$$('categoria').getList().load('/values/categorias')
$$('unidad').getList().load('/values/unidades')

27
source/static/js/controller/tickets.js
View File

@ -1,5 +1,6 @@
var query = []
var msg = ''
var cfg_ticket = new Object()
var tickets_controllers = {
@ -15,6 +16,7 @@ var tickets_controllers = {
$$('cmd_move_tickets_left').attachEvent('onItemClick', cmd_move_tickets_left_click)
$$('cmd_ticket_notes').attachEvent('onItemClick', cmd_ticket_notes_click)
$$('tsearch_product_key').attachEvent('onKeyPress', tsearch_product_key_press)
$$('grid_tickets').attachEvent('onItemClick', grid_tickets_click)
$$('grid_tdetails').attachEvent('onItemClick', grid_ticket_details_click)
$$('grid_tdetails').attachEvent('onBeforeEditStop', grid_tickets_details_before_edit_stop)
$$('gt_productos_found').attachEvent('onValueSuggest', gt_productos_found_click)
@ -26,6 +28,7 @@ var tickets_controllers = {
$$('tsearch_client_key').attachEvent('onKeyPress', tsearch_client_key_press)
$$('grid_ticket_clients_found').attachEvent('onValueSuggest', grid_ticket_clients_found_click)
webix.extend($$('grid_tickets'), webix.ProgressBar)
webix.extend($$('grid_tickets_active'), webix.ProgressBar)
}
@ -92,6 +95,12 @@ function filter_month_ticket_change(nv, ov){
function configuracion_inicial_ticket(){
current_dates_tickets()
get_tickets()
webix.ajax().sync().get('/values/configticket', function(text, data){
var values = data.json()
//~ showvar(values)
cfg_ticket['open_pdf'] = values.open_pdf
})
}
@ -172,6 +181,11 @@ function validar_ticket(){
}
function get_ticket_pdf(id){
window.open('/doc/tpdf/' + id, '_blank')
}
function guardar_ticket(values){
var gd = $$('grid_tdetails')
var grid = $$('grid_tickets')
@ -206,6 +220,9 @@ function guardar_ticket(values){
gd.clearAll()
grid.add(values.row)
$$('multi_tickets').setValue('tickets_home')
if(cfg_ticket.open_pdf){
get_ticket_pdf(values.row.id)
}
}else{
msg_error(values.msg)
}
@ -631,4 +648,14 @@ function cmd_ticket_notes_click(){
function ticket_notes_key_up(){
var value = this.getValue()
$$('form_new_ticket').setValues({notas: value}, true)
}
function grid_tickets_click(id, e, node){
//~ var row = this.getItem(id)
if(id.column == 'pdf'){
//~ window.open('/doc/tpdf/' + id, '_blank')
get_ticket_pdf(id)
}
}

8
source/static/js/ui/admin.js
View File

@ -499,6 +499,8 @@ var options_admin_otros = [
labelRight: 'Ocultar condiciones de pago'},
{view: 'checkbox', id: 'chk_config_send_zip', labelWidth: 0,
labelRight: 'Enviar factura en ZIP'},
{view: 'checkbox', id: 'chk_config_open_pdf', labelWidth: 0,
labelRight: 'Abrir PDF al timbrar'},
]},
{maxHeight: 20},
{template: 'Ayudas varias', type: 'section'},
@ -520,13 +522,17 @@ var options_admin_otros = [
{template: 'Complementos', type: 'section'},
{cols: [{maxWidth: 15},
{view: 'checkbox', id: 'chk_config_ine', labelWidth: 0,
labelRight: 'Mostrar el complemento INE al facturar'},
labelRight: 'Usar el complemento INE'},
{view: 'checkbox', id: 'chk_config_edu', labelWidth: 0,
labelRight: 'Usar el complemento EDU'},
{}]},
{maxHeight: 20},
{template: 'Punto de venta', type: 'section'},
{cols: [{maxWidth: 15},
{view: 'checkbox', id: 'chk_usar_punto_de_venta', labelWidth: 0,
labelRight: 'Usar punto de venta'},
{view: 'checkbox', id: 'chk_ticket_pdf_show', labelWidth: 0,
labelRight: 'Abrir PDF al generar'},
{}]},
{maxHeight: 20},