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

Bancos/IE.aspx

@@ -247,10 +247,8 @@
                                 </asp:UpdatePanel>
                             </asp:Panel>
                              <div id="DivOtrosIngresosEgresos" runat="server" visible="false" class="row">
-                                <label class="col-md-2 control-label"></label>
+                                                 
-                                <div class="col-md-2"></div>
+                                <label class="col-md-2 control-label ">Otros:</label>
-                                <div class="col-md-4"></div>
-                                <label class="col-md-1 control-label text-right">Otr:</label>
                                 <div class="col-md-2 input-icon">
                                     <i style="margin: 0px;">$</i>
                                     <asp:TextBox ID="TxtOtrosIngresosEgresos" runat="server" CssClass="form-control input-sm" ClientIDMode="Static" Style="text-align: right;"  AutoComplete="off"></asp:TextBox>

Bancos/IE.aspx.vb

@@ -1180,6 +1180,7 @@ Partial Class Bancos_IE
 
                     DdlProveedores.SelectedText = ObjProveedor.NombreComercial
                     DdlProveedores.SelectedValue = ObjProveedor.CveProveedor.ToString
+                    DivOtrosIngresosEgresos.Visible = True
 
                 End If
 

Compras/Compras.aspx.vb

@@ -6227,8 +6227,8 @@ Partial Class Compras_Compras
                                                                                         CostoIndirectoAcum176 += ImporteCI176
                                                                                         'se considera costoindirecto, para que la factura tiene en un concepto tipo servicio
                                                                                         SumatoriaOCINV += (Dr(If(ListaDocumentos IsNot Nothing AndAlso ListaDocumentos.Count > 0 AndAlso ArrAnticipos IsNot Nothing AndAlso ArrAnticipos.Count > 0 AndAlso TxtTotal.Text.ToDecimal = 0, "ImporteSinImpuestos", "Total")).ToString.ToDecimal * tipoCambioActual) - (ImporteMN228 + ImporteMN229 - ImporteCI176)
-                                                                                        If ObjConta.AddPrePolizasDetalle(CvePrePoliza, TipoMovimiento, Importe228, Referencia, ConceptoContabilizacionME, Concepto, FechaMovimiento, IdCtaContableME, -1, CveCompra:=CveCompra, CveProveedor:=CveProveedorConcepto, ImporteMX:=ImporteMN228, ImporteME:=ImporteME228, CveCuenta:=CveCuenta, CveOCDetalle:=Dr("CveOrdenCompraDetalle").ToString.ToEntero, TipoCambio:=TCAjuste, CveMovimientoAlmacen:=Dr("CveMovimientoAlmacen").ToString.ToEntero, Contabilizable:=SeContabiliza) Then
+                                                                                        If ObjConta.AddPrePolizasDetalle(CvePrePoliza, TipoMovimiento, Importe228, Referencia, ConceptoContabilizacionME, Concepto, FechaMovimiento, IdCtaContableME, -1, CveCompra:=CveCompra, CveProveedor:=CveProveedorConcepto, ImporteMX:=ImporteMN228, ImporteME:=ImporteME228, CveCuenta:=CveCuenta, CveOCDetalle:=Dr("CveOrdenCompraDetalle").ToString.ToEntero, TipoCambio:=TCAjuste, CveMovimientoAlmacen:=CveMovimientoAlmacen, Contabilizable:=SeContabiliza) Then
-                                                                                            If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, TipoMovimiento, Importe229, Referencia, ConceptoContabilizacionMEComp, Concepto, FechaMovimiento, IdCtaContableMEComp, -1, CveCompra:=CveCompra, CveProveedor:=CveProveedorConcepto, ImporteMX:=ImporteMN229, ImporteME:=ImporteME229, CveCuenta:=CveCuenta, CveOCDetalle:=Dr("CveOrdenCompraDetalle").ToString.ToEntero, TipoCambio:=TCAjuste, CveMovimientoAlmacen:=Dr("CveMovimientoAlmacen").ToString.ToEntero, Contabilizable:=SeContabiliza) Then
+                                                                                            If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, TipoMovimiento, Importe229, Referencia, ConceptoContabilizacionMEComp, Concepto, FechaMovimiento, IdCtaContableMEComp, -1, CveCompra:=CveCompra, CveProveedor:=CveProveedorConcepto, ImporteMX:=ImporteMN229, ImporteME:=ImporteME229, CveCuenta:=CveCuenta, CveOCDetalle:=Dr("CveOrdenCompraDetalle").ToString.ToEntero, TipoCambio:=TCAjuste, CveMovimientoAlmacen:=CveMovimientoAlmacen, Contabilizable:=SeContabiliza) Then
                                                                                                 ErrorPrepoliza = True
                                                                                                 Exit For
                                                                                             End If
