Fix - Ticket #222

This commit is contained in:
Mauricio Baeza 2018-06-14 22:20:55 -05:00
parent 43d4032b98
commit 0caea7b0ce
8 changed files with 69 additions and 9 deletions

View File

@ -1,3 +1,9 @@
v 1.8.1 [14-jun-2018]
---------------------
- Fix: Se agrega una barra de desplazamiento al buscar productos o clientes
- Se cambia el servidor de consulta de timbres
v 1.8.0 [03-jun-2018]
---------------------
- Se permiten 4 decimales en Tipo de cambio

View File

@ -1 +1 @@
1.8.0
1.8.1

View File

@ -12,3 +12,4 @@ chardet
pyqrcode
pypng
reportlab
psycopg2-binary

View File

@ -6,7 +6,7 @@ MV = True
# ~ Es la contraseña predeterminada de los usuarios admin y superadmin al crear
# ~ una nueva base de datos, personaliza por la que quieras.
DEFAULT_PASSWORD = 'blades3.3'
DEFAULT_PASSWORD = 'salgueiro3.3'
#~ Establece una ruta accesible para el servidor web
@ -21,4 +21,4 @@ LOG_PATH = '/home/empresa/.opt/empresa-libre.log'
# ~ 'REPO': 'id_repo',
# ~ }
SEAFILE_SERVER = {}
SEAFILE_SERVER = {}

View File

@ -1,5 +1,22 @@
#!/usr/bin/env python
# ~ Empresa Libre
# ~ Copyright (C) 2018 Mauricio Baeza Servin (web@correolibre.net)
# ~
# ~ This program is free software: you can redistribute it and/or modify
# ~ it under the terms of the GNU General Public License as published by
# ~ the Free Software Foundation, either version 3 of the License, or
# ~ (at your option) any later version.
# ~
# ~ This program is distributed in the hope that it will be useful,
# ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
# ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# ~ GNU General Public License for more details.
# ~
# ~ You should have received a copy of the GNU General Public License
# ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
import datetime
import getpass
import hashlib
@ -3408,7 +3425,7 @@ def get_timbres(rfc, token):
result = requests.get(url, headers=headers, timeout=10)
return result.json()
except Exception as e:
return ''
return 'n/e'
def truncate(value):

View File

@ -1,5 +1,21 @@
#!/usr/bin/env python
# ~ Empresa Libre
# ~ Copyright (C) 2018 Mauricio Baeza Servin (web@correolibre.net)
# ~
# ~ This program is free software: you can redistribute it and/or modify
# ~ it under the terms of the GNU General Public License as published by
# ~ the Free Software Foundation, either version 3 of the License, or
# ~ (at your option) any later version.
# ~
# ~ This program is distributed in the hope that it will be useful,
# ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
# ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# ~ GNU General Public License for more details.
# ~
# ~ You should have received a copy of the GNU General Public License
# ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
from decimal import Decimal
import sqlite3
import click

View File

@ -31,7 +31,7 @@ except ImportError:
DEBUG = DEBUG
VERSION = '1.8.0'
VERSION = '1.8.1'
EMAIL_SUPPORT = ('soporte@empresalibre.net',)
TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)
@ -151,6 +151,5 @@ DEFAULT_SAT_NOMINA = {
'DESCRIPCION': 'Pago de nómina',
}
API = 'http://139.162.255.71:4043{}'
if DEBUG:
API = 'http://127.0.0.1:8080{}'
API = 'https://api.empresalibre.net{}'

View File

@ -1,3 +1,18 @@
//~ Empresa Libre
//~ Copyright (C) 2018 Mauricio Baeza Servin (web@correolibre.net)
//~
//~ This program is free software: you can redistribute it and/or modify
//~ it under the terms of the GNU General Public License as published by
//~ the Free Software Foundation, either version 3 of the License, or
//~ (at your option) any later version.
//~
//~ This program is distributed in the hope that it will be useful,
//~ but WITHOUT ANY WARRANTY; without even the implied warranty of
//~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//~ GNU General Public License for more details.
//~
//~ You should have received a copy of the GNU General Public License
//~ along with this program. If not, see <http://www.gnu.org/licenses/>.
var grid_cfdi_cliente_cols = [
@ -348,6 +363,9 @@ var suggest_partners = {
name: 'grid_clients_found',
body: {
autoConfig: false,
scroll: true,
autoheight: false,
yCount: 15,
header: false,
columns: [
{id: 'id', hidden: true},
@ -373,6 +391,9 @@ var suggest_products = {
name: 'grid_products_found',
body: {
autoConfig: false,
scroll: true,
autoheight: false,
yCount: 12,
header: true,
columns: [
{id: 'id', hidden: true},
@ -738,4 +759,4 @@ var win_import_invoice = {
$$('cmd_upload_invoice').attachEvent('onItemClick', cmd_upload_invoice_click)
$$('up_invoice').attachEvent('onUploadComplete', up_invoice_upload_complete)
}
}
}