diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb
index f941a3f69..4a306f502 100644
--- a/App_Code/ClsInventarios.vb
+++ b/App_Code/ClsInventarios.vb
@@ -4997,7 +4997,7 @@ Public Class ClsInventarios
 
     Public Function GetFletesRep(CveEmpresa As Integer, Optional CveFlete As Integer = -1, Optional Folio As String = "-1", Optional CveProveedor As Integer = -1,
                                  Optional CveOC As Integer = -1, Optional CveCompra As Integer = -1, Optional FechaInicio As Date = MinFecha,
-                                 Optional FechaFin As Date = MaxFecha, Optional TipoGasto As Integer = -1) As Boolean
+                                 Optional FechaFin As Date = MaxFecha, Optional TipoGasto As Integer = -1, Optional CveEstatus As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Inv_FletesRep")
         With SqlAdapter.SelectCommand.Parameters
@@ -5010,6 +5010,7 @@ Public Class ClsInventarios
             .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
             .Add("@CveFlete", SqlDbType.Int).Value = CveFlete
             .Add("@TipoGasto", SqlDbType.Int).Value = TipoGasto
+            .Add("@CveEstatus", SqlDbType.Int).Value = CveEstatus
         End With
         Try
             SqlAdapter.Fill(Data)
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index caed3305f..f3fd68e1b 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -2194,9 +2194,8 @@ Partial Class Compras_Compras
             DdlRetISRConcepto.Items.Clear()
             DdlRetISRConcepto.Items.Insert(0, New ListItem("Honorarios", "1"))
             DdlRetISRConcepto.Items.Insert(1, New ListItem("Arrendamiento", "2"))
-            If UsuarioActual.CveEmpresa.Contiene(119, 7, 11, 12, 122, 145) Then
-                DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
-            End If
+            DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
+
         End If
         UpPS.Update()
     End Sub
@@ -14675,7 +14674,7 @@ Partial Class Compras_Compras
     Protected Sub BtnRefacturacionVer_Click(sender As Object, e As EventArgs) Handles BtnRefacturacionVer.Click
         Dim Opcion As Integer = 1
 
-        If UsuarioActual.CveEmpresa.Contiene(119, 1) Then Opcion = 2
+        If UsuarioActual.CveEmpresa.Contiene(119, 1, 140) Then Opcion = 2
 
         Dim ObjCompras As New ClsCompras
 
@@ -20315,10 +20314,14 @@ Partial Class Compras_Compras
         ObjCompras.Dispose()
 
         Dim ObjInv As New ClsInventarios
-        If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then
-            DdlFletes.DataSource = ObjInv.DtResultados
+        If ObjInv.GetFletesRep(UsuarioActual.CveEmpresa, -1, "-1", -1, -1, -1, MinFecha, MaxFecha, TipoGasto:=1, CveEstatus:=0) Then
+            DdlFletes.DataSource = ObjInv.DtResultados.FiltraParametros("CveFlete > 0")
             DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
         End If
+        'If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then
+        '    DdlFletes.DataSource = ObjInv.DtResultados
+        '    DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
+        'End If
         ObjInv.Dispose()
 
         DdlImportaciones.DataBind()
diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index a04a9f686..156070172 100644
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -336,6 +336,7 @@ Partial Class PopUpVerFactura
         Dim Cultivo As String = ""
         Dim noPallet As String = ""
         Dim Variedad As String = ""
+        Dim NoCajas As String = ""
 
         'Envase = "1 1/9"
         'Tamano = "Small"
@@ -350,6 +351,7 @@ Partial Class PopUpVerFactura
                 Cultivo = row("Cultivo").ToString()
                 noPallet = row("Codigo").ToString()
                 Variedad = row("CultivoVariedad").ToString()
+                NoCajas = String.Format("{0:N0}", row("NoCajas"))
 
             End If
 
@@ -360,6 +362,7 @@ Partial Class PopUpVerFactura
         params.Add(New ReportParameter("Cultivo", Cultivo))
         params.Add(New ReportParameter("noPallet", noPallet))
         params.Add(New ReportParameter("Variedad", Variedad))
+        params.Add(New ReportParameter("NoCajas", NoCajas))
 
         Dim lrds As New List(Of ReportDataSource)
 
