This commit is contained in:
rakcsle
2022-09-07 08:33:53 -07:00
7 changed files with 103 additions and 88 deletions

View File

@@ -9969,7 +9969,7 @@ Public Class ClsPaginas
Pago.CveConceptoPago = If(Pago.CveConceptoPago = -1, 2, Pago.CveConceptoPago) 'si viene en parametro lo toma com primera opcion, sino el 2 Pago.CveConceptoPago = If(Pago.CveConceptoPago = -1, 2, Pago.CveConceptoPago) 'si viene en parametro lo toma com primera opcion, sino el 2
If VentaActual.CveMoneda <> 1 Then If VentaActual.CveMoneda <> 1 Then
If Pago.TipoPago = "NC" Then Pago.CveConceptoPago = 301 : Pago.CveConceptoPago = 292 If Pago.TipoPago = "NC" Then Pago.CveConceptoPago = 301 Else Pago.CveConceptoPago = 292
End If End If
Dim Concepto As String = String.Format("{0} F:{1}", VentaActual.ClienteNombre, VentaActual.SerieFolio) Dim Concepto As String = String.Format("{0} F:{1}", VentaActual.ClienteNombre, VentaActual.SerieFolio)
@@ -10000,12 +10000,12 @@ Public Class ClsPaginas
If VentaActual.CveMoneda > 1 Then ImporteME = Pago.ImportePagoVenta If VentaActual.CveMoneda > 1 Then ImporteME = Pago.ImportePagoVenta
'movimiento de pago cliente 'movimiento de pago cliente
If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, Pago.ImportePagoVenta, Pago.ImportePagoVenta, Pago.CveConceptoPago, VentaActual.SerieFolio, Concepto, VentaActual.IdCtaContableCliente, CveVenta:=VentaActual.CveVenta, CveCliente:=VentaActual.CveCliente, CveIE:=Pago.CveIE, CvePersonal:=Pago.CvePersonal, CveVentaAmortizacion:=Pago.CveVentaAmortizacion, TipoCambio:=TCValuacion, TipoCambioPago:=Pago.TCPago, ImporteME:=ImporteME) Then ErrorMovtos = True If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, Pago.ImportePagoVenta, Pago.ImportePagoVenta, Pago.CveConceptoPago, VentaActual.SerieFolio, Concepto, VentaActual.IdCtaContableCliente, CveVenta:=VentaActual.CveVenta, CveCliente:=VentaActual.CveCliente, CveIE:=Pago.CveIE, CvePersonal:=Pago.CvePersonal, CveVentaAmortizacion:=Pago.CveVentaAmortizacion, TipoCambio:=TCValuacionVenta, TipoCambioPago:=Pago.TCPago, ImporteME:=ImporteME) Then ErrorMovtos = True
'movimiento de pago cliente Complementaria 'movimiento de pago cliente Complementaria
If Not ErrorMovtos AndAlso VentaActual.CveMoneda > 1 Then If Not ErrorMovtos AndAlso VentaActual.CveMoneda > 1 Then
If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, Pago.ImportePagoVenta, (ImporteME * TCValuacion - ImporteME).RoundSQL, CveConceptoContableComplementaria, VentaActual.SerieFolio, Concepto, VentaActual.IdCtaContableClienteComplementaria, CveVenta:=VentaActual.CveVenta, CveCliente:=VentaActual.CveCliente, CveIE:=Pago.CveIE, CvePersonal:=Pago.CvePersonal, CveVentaAmortizacion:=Pago.CveVentaAmortizacion, TipoCambio:=TCValuacion, TipoCambioPago:=Pago.TCPago, ImporteME:=ImporteME) Then ErrorMovtos = True If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, Pago.ImportePagoVenta, (ImporteME * TCValuacion - ImporteME).RoundSQL, CveConceptoContableComplementaria, VentaActual.SerieFolio, Concepto, VentaActual.IdCtaContableClienteComplementaria, CveVenta:=VentaActual.CveVenta, CveCliente:=VentaActual.CveCliente, CveIE:=Pago.CveIE, CvePersonal:=Pago.CvePersonal, CveVentaAmortizacion:=Pago.CveVentaAmortizacion, TipoCambio:=TCValuacionVenta, TipoCambioPago:=Pago.TCPago, ImporteME:=ImporteME) Then ErrorMovtos = True
End If End If
@@ -10150,13 +10150,13 @@ Public Class ClsPaginas
End If End If
If Not ErrorMovtos AndAlso VentaActual.TC <> Pago.TCPago Then If Not ErrorMovtos AndAlso TCValuacionVenta <> TCValuacionPago Then
Dim ConceptoContable, IdCtaContable As Integer Dim ConceptoContable, IdCtaContable As Integer
Dim TipoMovimiento As Boolean Dim TipoMovimiento As Boolean
Dim Diferencia As Decimal = 0 Dim Diferencia As Decimal = 0
If tImporteVenta <> tImportePago Then If tImporteVenta <> tImportePago Then
If tImporteVenta > tImportePago Then If tImporteVenta < tImportePago Then
ConceptoContable = 64 : IdCtaContable = UsuarioActual.Empresa.IdCuentaGananciaCambiaria ConceptoContable = 64 : IdCtaContable = UsuarioActual.Empresa.IdCuentaGananciaCambiaria
TipoMovimiento = True TipoMovimiento = True
Else Else

