This commit is contained in:
2022-05-11 13:32:47 -07:00
5 changed files with 383 additions and 202 deletions

View File

@@ -273,7 +273,7 @@ Partial Class PopUpVerFactura
Camion = String.Format("{0} {1}", row("CamEspecificacion"), row("CamAnio"))
Rem1Placa = row("Rem1Placa").ToString()
NoFactura = row("NoFactura").ToString()
Remolque1 = String.Format("{0} ", row("NumeroTrailer"), row("Rem1Anio"))
Remolque1 = String.Format("{0} ", row("NumeroRemolque"), row("Rem1Anio"))
Mercado = If(row("CveDestino").ToString() = "2", "Extranjero", "Nacional")
NumeroTrailer = String.Format("No. {0}", row("NumeroTrailer").ToString())
@@ -419,7 +419,7 @@ Partial Class PopUpVerFactura
Camion = String.Format("{0} {1}", row("CamEspecificacion"), row("CamAnio"))
Rem1Placa = row("Rem1Placa").ToString()
NoFactura = row("NoFactura").ToString()
Remolque1 = String.Format("{0} ", row("NumeroTrailer"))
Remolque1 = String.Format("{0} ", row("NumeroRemolque"))
Mercado = If(row("CveDestino").ToString() = "2", "Extranjero", "Nacional")
NumeroTrailer = String.Format("No. {0}", row("NumeroTrailer").ToString())
@@ -574,7 +574,7 @@ Partial Class PopUpVerFactura
Camion = String.Format("{0} {1}", row("CamEspecificacion"), row("CamAnio"))
Rem1Placa = row("Rem1Placa").ToString()
NoFactura = row("NoFactura").ToString()
Remolque1 = String.Format("{0} ", row("NumeroTrailer"))
Remolque1 = String.Format("{0} ", row("NumeroRemolque"))
Mercado = If(row("CveDestino").ToString() = "2", "Extranjero", "Nacional")
NumeroTrailer = String.Format("No. {0}", row("NumeroTrailer").ToString())

View File