diff --git a/GPS/PalletEtiqueta2.rdlc b/GPS/PalletEtiqueta2.rdlc
index 07be03233..e75b2bc6e 100644
--- a/GPS/PalletEtiqueta2.rdlc
+++ b/GPS/PalletEtiqueta2.rdlc
@@ -657,7 +657,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.49417cm</Height>
+                  <Height>0.25604cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1101,7 +1101,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.49417cm</Height>
+                  <Height>0.41479cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1237,7 +1237,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.54708cm</Height>
+                  <Height>0.44125cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1354,7 +1354,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.52062cm</Height>
+                  <Height>0.38833cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1492,7 +1492,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.36187cm</Height>
+                  <Height>0.3475cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1622,7 +1622,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.38833cm</Height>
+                  <Height>0.6cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1753,7 +1753,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.52062cm</Height>
+                  <Height>0.36187cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1889,7 +1889,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.44125cm</Height>
+                  <Height>0.17667cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -2144,7 +2144,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.41479cm</Height>
+                  <Height>0.36187cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -2274,7 +2274,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.41479cm</Height>
+                  <Height>0.62646cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -2658,7 +2658,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.52062cm</Height>
+                  <Height>0.38833cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -2796,7 +2796,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.44125cm</Height>
+                  <Height>0.38833cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -2926,7 +2926,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.38833cm</Height>
+                  <Height>0.6cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -3193,7 +3193,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.38833cm</Height>
+                  <Height>0.36187cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -3310,7 +3310,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.46771cm</Height>
+                  <Height>0.44125cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -3448,7 +3448,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.36187cm</Height>
+                  <Height>0.33542cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -3754,7 +3754,7 @@
             </TablixRowHierarchy>
             <Top>0.0762cm</Top>
             <Left>0.10266cm</Left>
-            <Height>13.18458cm</Height>
+            <Height>12.50875cm</Height>
             <Width>9.64969cm</Width>
             <Style>
               <Border>
@@ -3763,7 +3763,7 @@
             </Style>
           </Tablix>
         </ReportItems>
-        <Height>5.34012in</Height>
+        <Height>4.95471in</Height>
         <Style />
       </Body>
       <Width>3.97917in</Width>
diff --git a/Inventarios/RecepcionAlmacen.aspx.vb b/Inventarios/RecepcionAlmacen.aspx.vb
index a607e5811..39c4acfad 100644
--- a/Inventarios/RecepcionAlmacen.aspx.vb
+++ b/Inventarios/RecepcionAlmacen.aspx.vb
@@ -761,7 +761,7 @@ Partial Class Inventarios_RecepcionAlmacen
 
         Dim ObjInventarios As New ClsInventarios
         If ddlProveedor.SelectedValue.ToEntero > 0 Then
-            If ObjInventarios.GetFletes(UsuarioActual.CveEmpresa, CveProveedor:=ddlProveedor.SelectedValue.ToEntero) Then
+            If ObjInventarios.GetFletes(UsuarioActual.CveEmpresa, CveProveedor:=ddlProveedor.SelectedValue.ToEntero, OpcionInventario:=1) Then
                 DdlFletes.DataSource = ObjInventarios.DtResultados.FiltraParametros("CantRest  > 0")
             Else
                 Alert("Ocurrió un error al obtener las ordenes de compra pendientes de recibir del proveedor. Por favor vuelva a intentar", TipoMensaje.MsgError)
diff --git a/Metronic/assets/admin/layout/css/custom.css b/Metronic/assets/admin/layout/css/custom.css
index bf890b55d..692501f40 100644
--- a/Metronic/assets/admin/layout/css/custom.css
+++ b/Metronic/assets/admin/layout/css/custom.css
@@ -9,7 +9,9 @@
         overflow-x: auto !important;
     }
 }
-
+.table-hover > tbody > tr:hover {
+    background-color: #e5e5e5;
+}
 .table-striped > tbody > tr:nth-of-type(odd).ADSRow,
 table > tbody > tr.ADSRow > td, table.table > tbody > tr.ADSRow > td,
 table > tr.ADSRow > td, table.table > tr.ADSRow > td,
diff --git a/RH/Personal.aspx b/RH/Personal.aspx
index 0b2cfa41e..24237fddb 100644
--- a/RH/Personal.aspx
+++ b/RH/Personal.aspx
@@ -141,6 +141,11 @@
                                                 </div>
                                                 <div class="portlet-body form">
 
