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-02-03 03:17:01 -07:00
parent 66a6e1c593
commit 6f971b4220
4 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
GPS/PalletEtiquetaCaja.rdlc
View File

@@ -898,7 +898,6 @@ KM12 HERMOSILLO, SONORA</Value>
</Style>
</Textbox>
<ColSpan>5</ColSpan>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell />
@@ -2457,41 +2456,20 @@ KM12 HERMOSILLO, SONORA</Value>
</TablixCells>
</TablixRow>
<TablixRow>
<Height>1.44667cm</Height>
<Height>1.18209cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="Textbox821">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!noPallet.Value</Value>
<Style>
<FontFamily>Free 3 of 9 Extended</FontFamily>
<FontSize>41pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox821</rd:DefaultName>
<Image Name="Image2">
<Source>Embedded</Source>
<Value>CodBarr</Value>
<Sizing>FitProportional</Sizing>
<Style>
<Border>
<Style>None</Style>
</Border>
<VerticalAlign>Bottom</VerticalAlign>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</Image>
<ColSpan>5</ColSpan>
</CellContents>
</TablixCell>
@@ -2501,37 +2479,16 @@ KM12 HERMOSILLO, SONORA</Value>
<TablixCell />
<TablixCell>
<CellContents>
<Textbox Name="Textbox822">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!noPallet.Value</Value>
<Style>
<FontFamily>Free 3 of 9 Extended</FontFamily>
<FontSize>41pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox821</rd:DefaultName>
<Image Name="Image3">
<Source>Embedded</Source>
<Value>CodBarr</Value>
<Sizing>FitProportional</Sizing>
<Style>
<Border>
<Style>None</Style>
</Border>
<VerticalAlign>Bottom</VerticalAlign>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</Image>
<ColSpan>5</ColSpan>
</CellContents>
</TablixCell>
@@ -2542,7 +2499,7 @@ KM12 HERMOSILLO, SONORA</Value>
</TablixCells>
</TablixRow>
<TablixRow>
<Height>0.62646cm</Height>
<Height>0.49417cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
@@ -3026,8 +2983,8 @@ Produce of MX.</Value>
</TablixRowHierarchy>
<Top>0.07228cm</Top>
<Left>0.05625cm</Left>
<Height>10.59604cm</Height>
<Width>10.52137cm</Width>
<Height>10.19917cm</Height>
<Width>10.52136cm</Width>
<Style>
<Border>
<Style>None</Style>
@@ -3229,6 +3186,13 @@ tz/88IQXNLT1jvK6x5rYowb8xgXvcqDTfe8tfhiRVs/61rv+9bCPvexnT/va2/72uM+97nfP+977/vfA
+qAIhvmYQymZeniYlTmZkGmZjrmZmpmZl0mZkfmZoxmanmmaoNmZqemNosmZrHmaqlkQibmWNtiYr/mWwTiMaqEPiwAAd0gk9NiHEMCbJGiCrDeQyqCYPamXg7l7EZiT3hiYRCGZ4ficlxmY1kmI2EkF0PmTZZid0fmd3Hmd4tmdtHkK4Omd6Dme2lme5Lme5lmY8Pme6Xme9Smf9ymdNUGdrBmf+okQxWieSYmEzEmKFFiMReCGcsicfTiTBcGfzVmTVPAA5Imby8maFNqe0SCG/jl+HFqhH6qhIRqeG8qeJDqi3v9Zoh2qoiBqoimKorTJoiLqojEKo7ZJohhaoXJ5kjUxDzFwAwKRA3qpiMNYjJKIfsNwgUU4oLqpoREKfDDakWqpnggRpdRZn1I6n/vpnluqpQxxpTSapVgKpgJKpm9ppl06plz6pWuKEGjKpoIpn1UaphAKl62nD8vYlwhhgatIjLFYEHYpoHz6h8D4n0/aexc6pzN5o/uQqIAqmo66D2IImZE6qUv5hZbKqJlaqZCKqZ2qh5vqqZQqqpcKqp/KEKFqqqOqqhb6hZz6hQPJepjpjb0ZAE0aqDqKgpLYpBsYqYeqe5FplQKapd44l2AZrGJZmcKqrMmKrMdqrGTprNHMCq1wKa3VSq1Caa3Ziq1Uqa3dyq1KOZ1q6a3h+pNBuXpyupbr95ZU2Z68GIxu2Xp1+qu7F6uxmqIMEasWqa/6yK8+6K8ICYb/6pD7SrD9arADy4QJ64QL+4MNK7AB+5APK7GFCqsI65gCOqtJmaHBCARxGYx3EJU/CZEFiq/0ynu+WLEcmbKyKIqtuIqvWIu0CLO2KLMvO4s367KgiLM7q7Mty4o9C7Q/G7M0e67nWZRFe5MpqRbLiACOmKQQCYYRqRbFSI39F41S+3rpwXqyu6eES2qyWIiEcWiwUwiGZfuQZ+u1Y8uEafuEZnuFb5uFYUu2cIu2CjG1Trq2NWGRG6gIdgiBCqoQ
0FkLf3uGgTsQGeurXIt7CqgW89p/BuiAAii5BAi5D3h/l1uAmWu5k4u5nau5n8u5lZuAkeu5o9u4oOsACOimUyq6CDiSvOqNvOCBDUCoRtoX3YkMMCAQtQugnQEAw/q4izu8xFu8xnu8yJu8yru8zNu8zvu80Bu90ju91Fu91nu92Lu4AQEAOw==</ImageData>
</EmbeddedImage>
<EmbeddedImage Name="CodBarr">
<MIMEType>image/png</MIMEType>
<ImageData>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
G/UY+X4AAAAASUVORK5CYII=</ImageData>
</EmbeddedImage>
</EmbeddedImages>
<rd:ReportUnitType>Cm</rd:ReportUnitType>
<rd:ReportID>ab0e0117-79b9-44e9-a7a3-e3d163f1ee55</rd:ReportID>

