AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2022-04-13 08:23:01 -07:00
parent fc5c4b8d41
commit 01b82be964
5 changed files with 325 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Contabilidad/RegPrePolizaS.aspx
View File

@@ -4,6 +4,10 @@
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style> <style>
tr.Titulos {
display: table-row !important;
}
.GvMov input, .GvMov td { .GvMov input, .GvMov td {
height: 20px !important; height: 20px !important;
} }
@@ -499,7 +503,8 @@
<HeaderTemplate>Cargo</HeaderTemplate> <HeaderTemplate>Cargo</HeaderTemplate>
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtCargo" CssClass="txtcargo" runat="server" Style="text-align: right" Width="65px" Visible="False"></asp:TextBox> <asp:TextBox ID="TxtCargo" CssClass="txtcargo" runat="server" Style="text-align: right" Width="65px" Visible="False"></asp:TextBox>
<div id="divCargoME" runat="server" Visible="False">ME:<asp:TextBox ID="TxtCargoME" CssClass="" runat="server" Style="text-align: right" Width="55px"></asp:TextBox> <div id="divCargoME" runat="server" visible="False">
ME:<asp:TextBox ID="TxtCargoME" CssClass="" runat="server" Style="text-align: right" Width="55px"></asp:TextBox>
TC:<asp:TextBox ID="TxtTC" CssClass="" runat="server" Style="text-align: right" Width="45px"></asp:TextBox> TC:<asp:TextBox ID="TxtTC" CssClass="" runat="server" Style="text-align: right" Width="45px"></asp:TextBox>
</div> </div>
</ItemTemplate> </ItemTemplate>
@@ -509,7 +514,7 @@
<HeaderTemplate>Abono</HeaderTemplate> <HeaderTemplate>Abono</HeaderTemplate>
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtAbono" CssClass="txtabono" runat="server" Style="text-align: right" Width="65px" Visible="False"></asp:TextBox> <asp:TextBox ID="TxtAbono" CssClass="txtabono" runat="server" Style="text-align: right" Width="65px" Visible="False"></asp:TextBox>
<div id="divAbonoME" runat="server" Visible="False">ME:<asp:TextBox ID="TxtAbonoME" CssClass="" runat="server" Style="text-align: right" Width="55px" ></asp:TextBox></div> <div id="divAbonoME" runat="server" visible="False">ME:<asp:TextBox ID="TxtAbonoME" CssClass="" runat="server" Style="text-align: right" Width="55px"></asp:TextBox></div>
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Right" /> <ItemStyle HorizontalAlign="Right" />
</asp:TemplateField> </asp:TemplateField>
@@ -542,7 +547,7 @@
<asp:UpdatePanel ID="UpPrePoliza" runat="server" UpdateMode="Conditional"> <asp:UpdatePanel ID="UpPrePoliza" runat="server" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
<div style="width: 100%; min-height: 200px;overflow-scrolling:auto;"> <div style="width: 100%; min-height: 200px; overflow-scrolling: auto;">
<div class="portlet light xspadding bordered " id="pnldl"> <div class="portlet light xspadding bordered " id="pnldl">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption "> <div class="caption ">
@@ -566,7 +571,7 @@
<div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom "> <div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom ">
<asp:GridView ID="GvPrePoliza" runat="server" AutoGenerateColumns="False" CssClass="table table-striped table-advance table-hover mysmallbtn GvPrePoliza" GridLines="None" <asp:GridView ID="GvPrePoliza" runat="server" AutoGenerateColumns="False" CssClass="table table-striped table-advance table-hover mysmallbtn GvPrePoliza" GridLines="None"
DataKeyNames="CvePrePolizaDetalle, CveConceptoContable, IdCtaContable, CveSubProyecto, CveTipoGasto,Referencia,CveVenta,CveCompra, CveProveedor, CveCliente, CvePersonal, CveCuenta, PorcentajeImpuesto,TipoMovto,EsComplementaria,Concepto,CveClasificacion,ContadoCuenta,ContadoTipoTransaccion,ContadoNumeroFolio,ContadoBeneficiario,ContadoObservaciones,ContadoImporte,TC" Width="100%" > DataKeyNames="CvePrePolizaDetalle, CveConceptoContable, IdCtaContable, CveSubProyecto, CveTipoGasto,Referencia,CveVenta,CveCompra, CveProveedor, CveCliente, CvePersonal, CveCuenta, PorcentajeImpuesto,TipoMovto,EsComplementaria,Concepto,CveClasificacion,ContadoCuenta,ContadoTipoTransaccion,ContadoNumeroFolio,ContadoBeneficiario,ContadoObservaciones,ContadoImporte,TC" Width="100%">
<Columns> <Columns>
<asp:TemplateField> <asp:TemplateField>
<HeaderTemplate>Movimiento</HeaderTemplate> <HeaderTemplate>Movimiento</HeaderTemplate>
@@ -650,7 +655,7 @@
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField > <asp:TemplateField>
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="LnkEdit" runat="server" AlternateText="Actualizar" CausesValidation="True" CommandName="Update" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" /> <asp:LinkButton ID="LnkEdit" runat="server" AlternateText="Actualizar" CausesValidation="True" CommandName="Update" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" />
<asp:LinkButton ID="LnkGvPrePolizaEliminar" OnClick="LnkGvPrePolizaEliminar_Click" runat="server" AlternateText="Eliminar" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" <asp:LinkButton ID="LnkGvPrePolizaEliminar" OnClick="LnkGvPrePolizaEliminar_Click" runat="server" AlternateText="Eliminar" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>"
@@ -659,9 +664,9 @@
<ItemStyle Width="120px" /> <ItemStyle Width="120px" />
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField > <asp:TemplateField>
<ItemTemplate> <ItemTemplate>
<asp:CheckBox runat="server" ID="chkModificado" Checked="false" Visible="false"/> <asp:CheckBox runat="server" ID="chkModificado" Checked="false" Visible="false" />
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Right" Width="5px" /> <ItemStyle HorizontalAlign="Right" Width="5px" />
</asp:TemplateField> </asp:TemplateField>
@@ -812,7 +817,7 @@
<div id="DivEditConcepto" align="center" class="modal ADS fade" role="dialog"> <div id="DivEditConcepto" align="center" class="modal ADS fade" role="dialog">
<div class="modal-dialog" style="width: 450px;" id="DvMoldalConceptoAncho" > <div class="modal-dialog" style="width: 450px;" id="DvMoldalConceptoAncho">
<asp:UpdatePanel ID="UpModalConcepto" runat="server" class="modal-content" UpdateMode="Conditional"> <asp:UpdatePanel ID="UpModalConcepto" runat="server" class="modal-content" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>

