Merge branch 'master' of http://oirigoyen@192.168.10.111:8383/SIG.git
This commit is contained in:
rakcsle
@@ -131,6 +131,7 @@ Public Class ClsInventarios
|
|||||||
Public Property ResponsableCarga As String
|
Public Property ResponsableCarga As String
|
||||||
Public Property ResponsableRecibio As String
|
Public Property ResponsableRecibio As String
|
||||||
Public Property Modulo As String
|
Public Property Modulo As String
|
||||||
|
Public Property ConAplicacion As Boolean
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -2307,6 +2308,7 @@ Public Class ClsInventarios
|
|||||||
FechaI = dr("FechaInicio").ToString
|
FechaI = dr("FechaInicio").ToString
|
||||||
FechaF = dr("FechaFin").ToString
|
FechaF = dr("FechaFin").ToString
|
||||||
Estatus = dr("Estatus").ToString
|
Estatus = dr("Estatus").ToString
|
||||||
|
ConAplicacion = Convert.ToBoolean(dr("ConAplicacion").ToString)
|
||||||
Retorno = True
|
Retorno = True
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,127 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
|
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2010/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
|
||||||
|
<AutoRefresh>0</AutoRefresh>
|
||||||
|
<DataSources>
|
||||||
|
<DataSource Name="DsOC">
|
||||||
|
<ConnectionProperties>
|
||||||
|
<DataProvider>System.Data.DataSet</DataProvider>
|
||||||
|
<ConnectString>/* Local Connection */</ConnectString>
|
||||||
|
</ConnectionProperties>
|
||||||
|
<rd:DataSourceID>11331dc3-a681-47ed-913e-5e2b9920498f</rd:DataSourceID>
|
||||||
|
</DataSource>
|
||||||
|
</DataSources>
|
||||||
|
<DataSets>
|
||||||
|
<DataSet Name="DsOC">
|
||||||
|
<Query>
|
||||||
|
<DataSourceName>DsOC</DataSourceName>
|
||||||
|
<CommandText>/* Local Query */</CommandText>
|
||||||
|
</Query>
|
||||||
|
<Fields>
|
||||||
|
<Field Name="CveOrdenCompraDetalle">
|
||||||
|
<DataField>CveOrdenCompraDetalle</DataField>
|
||||||
|
<rd:TypeName>System.Int64</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="CveOrdenCompra">
|
||||||
|
<DataField>CveOrdenCompra</DataField>
|
||||||
|
<rd:TypeName>System.Int64</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Cantidad">
|
||||||
|
<DataField>Cantidad</DataField>
|
||||||
|
<rd:TypeName>System.Double</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="CveUnidadMedida">
|
||||||
|
<DataField>CveUnidadMedida</DataField>
|
||||||
|
<rd:TypeName>System.Int64</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Abreviatura">
|
||||||
|
<DataField>Abreviatura</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="PS">
|
||||||
|
<DataField>PS</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Obs">
|
||||||
|
<DataField>Obs</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Producto">
|
||||||
|
<DataField>Producto</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="CveClasificacion">
|
||||||
|
<DataField>CveClasificacion</DataField>
|
||||||
|
<rd:TypeName>System.Int64</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Clasificacion">
|
||||||
|
<DataField>Clasificacion</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="CveActivoFijo">
|
||||||
|
<DataField>CveActivoFijo</DataField>
|
||||||
|
<rd:TypeName>System.Int64</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Codigo">
|
||||||
|
<DataField>Codigo</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="CodPS">
|
||||||
|
<DataField>CodPS</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="TipoDato">
|
||||||
|
<DataField>TipoDato</DataField>
|
||||||
|
<rd:TypeName>System.Int64</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="CodigoAF">
|
||||||
|
<DataField>CodigoAF</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="CodigoPS">
|
||||||
|
<DataField>CodigoPS</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="UnidadMedida">
|
||||||
|
<DataField>UnidadMedida</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="SubProyecto">
|
||||||
|
<DataField>SubProyecto</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Importe">
|
||||||
|
<DataField>Importe</DataField>
|
||||||
|
<rd:TypeName>System.Decimal</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Descuento">
|
||||||
|
<DataField>Descuento</DataField>
|
||||||
|
<rd:TypeName>System.Decimal</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="Total">
|
||||||
|
<DataField>Total</DataField>
|
||||||
|
<rd:TypeName>System.Decimal</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="FolioAdicional">
|
||||||
|
<DataField>FolioAdicional</DataField>
|
||||||
|
<rd:TypeName>System.String</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
<Field Name="IEPS">
|
||||||
|
<DataField>IEPS</DataField>
|
||||||
|
<rd:TypeName>System.Decimal</rd:TypeName>
|
||||||
|
</Field>
|
||||||
|
</Fields>
|
||||||
|
<rd:DataSetInfo>
|
||||||
|
<rd:DataSetName>DsOC</rd:DataSetName>
|
||||||
|
<rd:SchemaPath>C:\inetpub\wwwVentas\App_Code\DsOC.xsd</rd:SchemaPath>
|
||||||
|
<rd:TableName>DtOCDetalle</rd:TableName>
|
||||||
|
<rd:TableAdapterFillMethod />
|
||||||
|
<rd:TableAdapterGetDataMethod />
|
||||||
|
<rd:TableAdapterName />
|
||||||
|
</rd:DataSetInfo>
|
||||||
|
</DataSet>
|
||||||
|
</DataSets>
|
||||||
|
<ReportSections>
|
||||||
|
<ReportSection>
|
||||||
<Body>
|
<Body>
|
||||||
<ReportItems>
|
<ReportItems>
|
||||||
<Tablix Name="Tablix2">
|
<Tablix Name="Tablix2">
|
||||||
@@ -307,6 +429,7 @@
|
|||||||
<FontFamily>Myriad Pro</FontFamily>
|
<FontFamily>Myriad Pro</FontFamily>
|
||||||
<FontSize>8.5pt</FontSize>
|
<FontSize>8.5pt</FontSize>
|
||||||
<FontWeight>Normal</FontWeight>
|
<FontWeight>Normal</FontWeight>
|
||||||
|
<Format>#,0.00;(#,0.00)</Format>
|
||||||
</Style>
|
</Style>
|
||||||
</TextRun>
|
</TextRun>
|
||||||
</TextRuns>
|
</TextRuns>
|
||||||
@@ -2613,126 +2736,8 @@
|
|||||||
<ColumnSpacing>0.13cm</ColumnSpacing>
|
<ColumnSpacing>0.13cm</ColumnSpacing>
|
||||||
<Style />
|
<Style />
|
||||||
</Page>
|
</Page>
|
||||||
<AutoRefresh>0</AutoRefresh>
|
</ReportSection>
|
||||||
<DataSources>
|
</ReportSections>
|
||||||
<DataSource Name="DsOC">
|
|
||||||
<ConnectionProperties>
|
|
||||||
<DataProvider>System.Data.DataSet</DataProvider>
|
|
||||||
<ConnectString>/* Local Connection */</ConnectString>
|
|
||||||
</ConnectionProperties>
|
|
||||||
<rd:DataSourceID>11331dc3-a681-47ed-913e-5e2b9920498f</rd:DataSourceID>
|
|
||||||
</DataSource>
|
|
||||||
</DataSources>
|
|
||||||
<DataSets>
|
|
||||||
<DataSet Name="DsOC">
|
|
||||||
<Query>
|
|
||||||
<DataSourceName>DsOC</DataSourceName>
|
|
||||||
<CommandText>/* Local Query */</CommandText>
|
|
||||||
</Query>
|
|
||||||
<Fields>
|
|
||||||
<Field Name="CveOrdenCompraDetalle">
|
|
||||||
<DataField>CveOrdenCompraDetalle</DataField>
|
|
||||||
<rd:TypeName>System.Int64</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="CveOrdenCompra">
|
|
||||||
<DataField>CveOrdenCompra</DataField>
|
|
||||||
<rd:TypeName>System.Int64</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Cantidad">
|
|
||||||
<DataField>Cantidad</DataField>
|
|
||||||
<rd:TypeName>System.Double</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="CveUnidadMedida">
|
|
||||||
<DataField>CveUnidadMedida</DataField>
|
|
||||||
<rd:TypeName>System.Int64</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Abreviatura">
|
|
||||||
<DataField>Abreviatura</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="PS">
|
|
||||||
<DataField>PS</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Obs">
|
|
||||||
<DataField>Obs</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Producto">
|
|
||||||
<DataField>Producto</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="CveClasificacion">
|
|
||||||
<DataField>CveClasificacion</DataField>
|
|
||||||
<rd:TypeName>System.Int64</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Clasificacion">
|
|
||||||
<DataField>Clasificacion</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="CveActivoFijo">
|
|
||||||
<DataField>CveActivoFijo</DataField>
|
|
||||||
<rd:TypeName>System.Int64</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Codigo">
|
|
||||||
<DataField>Codigo</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="CodPS">
|
|
||||||
<DataField>CodPS</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="TipoDato">
|
|
||||||
<DataField>TipoDato</DataField>
|
|
||||||
<rd:TypeName>System.Int64</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="CodigoAF">
|
|
||||||
<DataField>CodigoAF</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="CodigoPS">
|
|
||||||
<DataField>CodigoPS</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="UnidadMedida">
|
|
||||||
<DataField>UnidadMedida</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="SubProyecto">
|
|
||||||
<DataField>SubProyecto</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Importe">
|
|
||||||
<DataField>Importe</DataField>
|
|
||||||
<rd:TypeName>System.Decimal</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Descuento">
|
|
||||||
<DataField>Descuento</DataField>
|
|
||||||
<rd:TypeName>System.Decimal</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="Total">
|
|
||||||
<DataField>Total</DataField>
|
|
||||||
<rd:TypeName>System.Decimal</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="FolioAdicional">
|
|
||||||
<DataField>FolioAdicional</DataField>
|
|
||||||
<rd:TypeName>System.String</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
<Field Name="IEPS">
|
|
||||||
<DataField>IEPS</DataField>
|
|
||||||
<rd:TypeName>System.Decimal</rd:TypeName>
|
|
||||||
</Field>
|
|
||||||
</Fields>
|
|
||||||
<rd:DataSetInfo>
|
|
||||||
<rd:DataSetName>DsOC</rd:DataSetName>
|
|
||||||
<rd:SchemaPath>C:\inetpub\wwwVentas\App_Code\DsOC.xsd</rd:SchemaPath>
|
|
||||||
<rd:TableName>DtOCDetalle</rd:TableName>
|
|
||||||
<rd:TableAdapterFillMethod />
|
|
||||||
<rd:TableAdapterGetDataMethod />
|
|
||||||
<rd:TableAdapterName />
|
|
||||||
</rd:DataSetInfo>
|
|
||||||
</DataSet>
|
|
||||||
</DataSets>
|
|
||||||
<ReportParameters>
|
<ReportParameters>
|
||||||
<ReportParameter Name="CentroCostos">
|
<ReportParameter Name="CentroCostos">
|
||||||
<DataType>String</DataType>
|
<DataType>String</DataType>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user