2
Nomina/Nomina.aspx
View File

@@ -196,7 +196,7 @@
<asp:LinkButton ID="LnkTimbrarTodos" Visible="false" OnClick="LnkTimbrarTodos_Click" runat="server"><i class="fa fa-bell"></i> Timbrar todos</asp:LinkButton>
</li>
<li>
<asp:LinkButton ID="LnkRegistrarProvision" Visible="false" OnClick="LnkRegistrarProvision_Click" runat="server"><i class="fa fa-thumbs-up" aria-hidden="true"></i>Registrar provisión</asp:LinkButton>
<asp:LinkButton ID="LnkRegistrarProvision" Visible="false" OnClick="LnkRegistrarProvision_Click" runat="server" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea registrar provisión?" data-btn-ok-label="si" ><i class="fa fa-thumbs-up" aria-hidden="true" ></i>Registrar provisión</asp:LinkButton>
</li>
<li>
<asp:HyperLink ID="LnkProvisionNomina" Visible="false" runat="server"><i class="fa fa-eye"></i>Ver provisión</asp:HyperLink>

3
Nomina/Nomina.aspx.cs
View File

@@ -439,7 +439,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
int CvePrePolizaProrrateo = drow["CvePrePolizaProrrateo"].ToString().ToEntero();
//LnkConceptoEmpleado.Visible = (Estatus == 1);
LnkRegistrarProvision.Visible = (Estatus >= 2) && (CvePrePolizaProvision <= 0 || UsuarioActual.CveUsuario == 100);
LnkRegistrarProvision.Visible = (Estatus >= 2);//&& (CvePrePolizaProvision <= 0 || UsuarioActual.CveUsuario == 100);
LnkRegistrarProvision.Text = CvePrePolizaProvision <= 0 ? "<i class=\"fa fa-thumbs-up\" aria-hidden=\"true\" ></i>Registrar provisión" : "<i class=\"fa fa-thumbs-up\" aria-hidden=\"true\" ></i>Regenerar provisión";
LnkConceptoEmpleado.Visible = true;//(Estatus < 2);
LnkCargaAsistenciaMasiva.Visible = (Estatus < 2);
LnkModalPlantillaNomina.Visible = true;

2
vwd.webinfo
View File

@@ -410,6 +410,8 @@