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

App_Code/ClsCGame.vb

@@ -3480,6 +3480,25 @@ Public Class ClsCGame
 
 #End Region
 
+    Public Function MailsGet(cveMails As Int32, cveUsuarioCorreo As Int32, cveUsuario As Int32, cveEmpresa As Int32, tipo As Int32) As Boolean
+        Dim retorno As Boolean = False
+        DataAdapter("PA_CGame_MailsGet", CommandType.StoredProcedure)
+
+        With SqlAdapter.SelectCommand.Parameters
+            .Add("@CveMails", SqlDbType.Int).Value = cveMails
+            .Add("@CveUsuarioCorreo", SqlDbType.Int).Value = cveUsuarioCorreo
+            .Add("@CveUsuario", SqlDbType.Int).Value = cveUsuario
+            .Add("@CveEmpresa", SqlDbType.Int).Value = cveEmpresa
+            .Add("@Tipo", SqlDbType.Int).Value = tipo
+        End With
+        Try
+            SqlAdapter.Fill(Data)
+            retorno = True
+        Catch ex As Exception
+            OnError("Ocurrió un error al obtener el reporte de inventario diario.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+        End Try
+        Return retorno
+    End Function
 #Region "IDisposable Support"
     ' IDisposable
     Protected Overridable Sub Dispose(disposing As Boolean)

App_Code/Modelos.vb

@@ -10,6 +10,51 @@ Imports Microsoft.Reporting.WebForms
 
 Namespace Modelos
 
+    <Serializable>
+    Public Class NConcepto
+#Region "Percepciones"
+        Public Property NoConceptoP As String
+        Public Property ConceptoP As String
+        Public Property LabelValorP As String
+        Public Property CveConceptoP As Integer
+        Public Property ImporteP As Double
+        Public Property ImporteGravadoP As Double
+        Public Property ValorP As Double
+        Public Property EstatusP As Integer
+        Public Property isSavedP As Integer
+        Public Property isEditedP As Integer
+        Public Property isOnlyBisibleP As Integer
+        Public Property CveSistemaP As Integer
+#End Region
+#Region "Deducciones"
+        Public Property NoConceptoD As String
+        Public Property ConceptoD As String
+        Public Property LabelValorD As String
+        Public Property CveConceptoD As Integer
+        Public Property ImporteD As Double
+        Public Property ImporteGravadoD As Double
+        Public Property ValorD As Double
+        Public Property EstatusD As Integer
+        Public Property isSavedD As Integer
+        Public Property isEditedD As Integer
+        Public Property isOnlyBisibleD As Integer
+        Public Property CveSistemaD As Integer
+#End Region
+#Region "Obligaciones"
+        Public Property NoConceptoO As String
+        Public Property ConceptoO As String
+        Public Property LabelValorO As String
+        Public Property CveConceptoO As Integer
+        Public Property ImporteO As Double
+        Public Property ImporteGravadoO As Double
+        Public Property ValorO As Double
+        Public Property EstatusO As Integer
+        Public Property isEditedO As Integer
+        Public Property isOnlyBisibleO As Integer
+        Public Property CveSistemaO As Integer
+#End Region
+    End Class
+
     <Serializable>
     Public Class PlantillasPolizas
         Public Property CvePlantillaPoliza As Integer

Compras/PopUpVerFactura.aspx.vb

@@ -235,6 +235,9 @@ Partial Class PopUpVerFactura
                 If Request("onlyPrint").ToString() = "CitrusInventarioDiarioxls" AndAlso Not IsNothing(Request("fecha")) Then
                     imprimirRepcitrusInventarioDiario(Request("fecha").ToString(), "Excel")
                 End If
+                If Request("onlyPrint").ToString() = "CitrusInventarioDiarioSendMail" AndAlso Not IsNothing(Request("fecha")) Then
+                    imprimirRepcitrusInventarioDiario(Request("fecha").ToString(), "PDF", True)
+                End If
             End If
         End If
     End Sub
@@ -342,11 +345,11 @@ Partial Class PopUpVerFactura
     End Sub
 
 
-    Private Sub imprimirRepcitrusInventarioDiario(fecha As String, formato As String)
+    Private Sub imprimirRepcitrusInventarioDiario(fecha As String, formato As String, Optional EnviarCorrreo As Boolean = False)
         Dim totalPallets As String = ""
         Dim totalBachas As String = ""
         Dim dfec As DateTime = fecha.ToDateTime()
-        Dim fechas As String = String.Format(New System.Globalization.CultureInfo("es-MX"), "{0:dd} de {0:MMMM} del {0:yyyy}", dfec)
+        Dim fechas As String = String.Format(New System.Globalization.CultureInfo("es-MX"), "{0:dd} DE {0:MMMM} DEL {0:yyyy}", dfec).ToUpper()
         Dim totalcajas As String = ""
         Dim TotalBins As String = ""
 
@@ -382,7 +385,30 @@ Partial Class PopUpVerFactura
 
         '"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
         Dim rutardlc = "Formatos\RepAgroInventarioDiario.rdlc"
-        ImprimirPDF(rutardlc, lrds, params, "Inventario", formato) ', Content_Disposition:="Inline")
+        If EnviarCorrreo Then
+            Dim para As String = "caudillo.90d@gmail.com"
+            Dim dtCorreos As DataTable = New DataTable()
+
+            Using objnom As New ClsCGame
+                If objnom.MailsGet(-1, -1, -1, UsuarioActual.CveEmpresa, 2) Then
+                    dtCorreos = objnom.DtResultados
+                End If
+            End Using
+            For Each row As DataRow In dtCorreos.Rows
+                para = String.Format("{0},{1}", para, row("Correo"))
+            Next
+
+            Dim archivoBinario As Byte() = StreamPDF(rutardlc, lrds, params, "Inventario", formato)
+            Dim LSRutasMail As New List(Of ClsSisMail.ArchivoMail)
+            LSRutasMail.Add(New ClsSisMail.ArchivoMail With {.ArchivoBinario = archivoBinario, .NombreArchivo = String.Format("Inventario {0}.pdf", fechas)})
+
+
+            Dim Mail As New ClsSisMail()
+            Mail.SendMail(ClsPaginas.EmpresaNotificaciones, para, String.Format("Reporte de Inventario del {0}", fechas), "", "", Archivos:=LSRutasMail)
+
+        Else
+            ImprimirPDF(rutardlc, lrds, params, "Inventario", formato) ', Content_Disposition:="Inline")
+        End If
     End Sub
 
 
@@ -6974,9 +7000,9 @@ Partial Class PopUpVerFactura
                         End If
                     End If
                     ObjConta.Dispose()
-                    End If
+                End If
 
-                    ImprimirPDF(RutaReporte, DtDetalle, params, $"P{TipoPolizaString}{FolioPoliza}", Formato:="PDF")
+                ImprimirPDF(RutaReporte, DtDetalle, params, $"P{TipoPolizaString}{FolioPoliza}", Formato:="PDF")
 
             Else
                 Alert("El documento solicitado no existe, favor de revisar su búsqueda.", TipoMensaje.MsgAdvertencia)

Nomina/Finiquito.aspx

@@ -67,6 +67,53 @@
             font-weight: bold;
             font-size: 15px;
         }