+                                                    <div class="form-group form-md-line-input input-iconright">
+                                                        <asp:TextBox CssClass="form-control" ID="TxtCodigo" runat="server" MaxLength="12"></asp:TextBox>
+                                                        <asp:Label AssociatedControlID="TxtCodigo" runat="server" Text="Código:"></asp:Label>
+                                                        <i></i>
+                                                    </div>
                                                     <div class="form-group form-md-line-input input-iconright">
                                                         <asp:TextBox CssClass="form-control" ID="TxtAPaterno" runat="server" MaxLength="30"></asp:TextBox>
                                                         <asp:Label AssociatedControlID="TxtAPaterno" runat="server" Text="Apellido Paterno:"></asp:Label>
@@ -159,27 +164,6 @@
                                                         <asp:RequiredFieldValidator ID="RFVNombres" runat="server" ControlToValidate="TxtNombres" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Nombres''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
                                                         <i></i>
                                                     </div>
-                                                    <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:TextBox CssClass="form-control" ID="TxtCodigo" runat="server" MaxLength="12"></asp:TextBox>
-                                                        <asp:Label AssociatedControlID="TxtCodigo" runat="server" Text="Código:"></asp:Label>
-                                                        <i></i>
-                                                    </div>
-                                                    <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:DropDownList Width="100%" ID="DdlEscolaridad" CssClass="form-control input-sm select2me" runat="server" AppendDataBoundItems="true" DataTextField="Escolaridad" DataValueField="CveEscolaridad" ValidationGroup="GrpGuardar">
-                                                            <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
-                                                        </asp:DropDownList>
-                                                        <asp:Label AssociatedControlID="DdlEscolaridad" runat="server" Text="Escolaridad:"></asp:Label>
-                                                        <asp:RequiredFieldValidator ID="RFVEscolaridad" runat="server" ControlToValidate="DdlEscolaridad" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Escolaridad''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                                        <i></i>
-                                                    </div>
-                                                    <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:DropDownList Width="100%" ID="DdlEstadoCivil" runat="server" AppendDataBoundItems="true" DataTextField="EstadoCivil" DataValueField="CveEstadoCivil" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar">
-                                                            <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
-                                                        </asp:DropDownList>
-                                                        <asp:Label AssociatedControlID="DdlEstadoCivil" runat="server" Text="Estado Civil:"></asp:Label>
-                                                        <asp:RequiredFieldValidator ID="RFVEstadoCivil" runat="server" ControlToValidate="DdlEstadoCivil" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''EstadoCivil''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                                        <i></i>
-                                                    </div>
                                                     <div class="form-group form-md-line-input input-iconright">
                                                         <asp:DropDownList Width="100%" ID="DdlGenero" runat="server" AppendDataBoundItems="true" DataTextField="Genero" DataValueField="CveGenero" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar">
                                                             <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
@@ -189,7 +173,17 @@
                                                         <i></i>
                                                     </div>
                                                     <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:Label AssociatedControlID="TxtFechaNacimiento" runat="server" Text="Fecha de Nacimiento:"></asp:Label>
+                                                        <asp:DropDownList ID="DdlPais" runat="server" DataTextField="ClaveSATPaisDescripcion" DataValueField="CvePais" Width="100%" Class="form-control   input-sm select2me"></asp:DropDownList>
+                                                        <label for="<%= DdlPais.ClientID.ToString()%>">Nacionalidad: </label>
+                                                        <i></i>
+                                                    </div>
+                                                    <div class="form-group form-md-line-input input-iconright">
+                                                        <asp:DropDownList ID="DdlEstados" runat="server" DataTextField="NombreEstado" DataValueField="CveEstado" Width="100%" Class="form-control   input-sm select2me"></asp:DropDownList>
+                                                        <label for="<%= DdlEstados.ClientID.ToString()%>">Lugar de nacimiento: </label>
+                                                        <i></i>
+                                                    </div>
+                                                    <div class="form-group form-md-line-input input-iconright">
+                                                        <asp:Label AssociatedControlID="TxtFechaNacimiento" runat="server" Text="Fecha de nacimiento:"></asp:Label>
                                                         <div class="input-group input-sm date date-picker" data-date-format="dd/mm/yyyy" style="padding: 5px 0px;">
                                                             <asp:TextBox ID="TxtFechaNacimiento" runat="server" CausesValidation="true" CssClass="form-control input-sm"></asp:TextBox>
                                                             <span class="input-group-btn ">