View File

@@ -1741,7 +1741,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
CveEstatusPersonal As Integer, CveSubProyecto As Integer, CveClienteAsignado As Integer, HorarioTrabajo As String, CveSupervisor As Integer, CveEstatusPersonal As Integer, CveSubProyecto As Integer, CveClienteAsignado As Integer, HorarioTrabajo As String, CveSupervisor As Integer,
CveTipoPeriodo As Integer, CveMetodoPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer, CveTipoPeriodo As Integer, CveMetodoPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer,
FechaIFinContrato As String, FechaFFinContrato As String, FechaIIngreso As String, FechaFIngreso As String, SqlStr As String, NCaracteristicas As Integer, FechaIFinContrato As String, FechaFFinContrato As String, FechaIIngreso As String, FechaFIngreso As String, SqlStr As String, NCaracteristicas As Integer,
CveEmpresa As Integer, Optional TopSelect As Integer = 10000) As Boolean CveEmpresa As Integer, Optional TopSelect As Integer = 10000, Optional EsReserva As Integer = -1) As Boolean
Dim Retorno As Boolean = False Dim Retorno As Boolean = False
SqlDataAdapter("PA_RH_Personal2Get") SqlDataAdapter("PA_RH_Personal2Get")
@@ -1777,6 +1777,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
.Add("@NCaracteristicas", SqlDbType.Int).Value = NCaracteristicas .Add("@NCaracteristicas", SqlDbType.Int).Value = NCaracteristicas
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@TopSelect", SqlDbType.Int).Value = TopSelect .Add("@TopSelect", SqlDbType.Int).Value = TopSelect
.Add("@EsReserva", SqlDbType.Int).Value = EsReserva
End With End With
Try Try

View File

@@ -871,7 +871,7 @@ Partial Class Bancos_ProveedoresAbonar
Pago.OtroGastoIngreso = 0 Pago.OtroGastoIngreso = 0
End If End If
If AplicaPrePolizaPago(CompraActual, Pago, CvePrePoliza, ObjMov) Then If AplicaPrePolizaPagoCompra(CompraActual, Pago, CvePrePoliza, ObjMov) Then
MsgError = "No se pudo insertar la póliza" MsgError = "No se pudo insertar la póliza"
End If End If

View File

@@ -553,12 +553,12 @@ Partial Class Inventarios_RecepcionAlmacen
BtnGuardar.Visible = False BtnGuardar.Visible = False
TxtFecha.Text = Now.ToShortDateString TxtFecha.Text = Now.ToShortDateString
RVFecha.MaximumValue = MaxFecha.ToShortDateString
If UsuarioActual.CveEmpresa.Contiene(119) Then RVFecha.MinimumValue = Now.ToShortDateString : CEFecha.StartDate = Now Else RVFecha.MinimumValue = MinFecha.ToShortDateString If UsuarioActual.CveEmpresa.Contiene(119) Then RVFecha.MinimumValue = Now.ToShortDateString : CEFecha.StartDate = Now Else RVFecha.MinimumValue = MinFecha.ToShortDateString
InicializaBitacoraTemporal() InicializaBitacoraTemporal()
DdlMonedaTC.Enabled = False DdlMonedaTC.Enabled = False
RVFecha.MaximumValue = Now.ToShortDateString
CEFecha.EndDate = Now
End Sub End Sub
''' <summary> ''' <summary>

View File