+        
+        .isOnlyVisible {
+            color: #666;
+            /*text-decoration: line-through;*/
+        }
+
+        .isOnlyBisibleP td:nth-child(1) {
+            /*text-decoration: line-through;*/
+        }
+
+        .isOnlyBisibleD td:nth-last-child(3) {
+            /*text-decoration: line-through;*/
+        }
+
+        .isEditedP td:nth-child(-n+3) {
+            text-decoration: underline;
+        }
+
+        .isEditedD td:nth-last-child(-n+3) {
+            text-decoration: underline;
+        }
+
+        .isOnlyBisibleP td:nth-child(-n+3) {
+            color: #999;
+        }
+
+        .isOnlyBisibleD td:nth-last-child(-n+3) {
+            color: #999;
+        }
+
+        .isOnlyBisibleP td:nth-child(-n+3) a {
+            color: #999;
+        }
+
+        .isOnlyBisibleD td:nth-last-child(-n+3) a {
+            color: #999;
+        }
+
+        .isOnlyBisibleO td:nth-last-child(-n+3) a {
+            color: #999;
+        }
+        
+        .GvConceptos td {
+            font-size: 11px;
+            padding-top: 2px;
+            padding-bottom: 2px;
+        }
     </style>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -83,6 +130,9 @@
             <li>
                 <asp:LinkButton ID="LnkAutorizar" Visible="false" OnClick="LnkAutorizar_Click" runat="server"><i class='material-icons'>done_all</i>Autorizar</asp:LinkButton>
             </li>
