Merge branch 'master' of http://192.168.10.111:8383/SIG

App_Code/ClsNominas.vb

@@ -605,7 +605,12 @@ Public Class ClsNominas
             End If
             retorno = True
         Catch ex As Exception
-            OnError("Ocurrió un error al registrar la provisión de nómina.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+            If ex.Message.Contains("No se puede registrar una prepóliza en un periodo cerrado") Then
+                OnError("No se puede registrar la provisión, periodo contable cerrado.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+            Else
+                OnError("Ocurrió un error al registrar la provisión de nómina.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+
+            End If
         End Try
         Return retorno
     End Function

App_Code/ClsPaginas.vb

@@ -6326,6 +6326,10 @@ Public Class ClsPaginas
             Dim rds4 As New ReportDataSource With {.Name = "DataSet4", .Value = If(Vta.DtDocumentosRelacionados IsNot Nothing, Vta.DtDocumentosRelacionados, New DataTable)} ' sino esta creado el objeto, lo creamos, para que no truene el reporte
             lrds.Add(rds4)
             If UsuarioActual.Empresa.Funcionalidad(707) = "1" OrElse UsarStimulsoft Then
+                If Vta.Cliente.CodigoRegimenFiscal.ToString.Length > 0 Then
+                    params.Add(New ReportParameter("ClienteRegimenFiscal", $"{Vta.Cliente.CodigoRegimenFiscal}-{Vta.Cliente.RegimenFiscal}"))
+                End If
+
                 If Vta.DtDocumentosRelacionados IsNot Nothing AndAlso Vta.DtDocumentosRelacionados.Rows.Count > 0 Then
                     params.Add(New ReportParameter("TieneDocumentosRelacionados", "True"))
                 Else

App_Code/LogicNominas.vb

@@ -158,8 +158,13 @@ Public Class LogicNominas
                     Dim drow As DataRow = objNomina.DtResultados.Rows(0)
                     CvePersonal = drow("CvePersonal").ToString().ToEntero()
                     CvePeriodo = drow("CvePeriodo").ToString().ToEntero()
-                    totalDb = drow("Total").ToString().ToDecimal()
+                    If TimbreIndemnizacion Then
-                    subTotalDb = drow("SubTotal").ToString().ToDecimal()
+                        totalDb = drow("TotalFin").ToString().ToDecimal()
+                        subTotalDb = drow("SubTotalFin").ToString().ToDecimal()
+                    Else
+                        totalDb = drow("Total").ToString().ToDecimal()
+                        subTotalDb = drow("SubTotal").ToString().ToDecimal()
+                    End If
                     cfdi.Nomina.Antiguedad = drow("Antiguedad").ToString().ToEntero()
                     cfdi.Nomina.UltimoSueldoOrdinario = drow("UltimoSueldoOrdinario").ToString().ToDecimal()
                     Serie = objNomina.Serie

App_Code/modExtensiones.vb

@@ -3975,6 +3975,7 @@ Namespace Extensiones
             HeaderBar = New StringBuilder("<li><i class='fa fa-home'></i><a href='/Inicio.aspx'>Inicio</a></li>")
             MenuHTML = New StringBuilder()
             modpadres = New List(Of String)
+            headerstr = New List(Of String)
         End Sub
 
         Property CveModuloSeleccionado As Integer
@@ -3986,6 +3987,7 @@ Namespace Extensiones
         Property ScriptColorGrupoModulo As String
         Property strdomain As String
         Property modpadres As List(Of String)
+        Property headerstr As List(Of String)
 
 
     End Class

Ashx/E141.ashx

@@ -1851,7 +1851,8 @@ Public Class E141 : Implements IHttpHandler
                 New JProperty("short_description", ""),
                 New JProperty("description", ""),
                 New JProperty("currency", 1),
-                New JProperty("promo_price", RowPS("PrecioPromocion"))
+                New JProperty("promo_price", RowPS("PrecioPromocion")),
+                New JProperty("product_related", RowPS("CodigosRelacionados"))
             )
 
             ArrayPS.Add(producto)

Bancos/PrestamoPersonal.aspx

@@ -115,18 +115,18 @@
                                         </div>
                                         <div class="col-md-4" id="DivMovtoPermanente" runat="server" visible="false">
                                             <div class="row">
-                                                <div class="col-md-3">
+                                                <div class="col-md-4 control-label">
                                                     <asp:Label runat="server" Text="Concep. Nom:"></asp:Label>
                                                 </div>
-                                                <div class="col-md-9">
+                                                <div class="col-md-8">
                                                     <asp:DropDownList ID="DdlConcepto" runat="server" DataTextField="CodigoConcepto" DataValueField="CveConcepto" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
                                                 </div>
                                             </div>
                                             <div class="row">
-                                                <div class="col-md-3">
+                                                <div class="col-md-4 control-label">
                                                     <asp:Label runat="server" Text="Tipo Desc.:"></asp:Label>
                                                 </div>
-                                                <div class="col-md-9">
+                                                <div class="col-md-8">
                                                     <asp:DropDownList ID="DdlTipoDescto" runat="server" DataTextField="CodigoConcepto" DataValueField="CveConcepto" Class="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardarPrestamo">
                                                         <asp:ListItem Value="-1" Text="Seleccione" Enabled="true"></asp:ListItem>
                                                         <%--                                                        <asp:ListItem Value="1" Text="Importe"></asp:ListItem>
@@ -137,18 +137,18 @@
                                                 </div>
                                             </div>
                                             <div class="row" id="DivImportePrestamo" runat="server" visible="false">
-                                                <div class="col-md-3">
+                                                <div class="col-md-4 control-label">
                                                     <asp:Label runat="server" Text="Importe prestamo:"></asp:Label>
                                                 </div>
-                                                <div class="col-md-9">
+                                                <div class="col-md-8">
                                                     <asp:Label runat="server" Text="" ID="LblPrestamo" ClientIDMode="Static"></asp:Label>
                                                 </div>
                                             </div>
                                             <div class="row" id="DivValor" runat="server">
-                                                <div class="col-md-3">
+                                                <div class="col-md-4 control-label">
                                                     <asp:Label runat="server" Text="Valor:"></asp:Label>
                                                 </div>
-                                                <div class="col-md-9">
+                                                <div class="col-md-8">
                                                     <asp:TextBox ID="TxtValor" CssClass="form-control input-sm" runat="server" Style="text-align: right;" onkeyup="FormatoMoneda(this)" AutoComplete="off"></asp:TextBox>
                                                     <ajax:FilteredTextBoxExtender ID="FTVValor" runat="server" TargetControlID="TxtValor" FilterType="Custom, Numbers" ValidChars="+-.," />
                                                     <asp:RequiredFieldValidator ID="RfvMontoLimite" runat="server" Display="None" ControlToValidate="TxtValor" CssClass="help-block errorimput"

Metronic/assets/admin/layout/css/custom.css

@@ -13,7 +13,7 @@
     background-color: #e5e5e5;
 }
 .page-sidebar-menu .dnone {
-    display: none;
+    display: none !important;
 }
 .table-striped > tbody > tr:nth-of-type(odd).ADSRow,
 table > tbody > tr.ADSRow > td, table.table > tbody > tr.ADSRow > td,

Nomina/ConceptoNomina.aspx

@@ -277,7 +277,7 @@
                                             <div class="row">
                                                 <div class="col-md-6">
                                                     <div class="">
-                                                        <asp:Label runat="server" Text="Concepto contable Pasivo" AssociatedControlID="DdlCtaContablePasivo"></asp:Label>
+                                                        <asp:Label runat="server" Text="Concepto contable Pasivo" AssociatedControlID="DdlConceptoContablePasivo"></asp:Label>
                                                         <asp:DropDownList ID="DdlConceptoContablePasivo" runat="server" AppendDataBoundItems="True" DataTextField="ConceptoContable" DataValueField="CveConceptoContable" Class="form-control select2me" Width="100%" ValidationGroup="GrpGuardar"></asp:DropDownList>
                                                     </div>
                                                 </div>

Nomina/ConceptoNomina.aspx.cs

@@ -530,7 +530,7 @@ public partial class Nomina_CatConcepto : ClsPaginas
                 {
                     DdlCtaContableB.SelectedValueExist(drow["CveCuentaB"]);
                 }
-                if (ChkContabiliza.Checked && (DdlCtaContable.SelectedValue.ToEntero() <= 0 || (chkCtaImporteNegativoProv.Checked && DdlCtaContableB.SelectedValue.ToEntero() <= 0)))
+                if (ChkContabiliza.Checked && (DdlConceptoContable.SelectedValue.ToEntero() <= 0 || DdlConceptoContablePasivo.SelectedValue.ToEntero() <= 0 || (chkCtaImporteNegativoProv.Checked && DdlConceptoContableB .SelectedValue.ToEntero() <= 0)))
                 {
                     Alert("el concepto esta marcado como contabilizable pero no estan asignadas correctamente las cuentas.", ModExtensiones.TipoMensaje.MsgAdvertencia);
                 }
@@ -627,7 +627,7 @@ public partial class Nomina_CatConcepto : ClsPaginas
         string formula = TxtFormula.Text;
         using (ClsNominas objnom = new ClsNominas())
         {
-            if (TipoFormula == 0 && !ValidaFormula(formula).Equals(""))
+            if (false &&TipoFormula == 0 && !ValidaFormula(formula).Equals(""))
             {
                 Alert("Fórmula no válida. Favor de ingresar una correcta.", ModExtensiones.TipoMensaje.MsgError);
             }

Scripts/custom.js

@@ -216,8 +216,8 @@ function buscadorMenuCaudi() {
         hasmenusearch = (localStorage.getItem("HasMenu").toString() == "1")
     } catch (error) { }*/
     let idTxtMaster = "txtMasterMenu";
-    if ($('#' + idTxtMaster).length == 0 && hasmenusearch) {
+    if (!($('#' + idTxtMaster).hasClass("txtMasterMenukeychange")) && hasmenusearch) {
-        let buscador = $('' +
+        /*let buscador = $('' +
             '<div class="sidebar-search  " style="margin-top: 12px;">' +
             '    <div class="input-group">' +
             '        <input type="text" id="' + idTxtMaster + '" class="form-control" placeholder="Buscar...">' +
@@ -228,21 +228,22 @@ function buscadorMenuCaudi() {
             '        </span>' +
             '    </div>' +
             '</div>')
-        $('ul#ulmenulateralmaster li.sidebar-toggler-wrapper').append(buscador);
+        $('ul#ulmenulateralmaster li.sidebar-toggler-wrapper').append(buscador);*/
 
         let tickBar = 0;
         let input = $('#' + idTxtMaster);
+        input.addClass("txtMasterMenukeychange");
         let BuscarMenu = function () {
             tickBar = tickBar + 1;
             tickBarnew = tickBar;
 
             setTimeout(function () {
                 if (tickBarnew == tickBar) {
-                    if (input.val() == '') { $('ul#ulmenulateralmaster li').css('display', ''); }
+                    if (input.val() == '') { $('ul#ulmenulateralmasterB li').css('display', ''); }
                     else {
-                        $('ul#ulmenulateralmaster li:not(.sidebar-toggler-wrapper)').css('display', 'none');
+                        $('ul#ulmenulateralmasterB li:not(.sidebar-toggler-wrapper)').css('display', 'none');
-                        $('ul#ulmenulateralmaster li:contains("' + input.val() + '")').css('display', '');
+                        $('ul#ulmenulateralmasterB li:contains("' + input.val() + '")').css('display', '');
-                        $('ul#ulmenulateralmaster li > a[href="javascript:;"]:contains("' + input.val() + '")').parent().find('>ul>li').css('display', '');
+                        $('ul#ulmenulateralmasterB li > a[href="javascript:;"]:contains("' + input.val() + '")').parent().find('>ul>li').css('display', '');
                     }
                 }
             }, 500);
@@ -2326,3 +2327,256 @@ function AddFunctionPS(inputProducto, inputAlmace, datos) {
         }
     });
 }
+
+/*
+ * 
+ * 
+ * 
+ * 
+ * 
+ Este
+ Es
+ Un
+ Cambio
+ Grande
+ para
+ que e
+ el 
+ custom
+ JS
+ Se
+ Refresque
+ solo
+ y
+ no
+ tengan
+ que 
+ porner
+ el
+ shift F5
+ esta 
+ es 
+ la prueba e
+ en
+ el
+ local
+ host
+ espero que funciones
+
+});
+$(window).load(function () {
+    loadadscroll();
+});
+function AddFunctionPS(inputProducto, inputAlmace, datos) {
+
+    let inProducto = inputProducto;
+    let inAlmace = inputAlmace;
+    let PSModal = $('<div  class="modal ADS fade msProductos" role="dialog"></div>');
+    let content = $('<div class="modal-content"></div>');
+    let Mheader = $('<div class="modal-header "><button type="button" class="close" data-dismiss="modal">×</button><h4 class="modal-title">Productos ó Servicios</h4></div>');
+    let Mbody = $('<div class="modal-body"></div>');
+    let MFotter = $('<div class="modal-footer"><div>');
+    let Minput = $('<input type="text" class="form-control input-sm" placeholder="Buscar" >');
+    let buscador = $('<div class="input-group"></div>');
+    let lupa = $('<a href="javascript:;" class="btn submit"><i class="icon-magnifier"></i></a>');
+    let divResult = $('<div class="result"></div>');
+    let divPS = $('<div class=" divPS"></div>');
+    let divAlmacen = $('<div class=" divAlmacen"></div>');
+    let style = '';
+    let mcssclass = '.msProductos ';
+    let newline = '\n\r';
+    {
+        style = style.concat(
+            '<style>', newline,
+            mcssclass, ' .search-form {', newline,
+            '    margin: 10px 10px 0 0;', newline,
+            '    display: inline-block;', newline,
+            '    width: 350px !important; ', newline,
+            '}', newline,
+            mcssclass, ' .search-form .input-group {', newline,
+            '    border-radius: 25px !important; ', newline,
+            '}', newline,
+            mcssclass, ' .search-form .input-group .form-control {', newline,
+            '    border: 0;', newline,
+            '    background: transparent !important; ', newline,
+            '    text-indent: 0;', newline,
+            '    padding: 6px 12px;', newline,
+            '    margin: 0; ', newline,
+            '    cursor: text;', newline,
+            '}', newline,
+            mcssclass, ' .search-form .input-group .input-group-btn {', newline,
+            '    padding: 0;', newline,
+            '    margin: 0; ', newline,
+            '}', newline,
+            mcssclass, ' .search-form .input-group .input-group-btn .btn.submit {', newline,
+            '    margin: 3px 7px 0 0;', newline,
+            '    padding: 0;', newline,
+            '    background: none;', newline,
+            '    display: block;', newline,
+            '}', newline,
+            mcssclass, ' .search-form .input-group .input-group-btn .btn.submit > i {', newline,
+            '    font-size: 13px;', newline,
+            '}', newline,
+            mcssclass, '.search-form {', newline,
+            '    background: #FFFFFF; }', newline,
+            mcssclass, '.search-form .input-group {', newline,
+            '    border: 1px solid #ced6de; }', newline,
+            mcssclass, '.search-form .input-group:hover {', newline,
+            '    border-color: #bfcad4; }', newline,
+            mcssclass, '.search-form .input-group .form-control {', newline,
+            '    color: #333; }', newline,
+            mcssclass, '.search-form .input-group .form-control::-moz-placeholder {', newline,
+            '    color: #cbd4dc;', newline,
+            '    opacity: 1; }', newline,
+            mcssclass, '.search-form .input-group .form-control:-ms-input-placeholder {', newline,
+            '    color: #cbd4dc; }', newline,
+            mcssclass, '.search-form .input-group .form-control::-webkit-input-placeholder {', newline,
+            '    color: #cbd4dc; }', newline,
+            mcssclass, '.search-form .input-group .input-group-btn .btn.submit > i {', newline,
+            '    color: #ced6de; }', newline,
+            mcssclass, ' .list-group{ cursor:pointer;}', newline,
+            mcssclass, ' .item-almacen .col-sm-2{ text-align:right;padding:0px;}', newline,
+            mcssclass, ' .item-almacen { padding: 4px;border-bottom: 1px solid #aaa;}', newline,
+            mcssclass, ' .divPS{ height:500px; overflow: auto;}', newline,
+            mcssclass, ' .divAlmacen{ background-color:#eee; height:500px; overflow: auto;}', newline,
+            mcssclass, ' .PStitulo{ background-color:#eee; font-weight: 800;font-size: 14px;padding-top: 6px; padding-bottom: 6px; border-bottom: 1px solid #aaa;}', newline,
+            '</style>');
+    }
+
+    let myTick = 0;
+    let textoOld = '';
+    let LimpiarAlmacen = function () {
+        divAlmacen.empty();
+    }
+    let Limpiarresultado = function () {
+        divPS.empty();
+        LimpiarAlmacen();
+    }
+    let buscaPSTimer = function (texto) {
+        let Tick = myTick + 1;
+        myTick = Tick;
+        setTimeout(
+            function () {
+                if (myTick == Tick) {
+                    if (textoOld != texto) {
+                        buscaPS(texto);
+                    }
+                    textoOld = texto
+                }
+            }, 500);
+    };
+    let buscaPS = function (texto) {
+        myTick = 0;
+        if (datos == null) {
+            datos = { Name: texto, metodo: 'getps' }
+        }
+        let sdata = datos;
+        sdata.Name = texto;
+        sdata.metodo = 'getps';
+        Limpiarresultado();
+        if (texto.length > 0) {
+            $.ajax({
+                url: "/Ashx/SIGWeb.ashx",
+                data: sdata
+            }).done(function (data) {
+                //console.log(data)
+                if (data.length > 0) {
+                    data = JSON.parse(data)
+                    let dul = $('<ul class="list-group"></ul>')
+                    for (i = 0; i < data.length; i++) {
+                        dul.append('<li class="list-group-item" data-cve="' + data[i].id + '">' + data[i].text + '</li>');
+                    }
+                    divPS.append(dul);
+                }
+            });
+
+        }
+        textoOld = texto;
+
+    };
+    let GETPSALMACEN = function () {
+        PSModal.empty();
+        buscador.empty();
+        divResult.empty();
+        Mbody.empty();
+        content.append(Mheader);
+        content.append(Mbody);
+        content.append(MFotter);
+        buscador.append(Minput);
+        buscador.append($('<span class="input-group-btn"></span>').append(lupa));
+        divResult.append('<div class="row PStitulo"><div class=" col-sm-6 text-center">Productos</div><div class=" col-sm-1 text-left" style="padding: 0px;">Existencia</div><div  class=" col-sm-5 text-left">Almacen</div></div>')
+        divResult.append($('<div class="row"></div>').append($('<div class=" col-sm-6 " style="padding: 0px;" ></div>').append(divPS)).append($('<div class=" col-sm-6 " style="padding: 0px;"></div>').append(divAlmacen)))
+        Mbody.append($('<div class="search-form"></div>').append(buscador));
+        Mbody.append(divResult);
+
+        PSModal.append($('<div class="modal-dialog  modal-lg"></div>').append(content));
+        PSModal.modal();
+    };
+    lupa.bind("click", function () {
+        buscaPS(Minput.val());
+    });
+    Minput.bind("copy paste cut", function () {
+        buscaPS(Minput.val());
+    });
+    Minput.bind("keyup ", function (e) {
+        if (e.keyCode == 13) {
+            buscaPS(Minput.val());
+            e.preventDefault();
+        } else {
+            buscaPSTimer(Minput.val());
+        }
+    });
+
+    PSModal.on('click', '.list-group-item ', function (e) {
+        let $this = $(this).hasClass('list-group-item') ? $(this) : $(this).closest('.list-group-item');
+        let cve = $this.data('cve');
+        let text = $this.text();
+        let datos = { cveps: cve, metodo: 'getpsalmacen' }
+        $(PSModal.find('.active')).removeClass('active')
+        $this.addClass('active');
+        //console.log('' + cve + ' : ' + text)
+        LimpiarAlmacen();
+        $.ajax({
+            url: "/Ashx/SIGWeb.ashx",
+            data: datos
+        }).done(function (data) {
+            //console.log(data)
+            LimpiarAlmacen();
+            if (data.length > 0) {
+                data = JSON.parse(data)
+                for (i = 0; i < data.length; i++) {
+                    divAlmacen.append('<div class="row item-almacen" data-cve="' + data[i].id + '"><div class=" col-sm-2 " >' + data[i].existencia + '</div><div class=" col-sm-10 " >' + data[i].almacen + '</div></div>');
+                }
+            }
+        });
+    });
+    PSModal.on('shown.bs.modal', function () {
+        Minput.focus();
+    });
+    PSModal.on('click', '.item-almacen', function (e) {
+        let $this = $(this).hasClass('item-almacen') ? $(this) : $(this).closest('.item-almacen');
+        let cveps = $(PSModal.find('.active')).data('cve');
+        let cveAlmacen = $this.data('cve');
+        if ($(inputProducto).length > 0) { $(inputProducto).val(cveps) }
+        if ($(inputAlmace).length > 0) { $(inputAlmace).val(cveAlmacen) }
+        PSModal.modal('hide');
+    });
+    $('body').append(PSModal);
+    $('head').append($(style));
+    $("body").keyup(function (e) {
+        if (e.keyCode == 113) {
+            GETPSALMACEN();
+        }
+    });
+
+
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ */

Site.master

@@ -15,7 +15,7 @@
     <!-- BEGIN STYLES -->
     <style>
         .page-sidebar-menu .dnone {
-            display: none;
+            display: none !important;
         }
     </style>
     <%: Scripts.Render("~/bundles/modernizr") %>
@@ -346,8 +346,8 @@
         <div class="page-container" runat="server" id="divpagecontainer">
 
             <!-- BEGIN SIDEBAR -->
-            <div class="page-sidebar-wrapper" runat="server" id="divMenu">
+            <div class="page-sidebar-wrapper" runat="server" id="divMenuB" style=" position: fixed;">
-                <div class="page-sidebar navbar-collapse collapse" style="padding-bottom: 120px;">
+                <div class="page-sidebar navbar-collapse collapse" >
                     <!-- add "navbar-no-scroll" class to disable the scrolling of the sidebar menu -->
                     <!-- BEGIN SIDEBAR MENU -->
                     <ul class="page-sidebar-menu" id='ulmenulateralmaster' data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200">
@@ -356,28 +356,28 @@
                             <div class="sidebar-toggler">
                             </div>
                             <!-- BEGIN SIDEBAR TOGGLER BUTTON -->
-                        </li>
+                            <div class="sidebar-search  " style="margin-top: 12px;">
-
+                                <div class="input-group">
-                        <%--<li class="sidebar-search-wrapper">
+                                    <input type="text" id="txtMasterMenu" class="form-control" placeholder="Buscar..." />
-                            <!-- BEGIN RESPONSIVE QUICK SEARCH FORM -->
+                                    <span class="input-group-btn">
-                            <form class="sidebar-search" action="extra_search.html" method="POST">
+                                        <a href="javascript:;" class="btn BuscarMenu">
-                                <div class="form-container">
+                                            <i class="icon-magnifier"></i>
-                                    <div class="input-box">
+                                        </a>
-                                        <a href="javascript:;" class="remove"></a>
+                                    </span>
-                                        <input type="text" placeholder="Search..." />
-                                        <input type="button" class="submit" value=" " />
-                                    </div>
                                 </div>
-                            </form>
+                            </div>
-                            <!--END RESPONSIVE QUICK SEARCH FORM -->
+                        </li> 
-                        </li>--%>
-
-                        <asp:Literal ID="Menu" runat="server"></asp:Literal>
-
                     </ul>
                     <!-- END SIDEBAR MENU -->
                 </div>
             </div>
+            <div class="page-sidebar-wrapper" runat="server" id="divMenu" style="margin-top: 45px;">
+                <div class="page-sidebar navbar-collapse collapse" style="padding-bottom: 120px;"> 
+                    <ul class="page-sidebar-menu" id='ulmenulateralmasterB' data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200">
+                        <asp:Literal ID="Menu" runat="server"></asp:Literal>
+                    </ul> 
+                </div>
+            </div>
             <!-- END SIDEBAR -->
 
             <!-- BEGIN CONTENT -->

Site.master.vb

@@ -321,7 +321,8 @@ Partial Class Site
             estilo = If(drP("Estilo").ToString() <> "", String.Format("<i class='{0}'></i>", drP("Estilo")), "")
 
             If menuobj.CveModuloSeleccionado = cveModuloActual Then
-                menuobj.HeaderBar.AppendFormat("<li><i class='fa fa-angle-right'></i><a href='{0}'>{1}</a></li>", liga, modulo)
+                'menuobj.HeaderBar.AppendFormat("<li><i class='fa fa-angle-right'></i><a href='{0}'>{1}</a></li>", liga, modulo)
+                menuobj.headerstr.Add(String.Format("<li><i class='fa fa-angle-right'></i><a href='{0}'>{1}</a></li>", liga, modulo))
                 menuobj.CveModuloSeleccionadoPadre = CveModulo
                 menuobj.ScriptColorGrupoModulo = ColorPage(drP("CveGrupoModulo").ToString().ToEntero())
             End If
@@ -345,8 +346,8 @@ Partial Class Site
 
                     'menuobj.MenuHTML = menuobj.MenuHTML.Replace(String.Format("id='m{0}'", cveModuloActual), String.Format("id='m{0}' class='active open'", cveModuloActual))
                     'menuobj.MenuHTML = menuobj.MenuHTML.Replace(String.Format("id='j{0}'", cveModuloActual), String.Format("id='j{0}' class='selected'", cveModuloActual))
-
+                    menuobj.headerstr.Insert(0, String.Format("<li><i class='fa fa-angle-right'></i><a href='{0}'>{1}</a></li>", liga, modulo))
-                    menuobj.HeaderBar.AppendFormat("<li><i class='fa fa-angle-right'></i><a href='{0}'>{1}</a></li>", liga, modulo)
+                    'menuobj.HeaderBar.AppendFormat("<li><i class='fa fa-angle-right'></i><a href='{0}'>{1}</a></li>", liga, modulo)
                     menuobj.CveModuloSeleccionadoPadre = CveModulo
                 End If
                 menuobj.MenuHTML.Append("</ul>")
@@ -397,7 +398,9 @@ Partial Class Site
             menuobj.strdomain = menuobj.strdomain.Replace(String.Format(":{0}", Request.Url.Port), "")
         End If
         Dim newmenuobj As MenuModal = ArmarMenu(0, menuobj)
-
+        For Each stritem As String In menuobj.headerstr
+            menuobj.HeaderBar.Append(stritem)
+        Next
 
         'Dim MenuHTML As New StringBuilder
         'For Each drP As DataRow In Inicio

Ventas/Ventas.aspx.vb

@@ -9365,10 +9365,13 @@ Partial Class Ventas
         If (Archivo.Exists Or Archivo2.Exists Or ArchivoSti.Exists Or ArchivoSti2.Exists Or ArchivoSti3.Exists) And IfNull(CveVenta, 0).ToString().ToEntero() > 0 Then
             HplDownPDF.Visible = True
             HplDownPDF.NavigateUrl = String.Format("/Compras/PopUpVerFactura.aspx?P={0}", Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=1", CveVenta)))
-            If UsuarioActual.CveRol = 1 Then
+
+            If UsuarioActual.TienePermisoProceso(359) Then
                 HplRenerarPDF.Visible = True
                 HplRenerarPDF.NavigateUrl = String.Format("/Compras/PopUpVerFactura.aspx?P={0}", Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=1&REGENERAR=1", CveVenta)))
+            End If
 
+            If UsuarioActual.CveRol = 1 Then
                 HplImprimirPDFStimulsoft.Visible = True
                 HplImprimirPDFStimulsoft.NavigateUrl = String.Format("/Compras/PopUpVerFactura.aspx?P={0}", Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=0&STIMULSOFT=1", CveVenta)))
             End If
@@ -25260,9 +25263,9 @@ Partial Class Ventas
 
                     ObjFacturaCancelacion.CveAlmacenDevolucion = CveAlmacenDevolucion
 
-                    'If UsuarioActual.Empresa.Funcionalidad(531) = "1" AndAlso ObjFacturaCancelacion.TipoDocto.Contiene("Rem", "Dev") Then
+                    If UsuarioActual.Empresa.Funcionalidad(531) = "1" AndAlso ObjFacturaCancelacion.TipoDocto.Contiene("Rem", "Dev") Then
-                    '    ChkDevAlm.Checked = True
+                        ChkDevAlm.Checked = True
-                    'End If
+                    End If
 
                     If UsuarioActual.Empresa.Funcionalidad(567) = "1" AndAlso ObjFacturaCancelacion.TipoDocto = "Rem" Then
                         ChkDevAlm.Checked = True
@@ -33410,6 +33413,9 @@ Partial Class Ventas
 
                     Dim Cargo As Decimal = DTTamanios.FiltroPrimeroValor("Cargo", $" CveTamaño = { CveTamanioTemp  }").ToDecimal
 
+                    If DtUsadosDevolucion IsNot Nothing Then
+                        Cargo = DtUsadosDevolucion.FiltroPrimeroValor("PU", $"CvePS = {CvePsTemp}").ToString().ToDecimal()
+                    End If
 
                     If DTPSTemp.FiltraParametros($"CvePs = { CvePsTemp }").Rows.Count > 0 Then