@@ -4,8 +4,8 @@
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style> <style>
#C_GvCaracteristicas_LtlCaracteristica_0{ #C_GvCaracteristicas_LtlCaracteristica_0 {
min-width: 275px!important; min-width: 275px !important;
} }
</style> </style>
</asp:Content> </asp:Content>
@@ -133,86 +133,100 @@
</tr> </tr>
<tr> <tr>
<td class="text-right"><b>Estatus:</b></td> <td class="text-right"><b>Estatus:</b></td>
<td colspan="5"> <td>
<asp:DropDownList ID="DdlEstatus" runat="server" AppendDataBoundItems="true" DataTextField="EstatusPersonal" DataValueField="CveEstatusPersonal" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 100px !important;"> <asp:DropDownList ID="DdlEstatus" runat="server" AppendDataBoundItems="true" DataTextField="EstatusPersonal" DataValueField="CveEstatusPersonal" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 100px !important;">
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem> <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
</asp:DropDownList> </asp:DropDownList>
</td> </td>
<td class="text-right"><b>clasificación:</b></td>
<td>
<asp:DropDownList ID="ddlclasificacion" runat="server" Width="100%" CssClass="select2me" AppendDataBoundItems="true" DataTextField="Genero" DataValueField="CveGenero" ValidationGroup="GrpGuardar">
<asp:ListItem Text="Todos" Value="-1" Selected="True" ></asp:ListItem>
<asp:ListItem Text="Activos" Value="0"></asp:ListItem>
<asp:ListItem Text="Reserva" Value="1"></asp:ListItem>
</asp:DropDownList>
</td>
<td></td>
<td></td>
</tr> </tr>
<tr style="vertical-align:top;"><td colspan="2"> <tr style="vertical-align: top;">
<td colspan="2">
<asp:GridView ID="GvCrt1" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False" <asp:GridView ID="GvCrt1" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False"> DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
<Columns> <Columns>
<asp:TemplateField> <asp:TemplateField>
<ItemStyle BorderStyle="None" /> <ItemStyle BorderStyle="None" />
<ItemTemplate> <ItemTemplate>
<asp:Panel ID="PnlClasif" Visible="False" runat="server"> <asp:Panel ID="PnlClasif" Visible="False" runat="server">
<div style="width: 100%" class="SubTotales"> <div style="width: 100%" class="SubTotales">
<b><asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b> <b>
</div> <asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
</asp:Panel>
<div style="width:105px!important; display: inline-block; text-align:right;">
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>&nbsp;
</div> </div>
<div style="display: inline-block;"> </asp:Panel>
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField ="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm" ></asp:DropDownList> <div style="width: 105px!important; display: inline-block; text-align: right;">
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox> <asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>&nbsp;
</div> </div>
</ItemTemplate> <div style="display: inline-block;">
</asp:TemplateField> <asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm"></asp:DropDownList>
</Columns> <asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
</asp:GridView> </div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</td> </td>
<td colspan="2"> <td colspan="2">
<asp:GridView ID="GvCrt2" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False" <asp:GridView ID="GvCrt2" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False"> DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
<Columns> <Columns>
<asp:TemplateField> <asp:TemplateField>
<ItemStyle BorderStyle="None" /> <ItemStyle BorderStyle="None" />
<ItemTemplate> <ItemTemplate>
<asp:Panel ID="PnlClasif" Visible="False" runat="server"> <asp:Panel ID="PnlClasif" Visible="False" runat="server">
<div style="width: 100%" class="SubTotales"> <div style="width: 100%" class="SubTotales">
<b><asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b> <b>
</div> <asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
</asp:Panel>
<div style="width:110px!important; display: inline-block;">
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
</div> </div>
<div style="display: inline-block;"> </asp:Panel>
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField ="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm" ></asp:DropDownList> <div style="width: 110px!important; display: inline-block;">
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox> <asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
</div> </div>
</ItemTemplate> <div style="display: inline-block;">
</asp:TemplateField> <asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm"></asp:DropDownList>
</Columns> <asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
</asp:GridView> </div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</td> </td>
<td colspan="2"> <td colspan="2">
<asp:GridView ID="GvCrt3" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False" <asp:GridView ID="GvCrt3" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False"> DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
<Columns> <Columns>
<asp:TemplateField> <asp:TemplateField>
<ItemStyle BorderStyle="None" /> <ItemStyle BorderStyle="None" />
<ItemTemplate> <ItemTemplate>
<asp:Panel ID="PnlClasif" Visible="False" runat="server"> <asp:Panel ID="PnlClasif" Visible="False" runat="server">
<div style="width: 100%" class="SubTotales"> <div style="width: 100%" class="SubTotales">
<b><asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b> <b>
</div> <asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
</asp:Panel>
<div style="width:110px!important; display: inline-block; text-align:right;">
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
</div> </div>
<div style="display: inline-block;"> </asp:Panel>
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField ="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm" ></asp:DropDownList> <div style="width: 110px!important; display: inline-block; text-align: right;">
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox> <asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
</div> </div>
</ItemTemplate> <div style="display: inline-block;">
</asp:TemplateField> <asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm"></asp:DropDownList>
</Columns> <asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
</asp:GridView> </div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</td> </td>
</tr> </tr>
@@ -226,7 +240,7 @@
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional"> <asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
<table id="TblBusqueda" runat="server" border="0" visible="false"> <table id="TblBusqueda" runat="server" border="0" visible="false">
<tr> <tr>

