Descuentos en formatos de OC Emp:13,82

This commit is contained in:
2019-12-19 09:38:27 -07:00
parent abb873773c
commit 159f2be0d6
3 changed files with 7433 additions and 6988 deletions

View File

@@ -6707,15 +6707,15 @@ Public Class ClsPaginas
' nombreautorizo = "Lic. LUIS JORGE CONTRERAS LANDGRAVE" ' nombreautorizo = "Lic. LUIS JORGE CONTRERAS LANDGRAVE"
'End If 'End If
Dim Archivo As New System.IO.FileInfo(String.Format("{0}Formatos\OC.rdlc", EmpresaActual.Ruta)) Dim Archivo As New System.IO.FileInfo(String.Format("{0}Formatos\OC.rdlc", EmpresaActual.Ruta))
If Not Archivo.Exists OrElse EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 72, 80, 122, 126) Then If Not Archivo.Exists OrElse EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 13, 72, 80, 83, 122, 126) Then
params.Add(New ReportParameter("Descuento", DtDetalle.SUM("Descuento").ToString.FormatoNumero(2))) params.Add(New ReportParameter("Descuento", DtDetalle.SUM("Descuento").ToString.FormatoNumero(2)))
End If End If
'DATOS PARA DESCUENTO 'DATOS PARA DESCUENTO
If EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 72, 80, 122, 126) Then 'EMPRESAS QUE YA TIENEN EL AJUSTE EN EL FORMATO If EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 13, 72, 80, 83, 122, 126) Then 'EMPRESAS QUE YA TIENEN EL AJUSTE EN EL FORMATO
params.Add(New ReportParameter("SubTotal", ObjOC.SubTotal.ToString)) params.Add(New ReportParameter("SubTotal", ObjOC.SubTotal.ToString))
params.Add(New ReportParameter("SubTotal2", DtDetalle.SUM("Total").ToString)) params.Add(New ReportParameter("SubTotal2", DtDetalle.SUM("Total").ToString))
Else Else
params.Add(New ReportParameter("SubTotal", ObjOC.SubTotal.ToString)) params.Add(New ReportParameter("SubTotal", DtDetalle.SUM("Total").ToString))
End If End If
If EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 122) Then If EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 122) Then

View File

