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
2025-03-12 19:29:41 -07:00
parent 24315b028b b2a4b63432
commit 287682e1fe
13 changed files with 490 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Compras/Compras.aspx.vb
View File

@@ -22668,7 +22668,20 @@ Partial Class Compras_Compras
nRow("SubTotal") = subtotalParcial.RoundSQL(4)
nRow("Total") = totalParcialDeseado.RoundSQL(4)
nRow("PorcentajeIVA") = (ivaParcial / subtotalParcial).RoundSQL(2)
Dim tmpPorcentajeIVA As Decimal = 0
If ivaParcial > 0 Then
tmpPorcentajeIVA = (ivaParcial / subtotalParcial).RoundSQL(2)
If tmpPorcentajeIVA = 0.17 Or tmpPorcentajeIVA = 0.15 Then
tmpPorcentajeIVA = 0.16D
End If
If tmpPorcentajeIVA = 0.07 Or tmpPorcentajeIVA = 0.09 Then
tmpPorcentajeIVA = 0.16D
End If
End If
nRow("PorcentajeIVA") = tmpPorcentajeIVA
nRow("Porcentaje") = ((totalParcialDeseado.RoundSQL(4) * 100) / TotalOriginal).RoundSQL(2)
nRow("RetIVAPorcentaje") = (retIvaParcial / subtotalParcial).RoundSQL(4)

25
Compras/eFacturas.aspx
View File

@@ -311,7 +311,7 @@
<div class="col-md-4">
<div class="form-group form-md-line-input input-iconright" >
<asp:TextBox ID="TxtNumeroReembolso" runat="server" Width="100%" CssClass=" form-control input-sm " />
<asp:TextBox ID="TxtNumeroReembolso" runat="server" Width="100%" CssClass=" form-control " />
<label runat="server" id="LblNumeroReembolso" for="<%= TxtNumeroReembolso.ClientID.ToString()%>">Número de Reembolso:</label>
<asp:RequiredFieldValidator ID="RfvTxtNumeroReembolso" runat="server" ControlToValidate="TxtNumeroReembolso" InitialValue="" Display="Dynamic"
ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Num. Reembolso''</b> es necesario, por favor ingreselo." ValidationGroup="GrpRegistraCompra">
@@ -319,9 +319,18 @@
</div>
</div>
<div class="col-md-4">
</div>
<div class="col-md-4">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox runat="server" ID="TxtObservaciones" CssClass="form-control" MaxLength="50" Width="100%" ></asp:TextBox>
<label runat="server" id="Label3" for="<%= TxtObservaciones.ClientID.ToString()%>">Observaciones:</label>
<%--<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="TxtObservaciones" InitialValue="" Display="Dynamic"
ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripción''</b> es necesario, por favor ingreselo." ValidationGroup="GrpRegistraCompra">
</asp:RequiredFieldValidator>--%>
</div>
</div>
</div>
@@ -448,15 +457,7 @@
</div>
</div>
</div>
<div class="col-md-4" style="text-align: center;">
<asp:Button ID="BtnGuardarFacturas" runat="server" Text="Guardar" class="btn btn-primary" OnClick="BtnGuardarFacturas_Click" ValidationGroup="GrpRegistraCompra"
Style="margin: 0; position: absolute; top: 50%; transform: translateY(30%);" />

5
Compras/eFacturas.aspx.vb
View File

@@ -5801,7 +5801,7 @@ Partial Class Compras_eFacturas
If CompraActual.ConfiguraRegistroCompra(DdlPS.SelectedValue.ToEntero, DdlSubProyecto.SelectedValue.ToEntero, CveCajachica, CvePersonal,
DdlRetIVAConcepto.SelectedValue.ToEntero, DdlRetISRConcepto.SelectedValue.ToEntero, NumeroReembolso:=TxtNumeroReembolso.Text,
DTProrrateo:=DTProrrateo, DTPagosDeudores:=DTPagosDeudores) Then
DTProrrateo:=DTProrrateo, DTPagosDeudores:=DTPagosDeudores, Observaciones:=TxtObservaciones.Text) Then
If CompraActual.AddCompra(Objcompras.IniciaTransacSQL()) Then
Contador = Contador + 1
Else
@@ -6874,7 +6874,7 @@ Public Class ClsCompraManager
End Sub
Public Function ConfiguraRegistroCompra(CvePS As Integer, CveSubProyecto As Integer, CveCajaChica As Integer, CvePersonal As Integer, CveRetIVAConcepto As Integer, CveRetISRConcepto As Integer, NumeroReembolso As String, DTProrrateo As DataTable,
DTPagosDeudores As DataTable, Optional TipoComprobante As String = "") As Boolean
DTPagosDeudores As DataTable, Optional TipoComprobante As String = "", Optional Observaciones As String = "") As Boolean
Dim respuesta As Boolean = True
Me.CveSubProyecto = CveSubProyecto
@@ -6886,6 +6886,7 @@ Public Class ClsCompraManager
Me.CveTipoPoliza = 3
Me.NumeroReembolso = NumeroReembolso
Me.DTPagosDeudores = DTPagosDeudores
Me.Observaciones = Observaciones
If TipoComprobante.Length > 0 Then
Me.TipoComprobante = TipoComprobante