+            <li>
+                <asp:LinkButton ID="LnkCancelarNomina" Visible="false" OnClick="LnkCancelarNomina_Click" runat="server"><i class="fa fa-ban" aria-hidden="true"></i>Desautorizar nómina</asp:LinkButton>
+            </li>
             <li>
                 <asp:LinkButton ID="LnkTimbrar" Visible="false" OnClick="LnkTimbrar_Click" runat="server"><i class="fa fa-bell"></i>Timbrar</asp:LinkButton>
             </li>
@@ -332,7 +382,7 @@
 
                             <asp:GridView ID="GvFinOrdinario" runat="server" AutoGenerateColumns="False" CssClass="table table-striped table-hover Widthall GvConceptos"
                                 Style="text-align: center;" GridLines="None" OnRowDataBound="GvConceptos_RowDataBound" ShowHeaderWhenEmpty="true"
-                                DataKeyNames="ConceptoP,CveConceptoP,ImporteP,ValorP,EstatusP,ConceptoD,CveConceptoD,ImporteD,isOnlyBisibleP,isOnlyBisibleD,EstatusD,ValorD,isEditedD,isEditedP">
+                                DataKeyNames="ConceptoP,CveConceptoP,ImporteP,ValorP,EstatusP,ConceptoD,CveConceptoD,ImporteD,isOnlyBisibleP,isOnlyBisibleD,EstatusD,ValorD,isEditedD,isEditedP,isSavedP,isSavedD">
                                 <Columns>
                                     <asp:TemplateField HeaderText="Concepto">
                                         <ItemTemplate>
@@ -407,7 +457,7 @@
                         <div class="portlet-body ">
                             <asp:GridView ID="GVFinIndemnizacion" runat="server" AutoGenerateColumns="False" CssClass="table table-striped table-hover Widthall GvConceptos"
                                 Style="text-align: center;" GridLines="None" OnRowDataBound="GvConceptos_RowDataBound" ShowHeaderWhenEmpty="true"
-                                DataKeyNames="ConceptoP,CveConceptoP,ImporteP,ValorP,EstatusP,ConceptoD,CveConceptoD,ImporteD,isOnlyBisibleP,isOnlyBisibleD,EstatusD,ValorD,isEditedD,isEditedP">
+                                DataKeyNames="ConceptoP,CveConceptoP,ImporteP,ValorP,EstatusP,ConceptoD,CveConceptoD,ImporteD,isOnlyBisibleP,isOnlyBisibleD,EstatusD,ValorD,isEditedD,isEditedP,isSavedP,isSavedD">
                                 <Columns>
                                     <asp:TemplateField HeaderText="Concepto">
                                         <ItemTemplate>
@@ -479,20 +529,46 @@
                                         <asp:ListItem Value="-1" Text="Seleccione"></asp:ListItem>
                                     </asp:DropDownList>
                                 </div>
-                                <div class="form-group form-md-line-input input-iconright">
-                                    <asp:TextBox CssClass="form-control" ID="TxtmcImporte" runat="server" MaxLength="10"></asp:TextBox>
-                                    <asp:Label runat="server" AssociatedControlID="TxtmcImporte" Enabled="false" Text="Importe"></asp:Label>
-                                    <i></i>
+
+                                <div class="row">
+                                    <div class="col-md-9"></div>
+                                    <div class="col-md-3">Calcular automatico</div>
                                 </div>
-                                <div class="form-group form-md-line-input input-iconright">
-                                    <asp:TextBox CssClass="form-control" ID="TxtmcImporteGrabado" runat="server" MaxLength="10"></asp:TextBox>
-                                    <asp:Label runat="server" AssociatedControlID="TxtmcImporteGrabado" Enabled="false" Text="Gravado"></asp:Label>
-                                    <i></i>
+                                <div class="row">
+                                    <div class="col-md-9">
+                                        <div class="form-group form-md-line-input input-iconright">
+                                            <asp:TextBox CssClass="form-control" ID="Txtmcvalor" runat="server"></asp:TextBox>
+                                            <asp:Label runat="server" AssociatedControlID="Txtmcvalor" Enabled="false" Text="Valor"></asp:Label>
+                                            <i></i>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3 text-center">
+                                        <asp:CheckBox ID="ChkCalAutomaticoV" OnCheckedChanged="ChkCalAutomaticoV_CheckedChanged" AutoPostBack="true" runat="server" />
+                                    </div>
                                 </div>
