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

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

Browse Source
This commit is contained in:
rrene
2020-03-30 14:12:51 -07:00
parent 6b95f18abc 102feb4887
commit 77449c94b4
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Compras/Compras.aspx
View File

@@ -4937,8 +4937,8 @@
<label class="col-md-2" style="margin-top: 5px;">Factura de:</label> <label class="col-md-2" style="margin-top: 5px;">Factura de:</label>
<div class="col-md-6" align="center"> <div class="col-md-6" align="center">
<asp:RadioButtonList ID="RblFleteImportacionOpcion" CssClass="iradio_square-blue" runat="server" RepeatDirection="Horizontal" Width="100%"> <asp:RadioButtonList ID="RblFleteImportacionOpcion" CssClass="iradio_square-blue" runat="server" RepeatDirection="Horizontal" Width="100%">
<asp:ListItem Value="1" Selected="True">Productos</asp:ListItem> <%-- <asp:ListItem Value="1" Selected="True">Productos</asp:ListItem>
<asp:ListItem Value="2">Gastos</asp:ListItem> <asp:ListItem Value="2">Gastos</asp:ListItem>--%>
</asp:RadioButtonList> </asp:RadioButtonList>
</div> </div>
</div> </div>

10
Compras/Compras.aspx.vb
View File

@@ -8040,7 +8040,7 @@ Partial Class Compras_Compras
If UsuarioActual.Empresa.UsaAC Then If UsuarioActual.Empresa.UsaAC Then
MsgAccionAceptar = String.Format("window.opener.location.href = window.opener.location.href; window.open(""/Contabilidad/RegPoliza.aspx?IdPoliza={0}""); window.close();", IdPoliza) MsgAccionAceptar = String.Format("window.opener.location.href = window.opener.location.href; window.open(""/Contabilidad/RegPoliza.aspx?IdPoliza={0}""); window.close();", IdPoliza)
Else Else
MsgAccionAceptar = "If (window.opener){window.opener.location.href = window.opener.location.href; window.close();}" MsgAccionAceptar = "if (window.opener){window.opener.location.href = window.opener.location.href; window.close();}"
End If End If
Else Else
MsgAccionAceptar = "location.href =""Compras.aspx""" MsgAccionAceptar = "location.href =""Compras.aspx"""
@@ -19089,6 +19089,7 @@ Partial Class Compras_Compras
Private Sub CargaCombosFletesImportaciones() Private Sub CargaCombosFletesImportaciones()
DdlFletes.Items.Clear() DdlFletes.Items.Clear()
DdlImportaciones.Items.Clear() DdlImportaciones.Items.Clear()
RblFleteImportacionOpcion.Items.Clear()
Dim ObjCompras As New ClsCompras Dim ObjCompras As New ClsCompras
If ObjCompras.GetImportaciones(-1, -1, -1, "-1", "-1", UsuarioActual.CveEmpresa) Then If ObjCompras.GetImportaciones(-1, -1, -1, "-1", "-1", UsuarioActual.CveEmpresa) Then
@@ -19107,6 +19108,13 @@ Partial Class Compras_Compras
DdlImportaciones.DataBind() DdlImportaciones.DataBind()
DdlFletes.DataBind() DdlFletes.DataBind()
If DdlTipoComprobante.SelectedValue = "NC" Then
RblFleteImportacionOpcion.Items.Insert(0, New ListItem("Gastos", "2"))
Else
RblFleteImportacionOpcion.Items.Insert(0, New ListItem("Productos", "1"))
RblFleteImportacionOpcion.Items.Insert(1, New ListItem("Gastos", "2"))
End If
End Sub End Sub
Private Sub LnkFletesImportaciones_Click(sender As Object, e As EventArgs) Handles LnkFletesImportaciones.Click Private Sub LnkFletesImportaciones_Click(sender As Object, e As EventArgs) Handles LnkFletesImportaciones.Click

1
Inventarios/Fletes.aspx
View File

@@ -140,6 +140,7 @@
<Columns> <Columns>
<asp:BoundField HeaderText="Proveedor" DataField="RazonSocial" ItemStyle-Width="30%" /> <asp:BoundField HeaderText="Proveedor" DataField="RazonSocial" ItemStyle-Width="30%" />
<asp:HyperLinkField HeaderText="Serie-Folio" DataNavigateUrlFields="CveCompra" DataNavigateUrlFormatString="/Compras/Compras.aspx?CveCompra={0}" DataTextField="SerieFolio" ItemStyle-Width="10%" Target="_blank" /> <asp:HyperLinkField HeaderText="Serie-Folio" DataNavigateUrlFields="CveCompra" DataNavigateUrlFormatString="/Compras/Compras.aspx?CveCompra={0}" DataTextField="SerieFolio" ItemStyle-Width="10%" Target="_blank" />
<asp:BoundField HeaderText="Tipo" DataField="TipoDocto" DataFormatString="{0:d}" ItemStyle-Width="10%" />
<asp:BoundField HeaderText="Fecha" DataField="Fecha" DataFormatString="{0:d}" ItemStyle-Width="10%" /> <asp:BoundField HeaderText="Fecha" DataField="Fecha" DataFormatString="{0:d}" ItemStyle-Width="10%" />
<asp:BoundField HeaderText="Descripción" DataField="Descripcion" ItemStyle-Width="20%" /> <asp:BoundField HeaderText="Descripción" DataField="Descripcion" ItemStyle-Width="20%" />
<asp:BoundField HeaderText="Importe" DataField="SubTotal" DataFormatString="{0:n2}" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Right" /> <asp:BoundField HeaderText="Importe" DataField="SubTotal" DataFormatString="{0:n2}" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Right" />