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

-- cambio de nombre de filial a parte relacionada

Browse Source
This commit is contained in:
rrene
2024-06-18 15:17:15 -07:00
parent 028e5956d8
commit 8acd895b78
5 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ventas/Clientes.aspx
View File

@@ -1207,7 +1207,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input" id="Div5" runat="server">
Es Filial:
Es Parte relacionada:
<asp:CheckBox ID="ChkEsFilial" Checked="false" CssClass="make-switchsd" data-size="small" runat="server" />
</div>
</div>

6
Ventas/RepVentaDetalle.aspx
View File

@@ -308,12 +308,12 @@
<div class="col-md-2">
<asp:CheckBox ID="ChkLecturaAdmin" runat="server" Checked="false" CssClass="input-sm" />
</div>
<label title="Filial" data-toggle="tooltip" class="col-md-1 truncate" runat="server" id="Label4">Filial:</label>
<label title="Es parte relacionada" data-toggle="tooltip" class="col-md-1 truncate" runat="server" id="Label4">Parte Relacionada:</label>
<div class="col-md-2" runat="server" id="DivFilial">
<asp:DropDownList ID="DdlFilial" runat="server" AppendDataBoundItems="true" Class="table-group-action-input form-control input-inline input-small input-sm select2me">
<asp:ListItem Selected="True" Text="Todos" Value="-1"></asp:ListItem>
<asp:ListItem Text="Filial" Value="1"></asp:ListItem>
<asp:ListItem Text="Sin Filial" Value="0"></asp:ListItem>
<asp:ListItem Text="Solo parte relacionadas" Value="1"></asp:ListItem>
<asp:ListItem Text="Sin parte relacionadas" Value="0"></asp:ListItem>
</asp:DropDownList>
</div>
<label class="col-md-1 truncate">Relación:</label>

15
Ventas/RepVentas.aspx
View File

@@ -318,12 +318,12 @@
<div class="col-md-2">
<asp:CheckBox ID="ChkLecturaAdmin" runat="server" Checked="false" CssClass="input-sm" />
</div>
<label title="Filial" data-toggle="tooltip" class="col-md-1 truncate" runat="server" id="Label4">Filial:</label>
<label title="Es parte relacionada" data-toggle="tooltip" class="col-md-1 truncate" runat="server" id="Label4">Parte Relacionada:</label>
<div class="col-md-2" runat="server" id="DivFilial">
<asp:DropDownList ID="DdlFilial" runat="server" AppendDataBoundItems="true" Class="table-group-action-input form-control input-inline input-small input-sm select2me">
<asp:ListItem Selected="True" Text="Todos" Value="-1"></asp:ListItem>
<asp:ListItem Text="Filial" Value="1"></asp:ListItem>
<asp:ListItem Text="Sin Filial" Value="0"></asp:ListItem>
<asp:ListItem Text="Solo parte relacionadas" Value="1"></asp:ListItem>
<asp:ListItem Text="Sin parte relacionadas" Value="0"></asp:ListItem>
</asp:DropDownList>
</div>
<label title="Distr" data-toggle="tooltip" class="col-md-1 truncate" Visible="false" runat="server" id="DivLblDistr">Distribuidor:</label>
@@ -413,6 +413,8 @@
<asp:BoundField HeaderText="Tot. Mínimo" DataField="MIN_Total" ItemStyle-Width="5%" DataFormatString="{0:###,###,###,###.##}" ItemStyle-HorizontalAlign="Right" />
<%--18--%>
<asp:BoundField HeaderText="Tot. Refacturado" DataField="TotalRefacturado" ItemStyle-Width="5%" DataFormatString="{0:###,###,###,###.##}" ItemStyle-HorizontalAlign="Right" />
<asp:BoundField HeaderText="Sub. Crédito" DataField="SubTotalCredito" ItemStyle-Width="5%" DataFormatString="{0:###,###,###,###.##}" ItemStyle-HorizontalAlign="Right" />
<asp:BoundField HeaderText="Sub. Contado" DataField="SubTotalContado" ItemStyle-Width="5%" DataFormatString="{0:###,###,###,###.##}" ItemStyle-HorizontalAlign="Right" />
</Columns>
<RowStyle CssClass="Texto" />
<HeaderStyle CssClass="Titulos" />
@@ -497,12 +499,11 @@
<tr>
<td style="text-align: left;">
<td style="text-align: left;">
<asp:CheckBox ID="ChkImpLoc" runat="server" Text="&nbsp;Impuestos Locales" />
</td>
<td style="text-align: left;">
<asp:CheckBox ID="ChkCredito" runat="server" Text="&nbsp;Crédito" />
</td>
</tr>
@@ -512,7 +513,7 @@
<asp:CheckBox ID="ChkTotal" runat="server" Text="&nbsp;*Total" />
</td>
<td style="text-align: left;">
<asp:CheckBox ID="ChkContado" runat="server" Text="&nbsp;Contado" />
</td>
</tr>

