From 8f8d14fa23f341c09696f816e3a88588941eeb6e Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 20 Oct 2022 09:26:53 -0700 Subject: [PATCH 1/9] -- addcompra totaloriginal --- General/SaldosIniciales.aspx.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb index 394cd44e1..f62f3068b 100644 --- a/General/SaldosIniciales.aspx.vb +++ b/General/SaldosIniciales.aspx.vb @@ -1544,7 +1544,7 @@ Partial Class General_SaldosIniciales 'Compra If Not ObjCompras.AddCompra(TipoDocto, "", Serie, Folio, Folio2, CveProveedor.ToEntero, SubTotal, 0, 0, IVA, RetIVA, RetISR, IEPS, 0, 0, Total, Fecha, CveMoneda, TipoCambio.ToDouble, FechaVencimiento, False, CodProvee, 1, CvePrePoliza, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveProveedorSucursal:=CveProveedorSucursal, - NumeroReembolso:=Transaccion, PorcentajeIVA:=PorcentajeIVA.ToDecimal) Then + NumeroReembolso:=Transaccion, PorcentajeIVA:=PorcentajeIVA.ToDecimal, TotalOriginal:=Total) Then ErrorCompras = True Exit For End If From eec0ffb358b1fda54f4b2adeaa7629e6293963a5 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 20 Oct 2022 10:48:51 -0700 Subject: [PATCH 2/9] -- tipoconta para cuentas --- Nomina/ConceptoNomina.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nomina/ConceptoNomina.aspx.cs b/Nomina/ConceptoNomina.aspx.cs index a3ed53073..96b183355 100644 --- a/Nomina/ConceptoNomina.aspx.cs +++ b/Nomina/ConceptoNomina.aspx.cs @@ -256,7 +256,7 @@ public partial class Nomina_CatConcepto : ClsPaginas protected void CargaCtaContable() { - if (UsuarioActual.Empresa.UsaContabilidad) + if (UsuarioActual.Empresa.TipoContabilidad == 2) { DdlCtaContable.DataValueField = "Id"; using (ClsContPAQi ObjConta = new ClsContPAQi(UsuarioActual.Empresa)) From fcea33c1105ed31de71ac4e2d2156d5640cddb19 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 20 Oct 2022 13:48:28 -0700 Subject: [PATCH 3/9] =?UTF-8?q?--transacci=C3=B3n=20ajustemovto,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bancos/IE.aspx.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb index a2bd46524..a75ea1a03 100644 --- a/Bancos/IE.aspx.vb +++ b/Bancos/IE.aspx.vb @@ -6457,10 +6457,14 @@ Partial Class Bancos_IE Private Sub BtnAjustarMovimiento_Click(sender As Object, e As EventArgs) Handles BtnAjustarMovimiento.Click Dim ObjBanco As New ClsBancos + ObjBanco.IniciaTransacSQL() If ObjBanco.UpdateAjustarMovimiento(CveIE, TxtAjustarMovimiento.Text.ToDecimal, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then + ObjBanco.Commit() RegistraScript("$('#ModalAjustarMovimiento').modal('hide');", "ALTR") Alert("El ajuste se realizo correctamente.", TipoMensaje.MsgInformacion, $" document.location.href = ""./IE.aspx?CveIE={CveIE}"";") + Else + ObjBanco.RollBack() End If ObjBanco.Dispose() From c977f8be2e3665c70ddaa3a4bdce771ecb504d1f Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 20 Oct 2022 14:21:35 -0700 Subject: [PATCH 4/9] -- mejora, div --- Inventarios/PopUpExistenciasAlmacen.aspx.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/Inventarios/PopUpExistenciasAlmacen.aspx.vb b/Inventarios/PopUpExistenciasAlmacen.aspx.vb index 62b3ec424..029c3cf8a 100644 --- a/Inventarios/PopUpExistenciasAlmacen.aspx.vb +++ b/Inventarios/PopUpExistenciasAlmacen.aspx.vb @@ -228,7 +228,6 @@ Partial Class Inventarios_Default ObjInventarios.Dispose() GV.DataBind() UPDatos.Update() - DivMedRin.Visible = True End Sub #Region " BUSCA | CODIGO - SERIE " From ba387afd0603d900ad2d5a31cce2fa1861075c22 Mon Sep 17 00:00:00 2001 From: rrene Date: Sat, 22 Oct 2022 11:32:49 -0700 Subject: [PATCH 5/9] folio longitud 25 --- Bancos/IE.aspx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bancos/IE.aspx b/Bancos/IE.aspx index 3cd458484..7406155c3 100644 --- a/Bancos/IE.aspx +++ b/Bancos/IE.aspx @@ -209,7 +209,7 @@
- + From cbff97dfee20a224e96772cdd0f006ece3ea91ee Mon Sep 17 00:00:00 2001 From: rrene Date: Sat, 22 Oct 2022 11:33:06 -0700 Subject: [PATCH 6/9] --- inconsistencias --- Inicio.aspx | 62 +++++++++++++++++++++++++++----------------------- Inicio.aspx.vb | 4 ++-- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/Inicio.aspx b/Inicio.aspx index d672b236c..6b4322620 100644 --- a/Inicio.aspx +++ b/Inicio.aspx @@ -1105,44 +1105,48 @@
- -