diff --git a/App_GlobalResources/RadScheduler.Main.es-MX.resx b/App_GlobalResources/RadScheduler.Main.es-MX.resx deleted file mode 100644 index 4c9d7a4dd..000000000 --- a/App_GlobalResources/RadScheduler.Main.es-MX.resx +++ /dev/null @@ -1,456 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Please do not remove this key. - - - Todo el día - - - Diario - - - Día - - - día(s) - - - Título - - - Descripción - - - Fin despues - - - Fin en - - - Cada - - - Cada día - - - first - - - fourth - - - Inicio - - - Cada Hora - - - hora(s) - - - last - - - día - - - weekday - - - weekend day - - - Mensual - - - mes(es) - - - Más Detalles - - - Sin Fin - - - Veces - - - de - - - de cada - - - Range of recurrence: - - - Repetir cada - - - Perioricidad - - - Recurring task - - - reset exceptions - - - second - - - The - - - third - - - Fin - - - Semanal - - - semana(s) en - - - Anual - - - todo el día - - - Cancelar - - - Cancelar - - - Are you sure you want to delete this appointment? - - - Confirmar eliminar - - - OK - - - Delete only this occurrence. - - - Delete the series. - - - Deleting a recurring appointment - - - Editar solo la cita. - - - Editar la serie. - - - Editar la cita - - - Modificar la cita. - - - Resize the series. - - - Resizing a recurring appointment - - - Move only this occurrence. - - - Move the series. - - - Moving a recurring appointment - - - Día - - - Mes - - - Timeline - - - Multi-day - - - next day - - - previous day - - - hoy - - - Semana - - - Ver 24 horas... - - - Opciones - - - Ver horas trabajo... - - - más... - - - OK - - - Cancelar - - - Hoy - - - Please provide appointment subject - - - Start time must be before end time - - - Start time is required - - - Start date is required - - - End time is required - - - End date is required - - - Invalid number - - - Cargando... - - - Listo - - - New Cita - - - Editar Cita - - - Close - - - Confirm reset exceptions - - - Do you want to delete all existing recurrence exceptions? - - - Guardar - - - Nueva Cita - - - New Recurring Appointment - - - Delete - - - Editar - - - Go to today - - - Recordatorio - - - Recordatorios - - - due in - - - overdue - - - minuto - - - minutos - - - hora - - - horas - - - día - - - días - - - semana - - - semanas - - - - - - - Snooze - - - Dismiss - - - Dismiss All - - - Open Item - - - Click Snooze to be reminded again in: - - - before start - - - Time zone - - \ No newline at end of file diff --git a/App_GlobalResources/RadScheduler.Main.resx b/App_GlobalResources/RadScheduler.Main.resx deleted file mode 100644 index c2873eac0..000000000 --- a/App_GlobalResources/RadScheduler.Main.resx +++ /dev/null @@ -1,456 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Please do not remove this key. - - - All day - - - Daily - - - Day - - - day(s) - - - Subject - - - Description - - - End after - - - End by - - - Every - - - Every weekday - - - first - - - fourth - - - Start time - - - Hourly - - - hour(s) - - - last - - - day - - - weekday - - - weekend day - - - Monthly - - - month(s) - - - More details - - - No end date - - - occurrences - - - of - - - of every - - - Range of recurrence: - - - Recur every - - - Recurrence - - - Recurring task - - - reset exceptions - - - second - - - The - - - third - - - End time - - - Weekly - - - week(s) on - - - Yearly - - - all day - - - Cancel - - - Cancel - - - Are you sure you want to delete this appointment? - - - Confirm delete - - - OK - - - Delete only this occurrence. - - - Delete the series. - - - Deleting a recurring appointment - - - Edit only this occurrence. - - - Edit the series. - - - Editing a recurring appointment - - - Resize only this occurrence. - - - Resize the series. - - - Resizing a recurring appointment - - - Move only this occurrence. - - - Move the series. - - - Moving a recurring appointment - - - Day - - - Month - - - Timeline - - - Multi-day - - - next day - - - previous day - - - today - - - Week - - - Show 24 hours... - - - Options - - - Show business hours... - - - more... - - - OK - - - Cancel - - - Today - - - Please provide appointment subject - - - Start time must be before end time - - - Start time is required - - - Start date is required - - - End time is required - - - End date is required - - - Invalid number - - - Working... - - - Done - - - New Appointment - - - Edit Appointment - - - Close - - - Confirm reset exceptions - - - Do you want to delete all existing recurrence exceptions? - - - Save - - - New Appointment - - - New Recurring Appointment - - - Delete - - - Edit - - - Go to today - - - Reminder - - - Reminders - - - due in - - - overdue - - - minute - - - minutes - - - hour - - - hours - - - day - - - days - - - week - - - weeks - - - None - - - Snooze - - - Dismiss - - - Dismiss All - - - Open Item - - - Click Snooze to be reminded again in: - - - before start - - - Time zone - - \ No newline at end of file diff --git a/App_GlobalResources/RadSchedulerRecurrenceEditor.resx b/App_GlobalResources/RadSchedulerRecurrenceEditor.resx deleted file mode 100644 index 7baa4911c..000000000 --- a/App_GlobalResources/RadSchedulerRecurrenceEditor.resx +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Please do not remove this key. - - - Recurrence - - - Hourly - - - Daily - - - Weekly - - - Monthly - - - Yearly - - - Every - - - hour(s) - - - day(s) - - - week(s) on - - - month(s) - - - Every weekday - - - Recur every - - - Day - - - of every - - - first - - - second - - - third - - - fourth - - - last - - - day - - - weekday - - - weekend day - - - The - - - of - - - No end date - - - End after - - - End by - - - occurrences - - - OK - - - Cancel - - - Today - - \ No newline at end of file diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb index 94533a423..d3b746536 100644 --- a/Bancos/IE.aspx.vb +++ b/Bancos/IE.aspx.vb @@ -3850,22 +3850,28 @@ Partial Class Bancos_IE 'Conta ContPAQ If UsuarioActual.Empresa.Funcionalidad(200) = "1" AndAlso MsgError = "" Then - If IDCtaBeneficiario > 0 And IDCtaContable > 0 Then + Dim AutoConta As Boolean = True + If UsuarioActual.Empresa.TipoContabilidad = 2 Then + If Not (IDCtaBeneficiario > 0 And IDCtaContable > 0) Then + AutoConta = False + If IDCtaContable < 1 Then + Alert("No se puede contabilizar la Prepoliza debido a que la cuenta de Bancos es invalida", TipoMensaje.MsgAdvertencia) + End If + If IDCtaBeneficiario < 1 Then + Alert("No se puede contabilizar la Prepoliza debido a que las cuenta del Beneficiario es invalida", TipoMensaje.MsgAdvertencia) + End If + End If + End If + + If AutoConta Then If ObjMov.ContabilizarPrePoliza(CvePrePoliza, UsuarioActual.CveUsuario, UsuarioActual.Empresa) Then IDPoliza = ObjMov.ContaIdPoliza - 'Alert(alertaContabilizacion & ObjMov.AlertaMensaje, ModExtensiones.TipoMensaje.MsgInformacion) Else Alert("Ocurrio un error al contabilizar, pongase en contacto con Soporte Técnico", TipoMensaje.MsgError) MsgError = "Error al contabilizar." End If - Else - If IDCtaContable < 1 Then - Alert("No se puede contabilizar la Prepoliza debido a que la cuenta de Bancos es invalida", TipoMensaje.MsgAdvertencia) - End If - If IDCtaBeneficiario < 1 Then - Alert("No se puede contabilizar la Prepoliza debido a que las cuenta del Beneficiario es invalida", TipoMensaje.MsgAdvertencia) - End If End If + End If If MsgError = "" Then diff --git a/Inventarios/TraspasoAlmacen.aspx.vb b/Inventarios/TraspasoAlmacen.aspx.vb index b4088ea7e..076f9ac39 100644 --- a/Inventarios/TraspasoAlmacen.aspx.vb +++ b/Inventarios/TraspasoAlmacen.aspx.vb @@ -3354,29 +3354,6 @@ Partial Class Inventarios_TraspasoAlmacen Return Respuesta End Function - Private Sub CargaDireccionesEnvio() - Dim ObjClientes As New ClsClientes - Dim TieneError = False - - DdlDireccionEnvio.Items.Clear() - If ObjClientes.DireccionEnvioGet(-1, CveCliente, -1) Then - DdlDireccionEnvio.DataSource = ObjClientes.DtResultados.FiltraParametros(String.Format("Estatus = 1")) - DdlDireccionEnvio.DataBind() - 'DdlDireccionEnvio.Items.Insert(0, New ListItem("Seleccione", "-1")) - TmpDTEnvioDireccion = ObjClientes.DtResultados - Else - TieneError = True - End If - - If TieneError Then - Alert("Ocurrió un error al obtener las direcciones de envío", TipoMensaje.MsgError) - End If - - ObjClientes.Dispose() - UpCliente.Update() - - End Sub - #End Region End Class diff --git a/SAT/SolicitudesIngresoSat.aspx.cs b/SAT/SolicitudesIngresoSat.aspx.cs index 4e9d4ba09..6b5e5f4df 100644 --- a/SAT/SolicitudesIngresoSat.aspx.cs +++ b/SAT/SolicitudesIngresoSat.aspx.cs @@ -616,6 +616,7 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas } catch (Exception ex) { + string a = ex.Message; try { var oReader = new System.IO.StreamReader(f.FullName, System.Text.Encoding.GetEncoding("ISO-8859-1")); @@ -859,6 +860,7 @@ namespace ADSNetLibraryzI.HelpersI.ConexionesI.SIGAPII } catch (Exception e) { + string a = e.Message; //ModExtensiones.GuardaLog(string.Format("{0}{1}{2}{1}{3}{1}{4}{1}", tituloLog, ModVars.NewLine, route, e, strjsonreq), ModVars.ADSNetLibraryLog); } diff --git a/Ventas/Clientes.aspx b/Ventas/Clientes.aspx index ba8e4ec33..97e44ab27 100644 --- a/Ventas/Clientes.aspx +++ b/Ventas/Clientes.aspx @@ -1643,7 +1643,7 @@
-
+
@@ -1813,7 +1813,7 @@
- +
@@ -1864,7 +1864,7 @@
-
+
@@ -1879,9 +1879,9 @@
-
+
-
+
@@ -1892,9 +1892,9 @@
-
+
- + @@ -1905,7 +1905,7 @@
-
+
@@ -1916,7 +1916,7 @@
-
+
@@ -1957,11 +1957,11 @@
-
+
-
+
   @@ -1978,337 +1978,7 @@
