diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx
index 8c1422c57..5f3084c38 100644
--- a/Compras/Compras.aspx
+++ b/Compras/Compras.aspx
@@ -3732,11 +3732,18 @@
+
+
+
@@ -4142,7 +4149,7 @@
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index 47d1eb77c..579c5f9a5 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -3946,6 +3946,15 @@ Partial Class Compras_Compras
Dim EstatusCredito As Integer = 0
Dim CveSubProyecto As Integer = 0
'Credito Multiple
+ If RBLPago.SelectedValue.ToEntero = 2 Then
+ If RBLContado.SelectedValue.ToEntero = 6 Or RBLContado.SelectedValue.ToEntero = 2 Then
+ If Not TxtRembolsoNumero.Text.Length > 0 Then
+ Alert("Falta especificar un número de reembolso", TipoMensaje.MsgAdvertencia)
+ Exit Sub
+ End If
+ End If
+ End If
+
If RBLPago.SelectedValue.ToEntero = 4 Then
Dim DifCreCompra As Decimal = 0
@@ -12827,7 +12836,6 @@ Partial Class Compras_Compras
Select Case RBLPago.SelectedValue
Case "1" 'Credito
PnlContado.Visible = False
-
If Not UsuarioActual.Empresa.UsaAC Then
TxtNumeroReembolso.Text = ""
tdNumeroReembolso.Visible = False
@@ -12836,7 +12844,6 @@ Partial Class Compras_Compras
romCreditosTabla.Visible = False
Case "2" 'Contado
PnlContado.Visible = True
-
TxtNumeroReembolso.Text = ""
tdNumeroReembolso.Visible = False
@@ -12870,7 +12877,6 @@ Partial Class Compras_Compras
Case "3" 'Reembolso/Comprobacion
PnlContado.Visible = True
-
''AGARRA VALORES DE SESSION PARA REEMBOLSO -- SI YA ESTA REGISTRADA LA COMPRA IGNORA DATOS DE REEMBOLSO
If Not CveCompra > 0 Then
If UsuarioActual.Sesion("Comp-NumeroReembolso") <> Nothing AndAlso UsuarioActual.Sesion("Comp-NumeroReembolso").ToString <> "" Then
@@ -12998,26 +13004,61 @@ Partial Class Compras_Compras
Case "1" ' Bancos
PnlContadoBancos.Visible = True
TxtDocumentoImporte.Text = (TxtTotal.Text.ToDecimal - LblAmortizacion.Text.ToDecimal).FormatoNumero
+ ChkCreditoMultiple.Visible = False
+ DivReembolsoModal.Visible = False
+ RfvTxtRembolsoModal.Enabled = False
+ TxtRembolsoModal.Text = ""
+ TxtRembolsoNumero.Text = ""
Case "2" ' F y E
PnlContadoFyE.Visible = True
CargaFuncionariosEmpleados()
+ ChkCreditoMultiple.Visible = False
+ DivReembolsoModal.Visible = True
+ RfvTxtRembolsoModal.Enabled = True
+ TxtRembolsoNumero.Text = ""
+ TxtRembolsoModal.Text = ""
Case "3" ' Creditos
PnlContadoCreditos.Visible = True
+ ChkCreditoMultiple.Visible = True
CargaCreditos()
+ DivReembolsoModal.Visible = False
+ RfvTxtRembolsoModal.Enabled = False
+ TxtRembolsoModal.Text = ""
+ TxtRembolsoNumero.Text = ""
Case "4" ' Deudores
PnlContadoDeudores.Visible = True
CargaDeudores()
+ ChkCreditoMultiple.Visible = False
+ DivReembolsoModal.Visible = False
+ RfvTxtRembolsoModal.Enabled = False
+ TxtRembolsoModal.Text = ""
+ TxtRembolsoNumero.Text = ""
Case "5" ' ACREEDORES
PnlContadoAcreedores.Visible = True
+ ChkCreditoMultiple.Visible = True
CargaAcreedores()
+ DivReembolsoModal.Visible = False
+ RfvTxtRembolsoModal.Enabled = False
+ TxtRembolsoModal.Text = ""
+ TxtRembolsoNumero.Text = ""
Case "6" ' Caja Chica
PnlContadoCajaChica.Visible = True
TxtDocumentoImporteCaja.Text = (TxtTotal.Text.ToDecimal - LblAmortizacion.Text.ToDecimal).FormatoNumero
+ ChkCreditoMultiple.Visible = False
+ DivReembolsoModal.Visible = True
+ RfvTxtRembolsoModal.Enabled = True
+ TxtRembolsoModal.Text = ""
+ TxtRembolsoNumero.Text = ""
End Select
UpContado.Update()
End Sub
+ Protected Sub BtnContado_Click(sender As Object, e As EventArgs)
+ TxtRembolsoNumero.Text = TxtRembolsoModal.Text
+ RegistraScript(String.Format("$('#{0}').modal('hide');", "DivContadoModal"))
+ End Sub
+
Protected Sub RblRembolso_SelectedIndexChanged(sender As Object, e As EventArgs)
TrRembolsoCajaChica.Visible = False
TrRembolsoPersonal.Visible = False