@@ -547,12 +547,41 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value />
<Value>Camelia, #346, Col.:Luis Encinas,</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value> C.P. 83138 Hermosillo</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value xml:space="preserve"> </Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize>
<FontWeight>Normal</FontWeight>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
@@ -562,8 +591,8 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox4</rd:DefaultName>
<Left>1.7536in</Left>
<Height>0.59155in</Height>
<Left>1.76749in</Left>
<Height>0.67352in</Height>
<Width>3.86673in</Width>
<ZIndex>4</ZIndex>
<Style>
@@ -729,9 +758,9 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox10</rd:DefaultName>
<Top>0.51102in</Top>
<Top>0.67352in</Top>
<Left>1.7536in</Left>
<Height>0.65513in</Height>
<Height>0.43025in</Height>
<Width>2.01842in</Width>
<ZIndex>8</ZIndex>
<Visibility>
@@ -782,9 +811,9 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox10</rd:DefaultName>
<Top>0.51102in</Top>
<Top>0.67352in</Top>
<Left>3.77202in</Left>
<Height>0.65513in</Height>
<Height>0.43025in</Height>
<Width>1.88998in</Width>
<ZIndex>9</ZIndex>
<Style>
@@ -794,90 +823,6 @@
<VerticalAlign>Top</VerticalAlign>
</Style>
</Textbox>
<Textbox Name="Textbox19">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Nombre</Value>
<Style>
<FontSize>9pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.13777in</Top>
<Left>0.14361cm</Left>
<Height>0.22222in</Height>
<Width>0.81128in</Width>
<ZIndex>10</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox20">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!ClienteNombre.Value</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>7pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.13777in</Top>
<Left>0.86782in</Left>
<Height>0.22222in</Height>
<Width>4.79418in</Width>
<ZIndex>11</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Rectangle Name="Rectangle1">
<ReportItems>
<Textbox Name="Textbox77">
@@ -1488,7 +1433,7 @@
<Left>0.0208cm</Left>
<Height>2.10099cm</Height>
<Width>20.06179cm</Width>
<ZIndex>12</ZIndex>
<ZIndex>10</ZIndex>
<Visibility>
<Hidden>= (Parameters!AplicaPagare.Value="0" OrElse Parameters!AplicaPagare.Value="")</Hidden>
</Visibility>
@@ -2805,70 +2750,17 @@
</TablixMembers>
</TablixRowHierarchy>
<DataSetName>DsOC</DataSetName>
<Top>4.14415cm</Top>
<Top>4.77915cm</Top>
<Left>0.11516cm</Left>
<Height>2.29418cm</Height>
<Width>19.97108cm</Width>
<ZIndex>13</ZIndex>
<ZIndex>11</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
</Style>
</Tablix>
<Textbox Name="Textbox32">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>RFC: </Value>
<Style>
<FontSize>6pt</FontSize>
</Style>
</TextRun>
<TextRun>
<Value>=Parameters!ClienteRFC.Value</Value>
<Style>
<FontSize>6pt</FontSize>
</Style>
</TextRun>
<TextRun>
<Value xml:space="preserve"> </Value>
<Style>
<FontSize>6pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.42839in</Top>
<Left>5.66455in</Left>
<Height>0.20317in</Height>
<Width>2.24597in</Width>
<ZIndex>14</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Rectangle Name="Rectangle2">
<ReportItems>
<Image Name="QRCode">
@@ -3283,11 +3175,11 @@
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>13.45121cm</Top>
<Top>14.08621cm</Top>
<Left>0.04257cm</Left>
<Height>3.74574cm</Height>
<Width>20.109cm</Width>
<ZIndex>15</ZIndex>
<ZIndex>12</ZIndex>
<Style>
<Border>
<Style>None</Style>
@@ -4339,7 +4231,7 @@
<Top>0.26817in</Top>
<Left>5.88134in</Left>
<Height>0.34081in</Height>
<Width>1.98129in</Width>
<Width>1.98128in</Width>
<ZIndex>3</ZIndex>
<Style>
<Border>
@@ -4349,11 +4241,11 @@
</Tablix>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>6.61207cm</Top>
<Top>7.24707cm</Top>
<Left>0.11516cm</Left>
<Height>6.80033cm</Height>
<Width>20.03641cm</Width>
<ZIndex>16</ZIndex>
<ZIndex>13</ZIndex>
<Style>
<Border>
<Style>None</Style>
@@ -4400,7 +4292,7 @@
<Left>0.07003cm</Left>
<Height>1.01627cm</Height>
<Width>5.45089cm</Width>
<ZIndex>17</ZIndex>
<ZIndex>14</ZIndex>
<Style>
<Border>
<Style>None</Style>
@@ -4855,49 +4747,13 @@
</Border>
</Style>
</Tablix>
<Textbox Name="Textbox53">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>VERSION 3.3</Value>
<Style>
<FontFamily>MYRiad Pro</FontFamily>
<FontSize>9.16pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox5</rd:DefaultName>
<Top>2.28775cm</Top>
<Left>17.08931cm</Left>
<Height>0.6cm</Height>
<Width>3.06609cm</Width>
<ZIndex>4</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>17.21106cm</Top>
<Top>17.84606cm</Top>
<Left>0.00547cm</Left>
<Height>2.97096cm</Height>
<Height>2.25247cm</Height>
<Width>20.1554cm</Width>
<ZIndex>18</ZIndex>
<ZIndex>15</ZIndex>
<Visibility>
<Hidden>=Microsoft.VisualBasic.Interaction.IIF(First(Fields!SerieFolio.Value, "DataSet4") &lt;&gt; "", False, True)</Hidden>
</Visibility>
@@ -4907,6 +4763,327 @@
</Border>
</Style>
</Rectangle>
<Textbox Name="Textbox19">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Nombre</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>9pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.14544in</Top>
<Left>0.07305cm</Left>
<Height>0.22222in</Height>
<Width>0.81128in</Width>
<ZIndex>16</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<BackgroundColor>#c4d79b</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox20">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!ClienteNombre.Value</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>7pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.14544in</Top>
<Left>0.84004in</Left>
<Height>0.22222in</Height>
<Width>4.80807in</Width>
<ZIndex>17</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox22">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Dirección</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>9pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.36766in</Top>
<Left>0.02757in</Left>
<Height>0.2309in</Height>
<Width>0.80675in</Width>
<ZIndex>18</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<BackgroundColor>#c4d79b</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox29">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!ClienteDireccion.Value</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>7pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.36766in</Top>
<Left>0.84004in</Left>
<Height>0.2309in</Height>
<Width>7.0427in</Width>
<ZIndex>19</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox30">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Ciudad</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>9pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.59856in</Top>
<Left>0.02876in</Left>
<Height>0.23558in</Height>
<Width>0.81128in</Width>
<ZIndex>20</ZIndex>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<BottomBorder>
<Color>#c4d79b</Color>
<Width>1.25pt</Width>
</BottomBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<BackgroundColor>#c4d79b</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox31">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!ClienteLugar.Value</Value>
<Style>
<FontSize>6pt</FontSize>
</Style>
</TextRun>
<TextRun>
<Value xml:space="preserve"> </Value>
<Style>
<FontSize>6pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.59856in</Top>
<Left>0.84004in</Left>
<Height>0.23611in</Height>
<Width>4.79418in</Width>
<ZIndex>21</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox32">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>RFC: </Value>
<Style>
<FontSize>6pt</FontSize>
</Style>
</TextRun>
<TextRun>
<Value>=Parameters!ClienteRFC.Value</Value>
<Style>
<FontFamily>calibri</FontFamily>
<FontSize>8pt</FontSize>
</Style>
</TextRun>
<TextRun>
<Value xml:space="preserve"> </Value>
<Style>
<FontSize>6pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.62495in</Top>
<Left>5.61883in</Left>
<Height>0.2092in</Height>
<Width>2.26391in</Width>
<ZIndex>22</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<Height>23.58967cm</Height>
<Style />