@@ -1102,13 +1102,12 @@
</Style> </Style>
</Image> </Image>
<Textbox Name="Textbox20"> <Textbox Name="Textbox20">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether> <KeepTogether>true</KeepTogether>
<Paragraphs> <Paragraphs>
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>IVA</Value> <Value>Sub Total 2</Value>
<Style> <Style>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
</Style> </Style>
@@ -1120,7 +1119,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName> <rd:DefaultName>Textbox20</rd:DefaultName>
<Top>5.84792cm</Top> <Top>6.35592cm</Top>
<Left>16.1331cm</Left> <Left>16.1331cm</Left>
<Height>0.45183cm</Height> <Height>0.45183cm</Height>
<Width>2.06968cm</Width> <Width>2.06968cm</Width>
@@ -1157,7 +1156,6 @@
</Style> </Style>
</Textbox> </Textbox>
<Textbox Name="Textbox28"> <Textbox Name="Textbox28">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether> <KeepTogether>true</KeepTogether>
<Paragraphs> <Paragraphs>
<Paragraph> <Paragraph>
@@ -1175,7 +1173,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName> <rd:DefaultName>Textbox20</rd:DefaultName>
<Top>6.29975cm</Top> <Top>7.25225cm</Top>
<Left>16.1331cm</Left> <Left>16.1331cm</Left>
<Height>0.45183cm</Height> <Height>0.45183cm</Height>
<Width>2.06968cm</Width> <Width>2.06968cm</Width>
@@ -1212,7 +1210,6 @@
</Style> </Style>
</Textbox> </Textbox>
<Textbox Name="Textbox30"> <Textbox Name="Textbox30">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether> <KeepTogether>true</KeepTogether>
<Paragraphs> <Paragraphs>
<Paragraph> <Paragraph>
@@ -1267,13 +1264,12 @@
</Style> </Style>
</Textbox> </Textbox>
<Textbox Name="Textbox27"> <Textbox Name="Textbox27">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether> <KeepTogether>true</KeepTogether>
<Paragraphs> <Paragraphs>
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>=Parameters!IVA.Value</Value> <Value>=Parameters!SubTotal2.Value</Value>
<Style> <Style>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
<Format>#,0.00</Format> <Format>#,0.00</Format>
@@ -1287,7 +1283,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName> <rd:DefaultName>Textbox20</rd:DefaultName>
<Top>5.84792cm</Top> <Top>6.35592cm</Top>
<Left>18.20277cm</Left> <Left>18.20277cm</Left>
<Height>0.45183cm</Height> <Height>0.45183cm</Height>
<Width>2.26019cm</Width> <Width>2.26019cm</Width>
@@ -1324,7 +1320,6 @@
</Style> </Style>
</Textbox> </Textbox>
<Textbox Name="Textbox29"> <Textbox Name="Textbox29">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether> <KeepTogether>true</KeepTogether>
<Paragraphs> <Paragraphs>
<Paragraph> <Paragraph>
@@ -1344,7 +1339,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName> <rd:DefaultName>Textbox20</rd:DefaultName>
<Top>6.29975cm</Top> <Top>7.25225cm</Top>
<Left>18.20276cm</Left> <Left>18.20276cm</Left>
<Height>0.45183cm</Height> <Height>0.45183cm</Height>
<Width>2.26019cm</Width> <Width>2.26019cm</Width>
@@ -1381,7 +1376,6 @@
</Style> </Style>
</Textbox> </Textbox>
<Textbox Name="Textbox31"> <Textbox Name="Textbox31">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether> <KeepTogether>true</KeepTogether>
<Paragraphs> <Paragraphs>
<Paragraph> <Paragraph>
@@ -1455,7 +1449,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox46</rd:DefaultName> <rd:DefaultName>Textbox46</rd:DefaultName>
<Top>6.29975cm</Top> <Top>7.25225cm</Top>
<Left>0.20457cm</Left> <Left>0.20457cm</Left>
<Height>0.45183cm</Height> <Height>0.45183cm</Height>
<Width>15.92855cm</Width> <Width>15.92855cm</Width>
@@ -2438,7 +2432,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox12</rd:DefaultName> <rd:DefaultName>Textbox12</rd:DefaultName>
<Top>8.49815cm</Top> <Top>9.76815cm</Top>
<Left>3.07712cm</Left> <Left>3.07712cm</Left>
<Height>0.44478cm</Height> <Height>0.44478cm</Height>
<Width>5.83844cm</Width> <Width>5.83844cm</Width>
@@ -2474,7 +2468,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox12</rd:DefaultName> <rd:DefaultName>Textbox12</rd:DefaultName>
<Top>8.94293cm</Top> <Top>10.21293cm</Top>
<Left>3.07712cm</Left> <Left>3.07712cm</Left>
<Height>0.4095cm</Height> <Height>0.4095cm</Height>
<Width>5.83844cm</Width> <Width>5.83844cm</Width>
@@ -2514,7 +2508,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox12</rd:DefaultName> <rd:DefaultName>Textbox12</rd:DefaultName>
<Top>9.38771cm</Top> <Top>10.65771cm</Top>
<Left>3.07712cm</Left> <Left>3.07712cm</Left>
<Height>0.44478cm</Height> <Height>0.44478cm</Height>
<Width>5.83844cm</Width> <Width>5.83844cm</Width>
@@ -2550,7 +2544,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox12</rd:DefaultName> <rd:DefaultName>Textbox12</rd:DefaultName>
<Top>8.49815cm</Top> <Top>9.76815cm</Top>
<Left>11.4732cm</Left> <Left>11.4732cm</Left>
<Height>0.44478cm</Height> <Height>0.44478cm</Height>
<Width>5.83844cm</Width> <Width>5.83844cm</Width>
@@ -2586,7 +2580,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox12</rd:DefaultName> <rd:DefaultName>Textbox12</rd:DefaultName>
<Top>8.94293cm</Top> <Top>10.21293cm</Top>
<Left>11.4732cm</Left> <Left>11.4732cm</Left>
<Height>0.4095cm</Height> <Height>0.4095cm</Height>
<Width>5.83844cm</Width> <Width>5.83844cm</Width>
@@ -2626,7 +2620,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox12</rd:DefaultName> <rd:DefaultName>Textbox12</rd:DefaultName>
<Top>9.38771cm</Top> <Top>10.65771cm</Top>
<Left>11.4732cm</Left> <Left>11.4732cm</Left>
<Height>0.44478cm</Height> <Height>0.44478cm</Height>
<Width>5.83844cm</Width> <Width>5.83844cm</Width>
@@ -2646,7 +2640,7 @@
<Source>External</Source> <Source>External</Source>
<Value>=Parameters!FirmaAutorizo.Value</Value> <Value>=Parameters!FirmaAutorizo.Value</Value>
<Sizing>Fit</Sizing> <Sizing>Fit</Sizing>
<Top>6.92797cm</Top> <Top>8.19797cm</Top>
<Left>12.49243cm</Left> <Left>12.49243cm</Left>
<Height>3.5cm</Height> <Height>3.5cm</Height>
<Width>3.5cm</Width> <Width>3.5cm</Width>
@@ -2664,7 +2658,7 @@
<Source>External</Source> <Source>External</Source>
<Value>=Parameters!FirmaSolicito.Value</Value> <Value>=Parameters!FirmaSolicito.Value</Value>
<Sizing>Fit</Sizing> <Sizing>Fit</Sizing>
<Top>6.92797cm</Top> <Top>8.19797cm</Top>
<Left>4.23541cm</Left> <Left>4.23541cm</Left>
<Height>3.5cm</Height> <Height>3.5cm</Height>
<Width>3.5cm</Width> <Width>3.5cm</Width>
@@ -2811,7 +2805,7 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName> <rd:DefaultName>Textbox1</rd:DefaultName>
<Top>10.71901cm</Top> <Top>11.98901cm</Top>
<Left>2.79111cm</Left> <Left>2.79111cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>15.75563cm</Width> <Width>15.75563cm</Width>
@@ -2826,11 +2820,231 @@
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
</Style> </Style>
</Textbox> </Textbox>
<Textbox Name="Textbox43">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>IVA</Value>
<Style>
<FontSize>8pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName>
<Top>6.81234cm</Top>
<Left>16.1331cm</Left>
<Height>0.45183cm</Height>
<Width>2.06968cm</Width>
<ZIndex>38</ZIndex>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</TopBorder>
<BottomBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</BottomBorder>
<LeftBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</LeftBorder>
<RightBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox44">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!IVA.Value</Value>
<Style>
<FontSize>8pt</FontSize>
<Format>#,0.00</Format>
<Language>es-MX</Language>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName>
<Top>6.81234cm</Top>
<Left>18.20276cm</Left>
<Height>0.45183cm</Height>
<Width>2.26224cm</Width>
<ZIndex>39</ZIndex>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</TopBorder>
<BottomBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</BottomBorder>
<LeftBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</LeftBorder>
<RightBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox45">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Descuento</Value>
<Style>
<FontSize>8pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName>
<Top>5.87809cm</Top>
<Left>16.1331cm</Left>
<Height>0.45183cm</Height>
<Width>2.06968cm</Width>
<ZIndex>40</ZIndex>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</TopBorder>
<BottomBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</BottomBorder>
<LeftBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</LeftBorder>
<RightBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox47">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!Descuento.Value</Value>
<Style>
<FontSize>8pt</FontSize>
<Format>#,0.00</Format>
<Language>es-MX</Language>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName>
<Top>5.87809cm</Top>
<Left>18.20276cm</Left>
<Height>0.45183cm</Height>
<Width>2.26327cm</Width>
<ZIndex>41</ZIndex>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</TopBorder>
<BottomBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</BottomBorder>
<LeftBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</LeftBorder>
<RightBorder>
<Color>LightGrey</Color>
<Style>Solid</Style>
<Width>1pt</Width>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems> </ReportItems>
<Height>4.5211in</Height> <Height>4.9563in</Height>
<Style /> <Style />
</Body> </Body>
<Width>8.10629in</Width> <Width>8.15548in</Width>
<Page> <Page>
<PageHeight>27.94cm</PageHeight> <PageHeight>27.94cm</PageHeight>
<PageWidth>21.59cm</PageWidth> <PageWidth>21.59cm</PageWidth>
@@ -3130,6 +3344,16 @@
<AllowBlank>true</AllowBlank> <AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt> <Prompt>ReportParameter1</Prompt>
</ReportParameter> </ReportParameter>
<ReportParameter Name="Descuento">
<DataType>Float</DataType>
<Nullable>true</Nullable>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="SubTotal2">
<DataType>Float</DataType>
<Nullable>true</Nullable>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
</ReportParameters> </ReportParameters>
<EmbeddedImages> <EmbeddedImages>
<EmbeddedImage Name="LogoEMD"> <EmbeddedImage Name="LogoEMD">

File diff suppressed because it is too large Load Diff