Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -191,12 +191,12 @@ Public Class ClsCompras
|
||||
AplicaNotaCredito As Boolean, Observaciones As String, CveEstatusCompra As Integer, CvePrePoliza As Integer, CveUsuario As Integer, CveEmpresa As Integer, Optional IdPoliza As Integer = -1,
|
||||
Optional CveOC As Integer = -1, Optional CveCajaChica As Integer = -1, Optional CvePersonal As Integer = -1, Optional NumeroReembolso As String = "-1", Optional CveProveedorSucursal As Integer = -1,
|
||||
Optional AplicoPromocion As Boolean = False, Optional PorcentajeIVA As Double = 0, Optional CveMetodoPago As Integer = -1, Optional CveRetIVAConcepto As Integer = -1, Optional CveConceptoContableAlmacen As Integer = -1,
|
||||
Optional CveRetISRConcepto As Integer = -1, Optional NoDeducible As Boolean = False, Optional CveTipoCompra As Integer = -1, Optional TotalOriginal As Double = 0, Optional CveTipoConcepto As Integer = 1) As Boolean
|
||||
Optional CveRetISRConcepto As Integer = -1, Optional NoDeducible As Boolean = False, Optional CveTipoCompra As Integer = -1, Optional TotalOriginal As Double = 0, Optional CveTipoConcepto As Integer = 1, Optional CveFactura As Integer = -1) As Boolean
|
||||
|
||||
Dim Retorno As Boolean = False
|
||||
|
||||
DataAdapter("PA_Comp_CompraAdd")
|
||||
|
||||
DataAdapter("PA_Comp_CompraAdd")
|
||||
|
||||
With SqlAdapter.SelectCommand.Parameters
|
||||
.Add("@TipoDocto", SqlDbType.VarChar).Value = TipoDocto
|
||||
.Add("@Descripcion", SqlDbType.VarChar).Value = Descripcion
|
||||
@@ -241,6 +241,7 @@ Public Class ClsCompras
|
||||
.Add("@CveTipoCompra", SqlDbType.Int).Value = CveTipoCompra
|
||||
.Add("@TotalOriginal", SqlDbType.Money).Value = TotalOriginal
|
||||
.Add("@CveTipoConcepto", SqlDbType.Int).Value = CveTipoConcepto
|
||||
.Add("@CveFactura", SqlDbType.Int).Value = CveFactura
|
||||
End With
|
||||
|
||||
Try
|
||||
@@ -265,7 +266,7 @@ Public Class ClsCompras
|
||||
Descuento As Double, SubTotal As Double, IVA As Double, Total As Double, CveUsuario As Integer,
|
||||
CveCompra As Integer, Optional CveCajaChica As Integer = -1, Optional CvePersonal As Integer = -1,
|
||||
Optional CveProveedorSucursal As Integer = -1, Optional PorcentajeIVA As Double = 0,
|
||||
Optional NumeroReembolso As String = "", Optional CveTipoCompra As Integer = -1, Optional NoDeducible As Boolean = False) As Boolean
|
||||
Optional NumeroReembolso As String = "", Optional CveTipoCompra As Integer = -1, Optional NoDeducible As Boolean = False, Optional CveFactura As Integer = -1) As Boolean
|
||||
|
||||
Dim Retorno As Boolean = False
|
||||
|
||||
@@ -291,6 +292,7 @@ Public Class ClsCompras
|
||||
.Add("@NumeroReembolso", SqlDbType.VarChar).Value = NumeroReembolso
|
||||
.Add("@CveTipoCompra", SqlDbType.Int).Value = CveTipoCompra
|
||||
.Add("@NoDeducible", SqlDbType.Bit).Value = NoDeducible
|
||||
.Add("@CveFactura", SqlDbType.Int).Value = CveFactura
|
||||
End With
|
||||
|
||||
Try
|
||||
|
||||
@@ -130,7 +130,11 @@
|
||||
<div id="DivCliente" runat="server" visible="true">
|
||||
<label class="col-md-1 truncate" style="width: 110px">Cliente:</label>
|
||||
<div class="col-md-2">
|
||||
<asp:DropDownList ID="DdlClientes" AutoPostBack="true" OnSelectedIndexChanged="DdlClientes_SelectedIndexChanged" AppendDataBoundItems="true" runat="server" CssClass="form-control input-sm select2me" Style="max-width: 200px" DataTextField="NombreComercial" DataValueField="CveCliente"></asp:DropDownList>
|
||||
<asp:DropDownList ID="DdlClientes" AutoPostBack="False" OnSelectedIndexChanged="DdlClientes_SelectedIndexChanged" AppendDataBoundItems="true" runat="server" CssClass="form-control input-sm select2me" Style="max-width: 200px" DataTextField="NombreComercial" DataValueField="CveCliente"></asp:DropDownList>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label class="col-md-1 truncate" style="width: 125px">Todos los clientes:</label>
|
||||
<asp:CheckBox runat="server" ID="ChkClientesTodos" data-size="small" Checked="False" AutoPostBack="true" OnCheckedChanged="SeleccionarTipoDeClientes" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -139,7 +143,7 @@
|
||||
<div class="col-md-2 " id="DivDdlClienteSucursal" runat="server">
|
||||
<asp:DropDownList ID="DdlClientesSucursales" AutoPostBack="true" AppendDataBoundItems="true" runat="server" CssClass="form-control input-sm select2me" Style="max-width: 200px" DataTextField="SucursalCliente" DataValueField="CveClienteSucursal">
|
||||
<asp:ListItem Selected="True" Text="-" Value="-1"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</asp:DropDownList>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -968,7 +972,7 @@
|
||||
|
||||
<div class="form-group form-md-line-input ">
|
||||
<div class="row">
|
||||
<div class="col-md-2" style="width:50%">
|
||||
<div class="col-md-2" style="width: 50%">
|
||||
<label for='<%= txtCantidad.ClientID %>'>Cantidad:</label>
|
||||
<asp:TextBox ID="txtCantidad" CssClass="form-control input-sm" Width="100%" MaxLength="15" runat="server" ValidationGroup="GprAgregarUsado"></asp:TextBox>
|
||||
<ajax:FilteredTextBoxExtender ID="SoloNumerosCantidad" runat="server" TargetControlID="txtCantidad" FilterType=" Numbers" />
|
||||
@@ -977,7 +981,7 @@
|
||||
<asp:CustomValidator ID="CVCantidad" runat="server" ClientValidationFunction="ValidaDecimal6digits" ControlToValidate="TxtCantidad" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Cantidad''</b> no tiene el formato correcto (6 decimales). Por favor rectifique y vuelva a intentar." ValidateEmptyText="True" ValidationGroup="GprAgregarUsado"></asp:CustomValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VCECantidad" runat="server" HighlightCssClass="vco" TargetControlID="CVCantidad" Width="300px"></ajax:ValidatorCalloutExtender>
|
||||
</div>
|
||||
<div class="col-md-2" style="width:50%">
|
||||
<div class="col-md-2" style="width: 50%">
|
||||
<asp:CheckBox runat="server" ID="ChkSeguirAgregando" />
|
||||
<label for="ChkSeguirAgregando">Seguir Registrando</label>
|
||||
</div>
|
||||
|
||||
@@ -317,7 +317,6 @@ Partial Class Inventarios_RecepcionUsados
|
||||
ViewState("DtPorcentajeMarcas") = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
#End Region
|
||||
|
||||
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
@@ -346,7 +345,7 @@ Partial Class Inventarios_RecepcionUsados
|
||||
TxtFecha.Text = Now.ToShortDateString
|
||||
TxtFechaPendientes.Text = Now.ToShortDateString
|
||||
RVFecha.MaximumValue = Now.ToShortDateString
|
||||
InicializaClientes()
|
||||
InicializaClientes(False)
|
||||
|
||||
'si viene una parámetro para cargar un movimiento lo hacemos dentro del procedimiento cargadatos
|
||||
Select Case UsuarioActual.Empresa.Funcionalidad(103)
|
||||
@@ -1148,7 +1147,7 @@ Partial Class Inventarios_RecepcionUsados
|
||||
'si es selectedvalue = 42, es entrada ,3 -salida
|
||||
Dim CveConceptoUsados As Integer = If(RBLOpcion.SelectedValue.ToEntero = 42, 1, 2)
|
||||
|
||||
If RBLOpcion.SelectedValue.ToEntero = 42 AndAlso EsDistribuidor AndAlso Dr("CveTamaño").ToString.ToEntero > 0 Then
|
||||
If EsDistribuidor AndAlso RBLOpcion.SelectedValue.ToEntero = 42 AndAlso Dr("CveTamaño").ToString.ToEntero > 0 Then
|
||||
|
||||
If Not ObjAcum.DistribuidorMovtosAdd(DdlClientes.SelectedValue.ToEntero, Dr("Cantidad").ToString.ToEntero(), Dr("CveTamaño").ToString.ToEntero, CveConceptoUsados, CveVenta, UsuarioActual.CveUsuario,
|
||||
UsuarioActual.CveEmpresa, 0, Dr("Observaciones").ToString, CveMovimiento:=CveMovimiento) Then
|
||||
@@ -1706,9 +1705,9 @@ Partial Class Inventarios_RecepcionUsados
|
||||
|
||||
|
||||
#Region "DDL CLIENTE / CLIENTE SUCURSAL - SELECTED INDEX CHANGED"
|
||||
Private Sub InicializaClientes()
|
||||
Private Sub InicializaClientes(Todos As Boolean)
|
||||
|
||||
DdlClientes.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa).FiltraParametros("EsDistribuidor = 1")
|
||||
DdlClientes.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa).FiltraParametros(If(Todos, "", "EsDistribuidor = 1"))
|
||||
DdlClientes.DataBind()
|
||||
DdlClientes.Items.Insert(0, New ListItem("Seleccione", "-1"))
|
||||
DdlClientes.SelectedValue = "-1"
|
||||
@@ -2781,4 +2780,9 @@ Partial Class Inventarios_RecepcionUsados
|
||||
End Sub
|
||||
#End Region
|
||||
|
||||
Protected Sub SeleccionarTipoDeClientes(sender As Object, e As EventArgs)
|
||||
DdlClientes.Items.Clear()
|
||||
InicializaClientes(ChkClientesTodos.Checked)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
@@ -644,7 +644,7 @@ Partial Class Ventas_ClientesAbonar
|
||||
e.Row.FCRangeValidator("RVComision").MaximumValue = e.Row.DBCampo("Saldo")
|
||||
End If
|
||||
|
||||
If e.Row.DBCampo("DescuentoProntoPago").ToDecimal() > 0 Then
|
||||
If e.Row.DBCampo("DescuentoProntoPago").ToDecimal() > 0 AndAlso e.Row.DBCampo("DiasVencidos").ToEntero() <= 0 Then
|
||||
e.Row.FCCheckBox("ChkGenerarNC").Visible = True
|
||||
e.Row.FCCheckBox("ChkGenerarNC").Attributes.Add("onclick", String.Format("FnSuma(this,{0},{1}); FnCambia({2},this,{1},0,{3},{4}); FnEditarImporte({2}, {0});", e.Row.FCTextBox("TxtAbonar").ClientID, e.Row.DBCampo("Saldo").ToDecimal - e.Row.DBCampo("DescuentoProntoPago").ToDecimal, e.Row.FCCheckBox("ChkGenerarNC").ClientID, CveMonedaFiltro, moneda))
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user