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

Correciones en formato de RepProductosServicios Ventas

Browse Source 
Se puso que  se desbloquearala prepoliza al eliminar la poliza en Ventas, EntradasSalidas, PopUpAuxiliar, Compras y IE
This commit is contained in:
Desarrollo2019
2019-08-23 10:37:59 -07:00
parent 42b8fcbec8
commit 980234c4fb
8 changed files with 132 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Bancos/IE.aspx.vb
View File

@@ -4356,6 +4356,12 @@ Partial Class Bancos_IE
End If
End If
If Not ErrorCompra Then
If Not ObjConta.UpdatePrePolizasDetalleBloquear(CvePrePoliza, False) Then
ErrorCompra = True
End If
End If
If Not ErrorCompra Then
Alert("La poliza ha sido desvinculada y eliminada con exito.", TipoMensaje.MsgInformacion)
ObjAC.Commit()
@@ -4712,8 +4718,8 @@ Partial Class Bancos_IE
ObjGral.Dispose()
If Borrar = True Then
Dim ObjAC As ClsContPAQi = Nothing
Dim Banc As New ClsBancos
Banc.IniciaTransacSQL()
Dim Banc As New ClsBancos
Dim ObjConta As New ClsContabilidad(Banc.IniciaTransacSQL())
Dim ErrorCompra = False
@@ -4732,6 +4738,13 @@ Partial Class Bancos_IE
End If
End If
If Not ErrorCompra Then
If Not ObjConta.UpdatePrePolizasDetalleBloquear(CvePrePoliza, False) Then
ErrorCompra = True
End If
End If
If Not ErrorCompra Then
If Not Banc.EliminarBancos_IE(UsuarioActual.CveUsuario, CveIE) Then
ErrorCompra = True
@@ -4750,6 +4763,7 @@ Partial Class Bancos_IE
If ObjAC IsNot Nothing Then ObjAC.Dispose()
Banc.Dispose()
ObjConta.Dispose()
End If
Else
Alert("Tiene que decir el motivo de su eliminacion.", TipoMensaje.MsgInformacion)

14
Compras/Compras.aspx.vb
View File

@@ -7760,6 +7760,7 @@ Partial Class Compras_Compras
Dim ObjAC As ClsContPAQi = Nothing
Dim Comp As New ClsCompras()
Dim ObjEventos As New ClsOIEventos(Comp.IniciaTransacSQL())
Dim ObjConta As New ClsContabilidad(Comp.IniciaTransacSQL())
Dim ErrorCompra = False
@@ -7781,6 +7782,12 @@ Partial Class Compras_Compras
Next
End If
If Not ErrorCompra Then
If Not ObjConta.UpdatePrePolizasDetalleBloquear(CvePrePoliza, False) Then
ErrorCompra = True
End If
End If
If Not ErrorCompra Then
If Not Comp.DeleteCompra(CveCompra, False) Then
ErrorCompra = True
@@ -7799,6 +7806,7 @@ Partial Class Compras_Compras
If ObjAC IsNot Nothing Then ObjAC.Dispose()
Comp.Dispose()
ObjConta.Dispose()
End Sub
Protected Sub BtnAceptarAnticipos_Click(sender As Object, e As System.EventArgs) Handles BtnAceptarAnticipos.Click
@@ -12857,6 +12865,12 @@ Partial Class Compras_Compras
End If
End If
If Not ErrorCompra Then
If Not ObjConta.UpdatePrePolizasDetalleBloquear(CvePrePoliza, False) Then
ErrorCompra = True
End If
End If
If Not ErrorCompra Then
Alert("La poliza ha sido desvinculada y eliminada con exito.", TipoMensaje.MsgInformacion)
ObjAC.Commit()

7
Contabilidad/PopUpAuxiliar.aspx.vb
View File