@@ -226,38 +220,24 @@
                                                             <a id="LinkValidarCurp" class="btn btn-default" data-toggle="tooltip" title="Validar CURP" onclick="ValidaCURP();"><i class="fa fa-check"></i></a>
                                                         </div>
                                                     </div>
-                                                    <div class="row">
-                                                        <div class="col-md-6">¿es Temporal?</div>
-                                                        <div class="col-md-6">
-                                                            <asp:CheckBox ID="ChkEstemporal" Text=" " AutoPostBack="true" OnCheckedChanged="ChkEstemporal_CheckedChanged" CssClass="chksino" runat="server" />
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col-md-6">¿RFC Validado ante el SAT?</div>
-                                                        <div class="col-md-6">
-                                                            <asp:CheckBox ID="CHKRFCValidado" Text=" " CssClass="chksino" runat="server" />
-                                                        </div>
-                                                    </div>
 
                                                     <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:DropDownList Width="100%" ID="DdlTipoTrabajador" CssClass="form-control input-sm select2me" runat="server" AutoPostBack="true"
-                                                            DataTextField="TipoTrabajadorB" DataValueField="CveTipoTrabajador" ValidationGroup="GrpGuardar" OnSelectedIndexChanged="DdlTipoTrabajador_SelectedIndexChanged">
+                                                        <asp:DropDownList Width="100%" ID="DdlEscolaridad" CssClass="form-control input-sm select2me" runat="server" AppendDataBoundItems="true" DataTextField="Escolaridad" DataValueField="CveEscolaridad" ValidationGroup="GrpGuardar">
+                                                            <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
-                                                        <asp:Label AssociatedControlID="DdlTipoTrabajador" runat="server" Text="Tipo trabajador:"></asp:Label>
+                                                        <asp:Label AssociatedControlID="DdlEscolaridad" runat="server" Text="Escolaridad:"></asp:Label>
+                                                        <asp:RequiredFieldValidator ID="RFVEscolaridad" runat="server" ControlToValidate="DdlEscolaridad" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Escolaridad''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                        <i></i>
                                                     </div>
                                                     <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:DropDownList Width="100%" ID="DDlAgroDepartamento" CssClass="form-control input-sm select2me" runat="server"
-                                                            DataTextField="Departamento" DataValueField="CveDepartamento" ValidationGroup="GrpGuardar">
+                                                        <asp:DropDownList Width="100%" ID="DdlEstadoCivil" runat="server" AppendDataBoundItems="true" DataTextField="EstadoCivil" DataValueField="CveEstadoCivil" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar">
+                                                            <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
-                                                        <asp:Label AssociatedControlID="DDlAgroDepartamento" runat="server" Text="Depto:"></asp:Label>
-                                                    </div>
-                                                    <div class="form-group form-md-line-input input-iconright">
-                                                        <div style="height: 35px; padding-top: 12px;">
-                                                            <asp:CheckBox ID="ChkCharolaForanea" CssClass="chksino " Text=" " runat="server" />
-                                                        </div>
-                                                        <input type="text" class="form-control hidden" />
-                                                        <asp:Label AssociatedControlID="ChkCharolaForanea" runat="server" Text="Charola foraneo"></asp:Label>
+                                                        <asp:Label AssociatedControlID="DdlEstadoCivil" runat="server" Text="Estado Civil:"></asp:Label>
+                                                        <asp:RequiredFieldValidator ID="RFVEstadoCivil" runat="server" ControlToValidate="DdlEstadoCivil" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''EstadoCivil''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                        <i></i>
                                                     </div>
+
                                                 </div>
                                             </div>
                                         </div>
@@ -316,11 +296,6 @@
                                                         <label for="<%= TxtEstado.ClientID.ToString()%>">Estado: </label>
                                                         <i></i>
                                                     </div>
-                                                    <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:DropDownList ID="DdlEstados" runat="server" DataTextField="NombreEstado" DataValueField="CveEstado" Width="100%" Class="form-control   input-sm select2me"></asp:DropDownList>
-                                                        <label for="<%= DdlEstados.ClientID.ToString()%>">Estado: </label>
-                                                        <i></i>
-                                                    </div>
                                                     <div class="form-group form-md-line-input input-iconright">
                                                         <asp:TextBox CssClass="form-control" ID="TxtTelefono" runat="server" MaxLength="10"></asp:TextBox>
                                                         <label for="<%= TxtTelefono.ClientID.ToString()%>">Teléfono </label>
