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:
JORGE LUIS CAUDILLO ESPARZA
2020-07-24 18:43:51 -07:00
parent 0b3ddf845c b863d8b8e0
commit 048a6438a3
3 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Contabilidad/RegPoliza.aspx.vb
View File

@@ -1702,9 +1702,21 @@ Partial Class RegPoliza
If ObjConta.RemovePoliza(IDPoliza) Then If ObjConta.RemovePoliza(IDPoliza) Then
If ObjMov.DesvincularPrePolizaContabilizada(IDPoliza, UsuarioActual.CveEmpresa) Then If ObjMov.DesvincularPrePolizaContabilizada(IDPoliza, UsuarioActual.CveEmpresa) Then
If ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Polizas", TxtNumeroPoliza.Text, DdlTipoPoliza.SelectedValue.ToEntero) Then If Not ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Polizas", TxtNumeroPoliza.Text, DdlTipoPoliza.SelectedValue.ToEntero) Then
ErrorTrans = True
Else Else
End If
If Not ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", TxtConcepto.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Polizas", TxtNumeroPoliza.Text, DdlTipoPoliza.SelectedValue.ToEntero) Then
ErrorTrans = True
End If
If Not ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", TxtFechaPoliza.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Polizas", TxtNumeroPoliza.Text, DdlTipoPoliza.SelectedValue.ToEntero) Then
ErrorTrans = True
End If
If Not ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", DdlTipoPoliza.SelectedItem.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Polizas", TxtNumeroPoliza.Text, DdlTipoPoliza.SelectedValue.ToEntero) Then
ErrorTrans = True ErrorTrans = True
End If End If
Else Else

2
Contabilidad2/RepEstadoResultadosHorizontal.aspx
View File

@@ -298,7 +298,7 @@
</asp:GridView> </asp:GridView>
<br /> <br />
<br /> <br />
<asp:GridView ID="GvGastosMesH" runat="server" AutoGenerateColumns="False" DataKeyNames="" OnRowDataBound="GvGastosMesH_RowDataBound" ShowHeaderWhenEmpty="true" CssClass="table table-striped table-hover Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None"> <asp:GridView ID="GvGastosMesH" runat="server" AutoGenerateColumns="False" DataKeyNames="CveCuenta" OnRowDataBound="GvGastosMesH_RowDataBound" ShowHeaderWhenEmpty="true" CssClass="table table-striped table-hover Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None">
<Columns> <Columns>
<asp:TemplateField> <asp:TemplateField>

40
Empresas/Grales/Formatos/AuxiliarProveedor.rdlc
View File

@@ -50,34 +50,34 @@
<TablixBody> <TablixBody>
<TablixColumns> <TablixColumns>
<TablixColumn> <TablixColumn>
<Width>1.57873cm</Width> <Width>2.19852cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>2.54731cm</Width> <Width>2.26204cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>0.70704cm</Width> <Width>0.69929cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>1.66702cm</Width> <Width>1.65927cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>1.99686cm</Width> <Width>1.98911cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>1.96369cm</Width> <Width>1.95594cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>1.75246cm</Width> <Width>1.74471cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>0.85958cm</Width> <Width>0.85183cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>1.6398cm</Width> <Width>1.63205cm</Width>
</TablixColumn> </TablixColumn>
<TablixColumn> <TablixColumn>
<Width>1.77947cm</Width> <Width>1.50713cm</Width>
</TablixColumn> </TablixColumn>
</TablixColumns> </TablixColumns>
<TablixRows> <TablixRows>
@@ -822,7 +822,7 @@
<TablixMember> <TablixMember>
<Group Name="GPO" /> <Group Name="GPO" />
<TablixHeader> <TablixHeader>
<Size>3.06196cm</Size> <Size>3.05421cm</Size>
<CellContents> <CellContents>
<Textbox Name="RazonSocial"> <Textbox Name="RazonSocial">
<CanGrow>true</CanGrow> <CanGrow>true</CanGrow>
@@ -863,7 +863,7 @@
<Top>0.75875cm</Top> <Top>0.75875cm</Top>
<Left>0.06614cm</Left> <Left>0.06614cm</Left>
<Height>1.19472cm</Height> <Height>1.19472cm</Height>
<Width>19.55393cm</Width> <Width>19.55408cm</Width>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -891,8 +891,8 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName> <rd:DefaultName>Textbox1</rd:DefaultName>
<Top>0.07056cm</Top> <Top>0.0635cm</Top>
<Left>0.06614cm</Left> <Left>0.01654cm</Left>
<Height>0.58236cm</Height> <Height>0.58236cm</Height>
<Width>19.58715cm</Width> <Width>19.58715cm</Width>
<ZIndex>1</ZIndex> <ZIndex>1</ZIndex>
@@ -910,10 +910,10 @@
<Height>0.87325in</Height> <Height>0.87325in</Height>
<Style /> <Style />
</Body> </Body>
<Width>7.73752in</Width> <Width>7.7245in</Width>
<Page> <Page>
<PageHeader> <PageHeader>
<Height>2.22362cm</Height> <Height>2.32973cm</Height>
<PrintOnFirstPage>true</PrintOnFirstPage> <PrintOnFirstPage>true</PrintOnFirstPage>
<ReportItems> <ReportItems>
<Textbox Name="Textbox1"> <Textbox Name="Textbox1">
@@ -935,9 +935,8 @@
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName> <rd:DefaultName>Textbox1</rd:DefaultName>
<Left>2.43857cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>14.68354cm</Width> <Width>19.60369cm</Width>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -983,9 +982,8 @@
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName> <rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.63528cm</Top> <Top>0.63528cm</Top>
<Left>2.40329cm</Left>
<Height>0.52945cm</Height> <Height>0.52945cm</Height>
<Width>14.68354cm</Width> <Width>19.62022cm</Width>
<ZIndex>1</ZIndex> <ZIndex>1</ZIndex>
<Style> <Style>
<Border> <Border>
@@ -1003,7 +1001,7 @@
<Sizing>FitProportional</Sizing> <Sizing>FitProportional</Sizing>
<Left>0.06614cm</Left> <Left>0.06614cm</Left>
<Height>2.22362cm</Height> <Height>2.22362cm</Height>
<Width>2.33715cm</Width> <Width>4.64069cm</Width>
<ZIndex>2</ZIndex> <ZIndex>2</ZIndex>
<Style> <Style>
<Border> <Border>