From 7c00839b1f0bf6b30912858c9f4b8fec7ddf3c8a Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <git@elmau.net>
Date: Tue, 21 Aug 2018 18:49:53 -0500
Subject: [PATCH 1/2] Fix - Quitar columna 'cancelado' en tabla 'facturaspagos'

---
 source/app/models/main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/app/models/main.py b/source/app/models/main.py
index 9510a49..b7112b8 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -7483,6 +7483,10 @@ def _migrate_tables():
         migrations.append(
             migrator.add_column('prefacturasdetalle', 'unidad', unidad))
 
+    columns = [c.name for c in database_proxy.get_columns('facturaspagos')]
+    if 'cancelado' in columns:
+        migrations.append(migrator.drop_column('facturaspagos', 'cancelado'))
+
     if migrations:
         with database_proxy.atomic() as txn:
             migrate(*migrations)

From ea18996111919694ccb27806eed4ae8913f8a211 Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <git@elmau.net>
Date: Tue, 21 Aug 2018 18:52:36 -0500
Subject: [PATCH 2/2] =?UTF-8?q?Actualizar=20versi=C3=B3n=20y=20lista=20de?=
 =?UTF-8?q?=20cambios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md           | 19 +++++++++++++++++++
 VERSION                |  2 +-
 source/app/settings.py |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63c718b..ddd8eb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,38 @@
+v 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
+```
+
+
 v 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.
 
+
 v 1.10.0 [10-jul-2018]
 ----------------------
     - Ahora se pueden manejar precios con cuatro decimales.
 
+
 v 1.9.3 [08-jul-2018]
 ---------------------
     - Fix: Al refacturar conceptos con descuento
 
+
 v 1.9.2 [05-jul-2018]
 ---------------------
     - Fix: Al generar el reporte de facturas en PDF
 
+
 v 1.9.1 [25-jun-2018]
 ---------------------
     - Fix: Al mostrar el título de la aplicación
diff --git a/VERSION b/VERSION
index 1cac385..720c738 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.0
+1.11.1
diff --git a/source/app/settings.py b/source/app/settings.py
index 1ef36d4..8156b47 100644
--- a/source/app/settings.py
+++ b/source/app/settings.py
@@ -31,7 +31,7 @@ except ImportError:
 
 
 DEBUG = DEBUG
-VERSION = '1.11.0'
+VERSION = '1.11.1'
 EMAIL_SUPPORT = ('soporte@empresalibre.net',)
 TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)