-                                <div class="form-group form-md-line-input input-iconright">
-                                    <asp:TextBox CssClass="form-control" ID="Txtmcvalor" runat="server" MaxLength="10"></asp:TextBox>
-                                    <asp:Label runat="server" AssociatedControlID="Txtmcvalor" Enabled="false" Text="Valor"></asp:Label>
-                                    <i></i>
+                                <div class="row">
+                                    <div class="col-md-9">
+                                        <div class="form-group form-md-line-input input-iconright">
+                                            <asp:TextBox CssClass="form-control" ID="TxtmcImporte" runat="server"></asp:TextBox>
+                                            <asp:Label runat="server" AssociatedControlID="TxtmcImporte" Enabled="false" Text="Importe"></asp:Label>
+                                            <i></i>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3 text-center">
+                                        <asp:CheckBox ID="ChkCalAutomatico" OnCheckedChanged="ChkCalAutomatico_CheckedChanged" AutoPostBack="true" runat="server" />
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-md-9">
+                                        <div class="form-group form-md-line-input input-iconright">
+                                            <asp:TextBox CssClass="form-control" ID="TxtmcImporteGrabado" runat="server"></asp:TextBox>
+                                            <asp:Label runat="server" AssociatedControlID="TxtmcImporteGrabado" Enabled="false" Text="Gravado"></asp:Label>
+                                            <i></i>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3 text-center">
+                                        <asp:CheckBox ID="ChkCalAutomaticoG" OnCheckedChanged="ChkCalAutomaticoG_CheckedChanged" AutoPostBack="true" runat="server" />
+                                    </div>
                                 </div>
                             </div>
                             <div class="modal-footer">

Nomina/Nomina.aspx.cs

@@ -10,6 +10,7 @@ using System.Text;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using static Extensiones.ModExtensiones;
+using Modelos;
 
 public partial class Nomina_Nomina2 : ClsPaginas
 {
@@ -4589,51 +4590,6 @@ public partial class Nomina_Nomina2 : ClsPaginas
     }
 
 
-    private class NConcepto
-    {
-        public string NoConceptoP { get; set; }
-        public string ConceptoP { get; set; }
-        public string LabelValorP { get; set; }
-        public int CveConceptoP { get; set; }
-        public double ImporteP { get; set; }
-        public double ImporteGravadoP { get; set; }
-        public double ValorP { get; set; }
-        public int EstatusP { get; set; }
-        public int isSavedP { get; set; }
-        public int isEditedP { get; set; }
-        public int isOnlyBisibleP { get; set; }
-        public int CveSistemaP { get; set; }
-
-
-        public string NoConceptoD { get; set; }
-        public string ConceptoD { get; set; }
-        public string LabelValorD { get; set; }
-        public int CveConceptoD { get; set; }
-        public double ImporteD { get; set; }
-        public double ImporteGravadoD { get; set; }
-        public double ValorD { get; set; }
-        public int EstatusD { get; set; }
-        public int isSavedD { get; set; }
-        public int isEditedD { get; set; }
-        public int isOnlyBisibleD { get; set; }
-        public int CveSistemaD { get; set; }
-
-
-
-
-
-        public string NoConceptoO { get; set; }
-        public string ConceptoO { get; set; }
-        public string LabelValorO { get; set; }
-        public int CveConceptoO { get; set; }
-        public double ImporteO { get; set; }
-        public double ImporteGravadoO { get; set; }
-        public double ValorO { get; set; }
-        public int EstatusO { get; set; }
-        public int isEditedO { get; set; }
-        public int isOnlyBisibleO { get; set; }
-        public int CveSistemaO { get; set; }
-    }
 
     int CveConceptoPolgvc, CveConceptoDolgvc;
     protected void GvConceptos_RowDataBound(object sender, GridViewRowEventArgs e)