- - - <%--
- -
-
-
- - Parametros -
-
- -
-
-
- - - - - -
-
-
- -
-
-
-
- - Estado de Cuenta -
-
- -
-
-
- - -
-
- -
- - - - - - -
-
-
- -
- - - - - - -
-
-
-
-
- -
- - - - - - -
-
-
- -
- - - - - - -
-
-
- -
-
- - - - - -
- -
- - - - - - - - - - - -
-
-
-
- -
-
-
-
- -    -
-
- - - - -
-
-
-
-
-
-
- - --%> - - - - +
@@ -5448,7 +5118,7 @@
- +
diff --git a/Ventas/Clientes.aspx.vb b/Ventas/Clientes.aspx.vb index ec502615f..bff2d9844 100644 --- a/Ventas/Clientes.aspx.vb +++ b/Ventas/Clientes.aspx.vb @@ -1974,6 +1974,7 @@ Partial Class Clientes If ObjMovtos.GetCxCClienteDetalle(CveCliente, "-1", "-1", -1, -1, UsuarioActual.CveEmpresa, DdlSucursalCliente.SelectedValue.ToEntero()) Then DtCxCActivas = ObjMovtos.DtResultados.FiltraParametros("Tipo = 'Act'", "Moneda, OrdenVencimiento, FechaVencimiento") GvCxC.DataSource = DtCxCActivas + If DtCxCActivas.MAX("LineaAdicional") = "" Then GvCxC.Columns(6).Visible = False 'solo tomo los 10 ultimos mas el totalizador general Dim dt As DataTable = ObjMovtos.DtResultados.FiltraParametros("Tipo = 'Hist'") DtHistorialCxC = dt @@ -2963,30 +2964,14 @@ Partial Class Clientes #Region "G R I D V I E W S" Protected Sub GVHistorial_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GVHistorial.RowDataBound If e.Row.RowType = DataControlRowType.DataRow Then - Dim HLSendMail As HtmlAnchor = DirectCast(e.Row.FindControl("HLSendMail"), HtmlAnchor) - 'Dim HLRemision As HtmlAnchor = DirectCast(e.Row.FindControl("HLRemision"), HtmlAnchor) - - - e.Row.Cells(3).HorizontalAlign = HorizontalAlign.Right - e.Row.Cells(4).HorizontalAlign = HorizontalAlign.Right - e.Row.Cells(5).HorizontalAlign = HorizontalAlign.Right - e.Row.Cells(6).HorizontalAlign = HorizontalAlign.Right - - + Dim HLSendMail As HtmlAnchor = DirectCast(e.Row.FindControl("HLSendMail"), HtmlAnchor) + 'Dim HLRemision As HtmlAnchor = DirectCast(e.Row.FindControl("HLRemision"), HtmlAnchor) + If e.Row.RowIndex = 0 Then e.Row.BackColor = Drawing.Color.LightGray HLSendMail.Visible = False 'HLRemision.Visible = False - End If - - - 'If e.Row.RowIndex > 0 AndAlso e.Row.DBCampo("TipoDocto") <> "Rem" Then - ' HLRemision.Visible = False - 'ElseIf e.Row.RowIndex > 0 AndAlso e.Row.DBCampo("TipoDocto") = "Rem" AndAlso e.Row.DBCampo("CveVentaFacturada") <> String.Empty Then - ' HLRemision.Visible = False - 'End If - 'HLRemision.HRef = $"/Ventas/Ventas.aspx?CveRemision={e.Row.DBCampo("CveVenta")}" - + End If Dim Liga As String = String.Format("< a class=""Texto"" href=""/Ventas/Ventas.aspx?CveVenta={0}"">", e.Row.DBCampo("CveVenta")) HLSendMail.HRef = String.Format("javascript:(function mail(){{$get('HdnTipoDocto').value='{0}';$get('HdnCveVenta').value='{1}';$get('HdnFolioVenta').value='{2}';$get('TxtParaMail').value='{3}';$get('HdnSerieFolio').value='{4}';$get('HdnSubProyecto').value='{5}';$('#ModalDivMail').modal();void(0);}})();", e.Row.DBCampo("TipoDocto"), e.Row.DBCampo("CveVenta"), e.Row.DBCampo("folio"), e.Row.DBCampo("Correo"), e.Row.DBCampo("SerieFolio"), e.Row.DBCampo("SubProyecto")) e.Row.FCLiteral("LtlFactura").Text = String.Format("{1}", e.Row.DBCampo("CveVenta"), e.Row.DBCampo("Folio")) @@ -3007,12 +2992,8 @@ Partial Class Clientes e.Row.Cells(7).Width = Unit.Pixel(90) e.Row.Cells(8).Width = Unit.Pixel(80) e.Row.Cells(9).Width = Unit.Pixel(70) - End If - - e.Row.Cells(5).HorizontalAlign = HorizontalAlign.Right - e.Row.Cells(6).HorizontalAlign = HorizontalAlign.Right - e.Row.Cells(7).HorizontalAlign = HorizontalAlign.Right - + End If + If e.Row.DBCampo("Saldo").ToDouble < 0 Then e.Row.Cells(6).ForeColor = Drawing.Color.Red If e.Row.DBCampo("DiasVencidos").ToDouble > 0 AndAlso CType(sender, GridView).ID = "GvCxC" Then e.Row.Cells(4).ForeColor = Drawing.Color.Red If e.Row.DBCampo("Original").ToDouble = 0 Then DirectCast(e.Row.FindControl("LtlSaldoOriginal"), Literal).Text = "" diff --git a/Ventas/RepLineasAdicionales.aspx b/Ventas/RepLineasAdicionales.aspx index 3953c6bda..d0682f9df 100644 --- a/Ventas/RepLineasAdicionales.aspx +++ b/Ventas/RepLineasAdicionales.aspx @@ -113,7 +113,7 @@ - + @@ -129,9 +129,9 @@ OnRowDataBound="GvLAPO_RowDataBound"> - - - + + + @@ -141,7 +141,7 @@ - +