diff --git a/.gitignore b/.gitignore
index 0d1fdb6..ba31efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,9 @@ source/media
# Sphinx documentation
*.xlsx
-docs/
+docs/bk/
+source/docs/
+site/
cache/
credenciales.conf
*.sqlite
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a82f6d..1f22756 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+v 1.17.0 [25-sep-2018]
+----------------------
+ - Fix - Al generar factura de pago con documentos relacionados en otras monedas
+ - Fix - Al generar factura de pago sin serie en documentos relacionados
+ - Fix #278
+
+* IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -bk
+
+python main.py -m
+```
+
+
v 1.16.1 [18-sep-2018]
----------------------
- Error https://gitlab.com/mauriciobaeza/empresa-libre/issues/268
diff --git a/VERSION b/VERSION
index 41c11ff..092afa1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.16.1
+1.17.0
diff --git a/docs/empresalibre/docs/administracion.md b/docs/empresalibre/docs/administracion.md
new file mode 100644
index 0000000..e49eadc
--- /dev/null
+++ b/docs/empresalibre/docs/administracion.md
@@ -0,0 +1,67 @@
+## Administración del sistema
+
+
+TIP:
+ Se requiere un usuario con derechos de administración para usar esta área
+
+
+
+
+Para acceder al área administrativa, presiona el icono de los engranes en la
+esquina superior derecha. Si no lo ves, tu usuario no tiene derechos administrativos.
+
+
+
+### Agregar cuenta bancaria
+
+Para agregar una cuenta bancaria, primero hay que seleccionar el banco o bancos
+a usar, esto se hace en ***Catalogos SAT***, pestaña ***Bancos***. Por default
+veras primero los bancos ya seleccionados. Marca la casilla de verificación de
+cada banco que deses tener disponible al agregar las cuentas bancarias. Usa la
+barra de desplazamiento de la tabla o la rueda de tu ratón para ver más bancos.
+
+
+
+Ahora, desde la sección ***Emisor***, pestaña ***Cuentas de Banco***, captura
+los siguiente campos, todos son requeridos:
+
+* **Nombre**: Un nombre para identificar la cuenta, puedes usar cualquier texto
+* **Banco**: Solo veras los bancos previamente seleccionados
+* **Cuenta**: El número de cuenta
+* **CLABE**: La clave interbancaria, se valida que este correcta.
+* **Moneda**: Solo veras las monedas seleccionadas del Catalogo del SAT
+* **Fecha de apertura**: La fecha de apertura de la cuenta
+* **Saldo inicial**: Saldo inicial **a partir de donde se empezará a llevar el control de movimientos**
+* **Fecha saldo inicial**: La fecha del saldo inicial. **No puedes capturar movimientos anteriores a esta fecha**
+
+
+
+Usa el botón de comando **Agregar cuenta** para agregarla al sistema. Si todos
+los campos son correctos, deberá agregarse al listado inferior.
+
+TIP:
+ Solo puedes eliminar cuentas bancarias que no tengan movimientos capturados.
+
+
+
+### Complementos
+
+Los complementos, son caracteristicas especiales dictadas por el SAT que se
+pueden agregar a cada CFDI generado.
+
+
+TIP:
+ Consulta con tu departamente contable los requerimientos y caracteristicas de cada uno.
+
+
+
+Todos se encuentran en la sección ***Opciones***, pestaña ***Otros***. Ve a la
+subsección ***Complementos*** y activa solo los que requieras.
+
+
+
+* **INE**: Para CFDI emitidos a partidos politicos
+* **EDU**: Solo para escuelas incorporadas a la SEP
+* **Pagos**: Para generar facturas de pago.
+ * La serie predeterminada es **FP**, puedes personalizar la que quieras, capturas y presionas **ENTER** para guardar el valor.
+ * El folio predeterminado es **1**, puedes personalizar el que quieras, capturas y presionas **ENTER** para guardar el valor.
diff --git a/docs/empresalibre/docs/bancos.md b/docs/empresalibre/docs/bancos.md
new file mode 100644
index 0000000..0ef2057
--- /dev/null
+++ b/docs/empresalibre/docs/bancos.md
@@ -0,0 +1,269 @@
+## Bancos
+
+
+
+
+Esta herramienta nos permite llevar el control de ingresos y egresos de una o
+más cuentas bancarias. También nos permite generar el CFDI (factura) de pago.
+
+Primero, es necesario [dar de alta una cuenta bancaria][1]
+
+
+
+TIP:
+ Asegurate siempre de agregar solo movimientos conciliados con tu estado de
+ cuenta bancario y de, en la medida de lo posible, agregarlos en orden.
+
+
+
+### Fecha y saldo inicial
+
+Estos valores estarán determinados por los que hayas capturado al [dar de alta
+la cuenta bancaria][1] en el área administrativa. Mientras una cuenta no tenga
+movimientos, aparte del saldo inicial, es posible eliminarla desde
+administración.
+
+
+
+
+
+### Agregar depósito sin facturas relacionadas
+
+Con el botón de comando ***+ Depósito***, agregamos un nuevo depósito. 
+
+Todos los campos con asterisco rojo son requeridos.
+
+* **Fecha**: La fecha en que fue realizado el depósito.
+* **Hora**: La hora en que fue realizado el depósito.
+* **Referencia**: Referencia del depósito.
+* **Forma de pago**: Selecciona de la lista la forma de pago.
+* **Importe**: Captura el importe del depósito.
+* **Descripción**: El detalle del concepto de este depósito.
+
+
+
+Guarda con el botón de comando ***+ Guardar Depósito***. Se te preguntara para
+confirmar la acción. **Asegurate que todos los datos sean correctos**.
+
+
+
+Si todo esta bien, el nuevo movimiento será agregado a la cuenta y actualizado
+el saldo de la misma.
+
+
+
+TIP:
+ La hora de los depósitos se usa al generar una Factura de Pago. El SAT, en
+ caso de no saber la hora, permite usar el medío día para todos (12:00:00).
+ Resiste la "comodidad" de usar esto y asegurate de usar una hora diferente
+ para cada movimiento.
+
+
+
+
+### Agregar retiro
+
+Con el botón de comando ***- Retiro***, agregamos un nuevo retiro.
+
+Todos los campos con asterisco rojo son requeridos.
+
+* **Fecha**: La fecha en que fue realizado el retiro.
+* **Hora**: La hora en que fue realizado el retiro.
+* **Referencia**: Referencia del retiro.
+* **Forma de pago**: Selecciona de la lista la forma de pago.
+* **Importe**: Captura el importe del retiro.
+* **Descripción**: El detalle del concepto de este retiro.
+
+
+
+Guarda con el botón de comando ***- Guardar Retiro***. Se te preguntara para
+confirmar la acción. **Asegurate que todos los datos sean correctos**.
+
+
+
+Si todo esta bien, el nuevo movimiento será agregado a la cuenta y actualizado
+el saldo de la misma.
+
+
+
+TIP:
+ Recuerda: Resiste la "comodidad" de usar la misma hora para todos los
+ movimientos.
+
+
+
+
+### Pagar factura sin relacionar a un depósito
+
+Usa el botón de comando ***+ Depósito***. En la tabla ***Facturas por pagar***,
+veras las facturas pendientes de pago. Selecciona la correcta y da clic en el
+botón de comando ***Solo marcar pagada***.
+
+
+
+* No captures ningún dato del formulario, solo selecciona la factura a marcar como pagada.
+* **IMPORTANTE**: Solo marca facturas pagadas que **estes 100% seguro que NO requeriras generarle Factura de pago**
+
+Al dar clic en el botón de comando ***Solo marcar pagada***, debes confirmar la
+acción.
+
+
+
+Si todo esta bien, la factura será retirada de la tabla ***Facturas por pagar***,
+y recibiras una notificación de confirmación.
+
+
+
+TIP:
+ Marca solo como pagada una factura, al no estar relacionada con
+ ningún depósito, no afecta al saldo de la cuenta bancaria, pero si a la
+ cuenta del cliente.
+
+
+
+
+### Agregar depósito relacionando facturas
+
+Con el botón de comando ***+ Depósito***, agregamos un nuevo depósito.
+
+Todos los campos con asterisco rojo son requeridos.
+
+* **Fecha**: La fecha en que fue realizado el depósito.
+* **Hora**: La hora en que fue realizado el depósito. **Usa diferente hora para cada movimiento**
+* **Referencia**: Referencia del depósito.
+* **Forma de pago**: **Es importante selecciones el valor correcto, si vas a generar Factura de Pago.**
+* **Importe**: **NO captures este valor**
+* **Descripción**: **NO captures este valor**
+
+
+
+Para relacionar las facturas pagadas en este depósito, ubica las facturas
+correctas y arrastralas a la tabla ***Facturas a pagar en este depósito***,
+también puede usar un doble clic para esto. Puedes agregar una o más facturas,
+conforme las vas agregando, el sistema sumara sus respectivos importes y
+actualizará la descripción del depósito. La descripción puedes editarla
+libremente, pero **no cambies el importe del depósito manualmente**.
+
+
+
+Guarda con el botón de comando ***+ Guardar Depósito***. Se te preguntara para
+confirmar la acción. **Asegurate que todos los datos sean correctos** y de que
+la cantidad y las facturas relacionadas son correctas.
+
+
+
+Si todo esta bien, el nuevo movimiento será agregado a la cuenta y actualizado
+el saldo de la misma.
+
+
+
+REITERAMOS:
+ La hora de los depósitos se usa al generar una Factura de Pago. El SAT, en
+ caso de no saber la hora, permite usar el medío día para todos (12:00:00).
+ Resiste la "comodidad" de usar esto y asegurate de usar una hora diferente
+ para cada movimiento.
+
+
+
+
+### Cancelar un movimiento.
+
+En cualquier momento puedes cancelar un movimiento con el botón de comando
+***Cancelar***. Es mucho mejor te asegures de capturar movimientos solo
+confirmados y conciliados, en vez de estar eliminando movimientos. Cuando se
+elimina un movimiento, no importa si es retiro o depósito, el saldo de la cuenta
+se actualiza a partir de la fecha del movimiento eliminado y hasta el más
+reciente.
+
+* Si es un depósito y tiene facturas relacionadas, las mismas estarán de nuevo marcadas como **Por pagar** y disponibles para relacionarse con otro depósito.
+* **No podrás eliminar** un depósito si este ya tiene generada una Factura de Pago. **Siempre, asegurate de que todo este correcto antes de generar una Factura de Pago**.
+
+
+
+
+
+### Generar Factura de Pago
+
+Para usar esta herramienta, debe estar activado el uso del [complemento de pago][2]
+dentro de administración. Si no ves en ***Bancos*** el botón de comando ***Factura
+de Pago***, solicita a un administrador que lo active.
+
+
+
+TIP:
+ Asegurate de revisar que todos tus movimientos este correctamente capturados
+ y las facturas correctas relacionadas con cada depósito, antes de usar esta
+ herramienta.
+
+
+
+
+* Solo puedes generar ***Facturas de pago*** de movimientos de depósito que tengan facturas relacionadas.
+* Selecciona el depósito correcto y presiona el botón de comando ***Factura de Pago***.
+
+En la siguiente pantalla, **verifica una vez más que todos los datos con correctos**.
+En este momento puedes cerrar e incluso cancelar el movimiento para hacer cualquier
+corrección. Una vez generada la ***Factura de Pago***, no podrás hacer ningún
+cambio. Todos los datos mostrados son de solo lectura, tanto los datos del
+depósito como las facturas relacionadas para que, reiteramos, verifiques que
+todos los datos son correctos.
+
+
+
+**En cuanto estes 100% seguro de que todos los datos son correctos**, usa el
+botón de comando ***Timbrar***, para enviar a timbrar la ***Factura de Pago***.
+Se te pedirá una confirmación de esta acción.
+
+
+
+Si todo esta bien, el sistema: guardará, generará y timbrará la nueva ***Factura
+de Pago***.
+
+
+
+Con un clic en el icono ***PDF***, puedes generarl el PDF respectivo de esta
+***Factura de Pago***. Como con las plantillas de las facturas, puedes
+personalizar completamente esta plantilla.
+
+
+
+
+### Facturas de pago con facturas en otras monedas
+
+Cuando el sistema detecta que se están usando más de una moneda, automáticamente
+te mostrarás las columnas del ***Total*** y la ***Moneda*** respectiva.
+
+
+
+Al relacionar la factura, observa que tomará el valor original en la moneda del
+documento.
+
+
+
+Los siguientes pasos **son importantes y en este orden**, los campos que debes de modificar en la
+tabla ***Facturas a pagar en este depósito*** son:
+
+* **Este pago**: Si el valor pagado es el total de la factura, no lo modifiques, si es parcial, captura el valor pagado **en la moneda del documento**, en este ejemplo, en UDS. Este valor se usa para el estado de cuenta de la factura.
+* **Este Pago MXM**: Captura el valor pagado en moneda nacional de este documento. En este ejemplo, sería el valor **real** del depósito. Este valor se usará para la ***Factura de pago***, para el estado de cuenta y para el saldo del cliente.
+* **T.C.**: Al capturar correctamente los dos valores anteriores, el sistema te calculará el tipo de cambio (***T.C***) usado, si no es correcto, puedes editarlo libremente. Este valor se usa para la ***Factura de pago***.
+
+Ahora, nuestros datos deben verse así:
+
+
+
+Guarda con el botón de comando ***+ Guardar Depósito***. Se te preguntara para
+confirmar la acción. **Asegurate que todos los datos sean correctos** y de que
+la cantidad y las facturas relacionadas son correctas.
+
+
+
+Si todo esta bien, el nuevo movimiento será agregado a la cuenta y actualizado
+el saldo de la misma.
+
+Ahora si, puedes generar la ***Factura de Pago*** de este depósito.
+
+
+
+
+[1]: /administracion/#agregar-cuenta-bancaria
+[2]: /administracion/#complementos
diff --git a/docs/empresalibre/docs/css/main.css b/docs/empresalibre/docs/css/main.css
new file mode 100644
index 0000000..94fb814
--- /dev/null
+++ b/docs/empresalibre/docs/css/main.css
@@ -0,0 +1,30 @@
+.alert-box {
+ color: #555;
+ border-radius: 10px;
+ font-family: Tahoma,Geneva,Arial,sans-serif;
+ font-size: 15px;
+ padding: 10px 10px 10px 36px;
+ margin: 10px;
+}
+
+.alert-box span {
+ font-weight: bold;
+ text-transform: uppercase;
+}
+
+.error {
+ background:#ffecec url('../img/error.png') no-repeat 10px 50%;
+ border:1px solid #f5aca6;
+}
+.success {
+ background:#e9ffd9 url('../img/success.png') no-repeat 10px 50%;
+ border:1px solid #a6ca8a;
+}
+.warning {
+ background:#fff8c4 url('../img/warning.png') no-repeat 10px 50%;
+ border:1px solid #f2c779;
+}
+.notice {
+ background:#e3f7fc url('../img/notice.png') no-repeat 10px 50%;
+ border:1px solid #8ed9f6;
+}
diff --git a/docs/empresalibre/docs/guiadeusuario.md b/docs/empresalibre/docs/guiadeusuario.md
new file mode 100644
index 0000000..d95725f
--- /dev/null
+++ b/docs/empresalibre/docs/guiadeusuario.md
@@ -0,0 +1,9 @@
+## Guía de Usuario
+
+
+
+
+* Cliente y Proveedores
+* Productos y Servicios
+* [Bancos](bancos.md)
+* Facturas
diff --git a/docs/empresalibre/docs/img/01/install_001.png b/docs/empresalibre/docs/img/01/install_001.png
new file mode 100644
index 0000000..8b76df1
Binary files /dev/null and b/docs/empresalibre/docs/img/01/install_001.png differ
diff --git a/docs/empresalibre/docs/img/02/admin_001.png b/docs/empresalibre/docs/img/02/admin_001.png
new file mode 100644
index 0000000..b636d94
Binary files /dev/null and b/docs/empresalibre/docs/img/02/admin_001.png differ
diff --git a/docs/empresalibre/docs/img/02/admin_002.png b/docs/empresalibre/docs/img/02/admin_002.png
new file mode 100644
index 0000000..82740d5
Binary files /dev/null and b/docs/empresalibre/docs/img/02/admin_002.png differ
diff --git a/docs/empresalibre/docs/img/02/admin_003.png b/docs/empresalibre/docs/img/02/admin_003.png
new file mode 100644
index 0000000..0b3d0b8
Binary files /dev/null and b/docs/empresalibre/docs/img/02/admin_003.png differ
diff --git a/docs/empresalibre/docs/img/02/admin_004.png b/docs/empresalibre/docs/img/02/admin_004.png
new file mode 100644
index 0000000..fcfc319
Binary files /dev/null and b/docs/empresalibre/docs/img/02/admin_004.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_001.png b/docs/empresalibre/docs/img/03/bancos_001.png
new file mode 100644
index 0000000..a7909b5
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_001.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_002.png b/docs/empresalibre/docs/img/03/bancos_002.png
new file mode 100644
index 0000000..53d1a7b
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_002.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_003.png b/docs/empresalibre/docs/img/03/bancos_003.png
new file mode 100644
index 0000000..26f780a
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_003.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_004.png b/docs/empresalibre/docs/img/03/bancos_004.png
new file mode 100644
index 0000000..9d89daa
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_004.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_005.png b/docs/empresalibre/docs/img/03/bancos_005.png
new file mode 100644
index 0000000..41b1b02
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_005.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_006.png b/docs/empresalibre/docs/img/03/bancos_006.png
new file mode 100644
index 0000000..3d8bef8
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_006.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_007.png b/docs/empresalibre/docs/img/03/bancos_007.png
new file mode 100644
index 0000000..ffcc237
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_007.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_008.png b/docs/empresalibre/docs/img/03/bancos_008.png
new file mode 100644
index 0000000..e0b5138
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_008.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_009.png b/docs/empresalibre/docs/img/03/bancos_009.png
new file mode 100644
index 0000000..c37cd19
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_009.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_010.png b/docs/empresalibre/docs/img/03/bancos_010.png
new file mode 100644
index 0000000..b1e151d
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_010.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_011.png b/docs/empresalibre/docs/img/03/bancos_011.png
new file mode 100644
index 0000000..cf0fce4
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_011.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_012.png b/docs/empresalibre/docs/img/03/bancos_012.png
new file mode 100644
index 0000000..b36e7c9
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_012.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_013.png b/docs/empresalibre/docs/img/03/bancos_013.png
new file mode 100644
index 0000000..c64152d
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_013.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_014.png b/docs/empresalibre/docs/img/03/bancos_014.png
new file mode 100644
index 0000000..8be8282
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_014.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_015.png b/docs/empresalibre/docs/img/03/bancos_015.png
new file mode 100644
index 0000000..81de742
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_015.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_016.png b/docs/empresalibre/docs/img/03/bancos_016.png
new file mode 100644
index 0000000..9bd3754
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_016.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_017.png b/docs/empresalibre/docs/img/03/bancos_017.png
new file mode 100644
index 0000000..efa5189
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_017.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_018.png b/docs/empresalibre/docs/img/03/bancos_018.png
new file mode 100644
index 0000000..439aa34
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_018.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_019.png b/docs/empresalibre/docs/img/03/bancos_019.png
new file mode 100644
index 0000000..fc39f39
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_019.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_020.png b/docs/empresalibre/docs/img/03/bancos_020.png
new file mode 100644
index 0000000..8e056eb
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_020.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_021.png b/docs/empresalibre/docs/img/03/bancos_021.png
new file mode 100644
index 0000000..16bc6a2
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_021.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_022.png b/docs/empresalibre/docs/img/03/bancos_022.png
new file mode 100644
index 0000000..509c6e0
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_022.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_023.png b/docs/empresalibre/docs/img/03/bancos_023.png
new file mode 100644
index 0000000..9c06ad9
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_023.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_024.png b/docs/empresalibre/docs/img/03/bancos_024.png
new file mode 100644
index 0000000..2f94978
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_024.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_025.png b/docs/empresalibre/docs/img/03/bancos_025.png
new file mode 100644
index 0000000..42d8a7c
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_025.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_026.png b/docs/empresalibre/docs/img/03/bancos_026.png
new file mode 100644
index 0000000..7b21efc
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_026.png differ
diff --git a/docs/empresalibre/docs/img/03/bancos_027.png b/docs/empresalibre/docs/img/03/bancos_027.png
new file mode 100644
index 0000000..893d352
Binary files /dev/null and b/docs/empresalibre/docs/img/03/bancos_027.png differ
diff --git a/docs/empresalibre/docs/index.md b/docs/empresalibre/docs/index.md
new file mode 100644
index 0000000..8c9d248
--- /dev/null
+++ b/docs/empresalibre/docs/index.md
@@ -0,0 +1,35 @@
+## Bienvenido a la documentación de Empresa Libre
+
+
+
+En cada relación comercial,
+existe una relación humana.
+
+
+
+
+
+**Empresa Libre** es un sistema de facturación electrónica especificamente
+diseñado para la legislación mexicana. **Empresa Libre** es totalmente
+[software libre][1].
+
+### Índice
+
+1. [Instalación y configuración](instalacion.md)
+1. [Administración del sistema](administracion.md)
+1. [Guía de usuario](guiadeusuario.md)
+1. Preguntas más frecuentes
+
+
+### Como ayudar
+
+* Usa **Empresa Libre**
+* Reportando errores
+* Escribe documentación
+* Graba videos de uso
+* Propon mejoras
+* Conviertete en **patrocinador**
+
+
+
+[1]: https://www.gnu.org/philosophy/free-sw.es.html
diff --git a/docs/empresalibre/docs/instalacion.md b/docs/empresalibre/docs/instalacion.md
new file mode 100644
index 0000000..d825091
--- /dev/null
+++ b/docs/empresalibre/docs/instalacion.md
@@ -0,0 +1,244 @@
+## Instalación de Empresa Libre
+
+
+
+### Actualización
+
+
+TIP:
+ Es muy importante y es tu responsabilidad mantener siempre actualizado y al día el sistema.
+
+
+
+Mantener al día el sistema te permite tener siempre los ultimos cambios realizados
+en el, recibir las correcciones de errores y las mejoras que vamos incorporando.
+
+Siempre consulta el [historial de cambios](/notas) para saber si hay algún proceso
+extra que seguir al actualizar. Es muy importante que revises cada nota desde
+tu versión actual y hasta la más reciente.
+
+
+Al iniciar el sistema, debes de ver la versión actual del mismo. Si no la ves,
+es que tienes una versión demasiado desactualizada, es importante actualices a
+la brevedad.
+
+
+
+
+
+Ya dentro del sistema, el proceso para actualizar es:
+
+1. Entra a la carpeta del proyecto.
+
+ ┌─[empresalibre-][empresa]->{~}
+ └──> cd proyectos/empresa-libre
+ ┌─[empresalibre-][empresa]->{~/proyectos/empresa-libre}
+ └──>
+
+1. Actualiza la rama `master` del repositorio. El resultado variará, dependiendo desde la versión que estes actualizando, entre más vieja sea, veras más archivos modificados.
+
+ └──> git pull origin master
+ remote: Enumerating objects: 197, done.
+ remote: Counting objects: 100% (197/197), done.
+ remote: Compressing objects: 100% (93/93), done.
+ remote: Total 197 (delta 135), reused 146 (delta 99)
+ Recibiendo objetos: 100% (197/197), 131.71 KiB | 956.00 KiB/s, listo.
+ Resolviendo deltas: 100% (135/135), listo.
+ Desde https://gitlab.com/mauriciobaeza/empresa-libre
+ * branch master -> FETCH_HEAD
+ f0ab924..18b1880 master -> origin/master
+ Actualizando f0ab924..18b1880
+ Fast-forward
+ CHANGELOG.md | 44 ++++++++
+ VERSION | 2 +-
+ source/app/controllers/main.py | 3 +-
+ source/app/controllers/util.py | 35 +++++-
+ source/app/models/db.py | 23 +++-
+ source/app/models/main.py | 278 ++++++++++++++++++++++++++++++++++++++--------
+ source/app/settings.py | 3 +-
+ source/static/css/app.css | 7 ++
+ source/static/js/controller/admin.js | 44 +++++++-
+ source/static/js/controller/bancos.js | 89 +++++++++++++--
+ source/static/js/controller/partners.js | 163 ++++++++++++++++++---------
+ source/static/js/controller/util.js | 1 +
+ source/static/js/ui/admin.js | 18 ++-
+ source/static/js/ui/bancos.js | 9 +-
+ source/static/js/ui/main.js | 5 +-
+ source/static/js/ui/partners.js | 28 ++++-
+ source/templates/base.html | 2 +-
+ 17 files changed, 626 insertions(+), 128 deletions(-)
+
+1. Si las [notas de lanzamiento](/notas) te indican que debes de hacer algún otro proceso, generalmente será que migres la base de datos.
+ 1. ¿Cuando debo migrar la base de datos?
+ 1. Si te lo indica la **ultima** nota de lanzamiento
+ 1. Si te lo indica alguna nota intermedia desde tu versión actual y hasta la ultima.
+ 1. Si **no ves** la versión de **Empresa Libre** al inicio del sistema
+ 1. Si **no** estas seguro desde que versión estas actualizando.
+ * Para migrar entra a la siguiente carpeta
+
+ └──> cd source/app/models/
+ ┌─[empresalibre-][empresa]->{~/proyectos/empresa-libre/source/app/models}
+ └──>
+
+ * **IMPORTANTE:** siempre saca un respaldo de tu base de datos **antes de migrar**
+
+ └──> python main.py -bk
+ [21-Sep-2018 23:34:08] INFO: API: Generando backup de: LAN7008173R5
+ [21-Sep-2018 23:34:09] INFO: API: Backup generado de LAN7008173R5
+ [21-Sep-2018 23:34:09] INFO: API: Sin datos para sincronización particular de lan7008173r5.bk
+
+ * Si en vez del mensaje anterior, ves un mensaje de error como el siguiente. Mira en [errores más comúnes][1] para arreglarlo primero. Una vez resuelto, vuelve a ejecutar el comando anterior. **Verifica siempre estar en la carpeta correcta**.
+
+ File "/usr/lib/python3.7/site-packages/requests/adapters.py", line 513, in send
+ raise ConnectionError(e, request=request)
+ requests.exceptions.ConnectionError: HTTPSConnectionPool(host='seafile.empresalibre.net', port=443): Max retries exceeded with url: /api2/auth-token/ (Caused by NewConnectionError(': Failed to establish a new connection: [Errno -2] Name or service not known'))
+
+ * **IMPORTANTE:** Si **no sabes** desde que versión estas actualizando, o no has actualizado desde la **versión 1.2.0 del 18 de diciembre del 2017**. Entonces, primero usa el siguente comando.
+
+ └──> python main.py -bd
+ Introduce el RFC: TU_RFC
+
+ * Ahora si, si ya **no obtienes ningún error** y estas al día, puedes migrar tu base de datos con el comando.
+
+ └──> python main.py -m -r TU_RFC
+
+ * Por supuesto, reemplaza **TU_RFC** por el RFC del emisor a actualizar.
+
+ └──> python main.py -m -r LAN7008173R5
+ [21-Sep-2018 23:41:55] INFO: API: Conectado a la BD...
+ [21-Sep-2018 23:41:55] INFO: API: Creando tablas nuevas...
+ [21-Sep-2018 23:41:55] INFO: API: Tablas creadas correctamente...
+ [21-Sep-2018 23:41:55] INFO: API: Iniciando migración de tablas...
+ [21-Sep-2018 23:41:55] INFO: API: Tablas migradas correctamente...
+ [21-Sep-2018 23:41:55] INFO: API: Importando datos...
+ [21-Sep-2018 23:41:55] INFO: API: Importando tabla: Categorias
+ [21-Sep-2018 23:41:55] INFO: API: Importando tabla: SATImpuestos
+ [21-Sep-2018 23:41:55] INFO: API: Importando tabla: SATUnidades
+ [21-Sep-2018 23:41:55] INFO: API: Importando tabla: SATNivelesEducativos
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoRelacion
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATMonedas
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATFormaPago
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATRegimenes
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATBancos
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATUsoCfdi
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATEstados
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATOrigenRecurso
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATPeriodicidadPago
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATRiesgoPuesto
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoContrato
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoDeduccion
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoHoras
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoIncapacidad
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoJornada
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoNomina
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoOtroPago
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoPercepcion
+ [21-Sep-2018 23:41:56] INFO: API: Importando tabla: SATTipoRegimen
+ [21-Sep-2018 23:41:56] INFO: API: Importación terminada...
+
+ * **IMPORTANTE:** Si tienes varios emisores en el sistema, **debes de migrarlos todos**.
+
+1. Por ultimo reinicia el sistema.
+
+ └──> sudo systemctl restart empresalibre
+ [sudo] password for empresa:
+
+ * El proceso anterior debe ser instantaneo, si se tarda más de un minuto, mira en [errores más comúnes][2].
+ * También debe funcionar que reinicies la maquina virtual o servidor donde tengas el sistema.
+
+1. Cualquier otro problema, usa el [sistema de tickets del proyecto][3]
+
+
+
+### Errores más comúnes
+
+
+PRECAUCIÓN:
+ La modificación incorrecta de cualquier archivo del sistema, puede provocar
+ que deje de funcionar. Asegurate de seguir todos los pasos correctamente.
+ Si no estas seguro, es mejor contrates el soporte para que un técnico
+ especializado realice el procedimiento.
+
+
+
+#### Al respaldar la base de datos, muestra el error
+
+ File "/usr/lib/python3.7/site-packages/requests/adapters.py", line 513, in send
+ raise ConnectionError(e, request=request)
+ requests.exceptions.ConnectionError: HTTPSConnectionPool(host='seafile.empresalibre.net', port=443): Max retries exceeded with url: /api2/auth-token/ (Caused by NewConnectionError(': Failed to establish a new connection: [Errno -2] Name or service not known'))
+
+* Entra a la carpeta
+
+ └──> cd proyectos/empresa-libre/source/app/
+ ┌─[empresalibre-][empresa]->{~/proyectos/empresa-libre/source/app}
+ └──>
+
+* Siempre saca una copia de seguridad.
+
+ cp conf.py ~/conf.py
+
+* Edita el archivo
+
+ nano conf.py
+
+* Debe de verse exactamente como el siguiente ejemplo, agrega lo que haga falta.
+
+ #!/usr/bin/env python
+
+ DEBUG = False
+ MV = True
+
+ #~ Establece una ruta accesible para el servidor web
+ LOG_PATH = '/home/empresa/log/empresa-libre.log'
+
+ SEAFILE_SERVER = {
+ 'URL': 'https://seafile.empresalibre.net/api2/',
+ 'USER': '',
+ 'PASS': '',
+ 'REPO': '',
+ }
+ SEAFILE_SERVER = {}
+
+* Para guardar los cambios presionas: `CTRL+O`
+* Para salir presionas: `CTRL+X`
+
+
+#### Al reinciar el sistema, tarda más de un minuto en terminar.
+
+
+CUIDADO:
+ Se muestra el contenido del archivo de la maquina virtual, puede ser diferente
+ si lo usas en tu propio servidor o VPS.
+
+
+
+* Edita el archivo
+
+ sudo nano /etc/systemd/system/empresalibre.service
+
+* Asegurate de que este **exactamente** como en:
+
+ [Unit]
+ Description=uWSGI instance to serve Empresa Libre
+
+ [Service]
+ ExecStart=/usr/bin/uwsgi /home/empresa/empresa-libre/app/main.ini
+ KillSignal=SIGQUIT
+
+ [Install]
+ WantedBy=multi-user.target
+
+* Para guardar los cambios presionas: `CTRL+O`
+* Para salir presionas: `CTRL+X`
+* Recarga los cambios.
+
+ sudo systemctl daemon-reload
+
+* Asegurate de que ahora reinicia al instante.
+
+ sudo systemctl restart empresalibre
+
+
+[1]: #al-respaldar-la-base-de-datos-muestra-el-error
+[2]: #al-reinciar-el-sistema-tarda-mas-de-un-minuto-en-terminar
+[3]: https://gitlab.com/mauriciobaeza/empresa-libre/issues
diff --git a/docs/empresalibre/docs/licencia.md b/docs/empresalibre/docs/licencia.md
new file mode 100644
index 0000000..4a3b132
--- /dev/null
+++ b/docs/empresalibre/docs/licencia.md
@@ -0,0 +1,680 @@
+## License
+
+
+```
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ 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 .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
+
+```
diff --git a/docs/empresalibre/docs/notas.md b/docs/empresalibre/docs/notas.md
new file mode 100644
index 0000000..8555b8c
--- /dev/null
+++ b/docs/empresalibre/docs/notas.md
@@ -0,0 +1,195 @@
+## Notas de lanzamiento
+
+Siempre debe verificar en esta sección, el proceso que debes seguir con cada
+actualización del sistema. Recuerda; **es muy importante mantener tu sistema
+siempre actualizado.** Solo se da soporte sobre la ultima versión de **Empresa
+Libre**.
+
+
+### 1.17.0 [25-sep-2018]
+----------------------
+- Fix - Al generar factura de pago con documentos relacionados en otras monedas
+- Fix - Al generar factura de pago sin serie en documentos relacionados
+- Fix [#278](https://gitlab.com/mauriciobaeza/empresa-libre/issues/278)
+- IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -bk
+
+python main.py -m
+```
+
+
+### 1.16.1 [18-sep-2018]
+- Error [#268](https://gitlab.com/mauriciobaeza/empresa-libre/issues/268)
+- IMPORTANTE: Actualizar si usas cuatro decimales en impuestos
+
+
+### 1.16.0 [16-sep-2018]
+- Se puede editar el saldo de un cliente
+- Se muestra la cantidad de facturas de pago en los movimientos
+
+
+### 1.15.0 [12-sep-2018]
+- Se pueden mover las facturas con doble clic en los movimientos de banco.
+- Fix - Al sumar las facturas en los depósitos
+- Fix - Al importar los pedimentos en facturas por lotes
+- Fix - Al guardar los datos del emisor
+
+
+### 1.14.0 [10-sep-2018]
+- Personalizar plantilla para factura de pago
+- Fix - Mostrar serie y folio capturado para factura de pago
+- Fix - Agregar nueva cuenta de banco
+
+
+### 1.13.0 [10-sep-2018]
+- Cancelar factura de pago
+- IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -bk
+
+python main.py -m
+```
+
+
+### 1.12.0 [31-ago-2018]
+- Soporte para facturas (complemento) de pago.
+- IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -bk
+
+python main.py -m
+```
+
+
+### 1.11.1 [21-ago-2018]
+- Fix - Quitar columna en tabla facturaspagos.
+- IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -m
+```
+
+
+### 1.11.0 [25-jul-2018]
+- Se cambia la forma de consultar los folios restantes. Es indispensable actualizar a esta versión para ver tus timbres restantes.
+
+
+### 1.10.0 [10-jul-2018]
+- Ahora se pueden manejar precios con cuatro decimales.
+
+
+### 1.9.3 [08-jul-2018]
+- Fix: Al refacturar conceptos con descuento
+
+
+### 1.9.2 [05-jul-2018]
+- Fix: Al generar el reporte de facturas en PDF
+
+
+### 1.9.1 [25-jun-2018]
+- Fix: Al mostrar el título de la aplicación - Se agrega el registro de acción al borrar una factura
+
+
+### 1.9.0 [18-jun-2018]
+- Se agrega la vista del detalle de facturas
+- Fix: Al timbrar nómina
+
+
+### 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
+
+
+### 1.8.0 [03-jun-2018]
+- Se permiten 4 decimales en Tipo de cambio
+- Se agrega el campo {total_cantidades} al generar el PDF
+- Se agrega opción para generar respaldos de la BD en MV
+- Fix: Al generar con complemento EDU
+
+
+### 1.7.0 [23-may-2018]
+- Se agrega soporte para truncar impuestos locales, para las estulticias de los "ingenieros" de las dependencias de gobierno
+
+
+### 1.6.1 [09-abr-2018]
+- Fix: Nómina con separación
+
+
+### 1.6.0 [18-feb-2018]
+- Facturacion a extranjeros
+- IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -m
+```
+
+
+### 1.5.0 [30-ene-2018]
+- Timbrado de Nómina
+- IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -m
+```
+
+
+### 1.4.0 [01-ene-2018]
+- Impresión de tickets
+
+
+### 1.3.0 [27-Dic-2017]
+- Punto de venta
+- IMPORTANTE: Es necesario realizar una migración, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -m
+```
+
+
+### 1.2.0 [18-Dic-2017]
+- IMPORTANTE: Es necesario actualizar la base de datos, despues de actualizar la rama principal.
+
+```
+git pull origin master
+
+cd source/app/models
+
+python main.py -bd
+```
+
+
+### 0.1.0 [26-Oct-2017]
+- Generar y timbrar con CFDI 3.3
+
diff --git a/docs/empresalibre/mkdocs.yml b/docs/empresalibre/mkdocs.yml
new file mode 100644
index 0000000..80c660a
--- /dev/null
+++ b/docs/empresalibre/mkdocs.yml
@@ -0,0 +1,17 @@
+site_name: Empresa Libre
+#~ repo_url: https://gitlab.com/mauriciobaeza/empresa-libre
+nav:
+ - Inicio: index.md
+ - Contenido:
+ - Instalación y configuración: instalacion.md
+ - Administracón del sistema: administracion.md
+ - Guía de Usuario: guiadeusuario.md
+ - Preguntas más frecuentes: preguntas.md
+ - Acerca de :
+ - Un poco de historia: historia.md
+ - Notas de lanzamiento: notas.md
+ - Como ayudar: ayudar.md
+ - Licencia: licencia.md
+extra_css:
+ - css/main.css
+
diff --git a/source/app/models/main.py b/source/app/models/main.py
index b66197d..8cb10b0 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -250,6 +250,7 @@ def config_main():
data['empresa'] = titulo.format(data['empresa'], obj.nombre)
data['escuela'] = obj.es_escuela
data['timbres'] = Emisor.get_timbres()
+ data['multi_currency'] = SATMonedas.get_multi_currency()
return data
@@ -1312,6 +1313,14 @@ class SATMonedas(BaseModel):
def __str__(self):
return 'Moneda: ({}) {}'.format(self.key, self.name)
+ @classmethod
+ def get_multi_currency(cls):
+ count_currencies = len(cls.get_activos())
+ multi_currency = False
+ if count_currencies > 1:
+ multi_currency = True
+ return multi_currency
+
@classmethod
def add(self, values):
try:
@@ -1733,7 +1742,8 @@ class CuentasBanco(BaseModel):
data = {
'ok': True,
'rows': tuple(rows),
- 'moneda': first.moneda.name,
+ 'moneda': '{} ({})'.format(first.moneda.name, first.moneda.key),
+ 'key_currency': first.moneda.key,
'saldo': first.saldo,
}
return data
@@ -1743,7 +1753,12 @@ class CuentasBanco(BaseModel):
def _get_currency(self, values):
id = int(values['id'])
account = CuentasBanco.get(CuentasBanco.id==id)
- return {'ok': True, 'currency': account.moneda.name}
+ data = {
+ 'ok': True,
+ 'currency': '{} ({})'.format(account.moneda.name, account.moneda.key),
+ 'key_currency': account.moneda.key,
+ }
+ return data
@classmethod
def emisor(cls):
@@ -3288,10 +3303,18 @@ class Facturas(BaseModel):
@classmethod
def validate_count_partners(cls, ids):
filters = (Facturas.id.in_(tuple(ids.keys())))
- partners = (Facturas.select(fn.COUNT(Facturas.cliente))
+ # ~ partners = (Facturas.select(fn.COUNT(Facturas.cliente))
+ # ~ .where(filters)
+ # ~ .group_by(Facturas.cliente)
+ # ~ .order_by(Facturas.cliente).tuples())
+ # ~ if len(partners) > 1:
+ # ~ return False
+ # ~ return True
+ partners = (Facturas.select(fn.COUNT(Socios.rfc))
.where(filters)
- .group_by(Facturas.cliente)
- .order_by(Facturas.cliente).tuples())
+ .join(Socios).switch(Facturas)
+ .group_by(Socios.rfc)
+ .order_by(Socios.rfc).tuples())
if len(partners) > 1:
return False
return True
@@ -3645,6 +3668,8 @@ class Facturas(BaseModel):
Facturas.estatus,
Socios.nombre.alias('cliente'),
Facturas.total,
+ Facturas.moneda.alias('currency'),
+ Facturas.total_mn,
Facturas.saldo,
)
.where(filtros)
@@ -3749,14 +3774,22 @@ class Facturas(BaseModel):
fm = (Facturas.fecha.month == int(values['month']))
filters = (fy & fm)
- rows = tuple(Facturas
- .select(Facturas.id, Facturas.serie, Facturas.folio, Facturas.uuid,
- Facturas.fecha, Facturas.tipo_comprobante, Facturas.estatus,
+ rows = tuple(Facturas.select(
+ Facturas.id,
+ Facturas.serie,
+ Facturas.folio,
+ Facturas.uuid,
+ Facturas.fecha,
+ Facturas.tipo_comprobante,
+ Facturas.estatus,
case(Facturas.pagada, (
(True, 'Si'),
(False, 'No'),
)).alias('paid'),
- Facturas.total_mn, Socios.nombre.alias('cliente'))
+ Facturas.total,
+ Facturas.moneda.alias('currency'),
+ Facturas.total_mn,
+ Socios.nombre.alias('cliente'))
.where(filters)
.join(Socios)
.switch(Facturas).dicts()
@@ -3991,6 +4024,8 @@ class Facturas(BaseModel):
'tipo_comprobante': obj.tipo_comprobante,
'estatus': obj.estatus,
'paid': 'No',
+ 'total': obj.total,
+ 'currency': obj.moneda,
'total_mn': obj.total_mn,
'cliente': obj.cliente.nombre,
}
@@ -5231,6 +5266,8 @@ class FacturasPagos(BaseModel):
auto_round=True)
saldo = DecimalField(default=0.0, max_digits=18, decimal_places=6,
auto_round=True)
+ tipo_cambio = DecimalField(default=1.0, max_digits=15, decimal_places=6,
+ auto_round=True)
class Meta:
order_by = ('factura',)
@@ -5294,8 +5331,11 @@ class FacturasPagos(BaseModel):
@classmethod
def add(cls, mov, ids):
- for i, importe in ids.items():
+ for i, values in ids.items():
fac = Facturas.get(Facturas.id==int(i))
+ this_pay = values['this_pay']
+ importe = values['importe']
+ type_change = values['type_change']
mov_ant, numero = cls._movimiento_anterior(cls, mov, fac)
nuevo = {
'movimiento': mov,
@@ -5307,12 +5347,20 @@ class FacturasPagos(BaseModel):
nuevo['saldo_anterior'] = float(fac.saldo)
else:
nuevo['saldo_anterior'] = float(mov_ant.saldo)
- nuevo['saldo'] = nuevo['saldo_anterior'] - importe
+
+ if(fac.moneda=='MXN'):
+ nuevo['saldo'] = nuevo['saldo_anterior'] - importe
+ else:
+ nuevo['importe'] = this_pay
+ nuevo['tipo_cambio'] = type_change
+ nuevo['saldo'] = nuevo['saldo_anterior'] - this_pay
FacturasPagos.create(**nuevo)
+
fac.saldo = nuevo['saldo']
if nuevo['saldo'] == 0:
fac.pagada = True
fac.save()
+
cls._actualizar_saldo_cliente(cls, fac.cliente, importe * -1)
return
@@ -5383,6 +5431,36 @@ class CfdiPagos(BaseModel):
opt = values.pop('opt')
return getattr(cls, '_{}'.format(opt))(cls, values)
+ def _delete(self, values):
+ id_mov = int(values['id_mov'])
+
+ filters = (
+ (CfdiPagos.movimiento==id_mov)
+ )
+ last = CfdiPagos.select().where(filters)
+ if not last:
+ msg = 'El depósito no tiene facturas de pago'
+ data = {'ok': False, 'msg': msg}
+ return data
+
+ if len(last) > 1:
+ msg = 'Hay más de una factura activa para este depósito'
+ data = {'ok': False, 'msg': msg}
+ return data
+
+ last = last[0]
+ if last.uuid:
+ msg = 'La factura esta timbrada, no se puede eliminar'
+ data = {'ok': False, 'msg': msg}
+ return data
+
+ q = CfdiPagos.delete().where(CfdiPagos.id==last.id)
+ q.execute()
+
+ msg = 'Factura de pago eliminada correctamente'
+ data = {'ok': True, 'msg': msg}
+ return data
+
def _cancel(self, values):
id_mov = int(values['id_mov'])
@@ -5451,13 +5529,13 @@ class CfdiPagos(BaseModel):
data = {'ok': False, 'msg': msg}
return data
- partner = tuple(set([f.factura.cliente.id for f in related]))
+ partner = tuple(set([f.factura.cliente.rfc for f in related]))
if len(partner) > 1:
msg = 'Facturas relacionadas a diferentes clientes'
data = {'ok': False, 'msg': msg}
return data
- partner = partner[0]
+ partner = related[0].factura.cliente
partner_name = related[0].factura.cliente.nombre
regimen_fiscal = related[0].factura.regimen_fiscal
@@ -5519,7 +5597,7 @@ class CfdiPagos(BaseModel):
Facturas.serie.alias('Serie'),
Facturas.folio.alias('Folio'),
Facturas.moneda.alias('MonedaDR'),
- # ~ Facturas.tipo_cambio.alias('TipoCambioDR'),
+ Facturas.tipo_cambio.alias('TipoCambioDR'),
# ~ Facturas.metodo_pago.alias('MetodoDePagoDR'),
FacturasPagos.numero.alias('NumParcialidad'),
FacturasPagos.saldo_anterior.alias('ImpSaldoAnt'),
@@ -5534,7 +5612,7 @@ class CfdiPagos(BaseModel):
r['IdDocumento'] = str(r['IdDocumento'])
r['Folio'] = str(r['Folio'])
r['NumParcialidad'] = str(r['NumParcialidad'])
- # ~ r['TipoCambioDR'] = FORMAT.format(r['TipoCambioDR'])
+ r['TipoCambioDR'] = FORMAT.format(r['TipoCambioDR'])
r['MetodoDePagoDR'] = DEFAULT_CFDIPAY['WAYPAY']
r['ImpSaldoAnt'] = FORMAT.format(r['ImpSaldoAnt'])
r['ImpPagado'] = FORMAT.format(r['ImpPagado'])
@@ -5542,6 +5620,10 @@ class CfdiPagos(BaseModel):
r['ImpSaldoInsoluto'] = '0.00'
else:
r['ImpSaldoInsoluto'] = FORMAT.format(r['ImpSaldoInsoluto'])
+ if currency == r['MonedaDR']:
+ del r['TipoCambioDR']
+ if not r['Serie']:
+ del r['Serie']
return related
@@ -8079,6 +8161,10 @@ def _migrate_tables(rfc=''):
columns = [c.name for c in database_proxy.get_columns('facturaspagos')]
if 'cancelado' in columns:
migrations.append(migrator.drop_column('facturaspagos', 'cancelado'))
+ if not 'tipo_cambio' in columns:
+ tipo_cambio = DecimalField(default=1.0, max_digits=15, decimal_places=6,
+ auto_round=True)
+ migrations.append(migrator.add_column('facturaspagos', 'tipo_cambio', tipo_cambio))
columns = [c.name for c in database_proxy.get_columns('certificado')]
if not 'es_fiel' in columns:
diff --git a/source/app/settings.py b/source/app/settings.py
index 5edb537..4f92a3e 100644
--- a/source/app/settings.py
+++ b/source/app/settings.py
@@ -47,7 +47,7 @@ except ImportError:
DEBUG = DEBUG
-VERSION = '1.16.1'
+VERSION = '1.17.0'
EMAIL_SUPPORT = ('soporte@empresalibre.net',)
TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)
diff --git a/source/static/js/controller/bancos.js b/source/static/js/controller/bancos.js
index 28cd425..a33fe7d 100644
--- a/source/static/js/controller/bancos.js
+++ b/source/static/js/controller/bancos.js
@@ -17,6 +17,27 @@
var msg = ''
var msg_importe = ''
+//~ var is_mn = true
+var current_currency = ''
+var current_way_payment = ''
+
+
+function init_config_bank(){
+ var multi_currency = get_config('multi_currency')
+ var g1 = $$('grid_cfdi_por_pagar')
+ var g2 = $$('grid_cfdi_este_deposito')
+
+ if(multi_currency){
+ g1.showColumn('total')
+ g1.showColumn('currency')
+ g2.showColumn('total')
+ g2.showColumn('currency')
+ g2.showColumn('this_pay')
+ g2.showColumn('type_change')
+ }
+ show('cmd_complemento_pago', get_config('used_cfdi_pays'))
+ set_year_month()
+}
var bancos_controllers = {
@@ -41,12 +62,12 @@ var bancos_controllers = {
$$('cmd_pay_stamp').attachEvent('onItemClick', cmd_pay_stamp_click)
$$('cmd_pay_cancel').attachEvent('onItemClick', cmd_pay_cancel_click)
+ $$('cmd_pay_delete').attachEvent('onItemClick', cmd_pay_delete_click)
$$('grid_cfdi_pay').attachEvent('onItemClick', grid_cfdi_pay_click)
$$('grid_cfdi_por_pagar').attachEvent('onItemDblClick', grid_cfdi_por_pagar_double_click)
$$('grid_cfdi_este_deposito').attachEvent('onItemDblClick', grid_cfdi_este_deposito_double_click)
- set_year_month()
- show('cmd_complemento_pago', get_config('used_cfdi_pays'))
+ init_config_bank()
}
}
@@ -93,6 +114,8 @@ function get_cuentas_banco(){
$$('txt_cuenta_moneda').setValue(values.moneda)
$$('txt_cuenta_saldo').setValue(values.saldo)
get_estado_cuenta()
+ current_currency = values.key_currency
+ //~ set_is_mn()
}else{
enable('cmd_agregar_retiro', false)
enable('cmd_agregar_deposito', false)
@@ -159,6 +182,7 @@ function get_account_currency(){
var values = data.json()
if(values.ok){
$$('txt_cuenta_moneda').setValue(values.currency)
+ current_currency = values.key_currency
}
}
})
@@ -173,14 +197,16 @@ function lst_cuentas_banco_change(nv, ov){
function get_bancos_forma_pago(retiro){
- webix.ajax().get('/values/formapago', {}, function(text, data){
- var values = data.json()
- if(retiro){
- $$('lst_retiro_forma_pago').getList().parse(values)
- }else{
- $$('lst_deposito_forma_pago').getList().parse(values)
- }
- })
+ var values = table_waypayment.chain().find({'id': { '$ne' : '99' }}).data()
+ if(retiro){
+ lst = $$('lst_retiro_forma_pago')
+ }else{
+ lst = $$('lst_deposito_forma_pago')
+ }
+ lst.getList().parse(values)
+ if(current_way_payment){
+ lst.setValue(current_way_payment)
+ }
}
@@ -219,6 +245,9 @@ function cmd_agregar_deposito_click(){
msg_importe = ''
get_bancos_forma_pago(false)
get_facturas_por_pagar()
+ var g = $$('grid_cfdi_este_deposito')
+ g.config.columns[g.getColumnIndex('importe')].header = 'Este Pago ' + current_currency
+ g.refreshColumns()
$$('multi_bancos').setValue('banco_deposito')
}
@@ -357,19 +386,36 @@ function txt_deposito_importe_change(new_value, old_value){
}
}
+function get_type_change(){
+
+}
+
function actualizar_deposito(grid){
grid.sort("#fecha#", "desc", "date")
var suma = 0
var descripcion = ''
+
grid.data.each(function(obj){
descripcion += 'Pago de la factura: ' + obj.serie + obj.folio + ' del '
descripcion += 'cliente: ' + obj.cliente + '\n'
if(obj.importe == undefined){
+ //~ if(is_mn){
+ //~ obj.importe = obj.total_mn
+ //~ }else{
obj.importe = obj.saldo
+ obj.this_pay = obj.saldo
}
suma += obj.importe.to_float()
+ if(obj.type_change == undefined){
+ if(obj.currency==CURRENCY_MN){
+ obj.type_change = 1.00
+ }
+ //~ else{
+ //~ obj.type_change = get_type_change(obj.currency)
+ //~ }
+ }
})
$$('txt_deposito_importe').setValue(suma.round(DECIMALES))
@@ -406,6 +452,41 @@ function grid_cfdi_este_deposito_before_edit_stop(state, editor){
var row = grid.getItem(editor.row)
if(editor.column == 'importe'){
+ var importe = parseFloat(state.value)
+ if(isNaN(importe)){
+ msg = 'El importe a pagar debe ser un número'
+ msg_error(msg)
+ grid.blockEvent()
+ state.value = state.old
+ grid.editCancel()
+ grid.unblockEvent()
+ return true
+ }
+ if(importe <= 0){
+ msg = 'El importe a pagar debe ser mayor a cero'
+ msg_error(msg)
+ grid.blockEvent()
+ state.value = state.old
+ grid.editCancel()
+ grid.unblockEvent()
+ return true
+ }
+ var saldo = row['saldo'].to_float()
+ if(row['currency']==CURRENCY_MN && importe > saldo){
+ msg = 'El importe a pagar no puede ser mayor al saldo de la factura'
+ msg_error(msg)
+ grid.blockEvent()
+ state.value = state.old
+ grid.editCancel()
+ grid.unblockEvent()
+ return true
+ }
+
+ var this_pay = row['this_pay'].to_float()
+ row['type_change'] = (importe / this_pay).round(DECIMALES_TAX)
+ }
+
+ if(editor.column == 'this_pay'){
var importe = parseFloat(state.value)
if(isNaN(importe)){
msg = 'El importe a pagar debe ser un número'
@@ -436,12 +517,16 @@ function grid_cfdi_este_deposito_before_edit_stop(state, editor){
return true
}
}
+
+
+
}
function validate_deposito(values){
var grid = $$('grid_cfdi_este_deposito')
var importe = values.deposito_importe.to_float()
+ var msg_tc = ''
if(!importe){
msg = 'El importe es requerido'
@@ -502,14 +587,31 @@ function validate_deposito(values){
return false
}
suma += tmp
+
+ if(obj.currency!='MXN'){
+ if(obj.type_change==undefined){
+ msg_tc = 'Captura el Tipo de Cambio'
+ }else{
+ var tc = obj.type_change
+ if(tc <= 1.0){
+ msg_tc = 'El Tipo de Cambio debe ser mayor a 1.00'
+ }
+ }
+ }
})
suma = suma.round(DECIMALES)
+ if(msg_tc){
+ msg_error(msg_tc)
+ return false
+ }
+
if(suma > importe){
msg = 'La suma del pago de facturas, no puede ser mayor al deposito'
msg_error(msg)
return false
}
+
if(suma < importe){
msg_importe = 'El importe del depósito en mayor a la suma de facturas. '
msg_importe += 'Asegurate de que esto sea correcto'
@@ -535,12 +637,20 @@ function guardar_deposito(values){
data['retiro'] = 0.0
data['descripcion'] = values.deposito_descripcion
+ current_way_payment = data['forma_pago']
+
if(grid.count()){
var ids = new Object()
grid.data.each(function(obj){
- ids[obj.id] = obj.importe.to_float()
+ //~ ids[obj.id] = obj.importe.to_float()
+ ids[obj.id] = {
+ 'this_pay': obj.this_pay.to_float(),
+ 'importe': obj.importe.to_float(),
+ 'type_change': obj.type_change,
+ }
})
data['ids'] = ids
+ //~ showvar(data['ids'])
}
webix.ajax().post('/movbanco', data, {
@@ -581,7 +691,7 @@ function cmd_guardar_deposito_click(){
if(!grid.count()){
msg = 'Todos los datos son correctos
br>'
msg = 'El depósito no tiene facturas relacionadas
¿Estás '
- msg += ' seguro de guardar del depósito sin facturas relacionadas?'
+ msg += ' seguro de guardar el depósito sin facturas relacionadas?'
webix.confirm({
title: 'Guardar depósito',
ok: 'Si',
@@ -702,7 +812,7 @@ function cmd_invoice_payed_click(){
}
msg = '¿Estás seguro de marcar como pagadas las facturas seleccionadas?
'
- msg += 'No se relacionarán con ningún depósito.
ESTA ACCIÓN NO SE PUEDE DESHACER'
+ msg += 'No se relacionará con ningún depósito y no podrás generarle Factura de pago.
ESTA ACCIÓN NO SE PUEDE DESHACER'
webix.confirm({
title: 'Facturas Pagadas',
ok: 'Si',
@@ -948,6 +1058,48 @@ function cmd_pay_cancel_click(){
}
+function cmd_pay_delete_click(){
+ var form = $$('form_bank_pay')
+ var values = form.getValues()
+ var data = {'opt': 'delete', 'id_mov': values.id_mov}
+
+ var grid = $$('grid_cfdi_pay')
+ if(grid.count() == 0){
+ msg_error('El depósito no tiene facturas de pago')
+ return
+ }
+
+ msg = '¿Estás seguro de eliminar esta factura?
ASEGURATE QUE NO ESTE TIMBRADA
ESTA ACCIÓN NO SE PUEDE DESHACER'
+ webix.confirm({
+ title: 'Eliminar Factura',
+ ok: 'Si',
+ cancel: 'No',
+ type: 'confirm-error',
+ text: msg,
+ callback:function(result){
+ if(result){
+ webix.ajax().post('/cfdipay', data, {
+ error:function(text, data, XmlHttpRequest){
+ msg = 'Ocurrio un error, consulta a soporte técnico'
+ msg_error(msg)
+ },
+ success:function(text, data, XmlHttpRequest){
+ values = data.json();
+ if(values.ok){
+ grid.remove(grid.getFirstId())
+ msg_ok(values.msg)
+ }else{
+ msg_error(values.msg)
+ }
+ }
+ })
+ }
+ }
+ })
+
+}
+
+
function send_cfdi_email(row){
if(!row.uuid){
msg_error('La factura no esta timbrada')
@@ -1011,3 +1163,11 @@ function grid_cfdi_este_deposito_double_click(id, e, node){
this.move(id.row, -1, $$('grid_cfdi_por_pagar'))
actualizar_deposito(grid)
}
+
+
+//~ function set_is_mn(){
+ //~ var c = $$('txt_cuenta_moneda').getValue()
+ //~ if(c!=CURRENCY_MN){
+ //~ is_mn = false
+ //~ }
+//~ }
diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js
index 413f6a6..fac40e6 100644
--- a/source/static/js/controller/invoices.js
+++ b/source/static/js/controller/invoices.js
@@ -1,3 +1,19 @@
+//~ Empresa Libre
+//~ Copyright (C) 2016-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 query = []
var grid = null
var msg = ''
@@ -8,6 +24,17 @@ var donativo = false
var cfg_invoice = new Object()
+function init_config_invoices(){
+ var multi_currency = get_config('multi_currency')
+ var g = $$('grid_invoices')
+
+ if(multi_currency){
+ g.showColumn('total')
+ g.showColumn('currency')
+ }
+}
+
+
var invoices_controllers = {
init: function(){
//~ Invoices
@@ -53,6 +80,9 @@ var invoices_controllers = {
$$('cmd_import_invoice').attachEvent('onItemClick', cmd_import_invoice_click)
webix.extend($$('grid_invoices'), webix.ProgressBar)
+
+ init_config_invoices()
+
focus('search_client_name')
}
}
diff --git a/source/static/js/controller/main.js b/source/static/js/controller/main.js
index 72a72ac..06632bd 100644
--- a/source/static/js/controller/main.js
+++ b/source/static/js/controller/main.js
@@ -38,6 +38,8 @@ function configuracion_inicial(){
$$('cmd_update_timbres').refresh()
add_config({'key': 'decimales_precios', 'value': values.decimales_precios})
add_config({'key': 'used_cfdi_pays', 'value': values.pagos})
+ add_config({'key': 'multi_currency', 'value': values.multi_currency})
+
})
get_way_payment()
diff --git a/source/static/js/controller/util.js b/source/static/js/controller/util.js
index bcbe808..c1f66a2 100644
--- a/source/static/js/controller/util.js
+++ b/source/static/js/controller/util.js
@@ -23,6 +23,7 @@ var DECIMALES = 2;
//~ var DECIMALES_PU = 4;
var DECIMALES_TAX = 4;
var CLAVE_ANTICIPOS = '84111506';
+var CURRENCY_MN = 'MXN';
var db = new loki('data.db');
@@ -149,11 +150,17 @@ String.prototype.is_number = function(){
String.prototype.to_float = function(){
return get_float(this)
}
+String.prototype.to_float4 = function(){
+ return get_float4(this)
+}
function get_float(value){
return parseFloat(value.replace('$', '').replace(',', '').trim()).round(DECIMALES)
}
+function get_float4(value){
+ return parseFloat(value.replace('$', '').replace(',', '').trim()).round(DECIMALES_TAX)
+}
var format_decimal_2 = webix.Number.numToStr({
@@ -182,6 +189,11 @@ function format_currency(value){
}
+function format_currency4(value){
+ return '$ ' + format_decimal_4(value)
+}
+
+
webix.protoUI({
$cssName: "text",
name: "currency",
diff --git a/source/static/js/ui/bancos.js b/source/static/js/ui/bancos.js
index 2f61cbb..9620d4d 100644
--- a/source/static/js/ui/bancos.js
+++ b/source/static/js/ui/bancos.js
@@ -90,6 +90,10 @@ var grid_cfdi_por_pagar_cols = [
{id: 'cliente', header: ['Razón Social', {content: 'selectFilter'}],
fillspace:true, sort: 'string'},
{id: 'total', header: ['Total'], width: 125, sort: 'int',
+ format: webix.i18n.priceFormat, css: 'right', hidden: true},
+ {id: 'currency', header: ['Moneda', {content: 'selectFilter'}],
+ adjust: 'data', sort: 'string', hidden: true},
+ {id: 'total_mn', header: ['Total M.N'], width: 125, sort: 'int',
format: webix.i18n.priceFormat, css: 'right'},
{id: 'saldo', header: ['Saldo'], width: 125, sort: 'int',
format: webix.i18n.priceFormat, css: 'right'},
@@ -107,11 +111,19 @@ var grid_cfdi_este_deposito_cols = [
{id: 'estatus', header: 'Estatus', adjust: 'header'},
{id: 'cliente', header: ['Razón Social'], fillspace: true},
{id: 'total', header: ['Total'], width: 125, sort: 'int',
+ format: webix.i18n.priceFormat, css: 'right', hidden: true},
+ {id: 'currency', header: ['Moneda', {content: 'selectFilter'}],
+ adjust: 'data', sort: 'string', hidden: true},
+ {id: 'total_mn', header: ['Total M.N'], width: 125, sort: 'int',
format: webix.i18n.priceFormat, css: 'right'},
{id: 'saldo', header: ['Saldo'], width: 125, sort: 'int',
format: webix.i18n.priceFormat, css: 'right'},
+ {id: 'this_pay', header: ['Este pago'], width: 125, sort: 'int', hidden: true,
+ format: webix.i18n.priceFormat, css: 'right', editor: 'text'},
{id: 'importe', header: ['Este pago'], width: 125, sort: 'int',
format: webix.i18n.priceFormat, css: 'right', editor: 'text'},
+ {id: 'type_change', header: ['T.C.'], width: 75, hidden: true,
+ format: format_currency4, css: 'right', editor: 'text'},
]
@@ -270,6 +282,8 @@ var toolbar_bank_pay = [
{view: 'button', id: 'cmd_pay_stamp', label: 'Timbrar',
type: 'iconButton', autowidth: true, icon: 'ticket'},
{view: 'button', id: 'cmd_pay_cancel', label: 'Cancelar',
+ type: 'iconButton', autowidth: true, icon: 'minus'},
+ {view: 'button', id: 'cmd_pay_delete', label: 'Eliminar',
type: 'iconButton', autowidth: true, icon: 'ban'},
{},
{view: 'icon', click: '$$("multi_bancos").setValue("banco_home")',
diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js
index 516bdc2..49fe2f4 100644
--- a/source/static/js/ui/invoices.js
+++ b/source/static/js/ui/invoices.js
@@ -255,6 +255,11 @@ var grid_invoices_cols = [
adjust: "data", sort:"string"},
{id: "paid", header: ["Pagada", {content: "selectFilter"}],
adjust: "data", sort:"string"},
+ {id: 'total', header: ['Total', {content: 'numberFilter'}],
+ width: 125, sort: 'int', format: webix.i18n.priceFormat, css: 'right',
+ hidden: true},
+ {id: 'currency', header: ['Moneda', {content: 'selectFilter'}],
+ adjust: 'data', sort: 'string', hidden: true},
{id: 'total_mn', header: ['Total M.N.', {content: 'numberFilter'}],
width: 150, sort: 'int', format: webix.i18n.priceFormat, css: 'right',
footer: {content: 'summTimbrada', css: 'right'}},