This commit is contained in:
Jorge Luis caudillo esparza
2025-07-17 00:47:36 -07:00
5 changed files with 810 additions and 919 deletions

View File

@@ -114,7 +114,7 @@
<asp:TextBox ID="TxtConvenio" runat="server" MaxLength="18" Width="200px"></asp:TextBox></td>
</tr>
<tr id="TrConvenioNomina" runat="server" visible="false">
<td>Convenio:</td>
<td>Convenio Nómina:</td>
<td>
<asp:TextBox ID="TxtConvenioNomina" runat="server" MaxLength="18" Width="200px"></asp:TextBox></td>
</tr>

File diff suppressed because it is too large Load Diff

View File

@@ -16,7 +16,7 @@ Partial Class Compras_Proveedores
#Region "P R O P I E D A D E S"
Private ReadOnly Property CveProveedor As Integer
Get
Return ViewState("CveProveedor").ToString.ToEntero
Return IfNull(ViewState("CveProveedor"), -1).ToString.ToEntero()
End Get
End Property
Public ReadOnly Property ProveedorID As Integer
@@ -606,8 +606,6 @@ Partial Class Compras_Proveedores
If UsuarioActual.TienePermisoProceso(88) Then BtnGuardar.Visible = True 'agregar/Nuevo proveedor
ScriptManager.RegisterStartupScript(Me, Me.GetType, "Ll", "pageLoad();", True)
If UsuarioActual.Empresa.CvePlataforma = 2 Then
DivFiscal.Visible = False
'divportalusuarios.Visible = False
@@ -5932,51 +5930,121 @@ Partial Class Compras_Proveedores
End Sub
Protected Sub BtnCargaHistorial_Click(sender As Object, e As EventArgs) Handles BtnCargaHistorial.Click
If ViewState("YaEjecutadoHistorial") IsNot Nothing AndAlso CBool(ViewState("YaEjecutadoHistorial")) Then
' Ya se ejecutó, evita doble acción
Exit Sub
End If
' Marca que ya se ejecutó
ViewState("YaEjecutadoHistorial") = True
If CveProveedor > 0 Then
CargaHistorial(CveProveedorSucursal) ' <-- Tu método de carga
UpnHistorial.Update() ' <-- UpdatePanel de Historial
CargaHistorial(CveProveedorSucursal)
UpnResumenHistorial.Update()
UpnHistorial.Update()
UpBtnsTab.Update()
End If
End Sub
Protected Sub BtnCargaCxP_Click(sender As Object, e As EventArgs) Handles BtnCargaCxP.Click
If ViewState("YaEjecutadoCxP") IsNot Nothing AndAlso CBool(ViewState("YaEjecutadoCxP")) Then
' Ya se ejecutó, evita doble acción
Exit Sub
End If
' Marca que ya se ejecutó
ViewState("YaEjecutadoCxP") = True
If CveProveedor > 0 Then
CargaCxP(CveProveedorSucursal) ' <-- Tu método de carga
UPPCxP.Update() ' <-- UpdatePanel de CxP
UpBtnsTab.Update()
End If
End Sub
Protected Sub BtnCargaAnticipos_Click(sender As Object, e As EventArgs) Handles BtnCargaAnticipos.Click
If ViewState("YaEjecutadoAnticipos") IsNot Nothing AndAlso CBool(ViewState("YaEjecutadoAnticipos")) Then
' Ya se ejecutó, evita doble acción
Exit Sub
End If
' Marca que ya se ejecutó
ViewState("YaEjecutadoAnticipos") = True
If CveProveedor > 0 Then
CargaAnticipos(CveProveedorSucursal) ' <-- Tu método de carga
UpAnticipos.Update() ' <-- UpdatePanel de Anticipos
UpBtnsTab.Update()
End If
End Sub
Protected Sub BtnCargaBancos_Click(sender As Object, e As EventArgs) Handles BtnCargaBancos.Click
If ViewState("YaEjecutadoBancos") IsNot Nothing AndAlso CBool(ViewState("YaEjecutadoBancos")) Then
' Ya se ejecutó, evita doble acción
Exit Sub
End If
' Marca que ya se ejecutó
ViewState("YaEjecutadoBancos") = True
If CveProveedor > 0 Then
CargaBancos(CveProveedorSucursal) ' <-- Tu método de carga
UpBancos.Update() ' <-- UpdatePanel de Bancos
UpBtnsTab.Update()
End If
End Sub
Protected Sub BtnCargaOC_Click(sender As Object, e As EventArgs) Handles BtnCargaOC.Click
If ViewState("YaEjecutadoOC") IsNot Nothing AndAlso CBool(ViewState("YaEjecutadoOC")) Then
' Ya se ejecutó, evita doble acción
Exit Sub
End If
' Marca que ya se ejecutó
ViewState("YaEjecutadoOC") = True
If CveProveedor > 0 Then
CargaOC() ' <-- Tu método de carga
UpOC.Update() ' <-- UpdatePanel de OC
UpBtnsTab.Update()
End If
End Sub
Protected Sub BtnCargaDocs_Click(sender As Object, e As EventArgs) Handles BtnCargaDocs.Click
If ViewState("YaEjecutadoDocs") IsNot Nothing AndAlso CBool(ViewState("YaEjecutadoDocs")) Then
' Ya se ejecutó, evita doble acción
Exit Sub
End If
' Marca que ya se ejecutó
ViewState("YaEjecutadoDocs") = True
If CveProveedor > 0 Then
CargaDocs() ' <-- Tu método de carga
UpDocumentos.Update() ' <-- UpdatePanel de Documentos
UpBtnsTab.Update()
End If
End Sub
Protected Sub BtnCargaPortal_Click(sender As Object, e As EventArgs) Handles BtnCargaPortal.Click
If ViewState("YaEjecutadoPortal") IsNot Nothing AndAlso CBool(ViewState("YaEjecutadoPortal")) Then
' Ya se ejecutó, evita doble acción
Exit Sub
End If
' Marca que ya se ejecutó
ViewState("YaEjecutadoPortal") = True
If CveProveedor > 0 Then
CargaUsuariosPortalProveedor() ' <-- Tu método de carga
UpGvUsuarios.Update() ' <-- UpdatePanel de Portal/Usuarios
UpBtnsTab.Update()
End If
End Sub
End Class

