From 584cca327c478513f618b37ed91496322bcf861f Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 5 May 2021 12:10:49 -0700 Subject: [PATCH 01/11] -- carga de subproyectos --- Contabilidad2/RepEstadoActividades.aspx.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Contabilidad2/RepEstadoActividades.aspx.vb b/Contabilidad2/RepEstadoActividades.aspx.vb index ed556b6a1..22b3119c2 100644 --- a/Contabilidad2/RepEstadoActividades.aspx.vb +++ b/Contabilidad2/RepEstadoActividades.aspx.vb @@ -116,6 +116,10 @@ Partial Class AC_RepEstadoActividades DdlEjercicio.Items.Add(New ListItem(Now.Year.ToString, Now.Year.ToString)) End If DdlPeriodo.SelectedValue = Now.Month.ToString + + DdlSubproyecto.datasource = GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa) + DdlSubproyecto.databind + End Sub Private Sub CargaDatos() From 161e2f8877b276483b8827e0d3362f0d3723f491 Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 5 May 2021 12:11:15 -0700 Subject: [PATCH 02/11] -- conceptos de descuento de nomina --- AC/RegNomina.aspx | 17 ++++++++++++++--- AC/RegNomina.aspx.vb | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/AC/RegNomina.aspx b/AC/RegNomina.aspx index 5f660dfe7..db1709f12 100644 --- a/AC/RegNomina.aspx +++ b/AC/RegNomina.aspx @@ -93,12 +93,23 @@ - + + - -
ISPT Servicio Médico:Fonacot:
Crédito al Salario
+ Pensión: + P. Infonavit: + + + ISR Asimilados + C. Sindical + + + + + + diff --git a/AC/RegNomina.aspx.vb b/AC/RegNomina.aspx.vb index 2d6a6cd3d..cc9ed0b49 100644 --- a/AC/RegNomina.aspx.vb +++ b/AC/RegNomina.aspx.vb @@ -373,6 +373,12 @@ Partial Class AC_RegNomina Dim IdCtaCreditoSalario As Integer = 635 Dim IdCtaDevolucionISPT As Integer = 1745 Dim IdCtaMatriz As Integer + Dim IdCtaCuotaSindical As Integer = 644 + Dim IdCtaInfonavit As Integer = 2018 + Dim IdCtaFonacot As Integer = 646 + Dim IdCtaServicioMedico As Integer = 643 + Dim IdCtaPension As Integer = 643 + Dim IdCtaISRAsimilados As Integer = 4442 Dim Importe As Double Dim MsgError As String = "" @@ -564,6 +570,7 @@ Partial Class AC_RegNomina ObjIE.UpdateIEPrePoliza(Fecha, objAC.Folio.ToString, IDPoliza, CvePrePoliza, CveIE, -1) Else + MsgError = "no se pudo agregar el movimiento bancario" TieneError = True End If @@ -586,9 +593,34 @@ Partial Class AC_RegNomina If Importe > 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaCreditoSalario, False, Importe, "", Concepto, 0, Fecha, "") Then TieneError = True - 'Registro del Mov Devolución - Importe = TxtISPT.Text.ToDouble - TxtCredSalario.Text.ToDouble - If Importe <> 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaDevolucionISPT, If(Importe > 0, False, True), Math.Abs(Importe), "", Concepto, 0, Fecha, "") Then TieneError = True + 'Registro Cuotas Sindicales + Importe = TxtSindical.Text.ToDouble + If Importe > 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaCuotaSindical, True, Importe, "", Concepto, 0, Fecha, "") Then TieneError = True + + 'Registro Prestamo infonavit + Importe = txtInfonavit.Text.ToDouble + If Importe > 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaInfonavit, True, Importe, "", Concepto, 0, Fecha, "") Then TieneError = True + + 'Registro Fonacot + Importe = txtFonacot.Text.ToDouble + If Importe > 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaFonacot, True, Importe, "", Concepto, 0, Fecha, "") Then TieneError = True + + 'Registro Servicio Medico + Importe = txtServicioMedico.Text.ToDouble + If Importe > 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaServicioMedico, True, Importe, "", Concepto, 0, Fecha, "") Then TieneError = True + + 'Registro Pensión + Importe = txtPension.Text.ToDouble + If Importe > 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaPension, True, Importe, "", Concepto, 0, Fecha, "") Then TieneError = True + + 'Registro ISR Asimilados + Importe = TxtISRAsimilados.Text.ToDouble + If Importe > 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaISRAsimilados, True, Importe, "", Concepto, 0, Fecha, "") Then TieneError = True + + + ''Registro del Mov Devolución + 'Importe = TxtISPT.Text.ToDouble - TxtCredSalario.Text.ToDouble + 'If Importe <> 0 AndAlso Not objAC.AddMovimiento(IDPoliza, IdCtaDevolucionISPT, If(Importe > 0, False, True), Math.Abs(Importe), "", Concepto, 0, Fecha, "") Then TieneError = True Else TieneError = True From 9d5b802d9439b5f76c03c0d0074ec364a8aaeac3 Mon Sep 17 00:00:00 2001 From: HECTOR RODRIGUEZ Date: Wed, 5 May 2021 13:26:20 -0700 Subject: [PATCH 03/11] Poliza BDH --- Empresas/140/Formatos/Polizas.rdlc | 2255 ++++++++++++++++++++++++++++ 1 file changed, 2255 insertions(+) create mode 100644 Empresas/140/Formatos/Polizas.rdlc diff --git a/Empresas/140/Formatos/Polizas.rdlc b/Empresas/140/Formatos/Polizas.rdlc new file mode 100644 index 000000000..ffc1b50d8 --- /dev/null +++ b/Empresas/140/Formatos/Polizas.rdlc @@ -0,0 +1,2255 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 7ef92796-1755-4a85-b80c-8c8266256a94 + + + + + + DataSet1 + /* Local Query */ + + + + Id + System.Int32 + + + Fecha + System.DateTime + + + TipoPoliza + System.String + + + NombreCuenta + System.String + + + CodigoCuenta + System.String + + + Numero + System.Int32 + + + Folio + System.Int32 + + + Referencia + System.String + + + Concepto + System.String + + + ConceptoPoliza + System.String + + + TipoMovto + System.Int32 + + + Cargos + System.String + + + Abonos + System.String + + + SegNeg + System.String + + + Cargo + System.Decimal + + + Abono + System.Decimal + + + Codigo + System.String + + + NombreUsuario + System.String + + + + DataSet1 + C:\inetpub\wwwroot\ADSistemas\Ventas.root\Reportes\DataSet1.xsd + DataTable1 + + + + + + + + + + + + + + + 2.15421cm + + + 2.15421cm + + + 2.15421cm + + + 2.15421cm + + + 2.15421cm + + + 2.15421cm + + + 2.15421cm + + + 2.15421cm + + + 2.15421cm + + + + + 0.6cm + + + + + true + true + + + + + + + + + + + + Textbox1 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox2 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox3 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox34 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox25 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox17 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox5 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox7 + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + 0.6cm + + + + + true + true + + + + + Concepto: + + + + =Fields!ConceptoPoliza.Value + + + + + + + Textbox103 + + + 2pt + 2pt + 2pt + 2pt + + + 7 + + + + + + + + + + + + true + true + + + + + Fecha: + + + + =Fields!Fecha.Value + + + + + + + Textbox107 + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + 0.6cm + + + + + true + true + + + + + Referencia + + + + + + + Textbox15 + + + #3a4173 + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Cuenta + + + + + + + Textbox16 + + + #3a4173 + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Concepto + + + + + + + Textbox28 + + + #3a4173 + 2pt + 2pt + 2pt + 2pt + + + 4 + + + + + + + + + true + true + + + + + Sucursal + + + + + + + Textbox46 + + + #3a4173 + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Cargos + + + + + + + Textbox52 + + + #3a4173 + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Abonos + + + + + + + Textbox66 + + + #3a4173 + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.37063cm + + + + + true + + + + + =Fields!Referencia.Value + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + + + + + =Fields!CodigoCuenta.Value + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + =Fields!NombreCuenta.Value + + + + + + + Cuenta1 + + + 1pt + 1pt + 1pt + 1pt + + + 4 + + + + + + + + + true + true + + + + + =Fields!SegNeg.Value + + + + + + + SegNeg + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + + + + + =Fields!Cargo.Value + + + + + + + Cargo + + =iif(Fields!TipoMovto.Value = "1", true, false) + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + + + + + =Fields!Abono.Value + + + + + + + Abono + + =iif(Fields!TipoMovto.Value = "0", true, false) + + + + 1pt + 1pt + 1pt + 1pt + es-MX + + + + + + + + 0.41479cm + + + + + true + true + + + + + + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + =Fields!Concepto.Value + + + + + + + Concepto + + + 1pt + 1pt + 1pt + 1pt + + + 4 + + + + + + + + + true + true + + + + + + + + + + + + Textbox6 + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + + + + + + + + Textbox114 + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + + + + + + + + Textbox115 + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Code.IsNewPage(Fields!Id.Value,nothing,nothing) + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + =Fields!NombreUsuario.Value + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + + + + + + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + Totales: + + + + + + + Textbox11 + + + + Black + + 1pt + + 1pt + 1pt + 1pt + 1pt + + + + + + + + true + true + + + + + =Sum(Fields!Cargo.Value) + + + + + + + Textbox12 + + + + + + 1pt + 1pt + 1pt + 1pt + en-US + + + + + + + + true + true + + + + + =Sum(Fields!Abono.Value) + + + + + + + Abono + + + + + + 1pt + 1pt + 1pt + 1pt + en-US + + + + + + + + + + + + + + + + + + + + + + + + + + + =Fields!Fecha.Value + =Fields!TipoPoliza.Value + =Fields!Numero.Value + =Fields!ConceptoPoliza.Value + + + End + true + + + + =Fields!NombreUsuario.Value + + + + + + =Fields!Folio.Value + + + + + After + + + After + + + After + + + + + + + + + + Before + + + + + + true + DataSet1 + + End + true + + 0.05076cm + 3.18542cm + 19.38789cm + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + 5.82055cm + + + + + + + + + Impreso de póliza + + + + + + + + + =UCase(Parameters!TipoPoliza.Value) + + + + + + + Textbox4 + 0.19844cm + 2.10635in + 1.6616cm + 9.94376cm + + + 2pt + 2pt + + + + Embedded + Logo + FitProportional + 0.00896cm + 2.5433cm + 4.13cm + 1 + + + + + + + + + + + 0.7827cm + true + true + + + true + true + + + + + Fecha Impresión: + + + + + + + + =Now() + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + ="Página: " & Globals!PageNumber + + + + + + + Textbox35 + 0.13103cm + 16.24302cm + 0.46771cm + 2.8175cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Usuario Imprimio: + + + + + + + + =Parameters!UsuarioImprimio.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.25pt + + + + 27.94cm + 21.59cm + 0.5cm + 0.5cm + 0.5cm + 0.5cm + 0.03cm +