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

Ashx/SIGWeb.ashx

@@ -737,7 +737,7 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState
             Dim UsaGlobal As Boolean = True
 
             'verifica existencias
-            If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141, 152, 153, 159, 160, 161, 162, 163) Then
+            If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141, 152, 153, 159, 160, 161, 162, 163, 166) Then
                 UsaGlobal = False
 
                 Dim objInv As New ClsInventarios

Bancos/RepEgresosSinComprobante.aspx

@@ -150,7 +150,7 @@
 
     <br />
 
-    <ajax:TabContainer ID="tabGeneral" runat="server" ActiveTabIndex="0" Width="100%" CssClass="tabBodyOverride">
+    <ajax:TabContainer ID="tabGeneral" runat="server" ActiveTabIndex="0" Width="100%" >
 
         <ajax:TabPanel ID="tabProveedores" runat="server" HeaderText="Proveedores">
             <ContentTemplate>

Compras/Compras.aspx.vb

@@ -18036,14 +18036,16 @@ Partial Class Compras_Compras
 
                     ViewState("RetIVA") = If(PS("RetIVA").ToString = "-1", ViewState("RetIVA"), PS("RetIVA").ToString).ToString
                     ViewState("RetISR") = If(PS("RetISR").ToString = "-1", ViewState("RetISR"), PS("RetISR").ToString).ToString
-                    ViewState("IEPSPS") = If(PS("IEPSPorcentaje").ToString = "-1", ViewState("IEPSPS"), PS("IEPSPorcentaje").ToString).ToString
+                    If TxtIEPSModal.Text = "" Then
+                        TxtIEPSModal.Text = FormatoNumero(PS("IEPSPorcentaje").ToString.ToDecimal * 100, 0)
+                    End If
                     ViewState("IEPSPSIVA") = If(PS("IEPSGrabaIVA").ToString = "True", PS("IEPSPorcentaje").ToString.ToDouble, 0)
 
 
                     'TxtIVAModal.Text = FormatoNumero(ViewState("IVAPS").ToString().ToDouble * 100, 0)
                     TxtRetIVAModal.Text = FormatoNumero(ViewState("RetIVA").ToString().ToDouble * 100, 0)
                     TxtRetISRModal.Text = FormatoNumero(ViewState("RetISR").ToString().ToDouble * 100, 0)
-                    TxtIEPSModal.Text = FormatoNumero(ViewState("IEPSPS").ToString().ToDouble * 100, 0)
+
 
                     UpIVA.Update()