View File

@@ -143,7 +143,7 @@
</div>
<div class="portlet-body" style="display: flex; align-items: center; gap: 10px; width: 100%;">
<div class="form-group form-md-line-input input-iconright" style="width: 150px;">
<asp:TextBox ID="TxtTipoCambio" CssClass="form-control" runat="server" MaxLength="50"></asp:TextBox>
<asp:TextBox ID="TxtTipoCambio" CssClass="form-control" runat="server" MaxLength="10"></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTETipoCambio" runat="server" TargetControlID="TxtTipoCambio" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtTipoCambio.ClientID.ToString()%>">Tipo de Cambio:</label>
<asp:RequiredFieldValidator
@@ -390,21 +390,21 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-4" Text="Placa:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize" style="width: 300px;">
<asp:TextBox ID="TxtPlaca" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtPlaca" runat="server" CssClass="form-control input-sm" MaxLength="10" Width="100%" Text=""></asp:TextBox>
<label for="<%= TxtPlaca.ClientID.ToString()%>"></label>
</div>
</div>
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-4" Text="SCAC:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize" style="width: 300px;">
<asp:TextBox ID="TxtSCAC" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtSCAC" runat="server" CssClass="form-control input-sm" MaxLength="50" Width="100%" Text=""></asp:TextBox>
<label for="<%= TxtSCAC.ClientID.ToString()%>"></label>
</div>
</div>
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-4" Text="CAAT:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize" style="width: 300px;">
<asp:TextBox ID="TxtCAAT" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtCAAT" runat="server" CssClass="form-control input-sm" MaxLength="50" Width="100%" Text=""></asp:TextBox>
<label for="<%= TxtCAAT.ClientID.ToString()%>"></label>
</div>
</div>
@@ -444,21 +444,21 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-3" Text="Sello 1:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize" style="width: 300px;">
<asp:TextBox ID="TxtSello1" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtSello1" runat="server" CssClass="form-control input-sm" MaxLength="10" Width="100%" Text=""></asp:TextBox>
<label for="<%= TxtSello1.ClientID.ToString()%>"></label>
</div>
</div>
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-3" Text="Sello 2:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize" style="width: 300px;">
<asp:TextBox ID="TxtSello2" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtSello2" runat="server" CssClass="form-control input-sm" MaxLength="10" Width="100%" Text=""></asp:TextBox>
<label for="<%= TxtSello2.ClientID.ToString()%>"></label>
</div>
</div>
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-3" Text="Sello 3:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize" style="width: 300px;">
<asp:TextBox ID="TxtSello3" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtSello3" runat="server" CssClass="form-control input-sm" MaxLength="10" Width="100%" Text=""></asp:TextBox>
<label for="<%= TxtSello3.ClientID.ToString()%>"></label>
</div>
</div>
@@ -506,7 +506,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Transp.:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtIncFletes" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtIncFletes" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEIncFletes" runat="server" TargetControlID="TxtIncFletes" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtIncFletes.ClientID.ToString()%>"></label>
</div>
@@ -514,7 +514,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Seguros:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtIncSeguro" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtIncSeguro" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEIncSeguro" runat="server" TargetControlID="TxtIncSeguro" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtIncSeguro.ClientID.ToString()%>"></label>
</div>
@@ -522,7 +522,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Embalaje:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtIncEmbalajes" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtIncEmbalajes" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEIncEmbalajes" runat="server" TargetControlID="TxtIncEmbalajes" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtIncEmbalajes.ClientID.ToString()%>"></label>
</div>
@@ -530,7 +530,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Costo Envases:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtIncEmbalaje" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtIncEmbalaje" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEIncEmbalaje" runat="server" TargetControlID="TxtIncEmbalaje" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtIncEmbalaje.ClientID.ToString()%>"></label>
</div>
@@ -538,7 +538,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Conexos:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtIncConexos" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtIncConexos" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEIncConexos" runat="server" TargetControlID="TxtIncConexos" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtIncConexos.ClientID.ToString()%>"></label>
</div>
@@ -574,7 +574,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Transp.:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtDecFlete" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtDecFlete" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEDecFlete" runat="server" TargetControlID="TxtDecFlete" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtDecFlete.ClientID.ToString()%>"></label>
</div>
@@ -582,7 +582,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Seguros:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtDecSeguro" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtDecSeguro" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEDecSeguro" runat="server" TargetControlID="TxtDecSeguro" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtDecSeguro.ClientID.ToString()%>"></label>
</div>
@@ -590,7 +590,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Carga:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtDecCarga" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtDecCarga" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEDecCarga" runat="server" TargetControlID="TxtDecCarga" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtDecCarga.ClientID.ToString()%>"></label>
</div>
@@ -598,7 +598,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Gastos Descarga:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtDecDescarga" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtDecDescarga" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEDecDescarga" runat="server" TargetControlID="TxtDecDescarga" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtDecDescarga.ClientID.ToString()%>"></label>
</div>
@@ -606,7 +606,7 @@
<div class="form-group row" style="width: 100%;">
<asp:Label runat="server" CssClass="col-sm-6" Text="Otros Gastos:"></asp:Label>
<div class="form-group form-md-line-input linewhitsize col-md-5">
<asp:TextBox ID="TxtDecOtros" runat="server" CssClass="form-control input-sm" MaxLength="300" Width="100%" Text=""></asp:TextBox>
<asp:TextBox ID="TxtDecOtros" runat="server" CssClass="form-control input-sm" MaxLength="12" Width="100%" Text=""></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FTEDecOtros" runat="server" TargetControlID="TxtDecOtros" FilterType="Custom, Numbers" ValidChars="." />
<label for="<%= TxtDecOtros.ClientID.ToString()%>"></label>
</div>

