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
2024-01-04 22:54:12 -07:00
parent 97d60bf5e3 4fa0b33e33
commit 474d9fd65a
5 changed files with 102 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Empresas/186/Formatos/Entradas.rdlc
View File

@@ -402,7 +402,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Fecha Elaboración</Value> <Value>Fecha Caducidad</Value>
<Style> <Style>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>
@@ -437,6 +437,7 @@
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
</Style> </Style>
</Textbox> </Textbox>
<rd:Selected>true</rd:Selected>
</CellContents> </CellContents>
</TablixCell> </TablixCell>
</TablixCells> </TablixCells>

2
Empresas/186/Formatos/Salidas.rdlc
View File

@@ -337,7 +337,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Fecha Elaboracion</Value> <Value>Fecha Caducidad</Value>
<Style> <Style>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>

2
Empresas/186/Formatos/Traslado.rdlc
View File

@@ -358,7 +358,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Fecha Elaboracion</Value> <Value>Fecha Caducidad</Value>
<Style> <Style>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>

13
Ventas/Ventas.aspx
View File

@@ -5381,7 +5381,7 @@
Cantidad Cantidad
</HeaderTemplate> </HeaderTemplate>
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtCantidadRem" runat="server" style="text-align:right;" Text='<%#Eval("Cantidad", "{0:#,###.#####}").ToString%>' MaxLength="12" Width="46px" Height="24px"></asp:TextBox> <asp:TextBox ID="TxtCantidadRem" runat="server" Style="text-align: right;" Text='<%#Eval("Cantidad", "{0:#,###.#####}").ToString%>' MaxLength="12" Width="46px" Height="24px"></asp:TextBox>
<asp:RangeValidator ID="RVCantRem" runat="server" Type="Double" MinimumValue="0" MaximumValue='<%#Eval("Cantidad", "{0:####.#####}").ToString%>' ErrorMessage="Cantidad Excedida" ControlToValidate="TxtCantidadRem" ValidationGroup="GprGvRemPS" Display="Dynamic" SetFocusOnError="True"></asp:RangeValidator> <asp:RangeValidator ID="RVCantRem" runat="server" Type="Double" MinimumValue="0" MaximumValue='<%#Eval("Cantidad", "{0:####.#####}").ToString%>' ErrorMessage="Cantidad Excedida" ControlToValidate="TxtCantidadRem" ValidationGroup="GprGvRemPS" Display="Dynamic" SetFocusOnError="True"></asp:RangeValidator>
<ajax:ValidatorCalloutExtender ID="VCECantidad3" runat="server" HighlightCssClass="vco" TargetControlID="RVCantRem" Width="300px"></ajax:ValidatorCalloutExtender> <ajax:ValidatorCalloutExtender ID="VCECantidad3" runat="server" HighlightCssClass="vco" TargetControlID="RVCantRem" Width="300px"></ajax:ValidatorCalloutExtender>
</ItemTemplate> </ItemTemplate>
@@ -7007,17 +7007,17 @@
<asp:Literal ID="LtlIVA" runat="server" Text='<%# Eval("IVA", "{0:N2}") %>'></asp:Literal> <asp:Literal ID="LtlIVA" runat="server" Text='<%# Eval("IVA", "{0:N2}") %>'></asp:Literal>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="IEPS" ItemStyle-HorizontalAlign="Right" visible="false"> <asp:TemplateField HeaderText="IEPS" ItemStyle-HorizontalAlign="Right" Visible="false">
<ItemTemplate> <ItemTemplate>
<asp:Literal ID="LtlIEPS" runat="server" Text='<%# Eval("IEPS", "{0:N2}") %>'></asp:Literal> <asp:Literal ID="LtlIEPS" runat="server" Text='<%# Eval("IEPS", "{0:N2}") %>'></asp:Literal>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="RetIVA" ItemStyle-HorizontalAlign="Right" visible="false"> <asp:TemplateField HeaderText="RetIVA" ItemStyle-HorizontalAlign="Right" Visible="false">
<ItemTemplate> <ItemTemplate>
<asp:Literal ID="LtlRetIVA" runat="server" Text='<%# Eval("RetIVA", "{0:N2}") %>'></asp:Literal> <asp:Literal ID="LtlRetIVA" runat="server" Text='<%# Eval("RetIVA", "{0:N2}") %>'></asp:Literal>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="RetISR" ItemStyle-HorizontalAlign="Right" visible="false"> <asp:TemplateField HeaderText="RetISR" ItemStyle-HorizontalAlign="Right" Visible="false">
<ItemTemplate> <ItemTemplate>
<asp:Literal ID="LtlRetISR" runat="server" Text='<%# Eval("RetISR", "{0:N2}") %>'></asp:Literal> <asp:Literal ID="LtlRetISR" runat="server" Text='<%# Eval("RetISR", "{0:N2}") %>'></asp:Literal>
</ItemTemplate> </ItemTemplate>
@@ -8475,7 +8475,7 @@
<Columns> <Columns>
<asp:TemplateField ItemStyle-HorizontalAlign="Right" HeaderText="Cant." ItemStyle-Width="40px"> <asp:TemplateField ItemStyle-HorizontalAlign="Right" HeaderText="Cant." ItemStyle-Width="40px">
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtCantidad" runat="server" Text="" Width="40px" style="text-align:right!important"></asp:TextBox> <asp:TextBox ID="TxtCantidad" runat="server" Text="" Width="40px" Style="text-align: right!important"></asp:TextBox>
<ajax:FilteredTextBoxExtender ID="FilTxtCantidad" runat="server" TargetControlID="TxtCantidad" FilterType="Custom, Numbers" ValidChars="." /> <ajax:FilteredTextBoxExtender ID="FilTxtCantidad" runat="server" TargetControlID="TxtCantidad" FilterType="Custom, Numbers" ValidChars="." />
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
@@ -9240,7 +9240,10 @@
var CellIndex = 0; var CellIndex = 0;
if ($('#C_DdlNCNivelImporte').val() == "1") { if ($('#C_DdlNCNivelImporte').val() == "1") {
CellIndex = 8;
if ('<%= UsuarioActual.Empresa.Funcionalidad(713) %>' != '') {
CellIndex = 9; CellIndex = 9;
}
} else if ($('#C_DdlNCNivelImporte').val() == "2") { } else if ($('#C_DdlNCNivelImporte').val() == "2") {
CellIndex = 3; CellIndex = 3;
} }

12
Ventas/Ventas.aspx.vb
View File

@@ -2664,7 +2664,8 @@ Partial Class Ventas
TmpDT.Columns.Add("NumTurnos", GetType(Decimal)) TmpDT.Columns.Add("NumTurnos", GetType(Decimal))
TmpDT.Columns("NumTurnos").DefaultValue = 0D TmpDT.Columns("NumTurnos").DefaultValue = 0D
TmpDT.Columns.Add("NumeroPedimento", GetType(String)) TmpDT.Columns.Add("NumeroPedimento", GetType(String))
TmpDT.Columns.Add("CodigoAlterno", GetType(String))
TmpDT.Columns.Add("PSAlterno", GetType(String))
GvPS.DataSource = ObjVentas.DtResultados GvPS.DataSource = ObjVentas.DtResultados
GvPS.DataBind() GvPS.DataBind()
@@ -2713,7 +2714,8 @@ Partial Class Ventas
TmpDT.Columns.Add("NumTurnos", GetType(Decimal)) TmpDT.Columns.Add("NumTurnos", GetType(Decimal))
TmpDT.Columns("NumTurnos").DefaultValue = 0D TmpDT.Columns("NumTurnos").DefaultValue = 0D
TmpDT.Columns.Add("NumeroPedimento", GetType(String)) TmpDT.Columns.Add("NumeroPedimento", GetType(String))
TmpDT.Columns.Add("CodigoAlterno", GetType(String))
TmpDT.Columns.Add("PSAlterno", GetType(String))
GvPS.DataSource = ObjVentas.DtResultados GvPS.DataSource = ObjVentas.DtResultados
GvPS.DataBind() GvPS.DataBind()
@@ -18520,6 +18522,9 @@ Partial Class Ventas
Row("NumTurnos") = NumTurnos Row("NumTurnos") = NumTurnos
Row("CodigoAlterno") = DrPS("CodigoAlterno")
Row("PSAlterno") = DrPS("PSAlterno")
If UsuarioActual.CveEmpresa.Contiene(119, 13, 83) Then If UsuarioActual.CveEmpresa.Contiene(119, 13, 83) Then
If Not RemisionesLista.Count > 0 Then 'SI VIENE DE REMISION NO SE CONSIDERA If Not RemisionesLista.Count > 0 Then 'SI VIENE DE REMISION NO SE CONSIDERA
@@ -18764,6 +18769,9 @@ Partial Class Ventas
TmpDT.Columns("NumTurnos").DefaultValue = 0 TmpDT.Columns("NumTurnos").DefaultValue = 0
TmpDT.Columns.Add("NumeroPedimento", GetType(String)) TmpDT.Columns.Add("NumeroPedimento", GetType(String))
TmpDT.Columns.Add("CodigoAlterno", GetType(String))
TmpDT.Columns.Add("PSAlterno", GetType(String))
End Sub End Sub
Private Sub CreaDTmpC() Private Sub CreaDTmpC()
DTmpC = New DataTable DTmpC = New DataTable