diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb index 8b7a8ebff..e00c34042 100644 --- a/App_Code/ClsContabilidad.vb +++ b/App_Code/ClsContabilidad.vb @@ -4627,7 +4627,8 @@ Public Class ClsContabilidad Return Retorno End Function - Public Function AddCuenta(CvePadre As Integer, Codigo As String, Nombre As String, Tipo As String, CtaMayor As Integer, CveMoneda As Integer, Optional DigAgrupador As Integer = -1, Optional CveAgrupadorSAT As Integer = -1, Optional NomIdioma As String = "") As Integer + Public Function AddCuenta(CvePadre As Integer, Codigo As String, Nombre As String, Tipo As String, CtaMayor As Integer, CveMoneda As Integer, Optional DigAgrupador As Integer = -1, + Optional CveAgrupadorSAT As Integer = -1, Optional NomIdioma As String = "", Optional CveEmpresaParam As Integer = -1) As Integer Dim Retorno As Integer = 0 DataAdapter("PA_Conta_AddCuentas") @@ -4641,6 +4642,7 @@ Public Class ClsContabilidad .Add("@DigAgrupador", SqlDbType.Int).Value = DigAgrupador .Add("@NomIdioma", SqlDbType.VarChar).Value = NomIdioma .Add("@CveAgrupadorSAT", SqlDbType.Int).Value = CveAgrupadorSAT + .Add("@CveEmpresaParam", SqlDbType.Int).Value = CveEmpresaParam '.Add("@CveCuenta", SqlDbType.Int).Value = 0 '.Add("@Error", SqlDbType.VarChar).Value = "" '.Add("@Error", SqlDbType.VarChar).Direction = ParameterDirection.Output diff --git a/Ashx/TareasProgramadas.ashx b/Ashx/TareasProgramadas.ashx index 76932ef83..e7168ab56 100644 --- a/Ashx/TareasProgramadas.ashx +++ b/Ashx/TareasProgramadas.ashx @@ -41,8 +41,8 @@ Public Class TareasProgramadas : Implements IHttpHandler retorno = "" context.Response.Write(retorno) Case "EstadosCuenta" - 'CargaEstadosCuenta(context, 119, 227736) - CargaEstadosCuenta(context, -1, -1) + 'CargaEstadosCuenta(context, 119, 227774) + CargaEstadosCuenta(context, 119, -1) End Select Catch ex As Exception ex.GuardaLog(ex.ToString()) @@ -341,7 +341,7 @@ Public Class TareasProgramadas : Implements IHttpHandler End If End Using - If DTClientes IsNot Nothing Then + If DTClientes IsNot Nothing Then For Each RowCliente As DataRow In DTClientes.Rows Dim CveCliente As Integer = RowCliente("CveCliente").ToString().ToEntero() Dim Correo As String = RowCliente("CobranzaCorreo").ToString() @@ -435,9 +435,6 @@ Public Class TareasProgramadas : Implements IHttpHandler drr("CveMoneda") = drt("CveMoneda") DtCxCFact.Rows.Add(drr) Next - Else - Retorno = False - Return Retorno End If If DtCxCFact IsNot Nothing Then @@ -470,6 +467,11 @@ Public Class TareasProgramadas : Implements IHttpHandler TotalIng = SaldoIngPesos + SaldoIngDolaresPesos TotalAnt = SaldoAntPesos + SaldoAntDolaresPesos + If TotalIng.RoundSQL(2) = 0 AndAlso TotalAnt.RoundSQL(2) = 0 Then + Retorno = False + Return Retorno + End If + Dim DtCxCFact2 As DataTable = DtCxCFact.FiltraParametros($"TipoDocto IN ({TipoDocto2})") 'INGRESOS diff --git a/Bancos/DepositosCaja.aspx b/Bancos/DepositosCaja.aspx index aba1c1776..db3f0d7a9 100644 --- a/Bancos/DepositosCaja.aspx +++ b/Bancos/DepositosCaja.aspx @@ -110,14 +110,17 @@

- +
+ Importe seleccionado: $00.00 +
+
- + diff --git a/Bancos/DepositosCaja.aspx.vb b/Bancos/DepositosCaja.aspx.vb index 3d6394fca..b6f7ace0e 100644 --- a/Bancos/DepositosCaja.aspx.vb +++ b/Bancos/DepositosCaja.aspx.vb @@ -48,6 +48,7 @@ Partial Class Bancos_DepositosCaja UpGvFacturas.Update() GvFacturas.DataBind() + divLabelTotal.Visible = True End Sub Private Sub BtnDepositar_Click(sender As Object, e As EventArgs) Handles BtnDepositar.Click @@ -157,4 +158,20 @@ Partial Class Bancos_DepositosCaja ObjContabilidad.Dispose() End Sub + Private Sub ObtenerTotalImporta() + + Dim Total As Double = 0 + For Each Gvr As GridViewRow In GvFacturas.Rows + If Gvr.FCCheckBox("ChkFactura").Checked Then + Total += Gvr.DataKey("Importe").ToDouble + End If + Next + lblValorTotal.Text = Total.ToString + UpGvFacturas.Update() + End Sub + + Public Sub ChkFactura_Click(sender As Object, e As EventArgs) + ObtenerTotalImporta() + End Sub + End Class \ No newline at end of file diff --git a/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc b/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc index c9bcd8e99..5a2c9f653 100644 --- a/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc +++ b/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc @@ -15,11 +15,14 @@ 1.67447cm - 6.57043cm + 2.82586cm 1.94532cm + + 2.89687cm + 5.49064cm @@ -225,7 +228,7 @@ - + true true @@ -244,6 +247,42 @@ + Textbox15 + + + Silver + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Código Producto/Servicio + + + + + + Textbox22 - true @@ -616,6 +654,40 @@ + + + + true + true + + + + + =Fields!PS.Value + + + + + + =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent") + 2pt + 2pt + 2pt + 2pt + + + + @@ -851,6 +923,7 @@ + @@ -866,7 +939,7 @@ DataSet1 0.06614cm 0.90467cm - 28.36649cm + 27.51879cm @@ -877,7 +950,7 @@ 0.59228in