View File

@@ -2373,6 +2373,15 @@ Partial Class Ventas
ViewState("EsNCDevolucionEfectivo") = value
End Set
End Property
Private Property UsaProductoAlterno As Boolean
Get
Return CBool(IfNull(ViewState("UsaProductoAlterno"), False, ViewState("UsaProductoAlterno")))
End Get
Set(value As Boolean)
ViewState("UsaProductoAlterno") = value
End Set
End Property
#End Region
#Region " A C U M U L A D O R E S"
@@ -7155,6 +7164,7 @@ Partial Class Ventas
DdlMetodoPago33.Enabled = True
End If
Me.UsaProductoAlterno = ObjCliente.UsaProductoAlterno
Me.CveMetodoPago33Cliente = ObjCliente.CveMetodoPago
Me.CveFormaPago33Cliente = ObjCliente.CveFormaPago
@@ -21279,6 +21289,21 @@ Partial Class Ventas
DrPS = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePS).FiltroPrimero("") ' Estado = -1
Dim Codigo As String = ""
If UsaProductoAlterno Then
Codigo = DrPS("CodigoAlterno").ToString().Trim()
PS = DrPS("PSAlterno").ToString().Trim()
Else
Codigo = DrPS("Codigo").ToString().Trim()
PS = DrPS("PS").ToString().Trim()
End If
If UsaProductoAlterno AndAlso String.IsNullOrEmpty(Codigo) OrElse String.IsNullOrEmpty(PS) Then
Alert("El producto y/o servicio no tiene especificado el código alterno.", TipoMensaje.ToastAdventencia, timeout:=30)
End If
If DrPS Is Nothing Then
Alert("Ocurrió un error al cargar la información del Producto. Por favor vuelva a intentar.", TipoMensaje.MsgError)
Return False
@@ -21373,9 +21398,9 @@ Partial Class Ventas
TotalCalculableImpuestosIVA = TotalCalculableImpuestos * (1 + DrPS("IEPSPorcentaje").ToString().ToDecimal)
Row("PU") = PU
Row("Codigo") = DrPS("Codigo")
Row("Codigo") = Codigo
Row("NumeroParte") = DrPS("NumeroParte")
Row("NoIdentificacion") = DrPS("Codigo")
Row("NoIdentificacion") = Codigo
Row("ClaveSATFraccionArancelaria") = DrPS("ClaveSATFraccionArancelaria")
Row("ClaveSATUnidadAduana") = DrPS("ClaveSATUnidadAduana")
Row("ClaveSATFraccionArancelariaDescripcion") = DrPS("ClaveSATFraccionArancelariaDescripcion")
@@ -21396,8 +21421,8 @@ Partial Class Ventas
End If
Row("PS") = DrPS("PS")
Row("CodigoPS") = DrPS("PSCodigo").ToString()
Row("PS") = PS
Row("CodigoPS") = If(UsaProductoAlterno, String.Format("{0}-{1}", Codigo, PS), DrPS("PSCodigo")).ToString()
Row("CveTipoPS") = DrPS("CveTipoPS")
Row("CveTipoInvPS") = DrPS("Inv_CveMetodoInventario")
Row("AplicaSerie") = DrPS("AplicaSerie")