AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://agonzalez@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Antonio Gonzalez
2020-08-18 17:20:02 -07:00
parent 7d729bcdac bd755f7048
commit eafc8f830d
5 changed files with 213 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Inventarios/RepMaximoMinimo.aspx
View File

@@ -277,9 +277,12 @@
</div> </div>
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:DropDownList ID="DdlPSModal" CssClass="form-control input-sm select2me js-cuenta-programmatic" runat="server" AppendDataBoundItems="true" DataTextField="PSCodigo" DataValueField="CvePS" Width="240px" CausesValidation="true"></asp:DropDownList> <label for="<%= DdlPSModal.ClientID.ToString()%>"><span style="color:#F3565D;">* </span>Producto/Servicios:</label>
<asp:RequiredFieldValidator ID="RFVPS" runat="server" ControlToValidate="DdlPSModal" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Producto / Servicio''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpDefinir"></asp:RequiredFieldValidator> <ADS:Dropdownlost runat="server" ID="DdlPSModal" CssStyle="width: 100%;" CssClass="DdlPS " CssClassDdl="select2me " UsaWebService="true"
<label for="<%= DdlPSModal.ClientID.ToString()%>">Producto/Servicios:</label> IncluyeTodos="false" DataTextField="PSCodigo" DataValueField="CvePS" />
<%--<asp:DropDownList ID="DdlPSModal" CssClass="form-control input-sm select2me js-cuenta-programmatic" runat="server" AppendDataBoundItems="true" DataTextField="PSCodigo" DataValueField="CvePS" Width="240px" CausesValidation="true"></asp:DropDownList>--%>
<%--<asp:RequiredFieldValidator ID="RFVPS" runat="server" ControlToValidate="DdlPSModal" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Producto / Servicio''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpDefinir"></asp:RequiredFieldValidator>--%>
</div> </div>
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">

51
Inventarios/RepMaximoMinimo.aspx.vb
View File