6
Nomina/Nomina.aspx
View File

@@ -4,9 +4,9 @@
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style> <style>
/*#pnlIncapacidade .form-group.form-md-line-input > .select2-container { #pnlIncapacidade .form-group.form-md-line-input > .select2-container {
margin-top: 0px; margin-top: 20px;
}*/ }
.lnkMovotPermanente{ .lnkMovotPermanente{
width:100%; width:100%;
color:#111; color:#111;

16
RH/CatPersonal.aspx.vb
View File

@@ -1261,6 +1261,22 @@ Partial Class RH_CatPersonal
DdlTipoTrabajador.DataSource = dt DdlTipoTrabajador.DataSource = dt
DdlTipoTrabajador.DataBind() DdlTipoTrabajador.DataBind()
End If End If
If DdlSubProyectoAsignadoAdd.SelectedValue.ToEntero().Contiene(11954, 11884, 11883) Then
Dim objgenerales As New ClsGenerales()
objgenerales.GetMediosTransporte(-1, True, UsuarioActual.CveEmpresa, 1, -1, -1, -1)
DdlMedioTransporte.Items.Clear()
DdlMedioTransporte.DataSource = objgenerales.DtResultados
DdlMedioTransporte.DataBind()
Else
Dim objgenerales As New ClsGenerales()
objgenerales.GetMediosTransporte(-1, True, UsuarioActual.CveEmpresa, -1, DdlSubProyectoAsignadoAdd.SelectedValue.ToEntero(), -1, -1)
DdlMedioTransporte.Items.Clear()
DdlMedioTransporte.DataSource = objgenerales.DtResultados
DdlMedioTransporte.DataBind()
End If
End Using End Using
End Sub End Sub

5
SAT/SolicitudesNominaSat.aspx
View File

@@ -196,6 +196,11 @@
.reporte9 .GVSolicitudTimbreNominaGral tr td:nth-child(4) { .reporte9 .GVSolicitudTimbreNominaGral tr td:nth-child(4) {
white-space: nowrap; white-space: nowrap;
} }
.reporte9 .GVSolicitudTimbreNominaGral tr td:nth-child(2),
.reporte9 .GVSolicitudTimbreNominaGral tr td:nth-child(3),
.reporte9 .GVSolicitudTimbreNominaGral tr td:nth-child(n+40) {
text-align: right !important;
}
</style> </style>
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">

2
vwd.webinfo
View File

@@ -466,6 +466,8 @@