diff --git a/Acumuladores/CatGarantiasMeses.aspx b/Acumuladores/CatGarantiasMeses.aspx index 867b0fbc4..d9cca1c6c 100644 --- a/Acumuladores/CatGarantiasMeses.aspx +++ b/Acumuladores/CatGarantiasMeses.aspx @@ -189,7 +189,6 @@ Agregar Garantía de Mes
-
@@ -197,27 +196,19 @@
- -
-
-
-
- +
- -
-
diff --git a/Acumuladores/CatGarantiasMeses.aspx.vb b/Acumuladores/CatGarantiasMeses.aspx.vb index f99f4c14e..3b58370b8 100644 --- a/Acumuladores/CatGarantiasMeses.aspx.vb +++ b/Acumuladores/CatGarantiasMeses.aspx.vb @@ -76,6 +76,8 @@ Partial Class Acumuladores_CatFoliosGarantia DdlMarca.DataBind() DdlMarca.Items.Insert(0, New ListItem("Todos", "-1")) DdlMarca.SelectedValue = "-1" + DdlMarcaM.DataSource = GlobalDTGralMarcas(UsuarioActual.CveEmpresa) + DdlMarcaM.DataBind() DdlTipoUso.DataSource = GlobalDTAcumTiposUso(UsuarioActual.CveEmpresa) DdlTipoUso.DataBind() diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb index 4e1c5e4f6..af0b9aacd 100644 --- a/App_Code/ClsClientes.vb +++ b/App_Code/ClsClientes.vb @@ -3,8 +3,11 @@ Option Strict On Imports System.Data Imports System.Data.SqlClient +Imports AjaxControlToolkit Imports Extensiones +Imports iText.StyledXmlParser.Css.Resolve.Shorthand.Impl Imports Modelos +Imports Stimulsoft.Report.Func Public Class ClsClientes Implements IDisposable @@ -594,7 +597,7 @@ Public Class ClsClientes Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional RequiereOC As Boolean = False, Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False, - Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1") As Boolean + Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True) As Boolean Dim Retorno As Boolean = False @@ -745,6 +748,7 @@ Public Class ClsClientes .Add("@ComExtCalle", SqlDbType.VarChar).Value = ComExtCalle .Add("@ComExtNumExt", SqlDbType.VarChar).Value = ComExtNumExt .Add("@ComExtCP", SqlDbType.VarChar).Value = ComExtCP + .Add("@Genero", SqlDbType.Bit).Value = Genero End With Try SqlAdapter.Fill(Data) @@ -793,7 +797,7 @@ Public Class ClsClientes Optional ApellidoPaternoPF As String = "-1", Optional ApellidoMaternoPF As String = "-1", Optional NombresPF As String = "-1", Optional RequiereOC As Boolean = False, Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional NoDesglosaIVA As Boolean = False, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False, - Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1") As Boolean + Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True) As Boolean Dim Retorno As Boolean = False @@ -960,7 +964,7 @@ Public Class ClsClientes .Add("@ComExtCalle", SqlDbType.VarChar).Value = ComExtCalle .Add("@ComExtNumExt", SqlDbType.VarChar).Value = ComExtNumExt .Add("@ComExtCP", SqlDbType.VarChar).Value = ComExtCP - + .Add("@Genero", SqlDbType.Bit).Value = Genero End With @@ -1692,7 +1696,7 @@ Public Class ClsClientes Public Function AgregarClienteNoFrecuente(Nombre As String, Direccion As String, NoExt As String, NoInt As String, Colonia As String, Localidad As String, Ciudad As String, CveEstado As Integer, RFC As String, CP As String, Telefono As String, Mail As String, CveSubProyecto As Integer, CveUsuario As Integer, CveEmpresa As Integer, NumCuentaPago As String, CveMetodoPago33 As Integer, CveFormaPago33 As Integer, Optional CvePrecioLista As Integer = -1, Optional RegimenSociedad As String = "-1", - Optional TipoPersona As Boolean = False, Optional CveRegimenFiscal As Integer = -1, Optional CveUsoCFDI As Integer = -1) As Boolean + Optional TipoPersona As Boolean = False, Optional CveRegimenFiscal As Integer = -1, Optional CveUsoCFDI As Integer = -1, Optional Genero As Boolean = True) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_ClientesNoFrecuenteAdd") @@ -1721,6 +1725,7 @@ Public Class ClsClientes .Add("@TipoPersona", SqlDbType.Bit).Value = TipoPersona .Add("@CveRegimenFiscal", SqlDbType.Int).Value = CveRegimenFiscal .Add("@CveUsoCFDI", SqlDbType.Int).Value = CveUsoCFDI + .Add("@Genero", SqlDbType.Int).Value = Genero End With @@ -1752,7 +1757,7 @@ Public Class ClsClientes Public Function UpdateClienteNoFrencuente(CveCliente As Integer, Nombre As String, Direccion As String, NoExt As String, NoInt As String, Colonia As String, Localidad As String, Ciudad As String, CveEstado As Integer, RFC As String, CP As String, Telefono As String, Mail As String, CveSubProyecto As Integer, CveUsuario As Integer, CveEmpresa As Integer, - NumCuentaPago As String, CveMetodoPago33 As Integer, CveFormaPago33 As Integer, Optional CvePrecioLista As Integer = -1) As Boolean + NumCuentaPago As String, CveMetodoPago33 As Integer, CveFormaPago33 As Integer, Optional CvePrecioLista As Integer = -1, Optional Genero As Boolean = True) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_ClientesNoFrecuenteUpdate") @@ -1778,6 +1783,7 @@ Public Class ClsClientes .Add("@CveFormaPago33", SqlDbType.Int).Value = CveFormaPago33 .Add("@NumCuentaPago", SqlDbType.VarChar).Value = NumCuentaPago .Add("@CvePrecioLista", SqlDbType.Int).Value = CvePrecioLista + .Add("@Genero", SqlDbType.Int).Value = Genero End With diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index 7606b0287..f8ca5d0f7 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -1522,6 +1522,9 @@ Public Class ClsRH Public Property NumeroSS As String Public Property SeInscribioSS As Boolean Public Property SalarioDiarioPago As Double + Public Property NetoPeriodo As Double + + Public Property SalarioDiario As Double Public Property SDI As Double Public Property SalarioDiarioSS As Double @@ -1640,6 +1643,7 @@ Public Class ClsRH Me.NumeroSS = Data.Rows(0)("NumeroSS").ToString Me.SeInscribioSS = CBool(Data.Rows(0)("SeInscribioSS").ToString) Me.SalarioDiarioPago = Data.Rows(0)("SalarioDiarioPago").ToString.ToDouble + Me.NetoPeriodo = Data.Rows(0)("NetoPeriodo").ToString.ToDecimal Me.SalarioDiario = Data.Rows(0)("SalarioDiario").ToString.ToDouble Me.SDI = Data.Rows(0)("SDI").ToString.ToDouble Me.Bono = Data.Rows(0)("Bono").ToString.ToDouble @@ -1952,7 +1956,7 @@ Public Class ClsRH NombrePadre As String, NombreMadre As String, CveSATBanco As Integer, CveSATRiesgoPuesto As Integer, CveSATRegimenContratacion As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, URL As String, CveSupervisor As Integer, CLABE As String, BancoNumCuenta As String, CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveUsuario As Integer, CveEmpresa As Integer, CveUsuarioNomina As Integer, Beneficiario As String, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1, Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Boolean = False, Optional CvePais As Integer = -1, - Optional Pensionado As Boolean = False, Optional CveMedioTransporte As Integer = -1, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1, Optional CveTipoTrabajador As Integer = -1) As Boolean + Optional Pensionado As Boolean = False, Optional CveMedioTransporte As Integer = -1, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1, Optional CveTipoTrabajador As Integer = -1, Optional NetoPeriodo As Decimal = -1) As Boolean Dim Retorno As Boolean = False Dim noguardoXcurp = False @@ -2043,6 +2047,7 @@ Public Class ClsRH .Add("@CveRegistroPatronal", SqlDbType.Int).Value = CveRegistroPatronal .Add("@CveEmpresaAsignado", SqlDbType.Int).Value = CveEmpresaAsignado .Add("@CveTipoTrabajador", SqlDbType.Int).Value = CveTipoTrabajador + .Add("@NetoPeriodo", SqlDbType.Money).Value = NetoPeriodo @@ -2088,7 +2093,7 @@ Public Class ClsRH CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveEmpresa As Integer, CveUsuarioNomina As Integer, Beneficiario As String, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1, Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveUsuarioModifico As Integer = -1, Optional FechaActivo As Date = MinFecha, Optional FechaReingreso As Date = MinFecha, Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Integer = -1, Optional CvePais As Integer = -1, Optional Pensionado As Boolean = False, Optional CveRegistroPatronal As Integer = -1, - Optional CveEmpresaAsignado As Integer = -1, Optional CveMedioTransporte As Integer = -1, Optional EsReserva As Integer = -1, Optional Fiscalizable As Integer = -1, Optional CveTipoTrabajador As Integer = -1) As Boolean + Optional CveEmpresaAsignado As Integer = -1, Optional CveMedioTransporte As Integer = -1, Optional EsReserva As Integer = -1, Optional Fiscalizable As Integer = -1, Optional CveTipoTrabajador As Integer = -1, Optional NetoPeriodo As Decimal = -1) As Boolean Dim Retorno As Boolean = False @@ -2185,6 +2190,7 @@ Public Class ClsRH .Add("@EsReserva", SqlDbType.Int).Value = EsReserva .Add("@Fiscalizable", SqlDbType.Int).Value = Fiscalizable .Add("@CveTipoTrabajador", SqlDbType.Int).Value = CveTipoTrabajador + .Add("@NetoPeriodo", SqlDbType.Money).Value = NetoPeriodo End With diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index ed867167f..c9901fe10 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -2405,21 +2405,35 @@ Namespace Extensiones Dim indexRowGV As Integer = 0 Dim cssClassRow As String = "" + Dim CountRowFiltros As Integer = -1 + If DatosFiltros.Trim.Length > 0 Then + CountRowFiltros = 0 + End If + For indexRow = 8 To worksheet.Rows.Count - 4 Try cssClassRow = GridView.Rows(indexRowGV).CssClass.Trim() Select Case cssClassRow + + Case "Totales" + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#67809f")) + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000 + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#ddd") + Exit Select Case "SubTotales2" - worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#c0c0c0")) - worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000 - worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#000077") + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#c0c0c0")) + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000 + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#000077") + Exit Select Case "SubTotales" - worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#dddddd")) - worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000 - worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#67809F") + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#dddddd")) + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000 + worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#67809F") + Exit Select Case Else + Exit Select End Select Catch ex As Exception diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb index 52c328df4..15c9ae491 100644 --- a/Bancos/IE.aspx.vb +++ b/Bancos/IE.aspx.vb @@ -2516,7 +2516,7 @@ Partial Class Bancos_IE Dim ObjOC As New ClsOC If ObjOC.GetOCAnticipoSaldo(CveOCSolicitudAnticipo, UsuarioActual.CveEmpresa) Then - SaldoOCAnticipo = ObjOC.DtResultados(0)("Saldo").ToString.ToDecimal + SaldoOCAnticipo = ObjOC.DtResultados(0)("Saldo").ToString.ToDecimal.Round(2) Else SaldoOCAnticipo = 0 End If @@ -5465,7 +5465,7 @@ Partial Class Bancos_IE Dim ObjOC As New ClsOC If ObjOC.GetOCAnticipoSaldo(CveOCSolicitudAnticipo, UsuarioActual.CveEmpresa) Then - SaldoOCAnticipo = ObjOC.DtResultados(0)("Saldo").ToString.ToDecimal + SaldoOCAnticipo = ObjOC.DtResultados(0)("Saldo").ToString.ToDecimal.RoundSQL(2) Else SaldoOCAnticipo = 0 End If @@ -5477,7 +5477,7 @@ Partial Class Bancos_IE If DrOC("TipoTermino").ToString.ToEntero.Contiene(0, 3) Then TxtObservaciones.Text = DrOC("Descripcion").ToString - If DrOC("ImporteAnticipo").ToString.ToDecimal > SaldoOCAnticipo Then + If DrOC("ImporteAnticipo").ToString.ToDecimal.RoundSQL(2) > SaldoOCAnticipo Then 'TxtImporte.Text = SaldoOCAnticipo.ToString().FormatoNumero 'TxtImporteLetra.Text = SaldoOCAnticipo.ToString().FormatoNumero.ToDouble.Texto2Letras(DrOC("CveMoneda").ToString.ToEntero) diff --git a/Bancos/PagoAcreedor.aspx.cs b/Bancos/PagoAcreedor.aspx.cs index a486cae6a..df4599748 100644 --- a/Bancos/PagoAcreedor.aspx.cs +++ b/Bancos/PagoAcreedor.aspx.cs @@ -73,20 +73,7 @@ public partial class Bancos_PagoAcreedor : ClsPaginas ViewState["IDCtaContableAcreedorComplementaria"] = value; } } - - private bool UsaComplementaria - { - get - { - return Convert.ToBoolean(ViewState["UsaComplementaria"]); - } - - set - { - ViewState["UsaComplementaria"] = value; - } - } - + private int CveMonedaCuentaPago { get @@ -110,10 +97,9 @@ public partial class Bancos_PagoAcreedor : ClsPaginas protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) - { - UsaComplementaria = true; + { CveMonedaCuentaPago = 0; - rowComisiones.Visible = UsuarioActual.CveEmpresa.Contiene(1, 4, 5, 7, 11, 12, 72, 80, 126, 119, 122); + rowComisiones.Visible = true; CargaTipoTransaccion(); CargaCuentas(); @@ -318,17 +304,13 @@ public partial class Bancos_PagoAcreedor : ClsPaginas if (CveIE > 0) { - //GUARDA COMPROBANTE - if (!filemove.Equals("")) - { - filemove.FilesMove(CveIE.ToString(), string.Format(@"{0}IE", UsuarioActual.Empresa.Ruta), ConcatenarDirectorioBase: false); - } + decimal Importe; decimal ImporteMN; decimal ImporteComision; decimal ImporteComisionMN; decimal AcumImporteMN = 0; - decimal ImportePago, ImporteAcreedor; + decimal ImporteBancosMN, ImporteAcreedorMN; bool TipoMovtoComision = false; int IdCtaContableOtrosGastos = 0; int CveConceptoDiferenciaCambiaria = 0; @@ -339,7 +321,8 @@ public partial class Bancos_PagoAcreedor : ClsPaginas Importe = gvr.FCTextBox("TxtAbonar").Text.ToDecimal(); ImporteComision = gvr.FCTextBox("TxtComision").Text.ToDecimal(); ImporteMN = Importe; - ImporteAcreedor = Importe; ImportePago = Importe; + ImporteAcreedorMN = Importe; + ImporteBancosMN = Importe; ImporteComisionMN = ImporteComision; ImporteComplementaria = 0; @@ -354,63 +337,47 @@ public partial class Bancos_PagoAcreedor : ClsPaginas { TipoMovtoComision = false; IdCtaContableOtrosGastos = UsuarioActual.Empresa.Funcionalidad(266).ToEntero(); - } - - Decimal TC = gvr.DataKey("TipoCambio").ToDecimal(); - if (gvr.DataKey("FechaDocumento").ToDate().Month != TxtFechaDocumento.Text.ToDate().Month || gvr.DataKey("FechaDocumento").ToDate().Year != TxtFechaDocumento.Text.ToDate().Year) - { - TC = get_GlobalTipoCambio(TxtFechaDocumento.Text.ToDate().AddMonths(-1).LastDayOfMonth()).ToDecimal(); - } - + } if (gvr.FCCheckBox("Chk").Checked) { - int tCveMoneda = gvr.DataKey("CveMoneda").ToEntero(); - if (CveMonedaPago == 1 && tCveMoneda == 1) + Decimal TC = gvr.DataKey("TipoCambio").ToDecimal(); + int tCveMoneda = gvr.DataKey("CveMoneda").ToEntero(); + //Verifica Fluctuación mensual + if (tCveMoneda > 1 && gvr.DataKey("FechaDocumento").ToDate() < TxtFechaDocumento.Text.ToDate().FirstDayOfMonth()) { - ImporteMN = Importe; - ImporteComisionMN = ImporteComision; - ImportePago = Importe; + TC = get_GlobalTipoCambio(TxtFechaDocumento.Text.ToDate().AddMonths(-1).LastDayOfMonth()).ToDecimal();//obtengo el TC del mes anterior del pago } - else if (CveMonedaPago == 1 && tCveMoneda == 2) - { - ImporteComisionMN = ImporteComision; - ImportePago = (Importe * TCPago).RoundSQL(); - if (UsaComplementaria) - { - ImporteMN = Importe; - ImporteComplementaria = (Importe * TC - Importe).RoundSQL(); - } - else - { - ImporteMN = Importe * TC; - ImporteComplementaria = 0; - } - } - else if (CveMonedaPago == 2 && tCveMoneda == 1) - { + ImporteBancosMN = (Importe * TCPago).RoundSQL(); + ImporteAcreedorMN = (Importe * TC).RoundSQL(); - ImporteMN = Importe; - ImporteComisionMN = ImporteComision; - ImporteComplementaria = 0; - } - else if (CveMonedaPago == 2 && tCveMoneda == 2) - { - ImporteComisionMN = ImporteComision; - if (UsaComplementaria) - { - ImporteMN = Importe; - ImporteComplementaria = (Importe * TC - Importe).RoundSQL(); - } - else - { - ImporteMN = (Importe * TC).RoundSQL(); - ImporteComplementaria = 0; - } - } + //if (CveMonedaPago == 1 && tCveMoneda == 1) + //{ + // ImporteMN = Importe; + // ImporteComisionMN = ImporteComision; + //} + //else if (CveMonedaPago == 1 && tCveMoneda == 2) + //{ + // ImporteComisionMN = ImporteComision; + + // ImporteMN = Importe; + // ImporteComplementaria = (Importe * TC - Importe).RoundSQL(); + //} + //else if (CveMonedaPago == 2 && tCveMoneda == 1) + //{ + // ImporteMN = Importe; + // ImporteComisionMN = ImporteComision; + // ImporteComplementaria = 0; + //} + //else if (CveMonedaPago == 2 && tCveMoneda == 2) + //{ + // ImporteComisionMN = ImporteComision; + // ImporteMN = Importe; + // ImporteComplementaria = (Importe * TC - Importe).RoundSQL(); + //} - ImporteMN = ImporteMN.RoundSQL(); - ImporteComplementaria = ImporteComplementaria.RoundSQL(); + //ImporteMN = ImporteMN.RoundSQL(); + //ImporteComplementaria = ImporteComplementaria.RoundSQL(); ImporteComisionMN = ImporteComisionMN.RoundSQL(); ImporteComision = ImporteComision.RoundSQL(); AcumImporteMN += ImporteMN; @@ -426,13 +393,14 @@ public partial class Bancos_PagoAcreedor : ClsPaginas break; } - if (UsaComplementaria && tCveMoneda > 1 && MsgError == "") + if (tCveMoneda > 1 && MsgError == "") { + ImporteComplementaria = (Importe * TC - Importe).RoundSQL(); if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, false, Importe, Ref, CveConceptoContablePrestamoComplementario, Conc, DateTime.Now, IDCtaContableAcreedorComplementaria, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: ImporteComplementaria, CveIEDevolucion: gvr.DataKey("CveIE").ToEntero(), ImporteME: Importe, TipoCambio: TC, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyecto.SelectedValue.ToEntero())) MsgError = "No se pudo insertar concepto de acreedor complementaria"; } - if (ImportePago != ImporteAcreedor && MsgError == "") + if (ImporteBancosMN != ImporteAcreedorMN && MsgError == "") { bool TipoMovto = false; int IdCtaContableDiferenciaCambiaria = 0; @@ -440,24 +408,23 @@ public partial class Bancos_PagoAcreedor : ClsPaginas { CveConceptoDiferenciaCambiaria = 65; IdCtaContableDiferenciaCambiaria = UsuarioActual.Empresa.IdCuentaPerdidaCambiaria; - TipoMovto = false; - Importe = (Importe * TCPago) - (Importe * TC); + TipoMovto = false; } else if (TCPago < TC) { CveConceptoDiferenciaCambiaria = 64; IdCtaContableDiferenciaCambiaria = UsuarioActual.Empresa.IdCuentaGananciaCambiaria; TipoMovto = true; - Importe = (Importe * TC) - (Importe * TCPago); } - ImporteMN = Importe; + Importe = ((Importe * TCPago) - (Importe * TC)).Abs(); - if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, TipoMovto, Importe, Ref, CveConceptoDiferenciaCambiaria, Conc, DateTime.Now, IdCtaContableDiferenciaCambiaria, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: ImporteMN, CveIEDevolucion: gvr.DataKey("CveIE").ToEntero(), ImporteME: Importe, TipoCambio: TC, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyectoPago.SelectedValue.ToEntero())) + if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, TipoMovto, Importe, Ref, CveConceptoDiferenciaCambiaria, Conc, DateTime.Now, IdCtaContableDiferenciaCambiaria, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: Importe, CveIEDevolucion: gvr.DataKey("CveIE").ToEntero(), ImporteME: Importe, TipoCambio: TC, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyectoPago.SelectedValue.ToEntero())) MsgError = "No se pudo insertar concepto de diferencia cambiaria"; } - if (ImporteComisionMN > 0 && MsgError == "") + if (ImporteComision != 0 && MsgError == "") { + ImporteComisionMN = (ImporteComision * TCPago).RoundSQL(); if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, TipoMovtoComision, ImporteComision, Ref, 255, Conc, DateTime.Now, IdCtaContableOtrosGastos, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: ImporteComisionMN, CveIEDevolucion: gvr.DataKey("CveIE").ToEntero(), TipoCambio: TC, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyectoPago.SelectedValue.ToEntero())) { MsgError = "No se pudo insertar concepto de pago acreedor"; @@ -468,46 +435,18 @@ public partial class Bancos_PagoAcreedor : ClsPaginas } if (CveMonedaPago != 1) - { - if (UsaComplementaria) - { - ImporteMNBanco = ImporteBanco; + { ImporteComplementaria = (ImporteBanco * TCPago - ImporteBanco).RoundSQL(); - } - else - { - ImporteMNBanco = (ImporteBanco * TCPago).RoundSQL(); - ImporteComplementaria = 0; - } } - if (MsgError == "" && !ObjMov.AddPrePolizasDetalle(CvePrePoliza, true, ImporteBanco, Ref, 30, Conc, DateTime.Now, IDCtaContableBancos, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: ImporteMNBanco, ImporteME: ImporteBanco, TipoCambio: TCPago, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyectoPago.SelectedValue.ToEntero())) MsgError = "No se pudo insertar concepto de bancos"; + if (MsgError == "" && !ObjMov.AddPrePolizasDetalle(CvePrePoliza, true, ImporteBanco, Ref, 30, Conc, DateTime.Now, IDCtaContableBancos, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: ImporteBanco, ImporteME: ImporteBanco, TipoCambio: TCPago, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyectoPago.SelectedValue.ToEntero())) MsgError = "No se pudo insertar concepto de bancos"; //movimiento de ajuste por sino se aplicó en el proceso anterior - if (MsgError == "" && CveMonedaPago != 1 && UsaComplementaria ) + if (MsgError == "" && CveMonedaPago != 1 ) { if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, true, ImporteBanco, Ref, 204, Conc, DateTime.Now, IDCtaContableBancosComplementario, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: ImporteComplementaria, ImporteME: ImporteBanco, TipoCambio: TCPago, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyectoPago.SelectedValue.ToEntero())) MsgError = "No se pudo insertar concepto de bancos complementaria"; - } - if (AcumImporteMN != (ImporteBanco + ImporteComplementaria) && CveConceptoDiferenciaCambiaria == 0) - { - int tCveConceptoOtIngresos = 0; - bool TipoMovtoOt = false; - decimal Dif = AcumImporteMN - (ImporteBanco + ImporteComplementaria); - if (Dif < 0) - { - tCveConceptoOtIngresos = 65; TipoMovtoOt = false; - } - else - { - tCveConceptoOtIngresos = 64; TipoMovtoOt = true; - } - - if (MsgError == "" && !ObjMov.AddPrePolizasDetalle(CvePrePoliza, TipoMovtoOt, Dif.Abs(), Ref, tCveConceptoOtIngresos, Conc, DateTime.Now, 0, -1, CveIE, CveProveedor: DdlProveedores.SelectedValue.ToEntero(), ImporteMX: Dif.Abs(), ImporteME: Dif.Abs(), TipoCambio: TCPago, TipoCambioPago: TCPago, CveSubProyecto: DdlSubProyectoPago.SelectedValue.ToEntero())) - { - MsgError = "No se pudo insertar concepto de ajuste en redondeo"; - } - } + } } else @@ -561,6 +500,11 @@ public partial class Bancos_PagoAcreedor : ClsPaginas Msg.AppendFormat("El Documento se guardo correctamente. Folio {1}
", CveIE, ObjIE.Folio); } + //GUARDA COMPROBANTE + if (!filemove.Equals("")) + { + filemove.FilesMove(CveIE.ToString(), string.Format(@"{0}IE", UsuarioActual.Empresa.Ruta), ConcatenarDirectorioBase: false); + } System.IO.FileInfo archivo = null; if (DdlTipoTransaccion.SelectedValue.ToEntero().Contiene(2, 8, 9)) @@ -726,18 +670,8 @@ public partial class Bancos_PagoAcreedor : ClsPaginas if (CveMoneda != 1) { - - if (UsaComplementaria) - { ImporteMN = Importe; - ImporteComplementaria = Importe * TC - Importe; - } - else - { - ImporteMN = Importe * TC; - ImporteComplementaria = 0; - } - + ImporteComplementaria = Importe * TC - Importe; } @@ -761,18 +695,16 @@ public partial class Bancos_PagoAcreedor : ClsPaginas if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, true, Importe, Ref, CveConceptoContablePrestamo, Conc, DateTime.Now, IDCtaContableAcreedorExtranjera, -1, CveIE, CveProveedor: DdlProveedorPrestamo.SelectedValue.ToEntero(), ImporteMX: ImporteMN, TipoCambio: TC, TipoCambioPago: TC, CveSubProyecto: DdlSubProyecto.SelectedValue.ToEntero())) { MsgError = "No se pudo insertar concepto de acreedor"; - } - if (UsaComplementaria) + } + if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, false, Importe, Ref, CveConceptoContableBancoComplementario, Conc, DateTime.Now, IDCtaContableBancosComplementario, -1, CveIE, CveProveedor: DdlProveedorPrestamo.SelectedValue.ToEntero(), ImporteMX: ImporteComplementaria, ImporteME: Importe, TipoCambio: TC, TipoCambioPago: TC, CveSubProyecto: DdlSubProyecto.SelectedValue.ToEntero())) { - if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, false, Importe, Ref, CveConceptoContableBancoComplementario, Conc, DateTime.Now, IDCtaContableBancosComplementario, -1, CveIE, CveProveedor: DdlProveedorPrestamo.SelectedValue.ToEntero(), ImporteMX: ImporteComplementaria, ImporteME: Importe, TipoCambio: TC, TipoCambioPago: TC, CveSubProyecto: DdlSubProyecto.SelectedValue.ToEntero())) - { - MsgError = "No se pudo insertar concepto de bancos complementaria"; - } - if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, true, Importe, Ref, CveConceptoContablePrestamoComplementario, Conc, DateTime.Now, IDCtaContableAcreedorComplementaria, -1, CveIE, CveProveedor: DdlProveedorPrestamo.SelectedValue.ToEntero(), ImporteMX: ImporteComplementaria, ImporteME: Importe, TipoCambio: TC, TipoCambioPago: TC, CveSubProyecto: DdlSubProyecto.SelectedValue.ToEntero())) - { - MsgError = "No se pudo insertar concepto de acreedor complementaria"; - } + MsgError = "No se pudo insertar concepto de bancos complementaria"; } + if (!ObjMov.AddPrePolizasDetalle(CvePrePoliza, true, Importe, Ref, CveConceptoContablePrestamoComplementario, Conc, DateTime.Now, IDCtaContableAcreedorComplementaria, -1, CveIE, CveProveedor: DdlProveedorPrestamo.SelectedValue.ToEntero(), ImporteMX: ImporteComplementaria, ImporteME: Importe, TipoCambio: TC, TipoCambioPago: TC, CveSubProyecto: DdlSubProyecto.SelectedValue.ToEntero())) + { + MsgError = "No se pudo insertar concepto de acreedor complementaria"; + } + } else { diff --git a/CGame/CatEmpaque.aspx b/CGame/CatEmpaque.aspx index f7d514f31..66ba447fd 100644 --- a/CGame/CatEmpaque.aspx +++ b/CGame/CatEmpaque.aspx @@ -8,10 +8,10 @@ display: none; } - .page-bar .page-breadcrumb{ + .page-bar .page-breadcrumb { display: none !important; } - + .portlet-title .font-green, .portlet-title .font-green a { color: #3598dc !important; } @@ -42,90 +42,89 @@ - -
+ +
-
- - Información +
+ + Información -
+
-
- - <%----%> -
-
-
-
-
-
- " style="display: inline-block; margin-right: -20px; width: 150px;" /> - " style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"> - - -
+
+ + <%----%> +
+
+
+
+ " style="display: inline-block; margin-right: -20px; width: 150px;" /> + " style="margin-top: -3px;" class="btn btn-circle btn-sm label-info">
+
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
+
+