@@ -6301,7 +6301,7 @@ Partial Class Compras_Compras
 
                                                                     Concepto = $"{NombreProveedor} {TxtSerie.Text} - {TxtFolio.Text}"
 
-                                                                    If importeMovimiento > 0 And ChkNCInvNC.Checked Or TxtTotal.Text.ToDecimal = 0 And ChkNCInvNC.Checked Then
+                                                                    If importeMovimiento > 0 Or TxtTotal.Text.ToDecimal = 0 Then
                                                                         RegistroCuentaPuente = True
                                                                         'Conta ContPAQ
                                                                         If IdCtaContable = 0 Then

OS/OrdenesServicios.aspx.vb

@@ -247,6 +247,24 @@ Partial Class OS_OrdenesServicios
             ViewState("CveTecnico") = value
         End Set
     End Property
+
+    Private Property ClienteRFC As String
+        Get
+            Return ViewState("ClienteRFC").ToString
+        End Get
+        Set(value As String)
+            ViewState("ClienteRFC") = value
+        End Set
+    End Property
+
+    Private Property ClienteMail As String
+        Get
+            Return ViewState("ClienteMail").ToString
+        End Get
+        Set(value As String)
+            ViewState("ClienteMail") = value
+        End Set
+    End Property
 #End Region
     Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
         If Not IsPostBack Then
@@ -340,7 +358,6 @@ Partial Class OS_OrdenesServicios
 
             hdnEsThickbox.Value = "S"
             hdnClientIDLink.Value = "NoDefinido"
-            ImprimirAlGenerar()
         End If
 
     End Sub
@@ -708,6 +725,8 @@ Partial Class OS_OrdenesServicios
                 ClienteEstado = ObjCliente.Estado
                 TelefonoCliente = ObjCliente.Telefono
                 TxtSolicito.Text = ObjCliente.Contacto
+                ClienteRFC = ObjCliente.RFC
+                ClienteMail = ObjCliente.Mail
 
                 If ObjCliente.GetSucursales(CveCliente) Then
                     DdlSucursalCliente.DataSource = ObjCliente.DtResultados
@@ -979,7 +998,7 @@ Partial Class OS_OrdenesServicios
             If Not ObjOrdenServicio.AddOrdenesServicios(CveCliente, DdlSubProyecto.SelectedValue.ToEntero, TxtSolicito.Text, TxtFechaRecibido.Text.ToDateTime, TxtDescripcion.Text, UsuarioActual.CveUsuario, DdlEstatusOS.SelectedValue.ToEntero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveCotizacion, -1, -1, DdlTipoOrdenOS.SelectedValue.ToEntero, CveClienteSucursal:=DdlSucursalCliente.SelectedValue.ToEntero) Then
                 Errores = True
             End If
-
+            CargaCliente(CveCliente)
             For Each Row As DataRow In TmpDT.Rows
                 If Not Errores Then
                     Dim Consecutivo As Integer = Row("Consecutivo").ToString.ToEntero
@@ -1046,6 +1065,8 @@ Partial Class OS_OrdenesServicios
 
                 Dim Liga = $"document.location.href=""/OS/RepOrdenesServicios.aspx"";"
 
+                ImprimirAlGenerar()
+
                 ObjOrdenServicio.Commit()
 
                 Alert(MensajeAlert.ToString, TipoMensaje.MsgInformacion, Liga)
@@ -2427,8 +2448,41 @@ Partial Class OS_OrdenesServicios
     Private Sub ImprimirAlGenerar()
         Dim params As New List(Of ReportParameter)
         Dim report As LocalReport = New LocalReport()
+
+        Dim dt As DataTable = TmpDT
+        Dim DtMateriales As DataTable = TmpDTMaterialesDetalle
+
         report.ReportPath = String.Format("Empresas/{0}/Formatos/FormatoOS.rdlc", UsuarioActual.CveEmpresa)
