diff --git a/CHANGELOG.md b/CHANGELOG.md index d924594..6e03c38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/VERSION b/VERSION index afa2b35..a8fdfda 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.0 \ No newline at end of file +1.8.1 diff --git a/requirements.txt b/requirements.txt index e41bfb1..35ebb91 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ chardet pyqrcode pypng reportlab +psycopg2-binary diff --git a/source/app/conf.py.example b/source/app/conf.py.example index ca97694..1dc4598 100644 --- a/source/app/conf.py.example +++ b/source/app/conf.py.example @@ -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 = {} \ No newline at end of file +SEAFILE_SERVER = {} diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py index f691d99..2573584 100644 --- a/source/app/controllers/util.py +++ b/source/app/controllers/util.py @@ -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 . + + 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): diff --git a/source/app/models/main.py b/source/app/models/main.py index 84b46a3..20d509f 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -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 . + from decimal import Decimal import sqlite3 import click diff --git a/source/app/settings.py b/source/app/settings.py index b4061dd..a26597b 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -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{}' \ No newline at end of file +API = 'https://api.empresalibre.net{}' + diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js index 9b42459..00a7491 100644 --- a/source/static/js/ui/invoices.js +++ b/source/static/js/ui/invoices.js @@ -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 . 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) } -} \ No newline at end of file +}