AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2020-09-15 11:10:19 -07:00
parent 7288fb5148 4f8ad1f3da
commit 0e7101e250
23 changed files with 1341 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

235
Ventas/Clientes.aspx
View File

@@ -1007,129 +1007,10 @@
</div>
<div class="portlet-body form-horizontal form-row-sepe">
<div class="form-body">
<div class="form-group">
<label class="control-label col-md-4">Clientes: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableClientes" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroClientes" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Extranjera Clientes: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlMonedaExtranjeraClientes" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="Button2" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Complementaria Clientes: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableCompClientes" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegCompClientes" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Anticipos: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableAnticipos" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroAnticipos" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Anticipos" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Extranjera Anticipos: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlMonedaExtranjeraAnticipos" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="Button4" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Complementaria Anticipos: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableCompAnticipos" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegCompAnticipos" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Anticipos" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Ret. IVA: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableRetIVA" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroIVA" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="RetIVA" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Ret. ISR: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableRetISR" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroISR" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="RetISR" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Fondo de Garantía: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableFondoGarantia" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="Button1" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="RetIVA" Visible="False" />
</div>
</div>
</div>
</div>
</div>
<div class="portlet light xspadding bordered">
<div class="portlet-title">
<div class="caption font-green">
<i class="icon-pin font-green"></i>
<span class="caption-subject bold uppercase">Cuentas y conceptos</span>
</div>
<div class="actions">
<div class="btn-group">
</div>
</div>
</div>
<div class="portlet-body form-horizontal form-row-sepe">
<div class="form-body">
<asp:UpdatePanel runat="server" ID="UpCuentaConceptos" UpdateMode="Conditional">
<div id="divCuentas" runat="server" visible="false">
<asp:UpdatePanel runat="server" ID="UpCuentaConceptos" UpdateMode="Conditional">
<ContentTemplate>
<asp:GridView ID="GvCuentasContable" runat="server" DataKeyNames="ConceptoContable,NombreCuenta" AutoGenerateColumns="False" EmptyDataText="No se encontraron Ventas en el Cliente" ToolTip="Listado de Historial de Ventas" CssClass="table table-striped table-advance table-hover" Style="text-align: center; min-width: 783px; width: 100%;" GridLines="None">
<asp:GridView ID="GvCta" runat="server" DataKeyNames="ConceptoContable,NombreCuenta" AutoGenerateColumns="False" EmptyDataText="" ToolTip="Listado de Historial de Ventas" CssClass="table table-striped table-advance table-hover" Style="text-align: center; width: 100%;" GridLines="None">
<Columns>
<asp:BoundField HeaderText="Concepto Contable" DataField="ConceptoContable" />
<asp:BoundField HeaderText="Nombre Cuenta" DataField="NombreCuenta" />
@@ -1137,9 +1018,119 @@
</asp:GridView>
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div id="divCuentasContp" runat="server" visible="false">
<div class="form-group">
<label class="control-label col-md-4">Clientes: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableClientes" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroClientes" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Extranjera Clientes: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlMonedaExtranjeraClientes" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="Button2" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Complementaria Clientes: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableCompClientes" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegCompClientes" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Anticipos: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableAnticipos" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroAnticipos" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Anticipos" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Extranjera Anticipos: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlMonedaExtranjeraAnticipos" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="Button4" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Clientes" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Complementaria Anticipos: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableCompAnticipos" CssClass="form-control input-medium" runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegCompAnticipos" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="Anticipos" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Ret. IVA: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableRetIVA" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroIVA" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="RetIVA" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Ret. ISR: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableRetISR" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="BtnActivaRegistroISR" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="RetISR" Visible="False" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Fondo de Garantía: </label>
<div class="col-md-8">
<asp:DropDownList ID="DdlCtaContableFondoGarantia" CssClass="form-control input-medium " runat="server" AppendDataBoundItems="true" DataTextField="CtaCodigo" DataValueField="Id">
<asp:ListItem Selected="True" Text="Seleccione" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:Button ID="Button1" runat="server" CssClass="btn btn-primary btn-sm" Text="+" CommandArgument="RetIVA" Visible="False" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

23
Ventas/Clientes.aspx.vb
View File

@@ -791,7 +791,7 @@ Partial Class Clientes
If Request("ATI") IsNot Nothing AndAlso IsNumeric(Request("ATI")) Then
Tab.ActiveTabIndex = Request("ATI").ToEntero
End If
CargaCuentasyConceptos()
'CargaCuentasyConceptos()
Else
'Configuración de Modalidad Insert
@@ -1079,13 +1079,13 @@ Partial Class Clientes
DdlMonedaExtranjeraAnticipos.Attributes.Add("onclick", "CargaCuentas(9);")
End Sub
Private Sub CargaCuentasyConceptos()
Private Sub CargaCuentasConceptos()
Dim ObjConta As New ClsContabilidad
If ObjConta.GetCuentasyConceptos(CveCliente) Then
GvCuentasContable.DataSource = ObjConta.DtResultados
If ObjConta.GetCuentasConceptos(6, UsuarioActual.CveEmpresa, CveCliente:=CveCliente) Then
GvCta.DataSource = ObjConta.DtResultados
End If
ObjConta.Dispose()
GvCuentasContable.DataBind()
GvCta.DataBind()
UpCuentaConceptos.Update()
End Sub
Protected Sub BtnCargarCuentas_Click(sender As Object, e As EventArgs) Handles BtnCargarCuentas.Click
@@ -1681,8 +1681,17 @@ Partial Class Clientes
End If
CargaEventoBitacora()
'Ocultamos la mayoria de informacion si es no-frecuente
If UsuarioActual.Empresa.Funcionalidad(300) = "1" Then
CargaCuentasConceptos()
divCuentas.Visible = True
divCuentasContp.Visible = False
Else
divCuentas.Visible = False
divCuentasContp.Visible = True
End If
'Ocultamos la mayoria de informacion si es no-frecuente
If ObjClientes.TipoCliente = 2 Then
TabFiscalContable.Visible = False
TabCxC.Visible = False

7
Ventas/Ventas.aspx.vb
View File

@@ -14534,7 +14534,10 @@ Partial Class Ventas
End Sub
Private Sub RecargaSucursalPartidas()
Dim CveSubProyecto As Integer = DdlSubProyectoDatos.SelectedValue.ToEntero()
Dim SubProyecto As String = DdlSubProyectoDatos.SelectedItem.Text
Dim SubProyecto As String = ""
If CveSubProyecto > 0 Then
SubProyecto = DdlSubProyectoDatos.SelectedItem.Text
End If
If TmpDT IsNot Nothing AndAlso TmpDT.Rows.Count > 0 Then
For Each Row As DataRow In TmpDT.Rows
@@ -15233,8 +15236,6 @@ Partial Class Ventas
Row("CvePS") = CvePS
Row("Obs") = Obs
Dim DrPS As DataRow = Nothing
DrPS = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePS).FiltroPrimero("") ' Estado = -1