@@ -64,9 +64,9 @@ Partial Class Inventarios_RepMaximoMinimo
DdlAlmacenModal.DataBind() DdlAlmacenModal.DataBind()
DdlAlmacenModal.Items.Insert(0, New ListItem("Seleccione Almacén", "-1")) DdlAlmacenModal.Items.Insert(0, New ListItem("Seleccione Almacén", "-1"))
DdlPSModal.DataSource = GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) 'DdlPSModal.DataSource = GlobalDTPSSimplificado(UsuarioActual.CveEmpresa)
DdlPSModal.DataBind() 'DdlPSModal.DataBind()
DdlPSModal.Items.Insert(0, New ListItem("Seleccione", "-1")) 'DdlPSModal.Items.Insert(0, New ListItem("Seleccione", "-1"))
UpModalMaximoMinimo.Update() UpModalMaximoMinimo.Update()
@@ -86,9 +86,9 @@ Partial Class Inventarios_RepMaximoMinimo
DdlAlmacen.Items.Clear() DdlAlmacen.Items.Clear()
'If DtSubptoyecto.Rows.Count > 0 Then 'If DtSubptoyecto.Rows.Count > 0 Then
'Dim CveSucursal As Integer = DtSubptoyecto(0)("CveSucursal").ToString.ToEntero 'Dim CveSucursal As Integer = DtSubptoyecto(0)("CveSucursal").ToString.ToEntero
DdlAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa).FiltraParametros(String.Format("CveSubProyecto={0}", DdlSubProyecto.SelectedValue.ToEntero)) DdlAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveTipoAlmacen:=-1).FiltraParametros(String.Format("CveSubProyecto={0}", DdlSubProyecto.SelectedValue.ToEntero))
DdlAlmacen.DataBind() DdlAlmacen.DataBind()
DdlAlmacen.Items.Insert(0, New ListItem("Todos", "-1")) DdlAlmacen.Items.Insert(0, New ListItem("Todos", "-1"))
'Else 'Else
' DdlAlmacen.DataSource = Nothing ' DdlAlmacen.DataSource = Nothing
' DdlAlmacen.DataBind() ' DdlAlmacen.DataBind()
@@ -195,7 +195,8 @@ Partial Class Inventarios_RepMaximoMinimo
Private Sub LnkDefinir_Click(sender As Object, e As EventArgs) Handles LnkDefinir.Click Private Sub LnkDefinir_Click(sender As Object, e As EventArgs) Handles LnkDefinir.Click
HFDefinir.Value = "I" HFDefinir.Value = "I"
DdlAlmacenModal.SelectedIndex = 0 DdlAlmacenModal.SelectedIndex = 0
DdlPSModal.SelectedIndex = 0 DdlPSModal.SelectedValue = "-1"
DdlPSModal.SelectedText = "Seleccione"
TxtMaximo.Text = "" TxtMaximo.Text = ""
TxtMinimo.Text = "" TxtMinimo.Text = ""
DdlAlmacenModal.Enabled = True DdlAlmacenModal.Enabled = True
@@ -206,20 +207,26 @@ Partial Class Inventarios_RepMaximoMinimo
End Sub End Sub
Private Sub LbAgregarMaximoMinimo_Click(sender As Object, e As EventArgs) Handles LbAgregarMaximoMinimo.Click Private Sub LbAgregarMaximoMinimo_Click(sender As Object, e As EventArgs) Handles LbAgregarMaximoMinimo.Click
Dim ObjInventario As New ClsInventarios If DdlPSModal.SelectedValue.ToEntero > 0 Then
If HFDefinir.Value = "I" Then
If ObjInventario.AddAlmacenMaximoMinimo(DdlAlmacenModal.SelectedValue.ToEntero, DdlPSModal.SelectedValue.ToEntero, TxtMaximo.Text.ToDouble, TxtMinimo.Text.ToDouble, UsuarioActual.CveUsuario) Then
Alert("El Máximo/Mínimo se agregó correctamente.", TipoMensaje.MsgInformacion)
End If
ElseIf HFDefinir.Value = "U" Then
If ObjInventario.UpdateAlmacenMaximoMinimo(DdlAlmacenModal.SelectedValue.ToEntero, DdlPSModal.SelectedValue.ToEntero, TxtMaximo.Text.ToDouble, TxtMinimo.Text.ToDouble, UsuarioActual.CveUsuario) Then
Alert("El Máximo/Mínimo se actualizó correctamente.", TipoMensaje.MsgInformacion)
End If
End If
CargaGrid() Using ObjInventario As New ClsInventarios
RegistraScript(String.Format("$('#{0}').modal('hide');", "ModalMaximoMinimo"))
ObjInventario.Dispose() If HFDefinir.Value = "I" Then
If ObjInventario.AddAlmacenMaximoMinimo(DdlAlmacenModal.SelectedValue.ToEntero, DdlPSModal.SelectedValue.ToEntero, TxtMaximo.Text.ToDouble, TxtMinimo.Text.ToDouble, UsuarioActual.CveUsuario) Then
Alert("El Máximo/Mínimo se agregó correctamente.", TipoMensaje.MsgInformacion)
End If
ElseIf HFDefinir.Value = "U" Then
If ObjInventario.UpdateAlmacenMaximoMinimo(DdlAlmacenModal.SelectedValue.ToEntero, DdlPSModal.SelectedValue.ToEntero, TxtMaximo.Text.ToDouble, TxtMinimo.Text.ToDouble, UsuarioActual.CveUsuario) Then
Alert("El Máximo/Mínimo se actualizó correctamente.", TipoMensaje.MsgInformacion)
End If
End If
End Using
CargaGrid()
RegistraScript(String.Format("$('#{0}').modal('hide');", "ModalMaximoMinimo"))
Else
Alert("Seleccione un producto o servicio", TipoMensaje.MsgAdvertencia)
End If
End Sub End Sub
Protected Sub UpdateMaximoMinimo(sender As Object, e As EventArgs) Protected Sub UpdateMaximoMinimo(sender As Object, e As EventArgs)
@@ -227,13 +234,15 @@ Partial Class Inventarios_RepMaximoMinimo
HFDefinir.Value = "U" HFDefinir.Value = "U"
Dim CveAlmacen As Integer = GvRow.DataKey("CveAlmacen").ToString.ToEntero Dim CveAlmacen As Integer = GvRow.DataKey("CveAlmacen").ToString.ToEntero
Dim CvePS As Integer = GvRow.DataKey("CvePS").ToString.ToEntero Dim CvePS As Integer = GvRow.DataKey("CvePS").ToString.ToEntero
Dim strPS As String = GvRow.DataKey("PS").ToString()
Dim Maximo As String = GvRow.DataKey("Maximo").ToString Dim Maximo As String = GvRow.DataKey("Maximo").ToString
Dim Minimo As String = GvRow.DataKey("Minimo").ToString Dim Minimo As String = GvRow.DataKey("Minimo").ToString
DdlAlmacenModal.Enabled = False DdlAlmacenModal.Enabled = False
DdlPSModal.Enabled = False DdlPSModal.Enabled = False
DdlAlmacenModal.SelectedValue = CveAlmacen.ToString DdlAlmacenModal.SelectedValue = CveAlmacen.ToString()
DdlPSModal.SelectedText = strPS
DdlPSModal.SelectedValue = CvePS.ToString DdlPSModal.SelectedValue = CvePS.ToString
TxtMaximo.Text = Maximo TxtMaximo.Text = Maximo
TxtMinimo.Text = Minimo TxtMinimo.Text = Minimo

