diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb
index 610360c63..8f89239ca 100644
--- a/App_Code/ClsContabilidad.vb
+++ b/App_Code/ClsContabilidad.vb
@@ -5901,7 +5901,7 @@ Public Class ClsContabilidad
Return Retorno
End Function
- Public Function UpdatePeriodosBloqueo(CveEmpresa As Integer, Ejercicio As Integer, Mes1 As Integer, Mes2 As Integer, Mes3 As Integer, Mes4 As Integer, Mes5 As Integer, Mes6 As Integer, Mes7 As Integer, Mes8 As Integer, Mes9 As Integer, Mes10 As Integer, Mes11 As Integer, Mes12 As Integer) As Boolean
+ Public Function UpdatePeriodosBloqueo(CveEmpresa As Integer, Ejercicio As Integer, Mes1 As Integer, Mes2 As Integer, Mes3 As Integer, Mes4 As Integer, Mes5 As Integer, Mes6 As Integer, Mes7 As Integer, Mes8 As Integer, Mes9 As Integer, Mes10 As Integer, Mes11 As Integer, Mes12 As Integer, CveUsuario As Integer) As Boolean
Dim Retorno = False
DataAdapter("PA_Conta_EmpresasBloqueoMesesUpdate")
@@ -5920,6 +5920,7 @@ Public Class ClsContabilidad
.Add("@Mes10", SqlDbType.Bit).Value = Mes10
.Add("@Mes11", SqlDbType.Bit).Value = Mes11
.Add("@Mes12", SqlDbType.Bit).Value = Mes12
+ .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
End With
Try
@@ -5949,5 +5950,24 @@ Public Class ClsContabilidad
Return Retorno
End Function
+
+ Public Function GetBloqueoMesesBitacora(CveEmpresa As Integer) As Boolean
+ Dim Retorno = False
+
+ DataAdapter("PA_Conta_GetBloqueoMesesBitacora")
+
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ Me.OnError("Ocurrió un error al obtener el almacén contable", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return Retorno
+ End Function
#End Region
End Class
\ No newline at end of file
diff --git a/Contabilidad/CatPeriodosBloqueo.aspx b/Contabilidad/CatPeriodosBloqueo.aspx
index 0892172c5..80fa6e358 100644
--- a/Contabilidad/CatPeriodosBloqueo.aspx
+++ b/Contabilidad/CatPeriodosBloqueo.aspx
@@ -172,7 +172,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Contabilidad/CatPeriodosBloqueo.aspx.vb b/Contabilidad/CatPeriodosBloqueo.aspx.vb
index 801e7f910..090f4d1c3 100644
--- a/Contabilidad/CatPeriodosBloqueo.aspx.vb
+++ b/Contabilidad/CatPeriodosBloqueo.aspx.vb
@@ -68,10 +68,19 @@ Partial Class Contabilidad_CatPeriodosBloqueo
GvPeriodosBloqueo.DataSource = Nothing
End If
+ If ObjConta.GetBloqueoMesesBitacora(UsuarioActual.CveEmpresa) Then
+ GvMesesBloqueBitacora.DataSource = ObjConta.DtResultados
+ Else
+ GvMesesBloqueBitacora.DataSource = Nothing
+ End If
+
ObjConta.Dispose()
+
UPGvPeriodosBloqueo.DataBind()
+ GvMesesBloqueBitacora.DataBind()
UpGral.Update()
+ UPGvBitacora.Update()
End Sub
@@ -121,7 +130,7 @@ Partial Class Contabilidad_CatPeriodosBloqueo
End If
Else
- If ObjConta.UpdatePeriodosBloqueo(UsuarioActual.CveEmpresa, TxtEjercicio.Text, ChkM1.Checked, ChkM2.Checked, ChkM3.Checked, ChkM4.Checked, ChkM5.Checked, ChkM6.Checked, ChkM7.Checked, ChkM8.Checked, ChkM9.Checked, ChkM10.Checked, ChkM11.Checked, ChkM12.Checked) Then
+ If ObjConta.UpdatePeriodosBloqueo(UsuarioActual.CveEmpresa, TxtEjercicio.Text, ChkM1.Checked, ChkM2.Checked, ChkM3.Checked, ChkM4.Checked, ChkM5.Checked, ChkM6.Checked, ChkM7.Checked, ChkM8.Checked, ChkM9.Checked, ChkM10.Checked, ChkM11.Checked, ChkM12.Checked, UsuarioActual.CveUsuario) Then
CargadatosGvPeriodosBloqueo()
UpModalPeriodosBloqueo.Update()
diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx
index 019436ba6..cc817e97b 100644
--- a/Ventas/Ventas.aspx
+++ b/Ventas/Ventas.aspx
@@ -5337,7 +5337,7 @@
- |
+ |
|
@@ -5347,6 +5347,9 @@
+
+ Series total: 0
+ |
@@ -7544,8 +7547,7 @@
}
var ValidarRNC = false;
- function AplicarValidarRNC(Valor)
- {
+ function AplicarValidarRNC(Valor) {
ValidarRNC = Valor;
}
function CompararNC() {
@@ -7565,16 +7567,16 @@
document.getElementById('<%= TxtImportesRemisionesNC.ClientID %>').style.color = "#ff0000";
document.getElementById('<%= TxtNCImporte.ClientID %>').style.color = "#ff0000";
}
- }
- }
-
- function CerrarModalRemNC() {
- if ('<%= UsuarioActual.Empresa.Funcionalidad(344) %>' == '1') {
- AplicarValidarRNC(true);
- CompararNC();
}
- $('#ModalAplicarRemisionesNC').modal('hide');
}
+ function CerrarModalRemNC() {
+ if ('<%= UsuarioActual.Empresa.Funcionalidad(344) %>' == '1') {
+ AplicarValidarRNC(true);
+ CompararNC();
+ }
+ $('#ModalAplicarRemisionesNC').modal('hide');
+ }
+
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 2d0d27346..389ef21b7 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -19517,7 +19517,7 @@ Partial Class Ventas
GvSerie.DataSource = DtContratosSerieDetalle.FiltraParametros(String.Format("ConsecId = {0}", CveConsecSerieLote), "Consec DESC")
GvSerie.DataBind()
-
+ lblSerieTotal.Text = GvSerie.Rows.Count.ToString
'VALIDA QUE SIGA AGREGANDO
If DtContratosSerieDetalle.FiltraParametros(String.Format("ConsecId = {0}", CveConsecSerieLote)).Rows.Count = LbCantidad.Text.ToEntero And LimitaCantidadSerieLote = 1 Then
BtnAgregarPS.Enabled = False