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

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
janeth arvizu
2019-12-02 14:08:22 -07:00
parent b156b2f579 695d8ea5be
commit fbba37ac54
24 changed files with 1004 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
Empresas/140/Formatos/Factura.rdlc
View File

@@ -595,11 +595,10 @@
</Style>
</TextRun>
<TextRun>
<Value>=Parameters!ClienteNombre.Value</Value>
<Value>=Parameters!ClienteCodigo.Value</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
@@ -833,52 +832,6 @@
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Pedido/Contrato: </Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9pt</FontSize>
<FontWeight>SemiBold</FontWeight>
</Style>
</TextRun>
<TextRun>
<Value>=Parameters!PedidoContrato.Value</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Orden Compra: </Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9pt</FontSize>
<FontWeight>SemiBold</FontWeight>
</Style>
</TextRun>
<TextRun>
<Value>=Parameters!OrdenCompra.Value</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.05159in</Top>
@@ -1376,6 +1329,29 @@
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Vencimiento</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9.64pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
<TextRun>
<Value>: </Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9.64pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
<TextRun>
<Value>=Parameters!Vencimiento.Value</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9.64pt</FontSize>
</Style>
</TextRun>
<TextRun>
<Value xml:space="preserve"> </Value>
<Style>
@@ -1384,14 +1360,6 @@
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
<TextRun>
<Value>=iif(Parameters!TipoCambio.Value &lt;= 1, "", "Tipo Cambio: " &amp; Parameters!TipoCambio.Value)</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>6.5pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
@@ -1399,6 +1367,14 @@
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Moneda</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9.16pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
<TextRun>
<Value>Forma de pago: </Value>
<Style>
@@ -1639,7 +1615,7 @@
<Width>0.8527in</Width>
</TablixColumn>
<TablixColumn>
<Width>3.02234in</Width>
<Width>3.66416in</Width>
</TablixColumn>
<TablixColumn>
<Width>0.57354in</Width>
@@ -1650,9 +1626,6 @@
<TablixColumn>
<Width>0.61967in</Width>
</TablixColumn>
<TablixColumn>
<Width>0.64182in</Width>
</TablixColumn>
<TablixColumn>
<Width>0.79194in</Width>
</TablixColumn>
@@ -1918,43 +1891,6 @@
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox4">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>IEPS</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>9.5pt</FontSize>
<FontWeight>Bold</FontWeight>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox4</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>#3a4173</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox6">
@@ -2216,7 +2152,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!ImporteIVA.Value &amp; iif(Fields!PorcentajeIVA.Value = "0.16", " (16%)"," (0%)")</Value>
<Value>=Fields!ImporteIVA.Value</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>7.5pt</FontSize>
@@ -2243,42 +2179,6 @@
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="ImporteIEPS">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=iif(Fields!PorcentajeIEPS.Value = "0.03",Fields!ImporteIEPS.Value &amp; " (3%)",iif(Fields!PorcentajeIEPS.Value = "0.06",Fields!ImporteIEPS.Value &amp; " (6%)",iif(Fields!PorcentajeIEPS.Value = "0.07",Fields!ImporteIEPS.Value &amp; " (7%)",iif(Fields!PorcentajeIEPS.Value = "0.09",Fields!ImporteIEPS.Value &amp; " (9%)",""))))</Value>
<Style>
<FontFamily>Myriad Pro</FontFamily>
<FontSize>7.5pt</FontSize>
<FontWeight>Normal</FontWeight>
<Format>#,0.00;-#,0.00;'(Ninguna)'</Format>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>ImporteIEPS</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="TiempoEntrega">
@@ -2330,7 +2230,6 @@
<TablixMember />
<TablixMember />
<TablixMember />
<TablixMember />
</TablixMembers>
</TablixColumnHierarchy>
<TablixRowHierarchy>

24
Empresas/Grales/Formatos/Ajuste.rdlc
View File

@@ -861,7 +861,11 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Tipo:</Value>
<Value>Tipo: </Value>
<Style />
</TextRun>
<TextRun>
<Value>=Parameters!Tipo.Value</Value>
<Style />
</TextRun>
</TextRuns>
@@ -941,7 +945,11 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Marca:</Value>
<Value>Marca: </Value>
<Style />
</TextRun>
<TextRun>
<Value>=Parameters!Marca.Value</Value>
<Style />
</TextRun>
</TextRuns>
@@ -1913,6 +1921,18 @@
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="Tipo">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="Marca">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
</ReportParameters>
<Language>Es-MX</Language>
<rd:ReportUnitType>Inch</rd:ReportUnitType>