@@ -333,23 +308,23 @@
                                                     </div>
                                                     <div class="form-group form-md-line-input input-iconright">
                                                         <asp:TextBox CssClass="form-control" ID="TxtCorreo" runat="server" MaxLength="50"></asp:TextBox>
-                                                        <label for="<%= TxtCorreo.ClientID.ToString()%>">Correo: </label>
+                                                        <label for="<%= TxtCorreo.ClientID.ToString()%>">Correo personal: </label>
                                                         <asp:RegularExpressionValidator ID="REVCorreo" runat="server" ValidationExpression="\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" CssClass="help-block errorimput" ControlToValidate="TxtCorreo" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Correo - Email''</b> no es válido, por favor ingrése uno correcto." ValidationGroup="GrpGuardar"></asp:RegularExpressionValidator>
                                                         <i></i>
                                                     </div>
-                                                    <hr />
                                                     <div class="form-group form-md-line-input input-iconright">
+                                                        <asp:TextBox ID="TxtMailrecibonomina" runat="server" CausesValidation="true" CssClass="form-control input-sm"></asp:TextBox>
+                                                        <asp:Label runat="server" AssociatedControlID="TxtMailrecibonomina" Text="Mail recibo nómina:"></asp:Label>
+                                                    </div>
+
+
+                                                    <div class="form-group form-md-line-input input-iconright" style="display: none">
                                                         <asp:TextBox CssClass="form-control" ID="TxtLugarNacimiento" runat="server" MaxLength="70"></asp:TextBox>
-                                                        <label for="<%= TxtLugarNacimiento.ClientID.ToString()%>">Lugar de Nacimiento: </label>
+                                                        <label for="<%= TxtLugarNacimiento.ClientID.ToString()%>">Lugar de nacimiento: </label>
                                                         <i></i>
                                                     </div>
 
 
-                                                    <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:DropDownList ID="DdlPais" runat="server" DataTextField="ClaveSATPaisDescripcion" DataValueField="CvePais" Width="100%" Class="form-control   input-sm select2me"></asp:DropDownList>
-                                                        <label for="<%= DdlPais.ClientID.ToString()%>">Nacionalidad: </label>
-                                                        <i></i>
-                                                    </div>
 
                                                     <div runat="server" id="DivPadres" visible="true">
                                                         <div class="form-group form-md-line-input input-iconright">
@@ -575,7 +550,7 @@
                                                         <i></i>
                                                     </div>
 
-                                                    <div class="form-group form-md-line-input input-iconright">
+                                                    <div class="form-group form-md-line-input input-iconright" style="display: none;">
                                                         <asp:DropDownList Width="100%" ID="DdlRuta" runat="server" AppendDataBoundItems="True" DataTextField="Ruta" DataValueField="CveRuta" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar">
                                                             <asp:ListItem Selected="True" Text="Sin asignar Ruta" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
@@ -591,7 +566,7 @@
                                                         <i></i>
                                                     </div>
 
-                                                      <div class="form-group form-md-line-input input-iconright" runat="server" id="DvOutsourcing" visible="false">
+                                                    <div class="form-group form-md-line-input input-iconright" runat="server" id="DvOutsourcing" visible="false">
                                                         <asp:DropDownList Width="100%" ID="DdlEmpresaAsignada" runat="server" DataTextField="Empresa" DataValueField="CveEmpresa" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar">
                                                             <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
@@ -599,14 +574,55 @@
                                                         <i></i>
                                                     </div>
 
+
+
                                                     <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:Label AssociatedControlID="ChkPensionado" CssClass="lblforchk" runat="server" Text="Pensionado:"></asp:Label>
-                                                        <asp:CheckBox ID="ChkPensionado" CssClass="chksino " Text=" " runat="server" />
+                                                        <asp:DropDownList Width="100%" ID="DdlTipoTrabajador" CssClass="form-control input-sm select2me" runat="server" AutoPostBack="true"
+                                                            DataTextField="TipoTrabajadorB" DataValueField="CveTipoTrabajador" ValidationGroup="GrpGuardar" OnSelectedIndexChanged="DdlTipoTrabajador_SelectedIndexChanged">
+                                                        </asp:DropDownList>
+                                                        <asp:Label AssociatedControlID="DdlTipoTrabajador" runat="server" Text="Tipo trabajador:"></asp:Label>
                                                     </div>
                                                     <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:Label AssociatedControlID="ChkSindicalizado" CssClass="lblforchk" runat="server" Text="Sindicalizado:"></asp:Label>