-        Dim paramCollection = report.GetParameters
+
+        params.Add(New ReportParameter("Cliente", NombreCliente))
+        params.Add(New ReportParameter("Direccion", ClienteDireccion))
+        params.Add(New ReportParameter("NoDeCliente", TxtCodigo.Text))
+        params.Add(New ReportParameter("RFC", ClienteRFC))
+        params.Add(New ReportParameter("Poblacion", ClienteCiudad))
+        params.Add(New ReportParameter("Vendedor", UsuarioActual.Nombre))
+        params.Add(New ReportParameter("Contacto", TxtSolicito.Text))
+        params.Add(New ReportParameter("Correo", ClienteMail))
+        params.Add(New ReportParameter("Sucursal", DdlSubProyecto.SelectedItem.Value))
+        params.Add(New ReportParameter("TipoServicio", "Reparación/Diagnostico"))
+        params.Add(New ReportParameter("DiaFecha", Date.Today.Day.ToString))
+        params.Add(New ReportParameter("MesFecha", Date.Today.Month.ToString))
+        params.Add(New ReportParameter("AñoFecha", Date.Today.Year.ToString))
+        params.Add(New ReportParameter("DiaVigencia", Date.Today.Day.ToString))
+        params.Add(New ReportParameter("MesVigencia", Date.Today.Month.ToString))
+        params.Add(New ReportParameter("AñoVigencia", Date.Today.Year.ToString))
+        params.Add(New ReportParameter("Folio", CveFolio.ToString))
+        params.Add(New ReportParameter("CodigoDeServicio", CveOS.ToString))
+        params.Add(New ReportParameter("FallaReportada", TxtDescripcion.Text))
+        params.Add(New ReportParameter("Copia", "Copia: Cliente"))
+
+        Dim lrds As New List(Of ReportDataSource)
+        Dim rds As New ReportDataSource With {.Name = "DataSet2", .Value = DtMateriales}
+        Dim rds2 As New ReportDataSource With {.Name = "DataSet1", .Value = dt}
+
+        lrds.Add(rds)
+        lrds.Add(rds2)
+
+        ImprimirPDF(String.Format("Empresas/{0}/Formatos/FormatoOS.rdlc", UsuarioActual.CveEmpresa), lrds, params, NombreArchivo:=String.Format("OrdenServicio-{0}", CveFolio))
     End Sub
 #End Region
 

SqlServerTypes/readme.htm

@@ -0,0 +1,61 @@
+<html lang="en-US">
+<head>
+    <meta charset="utf-8" />
+    <title>Microsoft.SqlServer.Types</title>
+    <style>
+        body {
+            background: #fff;
+            color: #505050;
+            margin: 20px;
+        }
+
+        #main {
+            background: #efefef;
+            padding: 5px 30px;
+        }
+    </style>
+</head>
+<body>
+    <div id="main">
+        <h1>Action required to load native assemblies</h1>
+        <p>
+            To deploy an application that uses spatial data types to a machine that does not have 'System CLR Types for SQL Server' installed you also need to deploy the native assembly SqlServerSpatial140.dll. Both x86 (32 bit) and x64 (64 bit) versions of this assembly have been added to your project under the SqlServerTypes\x86 and SqlServerTypes\x64 subdirectories. The native assembly msvcr120.dll is also included in case the C++ runtime is not installed.
+        </p>
+        <p>
+            You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture).
+        </p>
+        <h2>ASP.NET Web Sites</h2>
+        <p>
+            For ASP.NET Web Sites, add the following block of code to the code behind file of the Web Form where you have added Report Viewer Control:
+            <pre>
+    Default.aspx.cs:
+        
+    public partial class _Default : System.Web.UI.Page
+    {
+        static bool _isSqlTypesLoaded = false;
+
+        public _Default()
+        {
+            if (!_isSqlTypesLoaded)
+            {
+                SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~"));
+                _isSqlTypesLoaded = true;
+            }
+            
+        }
+    }
+</pre>
+        </p>
+        <h2>ASP.NET Web Applications</h2>
+        <p>
+            For ASP.NET Web Applications, add the following line of code to the Application_Start method in Global.asax.cs:
+            <pre>    SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));</pre>
+        </p>
+        <h2>Desktop Applications</h2>
+        <p>
+            For desktop applications, add the following line of code to run before any spatial operations are performed:
+            <pre>    SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);</pre>
+        </p>
+    </div>
+</body>
+</html>

packages.config

@@ -7,7 +7,9 @@
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
+  <package id="Microsoft.ReportingServices.ReportViewerControl.WebForms" version="150.1358.0" targetFramework="net45" />
   <package id="Microsoft.ReportViewer.2015.Runtime" version="12.0.2.2402" targetFramework="net4" />
+  <package id="Microsoft.SqlServer.Types" version="14.0.1016.290" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net4" />
   <package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net4" />
   <package id="NC-OS-SessionStateProvider" version="4.4.0.0" targetFramework="net40" />