Merge branch 'master' of http://rpimienta@192.168.10.111:8383/SIG.git

OC/OC.aspx

@@ -818,6 +818,8 @@
                                                     <ajax:FilteredTextBoxExtender ID="SoloNumerosPU" runat="server" TargetControlID="txtPrecioUnitario" FilterType="Custom, Numbers" ValidChars="." />
                                                     <asp:CustomValidator ID="CVPU" runat="server" ClientValidationFunction="ValidaDecimal6digitsEmpty" ControlToValidate="txtPrecioUnitario" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''P.U.''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico con máximo seis decimales)." ValidateEmptyText="True" ValidationGroup="GrpDetalleGuardar"></asp:CustomValidator>
                                                     <ajax:ValidatorCalloutExtender ID="VCOPU" runat="server" HighlightCssClass="vco" TargetControlID="CVPU" Width="300px"></ajax:ValidatorCalloutExtender>
+                                                    <asp:RequiredFieldValidator ID="RfvPrecioUnitario" runat="server" ControlToValidate="txtPrecioUnitario" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''P.U.(precio unitario)''</b> es necesario, por favor ingréselo." ValidationGroup="GrpDetalleGuardar"></asp:RequiredFieldValidator>
+                                                    <ajax:ValidatorCalloutExtender ID="VcePrecioUnitario" runat="server" HighlightCssClass="vco" TargetControlID="RfvPrecioUnitario" Width="300px"></ajax:ValidatorCalloutExtender>
                                                     <br />
                                                     <asp:Label ID="LblUltimoCosto" Font-Italic="true" runat="server" Visible="false" ToolTip="Último Costo" Font-Size="Smaller"></asp:Label>
                                                 </td>
@@ -826,6 +828,8 @@
                                                     <ajax:FilteredTextBoxExtender ID="SoloNumerosDescuento" runat="server" TargetControlID="TxtDescuentoAdd" FilterType="Custom, Numbers" ValidChars="." />
                                                     <asp:CustomValidator ID="CVDescuento" runat="server" ClientValidationFunction="ValidaDecimal6digitsEmpty" ControlToValidate="TxtDescuentoAdd" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descuento''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico con máximo seis decimales)." ValidateEmptyText="True" ValidationGroup="GrpDetalleGuardar"></asp:CustomValidator>
                                                     <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender1" runat="server" HighlightCssClass="vco" TargetControlID="CVDescuento" Width="300px"></ajax:ValidatorCalloutExtender>
+                                                    <asp:RequiredFieldValidator ID="RfvDescuento" runat="server" ControlToValidate="TxtDescuentoAdd" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descuento''</b> es necesario, por favor ingréselo." ValidationGroup="GrpDetalleGuardar"></asp:RequiredFieldValidator>
+                                                    <ajax:ValidatorCalloutExtender ID="VceDescuento" runat="server" HighlightCssClass="vco" TargetControlID="RfvDescuento" Width="300px"></ajax:ValidatorCalloutExtender>
                                                 </td>
                                                 <td style="text-align: right; padding-right: 7px;">
                                                     <asp:TextBox runat="server" ID="Total" ClientIDMode="Static" CssClass="alineanum" Width="55px" Height="24px" Enabled="false"></asp:TextBox>

Ventas/CatPS.aspx

@@ -207,7 +207,7 @@
                             <asp:BoundField DataField="Codigo" HeaderText="Número de Parte / Código:" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="10%" />
                             <asp:HyperLinkField ItemStyle-CssClass="Izquierda Texto" HeaderText="Producto o Servicio" DataNavigateUrlFormatString="/Ventas/ProductosServicios.aspx?CvePS={0}" DataTextField="PS" DataNavigateUrlFields="CvePS" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="30%" />
                             <asp:BoundField DataField="Precio" HeaderText="Precio" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="10%" />
-                            <asp:BoundField DataField="AplicaParaVentap" HeaderText="Aplica Para Venta" Visible="false" ItemStyle-Width="10%" />
+                            <asp:BoundField DataField="AplicaParaVentap" HeaderText="Aplica Para Venta" Visible="false" ItemStyle-Width="20px" />
                            <%-- <asp:BoundField DataField="Estado" HeaderText="Estado" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Center" />--%>
                             <asp:TemplateField HeaderText="Estado" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center">
                                 <ItemTemplate>

Ventas/Ventas.aspx.vb

@@ -8186,8 +8186,9 @@ Partial Class Ventas
 
         Else
             'SI LA FACTURA VIENE DE SER CANCELADA SISTEMA CUANDO SE REFACTURO NO HAY QUE RELACIONAR
-            If CveEstatusFacturaPadre <> 4 Then
+            If (CveEstatusFacturaPadre > 0 AndAlso CveEstatusFacturaPadre <> 4) OrElse (DtVentasNC IsNot Nothing AndAlso DtVentasNC.Rows.Count > 0) Then
                 If Obj.CveTipoRelacion > 0 Then
+
                     Select Case Obj.CveTipoRelacion
                         Case 1
                             Timbre.CFDIRelacionados.TipoRelacion = "01"

localhost.sln

@@ -1,45 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "http://localhost", "http://localhost", "{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}"
-	ProjectSection(WebsiteProperties) = preProject
-		SccProjectName = ""$/localhost", CAAAAAAA"
-		SccAuxPath = ""
-		SccLocalPath = "."
-		SccProvider = "MSSCCI:Microsoft Visual SourceSafe"
-		UseIISExpress = "false"
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6"
-		Debug.AspNetCompiler.VirtualPath = "/localhost"
-		Debug.AspNetCompiler.PhysicalPath = "..\SIGIT\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/localhost"
-		Release.AspNetCompiler.PhysicalPath = "..\SIGIT\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		SlnRelativePath = "..\SIGIT\"
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B4590109-7BF9-411C-A1AE-792C02707CE6}
-	EndGlobalSection
-EndGlobal