@@ -238,6 +238,12 @@ Partial Class PopUpAuxiliar
Dim TieneError = False
If Not TieneError Then
If Not Conta.UpdatePrePolizasDetalleBloquear(ClavePrePoliza, False) Then
TieneError = True
End If
End If
If Not Conta.RemovePrePolizas(ClavePrePoliza, UsuarioActual.CveEmpresa) Then
TieneError = True
End If
@@ -257,6 +263,7 @@ Partial Class PopUpAuxiliar
If Not ObjContPaq.RemovePoliza(IdPoliza) Then
TieneError = True
End If
End If
End If
End If

83
Empresas/Grales/Formatos/RepProductosServicios.rdlc
View File

@@ -33,6 +33,7 @@
<RightBorder>
<Style>None</Style>
</RightBorder>
<BackgroundColor>LightGrey</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -47,19 +48,19 @@
<TablixBody>
<TablixColumns>
<TablixColumn>
<Width>2.71123cm</Width>
<Width>2.36727cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.71123cm</Width>
<Width>2.63186cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.71123cm</Width>
<Width>2.55248cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.71123cm</Width>
<Width>2.12915cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.71123cm</Width>
<Width>2.49956cm</Width>
</TablixColumn>
</TablixColumns>
<TablixRows>
@@ -77,13 +78,15 @@
<TextRun>
<Value>=Fields!Cantidad.Value</Value>
<Style>
<FontWeight>=IIF(Fields!GPO.Value.Equals("Total"),"Bold","Normal")</FontWeight>
<FontSize>8pt</FontSize>
<FontWeight>=IIF(Fields!Orden.Value.Equals(""),"Bold","Normal")</FontWeight>
<Format>#.##</Format>
<Color>=IIF(Fields!Orden.Value = "","White","Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
@@ -92,6 +95,7 @@
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!Orden.Value = "","CornflowerBlue","Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -111,12 +115,16 @@
<TextRun>
<Value>=Fields!SubTotal.Value</Value>
<Style>
<FontWeight>=IIF(Fields!GPO.Value.Equals("Total"),"Bold","Normal")</FontWeight>
<Format>#,0.00;(#,0.00)</Format>
<FontSize>8pt</FontSize>
<FontWeight>=IIF(Fields!Orden.Value.Equals(""),"Bold","Normal")</FontWeight>
<Format>#,0.00</Format>
<Color>=IIF(Fields!Orden.Value = "","White","Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style />
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>SubTotal</rd:DefaultName>
@@ -124,6 +132,7 @@
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!Orden.Value = "","CornflowerBlue","Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -143,12 +152,16 @@
<TextRun>
<Value>=Fields!Descuento.Value</Value>
<Style>
<FontWeight>=IIF(Fields!GPO.Value.Equals("Total"),"Bold","Normal")</FontWeight>
<Format>#,0.00;(#,0.00)</Format>
<FontSize>8pt</FontSize>
<FontWeight>=IIF(Fields!Orden.Value.Equals(""),"Bold","Normal")</FontWeight>
<Format>#,0.00</Format>
<Color>=IIF(Fields!Orden.Value = "","White","Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style />
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Descuento</rd:DefaultName>
@@ -156,6 +169,7 @@
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!Orden.Value = "","CornflowerBlue","Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -175,12 +189,16 @@
<TextRun>
<Value>=Fields!IVA.Value</Value>
<Style>
<FontWeight>=IIF(Fields!GPO.Value.Equals("Total"),"Bold","Normal")</FontWeight>
<Format>#,0.00;(#,0.00)</Format>
<FontSize>8pt</FontSize>
<FontWeight>=IIF(Fields!Orden.Value.Equals(""),"Bold","Normal")</FontWeight>
<Format>#,0.00</Format>
<Color>=IIF(Fields!Orden.Value = "","White","Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style />
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>IVA</rd:DefaultName>
@@ -188,6 +206,7 @@
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!Orden.Value = "","CornflowerBlue","Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -207,12 +226,16 @@
<TextRun>
<Value>=Fields!Total.Value</Value>
<Style>
<FontWeight>=IIF(Fields!GPO.Value.Equals("Total"),"Bold","Normal")</FontWeight>
<Format>#,0.00;(#,0.00)</Format>
<FontSize>8pt</FontSize>
<FontWeight>=IIF(Fields!Orden.Value.Equals(""),"Bold","Normal")</FontWeight>
<Format>#,0.00</Format>
<Color>=IIF(Fields!Orden.Value = "","White","Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style />
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Total</rd:DefaultName>
@@ -220,6 +243,7 @@
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!Orden.Value = "","CornflowerBlue","Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -260,6 +284,7 @@
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>LightGrey</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -295,6 +320,7 @@
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>LightGrey</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -330,6 +356,7 @@
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>LightGrey</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -365,6 +392,7 @@
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>LightGrey</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -400,6 +428,7 @@
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>LightGrey</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -419,13 +448,8 @@
<GroupExpression>=Fields!GPO.Value</GroupExpression>
</GroupExpressions>
</Group>
<SortExpressions>
<SortExpression>
<Value>=Fields!GPO.Value</Value>
</SortExpression>
</SortExpressions>
<TablixHeader>
<Size>5.42245cm</Size>
<Size>6.79828cm</Size>
<CellContents>
<Textbox Name="GPO">
<CanGrow>true</CanGrow>
@@ -436,7 +460,9 @@
<TextRun>
<Value>=Fields!GPO.Value</Value>
<Style>
<FontWeight>=IIF(Fields!GPO.Value.Equals("Total"),"Bold","Normal")</FontWeight>
<FontSize>8pt</FontSize>
<FontWeight>=IIF(Fields!Orden.Value.Equals(""),"Bold","Normal")</FontWeight>
<Color>=IIF(Fields!Orden.Value = "","White","Black")</Color>
</Style>
</TextRun>
</TextRuns>
@@ -448,6 +474,7 @@
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!Orden.Value = "","CornflowerBlue","Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -893,6 +920,10 @@
<DataField>Total</DataField>
<rd:TypeName>System.Double</rd:TypeName>
</Field>
<Field Name="Orden">
<DataField>Orden</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DataSet</rd:DataSetName>

30
Inventarios/EntradasSalidas.aspx.vb
View File

@@ -244,6 +244,14 @@ Partial Class Inventarios_EntradasSalidas
ViewState("Tipo") = value
End Set
End Property
Private Property CvePrePoliza As Integer
Get
Return CType(ViewState("CvePrePoliza"), Integer)
End Get
Set(value As Integer)
ViewState("CvePrePoliza") = value
End Set
End Property
#End Region
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -256,6 +264,7 @@ Partial Class Inventarios_EntradasSalidas
EstatusAlmacenCompra = -1
EsConsumoInterno = False
EsNuevoMov = False
CvePrePoliza = -1
CreaDT()
CargaCombos()
@@ -579,6 +588,7 @@ Partial Class Inventarios_EntradasSalidas
If DtMov.Rows(0)("CvePrePoliza").ToString.ToEntero > 0 Then
HplPrePoliza.Visible = True
HplPrePoliza.NavigateUrl = String.Format("/Contabilidad/RegPrePoliza.aspx?CvePrePoliza={0}", DtMov.Rows(0)("CvePrePoliza"))
CvePrePoliza = DtMov.Rows(0)("CvePrePoliza").ToString.ToEntero
Else
If UsuarioActual.CveRol = 1 Then
BtnGeneraPrepoliza.Visible = True
@@ -1035,14 +1045,10 @@ Partial Class Inventarios_EntradasSalidas
Private Sub BtnRemove_Click(sender As Object, e As EventArgs) Handles BtnRemove.Click
Dim Borrar As Boolean = False
If Not TxtDescripcion.Text = "" Then
Dim ObjGral As New ClsGenerales
ObjGral.IniciaTransacSQL()
If ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Inventarios", TxtFolio.Text + " / " + DdlConcepto.SelectedItem.Text) Then
Borrar = True
End If
Dim Inv As New ClsInventarios
Inv.IniciaTransacSQL()
Dim Conta As New ClsContabilidad(Inv.IniciaTransacSQL())
Dim ObjGral As New ClsGenerales(Inv.IniciaTransacSQL())
Dim TieneError = False
@@ -1052,6 +1058,9 @@ Partial Class Inventarios_EntradasSalidas
ObjConta.IniciaTransacSQL()
End If
If ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Inventarios", TxtFolio.Text + " / " + DdlConcepto.SelectedItem.Text) Then
TieneError = True
End If
If Inv.MovimientoRemove(CveMovimiento, UsuarioActual.CveEmpresa) Then
If HdnIdPoliza.Value.ToEntero > 0 Then
@@ -1063,10 +1072,15 @@ Partial Class Inventarios_EntradasSalidas
TieneError = True
End If
If Not TieneError Then
If Not Conta.UpdatePrePolizasDetalleBloquear(CvePrePoliza, False) Then
TieneError = True
End If
End If
If Not TieneError Then
If ObjConta IsNot Nothing Then ObjConta.Commit()
Inv.Commit()
ObjGral.Commit()
Alert("Movimientos Eliminado", TipoMensaje.MsgInformacion)
RegistraScript(String.Format("$('#{0}').modal('hide');", "divDescripcion"))
@@ -1074,7 +1088,6 @@ Partial Class Inventarios_EntradasSalidas
Else
If ObjConta IsNot Nothing Then ObjConta.RollBack()
Inv.RollBack()
ObjGral.RollBack()
Alert("Ocurrió un error al eliminar el movimiento. Por favor vuelva a intetar.", TipoMensaje.MsgError)
End If
@@ -1083,6 +1096,7 @@ Partial Class Inventarios_EntradasSalidas
If ObjConta IsNot Nothing Then ObjConta.Dispose()
Inv.Dispose()
ObjGral.Dispose()
Conta.Dispose()
End If
End Sub
#End Region

9
Inventarios/RecepcionUsados.aspx.vb
View File

@@ -633,7 +633,7 @@ Partial Class Inventarios_RecepcionUsados
Protected Sub BtnEliminar_Click(sender As Object, e As EventArgs) Handles BtnEliminar.Click
Dim Inv As New ClsInventarios
Inv.IniciaTransacSQL()
Dim Conta As New ClsContabilidad(Inv.IniciaTransacSQL())
Dim TieneError = False
@@ -654,6 +654,12 @@ Partial Class Inventarios_RecepcionUsados
TieneError = True
End If
'If Not TieneError Then
' If Not Conta.UpdatePrePolizasDetalleBloquear(CvePrePoliza, False) Then
' TieneError = True
' End If
'End If
If Not TieneError Then
If ObjConta IsNot Nothing Then ObjConta.Commit()
Inv.Commit()
@@ -670,6 +676,7 @@ Partial Class Inventarios_RecepcionUsados
If ObjConta IsNot Nothing Then ObjConta.Dispose()
Inv.Dispose()
Conta.Dispose()
End Sub
#End Region

4
Ventas/RepProductosServicios.aspx.vb
View File

@@ -476,8 +476,8 @@ Partial Class Ventas_RepProductosServicios
Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
Dim params As New List(Of ReportParameter)
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
params.Add(New ReportParameter("FechaInicio", FechaI.ToShortDateString))
params.Add(New ReportParameter("FechaFin", FechaF.ToShortDateString))
params.Add(New ReportParameter("FechaInicio", If(txtFechaI.Text <> "", FechaI.ToShortDateString, "")))
params.Add(New ReportParameter("FechaFin", If(txtFechaF.Text <> "", FechaF.ToShortDateString, "")))
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))

6
Ventas/Ventas.aspx.vb
View File

@@ -14607,6 +14607,12 @@ Partial Class Ventas
End If
End If
If Not ErrorMovimiento Then
If Not ObjConta.UpdatePrePolizasDetalleBloquear(CvePrePoliza, False) Then
ErrorMovimiento = True
End If
End If
If Not ErrorMovimiento Then
Alert("La póliza ha sido desvinculada y eliminada con éxito.", TipoMensaje.MsgInformacion)
ObjAC.Commit()