Merge branch 'master' of http://192.168.10.111:8383/SIG

Bancos/DepositosCaja.aspx

@@ -5,23 +5,20 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
     <style>
-            .checkbox label
+        .checkbox label {
-            {
             padding-left: 15px;
-
         }
-            .checkbox 
+
-            {
+        .checkbox {
             width: 100%;
             height: 100%;
-
         }
 
         .rowcheck {
             margin-left: -5px;
             padding-top: 10px;
-
         }
+
         .rowcheckCampos {
             padding-left: 0px;
         }
@@ -29,7 +26,6 @@
         #DivComisioncheck {
             border-top: 1px solid #e5e5e5;
         }
-
     </style>
 </asp:Content>
 
@@ -61,7 +57,7 @@
 
                             <label class="col-md-1 truncate" style="width: 70px;">Cuenta:</label>
                             <div class="col-md-2">
-                                <asp:DropDownList ID="DdlCajaChica" runat="server" AppendDataBoundItems="true" DataTextField="NumCuentaMoneda" DataValueField="CveCuenta" Class="table-group-action-input form-control input-inline input-small input-sm select2me" style="width:200px">
+                                <asp:DropDownList ID="DdlCajaChica" runat="server" AppendDataBoundItems="true" DataTextField="NumCuentaMoneda" DataValueField="CveCuenta" Class="table-group-action-input form-control input-inline input-small input-sm select2me" Style="width: 200px">
                                 </asp:DropDownList>
                             </div>
 
@@ -190,9 +186,9 @@
 
 
                 <div class="col-md-2" style="text-align: right; font-size: 1.2em;" runat="server" id="divLabelTotal" visible="true">
-                    <asp:label runat="server">Seleccionado: $</asp:label>
+                    <asp:Label runat="server">Seleccionado: $</asp:Label>
-                    <asp:label runat="server" ID="lblValorTotal">0.00</asp:label>
+                    <asp:Label runat="server" ID="lblValorTotal">0.00</asp:Label>
-                    <asp:label runat="server" ID="lblValorTotalSeleccionado" Visible="false"></asp:label>
+                    <asp:Label runat="server" ID="lblValorTotalSeleccionado" Visible="false"></asp:Label>
                 </div>
             </div>
         </ContentTemplate>
@@ -265,7 +261,7 @@
                 <div class="col-md-10 rowcheckCampos" id="DivInter" style="display: none">
                     <div class="col-md-1" id="dd" style="padding-right: 130px;">
                         <label>Intermediario:</label>
-                        <asp:Dropdownlist ID="DdlProveedorIntermediario" CssClassDdl="select2me" Width="100px" CssStyle="100%" DataTextField="RazonSocial" DataValueField="CveProveedor" runat="server"></asp:Dropdownlist>
+                        <asp:DropDownList ID="DdlProveedorIntermediario" CssClassDdl="select2me" Width="100px" CssStyle="100%" DataTextField="RazonSocial" DataValueField="CveProveedor" runat="server"></asp:DropDownList>
                     </div>
                     <div class="col-md-2" style="width: 205px;">
                         <div class="col-md-6" id="DivinterImporte" style="padding-left: 0px; padding-right: 0px;">
@@ -364,8 +360,14 @@
 </asp:Content>
 
 <asp:Content ID="Content7" ContentPlaceHolderID="JS" runat="Server">
+    <script src="/Scripts/PrintJS/print.min.js"></script>
     <script type="text/javascript" language="javascript">
 
+
+        function impresionBase64(pdfBase64) {
+            printJS({ printable: pdfBase64, type: 'pdf', showModal: true, base64: true });
+        }
+
         var specialKeys = new Array();
         specialKeys.push(9); //Backspace  
         function numericOnly(elementRef) {

Bancos/DepositosCaja.aspx.vb

@@ -2,6 +2,8 @@
 Option Strict On
 
 Imports System.Data
+Imports System.IO
+Imports System.Net.Http
 Imports Extensiones
 Partial Class Bancos_DepositosCaja
     Inherits ClsPaginas
@@ -150,6 +152,7 @@ Partial Class Bancos_DepositosCaja
         Dim IVA As Decimal = TxtIVA.Text.ToDecimal
         Dim ImporteInter As Decimal = TxtComisionIntermediario.Text.ToDecimal
 
+        Dim MsgError As String = "Ocurrió un error al realizar los depositos"
 
         For Each Gvr As GridViewRow In GvFacturas.Rows
             If Gvr.FCCheckBox("ChkFactura").Checked Then TotalImporte += Gvr.DataKey("Importe").ToDecimal
@@ -185,12 +188,18 @@ Partial Class Bancos_DepositosCaja
         End If
 
         Dim OcurrioError As Boolean = False
+        Dim NuevaCvePrePoliza As Integer
+
+        Dim pdf64 As String = ""
+        Dim documentos As String = "Los Depósitos se realizaron exitosamente<br/><br/>"
+
+        Dim CveIEOrigen As Integer = -1 'CajaChica
+        Dim CveIEDestino As Integer = -1  'Banco
+
         Dim ObjConta As New ClsContabilidad()
         Dim ObjBancos As New ClsBancos(ObjConta.IniciaTransacSQL())
 
-        Dim CveIEOrigen As Integer 'CajaChica
+        Try
-        Dim CveIEDestino As Integer 'Banco
-        Dim NuevaCvePrePoliza As Integer
             Dim FolioIE As Long = -1
             Dim CveMoneda As Integer = 1
             Dim TipoCambio As Decimal = 1
@@ -206,7 +215,7 @@ Partial Class Bancos_DepositosCaja
             Dim CveSubProyectoDescuento As Integer
             Dim CveClasificacionDescuento As Integer
 
-        Dim documentos As String = "Los Depósitos se realizaron exitosamente<br/><br/>"
+
             Dim imprimirFolios As String = ""
             Dim CveSubProyectoIntermediario As Integer
             Dim CveClasificacionIntermediario As Integer
@@ -363,18 +372,41 @@ Partial Class Bancos_DepositosCaja
                 End If
             End If
 
+            If Not OcurrioError Then
+                documentos += String.Format("<a class=""Texto"" target='_blank' href=""/Contabilidad/RegPrePolizas.aspx?CvePrePoliza={0}"">Prepóliza</a> <br/><br/> ", NuevaCvePrePoliza)
+            End If
+
+        Catch ex As Exception
+            OcurrioError = True
+            OnError("Ocurrió un error al procesar los datos", ex)
+        End Try
+
         If OcurrioError Then
             ObjConta.RollBack()
-            Alert("Ocurrio un error al realizar los depositos", TipoMensaje.MsgError)
+            Alert(MsgError, TipoMensaje.MsgError)
         Else
-
             ObjConta.Commit()
-            documentos += String.Format("<a class=""Texto"" target='_blank' href=""/Contabilidad/RegPrePolizas.aspx?CvePrePoliza={0}"">Prepóliza</a> <br/><br/> ", NuevaCvePrePoliza)
+
+            If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then
+                Try
+                    pdf64 = ImpresionDirectaPDF(CveIEOrigen, NuevaCvePrePoliza)
+                Catch ex As Exception
+                    pdf64 = ""
+                    GuardaLog(ex.ToString())
+                End Try
+
+                If Not String.IsNullOrEmpty(pdf64) Then
+                    RegistraScript($"impresionBase64('{pdf64}');", "Imprimir")
+                Else
+                    Alert("No se pudo imprimir el pdf", TipoMensaje.MsgAdvertencia)
+                End If
+            End If
 
             Alert(documentos.ToString)
             CargaDatos()
 
         End If
+
         TxtComision.Text = ""
         TxtDescuento.Text = ""
         TxtIVA.Text = ""
@@ -463,4 +495,79 @@ Partial Class Bancos_DepositosCaja
         End If
         DDlMesesSinIntereses.SelectedValue = "-1"
     End Sub
+
+    Private Function ImpresionDirectaPDF(CveIEOrigen As Integer, CvePrePoliza As Integer) As String
+
+        Dim PDFPago As Byte() = Nothing
+        Dim PDFPrePoliza As Byte() = Nothing
+
+        Dim ParametrosPago As String = Encripta($"OP=DC&CveIE={CveIEOrigen}&CuentaCaja={DdlCajaChica.SelectedItem.Text}&CuentaDepo={DdlCuentaDeposito.SelectedItem.Text}&TipoPago={DdlTipoPago.SelectedItem.Text}")
+        Dim ParametrosPrePoliza As String = Encripta($"OP=PREPO&CvePrePoliza={CvePrePoliza}")
+
+        Try
+            PDFPago = DescargarPDF(ParametrosPago, UsuarioActual.CveEmpresa, UsuarioActual.CveUsuario)
+            If PDFPago IsNot Nothing Then
+                PDFPrePoliza = DescargarPDF(ParametrosPrePoliza, UsuarioActual.CveEmpresa, UsuarioActual.CveUsuario)
+            End If
+
+        Catch ex As Exception
+            GuardaLog(ex.ToString())
+
+            PDFPago = Nothing
+            PDFPrePoliza = Nothing
+        End Try
+
+        If PDFPago IsNot Nothing AndAlso PDFPrePoliza IsNot Nothing Then
+            Dim pdf64 As String = ""
+            'UNIFICAR LOS 2 PDF
+            Using ms As New MemoryStream
+                Using pdfdoc As New iText.Kernel.Pdf.PdfDocument(New iText.Kernel.Pdf.PdfWriter(ms))
+                    pdfdoc.InitializeOutlines()
+
+                    Dim docPago As New iText.Kernel.Pdf.PdfDocument(New iText.Kernel.Pdf.PdfReader(New MemoryStream(PDFPago)))
+                    docPago.CopyPagesTo(1, docPago.GetNumberOfPages(), pdfdoc)
+                    docPago.Close()
+
+                    Dim docPrePoliza As New iText.Kernel.Pdf.PdfDocument(New iText.Kernel.Pdf.PdfReader(New MemoryStream(PDFPrePoliza)))
+                    docPrePoliza.CopyPagesTo(1, docPrePoliza.GetNumberOfPages(), pdfdoc)
+                    docPrePoliza.Close()
+
+                    pdfdoc.Close()
+                End Using
+                pdf64 = Convert.ToBase64String(ms.ToArray())
+            End Using
+
+            Return pdf64
+        Else
+            Return ""
+        End If
+
+    End Function
+    Private Function DescargarPDF(Parametros As String, CveEmpresa As Integer, CveUsuarioCreo As Integer, Optional GetBytes As Boolean = True, Optional strURLHOST As String = "") As Byte()
+
+        If String.IsNullOrEmpty(strURLHOST) Then
+            strURLHOST = String.Format("{0}://{1}:{2}", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Host, HttpContext.Current.Request.Url.Port)
+        End If
+
+        Dim Url As New Uri(String.Format("{0}/Compras/PopUpVerFactura.aspx?P={1}", strURLHOST, Parametros))
+        Dim File As Byte() = Nothing
+        Try
+            Using httpClient As New HttpClient()
+                httpClient.Timeout = New TimeSpan(0, 0, 40)
+                Using request As New HttpRequestMessage(HttpMethod.Get, Url)
+                    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 GetBytes AndAlso response.StatusCode = Net.HttpStatusCode.OK Then
+                        File = response.Content.ReadAsByteArrayAsync().Result
+                    End If
+                End Using
+            End Using
+        Catch ex As Exception
+            File = Nothing
+            OnError("Ocurrió un error al descargar la factura", ex)
+        End Try
+
+        Return File
+    End Function
+
 End Class

Compras/PopUpVerFactura.aspx.vb

@@ -1418,7 +1418,11 @@ Partial Class PopUpVerFactura
         'IMPRIME DEPOSITOS CAJA
         If UrlParametros("OP").ToString = "DC" Then
             If UrlParametros("CVEIE") IsNot Nothing AndAlso UrlParametros("CVEIE").ToString.ToEntero > 0 Then
-                CargaDepositosCaja(UrlParametros("CVEIE").ToString.ToEntero, UrlParametros("CUENTACAJA").ToString, UrlParametros("CUENTADEPO").ToString)
+                Dim TipoPago As String = ""
+                If UrlParametros("TIPOPAGO") IsNot Nothing Then
+                    TipoPago = UrlParametros("TIPOPAGO").ToString()
+                End If
+                CargaDepositosCaja(UrlParametros("CVEIE").ToString.ToEntero, UrlParametros("CUENTACAJA").ToString, UrlParametros("CUENTADEPO").ToString, TipoPago)
             End If
         End If
 
@@ -5261,22 +5265,25 @@ Partial Class PopUpVerFactura
 #End Region
 
 #Region "OP = 'DC' - DEPOSITOS CAJA"
-    Private Sub CargaDepositosCaja(CveIE As Integer, CuentaCaja As String, CuentaDeposito As String)
+    Private Sub CargaDepositosCaja(CveIE As Integer, CuentaCaja As String, CuentaDeposito As String, TipoPago As String)
         Dim Archivo As New System.IO.FileInfo(String.Format("{0}Formatos/DepositoCaja.rdlc", UsuarioActual.Empresa.Ruta))
 
+        Dim Tabla As DataTable = Nothing
+
         Dim ObjIE As New ClsBancos()
-        Dim Tabla As DataTable
+        If ObjIE.GetBancosIEMovimientosDepositos(CveIE, UsuarioActual.CveEmpresa) Then
-        ObjIE.GetBancosIEMovimientosDepositos(CveIE, UsuarioActual.CveEmpresa)
+            Tabla = ObjIE.DtResultados.Copy()
+        End If
+        ObjIE.Dispose()
 
-
+        If Tabla IsNot Nothing AndAlso Tabla.Rows.Count > 0 Then
-        If ObjIE.DtResultados IsNot Nothing AndAlso ObjIE.DtResultados.Rows.Count > 0 Then
-            Tabla = ObjIE.DtResultados
 
             Dim params As New List(Of ReportParameter)
             params.Add(New ReportParameter("Fecha", NowADS().ToDateTime.ToString))
-            params.Add(New ReportParameter("FechaIE", ObjIE.DtResultados(0)("FechaDocumento").ToString.ToDate.ToShortDateString))
+            params.Add(New ReportParameter("FechaIE", Tabla(0)("FechaDocumento").ToString.ToDate.ToShortDateString))
             params.Add(New ReportParameter("CuentaCaja", CuentaCaja))
             params.Add(New ReportParameter("CuentaDeposito", CuentaDeposito))
+            params.Add(New ReportParameter("TipoPago", TipoPago))
 
             If Archivo.Exists Then
                 params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
@@ -5287,11 +5294,6 @@ Partial Class PopUpVerFactura
             End If
         End If
 
-
-
-
-        ObjIE.Dispose()
-
     End Sub
 #End Region
 

Empresas/Grales/Formatos/DepositoCaja.rdlc

@@ -12,7 +12,10 @@
               <Width>0.96697in</Width>
             </TablixColumn>
             <TablixColumn>
-              <Width>4.66607in</Width>
+              <Width>3.81815in</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>0.98425in</Width>
             </TablixColumn>
             <TablixColumn>
               <Width>0.84873in</Width>
@@ -158,6 +161,50 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox9">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Tipo Pago</Value>
+                              <Style>
+                                <FontWeight>Bold</FontWeight>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox9</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>LightGrey</Color>
+                          <Style>None</Style>
+                        </Border>
+                        <TopBorder>
+                          <Color>DimGray</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </TopBorder>
+                        <BottomBorder>
+                          <Color>DimGray</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="Textbox10">
@@ -346,6 +393,49 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="TipoPago">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!TipoPago.Value</Value>
+                              <Style>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Left</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>TipoPago</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <TopBorder>
+                          <Color>DimGray</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </TopBorder>
+                        <BottomBorder>
+                          <Color>DimGray</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="Importe">
@@ -401,6 +491,7 @@
             <TablixMember />
             <TablixMember />
             <TablixMember />
+            <TablixMember />
           </TablixMembers>
         </TablixColumnHierarchy>
         <TablixRowHierarchy>
@@ -417,7 +508,7 @@
         <DataSetName>DataSet1</DataSetName>
         <Top>1.43975in</Top>
         <Height>0.43in</Height>
-        <Width>7.75822in</Width>
+        <Width>7.89456in</Width>
         <Style>
           <Border>
             <Style>None</Style>
@@ -876,11 +967,99 @@
           <PaddingBottom>2pt</PaddingBottom>
         </Style>
       </Textbox>
+      <Textbox Name="Textbox25">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Tipo Pago:</Value>
+                <Style>
+                  <FontWeight>Bold</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value />
+                <Style>
+                  <FontWeight>Bold</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox12</rd:DefaultName>
+        <Top>2.96905cm</Top>
+        <Left>12.49038cm</Left>
+        <Height>0.53299cm</Height>
+        <Width>2.14725cm</Width>
+        <ZIndex>13</ZIndex>
+        <Visibility>
+          <Hidden>=(Parameters!TipoPago.Value = "")</Hidden>
+        </Visibility>
+        <Style>
+          <Border>
+            <Color>LightGrey</Color>
+            <Style>None</Style>
+          </Border>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
+      <Textbox Name="Textbox36">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>=Parameters!TipoPago.Value</Value>
+                <Style>
+                  <FontWeight>Bold</FontWeight>
+                  <Format>dd/MM/yyyy</Format>
+                  <Language>es-MX</Language>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox12</rd:DefaultName>
+        <Top>2.96905cm</Top>
+        <Left>15.61669cm</Left>
+        <Height>0.53299cm</Height>
+        <Width>3.76632cm</Width>
+        <ZIndex>14</ZIndex>
+        <Style>
+          <Border>
+            <Color>LightGrey</Color>
+            <Style>None</Style>
+          </Border>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
     </ReportItems>
     <Height>5.34917cm</Height>
     <Style />
   </Body>
-  <Width>19.70589cm</Width>
+  <Width>20.05217cm</Width>
   <Page>
     <PageFooter>
       <Height>0.02646cm</Height>
@@ -934,6 +1113,10 @@
           <DataField>Cliente</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="TipoPago">
+          <DataField>TipoPago</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
         <Field Name="Importe">
           <DataField>Importe</DataField>
           <rd:TypeName>System.Double</rd:TypeName>
@@ -979,6 +1162,12 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="TipoPago">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
   </ReportParameters>
   <rd:ReportUnitType>Cm</rd:ReportUnitType>
   <rd:ReportID>8ca56a24-e4cd-4986-9105-84383a48863b</rd:ReportID>

Ventas/Ventas.aspx.vb

@@ -8537,6 +8537,11 @@ Partial Class Ventas
         GvPS.DataSource = TmpDT
         DtInv = TmpDT.Copy.FiltraParametros("CveTipoPS = 2")
         GvPS.DataBind()
+
+        If UsuarioActual.TienePermisoProceso(253) Then
+            GvPS.Rows(e.NewEditIndex).FCTextBox("TxtPrecio").Enabled = True
+        End If
+
         If UsuarioActual.Empresa.Funcionalidad(558) = "1" Then
             GvPS.Rows(e.NewEditIndex).FCDropDownList("DdlUnidadMedida").Enabled = False
             GvPS.Rows(e.NewEditIndex).FCDropDownList("DdlClasificacion").Enabled = False