BITACORA PARA MODIFICACIONES A PREPOLIZAS Y PREPOLIZAS DETALLE

App_Code/ClsGenerales.vb

@@ -2410,7 +2410,7 @@ Public Class ClsGenerales
     Public Function GetHistorialBitacora(CveAcarreo As Integer, CveOrdenCompra As Integer, CveActivoFijo As Integer,
                                          CveOS As Integer, CvePS As Integer, CveCompra As Integer, CveIE As Integer,
                                          CveEmpresa As Integer, Optional CveUsuario As Integer = -1, Optional CvePersonal As Integer = -1,
-                                         Optional IdPoliza As Integer = -1) As Boolean
+                                         Optional IdPoliza As Integer = -1, Optional CvePrePoliza As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Gral_HistorialBitacoraGet")
 
@@ -2422,6 +2422,7 @@ Public Class ClsGenerales
             .Add("@CvePS", SqlDbType.Int).Value = CvePS
             .Add("@CveCompra", SqlDbType.Int).Value = CveCompra
             .Add("@CveIE", SqlDbType.Int).Value = CveIE
+            .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza
             .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
             .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
             .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal

Contabilidad/RegPrePoliza.aspx

@@ -497,6 +497,42 @@
             </td>
         </tr>
     </table>
+    <asp:UpdatePanel runat="server" ID="UpBitacora" UpdateMode="Conditional">
+        <ContentTemplate>
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="portlet light bordered xspadding">
+                        <div class="portlet-title">
+                            <div class="caption font-green">
+                                <i class="icon-pin font-green"></i>
+                                <span class="caption-subject bold uppercase">Historial de Modificación</span>
+                            </div>
+                            <div class="actions">
+                                <div class="btn-group">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="portlet-body">
+                            <asp:GridView ID="GvBitacora" runat="server" GridLines="None" Width="100%" CssClass="table table-striped table-advance table-hover Widthall ADSCroll mysmallbtn" CellSpacing="0" AutoGenerateColumns="False">
+                                <Columns>
+                                    <asp:TemplateField>
+                                        <HeaderTemplate>Fecha</HeaderTemplate>
+                                        <ItemTemplate>
+                                            <asp:Literal ID="LtlFecha" runat="server" Text='<%# Eval("FechaIng") %>'></asp:Literal>
+                                        </ItemTemplate>
+                                    </asp:TemplateField>
+                                    <asp:BoundField DataField="ConceptoHistorialBitacora" HeaderText="Campo" ItemStyle-HorizontalAlign="Left" />
+                                    <asp:BoundField DataField="Anterior" HeaderText="Anterior" ItemStyle-HorizontalAlign="Left" />
+                                    <asp:BoundField DataField="Actual" HeaderText="Actual" ItemStyle-HorizontalAlign="Left" />
+                                    <asp:BoundField DataField="Usuario" HeaderText="Usuario" ItemStyle-HorizontalAlign="Left" />
+                                </Columns>
+                            </asp:GridView>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </ContentTemplate>
+    </asp:UpdatePanel>
 
     <div id="DivContadoModal" align="center" class="modal ADS fade" role="dialog">
         <div class="modal-dialog" style="width: 450px;">

Contabilidad/RegPrePoliza.aspx.vb

@@ -209,6 +209,7 @@ Partial Class ContabilidadC_RegPrePoliza
                 ViewState("CvePrePoliza") = Request("CvePrePoliza").ToEntero
                 CreaDT()
                 CargaPrePoliza()
+                CargaGvBitacora()
                 If IfNull(Request("Tipo"), "").ToString <> "NOMPROV" Then
                     GvPrePoliza.Columns(4).Visible = False
                     GvConcepto.Columns(4).Visible = False
@@ -1643,5 +1644,15 @@ Partial Class ContabilidadC_RegPrePoliza
         End If
         ObjCompras.Dispose()
     End Sub
+
+    Private Sub CargaGvBitacora()
+        ' COMENTADO POR IPP PARA SUBIR 5 ABRIL 2017
+        Dim ObjGral As New ClsGenerales()
+        If ObjGral.GetHistorialBitacora(-1, -1, -1, -1, -1, -1, -1, UsuarioActual.CveEmpresa, CvePrePoliza:=CvePrePoliza) Then
+            GvBitacora.DataSource = ObjGral.DtResultados
+            GvBitacora.DataBind()
+        End If
+        ObjGral.Dispose()
+    End Sub
 End Class
 

Ventas/Ventas.aspx.vb

@@ -5297,6 +5297,7 @@ Partial Class Ventas
             '    RegistraScript("$('#DivDocsClienteUpload').modal({ backdrop: 'static',  keyboard: false});", "modalOC")
         End If
         BloqueaCondiconesPago()
+        DeshabilitarAplicarNotaDeCredito(LblRFC.Text)
     End Sub
 
     Private Sub CargaRestriccionesCreditoCliente(Optional Alertas As Boolean = False, Optional CveVenta As Integer = -1)
@@ -26249,6 +26250,15 @@ Partial Class Ventas
         ObjVentas.Dispose()
     End Sub
 
+    Private Sub DeshabilitarAplicarNotaDeCredito(RFC As String)
+
+        If UsuarioActual.CveEmpresa = 119 AndAlso RFC.Contiene("XAXX010101000", "XEXX010101000") Then
+            LBNotaCredito.Visible = False
+            UpnTools.Update()
+        End If
+
+    End Sub
+
 #Region "Auxiliar"
     Private Sub CargarSaldoAuxiliar(CveCliente As Integer)