8
RH/Personal.aspx
View File

@@ -1284,11 +1284,15 @@
<i></i> <i></i>
</div> </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"> <div class="form-group form-md-line-input input-iconright">
<asp:DropDownList ID="DdlRegimenContratacion" runat="server" AppendDataBoundItems="true" DataTextField="RegimenContratacion" CssClass="form-control input-sm select2me" DataValueField="CveSATRegimenContratacion" ValidationGroup="GrpGuardar"> <asp:DropDownList ID="DdlRegimenContratacion" runat="server" AppendDataBoundItems="true" DataTextField="RegimenContratacion" CssClass="form-control input-sm select2me" DataValueField="CveSATRegimenContratacion" ValidationGroup="GrpGuardar">
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem> <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
</asp:DropDownList> </asp:DropDownList>
<asp:Label runat="server" AssociatedControlID="DdlRegimenContratacion" Text="Mail recibo nómina:"></asp:Label> <asp:Label runat="server" AssociatedControlID="DdlRegimenContratacion" Text="Régimen Contratación:"></asp:Label>
<asp:RequiredFieldValidator ID="RFVRegimenContratacion" runat="server" ControlToValidate="DdlRegimenContratacion" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Régimen Contratación''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ID="RFVRegimenContratacion" runat="server" ControlToValidate="DdlRegimenContratacion" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Régimen Contratación''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
<i></i> <i></i>
</div> </div>
@@ -1311,6 +1315,7 @@
<br /> <br />
<asp:CheckBox ID="ChkSeInscribioSS" CssClass="make-switchsd" data-size="small" runat="server" Text="" /> <asp:CheckBox ID="ChkSeInscribioSS" CssClass="make-switchsd" data-size="small" runat="server" Text="" />
</div> </div>
<asp:Panel runat="server" ID="PnlSalarios" Visible="false">
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtSalarioDiario" Enabled ="false" runat="server" MaxLength="10"></asp:TextBox> <asp:TextBox CssClass="form-control" ID="TxtSalarioDiario" Enabled ="false" runat="server" MaxLength="10"></asp:TextBox>
@@ -1340,6 +1345,7 @@
<i></i> <i></i>
</asp:Panel> </asp:Panel>
</asp:Panel>
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtBono" runat="server" MaxLength="10" Text="0"></asp:TextBox> <asp:TextBox CssClass="form-control" ID="TxtBono" runat="server" MaxLength="10" Text="0"></asp:TextBox>

4
RH/Personal.aspx.vb
View File

@@ -782,7 +782,7 @@ Partial Class RH_Personal
pnlSalarioIMSS.Visible = False pnlSalarioIMSS.Visible = False
End If End If
' '
PnlSalarios.Visible = UsuarioActual.Empresa.Funcionalidad(701) = "1"
ViewState("Orden") = "" ViewState("Orden") = ""
ViewState("Orden1") = "" ViewState("Orden1") = ""
@@ -1340,7 +1340,7 @@ Partial Class RH_Personal
ChkEstemporal.Checked = ObjPersonal.DtResultados.Rows(0)("esTemporal").ToString() = "1" ChkEstemporal.Checked = ObjPersonal.DtResultados.Rows(0)("esTemporal").ToString() = "1"
CHKRFCValidado.Checked = ObjPersonal.DtResultados.Rows(0)("RFCValidado").ToString() = "1" CHKRFCValidado.Checked = ObjPersonal.DtResultados.Rows(0)("RFCValidado").ToString() = "1"
TxtMailrecibonomina.Text = ObjPersonal.DtResultados.Rows(0)("MaiReciboNomina").ToString()
'Carga Datos Personales 'Carga Datos Personales
LtlPersonal.Text = ObjPersonal.NombreCompleto LtlPersonal.Text = ObjPersonal.NombreCompleto
NombreCompleto = ObjPersonal.NombreCompleto NombreCompleto = ObjPersonal.NombreCompleto

2
vwd.webinfo
View File

@@ -88,6 +88,8 @@