View File

@@ -166,7 +166,7 @@ Partial Class RH_PopUpBuscarPersonal
If ObjPersonal.GetPersonal2(-1, Codigo, Nombre, NSS, RFC, DdlTurnos.SelectedValue.ToEntero, DdlPuestos.SelectedValue.ToEntero, DdlDepartamentos.SelectedValue.ToEntero, If ObjPersonal.GetPersonal2(-1, Codigo, Nombre, NSS, RFC, DdlTurnos.SelectedValue.ToEntero, DdlPuestos.SelectedValue.ToEntero, DdlDepartamentos.SelectedValue.ToEntero,
DdlRuta.SelectedValue.ToEntero, DdlEscolaridad.SelectedValue.ToEntero, DdlEstadoCivil.SelectedValue.ToEntero, DdlGenero.SelectedValue.ToEntero, DdlRuta.SelectedValue.ToEntero, DdlEscolaridad.SelectedValue.ToEntero, DdlEstadoCivil.SelectedValue.ToEntero, DdlGenero.SelectedValue.ToEntero,
DdlEstatus.SelectedValue.ToEntero, DdlSubProyecto.SelectedValue.ToEntero, DdlClienteAsignado.SelectedValue.ToEntero, Horario, CveSupervisor, DdlEstatus.SelectedValue.ToEntero, DdlSubProyecto.SelectedValue.ToEntero, DdlClienteAsignado.SelectedValue.ToEntero, Horario, CveSupervisor,
-1, -1, -1, -1, -1, "-1", "-1", "-1", "-1", StrFiltroCaracteristica, 1, UsuarioActual.CveEmpresa) Then -1, -1, -1, -1, -1, "-1", "-1", "-1", "-1", StrFiltroCaracteristica, 1, UsuarioActual.CveEmpresa, EsReserva:=ddlclasificacion.SelectedValue.ToEntero()) Then
If ObjPersonal.DtResultados.Rows.Count > 0 Then If ObjPersonal.DtResultados.Rows.Count > 0 Then
LtlTotalRegistros.Text = ObjPersonal.DtResultados.Rows.Count.ToString.FormatoNumero(0) LtlTotalRegistros.Text = ObjPersonal.DtResultados.Rows.Count.ToString.FormatoNumero(0)
GV.DataSource = ObjPersonal.DtResultados GV.DataSource = ObjPersonal.DtResultados

View File

@@ -563,7 +563,9 @@ Public Class WSApp
Salida.Cliente = ObjClientes.Nombre Salida.Cliente = ObjClientes.Nombre
Salida.CvePrecioLista = ObjClientes.CvePrecioLista Salida.CvePrecioLista = ObjClientes.CvePrecioLista
Salida.CveEstatusCliente = If(ObjClientes.Estatus, 1, 0) Salida.CveEstatusCliente = If(ObjClientes.Estatus, 1, 0)
If ObjClientes.CveSubProyecto > 0 Then
Salida.CveSubProyecto = ObjClientes.CveSubProyecto
End If
retorno = JsonConvert.SerializeObject(Salida) retorno = JsonConvert.SerializeObject(Salida)
End If End If
Else Else
@@ -655,15 +657,13 @@ Public Class WSApp
Return If(TieneError, "{}", retorno.ToString()) Return If(TieneError, "{}", retorno.ToString())
End Function End Function
<WebMethod()> <WebMethod()>
Public Function GetListaPedidos(CveCliente As Integer, CveUsuario As Integer) As String Public Function GetListaPedidos(CveCliente As Integer, CveUsuario As Integer,FechaI As String, FechaF As String) As String
Dim retorno = "[]" Dim retorno = "[]"
Dim Serie As String = "-1" Dim Serie As String = "-1"
Dim Folio As Integer = -1 Dim Folio As Integer = -1
Dim Codigo As String = "-1" Dim Codigo As String = "-1"
Dim Cliente As String = "-1" Dim Cliente As String = "-1"
Dim FechaI As String = "-1"
Dim FechaF As String = "-1"
Dim FolioFiscal As String = "-1" Dim FolioFiscal As String = "-1"
Dim PeidoContrato As String = "-1" Dim PeidoContrato As String = "-1"
Dim OrdenCompra As String = "-1" Dim OrdenCompra As String = "-1"