Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -56,7 +56,7 @@
|
||||
<Width>2.54731cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.99685cm</Width>
|
||||
<Width>1.73227cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.66702cm</Width>
|
||||
@@ -65,14 +65,20 @@
|
||||
<Width>2.26144cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>2.15555cm</Width>
|
||||
<Width>1.46086cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>2.10255cm</Width>
|
||||
<Width>1.09776cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.57396cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.37522cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>1.23062cm</Width>
|
||||
</TablixColumn>
|
||||
</TablixColumns>
|
||||
<TablixRows>
|
||||
<TablixRow>
|
||||
@@ -353,6 +359,74 @@
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="CargoMN">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Fields!CargoMN.Value</Value>
|
||||
<Style>
|
||||
<FontSize>8pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>CargoMN</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<BackgroundColor>=IIf(Fields!CveConceptoContable.Value > 0, "No Color", "#9cacc1")</BackgroundColor>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="AbonoMN">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Fields!AbonoMN.Value</Value>
|
||||
<Style>
|
||||
<FontSize>8pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>AbonoMN</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<BackgroundColor>=IIf(Fields!CveConceptoContable.Value > 0, "No Color", "#9cacc1")</BackgroundColor>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
</TablixCells>
|
||||
</TablixRow>
|
||||
</TablixRows>
|
||||
@@ -361,7 +435,7 @@
|
||||
<TablixMembers>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox40">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -399,7 +473,7 @@
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox42">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -437,7 +511,7 @@
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox44">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -475,7 +549,7 @@
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox49">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -513,7 +587,7 @@
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox51">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -551,7 +625,7 @@
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox47">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -589,7 +663,7 @@
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox4">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -627,7 +701,7 @@
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.6cm</Size>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox6">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -663,6 +737,82 @@
|
||||
</CellContents>
|
||||
</TablixHeader>
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox5">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>Cargo MN</Value>
|
||||
<Style>
|
||||
<FontSize>8pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox5</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>DimGray</Color>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<BackgroundColor>LightGrey</BackgroundColor>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixHeader>
|
||||
</TablixMember>
|
||||
<TablixMember>
|
||||
<TablixHeader>
|
||||
<Size>0.8593cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox13">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>Abono MN</Value>
|
||||
<Style>
|
||||
<FontSize>8pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox13</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>DimGray</Color>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<BackgroundColor>LightGrey</BackgroundColor>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixHeader>
|
||||
</TablixMember>
|
||||
</TablixMembers>
|
||||
</TablixColumnHierarchy>
|
||||
<TablixRowHierarchy>
|
||||
@@ -670,7 +820,7 @@
|
||||
<TablixMember>
|
||||
<Group Name="GPO" />
|
||||
<TablixHeader>
|
||||
<Size>3.67051cm</Size>
|
||||
<Size>3.06196cm</Size>
|
||||
<CellContents>
|
||||
<Textbox Name="RazonSocial">
|
||||
<CanGrow>true</CanGrow>
|
||||
@@ -700,7 +850,6 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<rd:Selected>true</rd:Selected>
|
||||
</CellContents>
|
||||
</TablixHeader>
|
||||
</TablixMember>
|
||||
@@ -711,8 +860,8 @@
|
||||
<DataSetName>DataSet1</DataSetName>
|
||||
<Top>0.75875cm</Top>
|
||||
<Left>0.06614cm</Left>
|
||||
<Height>1.2cm</Height>
|
||||
<Width>19.55392cm</Width>
|
||||
<Height>1.4593cm</Height>
|
||||
<Width>19.58715cm</Width>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -756,7 +905,7 @@
|
||||
</Style>
|
||||
</Textbox>
|
||||
</ReportItems>
|
||||
<Height>0.77116in</Height>
|
||||
<Height>0.87325in</Height>
|
||||
<Style />
|
||||
</Body>
|
||||
<Width>7.73752in</Width>
|
||||
@@ -1129,6 +1278,14 @@
|
||||
<DataField>CveConceptoContable</DataField>
|
||||
<rd:TypeName>System.Int</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="CargoMN">
|
||||
<DataField>CargoMN</DataField>
|
||||
<rd:TypeName>System.Int</rd:TypeName>
|
||||
</Field>
|
||||
<Field Name="AbonoMN">
|
||||
<DataField>AbonoMN</DataField>
|
||||
<rd:TypeName>System.Int</rd:TypeName>
|
||||
</Field>
|
||||
</Fields>
|
||||
<rd:DataSetInfo>
|
||||
<rd:DataSetName>DataSet</rd:DataSetName>
|
||||
|
||||
@@ -251,9 +251,18 @@ Partial Class Inventarios_EntradasSalidas
|
||||
Set(value As Integer)
|
||||
ViewState("CvePrePoliza") = value
|
||||
End Set
|
||||
End Property
|
||||
End Property
|
||||
Private Property DescripcionDetalladaEliminar As String
|
||||
Get
|
||||
Return CType(ViewState("DescripcionDetalladaEliminar"), String)
|
||||
End Get
|
||||
Set(value As String)
|
||||
ViewState("DescripcionDetalladaEliminar") = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
#End Region
|
||||
|
||||
|
||||
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
If Not IsPostBack Then
|
||||
|
||||
@@ -1012,6 +1021,14 @@ Partial Class Inventarios_EntradasSalidas
|
||||
Protected Sub BtnEliminar_Click(sender As Object, e As EventArgs) Handles BtnEliminar.Click
|
||||
|
||||
RegistraScript("$('#divDescripcion').modal()")
|
||||
|
||||
Dim Description As String = String.Format("Movimiento con Concepto: {0}, Almacen: {1}, Fecha: {2}, Folio: {3}, Usuario: {4}, Observaciones adicionales: {5}, Productos Información:<br/>",
|
||||
DdlConcepto.SelectedItem, DdlAlmacen.SelectedItem, TxtFecha.Text, TxtFolio.Text, LblUsuarioRegistro.Text, TxtObservaciones.Text)
|
||||
For Each dr As DataRow In DtMovimientos.Rows
|
||||
Dim detalleDescripcion As String = String.Format("- Cant: {0}, PS: {1}, PU: {2}, UM: {3}<br/>", dr("Cantidad").ToString.ToEntero, dr("CodigoPS"), dr("PU"), dr("UnidadMedida"))
|
||||
Description = String.Format("{0}{1}", Description, detalleDescripcion)
|
||||
Next
|
||||
DescripcionDetalladaEliminar = Description
|
||||
UpDescripcion.Update()
|
||||
|
||||
'Dim Inv As New ClsInventarios
|
||||
@@ -1069,7 +1086,7 @@ Partial Class Inventarios_EntradasSalidas
|
||||
ObjConta.IniciaTransacSQL()
|
||||
End If
|
||||
|
||||
If Not ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Inventarios", TxtFolio.Text + " / " + DdlConcepto.SelectedItem.Text) Then
|
||||
If Not ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, String.Format("{0}, Informacion = {1}", TxtDescripcion.Text, DescripcionDetalladaEliminar), "Inventarios", TxtFolio.Text + " / " + DdlConcepto.SelectedItem.Text) Then
|
||||
TieneError = True
|
||||
End If
|
||||
|
||||
|
||||
@@ -615,8 +615,22 @@ Partial Class Inventarios_RecepcionUsados
|
||||
BloqueaEdicionEncabezado()
|
||||
End Sub
|
||||
Private Sub LimpiarMovimiento()
|
||||
|
||||
CveMovimiento = -1
|
||||
|
||||
If ObjFactura IsNot Nothing Then
|
||||
ObjFactura.Dispose()
|
||||
ObjFactura = Nothing
|
||||
End If
|
||||
|
||||
If ObjRemisionNC IsNot Nothing Then
|
||||
ObjRemisionNC.Dispose()
|
||||
ObjRemisionNC = Nothing
|
||||
End If
|
||||
|
||||
CveRemisionRecibida = -1
|
||||
EsDistribuidor = False
|
||||
DdlClientes.SelectedValueExist("-1")
|
||||
|
||||
SiguienteFolio()
|
||||
|
||||
HplCompra.Visible = False
|
||||
@@ -666,16 +680,6 @@ Partial Class Inventarios_RecepcionUsados
|
||||
TxtRemision.Text = ""
|
||||
DivRemision.Visible = False
|
||||
|
||||
If ObjFactura IsNot Nothing Then
|
||||
ObjFactura.Dispose()
|
||||
ObjFactura = Nothing
|
||||
End If
|
||||
|
||||
If ObjRemisionNC IsNot Nothing Then
|
||||
ObjRemisionNC.Dispose()
|
||||
ObjRemisionNC = Nothing
|
||||
End If
|
||||
|
||||
UpRegistroTipoCambio.Update()
|
||||
UPDatos.Update()
|
||||
End Sub
|
||||
|
||||
@@ -300,7 +300,7 @@
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="Id_Clave" HeaderText="Folio / Concepto" ItemStyle-HorizontalAlign="Left" />
|
||||
<asp:BoundField DataField="Descripcion" HeaderText="Descripción" ItemStyle-HorizontalAlign="Left" />
|
||||
<asp:BoundField DataField="Descripcion" HeaderText="Descripción" ItemStyle-HorizontalAlign="Left" HTMLEncode="false"/>
|
||||
<asp:BoundField DataField="Usuario" HeaderText="Usuario" ItemStyle-HorizontalAlign="Left" />
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
|
||||
@@ -135,14 +135,14 @@
|
||||
<asp:HyperLinkField HeaderText="Folio" ItemStyle-Width="50px" DataTextField="Folio" ItemStyle-CssClass="Texto" DataNavigateUrlFields="CveMovimiento" DataNavigateUrlFormatString="/Inventarios/EntradasSalidas.aspx?CveMovimiento={0}" />
|
||||
<asp:BoundField HeaderText="Activo Fijo" DataField="CodigoAF" ItemStyle-HorizontalAlign="Left" Visible="false" />
|
||||
<asp:BoundField HeaderText="SubProyecto" DataField="SubProyecto" ItemStyle-HorizontalAlign="Left" Visible="false" />
|
||||
<asp:BoundField HeaderText="Entradas" ItemStyle-Width="75px" DataField="Entradas" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Costo" ItemStyle-Width="75px" DataField="CostoE" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Importe" ItemStyle-Width="75px" DataField="ImporteE" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Salidas" ItemStyle-Width="75px" DataField="Salidas" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Costo" ItemStyle-Width="75px" DataField="CostoS" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Importe" ItemStyle-Width="75px" DataField="ImporteS" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Existencia" ItemStyle-Width="75px" DataField="ExistenciaAcum" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Valor" ItemStyle-Width="75px" DataField="ValorAcum" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right"/>
|
||||
<asp:BoundField HeaderText="Entradas" ItemStyle-Width="75px" DataField="Entradas" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Costo" ItemStyle-Width="75px" DataField="CostoE" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Importe" ItemStyle-Width="75px" DataField="ImporteE" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Salidas" ItemStyle-Width="75px" DataField="Salidas" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Costo" ItemStyle-Width="75px" DataField="CostoS" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Importe" ItemStyle-Width="75px" DataField="ImporteS" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Existencia" ItemStyle-Width="75px" DataField="ExistenciaAcum" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Valor" ItemStyle-Width="75px" DataField="ValorAcum" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Left"/>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
</div>
|
||||
|
||||
@@ -781,7 +781,6 @@ Partial Class Inventarios_TraspasoAlmacen
|
||||
Dim TextoError = ""
|
||||
Dim TipoMovimientoSalida As Integer = 26 'If(ChkTransitorio.Checked, 26, If(TipoAlmacenOrigen = 24, 26, 26))
|
||||
|
||||
|
||||
'AGREGAMOS LA SALIDA DEL ALMACEN ORIGEN
|
||||
CveMovimientoSalida = ObjInventario.AddMovimiento(DdlAlmacenOrigen.SelectedValue.ToEntero, TipoMovimientoSalida, 1, Fecha, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, -1, -1, -1,
|
||||
Observaciones:=TxtObservaciones.Text.Trim, Recibio:=If(ChkTransitorio.Checked, TxtResponsable.Text.Trim, "-1"),
|
||||
@@ -907,11 +906,30 @@ Partial Class Inventarios_TraspasoAlmacen
|
||||
Else
|
||||
ErrorMovInv = True
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
End If
|
||||
'AGREGAMOS PREPOLIZAS TRASPASO DIRECTO:
|
||||
If Not ErrorMovInv Then
|
||||
Dim CvePrePoliza As Integer = ObjConta.AddPrePolizas("Inventario/TraspasoAlmacen", 53, 0, 0, 1, Fecha, TxtObservaciones.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
|
||||
If ObjInventario.GetMovimientosDetalle(CveMovimientoSalida, UsuarioActual.CveEmpresa) Then
|
||||
|
||||
Dim resultado As DataTable = ObjInventario.DtResultados
|
||||
Dim importe As Decimal = resultado.SUM("Total").ToDecimal
|
||||
Dim IdCtaContable As Integer = GlobalDTAlmacen(UsuarioActual.CveEmpresa).FiltroPrimeroValor("IdCtaContable", String.Format("CveAlmacen = {0}", DdlAlmacenOrigen.SelectedValue.ToEntero)).ToEntero
|
||||
|
||||
If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, False, importe, TxtObservaciones.Text, 68, TxtObservaciones.Text, Fecha, IdCtaContable, -1, CveMovimientoAlmacen:=CveMovimientoSalida) Then
|
||||
ErrorMovInv = True
|
||||
End If
|
||||
|
||||
If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, importe, TxtObservaciones.Text, 68, TxtObservaciones.Text, Fecha, IdCtaContable, -1, CveMovimientoAlmacen:=CveMovimientoEntrada) Then
|
||||
ErrorMovInv = True
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
|
||||
''[IPP-1Noviembre2018] SE COMENTA PORQUE NO TIENE NI PIES NI CABEZA. LE FALTA DESARROLLO
|
||||
''CONSUMO INTERNO
|
||||
'If Not ErrorMovInv Then
|
||||
|
||||
@@ -811,7 +811,7 @@ Partial Class RepVentaDetalle
|
||||
Private Sub BtnDescargarPDF_Click(sender As Object, e As EventArgs) Handles BtnDescargarPDF.Click
|
||||
Dim pathPDF As String
|
||||
Dim TipoDocto As String = ""
|
||||
|
||||
'Dim ListaPDF As New List(Of MFacturaDescarga)
|
||||
'GENERA FACTURAS QUE NO ESTAN EN LA CARPETA
|
||||
For Each gvr As GridViewRow In GvDatos.Rows
|
||||
If gvr.DataKey("CveVenta").ToEntero > 0 Then
|
||||
@@ -835,8 +835,9 @@ Partial Class RepVentaDetalle
|
||||
|
||||
pathPDF = Server.MapPath(String.Format("~/Empresas/{0}/PDF/{1}/{2}.pdf", UsuarioActual.CveEmpresa, TipoDocto, gvr.DataKey("SerieFolio").ToString))
|
||||
|
||||
If Not IO.File.Exists(pathPDF) Then
|
||||
GenerarFacturaVentaDEV(gvr.DataKey("CveVenta").ToEntero)
|
||||
If Not IO.File.Exists(pathPDF) Then
|
||||
GenerarFacturaVentaDEV(gvr.DataKey("CveVenta").ToEntero, UsuarioActual.CveUsuario)
|
||||
'ListaPDF.Add(New MFacturaDescarga() With {.CveVenta = gvr.DataKey("CveVenta").ToEntero, .PDF = GenerarFacturaVentaDEV(gvr.DataKey("CveVenta").ToEntero, 100)})
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
@@ -877,14 +878,14 @@ Partial Class RepVentaDetalle
|
||||
Response.ContentType = "application/zip"
|
||||
Response.End()
|
||||
End Sub
|
||||
Private Function DescargarFactura(CveVenta As Integer, CveEmpresa As Integer) As Byte()
|
||||
Dim Url = New Uri(String.Format("{0}Compras/PopUpVerFactura.aspx?P={1}", ClsPaginas.UrlSitio, Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=1", CveVenta))))
|
||||
Private Function DescargarFactura(CveVenta As Integer, CveEmpresa As Integer, CveUsuarioCreo As Integer) As Byte()
|
||||
Dim Url = New Uri(String.Format("{0}Compras/PopUpVerFactura.aspx?P={1}", "http://localhost/", Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=1", CveVenta))))
|
||||
Dim File As Byte() = Nothing
|
||||
Try
|
||||
Using httpClient = New HttpClient()
|
||||
httpClient.Timeout = New TimeSpan(0, 15, 0)
|
||||
Using request = New HttpRequestMessage(HttpMethod.Get, Url)
|
||||
request.Headers.Add("ADSToken", Encripta(String.Format("CVEEMPRESA={0}&TICKS={1}", CveEmpresa, DateTime.UtcNow.Ticks)))
|
||||
request.Headers.Add("ADSToken", Encripta(String.Format("CVEEMPRESA={0}&TICKS={1}&CVEUSUARIO={2}", CveEmpresa, DateTime.UtcNow.Ticks, CveUsuarioCreo)))
|
||||
Dim response = httpClient.SendAsync(request).Result
|
||||
If response.StatusCode = Net.HttpStatusCode.OK Then
|
||||
File = response.Content.ReadAsByteArrayAsync().Result
|
||||
@@ -999,9 +1000,9 @@ Partial Class RepVentaDetalle
|
||||
GenerarPDF()
|
||||
End Sub
|
||||
|
||||
Private Sub GenerarFacturaVentaDEV(CveVenta As Integer)
|
||||
Private Function GenerarFacturaVentaDEV(CveVenta As Integer, CveUsuario As Integer) As Byte()
|
||||
|
||||
DescargarFactura(CveVenta, UsuarioActual.CveEmpresa)
|
||||
Return DescargarFactura(CveVenta, UsuarioActual.CveEmpresa, CveUsuario)
|
||||
'Dim ObjVentas As New ClsVentas
|
||||
'Dim Vta As Modelos.Factura = Nothing
|
||||
|
||||
@@ -1121,7 +1122,7 @@ Partial Class RepVentaDetalle
|
||||
' Vta = Nothing
|
||||
'End If
|
||||
|
||||
End Sub
|
||||
End Function
|
||||
|
||||
#End Region
|
||||
|
||||
|
||||
@@ -6257,7 +6257,7 @@ Partial Class Ventas
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Sub EmitirImprimir()
|
||||
Private Sub EmitirImprimir(Optional TipoDoctoViejo As String = "")
|
||||
DtRemisionesTmpDT = TmpDT.Copy
|
||||
DtPedidos2TmpDT = TmpDT.Copy
|
||||
DtCotizacionTmpDT = TmpDT.Copy
|
||||
@@ -6582,7 +6582,7 @@ Partial Class Ventas
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
EmitirImprimirNew()
|
||||
EmitirImprimirNew(TipoDoctoViejo)
|
||||
|
||||
End Sub
|
||||
#End Region
|
||||
@@ -6603,7 +6603,7 @@ Partial Class Ventas
|
||||
UpnTools.Update()
|
||||
End Sub
|
||||
|
||||
Protected Sub EmitirImprimirNew()
|
||||
Protected Sub EmitirImprimirNew(Optional TipoDoctoViejo As String = "")
|
||||
|
||||
|
||||
If ValidaPagosContado() Then
|
||||
@@ -6769,6 +6769,8 @@ Partial Class Ventas
|
||||
EsNCAmortizacion = True
|
||||
End If
|
||||
|
||||
Dim CveVentaAnterior As Integer = Me.CveVenta
|
||||
|
||||
GuardarVenta(ObjVentas, ObjConta, ObjInventario, ObjContr, ObjFactura, TmpDT, ObjFactura.CveNCaVincular, ObjContPaq, ObjBancos, ObjOS,
|
||||
ObjEventos, ObjCGame, ObjClientes, EsNCAmortizacion:=EsNCAmortizacion)
|
||||
|
||||
@@ -6789,6 +6791,15 @@ Partial Class Ventas
|
||||
Next
|
||||
End If
|
||||
|
||||
If Not String.IsNullOrEmpty(TipoDoctoViejo) Then
|
||||
'SI VIENE DE UNA AUTORIZACION
|
||||
If TipoDoctoViejo = "PA" Then
|
||||
If Not ObjEventos.AddEventoBitacora(String.Format("Se generó una remisión en Folio: <a href=""/Ventas/Ventas.aspx?CveVenta={0}"" target=""_blank"">{1}</a>", ObjFactura.CveVenta, ObjFactura.SerieFolio), "-1", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveVenta:=CveVentaAnterior) Then
|
||||
ErrorList.Add("Ocurrió un error al agregar la bitacora de Póliza Virtual.")
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
'SI ES REFACTURACION
|
||||
Dim ObjNC As List(Of Object) = Nothing
|
||||
If ErrorList.Count = 0 Then
|
||||
@@ -6926,8 +6937,6 @@ Partial Class Ventas
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
|
||||
If ObjFactura.CveVenta > 0 AndAlso ErrorList.Count = 0 AndAlso (SeGuardoPrePoliza Or ObjFactura.TipoDocto.Contiene("Ped", "Cot", "DPe", "PeC", "PA", "Pd2")) Then
|
||||
ObjVentas.Commit()
|
||||
|
||||
@@ -23584,9 +23593,30 @@ Partial Class Ventas
|
||||
TxtFechaPago.Text = If(TipoDoctoViejo = "Rem" AndAlso EsDiasCreditoFijo, Now.AddDays(DiasCredito), If(DdlTipoComprobante.SelectedValue = "Rem", Now.AddDays(PlazoCobranzaRemision), Now.AddDays(PlazoCobranza))).ToShortDateString
|
||||
TxtFechaEjecucion.Text = Now.ToString
|
||||
|
||||
'VALIDAR QUE NO SE HAYA REMISIONADO
|
||||
If TipoDoctoViejo = "PA" Then
|
||||
Dim RowVenta As DataRow = Nothing
|
||||
Dim ObjVentas As New ClsVentas
|
||||
If ObjVentas.GetVenta(CveVenta, UsuarioActual.CveEmpresa) Then
|
||||
RowVenta = ObjVentas.DtResultados.Rows(0)
|
||||
End If
|
||||
ObjVentas.Dispose()
|
||||
|
||||
If RowVenta IsNot Nothing Then
|
||||
Dim CveEstatusAutorizacion As Integer = RowVenta("CveEstatusFactura").ToString().ToEntero()
|
||||
'SI LA AUTORIZACION ESTA REMISIONADA NO DEBE REMISIONAR DE NUEVO
|
||||
If CveEstatusAutorizacion = 18 Then
|
||||
Alert("La autorización ya esta remisionada")
|
||||
Exit Sub
|
||||
End If
|
||||
Else
|
||||
Alert("No se encontró información de la autorización")
|
||||
Exit Sub
|
||||
End If
|
||||
End If
|
||||
|
||||
If FolioFijo = 0 Then CargaFolios() 'RECARGA FOLIOS CON EL NUEVO TIPO DOCTO
|
||||
EmitirImprimir() 'MANDA A EMITIR - PROCESO VIEJO
|
||||
EmitirImprimir(TipoDoctoViejo) 'MANDA A EMITIR - PROCESO VIEJO
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user