Merge branch 'develop'

Soporte para Factura de pagos

CHANGELOG.md

@@ -1,3 +1,19 @@
+v 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
+```
+
 v 1.11.1 [21-ago-2018]
 ----------------------
     - Fix - Quitar columna en tabla facturaspagos.

README.md

@@ -10,6 +10,10 @@ Este proyecto está en continuo desarrollo, contratar un esquema de soporte,
 nos ayuda a continuar su desarrollo. Ponte en contacto con nosotros para
 contratar: administracion ARROBA empresalibre.net
 
+#### Ahora también puede aportar con Bitcoin Cash (BCH):
+
+`pq763fj7kxxf2wtf360lfsy5ydw84yz72q76hanhxq`
+
 
 ### Requerimientos:
 

VERSION

@@ -1 +1 @@
-1.11.1
+1.12.0

source/app/controllers/cfdi_xml.py

@@ -1,4 +1,20 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+# ~ 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 <http://www.gnu.org/licenses/>.
 
 import datetime
 from xml.etree import ElementTree as ET
@@ -6,8 +22,6 @@ from xml.dom.minidom import parseString
 
 from logbook import Logger
 
-#~ from settings import DEBUG
-
 
 log = Logger('XML')
 CFDI_ACTUAL = 'cfdi33'
@@ -64,6 +78,12 @@ SAT = {
         'xmlns': 'http://www.sat.gob.mx/iedu',
         'schema': ' http://www.sat.gob.mx/iedu http://www.sat.gob.mx/sitio_internet/cfd/ine/iedu.xsd',
     },
+    'pagos': {
+        'version': '1.0',
+        'prefix': 'pago10',
+        'xmlns': 'http://www.sat.gob.mx/Pagos',
+        'schema': ' http://www.sat.gob.mx/Pagos http://www.sat.gob.mx/sitio_internet/cfd/Pagos/Pagos10.xsd',
+    },
 }
 
 
@@ -79,6 +99,7 @@ class CFDI(object):
         self._donativo = False
         self._ine = False
         self._edu = False
+        self._pagos = False
         self._is_nomina = False
         self.error = ''
 
@@ -129,6 +150,7 @@ class CFDI(object):
         if datos['complementos']:
             if 'ine' in datos['complementos']:
                 self._ine = True
+            self._pagos = bool(datos['complementos'].get('pagos', False))
 
         if 'nomina' in datos:
             self._is_nomina = True
@@ -174,9 +196,15 @@ class CFDI(object):
             attributes[name] = SAT['nomina']['xmlns']
             schema_nomina = SAT['nomina']['schema']
 
+        schema_pagos = ''
+        if self._pagos:
+            name = 'xmlns:{}'.format(SAT['pagos']['prefix'])
+            attributes[name] = SAT['pagos']['xmlns']
+            schema_pagos = SAT['pagos']['schema']
+
         attributes['xsi:schemaLocation'] = self._sat_cfdi['schema'] + \
             schema_locales + schema_donativo + schema_ine + schema_edu + \
-            schema_nomina
+            schema_nomina + schema_pagos
         attributes.update(datos)
 
         if not 'Version' in attributes:
@@ -403,6 +431,17 @@ class CFDI(object):
             atributos.update(datos['ine'])
             ET.SubElement(self._complemento, 'ine:INE', atributos)
 
+        if 'pagos' in datos:
+            datos = datos.pop('pagos')
+            relacionados = datos.pop('relacionados')
+            pre = SAT['pagos']['prefix']
+            attributes = {'Version': SAT['pagos']['version']}
+            pagos = ET.SubElement(
+                self._complemento, '{}:Pagos'.format(pre), attributes)
+            node_pago = ET.SubElement(pagos, '{}:Pago'.format(pre), datos)
+            for row in relacionados:
+                ET.SubElement(node_pago, '{}:DoctoRelacionado'.format(pre), row)
+
         if 'ce' in datos:
             pre = 'cce11'
             datos = datos.pop('ce')

source/app/controllers/main.py

@@ -509,8 +509,36 @@ class AppDocumentos(object):
         session = req.env['beaker.session']
         req.context['result'], file_name, content_type = \
             self._db.get_doc(type_doc, id_doc, session['rfc'])
-        if not type_doc in ('pdf', 'pre', 'tpdf'):
+        if not type_doc in ('pdf', 'pre', 'tpdf', 'pdfpago'):
             resp.append_header('Content-Disposition',
                 'attachment; filename={}'.format(file_name))
         resp.content_type = content_type
         resp.status = falcon.HTTP_200
+
+
+# ~ Revisado
+class AppInvoicePay(object):
+
+    def __init__(self, db):
+        self._db = db
+
+    def on_get(self, req, resp):
+        values = req.params
+        req.context['result'] = self._db.get_invoicepay(values)
+        resp.status = falcon.HTTP_200
+
+
+class AppCfdiPay(object):
+
+    def __init__(self, db):
+        self._db = db
+
+    def on_get(self, req, resp):
+        values = req.params
+        req.context['result'] = self._db.get_cfdipay(values)
+        resp.status = falcon.HTTP_200
+
+    def on_post(self, req, resp):
+        values = req.params
+        req.context['result'] = self._db.cfdipay(values)
+        resp.status = falcon.HTTP_200

source/app/controllers/util.py

@@ -320,6 +320,9 @@ def get_template_ods(name, default='plantilla_factura.ods'):
     if is_file(path):
         return path
 
+    if 'pagos' in name:
+        default='plantilla_pagos.ods'
+
     path = _join(PATH_TEMPLATES, default)
     if is_file(path):
         return path
@@ -954,6 +957,9 @@ class LIBO(object):
 
         self._set_cell('{total_cantidades}', str(self._total_cantidades))
 
+        if self._pagos:
+            return
+
         cell_title = self._set_cell('{subtotal.titulo}', 'SubTotal')
         value = data['subtotal']
         cell_value = self._set_cell('{subtotal}', value, value=True)
@@ -1150,16 +1156,114 @@ class LIBO(object):
 
         return
 
+    def _cfdipays(self, data):
+        related = data.pop('related', [])
+        for k, v in data.items():
+            if k.lower() in ('monto',):
+                self._set_cell('{pago.%s}' % k, v, value=True)
+            else:
+                self._set_cell('{pago.%s}' % k, v)
+
+        col1 = []
+        col2 = []
+        col3 = []
+        col4 = []
+        col5 = []
+        col6 = []
+        col7 = []
+        col8 = []
+        col9 = []
+        count = len(related)
+        for i, doc in enumerate(related):
+            uuid = doc['IdDocumento'].upper()
+            serie = doc['Serie']
+            folio = doc['Folio']
+            metodo_pago = doc['MetodoDePagoDR']
+            moneda = doc['MonedaDR']
+            parcialidad = doc['NumParcialidad']
+            saldo_anterior = doc['ImpSaldoAnt']
+            importe_pagado = doc['ImpPagado']
+            saldo_insoluto = doc['ImpSaldoInsoluto']
+            if i == 0:
+                cell_1 = self._set_cell('{doc.uuid}', uuid)
+                cell_2 = self._set_cell('{doc.serie}', serie)
+                cell_3 = self._set_cell('{doc.folio}', folio)
+                cell_4 = self._set_cell('{doc.metodopago}', metodo_pago)
+                cell_5 = self._set_cell('{doc.moneda}', moneda)
+                cell_6 = self._set_cell('{doc.parcialidad}', parcialidad)
+                cell_7 = self._set_cell('{doc.saldoanterior}', saldo_anterior, value=True)
+                cell_8 = self._set_cell('{doc.importepagado}', importe_pagado, value=True)
+                cell_9 = self._set_cell('{doc.saldoinsoluto}', saldo_insoluto, value=True)
+            else:
+                col1.append((uuid,))
+                col2.append((serie,))
+                col3.append((folio,))
+                col4.append((metodo_pago,))
+                col5.append((moneda,))
+                col6.append((parcialidad,))
+                col7.append((float(saldo_anterior),))
+                col8.append((float(importe_pagado),))
+                col9.append((float(saldo_insoluto),))
+
+        if count == 1:
+            return
+
+        count -= 1
+        row1 = cell_1.getCellAddress().Row + 1
+        row2 = row1 + count - 1
+        self._sheet.getRows().insertByIndex(row1, count)
+        self._copy_paste_rows(cell_1, count)
+
+        # ~ style_7 = self._get_style(cell_7)
+        # ~ style_8 = self._get_style(cell_8)
+        # ~ style_9 = self._get_style(cell_9)
+
+        col = cell_1.getCellAddress().Column
+        target1 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_2.getCellAddress().Column
+        target2 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_3.getCellAddress().Column
+        target3 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_4.getCellAddress().Column
+        target4 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_5.getCellAddress().Column
+        target5 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_6.getCellAddress().Column
+        target6 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_7.getCellAddress().Column
+        target7 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_8.getCellAddress().Column
+        target8 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+        col = cell_9.getCellAddress().Column
+        target9 = self._sheet.getCellRangeByPosition(col, row1, col, row2)
+
+        target1.setFormulaArray(tuple(col1))
+        target2.setDataArray(tuple(col2))
+        target3.setFormulaArray(tuple(col3))
+        target4.setDataArray(tuple(col4))
+        target5.setDataArray(tuple(col5))
+        target6.setDataArray(tuple(col6))
+        target7.setDataArray(tuple(col7))
+        target8.setDataArray(tuple(col8))
+        target9.setDataArray(tuple(col9))
+
+        return
+
     def _render(self, data):
         self._set_search()
         self._es_pre = data.pop('es_pre', False)
         self._is_ticket = data.pop('is_ticket', False)
         self._currency = data['totales']['moneda']
+        self._pagos = data.pop('pagos', False)
 
         self._comprobante(data['comprobante'])
         self._emisor(data['emisor'])
         self._receptor(data['receptor'])
         self._conceptos(data['conceptos'])
+
+        if self._pagos:
+            self._cfdipays(data['pays'])
+
         if 'nomina' in data and data['nomina']:
             self._nomina(data['nomina'])
         else:
@@ -1167,6 +1271,7 @@ class LIBO(object):
         self._timbre(data['timbre'])
         self._donataria(data['donataria'])
         self._ine(data['ine'])
+
         self._cancelado(data['cancelada'])
         self._clean()
         return
@@ -1444,13 +1549,17 @@ def to_pdf(data, emisor_rfc, ods=False):
     if 'nomina' in data and data['nomina']:
         version = '{}_{}'.format(data['nomina']['version'], version)
 
+    pagos = ''
+    if data.get('pagos', False):
+        pagos = '_pagos_'
+
     if APP_LIBO:
         app = LIBO()
         if app.is_running:
             donativo = ''
             if data['donativo']:
                 donativo = '_donativo'
-            name = '{}_{}{}.ods'.format(rfc.lower(), version, donativo)
+            name = '{}_{}{}{}.ods'.format(rfc.lower(), pagos, version, donativo)
             path = get_template_ods(name)
             if path:
                 return app.pdf(path, data, ods)
@@ -1553,6 +1662,7 @@ def _comprobante(doc, options):
             'I': 'ingreso',
             'E': 'egreso',
             'T': 'traslado',
+            'P': 'pago',
         }
         data['tipodecomprobante'] = tipos.get(data['tipodecomprobante'])
         data['lugarexpedicion'] = \
@@ -1854,6 +1964,27 @@ def _nomina(doc, data, values, version_cfdi):
     return info
 
 
+def _cfdipays(doc, data, version):
+    node = doc.find('{}Complemento/{}Pagos'.format(PRE[version], PRE['pagos']))
+    if node is None:
+        return {}
+
+    info = CaseInsensitiveDict(node.attrib.copy())
+    related = []
+    for n1 in node:
+        info.update(CaseInsensitiveDict(n1.attrib.copy()))
+        for n2 in n1:
+            related.append(CaseInsensitiveDict(n2.attrib.copy()))
+
+    info['related'] = related
+
+    data['comprobante']['totalenletras'] = to_letters(
+        float(info['monto']), info['monedap'])
+    data['comprobante']['moneda'] = info['monedap']
+
+    return info
+
+
 def get_data_from_xml(invoice, values):
     data = {'cancelada': invoice.cancelada, 'donativo': False}
     if hasattr(invoice, 'donativo'):
@@ -1878,6 +2009,9 @@ def get_data_from_xml(invoice, values):
     data['comprobante'].update(data['timbre'])
 
     data['nomina'] = _nomina(doc, data, values, version)
+    data['pagos'] = values.get('pagos', False)
+    if data['pagos']:
+        data['pays'] = _cfdipays(doc, data, version)
 
     return data
 

source/app/main.py

@@ -16,7 +16,8 @@ from controllers.main import (AppEmpresas,
     AppLogin, AppLogout, AppAdmin, AppEmisor, AppConfig,
     AppMain, AppValues, AppPartners, AppProducts, AppInvoices, AppFolios,
     AppDocumentos, AppFiles, AppPreInvoices, AppCuentasBanco,
-    AppMovimientosBanco, AppTickets, AppStudents, AppEmployees, AppNomina
+    AppMovimientosBanco, AppTickets, AppStudents, AppEmployees, AppNomina,
+    AppInvoicePay, AppCfdiPay
 )
 
 
@@ -55,6 +56,8 @@ api.add_route('/movbanco', AppMovimientosBanco(db))
 api.add_route('/students', AppStudents(db))
 api.add_route('/employees', AppEmployees(db))
 api.add_route('/nomina', AppNomina(db))
+api.add_route('/invoicepay', AppInvoicePay(db))
+api.add_route('/cfdipay', AppCfdiPay(db))
 
 
 # ~ Activa si usas waitress y NO estas usando servidor web

source/app/models/db.py

@@ -412,3 +412,13 @@ class StorageEngine(object):
 
     def importar_bdfl(self):
         return main.importar_bdfl()
+
+    # ~ Revisado
+    def get_invoicepay(self, values):
+        return main.FacturasPagos.get_values(values)
+
+    def get_cfdipay(self, values):
+        return main.CfdiPagos.get_values(values)
+
+    def cfdipay(self, values):
+        return main.CfdiPagos.post(values)

source/app/models/main.py

@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # ~ Empresa Libre
-# ~ Copyright (C) 2018  Mauricio Baeza Servin (web@correolibre.net)
+# ~ 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
@@ -34,7 +34,8 @@ from controllers import util
 from settings import log, DEBUG, VERSION, PATH_CP, COMPANIES, PRE, CURRENT_CFDI, \
     INIT_VALUES, DEFAULT_PASSWORD, DECIMALES, IMPUESTOS, DEFAULT_SAT_PRODUCTO, \
     CANCEL_SIGNATURE, PUBLIC, DEFAULT_SERIE_TICKET, CURRENT_CFDI_NOMINA, \
-    DEFAULT_SAT_NOMINA, DECIMALES_TAX, TITLE_APP, MV, DECIMALES_PRECIOS
+    DEFAULT_SAT_NOMINA, DECIMALES_TAX, TITLE_APP, MV, DECIMALES_PRECIOS, \
+    DEFAULT_CFDIPAY
 
 
 FORMAT = '{0:.2f}'
@@ -213,6 +214,10 @@ def get_doc(type_doc, id, rfc):
         data, file_name = util.get_log('nomina')
     elif type_doc == 'nompdf':
         data, file_name = CfdiNomina.get_pdf(id, rfc)
+    elif type_doc == 'xmlpago':
+        data, file_name = CfdiPagos.get_file_xml(id)
+    elif type_doc == 'pdfpago':
+        data, file_name = CfdiPagos.get_file_pdf(id)
 
     return data, file_name, content_type
 
@@ -223,8 +228,8 @@ def config_main():
     except IndexError:
         obj = None
 
-    punto_de_venta = util.get_bool(Configuracion.get_('chk_usar_punto_de_venta'))
-    nomina = util.get_bool(Configuracion.get_('chk_usar_nomina'))
+    punto_de_venta = Configuracion.get_bool('chk_usar_punto_de_venta')
+    nomina = Configuracion.get_bool('chk_usar_nomina')
     data = {
         'empresa': get_title_app(3),
         'punto_de_venta': punto_de_venta,
@@ -232,8 +237,9 @@ def config_main():
         'nomina': nomina,
         'timbres': 0,
         'decimales_precios': DECIMALES,
+        'pagos': Configuracion.get_bool('chk_config_pagos')
     }
-    dp = util.get_bool(Configuracion.get_('chk_config_decimales_precios'))
+    dp = Configuracion.get_bool('chk_config_decimales_precios')
     if dp:
         data['decimales_precios'] = DECIMALES_PRECIOS
 
@@ -363,6 +369,7 @@ class Configuracion(BaseModel):
                 'chk_llevar_inventario',
                 'chk_config_ine',
                 'chk_config_edu',
+                'chk_config_pagos',
                 'chk_usar_punto_de_venta',
                 'chk_ticket_pdf_show',
                 'chk_ticket_direct_print',
@@ -891,10 +898,15 @@ class Certificado(BaseModel):
     rfc = TextField(default='')
     desde = DateTimeField(null=True)
     hasta = DateTimeField(null=True)
+    es_fiel = BooleanField(default=False)
 
     def __str__(self):
         return self.serie
 
+    @classmethod
+    def get_cert(cls, is_fiel=False):
+        return Certificado.get(Certificado.es_fiel==is_fiel)
+
     @classmethod
     def get_data(cls):
         obj = cls.get_(cls)
@@ -1676,6 +1688,10 @@ class CuentasBanco(BaseModel):
 
     @classmethod
     def get_(cls, values):
+        opt = values.pop('opt', '')
+        if opt:
+            return getattr(cls, '_get_{}'.format(opt))(cls, values)
+
         if values['tipo'] == '1':
             rows = (CuentasBanco
                 .select()
@@ -1695,7 +1711,12 @@ class CuentasBanco(BaseModel):
             }
             return data
 
-        return
+        return {'ok': False}
+
+    def _get_currency(self, values):
+        id = int(values['id'])
+        account = CuentasBanco.get(CuentasBanco.id==id)
+        return {'ok': True, 'currency': account.moneda.name}
 
     @classmethod
     def emisor(cls):
@@ -1933,11 +1954,13 @@ class MovimientosBanco(BaseModel):
             .select(
                 MovimientosBanco.id,
                 MovimientosBanco.fecha,
+                SATFormaPago.name.alias('way_payment'),
                 MovimientosBanco.numero_operacion,
                 MovimientosBanco.descripcion,
                 MovimientosBanco.retiro,
                 MovimientosBanco.deposito,
                 MovimientosBanco.saldo)
+            .join(SATFormaPago).switch(MovimientosBanco)
             .where(filtros)
             .dicts()
         )
@@ -1945,21 +1968,6 @@ class MovimientosBanco(BaseModel):
         return {'ok': True, 'rows': rows}
 
 
-class CfdiPagos(BaseModel):
-    movimiento = ForeignKeyField(MovimientosBanco)
-    fecha = DateTimeField(default=util.now, formats=['%Y-%m-%d %H:%M:%S'])
-    fecha_timbrado = DateTimeField(null=True)
-    xml = TextField(default='')
-    uuid = UUIDField(null=True)
-    estatus = TextField(default='Guardado')
-    estatus_sat = TextField(default='')
-    notas = TextField(default='')
-    cancelado = BooleanField(default=False)
-
-    class Meta:
-        order_by = ('movimiento',)
-
-
 class SATUsoCfdi(BaseModel):
     key = TextField(index=True, unique=True)
     name = TextField(default='', index=True)
@@ -5220,6 +5228,413 @@ class FacturasPagos(BaseModel):
             cls._actualizar_saldo_cliente(cls, fac.cliente, importe * -1)
         return
 
+    def _get_related(self, values):
+        id = int(values['id'])
+        filters = (FacturasPagos.movimiento==id)
+
+        rows = tuple(FacturasPagos
+            .select(
+                Facturas.id,
+                Facturas.serie,
+                Facturas.folio,
+                Facturas.uuid,
+                Facturas.fecha,
+                Facturas.tipo_comprobante,
+                Facturas.estatus,
+                Socios.nombre.alias('cliente'),
+                Facturas.total,
+                FacturasPagos.saldo,
+                FacturasPagos.importe,
+            )
+            .join(Facturas).switch(FacturasPagos)
+            .join(Socios, on=(Facturas.cliente==Socios.id))
+            .where(filters)
+            .dicts()
+        )
+
+        return {'ok': True, 'rows': rows}
+
+    @classmethod
+    def get_values(cls, values):
+        opt = values.pop('opt')
+        return getattr(cls, '_get_{}'.format(opt))(cls, values)
+
+
+class CfdiPagos(BaseModel):
+    movimiento = ForeignKeyField(MovimientosBanco)
+    socio = ForeignKeyField(Socios)
+    serie = TextField(default='')
+    folio = IntegerField(default=0)
+    fecha = DateTimeField(default=util.now, formats=['%Y-%m-%d %H:%M:%S'])
+    fecha_timbrado = DateTimeField(null=True)
+    tipo_comprobante = TextField(default=DEFAULT_CFDIPAY['TYPE'])
+    lugar_expedicion = TextField(default='')
+    regimen_fiscal = TextField(default='')
+    tipo_relacion = TextField(default='')
+    uuid_relacionado = UUIDField(null=True)
+    xml = TextField(default='')
+    uuid = UUIDField(null=True)
+    estatus = TextField(default='Guardada')
+    estatus_sat = TextField(default='')
+    notas = TextField(default='')
+    error = TextField(default='')
+    cancelada = BooleanField(default=False)
+
+    class Meta:
+        order_by = ('movimiento',)
+
+    @classmethod
+    def post(cls, values):
+        opt = values.pop('opt')
+        return getattr(cls, '_{}'.format(opt))(cls, values)
+
+    def _get_folio(self, serie):
+        folio = int(Configuracion.get_('txt_config_cfdipay_folio') or '0')
+        start = (CfdiPagos
+            .select(fn.Max(CfdiPagos.folio).alias('mf'))
+            .where(CfdiPagos.serie==serie)
+            .order_by(SQL('mf'))
+            .scalar())
+
+        if start is None:
+            next_folio = 1
+        else:
+            next_folio = start + 1
+
+        if folio > next_folio:
+            next_folio = folio
+
+        return next_folio
+
+    def _new(self, values):
+        id_mov = int(values['id_mov'])
+
+        filters = (FacturasPagos.movimiento==id_mov)
+        related = FacturasPagos.select().where(filters)
+        if not related:
+            msg = 'El pago no tiene facturas relacionadas'
+            data = {'ok': False, 'msg': msg}
+            return data
+
+        partner = tuple(set([f.factura.cliente.id 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_name = related[0].factura.cliente.nombre
+        regimen_fiscal = related[0].factura.regimen_fiscal
+
+        filters = (
+            (CfdiPagos.movimiento==id_mov) &
+            (CfdiPagos.cancelada==False)
+        )
+        previous = CfdiPagos.select().where(filters)
+        if previous:
+            previous = previous[0]
+            if previous.uuid:
+                msg = 'Hay una factura activa, es necesario cancelarla primero'
+                data = {'ok': False, 'msg': msg}
+                return data
+            else:
+                data = {'ok': True, 'new': False}
+                return data
+
+        emisor = Emisor.select()[0]
+        serie = Configuracion.get_('txt_config_cfdipay_serie') or DEFAULT_CFDIPAY['SERIE']
+        fields = {}
+        fields['movimiento'] = id_mov
+        fields['socio'] = partner
+        fields['serie'] = serie
+        fields['folio'] = self._get_folio(self, serie)
+        fields['lugar_expedicion'] = emisor.cp_expedicion or emisor.codigo_postal
+        fields['regimen_fiscal'] = regimen_fiscal
+
+        with database_proxy.atomic() as txn:
+            obj = CfdiPagos.create(**fields)
+
+        row = {
+            'id': obj.id,
+            'serie': obj.serie,
+            'folio': obj.folio,
+            'uuid': obj.uuid,
+            'fecha': obj.fecha,
+            'tipo_comprobante': obj.tipo_comprobante,
+            'estatus': obj.estatus,
+            'cliente': partner_name,
+        }
+        data = {'ok': True, 'row': row, 'new': True}
+        return data
+
+    def _get_related_xml(self, id_mov, currency):
+        filters = (FacturasPagos.movimiento==id_mov)
+        related = tuple(FacturasPagos.select(
+                Facturas.uuid.alias('IdDocumento'),
+                Facturas.serie.alias('Serie'),
+                Facturas.folio.alias('Folio'),
+                Facturas.moneda.alias('MonedaDR'),
+                # ~ Facturas.tipo_cambio.alias('TipoCambioDR'),
+                # ~ Facturas.metodo_pago.alias('MetodoDePagoDR'),
+                FacturasPagos.numero.alias('NumParcialidad'),
+                FacturasPagos.saldo_anterior.alias('ImpSaldoAnt'),
+                FacturasPagos.importe.alias('ImpPagado'),
+                FacturasPagos.saldo.alias('ImpSaldoInsoluto'),
+            ).join(Facturas).switch(FacturasPagos)
+            .where(filters)
+            .dicts())
+
+        for r in related:
+            # ~ print('\n\nMONEDA', currency, r['MonedaDR'])
+            r['IdDocumento'] = str(r['IdDocumento'])
+            r['Folio'] = str(r['Folio'])
+            r['NumParcialidad'] = str(r['NumParcialidad'])
+            # ~ r['TipoCambioDR'] = FORMAT.format(r['TipoCambioDR'])
+            r['MetodoDePagoDR'] = DEFAULT_CFDIPAY['WAYPAY']
+            r['ImpSaldoAnt'] = FORMAT.format(r['ImpSaldoAnt'])
+            r['ImpPagado'] = FORMAT.format(r['ImpPagado'])
+            r['ImpSaldoInsoluto'] = FORMAT.format(r['ImpSaldoInsoluto'])
+
+        return related
+
+    def _generate_xml(self, invoice, auth):
+        emisor = Emisor.select()[0]
+        cert = Certificado.get_cert()
+
+        cfdi = {}
+        related = {}
+        cfdi['Serie'] = invoice.serie
+        cfdi['Folio'] = str(invoice.folio)
+        cfdi['Fecha'] = invoice.fecha.isoformat()[:19]
+        cfdi['NoCertificado'] = cert.serie
+        cfdi['Certificado'] = cert.cer_txt
+        cfdi['SubTotal'] = '0'
+        cfdi['Moneda'] = DEFAULT_CFDIPAY['CURRENCY']
+        cfdi['Total'] = '0'
+        cfdi['TipoDeComprobante'] = invoice.tipo_comprobante
+        cfdi['LugarExpedicion'] = invoice.lugar_expedicion
+
+        if invoice.tipo_relacion:
+            related = {
+                'tipo': invoice.tipo_relacion,
+                'cfdis': (invoice.uuid_relacionado,),
+            }
+
+        emisor = {
+            'Rfc': emisor.rfc,
+            'Nombre': emisor.nombre,
+            'RegimenFiscal': invoice.regimen_fiscal,
+        }
+
+        receptor = {
+            'Rfc': invoice.socio.rfc,
+            'Nombre': invoice.socio.nombre,
+            'UsoCFDI': DEFAULT_CFDIPAY['USED'],
+        }
+        if invoice.socio.tipo_persona == 4:
+            if invoice.socio.pais:
+                receptor['ResidenciaFiscal'] = invoice.socio.pais
+            if invoice.socio.id_fiscal:
+                receptor['NumRegIdTrib'] = invoice.socio.id_fiscal
+
+        conceptos = ({
+            'ClaveProdServ': DEFAULT_CFDIPAY['KEYSAT'],
+            'Cantidad': '1',
+            'ClaveUnidad': DEFAULT_CFDIPAY['UNITKEY'],
+            'Descripcion': DEFAULT_CFDIPAY['DESCRIPTION'],
+            'ValorUnitario': '0',
+            'Importe': '0',
+        },)
+
+        impuestos = {}
+
+        mov = invoice.movimiento
+        currency = mov.cuenta.moneda.key
+        related_docs = self._get_related_xml(self, invoice.movimiento, currency)
+        pagos = {
+            'FechaPago': mov.fecha.isoformat()[:19],
+            'FormaDePagoP': mov.forma_pago.key,
+            'MonedaP': currency,
+            'Monto': FORMAT.format(mov.deposito),
+            'relacionados': related_docs,
+        }
+
+        complementos = {'pagos': pagos}
+        data = {
+            'comprobante': cfdi,
+            'relacionados': related,
+            'emisor': emisor,
+            'receptor': receptor,
+            'conceptos': conceptos,
+            'impuestos': impuestos,
+            'donativo': {},
+            'edu': False,
+            'complementos': complementos,
+        }
+        return util.make_xml(data, cert, auth)
+
+    def _stamp(self, values):
+        id_mov = int(values['id_mov'])
+
+        auth = Emisor.get_auth()
+        filters = (
+            (CfdiPagos.movimiento==id_mov) &
+            (CfdiPagos.uuid.is_null(True))
+        )
+        obj = CfdiPagos.get(filters)
+        obj.xml = self._generate_xml(self, obj, auth)
+        obj.estatus = 'Generada'
+        obj.save()
+        msg = 'Factura timbrada correctamente'
+        result = util.timbra_xml(obj.xml, auth)
+        if result['ok']:
+            obj.xml = result['xml']
+            obj.uuid = result['uuid']
+            obj.fecha_timbrado = result['fecha']
+            obj.estatus = 'Timbrada'
+            obj.error = ''
+            row = {'uuid': obj.uuid, 'estatus': 'Timbrada'}
+        else:
+            msg = result['error']
+            obj.estatus = 'Error'
+            obj.error = msg
+            row = {'estatus': 'Error'}
+
+        obj.save()
+
+        result = {
+            'ok': result['ok'],
+            'msg': msg,
+            'id': obj.id,
+            'row': row,
+        }
+        return result
+
+    def _get_related(self, values):
+        id_mov = int(values['id_mov'])
+        filters = (
+            (CfdiPagos.movimiento==id_mov)
+        )
+        rows = tuple(CfdiPagos.select(
+            CfdiPagos.id,
+            CfdiPagos.serie,
+            CfdiPagos.folio,
+            CfdiPagos.uuid,
+            CfdiPagos.fecha,
+            CfdiPagos.tipo_comprobante,
+            CfdiPagos.estatus,
+            Socios.nombre.alias('cliente'),
+            ).join(Socios).switch(CfdiPagos)
+            .where(filters).dicts())
+        return {'ok': True, 'rows': rows}
+
+    @classmethod
+    def get_file_xml(cls, id):
+        obj = CfdiPagos.get(CfdiPagos.id==id)
+        folio = str(obj.folio).zfill(6)
+        name = '{}{}_{}.xml'.format(obj.serie, folio, obj.socio.rfc)
+        return obj.xml, name
+
+    def _get_not_in_xml(self, invoice, emisor):
+        values = {}
+
+        values['notas'] = invoice.notas
+        values['fechadof'] = None
+
+        obj = SATRegimenes.get(SATRegimenes.key==invoice.regimen_fiscal)
+        values['regimenfiscal'] = str(obj)
+
+        obj = SATUsoCfdi.get(SATUsoCfdi.key=='P01')
+        values['usocfdi'] = str(obj)
+
+        values['moneda'] = 'XXX'
+
+        if invoice.tipo_relacion:
+            obj = SATTipoRelacion.get(SATTipoRelacion.key==invoice.tipo_relacion)
+            values['tiporelacion'] = str(obj)
+
+        receptor = Socios.select().where(Socios.id==invoice.socio.id).dicts()[0]
+        values['receptor'] = {}
+        for k, v in receptor.items():
+            values['receptor'][k] = v
+
+        values['pagos'] = True
+        return values
+
+    @classmethod
+    def get_file_pdf(cls, id):
+        try:
+            emisor = Emisor.select()[0]
+        except IndexError:
+            return b'', 'sin_datos_de_emisor.pdf'
+
+        obj = CfdiPagos.get(CfdiPagos.id==id)
+        folio = str(obj.folio).zfill(6)
+        name = '{}{}_{}.pdf'.format(obj.serie, folio, obj.socio.rfc)
+
+        if obj.uuid is None:
+            return b'', name
+
+        values = cls._get_not_in_xml(cls, obj, emisor)
+        data = util.get_data_from_xml(obj, values)
+        obj = SATFormaPago.get(SATFormaPago.key==data['pays']['FormaDePagoP'])
+        data['pays']['formadepago'] = '{} ({})'.format(obj.name, obj.key)
+        doc = util.to_pdf(data, emisor.rfc)
+
+        return doc, name
+
+    @classmethod
+    def get_values(cls, values):
+        opt = values.pop('opt')
+        return getattr(cls, '_get_{}'.format(opt))(cls, values)
+
+    def _send(self, values):
+        id = int(values['id'])
+
+        values = Configuracion.get_({'fields': 'correo'})
+        if not values:
+            msg = 'No esta configurado el servidor de correo de salida'
+            return {'ok': False, 'msg': msg}
+
+        obj = CfdiPagos.get(CfdiPagos.id==id)
+        if obj.uuid is None:
+            msg = 'La factura no esta timbrada'
+            return {'ok': False, 'msg': msg}
+
+        to = obj.socio.correo_facturas
+        if not to:
+            msg = 'El cliente no tiene configurado el correo para facturas'
+            return {'ok': False, 'msg': msg}
+
+        files = (self.get_file_pdf(id), self.get_file_xml(id))
+
+        fields = util.make_fields(obj.xml)
+        server = {
+            'servidor': values['correo_servidor'],
+            'puerto': values['correo_puerto'],
+            'ssl': bool(int(values['correo_ssl'])),
+            'usuario': values['correo_usuario'],
+            'contra': values['correo_contra'],
+        }
+        options = {
+            'para': to,
+            'copia': values.get('correo_copia', ''),
+            'confirmar': util.get_bool(values.get('correo_confirmacion', '0')),
+            'asunto': util.make_info_mail(values['correo_asunto'], fields),
+            'mensaje': util.make_info_mail(values['correo_mensaje'], fields),
+            'files': files,
+        }
+        data= {
+            'server': server,
+            'options': options,
+        }
+        result = util.send_mail(data)
+        if not result['ok'] or result['msg']:
+            return {'ok': False, 'msg': result['msg']}
+
+        msg = 'Factura enviada correctamente'
+        return {'ok': True, 'msg': msg}
+
 
 class PreFacturasImpuestos(BaseModel):
     factura = ForeignKeyField(PreFacturas)
@@ -7487,6 +7902,35 @@ def _migrate_tables():
     if 'cancelado' in columns:
         migrations.append(migrator.drop_column('facturaspagos', 'cancelado'))
 
+    columns = [c.name for c in database_proxy.get_columns('certificado')]
+    if not 'es_fiel' in columns:
+        es_fiel = BooleanField(default=False)
+        migrations.append(migrator.add_column('certificado', 'es_fiel', es_fiel))
+
+    columns = [c.name for c in database_proxy.get_columns('cfdipagos')]
+    if not 'serie' in columns:
+        socio = ForeignKeyField(Socios, null=True, to_field=Socios.id)
+        serie = TextField(default='')
+        folio = IntegerField(default=0)
+        lugar_expedicion = TextField(default='')
+        regimen_fiscal = TextField(default='')
+        tipo_comprobante = TextField(default=DEFAULT_TYPE_CFDIPAY)
+        error = TextField(default='')
+        tipo_relacion = TextField(default='')
+        uuid_relacionado = UUIDField(null=True)
+        cancelada = BooleanField(default=False)
+        migrations.append(migrator.add_column('cfdipagos', 'serie', serie))
+        migrations.append(migrator.add_column('cfdipagos', 'folio', folio))
+        migrations.append(migrator.add_column('cfdipagos', 'lugar_expedicion', lugar_expedicion))
+        migrations.append(migrator.add_column('cfdipagos', 'regimen_fiscal', regimen_fiscal))
+        migrations.append(migrator.add_column('cfdipagos', 'tipo_comprobante', tipo_comprobante))
+        migrations.append(migrator.add_column('cfdipagos', 'error', error))
+        migrations.append(migrator.add_column('cfdipagos', 'tipo_relacion', tipo_relacion))
+        migrations.append(migrator.add_column('cfdipagos', 'uuid_relacionado', uuid_relacionado))
+        migrations.append(migrator.add_column('cfdipagos', 'socio_id', socio))
+        migrations.append(migrator.drop_column('cfdipagos', 'cancelado'))
+        migrations.append(migrator.add_column('cfdipagos', 'cancelada', cancelada))
+
     if migrations:
         with database_proxy.atomic() as txn:
             migrate(*migrations)

source/app/settings.py

@@ -1,4 +1,20 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+# ~ 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 <http://www.gnu.org/licenses/>.
 
 import logbook
 import os
@@ -31,7 +47,7 @@ except ImportError:
 
 
 DEBUG = DEBUG
-VERSION = '1.11.1'
+VERSION = '1.12.0'
 EMAIL_SUPPORT = ('soporte@empresalibre.net',)
 TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)
 
@@ -116,7 +132,8 @@ PRE = {
     'NOMINA': {
         '1.1': '{http://www.sat.gob.mx/nomina}',
         '1.2': '{http://www.sat.gob.mx/nomina12}',
-        }
+        },
+    'pagos': '{http://www.sat.gob.mx/Pagos}',
 }
 
 CURRENT_CFDI = '3.3'
@@ -138,6 +155,16 @@ IMPUESTOS = {
 }
 DEFAULT_SAT_PRODUCTO = '01010101'
 DEFAULT_SERIE_TICKET = 'T'
+DEFAULT_CFDIPAY = {
+    'SERIE': 'FP',
+    'TYPE': 'P',
+    'WAYPAY': 'PPD',
+    'CURRENCY': 'XXX',
+    'USED': 'P01',
+    'KEYSAT': '84111506',
+    'UNITKEY': 'ACT',
+    'DESCRIPTION': 'Pago',
+}
 DIR_FACTURAS = 'facturas'
 USAR_TOKEN = False
 CANCEL_SIGNATURE = False

source/static/css/air.css

@@ -1,6 +1,6 @@
 /*
 @license
-webix UI v.5.0.0
+webix UI v.5.4.3
 This software is covered by Webix Commercial License.
 Usage without proper license is prohibited.
 (c) XB Software Ltd.
@@ -9,12 +9,12 @@ Usage without proper license is prohibited.
 .webix_view.webix_form{background-color:#fff}
 body{-webkit-tap-highlight-color:transparent!important}
 .webix_abslayout{position:relative}
-.webix_abslayout>.webix_view{position:absolute}
+.webix_abslayout>.webix_view{position:absolute!important}
 .webix_layout_space,.webix_layout_wide{background-color:#ebebeb}
 .webix_layout_accordion,.webix_layout_clean,.webix_layout_line,.webix_multiview{background:0 0}
 .webix_overlay{width:100%;height:100%;position:absolute;z-index:10;text-align:center;padding-top:10px}
 .webix_view>.webix_disabled{width:100%;height:100%;position:absolute;top:0;left:0;background-color:#ddd;opacity:.4;filter:alpha(opacity=40);z-index:1}
-.webix_disabled_view{overflow:hidden!important}
+.webix_disabled_view{overflow:hidden!important;position:relative}
 body.webix_full_screen{margin:0;padding:0;overflow:hidden}
 .webix_noselect,.webix_noselect div{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}
 .webix_selectable{-moz-user-select:text;-webkit-user-select:text;user-select:text}
@@ -25,38 +25,38 @@ body.webix_full_screen{margin:0;padding:0;overflow:hidden}
 .webix_section>.webix_template{padding:0 8px;background-color:#fff;display:inline}
 .webix_layout_space>.webix_section>.webix_template,.webix_layout_wide>.webix_section>.webix_template{padding:0 8px;background-color:#ebebeb}
 .webix_layout_clean>.webix_section>.webix_template,.webix_layout_line>.webix_section>.webix_template{padding:0 8px;background-color:#fff}
-.webix_header>div{padding-left:10px;font-family:Helvetica,Verdana;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);line-height:32px;line-height:34px;padding-top:0;padding-bottom:0}
+.webix_header>div{padding-left:10px;font-family:Helvetica,Verdana;color:#1e2022;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x;line-height:32px;line-height:34px;padding-top:0;padding-bottom:0}
 .webix_header>div .webix_el_label,.webix_header>div .webix_inp_label{color:#1e2022}
 .webix_spacer{background:0 0}
 .webix_view_animate{position:relative;width:100%;height:100%}
 x\:ui{display:none}
-.webix_flexlayout{display:flex!important;flex-wrap:wrap;flex-direction:row;overflow:hidden;box-sizing:border-box}
+.webix_view.webix_flexlayout{display:flex!important;flex-wrap:wrap;flex-direction:row;overflow:hidden;box-sizing:border-box}
 .webix_flexlayout>div{display:block!important}
 .webix_view_align{background:0 0}
 .webix_view a.webix_list_item,.webix_view div,.webix_view span{outline:0}
-.webix_view a.webix_list_item:focus,.webix_view div:focus,.webix_view span:focus,.webix_view.webix_window:focus{outline:#727981 dotted 1px}
+.webix_view a.webix_list_item:focus,.webix_view div:focus,.webix_view span:focus,.webix_view.webix_window:focus{outline-color:#727981;outline-style:dotted;outline-width:1px}
 .webix_view div.webix_inp_static:focus,button,input,select,textarea{outline:0}
 .webix_resize_area{position:absolute;top:0;left:0;width:100%;height:100%}
 .webix_resize_handle_x .webix_handle_content,.webix_resize_handle_y .webix_handle_content{width:100%;height:100%;background:rgba(100,100,100,.1);border:1px dotted #9fa5aa}
-.webix_resize_handle_x{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:e-resize;width:1px;height:100%;position:absolute;z-index:2;top:0}
+.webix_resize_handle_x{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:ew-resize;width:1px;height:100%;position:absolute;z-index:2;top:0}
 .webix_resize_handle_x .webix_handle_content{border-width:0 1px}
-.webix_resize_origin_x{cursor:e-resize;width:3px;height:100%;position:absolute;z-index:2;top:0}
-.webix_resize_handle_y{cursor:n-resize;height:1px;width:100%;position:absolute;z-index:2;left:0}
+.webix_resize_origin_x{cursor:ew-resize;width:3px;height:100%;position:absolute;z-index:2;top:0}
+.webix_resize_handle_y{cursor:ns-resize;height:1px;width:100%;position:absolute;z-index:2;left:0}
 .webix_resize_handle_y .webix_handle_content{border-width:1px 0}
-.webix_resize_origin_y{cursor:n-resize;height:3px;width:100%;position:absolute;z-index:2;left:0}
+.webix_resize_origin_y{cursor:ns-resize;height:3px;width:100%;position:absolute;z-index:2;left:0}
 .webix_resizer.webix_disabled_view{cursor:default}
-.webix_resizer_vy{cursor:n-resize;margin-top:0!important;border:0!important;padding:0!important;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAADAQMAAABCowZuAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA9JREFUCB1jXMUABoxAGgAJaAFXPIkJqAAAAABJRU5ErkJggg==) center center no-repeat}
-.webix_resizer_vx{cursor:e-resize;margin-left:0!important;border:0!important;padding:0!important;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAXAQMAAAD0oWdxAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA5JREFUeF5jWMDAQDwGAKyuB4FpGQdzAAAAAElFTkSuQmCC) center center no-repeat}
-.webix_resizer_y{cursor:n-resize;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAADAQMAAABCowZuAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA9JREFUCB1jXMUABoxAGgAJaAFXPIkJqAAAAABJRU5ErkJggg==) center center no-repeat #fff}
-.webix_resizer_x{cursor:e-resize;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAXAQMAAAD0oWdxAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA5JREFUeF5jWMDAQDwGAKyuB4FpGQdzAAAAAElFTkSuQmCC) center center no-repeat #fff}
+.webix_resizer_vy{cursor:ns-resize;margin-top:0!important;border:0!important;padding:0!important;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAADAQMAAABCowZuAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA9JREFUCB1jXMUABoxAGgAJaAFXPIkJqAAAAABJRU5ErkJggg==) no-repeat center center}
+.webix_resizer_vx{cursor:ew-resize;margin-left:0!important;border:0!important;padding:0!important;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAXAQMAAAD0oWdxAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA5JREFUeF5jWMDAQDwGAKyuB4FpGQdzAAAAAElFTkSuQmCC) no-repeat center center}
+.webix_resizer_y{cursor:ns-resize;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAADAQMAAABCowZuAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA9JREFUCB1jXMUABoxAGgAJaAFXPIkJqAAAAABJRU5ErkJggg==) no-repeat center center;background-color:#fff}
+.webix_resizer_x{cursor:ew-resize;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAXAQMAAAD0oWdxAAAABlBMVEUAAACkvtSA7tmIAAAAAXRSTlMAQObYZgAAAA5JREFUeF5jWMDAQDwGAKyuB4FpGQdzAAAAAElFTkSuQmCC) no-repeat center center;background-color:#fff}
 .webix_accordionitem_body{position:relative}
-.webix_accordionitem_header{border-bottom:1px solid #a4bed4;position:relative;z-index:2;font-family:Helvetica,Verdana;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);line-height:32px;cursor:pointer;overflow:hidden}
+.webix_accordionitem_header{border-bottom:1px solid #a4bed4;position:relative;z-index:2;font-family:Helvetica,Verdana;color:#1e2022;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x;line-height:32px;cursor:pointer;overflow:hidden}
 .webix_accordionitem_header .webix_el_label,.webix_accordionitem_header .webix_inp_label{color:#1e2022}
 .webix_ie.horizontal>.webix_accordionitem_header.collapsed{-ms-writing-mode:tb-lr}
 .webix_ie.horizontal>.webix_accordionitem_header.collapsed .webix_accordionitem_label{padding-left:0;padding-top:10px}
 .webix_ie.horizontal>.webix_accordionitem_header.collapsed .webix_accordionitem_button{margin:0}
 .webix_accordionitem_label{height:100%;padding-left:10px}
-.webix_accordionitem_button{float:right;position:relative;height:11px;width:11px;margin:14px}
+.webix_accordionitem_button{float:right;position:relative;height:11px;width:11px;margin:14px 14px}
 .webix_carousel{position:relative}
 .webix_nav_panel{bottom:15px;height:auto;line-height:8px;overflow:hidden;position:absolute;text-align:center}
 .webix_nav_item{display:inline-block;height:8px;padding:6px 5px 6px 4px;width:8px;cursor:pointer;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}
@@ -89,10 +89,10 @@ x\:ui{display:none}
 .webix_dark .webix_nav_button_side.webix_nav_button_next .webix_nav_button_inner{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAiCAYAAACwaJKDAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gcdCSE1IU5u4gAAAW1JREFUSMet1rtOwzAUgOG/5jbBwsQD8BAwIAa2TggegjmRgELbuFeo1GRlQEJMMDN264CUiYdgg0dolzIkFUEk9nHSbLGtT76cc+xaMA53gUegDnwCgfa9Vyp8CngCToFNYB940WF0WRWt57SPqsAK+C7oG+kwuiqLdg3992Xgtelk8jGN4w3gqGDMyTSOZ8eHB+8uM0X7XhMYGMbd6TC6dkIzcH8VsMr+aN9rCeCGEyqEhzZY5TWmcM8C3zihKdy2wIMiWJmWURZWtk1P4a4FvnVCUziwwP0srKQBLYSbALXFYuGU1zqMNBAYhrRUiSI0s/RvKcdZNoChcQt8Tz5TKSg/fQdQFqdJcJvAXha0Z1QCDixgW577drCbBxZXKRkYyOtpkm6lwf+VPwH7VcC/d5Qd7EjA39s0KQQ2UIvvfbZ3zoEHU2Rp3+u4vlDGqwSX6N4qwSX6ltMelAUB1oELYA6cAV/poTxXeZ/+AOFqn1e/Gh7yAAAAAElFTkSuQmCC)}
 .webix_list_item{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:2px 10px;line-height:23px;cursor:pointer;border-bottom:1px solid #ebebeb;text-align:left}
 .webix_list_item.webix_invalid{background-color:#fee}
-.webix_list_item.webix_selected{color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_list_item.webix_selected{background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
 .webix_list .webix_list_item.webix_selected{border-bottom:1px solid #ffd47b;box-shadow:0 1px #ffe3a9 inset;padding:2px 10px}
 .webix_group{position:relative}
-.webix_group_back,.webix_group_back.webix_selected{position:relative;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%)}
+.webix_group_back,.webix_group_back.webix_selected{position:relative;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x}
 .webix_arrow_icon{position:absolute;top:50%;bottom:50%;margin-top:-12px;right:15px;width:9px;height:22px;line-height:22px;color:#1e2022;font-size:18px;font-family:FontAwesome}
 .webix_arrow_icon:before{content:'\f105'}
 .webix_group_back{padding-left:29px}
@@ -103,18 +103,19 @@ x\:ui{display:none}
 .webix_unit_header{padding:0 10px;line-height:19px;text-align:left;background-color:#d6e8ff}
 .webix_list-x .webix_list_item{display:inline-block;vertical-align:top;border-right:1px solid #ebebeb;border-bottom:none}
 .webix_list-x .webix_list_item.webix_selected{border-right:1px solid #ffd47b;border-left:1px solid #ffd47b;padding-left:9px}
-.webix_list-x .webix_scroll_cont{display:inline}
+.webix_list-x .webix_scroll_cont{display:inline-block;overflow:visible}
 .webix_view.webix_list-x{white-space:nowrap}
 .webix_list_item.webix_disabled{color:#8b949e}
 .webix_list_item.webix_disabled .webix_submenu_icon{visibility:hidden}
 .webix_view.webix_pager{padding:2px 0;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:transparent}
-.webix_pager_item,.webix_pager_item_selected{padding:0 6px;text-align:center;height:100%;width:32px;border:1px solid #a4bed4;margin:0 2px;cursor:pointer;background-color:#fff;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;font-family:Helvetica,Verdana;font-size:13px}
+.webix_pager_item,.webix_pager_item_selected{padding:0 6px;text-align:center;height:100%;width:auto;min-width:32px;border:1px solid #a4bed4;margin:0 2px;cursor:pointer;background-color:#fff;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;font-family:Helvetica,Verdana;font-size:13px}
 .webix_pager_item_selected{cursor:default;background-color:#ffdb8f;border:1px solid #ffd47b}
 .webix_animation .webix_ss_header{position:relative;z-index:10}
 .webix_animation .webix_ss_footer,.webix_animation .webix_vscroll_x{position:absolute;bottom:0;z-index:10}
 .webix_allow_selection{-moz-user-select:text;-webkit-user-select:text;user-select:text}
 .webix_dataview_item{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:2px 10px;line-height:23px;cursor:pointer;border-bottom:1px solid #ebebeb;text-align:left;border-right:1px solid #ebebeb}
-.webix_dataview_item.webix_selected{color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f);border-bottom:1px solid #ffd47b;border-right:1px solid #ffd47b}
+.webix_dataview_item.webix_selected{background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f);border-bottom:1px solid #ffd47b;border-right:1px solid #ffd47b}
+.webix_dataview_item.webix_invalid{background-color:#fee}
 .webix_chart{position:relative;font-family:Helvetica,Verdana;font-size:13px;color:#1e2022;overflow:hidden;z-index:1}
 .webix_chart canvas{position:absolute}
 .webix_canvas_text{position:absolute;text-align:center;overflow:hidden;white-space:nowrap;font-size:12px;z-index:100}
@@ -155,11 +156,11 @@ x\:ui{display:none}
 .webix_dt_editor select{padding-right:0;padding-left:5px}
 .webix_clipbuffer{width:2000px;height:1px;padding:0;margin:0;border:0;left:0;top:0;white-space:pre-wrap;position:fixed;filter:alpha(opacity=0);opacity:0;pointer-events:none;cursor:default}
 .webix_message_area{position:fixed;right:5px;width:250px;z-index:1000}
-.webix_info{min-width:120px;font-family:Tahoma,Arial;z-index:10000;overflow:hidden;margin:5px 5px 10px;-webkit-transition:all .5s ease;-moz-transition:all .5s ease;-o-transition:all .5s ease;transition:all .5s ease}
+.webix_info{min-width:120px;font-family:Tahoma,Arial;z-index:10000;overflow:hidden;margin:5px;margin-bottom:10px;-webkit-transition:all .5s ease;-moz-transition:all .5s ease;-o-transition:all .5s ease;transition:all .5s ease}
 .webix_no_transition{-webkit-transition:none;-moz-transition:none;transition:none}
 .webix_info.hidden{height:0;min-height:0;padding-top:0;padding-bottom:0;border-width:0;margin-top:0;margin-bottom:0;overflow:hidden}
 .webix_modal_box{overflow:hidden;display:inline-block;min-width:250px;width:250px;text-align:center;position:fixed;background-color:#fff;box-shadow:0 3px 6px #c8c8c8;font-family:Helvetica,Verdana;z-index:20000;border-radius:0;outline:0}
-.webix_popup_title{border-top-left-radius:-1px;border-top-right-radius:-1px;border-width:0}
+.webix_popup_title{border-top-left-radius:-1px;border-top-right-radius:-1px;border-width:0;background-image:-webkit-linear-gradient(top,#707070 1%,#3d3d3d 70%,#4c4c4c 97%,#393939 97%);background-image:-moz-linear-gradient(top,#707070 1%,#3d3d3d 70%,#4c4c4c 97%,#393939 97%)}
 .webix_button,.webix_info,.webix_popup_button{cursor:pointer}
 .webix_popup_text{overflow:hidden}
 .webix_popup_controls{border-radius:6px;padding:5px 10px 10px}
@@ -171,12 +172,12 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_alert_error .webix_popup_title,.webix_confirm_error .webix_popup_title{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAsCAIAAAArRUU2AAAATklEQVR4nIWLuw2AMBBDjVuQiBT2oWbRDATrnB0KQOJoqPzRe3BrHI6dcBASYREKovtK6/6DsDOX+stN+3H1YX9ciRgnYq5EWYhS2dftBIuLT4JyIrPCAAAAAElFTkSuQmCC)}
 .webix_alert_error,.webix_confirm_error{border:1px solid red}
 .webix_button,.webix_popup_button{border:1px solid #a4bed4}
-.webix_button input,.webix_popup_button div{font-size:13px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background:-webkit-linear-gradient(#fff,#e6e6e6);background:-moz-linear-gradient(#fff,#e6e6e6);background:-ms-linear-gradient(top,#fff,#e6e6e6);background:-o-linear-gradient(top,#fff,#e6e6e6);height:28px;line-height:28px}
-.webix_popup_button.confirm div{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%)}
+.webix_button input,.webix_popup_button div{font-size:13px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background-image:-webkit-linear-gradient(#fff,#e6e6e6);background-image:-moz-linear-gradient(#fff,#e6e6e6);background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);height:28px;line-height:28px}
+.webix_popup_button.confirm div{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x}
 .webix_popup_title{color:#fff;height:40px;line-height:40px}
-.webix_popup_text{margin:0 0 5px;padding-top:25px;font-size:13px;color:#1e2022;min-height:60px}
+.webix_popup_text{margin:0 0 5px 0;padding-top:25px;font-size:13px;color:#1e2022;min-height:60px}
 .webix_error,.webix_info{font-size:13px;color:#333;box-shadow:0 0 10px #888;padding:0;background-color:#FFF;border-radius:3px;border:1px solid #fff}
-.webix_info div{padding:5px 10px;background-color:#fff;border-radius:3px;border:1px solid #B8B8B8}
+.webix_info div{padding:5px 10px 5px 10px;background-color:#fff;border-radius:3px;border:1px solid #B8B8B8}
 .webix_error{background-color:#d81b1b;border:1px solid #ff3c3c;box-shadow:0 0 10px #000}
 .webix_error div{background-color:#d81b1b;border:1px solid #940000;color:#FFF}
 .webix_drag_zone{position:absolute;box-shadow:1px 1px 5px #a4bed4;background-color:#fff;font-family:Helvetica,Verdana;font-size:13px;color:#1e2022;pointer-events:none}
@@ -201,13 +202,13 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_block_selection,.webix_cell,.webix_hcell,.webix_ss_footer td,.webix_ss_header td,.webix_table_cell,.webix_view.webix_table_cell{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 .webix_block_selection{position:absolute}
 .webix_ss_sort_asc,.webix_ss_sort_desc{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}
-.webix_hcell.webix_ss_filter{padding:2px 5px}
+.webix_hcell.webix_ss_filter{padding:2px 5px 2px 5px}
 .webix_ss_filter input,.webix_ss_filter select{width:100%;font-size:inherit;color:#1e2022!important;height:30px;margin-top:-2px;padding:0 3px;vertical-align:top;border:1px solid #a4bed4;line-height:30px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;font-family:Helvetica,Verdana}
 .webix_richfilter{margin-top:1px;line-height:30px}
 .webix_ss_filter select{padding:3px}
-.webix_dd_drag_column,.webix_ss_header,.webix_ss_header TD,.webix_ss_vscroll_header{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%)}
+.webix_dd_drag_column,.webix_ss_header,.webix_ss_header TD,.webix_ss_vscroll_header{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x}
 .webix_ss_footer TD,.webix_ss_vscroll_footer{background:#fafafa}
-.webix_hcell{padding:0 10px;text-align:left}
+.webix_hcell{padding:0 10px 0 10px;text-align:left}
 .webix_ss_header td{border-right:1px solid #a4bed4;border-bottom:1px solid #a4bed4}
 .webix_ss_footer td{border-right:1px solid #ebebeb;border-top:1px solid #ebebeb}
 .webix_size_row td{border:none}
@@ -222,31 +223,32 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_block_selection{background:rgba(0,0,0,.1);border:2px solid #ffd47b}
 .webix_dd_drag{white-space:nowrap;overflow:hidden;border-left:1px solid #ebebeb;height:34px}
 .webix_dd_drag>div{display:inline-block;vertical-align:top;background:#fff;border-top:1px solid #ebebeb;border-right:1px solid #ebebeb;border-bottom:1px solid #ebebeb;padding:5px 10px;height:34px;line-height:26px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
-.webix_dd_drag_column{padding:5px 10px}
+.webix_dd_drag_column{padding:5px 10px 5px 10px}
 .webix_column>.webix_drag_over.webix_cell{background-color:#e6e6e6;color:#1e2022}
 .webix_ss_header table,.webix_ss_header td{padding:0;margin:0}
 .webix_cell.webix_invalid,.webix_column>.webix_cell.webix_invalid:nth-child(even){background-color:#fee}
 .webix_invalid_cell{position:relative}
 .webix_invalid_cell:after{content:"";position:absolute;top:0;right:0;width:0;height:1px;border-top:8px solid #f44;border-left:8px solid transparent}
-.webix_column>div.webix_cell_select,.webix_column>div.webix_column_select,.webix_column>div.webix_row_select{color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_column>div.webix_cell_select,.webix_column>div.webix_column_select,.webix_column>div.webix_row_select{background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
 .webix_column>div.webix_cell_select{border-bottom:1px solid #ffd47b;box-shadow:0 1px #ffe3a9 inset;border-right:1px solid #ffd47b;border-left:1px solid #ffd47b;padding-top:0;padding-left:9px}
 .webix_ss_right .webix_column.webix_first>div.webix_cell_select{padding-left:10px}
 .webix_column>div.webix_invalid.webix_row_select:nth-child(even),.webix_column>div.webix_row_select{border-bottom:1px solid #ffd47b;box-shadow:0 1px #ffe3a9 inset;padding-top:0}
 .webix_column>div.webix_column_select{border-right:1px solid #ffd47b;border-left:1px solid #ffd47b;padding-left:9px}
-.webix_column>.webix_cell.webix_invalid.webix_cell_select:nth-child(even){color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
-.webix_cell.webix_dtable_colrow,.webix_cell.webix_dtable_subrow,.webix_cell.webix_dtable_subview{position:absolute;left:0;top:0;background-color:#fff;width:100%;padding-right:28px;padding-left:10px;padding-top:1px;border-bottom:1px solid #ebebeb}
+.webix_column>.webix_cell.webix_invalid.webix_cell_select:nth-child(even){background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_cell.webix_dtable_colrow,.webix_cell.webix_dtable_subrow,.webix_dtable_subview{position:absolute;left:0;top:0;background-color:#fff;width:100%;padding-right:28px;padding-left:10px;padding-top:1px;border-bottom:1px solid #ebebeb}
+.webix_cell.webix_dtable_colrow.webix_selected{background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
 .webix_dtable_subrow{border-top:1px solid #ebebeb;text-align:right}
-.webix_dtable_subview{background:#ebebeb;border-top:1px solid #ebebeb;padding:0 0 0 10px;box-sizing:border-box}
+.webix_dtable_subview{background:#ebebeb;border-top:1px solid #ebebeb;padding:0;padding-left:10px;box-sizing:border-box}
 .number .webix_cell{text-align:right}
 .webix_rotate{transform:rotate(-90deg);-webkit-transform:rotate(-90deg);line-height:normal}
 .webix_measure_rotate{line-height:normal;white-space:normal;padding:10px}
 .webix_span_layer,.webix_span_layer_top{background:0 0;position:absolute;left:0;top:0;height:0;width:0;overflow:visible}
-.webix_span_layer_top{z-index:1;overflow:hidden}
+.webix_span_layer_top{z-index:1}
 .webix_ss_right .webix_span_layer,.webix_ss_right .webix_span_layer_top{border-left:1px solid #a4bed4}
 .webix_dtable_span{position:absolute;background:#fff;text-align:left}
-.webix_dtable_span.webix_selected{color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_dtable_span.webix_selected{background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
 .webix_hcell span.webix_input_icon{background-color:#a4bed4}
-.webix_area_selection_layer{position:absolute;z-index:1}
+.webix_area_selection_layer{position:absolute;z-index:2}
 .webix_area_selection{position:absolute;background:#1e2022}
 .webix_area_selection_bottom,.webix_area_selection_top{height:2px}
 .webix_area_selection_left,.webix_area_selection_right{width:2px}
@@ -256,7 +258,7 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_win_body{overflow:hidden}
 .webix_win_body,.webix_win_body>.webix_view,.webix_win_body>.webix_view .webix_cal_month,.webix_win_content,.webix_window{border-radius:0}
 .webix_win_head{border-bottom:1px solid silver}
-.webix_win_head>.webix_view>.webix_template{font-family:Helvetica,Verdana;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);padding:0;text-align:center;line-height:34px}
+.webix_win_head>.webix_view>.webix_template{font-family:Helvetica,Verdana;color:#1e2022;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x;padding:0;text-align:center;line-height:34px}
 .webix_win_head>.webix_view>.webix_template .webix_el_label,.webix_win_head>.webix_view>.webix_template .webix_inp_label{color:#1e2022}
 .webix_win_content{height:auto;width:auto;overflow:hidden}
 .webix_modal{width:100%;height:100%;position:fixed;top:0;left:0;background-color:#000;filter:alpha(opacity=20);opacity:.2}
@@ -268,18 +270,19 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_point_bottom{background-position:0 0}
 .webix_point_right{background-position:0 -22px}
 .webix_point_left{background-position:0 -9px}
-.webix_resize_handle{position:absolute;width:15px;height:15px;bottom:0;line-height:15px;right:-1px;text-align:center;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABlBMVEUAAAAAAAClZ7nPAAAAAXRSTlMAQObYZgAAABZJREFUeAFjIAUwUshlpJDLSIhLGAAACQ4AFk79JaMAAAAASUVORK5CYII=);cursor:nw-resize}
+.webix_resize_handle{position:absolute;z-index:2;width:15px;height:15px;bottom:0;line-height:15px;right:-1px;text-align:center;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABlBMVEUAAAAAAAClZ7nPAAAAAXRSTlMAQObYZgAAABZJREFUeAFjIAUwUshlpJDLSIhLGAAACQ4AFk79JaMAAAAASUVORK5CYII=);cursor:nw-resize}
 .webix_resize_frame{position:absolute;filter:alpha(opacity=10);opacity:.1;background:#d6e8ff;display:block;border:1px solid #70afff;box-shadow:1px 3px 6px #000}
 .webix_resize_cursor{cursor:nw-resize}
 .webix_tree .webix_scroll_cont>.webix_tree_leaves{padding:9px 10px 9px 9px}
 .webix_tree_item{clear:both;height:22px;line-height:22px;white-space:nowrap}
 .webix_tree_item.webix_selected{background:0 0}
-.webix_tree_item.webix_selected span{padding:4px 10px 4px 4px;margin-left:-4px;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_tree_item.webix_selected span{padding:4px 10px 4px 4px;margin-left:-4px;background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_tree_item.webix_invalid{background-color:#fee}
 .webix_tree_checkbox{margin:1px 0 0;padding:0;float:left;vertical-align:middle;height:100%;width:13px}
 .webix_indeterminate{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gcCCSwfRyGesAAAAAxpVFh0Q29tbWVudAAAAAAAvK6ymQAAAExJREFUKM9jLCgo+M9AAmBhYGBgaGtrY+Tk5MSrsLCwkIGBgeE/EwOJgGQNLMgcJSUlBgYGBnQ/Md67d498G+jsB6hbGQfWSYykJg0AUMsPVoNrFX0AAAAASUVORK5CYII=);background-repeat:no-repeat;background-position:left center;height:100%;width:13px;margin-top:0!important}
 .webix_measure_size input,.webix_measure_size select,.webix_measure_size textarea{width:5px}
 .webix_measure_size div{margin-left:-5px;float:none}
-.webix_measure_size a,.webix_measure_size div{display:inline-block!important}
+.webix_measure_size a,.webix_measure_size div{display:inline-block!important;position:static!important}
 .webix_tree_close,.webix_tree_file,.webix_tree_folder,.webix_tree_folder_open,.webix_tree_none,.webix_tree_open{float:left;width:20px;height:100%;cursor:pointer;margin:0;background-repeat:no-repeat}
 .webix_tree_close,.webix_tree_none,.webix_tree_open{background-position:center center}
 .webix_cell .webix_tree_close,.webix_cell .webix_tree_none,.webix_cell .webix_tree_open{background-color:transparent}
@@ -291,7 +294,7 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_tree_file{background-image:url(data:image/gif;base64,R0lGODlhEgASAMQVAPv7+2RkZPf39/r6+vj4+Pn5+fT09Pb29vX19fHx8fDw8Onp6fLy8u7u7uzs7PPz8+vr6+rq6uXl5ejo6O/v7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABUALAAAAAASABIAAAV4YCWOZGkGaKqaVSAMQCwLQnAOj6ErzUTXpQDgQDgcGJTFDzgSEp4HRCKytDUBMKzAoIAsJACrSCjTGhINR5hELg8ECEZifS3HCgQEgj62xwZPAnwtbgMDBQU0g21Yh4iIi3aGkzBihH52lgEEmDIEli0qoigspSYhADs=)}
 .webix_tree_folder{background-image:url(data:image/gif;base64,R0lGODlhEgASAMQfAPvjpP/24fPHVvnUdvzotdSiKv/23vvrw/LCS/C+RfnelvPMaf/88/nbi/rsyerYq/TLYv7y1v7wzeCsLO+8P86dJfvv0MuaIsydKPPOc+SqGKGEPe/AS+zVneWwLf///yH5BAEAAB8ALAAAAAASABIAAAWZ4CdeZGleYvpdA+O+zNUBqHoZOB4EceHUqVtuF+n9VCtdQCI5BC6FA3BkCEQkBALAACVMV9eDVhGJQGnIixigaAwiG6jie2G7BxDLpVJozG13EAICPxUeGRleQQMLgggJUhiHC3pBggKPFJETGZRAF5gJCRSaFxgTC55BCByioz+nEKojGgmtHBwPJAUCELo2J8FfSMTFxsUhADs=)}
 .webix_tree_folder_open{background-image:url(data:image/gif;base64,R0lGODlhEgASAMQfAPXMWPK9N/fipOzLbPrVaP/89frqwv3tuvvprfLES+7PdP7xyP7z0vPAQfvtyMuaIv/32/735OSqFv3de+7ReP7lmf7gh/nv0v/67unFXfb29vK/PenFSaGEPfLnyv///yH5BAEAAB8ALAAAAAASABIAAAWS4Cc+ZGk+YvqZRVtgGiag6sNBThlFWnTQqQcE4sqRFj/VashsYR6HZI0JWSAjDwQCOGIgERULg/EQzJRQsGVCYHTK51qYTQDkFPj4iA4AJHIUgQoGQA8EdX4NhHgKAxeFfQkJGwGLeI6Fkg2UlQ8Dn5hBCZuchKChIxKkGw05Ga8DHlwkqg2tJ1xBtDlKvTUkviEAOw==)}
-.webix_tree_img{background:0 0;float:left;width:18px;height:22px}
+.webix_tree_img{background:0 0;float:left;width:18px;height:22px;background-position:0 0}
 .webix_tree_plus2{background-image:url(data:image/gif;base64,R0lGODlhEgASAMQfAFSWrmi52FCPplORqVmet8HBwfn//02KoE+NpEyIn2a21E2Jn2u/3mzB4Vqguk6LomGtyWGuy27E5VqivG/H51OUrE+OpVyhu1eXr2CqxV6lwFaas06LoXHJ6lKTqgAAACH5BAEAAB8ALAAAAAASABIAAAVZ4CeOYkGeaJmuKpuaLgrHX7IcD2IJrs0hAk8FAGAlDoiBYUNwTIyPAcagyUAirAXCwOUGAoVwmHSwVAiGSIDRYB0EgIthLaG44RN1g9JxwR0QdDSDhIWGKyEAOw==);background-repeat:no-repeat}
 .webix_tree_plus3{background-image:url(data:image/gif;base64,R0lGODlhEgASAMQfAFSWrmi52FCPplORqVmet8HBwfn//02KoE+NpEyIn2a21E2Jn2u/3mzB4Vqguk6LomGtyWGuy27E5VqivG/H51OUrE+OpVyhu1eXr2CqxV6lwFaas06LoXHJ6lKTqgAAACH5BAEAAB8ALAAAAAASABIAAAVb4CeOYkGeaJmuKpuaLgrHX7IcD2IJrs0hAk8FAGAlDoiBYUNwTIyPAcagyUAirAXCwOUGAoVwmHSwVAiGSIDRYB0EgIthLaG44RN1g9JxwR0QdDQtg4SFM4csIQA7)}
 .webix_tree_plus4{background-image:url(data:image/gif;base64,R0lGODlhEgASAMQfAFSWrmi52FCPplORqVmet/n//8HBwU2KoE+NpEyIn2a21E2Jn2u/3mzB4VqgumGtyWGuy27E5VqivE6Lom/H51OUrE+OpVyhu1eXr2CqxV6lwFaas06LoVKTqnHJ6gAAACH5BAEAAB8ALAAAAAASABIAAAVY4CeOZGmeaKqubEsmyzEhlqDCHCJ0FQCkiQNiUNgQHBLgZIApaDIPSGqBKFitgYBhuyUdLBVCARJgNFIHAeBSKEcoaLWE3KB4VGrHw+0yuEZ+fx+Bf4QmIQA7)}
@@ -308,9 +311,9 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_cal_next_button,.webix_cal_prev_button{cursor:pointer;position:absolute;top:17px;width:30px;height:28px;background-position:11.5px 4px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}
 .webix_cal_prev_button{left:17px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAALCAYAAACzkJeoAAAASUlEQVR42p2QMQoAQQgD79EZ0Mqn5xCu2cPdYgUbJ0rMMxXgLeiuKq8gsJAz8weQ0QiwJEfECnr4wdlEnwJ68+yyhReC+c85oRecj0Um+pmo9wAAAABJRU5ErkJggg==);background-repeat:no-repeat}
 .webix_cal_next_button{right:17px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAALCAYAAACzkJeoAAAARElEQVR42qXPsQoAIAhF0T76PdDJT7cUmtQhcmk4N8QVQ9JXN2bmgWOgqp+BiCRG2AYAMoi3/LxYdyagAnhA6G93TrABZaJFJjrFY8IAAAAASUVORK5CYII=);background-repeat:no-repeat}
-.webix_view>.webix_cal_header{margin:0 17px 10px;height:auto}
+.webix_view>.webix_cal_header{margin:0 17px 10px 17px;height:auto}
 .webix_view>.webix_cal_header div{float:left;text-align:center;height:19px;font-size:11px;color:#1e2022;border-bottom:#cecece 1px solid;margin-bottom:7px}
-.webix_cal_body{margin:0 17px}
+.webix_cal_body{margin:0 17px 0 17px}
 .webix_cal_body .webix_cal_row{clear:both}
 .webix_cal_body .webix_cal_row>div{float:left;text-align:center;height:100%}
 .webix_cal_body .webix_cal_select,.webix_cal_body .webix_cal_select.webix_cal_today,.webix_cal_body .webix_selected{color:#1e2022;background:#ffdb8f}
@@ -325,30 +328,30 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_cal_block{float:left;text-align:center;cursor:pointer;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}
 .webix_selected{background:#ffdb8f;color:#1e2022}
 .webix_cal_footer{text-align:center;font-size:12px;color:#444;margin:4px 17px;padding-top:2px;cursor:pointer}
-.webix_cal_icons{float:right;padding:4px}
+.webix_cal_icons{float:right;padding:4px 4px}
 .webix_cal_time{padding:2px 4px}
 .webix_cal_time_icons{float:left}
 .webix_cal_icons .webix_cal_icon{text-align:center;padding:2px 4px}
 .webix_cal_icon:hover,.webix_cal_month_name:hover,.webix_cal_time:hover{text-decoration:underline;color:#d6e8ff}
 .webix_cal_month_name.webix_readonly:hover{text-decoration:none;color:#1e2022;cursor:default}
-.webix_time_header{padding:17px 17px 1px}
+.webix_time_header{padding:17px 17px 1px 17px}
 .webix_time_header .webix_cal_hours,.webix_time_header .webix_cal_minutes{display:inline-block;font-size:14px;text-align:center;height:26px;line-height:22px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;border-bottom:1px solid #a4bed4}
 .webix_time_header .webix_cal_minutes{padding-left:1px;border-left:none}
 .webix_time_header .webix_cal_hours{border-right:none!important}
 .webix_cal_body .webix_hours{float:left;border-right:1px solid #cecece;padding-right:1px}
 .webix_cal_body .webix_minutes{float:left;padding-left:1px}
 .webix_cal_block_empty{float:left;text-align:center}
-.webix_time_footer{text-align:center;font-size:12px;padding:7px 17px 0;cursor:pointer}
-.webix_cal_done{margin-top:3px;padding:2px 7px;font-size:12px;border-radius:6px;border:1px solid #a4bed4;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);float:right}
+.webix_time_footer{text-align:center;font-size:12px;padding:7px 17px 0 17px;cursor:pointer}
+.webix_cal_done{margin-top:3px;padding:2px 7px;font-size:12px;border-radius:6px;border:1px solid #a4bed4;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x;float:right}
 .webix_cal_blurred_hours{background-color:#f7f7f7}
 .webix_property_line{clear:both;width:100%;min-height:24px;height:auto}
 .webix_property_line:nth-child(odd){background-color:#f7f7f7}
 .webix_property_label,.webix_property_value{height:24px;line-height:24px;padding-left:10px;float:left;border-bottom:1px solid #a4bed4;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}
 .webix_property_label{border-right:1px solid #a4bed4}
-.webix_property_label_line{padding-left:10px;font-family:Helvetica,Verdana;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);line-height:32px;line-height:23px;border-bottom:1px solid #ebebeb}
+.webix_property_label_line{padding-left:10px;font-family:Helvetica,Verdana;color:#1e2022;font-size:13px;font-weight:700;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x;line-height:32px;line-height:23px;border-bottom:1px solid #ebebeb}
 .webix_property_label_line .webix_el_label,.webix_property_label_line .webix_inp_label{color:#1e2022}
 .webix_property_col_val{width:100%;height:100%;-moz-user-select:text;-webkit-user-select:text;user-select:text}
-.webix_property_col_ind{float:right;border:1px solid #a4bed4;border-radius:2px;width:30px;cursor:pointer;height:13px;margin:3px 10px 3px 0}
+.webix_property_col_ind{float:right;border:1px solid #a4bed4;border-radius:3px;width:16px;cursor:pointer;height:16px;margin:4px 10px 3px 0}
 .webix_property_value{text-overflow:ellipsis;white-space:nowrap}
 .webix_property_check{margin-top:5px}
 .webix_tooltip{display:none;position:absolute;z-index:10000;background-color:#fff;padding:5px 10px;border:1px solid #a4bed4;font-family:Helvetica,Verdana;font-size:13px;color:#1e2022;border-radius:0;box-shadow:1px 1px 0 0 #CCC}
@@ -377,16 +380,16 @@ div.webix_modal_cover{background-color:#000;cursor:default;filter:alpha(opacity=
 .webix_el_button button,.webix_el_button input,.webix_el_toggle button,.webix_el_toggle input,.webixbutton{border-radius:6px;border:1px solid #a4bed4;height:100%;width:100%;cursor:pointer;font-size:13px;font-family:Helvetica,Verdana;-webkit-appearance:none}
 .webix_el_button .webix_img_btn,.webix_el_button .webix_img_btn .webix_img_btn_text,.webix_el_button .webix_img_btn_top,.webix_el_button .webix_img_btn_top .webix_img_btn_text,.webix_el_toggle .webix_img_btn,.webix_el_toggle .webix_img_btn .webix_img_btn_text,.webix_el_toggle .webix_img_btn_top,.webix_el_toggle .webix_img_btn_top .webix_img_btn_text{color:#1e2022}
 .webix_el_button .webix_img_btn,.webix_el_button .webix_img_btn_top,.webix_el_toggle .webix_img_btn,.webix_el_toggle .webix_img_btn_top{border:0}
-.webixbutton,.webixtype_base,.webixtype_next,.webixtype_prev{color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background:-webkit-linear-gradient(#fff,#e6e6e6);background:-moz-linear-gradient(#fff,#e6e6e6);background:-ms-linear-gradient(top,#fff,#e6e6e6);background:-o-linear-gradient(top,#fff,#e6e6e6);font-size:13px;font-family:Helvetica,Verdana;padding:0;border:0}
-.webixtype_form{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%)}
-.webixtype_form:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background:no-repeat #d6e8ff}
-.webix_el_button .webixtype_danger{background:#c10;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#e7877e),color-stop(100%,#c10));background:-webkit-linear-gradient(#e7877e,#c10);background:-moz-linear-gradient(#e7877e,#c10);background:-ms-linear-gradient(top,#e7877e,#c10);background:-o-linear-gradient(top,#e7877e,#c10);border:none!important;color:#fff}
+.webixbutton,.webixtype_base,.webixtype_next,.webixtype_prev{color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background-image:-webkit-linear-gradient(#fff,#e6e6e6);background-image:-moz-linear-gradient(#fff,#e6e6e6);background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);font-size:13px;font-family:Helvetica,Verdana;padding:0;border:0}
+.webixtype_form{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x}
+.webixtype_form:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background:#d6e8ff;background-repeat:no-repeat}
+.webix_el_button .webixtype_danger{background:#c10;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#e7877e),color-stop(100%,#c10));background-image:-webkit-linear-gradient(#e7877e,#c10);background-image:-moz-linear-gradient(#e7877e,#c10);background-image:-ms-linear-gradient(top,#e7877e,#c10);background-image:-o-linear-gradient(top,#e7877e,#c10);border:none!important;color:#fff}
 .webix_el_button .webix_el_box,.webix_el_toggle .webix_el_box{position:relative}
-.webix_el_button .webix_el_arrow,.webix_el_toggle .webix_el_arrow{position:absolute;z-index:1}
-.webixtype_next,.webixtype_prev{position:absolute;z-index:2;top:0}
-input.webixtype_prev{border-left-width:0;border-radius:0 6px 6px 0;-webkit-border-radius:0 6px 6px 0;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}
-input.webixtype_next{border-right-width:0;border-radius:6px 0 0 6px;-webkit-border-radius:6px 0 0 6px;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0}
-.webix_el_arrow{width:18px;height:18px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background:-webkit-linear-gradient(#fff,#e6e6e6);background:-moz-linear-gradient(#fff,#e6e6e6);background:-ms-linear-gradient(top,#fff,#e6e6e6);background:-o-linear-gradient(top,#fff,#e6e6e6);border:1px solid #a4bed4}
+.webix_el_button .webix_el_arrow,.webix_el_toggle .webix_el_arrow{position:absolute}
+.webixtype_next,.webixtype_prev{position:absolute;z-index:1;top:0}
+input.webixtype_prev{border-left-width:0;border-radius:0;-webkit-border-top-left-radius:0;-webkit-border-bottom-left-radius:0;-webkit-border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:6px;border-bottom-right-radius:6px}
+input.webixtype_next{border-right-width:0;border-radius:0;-webkit-border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-webkit-border-top-right-radius:0;-webkit-border-bottom-right-radius:0;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-top-left-radius:6px;border-bottom-left-radius:6px;border-top-right-radius:0;border-bottom-right-radius:0}
+.webix_el_arrow{width:18px;height:18px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background-image:-webkit-linear-gradient(#fff,#e6e6e6);background-image:-moz-linear-gradient(#fff,#e6e6e6);background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);border:1px solid #a4bed4}
 .webixtype_prev_arrow{-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg)}
 .webixtype_next_arrow{-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg)}
 .webix_img_btn_abs_top .webix_icon,.webix_img_btn_top .webix_icon{font-size:22px;position:absolute;top:8px;left:50%}
@@ -405,7 +408,7 @@ input.webixtype_next{border-right-width:0;border-radius:6px 0 0 6px;-webkit-bord
 .webix_img_btn_top{background-position:center top;vertical-align:top}
 .webix_img_btn_abs .webix_img_btn_text{bottom:8px}
 .webix_pressed .webix_img_btn,.webix_pressed .webix_img_btn_top{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background-color:rgba(0,0,0,.05)}
-.webix_control .webix_disabled_box .webix_el_arrow,.webix_control .webix_disabled_box .webix_img_btn,.webix_control .webix_disabled_box .webixtype_base,.webix_control .webix_disabled_box .webixtype_danger,.webix_control .webix_disabled_box .webixtype_form,.webix_control .webix_disabled_box .webixtype_next,.webix_control .webix_disabled_box .webixtype_prev{color:#aaa!important;background:#e9e9e9;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fbfbfb),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(#fbfbfb,#e9e9e9);background:-moz-linear-gradient(#fbfbfb,#e9e9e9);background:-ms-linear-gradient(top,#fbfbfb,#e9e9e9);background:-o-linear-gradient(top,#fbfbfb,#e9e9e9);border-color:#d5d5d5!important}
+.webix_control .webix_disabled_box .webix_el_arrow,.webix_control .webix_disabled_box .webix_img_btn,.webix_control .webix_disabled_box .webixtype_base,.webix_control .webix_disabled_box .webixtype_danger,.webix_control .webix_disabled_box .webixtype_form,.webix_control .webix_disabled_box .webixtype_next,.webix_control .webix_disabled_box .webixtype_prev{color:#aaa!important;background:#e9e9e9;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fbfbfb),color-stop(100%,#e9e9e9));background-image:-webkit-linear-gradient(#fbfbfb,#e9e9e9);background-image:-moz-linear-gradient(#fbfbfb,#e9e9e9);background-image:-ms-linear-gradient(top,#fbfbfb,#e9e9e9);background-image:-o-linear-gradient(top,#fbfbfb,#e9e9e9);border-color:#d5d5d5!important}
 .webix_control .webix_disabled_box .webix_img_btn_text{color:#aaa}
 .webix_control .webix_disabled_box .webix_image{opacity:.4}
 .webix_disabled_view.webix_control .webix_icon,.webix_disabled_view.webix_control .webix_icon_btn,.webix_layout_toolbar.webix_toolbar .webix_disabled_view.webix_control .webix_disabled_box .webix_img_btn_text,.webix_layout_toolbar.webix_toolbar .webix_disabled_view.webix_control .webix_icon,.webix_layout_toolbar.webix_toolbar .webix_disabled_view.webix_control .webix_icon_btn{color:#aaa}
@@ -415,31 +418,31 @@ input.webixtype_next{border-right-width:0;border-radius:6px 0 0 6px;-webkit-bord
 .webix_richtext_container .webix_template{padding:10px;overflow-x:auto;border:solid #ccc;border-width:0 1px 1px;border-radius:0 0 6px 6px}
 .webix_control{background:0 0}
 .webix_control button,.webix_control input,.webix_control textarea,.webix_el_label,.webix_inp_bottom_label,.webix_inp_label,.webix_inp_top_label{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;font-family:Helvetica,Verdana}
-.webix_el_box{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:2px;height:100%;width:100%;font-size:13px;overflow:hidden}
+.webix_el_box{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:2px 2px;height:100%;width:100%;font-size:13px;overflow:hidden}
 .webix_el_colorpicker input,.webix_el_combo input,.webix_el_datepicker input,.webix_el_search input,.webix_el_text input{height:100%;padding:0 10px;border:1px solid #a4bed4;color:#1e2022;font-size:13px;font-family:Helvetica,Verdana;-webkit-appearance:none;border-radius:0}
 .webix_inp_label,.webix_inp_top_label,.webix_label_right{color:#1e2022;text-transform:none;font-size:13px}
 .webix_inp_label{float:left;padding-top:1px;padding-left:2px;padding-right:7.5px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}
-.webix_inp_top_label{float:none;padding:2px 2px 0}
+.webix_inp_top_label{float:none;padding:2px 2px;padding-bottom:0}
 .webix_inp_bottom_label{font-size:11px;color:#2a2d30}
 .webix_label_right{padding-left:7.5px}
 .webix_el_checkbox .webix_label_right{display:inline-block;padding-top:2px}
-.webix_el_label{color:#1e2022;line-height:30px;padding:2px}
+.webix_el_label{color:#1e2022;line-height:30px;padding:2px 2px}
 .webix_toolbar .webix_el_label{padding-left:10px;text-transform:none}
 .webix_el_select select{height:100%;font-size:13px;font-family:Helvetica,Verdana;border:1px solid #a4bed4}
 body:not(:-moz-handler-blocked) .webix_el_select select{padding:.2em}
 .webix_all_segments,.webix_el_group{height:100%;white-space:nowrap}
 .webix_inp_counter_next,.webix_inp_counter_prev,.webix_inp_counter_value{border:1px solid #a4bed4;cursor:pointer;-webkit-appearance:none;width:20px;height:100%;vertical-align:top}
 .webix_inp_counter_value{font-size:13px;width:50px;color:#1e2022;text-align:center;border-left-width:0;border-right-width:0;-webkit-appearance:none;border-radius:0}
-.webix_inp_counter_prev{padding-left:6px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background:-webkit-linear-gradient(#fff,#e6e6e6);background:-moz-linear-gradient(#fff,#e6e6e6);background:-ms-linear-gradient(top,#fff,#e6e6e6);background:-o-linear-gradient(top,#fff,#e6e6e6);-webkit-border-radius:6px 0 0 6px;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-radius:6px 0 0 6px}
-.webix_inp_counter_next{padding-left:6px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background:-webkit-linear-gradient(#fff,#e6e6e6);background:-moz-linear-gradient(#fff,#e6e6e6);background:-ms-linear-gradient(top,#fff,#e6e6e6);background:-o-linear-gradient(top,#fff,#e6e6e6);-webkit-border-radius:0 6px 6px 0;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px;border-radius:0 6px 6px 0}
-.webix_el_textarea textarea{border:1px solid #a4bed4;height:100%;margin:0;padding:5px 10px;color:#1e2022;resize:none;font-size:13px;font-family:Helvetica,Verdana}
+.webix_inp_counter_prev{padding-left:6px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background-image:-webkit-linear-gradient(#fff,#e6e6e6);background-image:-moz-linear-gradient(#fff,#e6e6e6);background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);-webkit-border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-webkit-border-top-right-radius:0;-webkit-border-bottom-right-radius:0;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-top-left-radius:6px;border-bottom-left-radius:6px;border-top-right-radius:0;border-bottom-right-radius:0}
+.webix_inp_counter_next{padding-left:6px;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background-image:-webkit-linear-gradient(#fff,#e6e6e6);background-image:-moz-linear-gradient(#fff,#e6e6e6);background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);-webkit-border-top-left-radius:0;-webkit-border-bottom-left-radius:0;-webkit-border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:6px;border-bottom-right-radius:6px}
+.webix_el_textarea textarea{border:1px solid #a4bed4;height:100%;margin:0;padding:5px;color:#1e2022;resize:none;font-size:13px;font-family:Helvetica,Verdana;padding-left:10px;padding-right:10px}
 .webix_el_textarea .webix_inp_label{padding-top:8.5px}
 .webix_segment_0,.webix_segment_1{border:1px solid #a4bed4;border-right-width:0;height:100%}
-.webix_segment_0{-webkit-border-radius:6px 0 0 6px;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-radius:6px 0 0 6px}
-.webix_segment_N{border:1px solid #a4bed4;height:100%;-webkit-border-radius:0 6px 6px 0;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px;border-radius:0 6px 6px 0}
-.webix_segment_N:first-child{-webkit-border-radius:6px;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px;border-radius:6px}
-.webix_segment_0,.webix_segment_1,.webix_segment_N{-webkit-appearance:none;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background:-webkit-linear-gradient(#fff,#e6e6e6);background:-moz-linear-gradient(#fff,#e6e6e6);background:-ms-linear-gradient(top,#fff,#e6e6e6);background:-o-linear-gradient(top,#fff,#e6e6e6);font-size:13px;font-family:Helvetica,Verdana;cursor:pointer;padding:0}
-.webix_segment_0.webix_selected,.webix_segment_1.webix_selected,.webix_segment_N.webix_selected{color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_segment_0{-webkit-border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-webkit-border-top-right-radius:0;-webkit-border-bottom-right-radius:0;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-top-left-radius:6px;border-bottom-left-radius:6px;border-top-right-radius:0;border-bottom-right-radius:0}
+.webix_segment_N{border:1px solid #a4bed4;height:100%;-webkit-border-top-left-radius:0;-webkit-border-bottom-left-radius:0;-webkit-border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:6px;border-bottom-right-radius:6px}
+.webix_segment_N:first-child{-webkit-border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-webkit-border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-topleft:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px;border-top-left-radius:6px;border-bottom-left-radius:6px;border-top-right-radius:6px;border-bottom-right-radius:6px}
+.webix_segment_0,.webix_segment_1,.webix_segment_N{-webkit-appearance:none;color:#1e2022;background:#e6e6e6;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#e6e6e6));background-image:-webkit-linear-gradient(#fff,#e6e6e6);background-image:-moz-linear-gradient(#fff,#e6e6e6);background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);font-size:13px;font-family:Helvetica,Verdana;cursor:pointer;padding:0}
+.webix_segment_0.webix_selected,.webix_segment_1.webix_selected,.webix_segment_N.webix_selected{background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
 .webix_inp_static{border:1px solid #a4bed4;background:#fff;overflow:hidden;padding:0 10px;height:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;float:left}
 .webix_inp_static .webix_placeholder{color:#666d73}
 .webix_el_colorpicker,.webix_el_combo,.webix_el_datepicker,.webix_el_richselect,.webix_el_search{font-size:13px}
@@ -465,15 +468,15 @@ body:not(:-moz-handler-blocked) .webix_el_select select{padding:.2em}
 .webix_disabled_view.webix_control .webix_image{-webkit-filter:grayscale(100%);filter:grayscale(100%)}
 .webix_view.webix_control .webix_disabled_box .webix_input_icon,.webix_view.webix_control .webix_disabled_box button,.webix_view.webix_control .webix_disabled_box label{color:#aaa}
 .webix_view.webix_control .webix_disabled_box .webix_inp_static,.webix_view.webix_control .webix_disabled_box input,.webix_view.webix_control .webix_disabled_box select,.webix_view.webix_control .webix_disabled_box textarea{color:#aaa;background:#eee}
-.webix_view.webix_control .webix_disabled_box .webix_inp_counter_next,.webix_view.webix_control .webix_disabled_box .webix_inp_counter_prev,.webix_view.webix_control .webix_disabled_box .webix_segment_0,.webix_view.webix_control .webix_disabled_box .webix_segment_1,.webix_view.webix_control .webix_disabled_box .webix_segment_N{color:#aaa!important;background:#e9e9e9;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fbfbfb),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(#fbfbfb,#e9e9e9);background:-moz-linear-gradient(#fbfbfb,#e9e9e9);background:-ms-linear-gradient(top,#fbfbfb,#e9e9e9);background:-o-linear-gradient(top,#fbfbfb,#e9e9e9);border-color:#d5d5d5!important}
+.webix_view.webix_control .webix_disabled_box .webix_inp_counter_next,.webix_view.webix_control .webix_disabled_box .webix_inp_counter_prev,.webix_view.webix_control .webix_disabled_box .webix_segment_0,.webix_view.webix_control .webix_disabled_box .webix_segment_1,.webix_view.webix_control .webix_disabled_box .webix_segment_N{color:#aaa!important;background:#e9e9e9;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fbfbfb),color-stop(100%,#e9e9e9));background-image:-webkit-linear-gradient(#fbfbfb,#e9e9e9);background-image:-moz-linear-gradient(#fbfbfb,#e9e9e9);background-image:-ms-linear-gradient(top,#fbfbfb,#e9e9e9);background-image:-o-linear-gradient(top,#fbfbfb,#e9e9e9);border-color:#d5d5d5!important}
 .webix_disabled_top_label{color:#aaa}
-label.webix_required:after{padding-left:4px;content:"*";color:red}
+label.webix_required:after,legend.webix_required:after{padding-left:4px;content:"*";color:red}
 .webix_multicombo .webix_inp_static{padding:0 3px}
 .webix_el_text .webix_multicombo_input{background-color:transparent;border:0;float:left;vertical-align:middle;padding:0;color:#1e2022;font-size:13px;font-family:Helvetica,Verdana;margin-left:7px}
 .webix_el_text .webix_multicombo_input:focus{border:0;box-shadow:none}
 .webix_multicombo_listbox{width:auto;line-height:1;margin:0;padding:0;list-style:none}
 .webix_multicombo_tag,.webix_multicombo_value{padding:0 5px 0 7px;background-color:#f2f2f2;display:inline-block;margin:3px;float:left;border-radius:6px}
-.webix_multicombo_tag{min-width:15px;text-align:center;padding:0 5px}
+.webix_multicombo_tag{min-width:15px;text-align:center;padding:0 5px 0 5px}
 .webix_multicombo_delete{margin-left:10px;padding:0 5px;color:#000;cursor:pointer}
 .webix_multilist .webix_selected{background:#f2f2f2;color:#1e2022}
 .webix_checksuggest_select_all{border:none;border-bottom:1px solid #ebebeb;border-color:#ebebeb;margin-bottom:1px}
@@ -485,13 +488,13 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .webix_tab_filler{display:table-cell;background:0 0;font-size:1px;border-bottom:1px solid #a4bed4;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 .webix_tab_filler:first-child{border-right:1px solid #a4bed4}
 .webix_item_tab:first-child{border-left:1px solid #a4bed4}
-.webix_item_tab{display:table-cell;text-align:center;vertical-align:middle;overflow:hidden;cursor:pointer;border:1px solid #a4bed4;border-left-width:0;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);-webkit-border-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-radius:0;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+.webix_item_tab{display:table-cell;text-align:center;vertical-align:middle;overflow:hidden;cursor:pointer;border:1px solid #a4bed4;border-left-width:0;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x;-webkit-border-top-left-radius:0;-webkit-border-bottom-left-radius:0;-webkit-border-top-right-radius:0;-webkit-border-bottom-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:0;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 .webixtype_bottom .webix_item_tab{border-radius:0}
-.webix_item_tab.webix_selected{border-bottom-width:0;background:#fff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#e5f1ff),color-stop(100%,#fff));background:-webkit-linear-gradient(#e5f1ff,#fff);background:-moz-linear-gradient(#e5f1ff,#fff);background:-ms-linear-gradient(top,#e5f1ff,#fff);background:-o-linear-gradient(top,#e5f1ff,#fff)}
-.webixtype_bottom .webix_item_tab.webix_selected{border-bottom-width:1px;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background:-webkit-linear-gradient(#ffebc2,#ffdb8f);background:-moz-linear-gradient(#ffebc2,#ffdb8f);background:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
+.webix_item_tab.webix_selected{border-bottom-width:0;background:#fff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#e5f1ff),color-stop(100%,#fff));background-image:-webkit-linear-gradient(#e5f1ff,#fff);background-image:-moz-linear-gradient(#e5f1ff,#fff);background-image:-ms-linear-gradient(top,#e5f1ff,#fff);background-image:-o-linear-gradient(top,#e5f1ff,#fff)}
+.webixtype_bottom .webix_item_tab.webix_selected{border-bottom-width:1px;background-size:100% 100%;background-position:0 0;color:#1e2022;background:#ffdb8f;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#ffebc2),color-stop(100%,#ffdb8f));background-image:-webkit-linear-gradient(#ffebc2,#ffdb8f);background-image:-moz-linear-gradient(#ffebc2,#ffdb8f);background-image:-ms-linear-gradient(top,#ffebc2,#ffdb8f);background-image:-o-linear-gradient(top,#ffebc2,#ffdb8f)}
 .webix_before_all_tabs{width:100%}
 .webix_after_all_tabs{width:100%;border-left:1px solid #a4bed4;border-right:1px solid #a4bed4;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
-.webix_view.webix_control .webix_disabled_box .webix_item_tab{color:#aaa!important;background:#e9e9e9;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fbfbfb),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(#fbfbfb,#e9e9e9);background:-moz-linear-gradient(#fbfbfb,#e9e9e9);background:-ms-linear-gradient(top,#fbfbfb,#e9e9e9);background:-o-linear-gradient(top,#fbfbfb,#e9e9e9);border-color:#d5d5d5!important}
+.webix_view.webix_control .webix_disabled_box .webix_item_tab{color:#aaa!important;background:#e9e9e9;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fbfbfb),color-stop(100%,#e9e9e9));background-image:-webkit-linear-gradient(#fbfbfb,#e9e9e9);background-image:-moz-linear-gradient(#fbfbfb,#e9e9e9);background-image:-ms-linear-gradient(top,#fbfbfb,#e9e9e9);background-image:-o-linear-gradient(top,#fbfbfb,#e9e9e9);border-color:#d5d5d5!important}
 .webix_el_tabbar .webixtype_icon .webix_img_btn{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0 auto;text-align:center}
 .webix_el_tabbar .webixtype_icon .webix_img_btn .webix_icon_btn{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0 3px}
 .webix_el_tabbar .webixtype_icon .webix_item_tab,.webix_el_tabbar .webixtype_iconTop .webix_item_tab,.webix_el_tabbar .webixtype_image .webix_item_tab{padding:2px 0;border-radius:0}
@@ -505,17 +508,17 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .webix_menu .webix_list_item .webix_submenu_icon,.webix_menu-x .webix_list_item .webix_submenu_icon{float:right;text-align:right;position:relative;margin-left:4px}
 .webix_menu-x .webix_list_item:first-child{margin-left:0}
 .webix_menu-x .webix_submenu_icon{top:13px}
-.webix_menu-x{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%)}
+.webix_menu-x{background-color:#fff;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x}
 .webix_menu-x .webix_list_item{display:inline-block;line-height:30px;-moz-background-size:1px 100%,100% 100%,1px 100%;background-size:1px 100%,100% 100%,1px 100%;background-color:transparent;margin:1px 0;background-position:0 0,1px 0,100% 0;background-repeat:no-repeat;background-image:-webkit-gradient(linear,left top,left bottom,#f0f6ff,#fff,#f0f6ff),-webkit-gradient(linear,left top,left bottom,transparent,transparent),-webkit-gradient(linear,left top,left bottom,#f0f6ff,#a4bed4,#f0f6ff);background-image:-webkit-linear-gradient(#f0f6ff,#fff,#f0f6ff),-webkit-linear-gradient(transparent,transparent),-webkit-linear-gradient(#f0f6ff,#a4bed4,#f0f6ff);background-image:-moz-linear-gradient(#f0f6ff,#fff,#f0f6ff),-moz-linear-gradient(transparent,transparent),-moz-linear-gradient(#f0f6ff,#a4bed4,#f0f6ff);background-image:-ms-linear-gradient(top,#f0f6ff,#fff,#f0f6ff),-ms-linear-gradient(transparent,transparent),-ms-linear-gradient(top,#f0f6ff,#a4bed4,#f0f6ff);background-image:-o-linear-gradient(top,#f0f6ff,#fff,#f0f6ff),-o-linear-gradient(transparent,transparent),-o-linear-gradient(top,#f0f6ff,#a4bed4,#f0f6ff)}
 .webix_menu-x .webix_list_item:last-child{background-size:1px 100%,100% 100%,1px 100%;background-repeat:no-repeat;background-image:-webkit-gradient(linear,left top,left bottom,#f0f6ff,#fff,#f0f6ff),-webkit-gradient(linear,left top,left bottom,transparent,transparent),-webkit-gradient(linear,left top,left bottom,transparent,transparent);background-image:-webkit-linear-gradient(#f0f6ff,#fff,#f0f6ff),-webkit-linear-gradient(transparent,transparent),-webkit-linear-gradient(transparent,transparent);background-image:-moz-linear-gradient(#f0f6ff,#fff,#f0f6ff),-moz-linear-gradient(transparent,transparent),-moz-linear-gradient(transparent,transparent);background-image:-ms-linear-gradient(top,#f0f6ff,#fff,#f0f6ff),-ms-linear-gradient(transparent,transparent),-ms-linear-gradient(transparent,transparent);background-image:-o-linear-gradient(top,#f0f6ff,#fff,#f0f6ff),-o-linear-gradient(transparent,transparent),-o-linear-gradient(transparent,transparent);border-right:0}
 .webix_menu{background:#fff;border:1px solid #a4bed4;border-radius:0}
 .webix_menu .webix_list_item{display:block}
-.webix_menu .webix_context_separator{height:3px;padding:1px 3px 0}
+.webix_menu .webix_context_separator{height:3px;padding:1px 3px 0 3px}
 .webix_menu .webix_context_separator .sep_line{height:1px;border-top:1px solid #a4bed4}
 .webix_menu .webix_submenu_icon{top:11px}
 .webix_menu .webix_context_spacer{height:28px}
 .webix_menu_link{color:inherit;text-decoration:none;display:block;height:100%}
-.webix_layout_toolbar,.webix_toolbar.webix_layout_subbar{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%)}
+.webix_layout_toolbar,.webix_toolbar.webix_layout_subbar{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x}
 .webix_toolbar .webix_layout_clean,.webix_toolbar .webix_layout_line,.webix_toolbar .webix_layout_toolbar{background:0 0}
 .webix_el_button .webix_hidden_upload,.webix_hidden_upload{height:1px;width:1px;border:0!important;font-size:1px;position:absolute;top:0;left:0;z-index:-1}
 .webix_upload_client,.webix_upload_error,.webix_upload_server{width:60px;text-align:center;float:right}
@@ -530,29 +533,42 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .webix_fieldset fieldset{border:1px solid #81a5c4;margin:0;padding:5px 8px}
 .webix_fieldset legend{color:#1e2022;font-size:12px}
 .webix_forminput fieldset{border:none;margin:0;padding:0}
-.webix_forminput legend{color:#1e2022;line-height:30px;padding:2px 7.5px 2px 2px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;font-family:Helvetica,Verdana;float:left}
-.webix_slider_box{position:relative;padding:13px 10px 0;height:100%;float:left;border-radius:5px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin-top:-11px}
-.webix_slider_box .webix_slider_left{height:10px;float:left;width:100px;border:1px solid #b5cadc;-webkit-border-radius:5px 0 0 5px;-moz-border-radius-topleft:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-radius:5px 0 0 5px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
-.webix_slider_box .webix_slider_right{height:10px;float:left;width:100px;background:#fff;-webkit-border-radius:0 5px 5px 0;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:5px;-moz-border-radius-bottomright:5px;border-radius:0 5px 5px 0;border:1px solid #b5cadc;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+.webix_forminput legend{color:#1e2022;line-height:30px;padding:2px 5px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;font-family:Helvetica,Verdana;float:left;padding-right:7.5px}
+.webix_slider_box{position:relative;padding:0 10px;height:100%;padding-top:13px;float:left;border-radius:5px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin-top:-11px}
+.webix_slider_box .webix_slider_left{height:10px;float:left;width:100px;border:1px solid #b5cadc;-webkit-border-top-left-radius:5px;-webkit-border-bottom-left-radius:5px;-webkit-border-top-right-radius:0;-webkit-border-bottom-right-radius:0;-moz-border-radius-topleft:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:0;border-top-left-radius:5px;border-bottom-left-radius:5px;border-top-right-radius:0;border-bottom-right-radius:0;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+.webix_slider_box .webix_slider_right{height:10px;float:left;width:100px;background:#fff;-webkit-border-top-left-radius:0;-webkit-border-bottom-left-radius:0;-webkit-border-top-right-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:5px;-moz-border-radius-bottomright:5px;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:5px;border-bottom-right-radius:5px;border:1px solid #b5cadc;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 .webix_slider_box .webix_slider_handle{z-index:1;position:absolute;width:14px;height:14px;border-radius:8px}
 .webix_slider_box .webix_slider_left{background:#f5f9ff}
-.webix_slider_box .webix_slider_handle{border:1px solid #a4bed4;-moz-box-shadow:inset 0 1px 1px 1px #fff;-webkit-box-shadow:inset 0 1px 1px 1px #fff;box-shadow:inset 0 1px 1px #fff;background:#fafcff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#d6e8ff),color-stop(100%,#fafcff));background:-webkit-linear-gradient(#d6e8ff,#fafcff);background:-moz-linear-gradient(#d6e8ff,#fafcff);background:-ms-linear-gradient(top,#d6e8ff,#fafcff);background:-o-linear-gradient(top,#d6e8ff,#fafcff);top:10px}
+.webix_slider_box .webix_slider_handle{border:1px solid #a4bed4;-moz-box-shadow:inset 0 1px 1px 1px #fff;-webkit-box-shadow:inset 0 1px 1px 1px #fff;box-shadow:inset 0 1px 1px #fff;background:#fafcff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#d6e8ff),color-stop(100%,#fafcff));background-image:-webkit-linear-gradient(#d6e8ff,#fafcff);background-image:-moz-linear-gradient(#d6e8ff,#fafcff);background-image:-ms-linear-gradient(top,#d6e8ff,#fafcff);background-image:-o-linear-gradient(top,#d6e8ff,#fafcff);top:10px}
 .webix_rangeslider .webix_slider_box .webix_slider_left{position:absolute}
 .webix_rangeslider .webix_slider_box .webix_slider_active{z-index:1}
 .webix_rangeslider .webix_slider_box .webix_slider_right{border-radius:5px}
+.webix_rangeslider .webix_slider_title_box{position:relative;float:left;width:1px}
+.webix_rangeslider .webix_slider_title.webix_slider_move{position:absolute}
+.webix_rangeslider.webix_slider_vertical .webix_slider_box .webix_slider_right{-webkit-border-top-left-radius:5px;-webkit-border-bottom-left-radius:5px;-webkit-border-top-right-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-topright:5px;-moz-border-radius-bottomright:5px;border-top-left-radius:5px;border-bottom-left-radius:5px;border-top-right-radius:5px;border-bottom-right-radius:5px}
+.webix_rangeslider.webix_slider_vertical .webix_slider_title.webix_slider_move{display:block;position:relative}
 .webix_slider_alt .webix_slider_box .webix_slider_left,.webix_slider_alt .webix_slider_box .webix_slider_right{border:1px solid #e1e1e1}
 .webix_slider_alt .webix_slider_box .webix_slider_handle{width:11px;margin:0 2px;height:14px;border-radius:2px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTJCMjdFNENBRTg4MTFFMjk2NjJGMTJENjkyNDA2NTkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTJCMjdFNERBRTg4MTFFMjk2NjJGMTJENjkyNDA2NTkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo5MkIyN0U0QUFFODgxMUUyOTY2MkYxMkQ2OTI0MDY1OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo5MkIyN0U0QkFFODgxMUUyOTY2MkYxMkQ2OTI0MDY1OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Powz/icAAAAaSURBVHjaYmBgYDBjgAA4zcSABQysIECAAQBn+ACx2PqtbAAAAABJRU5ErkJggg==);background-repeat:no-repeat;background-position:3px center}
 .webix_slider_alt .webix_slider_box .webix_slider_left{background:#f0f6ff}
 .webix_slider_alt .webix_slider_box .webix_slider_right{background:#eee}
 .webix_slider_alt .webix_slider_box .webix_slider_handle{background-color:#f5f9ff;top:10px}
 .webix_slider_vertical .webix_slider_box .webix_slider_left,.webix_slider_vertical .webix_slider_box .webix_slider_right{width:10px;float:none}
-.webix_slider_vertical .webix_slider_box .webix_slider_left{-webkit-border-radius:0 0 5px 5px;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:5px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:5px;border-radius:0 0 5px 5px}
-.webix_slider_vertical .webix_slider_box .webix_slider_right{-webkit-border-radius:5px 5px 0 0;-moz-border-radius-topleft:5px;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:5px;-moz-border-radius-bottomright:0;border-radius:5px 5px 0 0}
+.webix_slider_vertical .webix_slider_box .webix_slider_left{-webkit-border-top-left-radius:0;-webkit-border-bottom-left-radius:5px;-webkit-border-top-right-radius:0;-webkit-border-bottom-right-radius:5px;-moz-border-radius-topleft:0;-moz-border-radius-bottomleft:5px;-moz-border-radius-topright:0;-moz-border-radius-bottomright:5px;border-top-left-radius:0;border-bottom-left-radius:5px;border-top-right-radius:0;border-bottom-right-radius:5px}
+.webix_slider_vertical .webix_slider_box .webix_slider_right{-webkit-border-top-left-radius:5px;-webkit-border-bottom-left-radius:0;-webkit-border-top-right-radius:5px;-webkit-border-bottom-right-radius:0;-moz-border-radius-topleft:5px;-moz-border-radius-bottomleft:0;-moz-border-radius-topright:5px;-moz-border-radius-bottomright:0;border-top-left-radius:5px;border-bottom-left-radius:0;border-top-right-radius:5px;border-bottom-right-radius:0}
 .webix_slider_vertical .webix_slider_box .webix_slider_handle{left:7px}
 .webix_slider_vertical .webix_slider_title{padding-top:1px;text-align:left}
 .webix_slider_vertical.webix_slider_alt .webix_slider_handle{height:11px;width:14px;left:5px;background-position:4px center}
 .webix_slider_title{text-align:center}
-.webix_slider_title.webix_slider_move{position:relative;text-align:left;display:inline-block;width:auto}
+.webix_slider_title.webix_slider_move{position:relative;text-align:left;display:inline-block;width:auto;white-space:nowrap}
+.webix_el_box .webix_switch_box{margin-top:4px}
+.webix_switch_toggle{position:absolute;visibility:hidden}
+.webix_switch_box{display:block;position:relative;cursor:pointer;height:24px;width:60px;background-color:#f1f1f1;border:1px solid #a4bed4;border-radius:60px;box-sizing:border-box;transition:background-color .4s ease;color:#666;text-align:center;float:left}
+.webix_el_switch .webix_label_right{display:inline-block;padding-top:3px;margin-top:4px}
+.webix_switch_handle{height:22px;width:22px;border-radius:100%;box-shadow:0 1px 5px rgba(0,0,0,.3);border:1px solid #eee;position:absolute;top:0;background-color:#fff;transition:left .3s ease;cursor:pointer;box-sizing:border-box}
+.webix_switch_box:active .webix_switch_handle,.webix_switch_handle:focus{box-shadow:0 0 2px 2px rgba(0,0,0,.2)}
+.webix_switch_text{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none;padding:1px 0 0 18px;display:inline-block;box-sizing:border-box;width:100%}
+.webix_switch_on .webix_switch_text{padding:1px 18px 0 0}
+.webix_switch_box.webix_switch_on{color:#fff}
 .webix_progress_bottom,.webix_progress_top{width:100%;position:absolute;top:0;left:0;height:6px;overflow:hidden;z-index:20}
 .webix_progress_bottom{bottom:0;top:auto;height:17px}
 .webix_progress_bottom .webix_progress_state,.webix_progress_top .webix_progress_state{width:0;height:6px;background:#ffdb8f;-moz-transition:width 3s;transition:width 3s}
@@ -562,7 +578,7 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .webix_gage{height:100%;width:100%;transform:rotate(180deg)}
 .webix_gage_label{font-size:.9em;text-align:center;margin-top:10px}
 .webix_gage_placeholder{margin-top:-20px}
-.webix_gage_info{text-align:center;font-size:.7em;position:relative;margin:0 auto 10px}
+.webix_gage_info{text-align:center;font-size:.7em;position:relative;margin:0 auto 10px auto}
 .webix_gage_min_range{left:-74px}
 .webix_gage_max_range{right:-74px}
 .webix_gage_max_range,.webix_gage_min_range{display:inline-block;margin-top:20px;position:absolute;text-align:center;width:150px}
@@ -571,22 +587,190 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .webix_gage_gradient_point_animated{transition:transform 1.3s linear}
 .webix_gage_animated{stroke:#0f0;animation:gage_dash 1.3s linear forwards;transition:stroke 1.3s linear,stroke-dasharray 1.3s linear}
 .webix_gage_animated_first_load{stroke:#0f0;animation:gage_dash 1.3s linear forwards;transition:stroke 1.3s linear}
-@keyframes gage_dash{to{stroke-dashoffset:0}}
+@keyframes gage_dash{to{stroke-dashoffset:0}
+}
 .webix_bullet_name{width:100}
 .webix_bullet_header{font-weight:700;font-size:15px}
 .webix_bullet_subheader{font-size:15px}
 .webix_bullet_scale{font-size:12px;font-weight:700}
 .webix_organogram canvas{position:absolute}
-.webix_organogram_item{position:absolute;z-index:1;text-align:center;border-radius:4px;background-color:#e3f2fd;border:1px solid #bbdefb;padding:7px 7px 10px;box-sizing:border-box}
+.webix_organogram_item{position:absolute;z-index:1;text-align:center;border-radius:4px;background-color:#e3f2fd;border:1px solid #bbdefb;padding:7px 7px 10px 7px;box-sizing:border-box}
 .webix_organogram_item.webix_selected{background-color:#ffdb8f;border-color:#ffdb8f}
 .webix_organogram_list{border-radius:4px;position:absolute;z-index:1;height:auto;border:1px solid #ddd;box-sizing:border-box}
 .webix_organogram_list .webix_organogram_list_item{border:none;text-align:left;position:static;padding:5px;border-radius:0;box-sizing:border-box}
+.webix_icon,.webix_icon_btn,.webix_input_icon{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0,0)}
+.webix_icon,.webix_input_icon{font-size:17px;display:inline-block;width:20px}
+.webix_input_icon{float:right;font-size:19px;color:#888}
+.webix_icon_button{background-color:transparent;border:none;padding:0;cursor:pointer;position:relative}
+.webix_icon_button .webix_icon{font-size:20px;height:23px;width:21px;display:inline-block;text-align:center;color:#606060}
+.webix_icon_btn{font-size:17px;display:inline-block;text-align:center;width:24px;color:#606060}
+.webix_el_iconBbutton .webix_icon_btn{text-align:center;width:100%;padding:5px 0}
+.webix_el_icon{cursor:pointer}
+.webix_badge{background-color:#ff8839;color:#fff;border-radius:50%;font-size:12px;height:22px;min-width:22px;box-sizing:border-box;padding:0 4px;text-align:center;line-height:21px;position:absolute;right:0;top:0}
+.webix_list_item .webix_badge{position:static;float:right;margin:4px -5px 0 10px}
+.webixtype_base .webix_badge{top:50%;margin-top:-11px;margin-right:8px}
+.webix_treemap{background-color:#f5f5f5}
+.webix_treemap .webix_scroll_cont{position:relative;height:100%;width:100%}
+.webix_treemap_item{position:absolute;color:#444;overflow:hidden;text-align:left;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:3px 5px;border-width:0 1px 1px 0;border-style:solid;border-color:rgba(0,0,0,.2);background:0 0;cursor:pointer}
+.webix_treemap_level_top{z-index:1;border-color:rgba(0,0,0,.4)}
+.webix_treemap_item_bottom{border-bottom-width:0}
+.webix_treemap_item_right{border-right-width:0}
+.webix_treemap_item:hover{box-shadow:inset 0 0 5px #666}
+.webix_treemap_item.webix_selected{border-color:#ffdb8f;box-shadow:inset 0 0 1px 2px #ffdb8f}
+.webix_treemap_header{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 10px;border-bottom:1px solid #a4bed4}
+.webix_treemap_header_item{cursor:pointer}
+.webix_treemap_header_item:last-child{cursor:default}
+.webix_treemap_reset{float:right;width:25px;text-align:center}
+.webix_treemap_reset:before{content:"\f00d";color:#1e2022;font-family:FontAwesome;font-size:16px;display:block;cursor:pointer}
+.webix_treemap_path_icon{width:20px;text-align:center}
+.webix_barcode{position:relative}
+.webix_barcode .webix_canvas_text{font-size:13px;padding:0 2px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+.portlet_drag{position:absolute;z-index:1;top:5px;right:5px;width:18px;opacity:.5;cursor:pointer}
+.portlet_in_drag{opacity:.4}
+.portlet_marker,.portlet_markerbottom,.portlet_markerleft,.portlet_markerright,.portlet_markertop{opacity:.5;background:#9169BE;position:absolute;z-index:2;transition:top .5s,left .5s,width .5s,height .5s;top:0;left:0;width:100%;height:100%}
+.portlet_markertop{height:50%}
+.portlet_markerbottom{height:50%;top:50%}
+.portlet_markerleft{width:50%}
+.portlet_markerright{width:50%;left:50%}
+.panel_icon{position:absolute;z-index:100;top:5px;right:5px;line-height:normal;font-size:13px;width:18px;opacity:.5;cursor:pointer}
+.panel_target{position:absolute;background:rgba(120,120,120,.84);box-shadow:0 0 10px 5px #666;z-index:3}
+.webix_popup.webix_sidemenu.webix_sidemenu_left{border-width:0 1px 0 0;box-shadow:2px 0 2px rgba(0,0,0,.05)}
+.webix_sidemenu_left.webix_animate{transition:left .6s}
+.webix_popup.webix_sidemenu.webix_sidemenu_right{left:auto;border-width:0 0 0 1px;box-shadow:-2px 0 2px rgba(0,0,0,.05)}
+.webix_sidemenu_right.webix_animate{transition:right .6s}
+.webix_popup.webix_sidemenu.webix_sidemenu_top{border-width:0 0 1px 0;box-shadow:0 2px 2px rgba(0,0,0,.05)}
+.webix_sidemenu_top .webix_win_body{position:relative}
+.webix_sidemenu_top .webix_win_body>.webix_view{position:absolute;top:auto;left:0;bottom:0}
+.webix_sidemenu_top.webix_animate,.webix_sidemenu_top.webix_animate .webix_win_body{transition:height .6s}
+.webix_popup.webix_sidemenu.webix_sidemenu_bottom{border-width:1px 0 0 0;top:auto;box-shadow:0 -2px 2px rgba(0,0,0,.05)}
+.webix_sidemenu_bottom.webix_animate,.webix_sidemenu_bottom.webix_animate .webix_win_body{transition:height .6s}
+.webix_sidebar{background:#ECEFF1}
+.webix_sidebar .webix_tree_item{color:#454545;height:35px;line-height:35px}
+.webix_sidebar .webix_scroll_cont>.webix_tree_leaves{padding:0}
+.webix_sidebar .webix_tree_leaves .webix_tree_leaves{margin-left:0}
+.webix_sidebar_expanded .webix_tree_item:hover,.webix_sidebar_selected{background-color:rgba(0,0,0,.02)}
+.webix_sidebar .webix_tree_item.webix_selected,.webix_sidebar .webix_tree_item.webix_selected span{background-color:#27ae60;padding-right:0}
+.webix_sidebar .webix_tree_branch_1 .webix_tree_item{padding-left:40px}
+.webix_sidebar .webix_tree_branch_1>.webix_tree_item{height:40px;line-height:40px;padding-left:0}
+.webix_sidebar .webix_tree_branch_1{border-bottom:1px solid #e5e5e5}
+.webix_sidebar .webix_tree_item span,.webix_sidebar .webix_tree_item.webix_selected span{margin:0;padding:0}
+.webix_sidebar_icon{width:40px;text-align:center}
+.webix_sidebar_dir_icon{float:right;line-height:inherit}
+.webix_sidebar_popup{border:none!important;box-shadow:2px 3px 3px #ddd}
+.webix_sidebar_popup,.webix_sidebar_popup .webix_list_item{border-radius:0}
+.webix_sidebar_popup_right{box-shadow:-1px 3px 3px #ddd}
+.webix_sidebar_popup_list.webix_sidebar_popup_left .webix_icon{float:right;line-height:inherit;width:7px}
+.webix_sidebar_popup_title{background:#ECEFF1}
+.webix_sidebar_popup_title.webix_selected{border-left-color:#27ae60;background:#27ae60}
+.webix_sidebar_popup_title .webix_template{line-height:40px;padding:0 10px;border:1px solid #E5E5E5;border-left:none}
+.webix_sidebar_selected.webix_sidebar_popup_title .webix_template{background:rgba(0,0,0,.03);border-left:none}
+.webix_sidebar_popup_list .webix_list_item{border-left:1px solid #E5E5E5;border-right:1px solid #E5E5E5}
+.webix_sidebar_popup_list .webix_list_item:first-child{border-top:1px solid #E5E5E5}
+.webix_sidebar_popup_list .webix_list_item:hover{background:#f6f9fb}
+.webix_sidebar_popup_list .webix_list_item.webix_selected:hover{background:#27ae60}
+.webix_menu .webix_list_item.webix_sidebar_selected{background:rgba(0,0,0,.02)}
+.webix_menu .webix_list_item.webix_sidebar_selected:hover{background:rgba(0,0,0,.02)!important}
+.webix_view.webix_pdf{background-color:#404040;overflow:auto;-webkit-overflow-scrolling:touch}
+.webix_pdf .canvas_wrapper{margin:0 auto;box-shadow:5px 5px 15px #1c1c1c;width:100%;height:100%}
+.webix_toolbar.pdf_bar{background-color:#474747}
+.webix_toolbar.pdf_bar .webix_icon_btn{font-size:15px}
+.webix_toolbar.pdf_bar .webix_img_btn:focus,.webix_toolbar.pdf_bar .webix_img_btn:hover{background-color:#404040}
+.webix_toolbar.pdf_bar .webix_template{background-color:#3498db;color:#fff;line-height:2em}
+.webix_toolbar.pdf_bar .webix_el_box input,.webix_toolbar.pdf_bar .webix_inp_static{background-color:#5c5c5c;color:#fff;border-color:#404040}
+.webix_toolbar.pdf_bar .webix_el_box input:focus,.webix_toolbar.pdf_bar .webix_inp_static:focus{border-color:#333}
+.webix_toolbar.pdf_bar .webix_el_box .webix_input_icon{color:#fff}
+.webix_view.webix_popup.pdf_opt_list{box-shadow:5px 5px 15px #1c1c1c;border:none}
+.pdf_opt_list .webix_list{background-color:#404040;color:#fff}
+.pdf_opt_list .webix_list .webix_list_item{border-color:#474747;line-height:1.5em}
+.pdf_opt_list .webix_list .webix_list_item.webix_selected,.pdf_opt_list .webix_list .webix_list_item:hover{color:#404040;background-color:#fff}
+.webix_dbllist .webix_list{background:#ededed}
+.webix_dbllist .webix_list_item{background:#fff;margin:3px 4px 0 4px;box-sizing:border-box}
+.webix_dbllist .webix_list_item.webix_selected{color:#FFF;background:#27ae60}
+.webix_dbllist button{width:45%;height:30px;margin-top:5px;background:#fff;border-radius:6px;border:1px solid #a4bed4;cursor:pointer;font-size:13px;font-family:Helvetica,Verdana}
+.webix_dbllist button:active{box-shadow:inset 1px 1px 0 silver}
+.webix_dbllist button .webix_icon{color:#888;font-size:26px}
+.webix_dbllist button:first-child{margin-top:32px;margin-right:5%}
+.webix_dbllist button:last-child{margin-left:5%}
+.webix_dbllist .bottom_label{font-size:10px;text-transform:uppercase;background:#ededed;padding-left:13px}
+.webix_invalid .webix_list{background:#f8e2e2}
+.webix_toolbar .webix_el_label,.webix_toolbar .webix_inp_label{color:#1e2022}
+.webix_ss_sort_asc{position:absolute;float:right;right:3px;top:8px;width:7px;height:13px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAANCAYAAABlyXS1AAAARUlEQVR4nGNgQAKGxib/GbABkIS7b8B/DAUwCRiGK0CXwFBAb1DfP/U/LszwHwi2X7qFgUEArBtdAVwCBmAKMCSQFSDzAWXXaOHsXeqkAAAAAElFTkSuQmCC)}
+.webix_ss_sort_desc{position:absolute;right:3px;top:8px;width:7px;height:13px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAANCAYAAABlyXS1AAAARUlEQVR42mNgQAL1/VP/M2ADIIntF2/9x1AAlrh0C47hCmA60DFYwX88gIFGwNDY5D8uDFbg7hvwHx2jmIBTAlkB0e4BAEjlaNtBWJPnAAAAAElFTkSuQmCC)}
+.webix_group_back .webix_arrow_icon{color:#1e2022}
+.webix_menu-x .webix_list_item:active,.webix_menu-x .webix_list_item:focus,.webix_menu-x .webix_list_item:hover{background-color:rgba(255,255,255,.4)!important}
+.webix_menu .webix_list_item:active,.webix_menu .webix_list_item:hover{background-color:rgba(0,0,0,.05)!important}
+.webix_list_item .webix_submenu_icon{width:0;height:0;border-width:4px;border-style:solid}
+.webix_menu-x .webix_list_item .webix_submenu_icon{border-color:#375975 transparent transparent transparent}
+.webix_menu .webix_list_item .webix_submenu_icon{border-color:transparent transparent transparent #375975}
+.webix_popup_title{color:#1e2022!important;background:#e3e3e3!important;font-size:15px!important;font-weight:700;border-bottom:1px solid #dedede!important;text-shadow:none!important}
+.webix_modal_box{background:#ebebeb!important;border:1px solid #a4bed4!important}
+.confirmButton{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x}
+.confirmButtonActive{background:#fff}
+.webix_item_tab{font-size:13px}
+.buttonStyle{font-size:13px;font-family:Helvetica,Verdana}
+.activeShadow{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}
+.webix_img_btn_abs:active+input,.webix_inp_counter_next:active,.webix_inp_counter_prev:active,.webixtype_base:active{background:#f5f5f5;box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background-repeat:none}
+.webix_icon_button:active,.webix_img_btn:active,.webix_img_btn_top:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background-color:rgba(0,0,0,.05)}
+.webix_pressed .webix_img_btn_abs+input,.webix_pressed .webixtype_base{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background:#f5f5f5!important}
+.webix_slider_vertical .webix_slider_box{margin-top:-8px}
+.webix_rangeslider .webix_slider_title_box{height:17px}
+.webix_switch_box.webix_switch_on{background-color:#a4bed4}
+.webix_switch_text{line-height:21px}
+.webix_accordionitem_label .webix_icon{font-size:19px;width:25px}
+.webix_accordionitem.vertical>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAARUlEQVR42o2PAQYAMAwD9+iEFvTpnZYZU7EQRa4kaxKAXD9y9yTZluCBALRJpATNrIG6rAdjjmBVeCuB6EyAYkNEiDE33yMJRSaycR8/AAAAAElFTkSuQmCC);background-repeat:no-repeat}
+.webix_accordionitem.vertical.collapsed>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAASElEQVR42n2PMQoAMAgD++gEdPLpFkshS9oDEcxlcA1V1euNcpI9k5m2MPfrqABCBS8KBptAR8QJZks0kGjgjMQn/oc/AKy4Acp9RSZl+HEYAAAAAElFTkSuQmCC);background-repeat:no-repeat}
+.webix_accordionitem.horizontal>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAALCAYAAACzkJeoAAAASUlEQVR42p2QMQoAQQgD79EZ0Mqn5xCu2cPdYgUbJ0rMMxXgLeiuKq8gsJAz8weQ0QiwJEfECnr4wdlEnwJ68+yyhReC+c85oRecj0Um+pmo9wAAAABJRU5ErkJggg==);background-repeat:no-repeat}
+.webix_accordionitem.horizontal:last-child>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAALCAYAAACzkJeoAAAARElEQVR42qXPsQoAIAhF0T76PdDJT7cUmtQhcmk4N8QVQ9JXN2bmgWOgqp+BiCRG2AYAMoi3/LxYdyagAnhA6G93TrABZaJFJjrFY8IAAAAASUVORK5CYII=);background-repeat:no-repeat}
+.webix_accordionitem.horizontal.collapsed:last-child>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAASElEQVR42n2PMQoAMAgD++gEdPLpFkshS9oDEcxlcA1V1euNcpI9k5m2MPfrqABCBS8KBptAR8QJZks0kGjgjMQn/oc/AKy4Acp9RSZl+HEYAAAAAElFTkSuQmCC);background-repeat:no-repeat}
+.webix_accordionitem.horizontal.collapsed>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAARUlEQVR42o2PAQYAMAwD9+iEFvTpnZYZU7EQRa4kaxKAXD9y9yTZluCBALRJpATNrIG6rAdjjmBVeCuB6EyAYkNEiDE33yMJRSaycR8/AAAAAElFTkSuQmCC);background-repeat:no-repeat}
+.webix_progress_bottom,.webix_progress_top{background:#f7f7f7;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f2f2f2),color-stop(50%,#f7f7f7),color-stop(100%,#f2f2f2));background-image:-webkit-linear-gradient(top,#f2f2f2 0,#f7f7f7 50%,#f2f2f2 100%);background-image:-moz-linear-gradient(top,#f2f2f2 0,#f7f7f7 60%,#f2f2f2 100%);background-image:-ms-linear-gradient(top,#f2f2f2 0,#f7f7f7 60%,#f2f2f2 100%);background-image:-o-linear-gradient(top,#f2f2f2 0,#f7f7f7 60%,#f2f2f2 100%);background-position:0 1px;background-repeat:repeat-x}
+.webix_daterange .webix_range_timepicker .webix_cal_time{padding:5px 15px}
+.webix_daterange .webix_range_footer .webix_template{padding:10px 0}
+.webix_cal_range{background-color:#fff4dc}
+.webix_item_tab .webix_icon{width:30px;font-size:19px}
+.webix_tab_more_icon{border-bottom:1px solid #a4bed4}
+.webix_skin_mark{height:110px}
+.webix_sparklines{padding:1px 0;box-sizing:border-box}
+.webix_sparklines svg{box-sizing:border-box}
+.webix_sparklines_line{stroke:#3498db;stroke-width:1;fill:transparent;stroke-linecap:round}
+.webix_sparklines_item{fill:#3498db;stroke-width:1}
+.webix_sparklines_bar{fill:#6dbcf0}
+.webix_sparklines_bar_negative{fill:#d86c79}
+.webix_sparklines_area{fill:#e5eef4}
+.webix_sparklines_origin{stroke:#888;stroke-width:1}
+.webix_sparklines_event_area{fill:transparent}
+.webix_sparklines_area_chart .webix_sparklines_event_area:hover,.webix_sparklines_line_chart .webix_sparklines_event_area:hover,.webix_sparklines_splinearea_chart .webix_sparklines_event_area:hover{fill:rgba(220,220,220,.4);stroke:rgba(255,255,255,.6)}
+.webix_sparklines_bar_chart .webix_sparklines_event_area:hover,.webix_sparklines_pie_chart .webix_sparklines_event_area:hover{fill:rgba(255,255,255,.3)}
+.webix_ui_print{display:none}
+body.webix_print{margin-top:0}
+@media print{body.webix_print{overflow:visible!important;background-color:none!important}
+body.webix_print>*{display:none}
+body.webix_print *{visibility:hidden}
+.webix_ui_print{display:block!important;margin:0!important;visibility:visible!important}
+.webix_ui_print *{visibility:visible!important}
+.webix_print_noscroll{height:auto!important;width:auto!important}
+.webix_print_noscroll,.webix_print_noscroll .webix_scroll_cont{overflow:visible!important}
+.webix_print_pagebreak{page-break-after:always}
+.webix_print_footer,.webix_print_header{display:block!important;margin:20px 0;text-align:center;height:auto!important;visibility:visible!important}
+.webix_print_footer *,.webix_print_header *{visibility:visible!important}
+.webix_table_print{display:table;visibility:visible!important;table-layout:fixed;width:100%;border:1px solid #ebebeb;margin-bottom:20px;position:initial}
+.webix_table_print td{overflow:hidden}
+.webix_table_print tr{page-break-inside:avoid}
+.webix_table_print .webix_cell{display:table-cell!important;border-right:1px solid #ebebeb;border-bottom:1px solid #ebebeb;padding:0 10px;white-space:nowrap}
+.webix_table_print .webix_header_cell{display:table-cell;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:#e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff));background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-position:0 1px;background-repeat:repeat-x;border-right:1px solid #a4bed4;border-bottom:1px solid #a4bed4}
+.webix_table_print .webix_footer_cell{display:table-cell;background:#fafafa;border-right:1px solid #ebebeb;border-top:1px solid #ebebeb;border-bottom:1px solid #ebebeb}
+.webix_table_print .webix_cell.webix_dtable_span{position:initial!important;white-space:normal}
+.webix_table_print .webix_rotate{transform-origin:center 40%!important;-webkit-transform-origin:center 40%!important}
+.webix_table_print.borderless,.webix_table_print.borderless .webix_cell{border:none}
+.webix_table_print.webix_view.webix_list-x{white-space:normal}
+.webix_table_print.webix_view.webix_list-x .webix_list_item{display:table-cell}
+}
 /*!
  *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 @font-face{font-family:FontAwesome;src:url(../fonts/fontawesome-webfont.eot?v=4.7.0);src:url(../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0) format('embedded-opentype'),url(../fonts/fontawesome-webfont.woff2?v=4.7.0) format('woff2'),url(../fonts/fontawesome-webfont.woff?v=4.7.0) format('woff'),url(../fonts/fontawesome-webfont.ttf?v=4.7.0) format('truetype'),url(../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular) format('svg');font-weight:400;font-style:normal}
-.fa,.webix_icon,.webix_icon_btn,.webix_input_icon{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0,0)}
+.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0,0)}
 .fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}
 .fa-2x{font-size:2em}
 .fa-3x{font-size:3em}
@@ -597,7 +781,7 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .fa-ul>li{position:relative}
 .fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}
 .fa-li.fa-lg{left:-1.85714286em}
-.fa-border{padding:.2em .25em .15em;border:.08em solid #eee;border-radius:.1em}
+.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}
 .fa-pull-left{float:left}
 .fa-pull-right{float:right}
 .fa.fa-pull-left{margin-right:.3em}
@@ -609,9 +793,11 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}
 .fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}
 @-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}
-100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}
+100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}
+}
 @keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}
-100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}
+100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}
+}
 .fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}
 .fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}
 .fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}
@@ -1300,140 +1486,6 @@ label.webix_required:after{padding-left:4px;content:"*";color:red}
 .fa-meetup:before{content:"\f2e0"}
 .sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}
 .sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
-.webix_icon,.webix_input_icon{font-size:17px;display:inline-block;width:20px}
-.webix_input_icon{float:right;font-size:19px;color:#888}
-.webix_icon_button{background-color:transparent;border:none;padding:0;cursor:pointer;position:relative}
-.webix_icon_button .webix_icon{font-size:20px;height:23px;width:21px;display:inline-block;text-align:center;color:#606060}
-.webix_icon_btn{font-size:17px;display:inline-block;text-align:center;width:24px;color:#606060}
-.webix_el_iconBbutton .webix_icon_btn{text-align:center;width:100%;padding:5px 0}
-.webix_el_icon{cursor:pointer}
-.webix_badge{background-color:#ff8839;color:#fff;border-radius:50%;font-size:12px;height:22px;min-width:22px;box-sizing:border-box;padding:0 4px;text-align:center;line-height:21px;position:absolute;right:0;top:0}
-.webix_list_item .webix_badge{position:static;float:right;margin:4px -5px 0 10px}
-.webixtype_base .webix_badge{top:50%;margin-top:-11px;margin-right:8px}
-.webix_treemap{background-color:#f5f5f5}
-.webix_treemap .webix_scroll_cont{position:relative;height:100%;width:100%}
-.webix_treemap_item{position:absolute;color:#444;overflow:hidden;text-align:left;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:3px 5px;border-width:0 1px 1px 0;border-style:solid;border-color:rgba(0,0,0,.2);background:0 0}
-.webix_treemap_level_top{z-index:1;border-color:rgba(0,0,0,.4)}
-.webix_treemap_item_bottom{border-bottom-width:0}
-.webix_treemap_item_right{border-right-width:0}
-.webix_treemap_item:hover{box-shadow:inset 0 0 5px #666}
-.webix_treemap_item.webix_selected{border-color:#ffdb8f;box-shadow:inset 0 0 1px 2px #ffdb8f}
-.webix_treemap_header{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 10px;border-bottom:1px solid #a4bed4}
-.webix_treemap_header_item{cursor:pointer}
-.webix_treemap_header_item:last-child{cursor:default}
-.webix_treemap_reset{float:right;width:25px;text-align:center}
-.webix_treemap_reset:before{content:"\f00d";color:#1e2022;font-family:FontAwesome;font-size:16px;display:block;cursor:pointer}
-.webix_treemap_path_icon{width:20px;text-align:center}
-.webix_barcode{position:relative}
-.webix_barcode .webix_canvas_text{font-size:13px;padding:0 2px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
-.portlet_drag{position:absolute;z-index:1;top:5px;right:5px;width:18px;opacity:.5;cursor:pointer}
-.portlet_in_drag{opacity:.4}
-.portlet_marker,.portlet_markerbottom,.portlet_markerleft,.portlet_markerright,.portlet_markertop{opacity:.5;background:#9169BE;position:absolute;transition:top .5s,left .5s,width .5s,height .5s;top:0;left:0;width:100%;height:100%}
-.portlet_markertop{height:50%}
-.portlet_markerbottom{height:50%;top:50%}
-.portlet_markerleft{width:50%}
-.portlet_markerright{width:50%;left:50%}
-.webix_popup.webix_sidemenu.webix_sidemenu_left{border-width:0 1px 0 0;box-shadow:2px 0 2px rgba(0,0,0,.05)}
-.webix_sidemenu_left.webix_animate{transition:left .6s}
-.webix_popup.webix_sidemenu.webix_sidemenu_right{left:auto;border-width:0 0 0 1px;box-shadow:-2px 0 2px rgba(0,0,0,.05)}
-.webix_sidemenu_right.webix_animate{transition:right .6s}
-.webix_popup.webix_sidemenu.webix_sidemenu_top{border-width:0 0 1px;box-shadow:0 2px 2px rgba(0,0,0,.05)}
-.webix_sidemenu_top .webix_win_body{position:relative}
-.webix_sidemenu_top .webix_win_body>.webix_view{position:absolute;top:auto;left:0;bottom:0}
-.webix_sidemenu_top.webix_animate,.webix_sidemenu_top.webix_animate .webix_win_body{transition:height .6s}
-.webix_popup.webix_sidemenu.webix_sidemenu_bottom{border-width:1px 0 0;top:auto;box-shadow:0 -2px 2px rgba(0,0,0,.05)}
-.webix_sidemenu_bottom.webix_animate,.webix_sidemenu_bottom.webix_animate .webix_win_body{transition:height .6s}
-.webix_view.webix_pdf{background-color:#404040;overflow:auto;-webkit-overflow-scrolling:touch}
-.webix_pdf .canvas_wrapper{margin:0 auto;box-shadow:5px 5px 15px #1c1c1c;width:100%;height:100%}
-.webix_toolbar.pdf_bar{background-color:#474747}
-.webix_toolbar.pdf_bar .webix_icon_btn{font-size:15px}
-.webix_toolbar.pdf_bar .webix_img_btn:focus,.webix_toolbar.pdf_bar .webix_img_btn:hover{background-color:#404040}
-.webix_toolbar.pdf_bar .webix_template{background-color:#3498db;color:#fff;line-height:2em}
-.webix_toolbar.pdf_bar .webix_el_box input,.webix_toolbar.pdf_bar .webix_inp_static{background-color:#5c5c5c;color:#fff;border-color:#404040}
-.webix_toolbar.pdf_bar .webix_el_box input:focus,.webix_toolbar.pdf_bar .webix_inp_static:focus{border-color:#333}
-.webix_toolbar.pdf_bar .webix_el_box .webix_input_icon{color:#fff}
-.webix_view.webix_popup.pdf_opt_list{box-shadow:5px 5px 15px #1c1c1c;border:none}
-.pdf_opt_list .webix_list{background-color:#404040;color:#fff}
-.pdf_opt_list .webix_list .webix_list_item{border-color:#474747;line-height:1.5em}
-.pdf_opt_list .webix_list .webix_list_item.webix_selected,.pdf_opt_list .webix_list .webix_list_item:hover{color:#404040;background-color:#fff}
-.webix_dbllist .webix_list{background:#ededed}
-.webix_dbllist .webix_list_item{background:#fff;margin:3px 4px 0;box-sizing:border-box}
-.webix_dbllist .webix_list_item.webix_selected{color:#FFF;background:#27ae60}
-.webix_dbllist button{width:45%;height:30px;margin-top:5px;background:#fff;border-radius:6px;border:1px solid #a4bed4;cursor:pointer;font-size:13px;font-family:Helvetica,Verdana}
-.webix_dbllist button:active{box-shadow:inset 1px 1px 0 silver}
-.webix_dbllist button .webix_icon{color:#888;font-size:26px}
-.webix_dbllist button:first-child{margin-top:32px;margin-right:5%}
-.webix_dbllist button:last-child{margin-left:5%}
-.webix_dbllist .bottom_label{font-size:10px;text-transform:uppercase;background:#ededed;padding-left:13px}
-.webix_invalid .webix_list{background:#f8e2e2}
-.webix_toolbar .webix_el_label,.webix_toolbar .webix_inp_label{color:#1e2022}
-.webix_ss_sort_asc{position:absolute;float:right;right:3px;top:8px;width:7px;height:13px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAANCAYAAABlyXS1AAAARUlEQVR4nGNgQAKGxib/GbABkIS7b8B/DAUwCRiGK0CXwFBAb1DfP/U/LszwHwi2X7qFgUEArBtdAVwCBmAKMCSQFSDzAWXXaOHsXeqkAAAAAElFTkSuQmCC)}
-.webix_ss_sort_desc{position:absolute;right:3px;top:8px;width:7px;height:13px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAANCAYAAABlyXS1AAAARUlEQVR42mNgQAL1/VP/M2ADIIntF2/9x1AAlrh0C47hCmA60DFYwX88gIFGwNDY5D8uDFbg7hvwHx2jmIBTAlkB0e4BAEjlaNtBWJPnAAAAAElFTkSuQmCC)}
-.webix_group_back .webix_arrow_icon{color:#1e2022}
-.webix_menu-x .webix_list_item:active,.webix_menu-x .webix_list_item:focus,.webix_menu-x .webix_list_item:hover{background-color:rgba(255,255,255,.4)!important}
-.webix_menu .webix_list_item:active,.webix_menu .webix_list_item:hover{background-color:rgba(0,0,0,.05)!important}
-.webix_list_item .webix_submenu_icon{width:0;height:0;border-width:4px;border-style:solid}
-.webix_menu-x .webix_list_item .webix_submenu_icon{border-color:#375975 transparent transparent}
-.webix_menu .webix_list_item .webix_submenu_icon{border-color:transparent transparent transparent #375975}
-.webix_popup_title{color:#1e2022!important;background:#e3e3e3!important;font-size:15px!important;font-weight:700;border-bottom:1px solid #dedede!important;text-shadow:none!important}
-.webix_modal_box{background:#ebebeb!important;border:1px solid #a4bed4!important}
-.confirmButton{color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%)}
-.confirmButtonActive{background:#fff}
-.webix_item_tab{font-size:13px}
-.buttonStyle{font-size:13px;font-family:Helvetica,Verdana}
-.activeShadow{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}
-.webix_img_btn_abs:active+input,.webix_inp_counter_next:active,.webix_inp_counter_prev:active,.webixtype_base:active{background:none #f5f5f5;box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}
-.webix_icon_button:active,.webix_img_btn:active,.webix_img_btn_top:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background-color:rgba(0,0,0,.05)}
-.webix_pressed .webix_img_btn_abs+input,.webix_pressed .webixtype_base{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);background:#f5f5f5!important}
-.webix_slider_vertical .webix_slider_box{margin-top:-8px}
-.webix_accordionitem_label .webix_icon{font-size:19px;width:25px}
-.webix_accordionitem.vertical>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAARUlEQVR42o2PAQYAMAwD9+iEFvTpnZYZU7EQRa4kaxKAXD9y9yTZluCBALRJpATNrIG6rAdjjmBVeCuB6EyAYkNEiDE33yMJRSaycR8/AAAAAElFTkSuQmCC);background-repeat:no-repeat}
-.webix_accordionitem.vertical.collapsed>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAASElEQVR42n2PMQoAMAgD++gEdPLpFkshS9oDEcxlcA1V1euNcpI9k5m2MPfrqABCBS8KBptAR8QJZks0kGjgjMQn/oc/AKy4Acp9RSZl+HEYAAAAAElFTkSuQmCC);background-repeat:no-repeat}
-.webix_accordionitem.horizontal>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAALCAYAAACzkJeoAAAASUlEQVR42p2QMQoAQQgD79EZ0Mqn5xCu2cPdYgUbJ0rMMxXgLeiuKq8gsJAz8weQ0QiwJEfECnr4wdlEnwJ68+yyhReC+c85oRecj0Um+pmo9wAAAABJRU5ErkJggg==);background-repeat:no-repeat}
-.webix_accordionitem.horizontal:last-child>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAALCAYAAACzkJeoAAAARElEQVR42qXPsQoAIAhF0T76PdDJT7cUmtQhcmk4N8QVQ9JXN2bmgWOgqp+BiCRG2AYAMoi3/LxYdyagAnhA6G93TrABZaJFJjrFY8IAAAAASUVORK5CYII=);background-repeat:no-repeat}
-.webix_accordionitem.horizontal.collapsed:last-child>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAASElEQVR42n2PMQoAMAgD++gEdPLpFkshS9oDEcxlcA1V1euNcpI9k5m2MPfrqABCBS8KBptAR8QJZks0kGjgjMQn/oc/AKy4Acp9RSZl+HEYAAAAAElFTkSuQmCC);background-repeat:no-repeat}
-.webix_accordionitem.horizontal.collapsed>.webix_accordionitem_header .webix_accordionitem_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAHCAYAAADebrddAAAARUlEQVR42o2PAQYAMAwD9+iEFvTpnZYZU7EQRa4kaxKAXD9y9yTZluCBALRJpATNrIG6rAdjjmBVeCuB6EyAYkNEiDE33yMJRSaycR8/AAAAAElFTkSuQmCC);background-repeat:no-repeat}
-.webix_progress_bottom,.webix_progress_top{background:0 1px repeat-x #f7f7f7;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f2f2f2),color-stop(50%,#f7f7f7),color-stop(100%,#f2f2f2)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#f2f2f2 0,#f7f7f7 50%,#f2f2f2 100%);background-image:-moz-linear-gradient(top,#f2f2f2 0,#f7f7f7 60%,#f2f2f2 100%);background-image:-ms-linear-gradient(top,#f2f2f2 0,#f7f7f7 60%,#f2f2f2 100%);background-image:-o-linear-gradient(top,#f2f2f2 0,#f7f7f7 60%,#f2f2f2 100%)}
-.webix_daterange .webix_range_timepicker .webix_cal_time{padding:5px 15px}
-.webix_daterange .webix_range_footer .webix_template{padding:10px 0}
-.webix_cal_range{background-color:#fff4dc}
-.webix_item_tab .webix_icon{width:30px;font-size:19px}
-.webix_tab_more_icon{border-bottom:1px solid #a4bed4}
-.webix_skin_mark{height:110px}
-.webix_sparklines{padding:1px 0;box-sizing:border-box}
-.webix_sparklines svg{box-sizing:border-box}
-.webix_sparklines_line{stroke:#3498db;stroke-width:1;fill:transparent;stroke-linecap:round}
-.webix_sparklines_item{fill:#3498db;stroke-width:1}
-.webix_sparklines_bar{fill:#6dbcf0}
-.webix_sparklines_bar_negative{fill:#d86c79}
-.webix_sparklines_area{fill:#e5eef4}
-.webix_sparklines_origin{stroke:#888;stroke-width:1}
-.webix_sparklines_event_area{fill:transparent}
-.webix_sparklines_area_chart .webix_sparklines_event_area:hover,.webix_sparklines_line_chart .webix_sparklines_event_area:hover,.webix_sparklines_splinearea_chart .webix_sparklines_event_area:hover{fill:rgba(220,220,220,.4);stroke:rgba(255,255,255,.6)}
-.webix_sparklines_bar_chart .webix_sparklines_event_area:hover,.webix_sparklines_pie_chart .webix_sparklines_event_area:hover{fill:rgba(255,255,255,.3)}
-.webix_ui_print{display:none}
-body.webix_print{margin-top:0}
-@media print{body.webix_print{overflow:visible!important;background-color:none!important}
-body.webix_print>*{display:none}
-body.webix_print *{visibility:hidden}
-.webix_ui_print{display:block!important;margin:0!important;visibility:visible!important}
-.webix_ui_print *{visibility:visible!important}
-.webix_print_noscroll{height:auto!important;width:auto!important}
-.webix_print_noscroll,.webix_print_noscroll .webix_scroll_cont{overflow:visible!important}
-.webix_print_pagebreak{page-break-after:always}
-.webix_print_footer,.webix_print_header{display:block!important;margin:20px 0;text-align:center;height:auto!important;visibility:visible!important}
-.webix_print_footer *,.webix_print_header *{visibility:visible!important}
-.webix_table_print{display:table;visibility:visible!important;table-layout:fixed;width:100%;border:1px solid #ebebeb;margin-bottom:20px;position:initial}
-.webix_table_print td{overflow:hidden}
-.webix_table_print tr{page-break-inside:avoid}
-.webix_table_print .webix_cell{display:table-cell!important;border-right:1px solid #ebebeb;border-bottom:1px solid #ebebeb;padding:0 10px;white-space:nowrap}
-.webix_table_print .webix_header_cell{display:table-cell;color:#1e2022!important;box-shadow:0 1px 1px #fff inset;background:0 1px repeat-x #e5f1ff;background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#eaf3ff),color-stop(50%,#e5f1ff),color-stop(100%,#d6e8ff)) 0 1px repeat-x;background-image:-webkit-linear-gradient(top,#eaf3ff 0,#e5f1ff 50%,#d6e8ff 100%);background-image:-moz-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-ms-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);background-image:-o-linear-gradient(top,#eaf3ff 0,#e5f1ff 60%,#d6e8ff 100%);border-right:1px solid #a4bed4;border-bottom:1px solid #a4bed4}
-.webix_table_print .webix_footer_cell{display:table-cell;background:#fafafa;border-right:1px solid #ebebeb;border-top:1px solid #ebebeb;border-bottom:1px solid #ebebeb}
-.webix_table_print .webix_cell.webix_dtable_span{position:initial!important;white-space:normal}
-.webix_table_print .webix_rotate{transform-origin:center 40%!important;-webkit-transform-origin:center 40%!important}
-.webix_table_print.borderless,.webix_table_print.borderless .webix_cell{border:none}
-.webix_table_print.webix_view.webix_list-x{white-space:normal}
-.webix_table_print.webix_view.webix_list-x .webix_list_item{display:table-cell}}
 .webix_strong{font-weight:700;white-space:nowrap}
 .webix_light{color:#666d73}
 .webix_debug div{border:1px solid orange;background-color:#FF9;color:#000}

source/static/css/sidebar.css

@@ -1,95 +0,0 @@
-
-/* SideBar*/
-.webix_sidebar{
-	background: #ECEFF1;
-}
-.webix_sidebar .webix_tree_item {
-	color: #454545;
-	height: 35px;
-	line-height: 35px;
-}
-.webix_sidebar .webix_scroll_cont > .webix_tree_leaves {
-	padding: 0;
-}
-.webix_sidebar .webix_tree_leaves .webix_tree_leaves {
-	margin-left: 0px;
-}
-.webix_sidebar_selected,
-.webix_sidebar_expanded .webix_tree_item:hover{
-	background-color: rgba(0,0,0,0.02);
-}
-.webix_sidebar .webix_tree_item.webix_selected,
-.webix_sidebar .webix_tree_item.webix_selected span{
-	background-color: #27ae60;
-	padding-right:0;
-}
-.webix_sidebar .webix_tree_branch_1 .webix_tree_item{
-	padding-left:40px;
-}
-.webix_sidebar .webix_tree_branch_1>.webix_tree_item{
-	height: 40px;
-	line-height: 40px;
-	padding-left:0;
-}
-.webix_sidebar .webix_tree_branch_1{
-	border-bottom:1px solid #e5e5e5;
-}
-.webix_sidebar .webix_tree_item.webix_selected span,
-.webix_sidebar .webix_tree_item span{
-	margin:0;
-	padding:0px;
-}
-.webix_sidebar_icon{
-	width: 40px;
-	text-align: center;
-}
-
-.webix_sidebar_dir_icon{
-	float: right;
-	line-height: inherit;
-}
-
-/*SubMenu (Popup) */
-.webix_sidebar_popup{
-	border:none !important;
-	box-shadow: 2px 3px 3px #ddd;
-}
-.webix_sidebar_popup, .webix_sidebar_popup .webix_list_item{
-	border-radius:0;
-}
-.webix_sidebar_popup_right{
-	box-shadow: -1px 3px 3px #ddd;
-}
-/*SubMenu: title*/
-.webix_sidebar_popup_title{
-	background: #ECEFF1;
-}
-.webix_sidebar_popup_title.webix_selected{
-	border-left-color: #27ae60;
-	background: #27ae60;
-}
-.webix_sidebar_popup_title .webix_template{
-	line-height: 40px;
-	padding: 0 10px;
-	border: 1px solid #E5E5E5;
-	border-left:none;
-}
-.webix_sidebar_selected.webix_sidebar_popup_title .webix_template{
-	background: rgba(0,0,0,0.03);
-	border-left: none;
-}
-.webix_sidebar_popup_list .webix_list_item{
-	border-left: 1px solid #E5E5E5;
-	border-right: 1px solid #E5E5E5;
-}
-/*SubMenu: list*/
-.webix_sidebar_popup_list .webix_list_item:first-child{
-	border-top: 1px solid #E5E5E5;
-}
-.webix_sidebar_popup_list .webix_list_item:hover{
-	background: #f6f9fb;
-}
-
-.webix_sidebar_popup_list .webix_list_item.webix_selected:hover{
-	background: #27ae60;
-}

source/static/js/controller/admin.js

@@ -1,3 +1,20 @@
+//~ 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 <http://www.gnu.org/licenses/>.
+
+
 var msg = ''
 var tb_options = null
 var tb_sat = null
@@ -70,6 +87,7 @@ var controllers = {
         $$('chk_config_anticipo').attachEvent('onItemClick', chk_config_item_click)
         $$('chk_config_ine').attachEvent('onItemClick', chk_config_item_click)
         $$('chk_config_edu').attachEvent('onItemClick', chk_config_item_click)
+        $$('chk_config_pagos').attachEvent('onItemClick', chk_config_item_click)
         $$('chk_config_cuenta_predial').attachEvent('onItemClick', chk_config_item_click)
         $$('chk_config_codigo_barras').attachEvent('onItemClick', chk_config_item_click)
         $$('chk_config_precio_con_impuestos').attachEvent('onItemClick', chk_config_item_click)
@@ -82,6 +100,8 @@ var controllers = {
         $$('txt_ticket_printer').attachEvent('onKeyPress', txt_ticket_printer_key_press)
         $$('txt_config_nomina_serie').attachEvent('onKeyPress', txt_config_nomina_serie_press)
         $$('txt_config_nomina_folio').attachEvent('onKeyPress', txt_config_nomina_folio_press)
+        $$('txt_config_cfdipay_serie').attachEvent('onKeyPress', txt_config_cfdipay_serie_press)
+        $$('txt_config_cfdipay_folio').attachEvent('onKeyPress', txt_config_cfdipay_folio_press)
         $$('chk_usar_nomina').attachEvent('onItemClick', chk_config_item_click)
 
         $$('cmd_subir_bdfl').attachEvent('onItemClick', cmd_subir_bdfl_click)
@@ -2035,6 +2055,88 @@ function txt_config_nomina_folio_press(code, e){
 }
 
 
+function txt_config_cfdipay_serie_press(code, e){
+    var value = this.getValue()
+    if(code != 13){
+        return
+    }
+
+    if(!value.trim()){
+        webix.ajax().del('/config', {id: 'txt_config_cfdipay_serie'}, function(text, xml, xhr){
+            var msg = 'Serie de Pagos borrada correctamente'
+            if(xhr.status == 200){
+                msg_ok(msg)
+            }else{
+                msg = 'No se pudo eliminar'
+                msg_error(msg)
+            }
+        })
+        return
+    }
+
+    webix.ajax().post('/config', {'txt_config_cfdipay_serie': value.toUpperCase()}, {
+        error: function(text, data, xhr) {
+            msg = 'Error al guardar la configuración'
+            msg_error(msg)
+        },
+        success: function(text, data, xhr) {
+            var values = data.json();
+            if (values.ok){
+                msg = 'Serie de Pagos guardada correctamente'
+                msg_ok(msg)
+            }else{
+                msg_error(values.msg)
+            }
+        }
+    })
+
+}
+
+
+function txt_config_cfdipay_folio_press(code, e){
+    var value = this.getValue()
+    if(code != 13){
+        return
+    }
+
+    if(!value.trim()){
+        webix.ajax().del('/config', {id: 'txt_config_cfdipay_folio'}, function(text, xml, xhr){
+            var msg = 'Folio de Pagos borrado correctamente'
+            if(xhr.status == 200){
+                msg_ok(msg)
+            }else{
+                msg = 'No se pudo eliminar'
+                msg_error(msg)
+            }
+        })
+        return
+    }
+
+    if(!value.trim().is_number()){
+        msg = 'El Folio de Pagos debe ser un número'
+        msg_error(msg)
+        return
+    }
+
+    webix.ajax().post('/config', {'txt_config_cfdipay_folio': value}, {
+        error: function(text, data, xhr) {
+            msg = 'Error al guardar la configuración'
+            msg_error(msg)
+        },
+        success: function(text, data, xhr) {
+            var values = data.json();
+            if (values.ok){
+                msg = 'Folio de Pagos guardado correctamente'
+                msg_ok(msg)
+            }else{
+                msg_error(values.msg)
+            }
+        }
+    })
+
+}
+
+
 function cmd_niveles_educativos_click(){
     admin_ui_niveles_educativos.init()
     $$('win_niveles_educativos').show()

source/static/js/controller/bancos.js

@@ -1,3 +1,20 @@
+//~ 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 <http://www.gnu.org/licenses/>.
+
+
 var msg = ''
 var msg_importe = ''
 
@@ -7,6 +24,7 @@ var bancos_controllers = {
         $$('lst_cuentas_banco').attachEvent('onChange', lst_cuentas_banco_change)
         $$('cmd_agregar_retiro').attachEvent('onItemClick', cmd_agregar_retiro_click)
         $$('cmd_agregar_deposito').attachEvent('onItemClick', cmd_agregar_deposito_click)
+        $$('cmd_complemento_pago').attachEvent('onItemClick', cmd_complemento_pago_click)
         $$('cmd_guardar_retiro').attachEvent('onItemClick', cmd_guardar_retiro_click)
         $$('cmd_guardar_deposito').attachEvent('onItemClick', cmd_guardar_deposito_click)
         $$('cmd_cancelar_movimiento').attachEvent('onItemClick', cmd_cancelar_movimiento_click)
@@ -20,7 +38,13 @@ var bancos_controllers = {
         $$('filter_cuenta_year').attachEvent('onChange', filter_cuenta_change)
         $$('filter_cuenta_month').attachEvent('onChange', filter_cuenta_change)
         $$('filter_cuenta_dates').attachEvent('onChange', filter_cuenta_dates_change)
+
+        $$('cmd_pay_stamp').attachEvent('onItemClick', cmd_pay_stamp_click)
+        $$('cmd_pay_cancel').attachEvent('onItemClick', cmd_pay_cancel_click)
+        $$('grid_cfdi_pay').attachEvent('onItemClick', grid_cfdi_pay_click)
+
         set_year_month()
+        show('cmd_complemento_pago', get_config('used_cfdi_pays'))
     }
 }
 
@@ -122,8 +146,27 @@ function get_saldo_cuenta(){
 }
 
 
+function get_account_currency(){
+    var id = $$('lst_cuentas_banco').getValue()
+    webix.ajax().get('/cuentasbanco', {'id': id, 'opt': 'currency'}, {
+        error:function(text, data, XmlHttpRequest){
+            msg = 'Ocurrio un error, consulta a soporte técnico'
+            msg_error(msg)
+        },
+        success:function(text, data, XmlHttpRequest){
+            var values = data.json()
+            if(values.ok){
+                $$('txt_cuenta_moneda').setValue(values.currency)
+            }
+        }
+    })
+}
+
+
 function lst_cuentas_banco_change(nv, ov){
+    get_saldo_cuenta()
     get_estado_cuenta()
+    get_account_currency()
 }
 
 
@@ -666,8 +709,238 @@ function filter_cuenta_change(){
     get_estado_cuenta()
 }
 
+
 function filter_cuenta_dates_change(range){
     if(range.start != null && range.end != null){
         get_estado_cuenta(range)
     }
-}
+}
+
+
+function set_data_pay(row){
+    var form = $$('form_bank_pay')
+    var dt = row.fecha.split(' ')
+    var grid = $$('grid_pay_related')
+    grid.clearAll()
+
+    set_way_payment('pay_way_payment')
+    var wp = table_waypayment.findOne({'value': row.way_payment})
+
+    form.setValues({
+        id_mov: row.id,
+        pay_date: dt[0],
+        pay_time: dt[1],
+        pay_reference: row.numero_operacion,
+        pay_way_payment: wp.id,
+        pay_import: row.deposito,
+        pay_description: row.descripcion
+    })
+
+    webix.ajax().get('/invoicepay', {'opt': 'related', 'id': row.id}, {
+        error:function(text, data, XmlHttpRequest){
+            msg = 'Ocurrio un error, consulta a soporte técnico'
+            msg_error(msg)
+        },
+        success:function(text, data, XmlHttpRequest){
+            var values = data.json()
+            if(values.ok){
+                grid.parse(values.rows, 'json')
+            }
+        }
+    })
+
+    $$('grid_cfdi_pay').clearAll()
+    webix.ajax().get('/cfdipay', {'opt': 'related', 'id_mov': row.id}, {
+        error:function(text, data, XmlHttpRequest){
+            msg = 'Ocurrio un error, consulta a soporte técnico'
+            msg_error(msg)
+        },
+        success:function(text, data, XmlHttpRequest){
+            var values = data.json()
+            if(values.ok){
+                $$('grid_cfdi_pay').parse(values.rows, 'json')
+            }
+        }
+    })
+
+}
+
+
+function cmd_complemento_pago_click(){
+    var grid = $$('grid_cuentabanco')
+
+    var row = grid.getSelectedItem()
+    if(row == undefined){
+        msg_error('Selecciona un movimiento de depósito')
+        return
+    }
+    if(row.descripcion == 'Saldo inicial'){
+        msg_error('No es posible generar un pago del Saldo Inicial')
+        return
+    }
+    if(row.deposito == 0){
+        msg_error('Selecciona un movimiento de depósito')
+        return
+    }
+
+    set_data_pay(row)
+    $$('multi_bancos').setValue('bank_pay')
+}
+
+
+function validate_cfdi_pay(form){
+    if(!form.validate()) {
+        msg_error('Valores inválidos')
+        return false
+    }
+
+    var grid = $$('grid_pay_related')
+    if(grid.count() == 0){
+        msg_error('El depósito no tiene facturas relacionadas')
+        return false
+    }
+
+    return true
+}
+
+
+function update_grid_cfdi_pay(row){
+    var g = $$('grid_cfdi_pay')
+
+    g.add(result.row)
+    if (g.count() == 1){
+        g.adjustColumn('index')
+        g.adjustColumn('serie')
+        g.adjustColumn('folio')
+        g.adjustColumn('fecha')
+        g.adjustColumn('cliente')
+        g.adjustColumn('xml')
+        g.adjustColumn('pdf')
+        g.adjustColumn('email')
+    }
+}
+
+function send_stamp_cfdi_pay(id_mov){
+    var g = $$('grid_cfdi_pay')
+    var data = {'opt': 'stamp', 'id_mov': id_mov}
+
+    webix.ajax().sync().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){
+            result = data.json();
+            if(result.ok){
+                g.updateItem(result.id, result.row)
+                msg_ok(result.msg)
+            }else{
+                msg_error(result.msg)
+            }
+        }
+    })
+}
+
+function save_cfdi_pay(form){
+    var values = form.getValues()
+    var data = {'opt': 'new', 'id_mov': values.id_mov}
+
+    webix.ajax().sync().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){
+            result = data.json();
+            if(result.ok){
+                if(result.new){
+                    msg_ok('Factura guardada correctamente<BR>Enviando a timbrar...')
+                    update_grid_cfdi_pay(result.row)
+                }else{
+                    msg_ok('Enviando a timbrar...')
+                }
+                send_stamp_cfdi_pay(values.id_mov)
+            }else{
+                msg_error(result.msg)
+            }
+        }
+    })
+}
+
+
+function cmd_pay_stamp_click(){
+    var form = $$('form_bank_pay')
+    var title = 'Timbrar Factura de Pago'
+    msg = '¿Estás seguro de enviar a timbrar este pago?'
+
+    if (!validate_cfdi_pay(form)){
+        return
+    }
+
+    webix.confirm({
+        title: title,
+        ok: 'Si',
+        cancel: 'No',
+        type: 'confirm-error',
+        text: msg,
+        callback:function(result){
+            if(result){
+                save_cfdi_pay(form)
+            }
+        }
+    })
+}
+
+
+function cmd_pay_cancel_click(){
+
+}
+
+
+function send_cfdi_email(row){
+    if(!row.uuid){
+        msg_error('La factura no esta timbrada')
+        return
+    }
+
+    msg = '¿Estás seguro de enviar por correo esta factura?'
+    webix.confirm({
+        title: 'Enviar Factura',
+        ok: 'Si',
+        cancel: 'No',
+        type: 'confirm-error',
+        text: msg,
+        callback:function(result){
+            if(result){
+                webix.ajax().post('/cfdipay', {'opt': 'send', 'id': row.id}, {
+                    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){
+                            msg_ok(values.msg)
+                        }else{
+                            msg_error(values.msg)
+                        }
+                    }
+                })
+            }
+        }
+    })
+}
+
+
+function grid_cfdi_pay_click(id, e, node){
+    var row = this.getItem(id)
+
+    if(id.column == 'xml'){
+        location = '/doc/xmlpago/' + row.id
+    }else if(id.column == 'pdf'){
+        window.open('/doc/pdfpago/' + row.id, '_blank')
+    }else if(id.column == 'email'){
+        send_cfdi_email(row)
+    }
+
+}

source/static/js/controller/main.js

@@ -6,7 +6,7 @@ function configuracion_inicial(){
         var values = data.json()
         show('cmd_ir_al_admin', values)
     })
-    webix.ajax().get('/values/main', function(text, data){
+    webix.ajax().sync().get('/values/main', function(text, data){
         var values = data.json()
         $$('lbl_title_main').setValue(values.empresa)
         var pos = 4
@@ -37,8 +37,11 @@ function configuracion_inicial(){
         $$('cmd_update_timbres').define('badge', values.timbres)
         $$('cmd_update_timbres').refresh()
         add_config({'key': 'decimales_precios', 'value': values.decimales_precios})
+        add_config({'key': 'used_cfdi_pays', 'value': values.pagos})
     })
 
+    get_way_payment()
+
 }
 
 

source/static/js/controller/util.js

@@ -1,3 +1,20 @@
+//~ 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 <http://www.gnu.org/licenses/>.
+
+
 var PUBLICO = "Público en general";
 var RFC_PUBLICO = "XAXX010101000";
 var RFC_EXTRANJERO = "XEXX010101000";
@@ -16,6 +33,7 @@ var table_totals = db.addCollection('totals', {unique: ['tax']})
 var table_series = db.addCollection('series')
 var table_usocfdi = db.addCollection('usocfdi')
 var table_relaciones = db.addCollection('relaciones')
+var table_waypayment = db.addCollection('waypayment')
 
 var msg = ''
 
@@ -408,6 +426,21 @@ function get_forma_pago(control){
 }
 
 
+function get_way_payment(){
+    webix.ajax().get('/values/formapago', {key: true}, function(text, data){
+        var values = data.json()
+        table_waypayment.clear()
+        table_waypayment.insert(values)
+    })
+}
+
+
+function set_way_payment(control){
+    var values = table_waypayment.chain().data()
+    $$(control).getList().parse(values)
+}
+
+
 function validate_regexp(value, pattern){
     re = new RegExp(pattern, 'i');
     if(value.match(re)){
@@ -443,3 +476,7 @@ function pause(milliseconds) {
     var dt = new Date();
     while ((new Date()) - dt <= milliseconds) { /* Do nothing */ }
 }
+
+
+//~ Revisado
+

source/static/js/es.js

@@ -29,10 +29,6 @@ webix.i18n.locales["es-ES"] = {
 		today: "Hoy"
     },
 
-    controls:{
-    	select:"Seleccione",
-    	invalidMessage: "Valor de entrada no válido"
-    },
     dataExport:{
 		page:"Página",
 		of:"de"
@@ -81,7 +77,12 @@ webix.i18n.locales["es-ES"] = {
         italic: "Itálico"
     },
     combo:{
+    	select:"Seleccionar",
         selectAll:"Seleccionar todo",
         unselectAll:"Deselecciona todo"
+    },
+    message:{
+    	ok:"OK",
+    	cancel:"Cancelar"
     }
 };

source/static/js/sidebar.js

@@ -1,275 +0,0 @@
-webix.protoUI({
-	name: "sidebar",
-	defaults:{
-		titleHeight: 40,
-		type: "sideBar",
-		activeTitle: true,
-		select: true,
-		scroll: false,
-		collapsed: false,
-		collapsedWidth: 41,
-		position: "left",
-		width: 250,
-		mouseEventDelay: 10
-	},
-	$init: function(config){
-		this.$ready.push(this._initSidebar);
-		this.$ready.push(this._initContextMenu);
-	},
-
-	on_context:{},
-	on_mouse_move:{},
-	_initSidebar: function(){
-		this._fullWidth = this.config.width;
-		this.attachEvent("onBeforeOpen", function(id){
-			if(!this.config.multipleOpen)
-				this.closeAll();
-			return !this.config.collapsed;
-		});
-		this.attachEvent("onItemClick", function(id, ev, node){
-			if(this.getPopup() && !this.getPopup().config.hidden)
-				ev.showpopup = true;
-			if(webix.env.touch)
-				this._showPopup(id, node);
-		});
-		this.attachEvent("onBeforeSelect", function(id){
-			if(!this.getItem(id).$count){
-				var selected = this.getSelectedId();
-				if(selected && id!= selected){
-					var parentId = this.getParentId(selected);
-
-					this.removeCss(parentId, "webix_sidebar_selected");
-				}
-				return true;
-			}
-			return false;
-		});
-		this.attachEvent("onAfterSelect", function(id){
-			var parentId = this.getParentId(id);
-			this.addCss(parentId, "webix_sidebar_selected");
-			var title = this.getPopupTitle();
-
-			title.callEvent("onMasterSelect",[id]);
-		});
-		this.attachEvent("onMouseMove", function(id, ev, node){
-			this._showPopup(id, node);
-		});
-
-		if(this.config.collapsed)
-			this.collapse();
-	},
-	_showPopup: function(id, node){
-		if(this.config.collapsed){
-			var popup = this.getPopup();
-
-			if(popup){
-				var title = this.getPopupTitle();
-				if(title){
-					this._updateTitle(id);
-				}
-				var list = this.getPopupList();
-				if(list){
-					this._updateList(id);
-				}
-				var x = (this.config.position == "left"?this.config.collapsedWidth:-popup.config.width);
-				popup.show(node, {x: x , y:-1});
-			}
-		}
-	},
-	_updateTitle: function(id){
-		var title = this.getPopupTitle();
-		title.masterId = id;
-		title.parse(this.getItem(id));
-		var selectedId = this.getSelectedId();
-		if(selectedId && this.getParentId(selectedId) == id){
-			webix.html.addCss(title.$view, "webix_sidebar_selected", true);
-		}
-		else{
-			webix.html.removeCss(title.$view, "webix_sidebar_selected");
-		}
-
-		if(selectedId == id){
-			webix.html.addCss(title.$view, "webix_selected", true);
-		}
-		else{
-			webix.html.removeCss(title.$view, "webix_selected");
-		}
-	},
-	_updateList: function(id){
-		var list = this.getPopupList();
-		list.masterId = id;
-		var selectedId = this.getSelectedId();
-		var data = [].concat(webix.copy(this.data.getBranch(id)));
-		list.unselect();
-		if(data.length){
-			list.show();
-			list.data.importData(data);
-			if(list.exists(selectedId))
-				list.select(selectedId);
-		}
-		else
-			list.hide();
-
-	},
-	_initContextMenu: function(){
-		var config = this.config,
-			popup;
-
-		if(config.popup){
-			popup = webix.$$(config.popup);
-		}
-		if(!popup){
-			var dirClassName = (config.position=="left"?"webix_sidebar_popup_left":"webix_sidebar_popup_right");
-			var popupConfig = {
-				view:"popup",
-				css: "webix_sidebar_popup "+dirClassName,
-				autofit: false,
-				width: this._fullWidth - this.config.collapsedWidth,
-				borderless: true,
-				padding:0,
-				body:{
-					rows:[
-						{
-							view: "template", 	borderless: true, css: "webix_sidebar_popup_title",
-							template: "#value#", height: this.config.titleHeight+2,
-							on:{
-								onMasterSelect: function(id){
-									var master = this.getTopParentView().master;
-									if( master && master.getParentId(id) == this.masterId){
-										webix.html.addCss(this.$view, "webix_sidebar_selected", true);
-									}
-									if(master.config.collapsed && master.getItem(id).$level ==1){
-										webix.html.addCss(this.$view, "webix_selected", true);
-									}
-								}
-							},
-							onClick:{
-								webix_template: function(){
-									var id = this.masterId;
-									var master = this.getTopParentView().master;
-									if(!master.getItem(id).$count)
-										master.select(id);
-								}
-							}
-						},
-						{ view: "list", select: true, 	borderless: true, css: "webix_sidebar_popup_list",  autoheight: true,
-							on:{
-								onAfterSelect: function(id){
-									this.getTopParentView().master.select(id);
-								}
-							}
-						}
-					]
-				}
-			};
-			webix.extend(popupConfig, config.popup||{}, true);
-			popup = webix.ui(popupConfig);
-			popup.master = this;
-		}
-		popup.attachEvent("onBeforeShow",function(){
-			return config.collapsed;
-		});
-		var master = this;
-		var h = webix.event(document.body,"mousemove", function(e){
-			var trg = e.target || e.srcElement;
-			if(!popup.config.hidden && !popup.$view.contains(trg) && !master.$view.firstChild.contains(trg)){
-				popup.hide();
-			}
-		});
-		this.attachEvent("onDestruct", function(){
-			if(webix.removeEvent)
-				webix.removeEvent(h);
-			if(popup)
-				popup.destructor();
-		});
-		config.popupId = popup.config.id;
-	},
-	getPopup: function(){
-		return webix.$$(this.config.popupId);
-	},
-	getPopupTitle: function(){
-		var popup = this.getPopup();
-		return popup.getBody().getChildViews()[0];
-	},
-	getPopupList: function(){
-		var popup = this.getPopup();
-		return popup.getBody().getChildViews()[1];
-	},
-	position_setter:function(value){
-		var newPos = value;
-		var oldPos = value=="left"?"right":"left";
-
-		webix.html.removeCss(this.$view, "webix_sidebar_"+oldPos);
-		webix.html.addCss(this.$view, "webix_sidebar_"+newPos, true);
-
-		var popup = this.getPopup();
-		if(popup){
-			var popupEl = popup.$view;
-			webix.html.removeCss(popupEl, "webix_sidebar_popup_"+oldPos);
-			webix.html.addCss(popupEl, "webix_sidebar_popup_"+newPos, true);
-		}
-		return value;
-	},
-	collapse: function(){
-		this.define("collapsed", true);
-	},
-	expand: function(){
-		this.define("collapsed", false);
-	},
-	toggle: function(){
-		var collapsed = !this.config.collapsed;
-		this.define("collapsed", collapsed);
-	},
-	collapsed_setter: function(value){
-		var width;
-
-		if(!value){
-			width = this._fullWidth;
-		}
-		else{
-			width = this.config.collapsedWidth;
-			this.closeAll();
-		}
-
-		if(!value){
-			this.type.collapsed = false;
-			webix.html.addCss(this.$view, "webix_sidebar_expanded", true);
-		}
-		else{
-			this.type.collapsed = true;
-			webix.html.removeCss(this.$view, "webix_sidebar_expanded");
-		}
-
-		this.define("width",width);
-		this.resize();
-
-		return value;
-	}
-}, webix.ui.tree);
-
-webix.type(webix.ui.tree, {
-	name:"sideBar",
-	height: "auto",
-	css: "webix_sidebar",
-	template: function(obj, common){
-		if(common.collapsed)
-			return common.icon(obj, common);
-		return   common.arrow(obj, common)+common.icon(obj, common) +"<span>"+obj.value+"</span>";
-	},
-	arrow: function(obj, common){
-		var html = "";
-		var open = "";
-		for (var i=1; i<=obj.$level; i++){
-			if (i==obj.$level && obj.$count){
-				var className = "webix_sidebar_dir_icon webix_icon fa-angle-"+(obj.open?"down":"left");
-				html+="<span class='"+className+"'></span>";
-			}
-		}
-		return html;
-	},
-	icon:function(obj, common){
-		if(obj.icon)
-			return "<span class='webix_icon webix_sidebar_icon fa-"+obj.icon+"'></span>";
-		return "";
-	}
-});

source/static/js/ui/admin.js

@@ -1,3 +1,18 @@
+//~ 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 <http://www.gnu.org/licenses/>.
 
 
 var form_editar_usuario_elementos = [
@@ -233,18 +248,38 @@ var emisor_otros_datos= [
 ]
 
 
-var emisor_certificado = [
+var col_sello = {rows: [
     {template: 'Certificado actual', type: 'section'},
     {view: 'form', id: 'form_cert', rows: [
     {cols: [{view: 'text', id: 'cert_rfc', name: 'cert_rfc',
-        label: 'RFC: ', readonly: true, placeholder: 'Ninguno'}, {}]},
+        label: 'RFC: ', readonly: true, placeholder: 'Ninguno'}]},
     {cols: [{view: 'text', id: 'cert_serie', name: 'cert_serie',
-        label: 'Serie: ', readonly: true, placeholder: 'Ninguno'}, {}]},
+        label: 'Serie: ', readonly: true, placeholder: 'Ninguno'}]},
     {cols: [{view: 'text', id: 'cert_desde', name: 'cert_desde',
-        label: 'Vigente desde: ', readonly: true}, {}]},
+        label: 'Vigente desde: ', readonly: true}]},
     {cols: [{view: 'text', id: 'cert_hasta', name: 'cert_hasta',
-        label: 'Vigente hasta: ', readonly: true}, {}]},
-    ]},
+        label: 'Vigente hasta: ', readonly: true}]},
+    ]}
+]}
+
+
+var col_fiel = {rows: [
+    {template: 'Fiel actual', type: 'section'},
+    {view: 'form', id: 'form_fiel', rows: [
+    {cols: [{view: 'text', id: 'fiel_rfc', name: 'fiel_rfc',
+        label: 'RFC: ', readonly: true, placeholder: 'Ninguno'}]},
+    {cols: [{view: 'text', id: 'fiel_serie', name: 'fiel_serie',
+        label: 'Serie: ', readonly: true, placeholder: 'Ninguno'}]},
+    {cols: [{view: 'text', id: 'fiel_desde', name: 'fiel_desde',
+        label: 'Vigente desde: ', readonly: true}]},
+    {cols: [{view: 'text', id: 'fiel_hasta', name: 'fiel_hasta',
+        label: 'Vigente hasta: ', readonly: true}]},
+    ]}
+]}
+
+
+var emisor_certificado = [
+    {cols: [col_sello, col_fiel]},
     {template: 'Cargar Certificado', type: 'section'},
     {view: 'form', id: 'form_upload', rows: [
         {cols: [{},
@@ -634,6 +669,14 @@ var options_admin_otros = [
         {view: 'checkbox', id: 'chk_config_edu', labelWidth: 0,
             labelRight: 'Usar el complemento EDU'},
         {}]},
+    {cols: [{maxWidth: 15},
+        {view: 'checkbox', id: 'chk_config_pagos', labelWidth: 0,
+            labelRight: 'Usar complemento de pagos'},
+        {view: 'text', id: 'txt_config_cfdipay_serie', name: 'txt_config_cfdipay_serie',
+            label: 'Serie', labelWidth: 50, labelAlign: 'right'},
+        {view: 'text', id: 'txt_config_cfdipay_folio', name: 'txt_config_cfdipay_serie',
+            label: 'Folio', labelWidth: 50, labelAlign: 'right'},
+    {}]},
     {maxHeight: 20},
     {template: 'Punto de venta', type: 'section'},
     {cols: [{maxWidth: 15},

source/static/js/ui/bancos.js

@@ -1,3 +1,18 @@
+//~ 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 <http://www.gnu.org/licenses/>.
 
 
 var toolbar_banco = [
@@ -26,6 +41,9 @@ var toolbar_movimientos_banco = [
     {view: 'button', id: 'cmd_agregar_deposito', label: 'Depósito',
         type: 'iconButton', autowidth: true, icon: 'plus'},
     {},
+    {view: 'button', id: 'cmd_complemento_pago', label: 'Factura de Pago',
+        type: 'iconButton', autowidth: true, icon: 'file-code-o'},
+    {},
     {view: 'button', id: 'cmd_cancelar_movimiento', label: 'Cancelar',
         type: 'iconButton', autowidth: true, icon: 'ban'},
 ]
@@ -35,6 +53,7 @@ var grid_cuentabanco_cols = [
     {id: 'id', header:'ID', hidden: true},
     {id: 'fecha', header: 'Fecha', width: 150},
     {id: 'numero_operacion', header: 'Referencia'},
+    {id: 'way_payment', header: 'Forma de Pago', hidden: true},
     {id: 'descripcion', header: ['Descripción', {content: 'textFilter'}],
         fillspace:true},
     {id: 'retiro', header: ['Retiro', {content: 'numberFilter'}],
@@ -95,6 +114,49 @@ var grid_cfdi_este_deposito_cols = [
 ]
 
 
+var grid_cfdi_pay_cols = [
+    {id: 'index', header: '#', adjust: 'data', css: 'right',
+        footer: {content: 'countRows', colspan: 3, css: 'right'}},
+    {id: "id", header:"ID", hidden:true},
+    {id: 'serie', header: ["Serie"], adjust: "data", sort: 'string'},
+    {id: 'folio', header: ['Folio'], adjust: 'data',
+        sort: 'int', css: 'right', footer: {text: 'Facturas', colspan: 3}},
+    {id: "uuid", header: ["UUID"], adjust: "data",
+        sort:"string", hidden:true},
+    {id: "fecha", header: ["Fecha y Hora"],
+        adjust: "data", sort: "string"},
+    {id: "tipo_comprobante", header: ["Tipo"],
+        adjust: 'header', sort: 'string'},
+    {id: "estatus", header: ["Estatus"],
+        adjust: "data", sort:"string"},
+    {id: 'cliente', header: ['Razón Social'], fillspace: true},
+    {id: 'xml', header: 'XML', adjust: 'data', template: get_icon('xml')},
+    {id: 'pdf', header: 'PDF', adjust: 'data', template: get_icon('pdf')},
+    {id: 'email', header: '', adjust: 'data', template: get_icon('email')}
+]
+
+
+var grid_pay_related_cols = [
+    {id: 'index', header: '#', adjust: 'data', css: 'right'},
+    {id: 'id', header: 'ID', hidden: true},
+    {id: 'serie', header: 'Serie', adjust: 'data'},
+    {id: 'folio', header: 'Folio', adjust: 'data', css: 'right'},
+    {id: 'uuid', header: 'UUID', width: 250, hidden: true},
+    {id: 'fecha', header: 'Fecha y Hora', width: 150, sort: 'date'},
+    {id: 'tipo_comprobante', header: 'Tipo', adjust: 'data'},
+    {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'},
+    {id: 'saldo', header: ['Saldo'], width: 125, sort: 'int',
+        format: webix.i18n.priceFormat, css: 'right', css: 'right',
+        footer: 'Importe Depósito'},
+    {id: 'importe', header: ['Este pago'], width: 125, sort: 'int',
+        format: webix.i18n.priceFormat, css: 'right',
+        footer: {content: 'summColumn', css: 'right'}},
+]
+
+
 var grid_cfdi_por_pagar = {
     view: 'datatable',
     id: 'grid_cfdi_por_pagar',
@@ -139,6 +201,47 @@ var grid_cfdi_este_deposito = {
 }
 
 
+var grid_cfdi_pay = {
+    view: 'datatable',
+    id: 'grid_cfdi_pay',
+    select: 'row',
+    autoConfig: false,
+    adjust: true,
+    autoheight: true,
+    resizeColumn: true,
+    headermenu: true,
+    columns: grid_cfdi_pay_cols,
+    on:{
+        'data->onStoreUpdated':function(){
+            this.data.each(function(obj, i){
+                obj.index = i + 1
+            })
+        }
+    },
+}
+
+
+var grid_pay_related = {
+    view: 'datatable',
+    id: 'grid_pay_related',
+    select: 'row',
+    autoConfig: false,
+    adjust: true,
+    autoheight: true,
+    resizeColumn: true,
+    headermenu: true,
+    footer: true,
+    columns: grid_pay_related_cols,
+    on:{
+        'data->onStoreUpdated':function(){
+            this.data.each(function(obj, i){
+                obj.index = i + 1
+            })
+        }
+    },
+}
+
+
 var toolbar_banco_retiro = [
     {view: 'label', label: 'Agregar retiro de banco'},
     {},
@@ -159,6 +262,19 @@ var toolbar_banco_deposito = [
 ]
 
 
+var toolbar_bank_pay = [
+    {view: 'label', label: 'Factura de pago'},
+    {},
+    {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: 'ban'},
+    {},
+    {view: 'icon', click: '$$("multi_bancos").setValue("banco_home")',
+        icon: 'times-circle'}
+]
+
+
 var controls_banco_retiro = [
     {view: 'toolbar', elements: toolbar_banco_retiro},
     {cols: [
@@ -229,6 +345,41 @@ var controls_banco_deposito = [
 ]
 
 
+var controls_bank_pay = [
+    {view: 'toolbar', elements: toolbar_bank_pay},
+    {view: 'label', label: '<b>Este depósito: </b>'},
+    {cols: [
+        {view: 'datepicker', id: 'pay_date', name: 'pay_date',
+            label: 'Fecha', format: '%d-%M-%Y', labelAlign: 'right',
+            required: true, invalidMessage: 'Selecciona una fecha',
+            labelWidth: 125, readonly: true},
+        {view: 'search', id: 'pay_time', name: 'pay_time', label: 'Hora',
+            icon: 'clock-o', labelAlign: 'right', required: true,
+            readonly: true,
+            invalidMessage: 'Captura una hora'},
+        {view: 'text', id: 'pay_reference', name: 'pay_reference',
+            label: 'Referencia', labelAlign: 'right', readonly: true},
+    ]},
+    {cols: [
+        {view: 'richselect', id: 'pay_way_payment', readonly: true,
+            name: 'pay_way_payment', label: 'Forma de Pago', required: true,
+            options: [], labelWidth: 125, labelAlign: 'right'},
+        {view: 'currency', type: 'text', id: 'pay_import', name: 'pay_import',
+            label: 'Importe', labelAlign: 'right', required: true, readonly: true,
+            invalidMessage: 'Captura un valor númerico', inputAlign: 'right'}
+    ]},
+    {cols: [
+        {view: 'textarea', id: 'pay_description', label: 'Descripción',
+            name: 'pay_description', labelAlign: 'right', required: true,
+            labelWidth: 125, height: 70, readonly: true},
+    ]},
+    {view: 'label', label: '<b>Facturas de pago de este depósito: </b>'},
+    grid_cfdi_pay,
+    {view: 'label', label: '<b>Facturas relacionadas en este pago: </b>'},
+    grid_pay_related
+]
+
+
 var form_banco_retiro = {
     type: 'space',
     responsive: true,
@@ -255,6 +406,19 @@ var form_banco_deposito = {
 }
 
 
+var form_bank_pay = {
+    type: 'space',
+    responsive: true,
+    cols: [{
+        view: 'form',
+        id: 'form_bank_pay',
+        complexData: true,
+        scroll: true,
+        elements: controls_bank_pay,
+    }],
+}
+
+
 var multi_bancos = {
     id: 'multi_bancos',
     animate: true,
@@ -266,7 +430,8 @@ var multi_bancos = {
             grid_cuentabanco,
         ]},
         {id: 'banco_retiro', rows: [form_banco_retiro]},
-        {id: 'banco_deposito', rows: [form_banco_deposito]}
+        {id: 'banco_deposito', rows: [form_banco_deposito]},
+        {id: 'bank_pay', rows: [form_bank_pay]}
     ],
 }
 

source/static/js/ui/invoices.js

@@ -1,5 +1,5 @@
 //~ Empresa Libre
-//~ Copyright (C) 2018  Mauricio Baeza Servin (web@correolibre.net)
+//~ 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

source/templates/admin.html

@@ -1,14 +1,8 @@
 <%inherit file="base.html"/>
 
 <%block name="media">
-    <link rel="stylesheet" href="/static/css/sidebar_air.css" type="text/css">
-    <link rel="stylesheet" href="/static/css/app.css" type="text/css">
-    <script src="/static/js/sidebar.js" type="text/javascript" ></script>
-
-    <script src="/static/js/controller/util.js" type="text/javascript" ></script>
     <script src="/static/js/ui/admin.js" type="text/javascript" ></script>
     <script src="/static/js/controller/admin.js" type="text/javascript" ></script>
-
 </%block>
 
 <%block name="content">

source/templates/base.html

@@ -6,10 +6,13 @@
     <meta charset="utf-8" />
     <link rel="shortcut icon" href="/static/img/favicon.png">
     <link rel="stylesheet" href="/static/css/air.css" type="text/css">
+    <link rel="stylesheet" href="/static/css/sidebar_air.css" type="text/css">
     <link rel="stylesheet" href="/static/css/app.css" type="text/css">
     <script src="/static/js/webix.js" type="text/javascript" ></script>
     <script src="/static/js/es-MX.js" type="text/javascript" ></script>
     <script src="/static/js/lokijs.min.js" type="text/javascript" ></script>
+    <script src="/static/js/controller/util.js" type="text/javascript" ></script>
+
     <%block name="media"/>
 
 </head>

source/templates/main.html

@@ -1,10 +1,6 @@
 <%inherit file="base.html"/>
 
 <%block name="media">
-    <link rel="stylesheet" href="/static/css/sidebar_air.css" type="text/css">
-    <script src="/static/js/sidebar.js" type="text/javascript" ></script>
-
-    <script src="/static/js/controller/util.js" type="text/javascript" ></script>
     <script src="/static/js/ui/partners.js" type="text/javascript" ></script>
     <script src="/static/js/ui/products.js" type="text/javascript" ></script>
     <script src="/static/js/ui/bancos.js" type="text/javascript" ></script>

source/xslt/cadena.xslt

@@ -12,6 +12,7 @@
   <xsl:include href="donat11.xslt"/>
   <xsl:include href="ine11.xslt"/>
   <xsl:include href="iedu.xslt"/>
+  <xsl:include href="pagos10.xslt"/>
 <!--
   <xsl:include href="ecc11.xslt"/>
   <xsl:include href="Divisas.xslt"/>
@@ -30,7 +31,6 @@
   <xsl:include href="obrasarteantiguedades.xslt"/>
   <xsl:include href="ventavehiculos11.xslt"/>
   <xsl:include href="terceros11.xslt"/>
-  <xsl:include href="Pagos10.xslt"/>
 -->
 
 

source/xslt/pagos10.xslt

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:pago10="http://www.sat.gob.mx/Pagos">
+
+  <xsl:template match="pago10:Pagos">
+    <!--Manejador de Atributos Pagos-->
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@Version" />
+    </xsl:call-template>
+
+    <!--  Iniciamos el manejo de los elementos hijo en la secuencia -->
+    <xsl:for-each select="./pago10:Pago">
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="pago10:Pago">
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@FechaPago" />
+    </xsl:call-template>
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@FormaDePagoP" />
+    </xsl:call-template>
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@MonedaP" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@TipoCambioP" />
+    </xsl:call-template>
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@Monto" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@NumOperacion" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@RfcEmisorCtaOrd" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@NomBancoOrdExt" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@CtaOrdenante" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@RfcEmisorCtaBen" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@CtaBeneficiario" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@TipoCadPago" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@CertPago" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@CadPago" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@SelloPago" />
+    </xsl:call-template>
+
+    <!--  Iniciamos el tratamiento de los atributos de pago10:DocumentoRelacionado-->
+    <xsl:for-each select="./pago10:DoctoRelacionado">
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
+    <xsl:for-each select="./pago10:Impuestos">
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="pago10:DoctoRelacionado">
+
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@IdDocumento" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@Serie" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@Folio" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@MonedaDR" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@TipoCambioDR" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@MetodoDePagoDR" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@NumParcialidad" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@ImpSaldoAnt" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@ImpPagado" />
+    </xsl:call-template>
+
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@ImpSaldoInsoluto" />
+    </xsl:call-template>
+
+  </xsl:template>
+
+  <xsl:template match="pago10:Impuestos">
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@TotalImpuestosRetenidos" />
+    </xsl:call-template>
+    <xsl:call-template name="Opcional">
+      <xsl:with-param name="valor" select="./@TotalImpuestosTrasladados" />
+    </xsl:call-template>
+
+    <xsl:apply-templates select="./pago10:Retenciones"/>
+    <xsl:apply-templates select="./pago10:Traslados"/>
+
+  </xsl:template>
+
+  <xsl:template match="pago10:Retenciones">
+    <xsl:for-each select="./pago10:Retencion">
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="pago10:Traslados">
+    <xsl:for-each select="./pago10:Traslado">
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
+
+  </xsl:template>
+
+  <xsl:template match="pago10:Retencion">
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@Impuesto" />
+    </xsl:call-template>
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@Importe" />
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="pago10:Traslado">
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@Impuesto" />
+    </xsl:call-template>
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@TipoFactor" />
+    </xsl:call-template>
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@TasaOCuota" />
+    </xsl:call-template>
+    <xsl:call-template name="Requerido">
+      <xsl:with-param name="valor" select="./@Importe" />
+    </xsl:call-template>
+  </xsl:template>
+</xsl:stylesheet>