16
Ventas/RepVentas.aspx.vb
View File

@@ -605,12 +605,16 @@ Partial Class Ventas_RepVentas
If CheckRefacturado.Checked Then
ListPersonalizada.Add("CheckRefacturado")
End If
If ChkContado.Checked Then
ListPersonalizada.Add("ChkContado")
End If
If ChkCredito.Checked Then
ListPersonalizada.Add("ChkCredito")
End If
If ChkCantidad.Checked Then
ListPersonalizada.Add("Cantidad")
End If
If objUsuario.AddUsuariosPersonalizaciones(UsuarioActual, "RepVentas.aspx", String.Join("|", ListPersonalizada)) Then
'Alert("Personalizacion guardada")
End If
@@ -703,6 +707,12 @@ Partial Class Ventas_RepVentas
Case "CheckRefacturado"
CheckRefacturado.Checked = True
Exit Select
Case "ChkContado"
ChkContado.Checked = True
Exit Select
Case "ChkCredito"
ChkCredito.Checked = True
Exit Select
Case Else
Exit Select
End Select
@@ -758,6 +768,8 @@ Partial Class Ventas_RepVentas
GvDatos.Columns(16).Visible = ChkAvgTot.Checked
GvDatos.Columns(17).Visible = ChkMinTot.Checked
GvDatos.Columns(18).Visible = CheckRefacturado.Checked
GvDatos.Columns(19).Visible = ChkCredito.Checked
GvDatos.Columns(20).Visible = ChkContado.Checked
Personalizo = 1
If Personalizo = 1 Then

12
Ventas/RepVentasUtilidadPadre.aspx
View File

@@ -179,13 +179,13 @@
<div class="col-md-2">
<asp:Dropdownlist runat="server" ID="DdlMarcas" CssStyle="width: 100%;" CssClass="form-control input-small input-sm select2me" Width="100%" DataTextField="Marca" DataValueField="CveMarca" />
</div>
<label title="Filial" data-toggle="tooltip" class="col-md-1 truncate" runat="server" id="Label4">Filial:</label>
<label title="Es parte relacionada" data-toggle="tooltip" class="col-md-1 truncate" runat="server" id="Label4">Parte Relacionada:</label>
<div class="col-md-2" runat="server" id="DivFilial">
<asp:DropDownList ID="DdlFilial" runat="server" AppendDataBoundItems="true" Class="table-group-action-input form-control input-inline input-small input-sm select2me">
<asp:ListItem Selected="True" Text="Todos" Value="-1"></asp:ListItem>
<asp:ListItem Text="Filial" Value="1"></asp:ListItem>
<asp:ListItem Text="Sin Filial" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:DropDownList ID="DdlFilial" runat="server" AppendDataBoundItems="true" Class="table-group-action-input form-control input-inline input-small input-sm select2me">
<asp:ListItem Selected="True" Text="Todos" Value="-1"></asp:ListItem>
<asp:ListItem Text="Solo parte relacionadas" Value="1"></asp:ListItem>
<asp:ListItem Text="Sin parte relacionadas" Value="0"></asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-md-1 truncate" id="divgarantia1" runat="server" visible="false">
Garantía?: