Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -5,6 +5,11 @@
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
|
||||
<style>
|
||||
.v-center {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.btn-xs {
|
||||
padding: 0px 5px;
|
||||
}
|
||||
@@ -2568,35 +2573,28 @@
|
||||
</div>
|
||||
<div class="portlet-body">
|
||||
<div class="rowpadding">
|
||||
|
||||
<asp:UpdatePanel ID="UpComercioExterior" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<label class="col-md-2 form-group form-md-line-input">Tipo Operación:</label>
|
||||
<div class="col-md-4 form-group form-md-line-input">
|
||||
<label class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">Tipo Operación:</label>
|
||||
<div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
|
||||
<asp:Label ID="LblTipoOperacion" runat="server"></asp:Label>
|
||||
</div>
|
||||
<label class="col-md-2 form-group form-md-line-input">Clave Pedimento:</label>
|
||||
<div class="col-md-4 form-group form-md-line-input">
|
||||
<label class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">Clave Pedimento:</label>
|
||||
<div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
|
||||
<asp:Label ID="LblClavePedimento" runat="server"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2 form-group form-md-line-input col-md-offset-3">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter">
|
||||
<label>Incoterm:</label>
|
||||
</div>
|
||||
<div class="col-md-4 form-group form-md-line-input col-md-offset-3">
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:DropDownList ID="DdlIncoterm" CssClass="form-control select2me" AppendDataBoundItems="true" Width="100%" runat="server" DataTextField="ClaveSATIncotermDescripcion" DataValueField="CveIncoterm">
|
||||
</asp:DropDownList>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<%-- <label class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">Motivo Traslado:</label>
|
||||
<div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
|
||||
<asp:DropDownList ID="DdlSATMotivoTraslado" Width="100%" runat="server" CssClass="select2me" DataTextField="ClaveSATMotivoTrasladoDescripcion" DataValueField="CveMotivoTraslado"></asp:DropDownList>
|
||||
</div>--%>
|
||||
<label class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">Num Reg IdTrib:</label>
|
||||
<div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
|
||||
<label class="col-md-2 form-group form-md-line-input v-venter">Num Reg IdTrib:</label>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:TextBox ID="TxtNumRegIdTrib" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
|
||||
</div>
|
||||
</div>
|
||||
@@ -2605,63 +2603,60 @@
|
||||
<asp:UpdatePanel ID="UPPDestina" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-md-2 form-group form-md-line-input"><span>Nombre:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter"><span>Nombre:</span></div>
|
||||
<div class="col-md-10 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:TextBox ID="TxtDestinatarioNombre" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;"><span>Calle:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter"><span>Calle:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:TextBox ID="TxtComExtCalle" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
|
||||
</div>
|
||||
<div class="col-md-1 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;"><span>Núm.</span></div>
|
||||
<div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
|
||||
<asp:TextBox ID="TxtComExtNumero" CssClass="form-control input-sm" runat="server" Width="55px"></asp:TextBox>
|
||||
<div class="col-md-1 form-group form-md-line-input v-venter"><span>Núm.</span></div>
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:TextBox ID="TxtComExtNumero" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
|
||||
</div>
|
||||
<div class="col-md-1 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;"><span>CP.</span></div>
|
||||
<div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
|
||||
<asp:TextBox ID="TxtComExtCP" CssClass="form-control input-sm" runat="server" Width="65px"></asp:TextBox>
|
||||
<div class="col-md-1 form-group form-md-line-input v-venter"><span>CP.</span></div>
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:TextBox ID="TxtComExtCP" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2 form-group form-md-line-input"><span>Pais:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter"><span>Pais:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:DropDownList ID="DdlComExtPais" AutoPostBack="true" OnSelectedIndexChanged="DdlPais_SelectedIndexChanged" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATPaisDescripcion" DataValueField="CvePais"></asp:DropDownList>
|
||||
<asp:TextBox ID="TxtComExtPais" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
|
||||
</div>
|
||||
<div class="col-md-2 form-group form-md-line-input"><span>Estado:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter"><span>Estado:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:DropDownList ID="DdlComExtEstado" AutoPostBack="true" OnSelectedIndexChanged="DdlEstado_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATEstadoNombreEstado" DataValueField="CveEstado"></asp:DropDownList>
|
||||
<asp:TextBox ID="TxtComExtEstado" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2 form-group form-md-line-input"><span>Municipio:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter"><span>Municipio:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:DropDownList ID="DdlComExtMunicipio" AutoPostBack="true" OnSelectedIndexChanged="DdlMunicipio_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATMunicipioDescripcion" DataValueField="CveMunicipio"></asp:DropDownList>
|
||||
<asp:TextBox ID="TxtComExtMunicipio" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
|
||||
</div>
|
||||
<div class="col-md-2 form-group form-md-line-input"><span>Colonia:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter"><span>Colonia:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" style="margin-top: 0px; padding-top: 0px;">
|
||||
<asp:DropDownList ID="DdlComExtColonia" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" Visible="false" runat="server" DataTextField="ClaveSATColoniaNombreAsentamiento" DataValueField="CveColonia"></asp:DropDownList>
|
||||
<asp:TextBox ID="TxtComExtColonia" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row rowpadding">
|
||||
<div class="col-md-2 form-group form-md-line-input"><span>Aplica Destinatario:</span></div>
|
||||
<div class="col-md-2 form-group form-md-line-input">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter"><span>Aplica Destinatario:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter">
|
||||
<asp:CheckBox ID="ChkAplicaDestinatario" runat="server" CssClass="chksino" Text=" " OnCheckedChanged="ChkAplicaDestinatario_CheckedChanged" AutoPostBack="true" Checked="false" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row rowpadding">
|
||||
<div class="col-md-2 form-group form-md-line-input" id="DivLblDestino" runat="server" visible="false"><span>Destino:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input" id="DivDdlDestino" runat="server" visible="false">
|
||||
<div class="col-md-2 form-group form-md-line-input v-venter" id="DivLblDestino" runat="server" visible="false"><span>Destino:</span></div>
|
||||
<div class="col-md-4 form-group form-md-line-input v-venter" id="DivDdlDestino" runat="server" visible="false">
|
||||
<asp:DropDownList ID="DdlDirecionDestinatario" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="DireccionEnvioContacto" DataValueField="CveDireccionEnvio"></asp:DropDownList>
|
||||
</div>
|
||||
</div>
|
||||
@@ -2674,20 +2669,20 @@
|
||||
<Columns>
|
||||
<asp:TemplateField HeaderText="Cantidad">
|
||||
<ItemTemplate>
|
||||
<asp:TextBox ID="TxtCantidad" runat="server" Text='<%# Eval("Cantidad", "{0:#,##0.##}") %>' Width="50px"></asp:TextBox>
|
||||
<asp:TextBox ID="TxtCantidad" runat="server" Text='<%# Eval("CantidadConversion", "{0:#,##0.##}") %>' Width="50px"></asp:TextBox>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="CodigoPS" HeaderText="Producto ó Servicio" />
|
||||
<asp:TemplateField HeaderText="Valor Unitario">
|
||||
<ItemTemplate>
|
||||
<asp:TextBox ID="TxtValorUnitario" runat="server" Text='<%# Eval("PU") %>' Width="60px"></asp:TextBox>
|
||||
<asp:TextBox ID="TxtValorUnitario" runat="server" Width="60px"></asp:TextBox>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="ClaveSATFraccionArancelariaDescripcion" HeaderText="Fracción Arancelaria" />
|
||||
<asp:BoundField DataField="ClaveSATUnidadAduanaDescripcion" HeaderText="Unidad Aduana" />
|
||||
<asp:TemplateField HeaderText="Total USD">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="LblTotalUSD" Text='<%# (CDbl(Eval("Cantidad").ToString) * CDbl(Eval("PU").ToString)).ToString("N2") %>' runat="server"></asp:Label>
|
||||
<asp:Label ID="LblTotalUSD" runat="server"></asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Marca">
|
||||
|
||||
@@ -2720,15 +2720,15 @@ Partial Class Ventas
|
||||
|
||||
|
||||
If Request("CveManifiesto") IsNot Nothing AndAlso IsNumeric(Request("CveManifiesto")) AndAlso Request("CveManifiesto").ToEntero() > 0 Then
|
||||
Using ObjVentas As New ClsCGame()
|
||||
Using ObjCGame As New ClsCGame()
|
||||
|
||||
If ObjVentas.ManifiestoGet(Request("CveManifiesto").ToEntero(), -1, -1, -1, -1, -1, -1, -1, -1, UsuarioActual.CveEmpresa, "-1", "-1") Then
|
||||
DdlSubProyectoDatos.SelectedValueExist(ObjVentas.DtResultados.Rows(0)("CveSubProyecto").ToString())
|
||||
If ObjCGame.ManifiestoGet(Request("CveManifiesto").ToEntero(), -1, -1, -1, -1, -1, -1, -1, -1, UsuarioActual.CveEmpresa, "-1", "-1") Then
|
||||
DdlSubProyectoDatos.SelectedValueExist(ObjCGame.DtResultados.Rows(0)("CveSubProyecto").ToString())
|
||||
End If
|
||||
|
||||
If ObjVentas.ManifiestoForVtaGet(UsuarioActual.CveEmpresa, UsuarioActual.CveUsuario, Request("CveManifiesto").ToEntero()) Then
|
||||
GvPS.DataSource = ObjVentas.DtResultados
|
||||
TmpDT = ObjVentas.DtResultados
|
||||
If ObjCGame.ManifiestoForVtaGet(UsuarioActual.CveEmpresa, UsuarioActual.CveUsuario, Request("CveManifiesto").ToEntero()) Then
|
||||
GvPS.DataSource = ObjCGame.DtResultados
|
||||
TmpDT = ObjCGame.DtResultados
|
||||
GvPS.DataBind()
|
||||
End If
|
||||
|
||||
@@ -10127,6 +10127,40 @@ Partial Class Ventas
|
||||
End If
|
||||
End If
|
||||
|
||||
Try
|
||||
ViewState("CveVenta") = ObjFactura.CveVenta
|
||||
|
||||
If Request("CveEmbarqueManifiesto") IsNot Nothing AndAlso IsNumeric(Request("CveEmbarqueManifiesto")) AndAlso Request("CveEmbarqueManifiesto").ToEntero() > 0 Then
|
||||
|
||||
If ObjVentas.Embarque_ManifiestoUpvta(ObjFactura.CveVenta, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, Request("CveEmbarqueManifiesto").ToEntero()) Then
|
||||
|
||||
End If
|
||||
End If
|
||||
If Request("CveManifiesto") IsNot Nothing AndAlso IsNumeric(Request("CveManifiesto")) AndAlso Request("CveManifiesto").ToEntero() > 0 Then
|
||||
|
||||
If ObjVentas.CGame_ManifiestoUpvta(ObjFactura.CveVenta, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, Request("CveManifiesto").ToEntero()) Then
|
||||
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
OnError("Ocurrió un error al actualizar el embarque", ex)
|
||||
ErrorList.Add("Ocurrió un error al actualizar el embarque")
|
||||
End Try
|
||||
|
||||
Try
|
||||
ViewState("CveVenta") = ObjFactura.CveVenta
|
||||
|
||||
If Request("CveOrdenProduccion") IsNot Nothing AndAlso IsNumeric(Request("CveOrdenProduccion")) AndAlso Request("CveOrdenProduccion").ToEntero() > 0 Then
|
||||
|
||||
If ObjVentas.AgroOrdenProduccionUpvta(ObjFactura.CveVenta, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, Request("CveOrdenProduccion").ToEntero()) Then
|
||||
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
OnError("Ocurrió un error al actualizar la orden de producción", ex)
|
||||
ErrorList.Add("Ocurrió un error al actualizar la orden de producción")
|
||||
End Try
|
||||
|
||||
'ContPAQ El movimiento 1 es el de Venta
|
||||
Dim AutoConta As Boolean = UsuarioActual.Empresa.Funcionalidad(200) = "1"
|
||||
AutoConta = AutocontaMatriz(AutoConta)
|
||||
@@ -10184,36 +10218,7 @@ Partial Class Ventas
|
||||
' OnError("Ocurrió un error al mandar las notificaciones de autorización", ex)
|
||||
'End Try
|
||||
|
||||
Try
|
||||
ViewState("CveVenta") = ObjFactura.CveVenta
|
||||
|
||||
If Request("CveEmbarqueManifiesto") IsNot Nothing AndAlso IsNumeric(Request("CveEmbarqueManifiesto")) AndAlso Request("CveEmbarqueManifiesto").ToEntero() > 0 Then
|
||||
|
||||
If ObjVentas.Embarque_ManifiestoUpvta(ObjFactura.CveVenta, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, Request("CveEmbarqueManifiesto").ToEntero()) Then
|
||||
|
||||
End If
|
||||
End If
|
||||
If Request("CveManifiesto") IsNot Nothing AndAlso IsNumeric(Request("CveManifiesto")) AndAlso Request("CveManifiesto").ToEntero() > 0 Then
|
||||
|
||||
If ObjVentas.CGame_ManifiestoUpvta(ObjFactura.CveVenta, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, Request("CveManifiesto").ToEntero()) Then
|
||||
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
OnError("Ocurrió un error al actualizar el embarque", ex)
|
||||
End Try
|
||||
Try
|
||||
ViewState("CveVenta") = ObjFactura.CveVenta
|
||||
|
||||
If Request("CveOrdenProduccion") IsNot Nothing AndAlso IsNumeric(Request("CveOrdenProduccion")) AndAlso Request("CveOrdenProduccion").ToEntero() > 0 Then
|
||||
|
||||
If ObjVentas.AgroOrdenProduccionUpvta(ObjFactura.CveVenta, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, Request("CveOrdenProduccion").ToEntero()) Then
|
||||
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
OnError("Ocurrió un error al actualizar la orden de producción", ex)
|
||||
End Try
|
||||
|
||||
Try
|
||||
Dim DirectoriArchivoXML As String = String.Format("{0}{1}", UsuarioActual.Empresa.Ruta, ObjFactura.TipoDocto) ' System.IO.Path.Combine()
|
||||
@@ -13420,7 +13425,7 @@ Partial Class Ventas
|
||||
CveContratoDetalle:=Row("CveContratoDetalle").ToString().ToEntero(), CvePromocionDetalle:=Row("CvePromocionDetalle").ToString().ToEntero(), IEPS:=Row("ImporteIEPS").ToString().ToDecimal, CveMovimientoDetallePedido:=Row("CveMovimientoDetallePedido").ToString().ToEntero(), ImporteRetIVA:=Row("ImporteRetIVA").ToString().ToDecimal, ImporteRetISR:=Row("ImporteRetISR").ToString().ToDecimal,
|
||||
PorcentajeIVA:=Row("PorcentajeIVA").ToString().ToDecimal, PorcentajeIEPS:=Row("PorcentajeIEPS").ToString().ToDecimal, PorcentajeRetIVA:=Row("PorcentajeRetIVA").ToString().ToDecimal,
|
||||
PorcentajeRetISR:=Row("PorcentajeRetISR").ToString().ToDecimal, CuentaPredial:=Row("CuentaPredial").ToString(), CvePrecioLista:=Row("CvePrecioLista").ToString().ToEntero(),
|
||||
CveActivoFijo:=Row("CveActivoFijo").ToString().ToEntero(), NumTurnos:=Row("NumTurnos").ToString().ToDecimal(), EstatusAlmacen:=EsatusAlmacen) Then
|
||||
CveActivoFijo:=Row("CveActivoFijo").ToString().ToEntero(), NumTurnos:=Row("NumTurnos").ToString().ToDecimal(), EstatusAlmacen:=EsatusAlmacen, CantidadConversion:=Row("CantidadConversion").ToString().ToDecimal()) Then
|
||||
ErrorList.Add("Ocurrió un error al agregar un Producto o Servicio a la Factura.<br />Revise su factura y cualquier detalle comuníquese a Soporte Técnico")
|
||||
Exit For
|
||||
Else
|
||||
@@ -18199,7 +18204,7 @@ Partial Class Ventas
|
||||
Optional CveOrdenCompraDetalle As Integer = 0, Optional CveVentaDetalleRemision As Integer = 0, Optional CveVentaDetalleCotizacion As Integer = 0, Optional CuentaPredial As String = "",
|
||||
Optional RegeneraIEPS As Boolean = True, Optional CveVentaDetallePedido2 As Integer = 0, Optional SeActualiza As Boolean = False, Optional CvePromocionDetalle As Integer = -1, Optional EsCargo As Boolean = False,
|
||||
Optional ImporteProntoPago As Decimal = 0, Optional ByRef ObjDescuento As Modelos.VentaDescuentos = Nothing, Optional CvePrecioLista As Integer = -1, Optional PrecioLista As String = "",
|
||||
Optional CveActivoFijo As Integer = -1, Optional AFDepreciacion As Decimal = 0D, Optional AFValorInicial As Decimal = 0D, Optional NumTurnos As Decimal = 0D) As Boolean
|
||||
Optional CveActivoFijo As Integer = -1, Optional AFDepreciacion As Decimal = 0D, Optional AFValorInicial As Decimal = 0D, Optional NumTurnos As Decimal = 0D, Optional CantidadConversion As Decimal = 0) As Boolean
|
||||
|
||||
Dim Retorno As Boolean = False
|
||||
Try
|
||||
@@ -18458,6 +18463,16 @@ Partial Class Ventas
|
||||
Row("CodigoAlterno") = DrPS("CodigoAlterno")
|
||||
Row("PSAlterno") = DrPS("PSAlterno")
|
||||
|
||||
'SI NO SE UTILIZA LA CONVERSION, UTILIZA LA CANTIDAD
|
||||
If CantidadConversion = 0 Then
|
||||
If DrPS("PesoKg").ToString().ToDecimal() > 0 Then
|
||||
CantidadConversion = DrPS("PesoKg").ToString().ToDecimal()
|
||||
Else
|
||||
CantidadConversion = Cantidad
|
||||
End If
|
||||
End If
|
||||
Row("CantidadConversion") = CantidadConversion
|
||||
|
||||
If UsuarioActual.CveEmpresa.Contiene(119, 13, 83) Then
|
||||
If Not RemisionesLista.Count > 0 Then 'SI VIENE DE REMISION NO SE CONSIDERA
|
||||
|
||||
@@ -18704,7 +18719,9 @@ Partial Class Ventas
|
||||
|
||||
TmpDT.Columns.Add("CodigoAlterno", GetType(String))
|
||||
TmpDT.Columns.Add("PSAlterno", GetType(String))
|
||||
|
||||
'USO PARA COMERCIO EXTERIOR
|
||||
TmpDT.Columns.Add("CantidadConversion", GetType(Decimal))
|
||||
TmpDT.Columns("CantidadConversion").DefaultValue = 0
|
||||
End Sub
|
||||
Private Sub CreaDTmpC()
|
||||
DTmpC = New DataTable
|
||||
@@ -29671,6 +29688,24 @@ Partial Class Ventas
|
||||
|
||||
Protected Sub GvComercioExterior_RowDataBound(sender As Object, e As GridViewRowEventArgs)
|
||||
If e.Row.RowType = DataControlRowType.DataRow Then
|
||||
Dim CantidadConversion = CDbl(e.Row.DBCampo("CantidadConversion"))
|
||||
Dim CantidadBase = CDbl(e.Row.DBCampo("Cantidad"))
|
||||
Dim PUBase = CDbl(e.Row.DBCampo("PU"))
|
||||
|
||||
Dim TotalUSD = (CantidadBase * PUBase)
|
||||
|
||||
e.Row.FCLabel("LblTotalUSD").Text = TotalUSD.ToString("N2")
|
||||
|
||||
If CantidadConversion <> CantidadBase Then
|
||||
If CantidadConversion > 0 Then
|
||||
e.Row.FCTextBox("TxtValorUnitario").Text = (TotalUSD / CantidadConversion).ToString("N6")
|
||||
Else
|
||||
e.Row.FCTextBox("TxtValorUnitario").Text = PUBase.ToString("N2")
|
||||
End If
|
||||
Else
|
||||
e.Row.FCTextBox("TxtValorUnitario").Text = PUBase.ToString("N2")
|
||||
End If
|
||||
|
||||
e.Row.FCTextBox("TxtValorUnitario").Attributes.Add("onkeyup", $"CalculaTotalUSD({e.Row.FCLabel("LblTotalUSD").ClientID}, this,{e.Row.FCTextBox("TxtCantidad").ClientID});")
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user