-                                                        <asp:CheckBox ID="ChkSindicalizado" CssClass="chksino " Text=" " runat="server" />
+                                                        <asp:DropDownList Width="100%" ID="DDlAgroDepartamento" CssClass="form-control input-sm select2me" runat="server"
+                                                            DataTextField="Departamento" DataValueField="CveDepartamento" ValidationGroup="GrpGuardar">
+                                                        </asp:DropDownList>
+                                                        <asp:Label AssociatedControlID="DDlAgroDepartamento" runat="server" Text="Depto:"></asp:Label>
                                                     </div>
+                                                    
+                                                    <div class="row">
+                                                        <div class="col-md-6">
+                                                            <asp:Label AssociatedControlID="ChkPensionado" CssClass="lblforchk" runat="server" Text="Pensionado:"></asp:Label>
+                                                            <asp:CheckBox ID="ChkPensionado" CssClass="chksino " Text=" " runat="server" />
+                                                        </div>
+                                                        <div class="col-md-6">
+                                                            <asp:Label AssociatedControlID="ChkSindicalizado" CssClass="lblforchk" runat="server" Text="Sindicalizado:"></asp:Label>
+                                                            <asp:CheckBox ID="ChkSindicalizado" CssClass="chksino " Text=" " runat="server" />
+                                                        </div>
+                                                    </div> 
+                                                    <div class="row">
+                                                        <div class="col-md-6">
+                                                            <asp:Label AssociatedControlID="ChkEstemporal" CssClass="lblforchk" runat="server" Text="¿es Temporal?:"></asp:Label>
+                                                            <asp:CheckBox ID="ChkEstemporal" Text=" " AutoPostBack="true" OnCheckedChanged="ChkEstemporal_CheckedChanged" CssClass="chksino" runat="server" />
+                                                        </div>
+                                                        <div class="col-md-6">
+
+                                                            <div class="form-group form-md-line-input input-iconright">
+                                                                <div style="height: 35px; padding-top: 12px;">
+                                                                    <asp:CheckBox ID="ChkCharolaForanea" CssClass="chksino " Text=" " runat="server" />
+                                                                </div>
+                                                                <input type="text" class="form-control hidden" />
+                                                                <asp:Label AssociatedControlID="ChkCharolaForanea" runat="server" Text="Charola foraneo"></asp:Label>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" style="display: none;">
+                                                        <div class="col-md-6">
+                                                            <asp:Label AssociatedControlID="CHKRFCValidado" CssClass="lblforchk" runat="server" Text="¿RFC Validado ante el SAT?:"></asp:Label></div>
+                                                        <div class="col-md-6">
+                                                            <asp:CheckBox ID="CHKRFCValidado" Text=" " CssClass="chksino" runat="server" />
+                                                        </div>
+                                                    </div>
+
                                                 </div>
                                             </div>
                                         </div>
@@ -858,7 +874,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="portlet-body form">
-                                                    <div class="form-group form-md-line-input input-iconright "  runat="server" id="DVSupervisorAsignado" >
+                                                    <div class="form-group form-md-line-input input-iconright " runat="server" id="DVSupervisorAsignado">
                                                         <asp:DropDownList ID="DdlSupervisor" runat="server" AppendDataBoundItems="True" DataTextField="Nombre" DataValueField="CveUsuario" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar" Width="100%">
                                                             <asp:ListItem Selected="True" Text="Sin Supervisor Asignado" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
@@ -1437,10 +1453,6 @@
                                                         <i></i>
                                                     </div>
 
-                                                    <div class="form-group form-md-line-input input-iconright">
-                                                        <asp:TextBox ID="TxtMailrecibonomina" runat="server" CausesValidation="true" CssClass="form-control input-sm"></asp:TextBox>
-                                                        <asp:Label runat="server" AssociatedControlID="TxtMailrecibonomina" Text="Mail recibo nómina:"></asp:Label>
-                                                    </div>
                                                     <div class="form-group form-md-line-input input-iconright">
 
                                                         <asp:DropDownList ID="DDlTipoSalario" runat="server" CssClass="form-control input-sm select2me" Width="100%" ValidationGroup="GrpGuardar">