View File

@@ -285,8 +285,7 @@
</ContentTemplate>
<Triggers>
<asp:PostBackTrigger ControlID="LnkListaRaya" />
<asp:PostBackTrigger ControlID="LnkFormatoTabular" />
<asp:PostBackTrigger ControlID="LnkLayoutContable" />
<asp:PostBackTrigger ControlID="LnkFormatoTabular" />
</Triggers>
</asp:UpdatePanel>

View File

@@ -475,7 +475,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
LnkModalPlantillaNomina.Visible = true;
LnkTimbrarTodos.Visible = (Estatus > 2);
LnkLayoutContable.Visible = (Estatus > 2);
LnkLayoutContable.Visible = (Estatus >= 2);
LnkProvisionNomina.Visible = CvePrePolizaProvision > 0;
LnkProvisionNomina.NavigateUrl = $"../Contabilidad/RegPrePoliza.aspx?CvePrePoliza={CvePrePolizaProvision}";
LnkProvisionNominaAsimilados.Visible = CvePrePolizaProvisionAsimilados > 0;
@@ -8779,7 +8779,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
//Accion N 1 88-88
sb.Append("0");
//filler 77 89-165
sb.Append(string.Empty.PadLeft(77, Espacio));
sb.Append(string.Empty.PadLeft(77, Cero));
if (!ErrorProceso)
{
@@ -8799,8 +8799,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
string ImporteIvaOperacion = dRow["ImporteIvaOperacion"].ToString().Trim();
//Tipo de registro A 1 1-1
//Linea Nueva
sb.AppendLine("");
//Tipo de registro A 1 1-1
sb.Append("D");
//Fecha Aplicacion N 8 2-9
sb.Append(DateTime.Now.ToString("yyyyMMdd"));
@@ -8839,6 +8841,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}

View File

@@ -22,7 +22,9 @@ public partial class RH_CalculoSBC : ClsPaginas
{
if (!IsPostBack)
{
TxtFechaPago.Text = String.Format("{0:01/MM/yyyy}", DateTime.Now);
//string rutarchivos = string.Format("{0}modificacionsalarios\\", UsuarioActual.Empresa.RutaArchivos);
//Alert(rutarchivos);
//ADSNetLibrary.SIGAPI.Services.Agropecuaria.IAgropecuariaService servicioAgro = new ADSNetLibrary.SIGAPI.Services.Agropecuaria.AgropecuariaService(System.Configuration.ConfigurationManager.ConnectionStrings["Conexion"].ConnectionString);
//ADSNetLibrary.SIGAPI.Models.Agropecuaria.Request.ActividadGET acmo = new ADSNetLibrary.SIGAPI.Models.Agropecuaria.Request.ActividadGET();
//acmo.cveEmpresa = UsuarioActual.CveEmpresa; acmo.cveActividad = -1;