Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subida de modificaciones sobre contabilidad

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@62 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2007-12-13 20:13:31 +00:00
parent 33e03de872
commit ae571b7016
13 changed files with 363 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Modulos/Contabilidad/Controller/uApuntesController.pas
View File

@ -82,7 +82,10 @@ end;
procedure TApuntesController.Anadir(AApunte: IBizApunte);
begin
AApunte.Insert;
// AApunte.DataTable.DisableControls;
// AApunte.Last;
AApunte.Append;
// AApunte.DataTable.EnableControls;
end;
procedure TApuntesController.AsignarDataModule;
@ -171,6 +174,9 @@ begin
end;
function TApuntesController.ValidarApunte(AApunte: IBizApunte): Boolean;
var
Descuadre : Double;
begin
Result := False;
@ -185,6 +191,7 @@ begin
raise Exception.Create('El asiento debe tener algún apunte');
AApunte.DataTable.DisableControls;
Descuadre := 0;
AApunte.DataTable.First;
while not AApunte.DataTable.EOF do
begin
@ -193,29 +200,17 @@ begin
AApunte.DataTable.EnableControls;
raise Exception.Create('Todo apunte debe tener una subcuenta asociada');
end;
Descuadre := Descuadre + AApunte.DEBE;
Descuadre := Descuadre - AApunte.HABER;
AApunte.DataTable.Next;
end;
if (Descuadre <> 0) then
begin
AApunte.DataTable.EnableControls;
Result := True;
raise Exception.Create('El asiento está descuadrado');
end;
{
if not Assigned(AApunte) then
raise Exception.Create ('Apunte no asignado');
if (AApunte.DataTable.State in dsEditModes) then
AApunte.DataTable.Post;
//Tambien hacemos post de sus tablas hija
if (AApunte.Apuntes.DataTable.State in dsEditModes) then
AApunte.Apuntes.DataTable.Post;
if (AApunte.Apuntes.DataTable.RecordCount = 0) then
raise Exception.Create('El Apunte debe tener algún apunte');
// if Length(AApunte.CONCEPTO) = 0 then
// raise Exception.Create('Debe indicar un concepto para este Apunte.');
}
Result := True;
end;

9
Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm
View File

@ -47,10 +47,10 @@ object PluginContabilidad: TPluginContabilidad
Caption = 'Subcuentas'
OnExecute = actSubCuentasExecute
end
object actAsientos: TAction
object actDiario: TAction
Category = 'Contabilidad'
Caption = 'Asientos'
OnExecute = actAsientosExecute
Caption = 'Libro de diario'
OnExecute = actDiarioExecute
end
end
object MainMenu: TMainMenu
@ -76,7 +76,8 @@ object PluginContabilidad: TPluginContabilidad
Action = actSubCuentas
end
object Asientos1: TMenuItem
Action = actAsientos
Tag = 19005
Action = actDiario
end
end
object Contabilidad2: TMenuItem

6
Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.pas
View File

@ -30,14 +30,14 @@ type
Cuentas1: TMenuItem;
actSubCuentas: TAction;
Subcuentas1: TMenuItem;
actAsientos: TAction;
actDiario: TAction;
Asientos1: TMenuItem;
procedure actEpigrafesExecute(Sender: TObject);
procedure actBalancesExecute(Sender: TObject);
procedure actCuentasEspecialesExecute(Sender: TObject);
procedure actCuentasExecute(Sender: TObject);
procedure actSubCuentasExecute(Sender: TObject);
procedure actAsientosExecute(Sender: TObject);
procedure actDiarioExecute(Sender: TObject);
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -63,7 +63,7 @@ end;
exports
GetModule name GET_MODULE_FUNC;
procedure TPluginContabilidad.actAsientosExecute(Sender: TObject);
procedure TPluginContabilidad.actDiarioExecute(Sender: TObject);
var
AAsientosController : IAsientosController;
ADiario : IBizDiario;

18
Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm
View File

@ -97,6 +97,7 @@ inherited fEditorAsiento: TfEditorAsiento
end
inherited pgPaginas: TPageControl
Width = 632
ActivePage = pagApuntes
ExplicitWidth = 632
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
@ -125,6 +126,7 @@ inherited fEditorAsiento: TfEditorAsiento
Properties.DisplayFormat = '0'
Properties.ImmediatePost = True
Properties.MaxValue = 100.000000000000000000
Properties.UseLeftAlignmentOnEditing = False
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Font.Charset = DEFAULT_CHARSET
@ -145,11 +147,12 @@ inherited fEditorAsiento: TfEditorAsiento
Width = 168
end
object edtFecha: TcxDBDateEdit
Left = 361
Left = 303
Top = 10
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ASIENTO'
DataBinding.DataSource = dsDataTable
Properties.UseLeftAlignmentOnEditing = False
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Color = clInfoBk
@ -163,7 +166,7 @@ inherited fEditorAsiento: TfEditorAsiento
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 1
Width = 158
Width = 253
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
@ -214,9 +217,14 @@ inherited fEditorAsiento: TfEditorAsiento
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
Format = '0 ejercicios'
Kind = skCount
Column = frViewApuntes1.cxGridViewID_ASIENTO
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = frViewApuntes1.cxGridViewDEBE
end
item
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = frViewApuntes1.cxGridViewHABER
end>
end
end

4
Source/Modulos/Contabilidad/Views/uEditorAsiento.pas
View File

@ -114,9 +114,9 @@ begin
if Assigned(Asiento) then
begin
if Asiento.EsNuevo then
FTitulo := 'Nueva Asiento - ' + AppFactuGES.EjercicioActivo.NOMBRE
FTitulo := 'Nueva Asiento - ' + AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE
else
FTitulo := 'Asiento' + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE; // + ' - ' + Asiento.DESCRIPCION;
FTitulo := 'Asiento' + ' ' + IntToStr(Asiento.ORDEN) + ' - ' + AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE;
end;
inherited PonerTitulos(FTitulo);

22
Source/Modulos/Contabilidad/Views/uEditorDiario.dfm
View File

@ -70,17 +70,6 @@ inherited fEditorDiario: TfEditorDiario
Height = 195
ExplicitWidth = 543
ExplicitHeight = 195
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
Format = '0 ejercicios'
Kind = skCount
Column = frViewDiario1.cxGridViewREF_SUBCUENTA
end>
inherited cxGridViewID_ASIENTO: TcxGridDBColumn
IsCaptionAssigned = True
end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 543
@ -90,9 +79,19 @@ inherited fEditorDiario: TfEditorDiario
inherited dxLayoutControl1: TdxLayoutControl
Width = 543
ExplicitWidth = 543
inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 273
Width = 273
end
inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 121
Width = 121
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 337
ExplicitLeft = 337
ExplicitWidth = 121
Width = 121
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@ -108,6 +107,7 @@ inherited fEditorDiario: TfEditorDiario
inherited pnlAgrupaciones: TTBXDockablePanel
Top = 297
ExplicitTop = 297
ExplicitWidth = 543
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 543
ExplicitWidth = 543

2
Source/Modulos/Contabilidad/Views/uEditorDiario.pas
View File

@ -93,7 +93,7 @@ procedure TfEditorDiario.PonerTitulos(const ATitulo: string);
var
FTitulo : String;
begin
FTitulo := 'Lista de Asientos - ' + AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE;
FTitulo := 'Libro de diario - ' + AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE;
inherited PonerTitulos(FTitulo);
end;

60
Source/Modulos/Contabilidad/Views/uViewApuntes.dfm
View File

@ -1,18 +1,33 @@
inherited frViewApuntes: TfrViewApuntes
Width = 623
ExplicitWidth = 623
inherited cxGrid: TcxGrid
Width = 623
ExplicitWidth = 623
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
Format = '0 ejercicios'
Kind = skCount
Column = cxGridViewREF_SUBCUENTA
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = cxGridViewDEBE
end
item
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = cxGridViewHABER
end>
DataController.Summary.OnAfterSummary = cxGridViewDataControllerSummaryAfterSummary
OptionsBehavior.PullFocusing = True
OptionsView.CellAutoHeight = False
OptionsView.Footer = True
inherited cxGridViewID: TcxGridDBColumn
Visible = True
SortIndex = 0
SortOrder = soAscending
end
object cxGridViewID_ASIENTO: TcxGridDBColumn
DataBinding.FieldName = 'ID_ASIENTO'
Options.Sorting = False
end
object cxGridViewREF_SUBCUENTA: TcxGridDBColumn
Caption = 'Referencia'
@ -25,8 +40,7 @@ inherited frViewApuntes: TfrViewApuntes
end>
Properties.ReadOnly = True
Properties.OnButtonClick = cxGridViewREF_SUBCUENTAPropertiesButtonClick
SortIndex = 0
SortOrder = soAscending
Options.Sorting = False
Width = 119
end
object cxGridViewSUBCUENTA: TcxGridDBColumn
@ -34,16 +48,19 @@ inherited frViewApuntes: TfrViewApuntes
DataBinding.FieldName = 'SUBCUENTA'
PropertiesClassName = 'TcxTextEditProperties'
Properties.ReadOnly = True
Options.Sorting = False
Width = 86
end
object cxGridViewCONCEPTO: TcxGridDBColumn
Caption = 'Concepto'
DataBinding.FieldName = 'CONCEPTO'
PropertiesClassName = 'TcxTextEditProperties'
Options.Sorting = False
Width = 109
end
object cxGridViewDOCUMENTO: TcxGridDBColumn
DataBinding.FieldName = 'DOCUMENTO'
Options.Sorting = False
Width = 58
end
object cxGridViewDEBE: TcxGridDBColumn
@ -51,6 +68,7 @@ inherited frViewApuntes: TfrViewApuntes
DataBinding.FieldName = 'DEBE'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.OnEditValueChanged = cxGridViewDEBEPropertiesEditValueChanged
Options.Sorting = False
Width = 59
end
object cxGridViewHABER: TcxGridDBColumn
@ -58,11 +76,14 @@ inherited frViewApuntes: TfrViewApuntes
DataBinding.FieldName = 'HABER'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.OnEditValueChanged = cxGridViewHABERPropertiesEditValueChanged
Options.Sorting = False
Width = 58
end
end
end
inherited ToolBar1: TToolBar
Width = 623
ExplicitWidth = 623
inherited ToolButton1: TToolButton
Top = 0
ExplicitTop = 0
@ -91,6 +112,35 @@ inherited frViewApuntes: TfrViewApuntes
ExplicitTop = 0
ExplicitWidth = 117
end
object ToolButton3: TToolButton
Left = 336
Top = 0
Width = 121
Caption = 'ToolButton3'
ImageIndex = 4
Style = tbsSeparator
end
object Label1: TLabel
Left = 457
Top = 0
Width = 55
Height = 22
Margins.Top = 8
Alignment = taRightJustify
Caption = 'Descuadre:'
Layout = tlCenter
end
object eDescuadre: TcxCurrencyEdit
Left = 512
Top = 0
Enabled = False
Style.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0
Width = 112
end
end
inherited ActionListContenido: TActionList
object actElegirSubCuenta: TAction

32
Source/Modulos/Contabilidad/Views/uViewApuntes.pas
View File

@ -15,7 +15,7 @@ uses
cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX,
TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar,
cxImageComboBox, cxTextEdit, cxCurrencyEdit, ComCtrls, ToolWin, cxButtonEdit,
uApuntesController;
uApuntesController, StdCtrls, cxContainer;
type
IViewApuntes = interface
@ -35,12 +35,16 @@ type
cxGridViewDOCUMENTO: TcxGridDBColumn;
cxGridViewID_ASIENTO: TcxGridDBColumn;
actElegirSubCuenta: TAction;
eDescuadre: TcxCurrencyEdit;
ToolButton3: TToolButton;
Label1: TLabel;
procedure cxGridViewIDCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
procedure cxGridViewREF_SUBCUENTAPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure actElegirSubCuentaExecute(Sender: TObject);
procedure cxGridViewDEBEPropertiesEditValueChanged(Sender: TObject);
procedure cxGridViewHABERPropertiesEditValueChanged(Sender: TObject);
procedure cxGridViewDataControllerSummaryAfterSummary(ASender: TcxDataSummary);
protected
FApuntes: IBizApunte;
FController : IApuntesController;
@ -93,7 +97,8 @@ end;
procedure TfrViewApuntes.AnadirInterno;
begin
inherited;
// inherited;
FController.Anadir(Apuntes);
// try
// with TApuntesController.Create do
// begin
@ -112,16 +117,32 @@ begin
FController := TApuntesController.Create;
end;
procedure TfrViewApuntes.cxGridViewDataControllerSummaryAfterSummary(ASender: TcxDataSummary);
var
Descuadre: Double;
begin
inherited;
Descuadre := 0;
if not VarIsNull(cxGridView.DataController.Summary.FooterSummaryValues[0]) then
Descuadre := cxGridView.DataController.Summary.FooterSummaryValues[0];
if not VarIsNull(cxGridView.DataController.Summary.FooterSummaryValues[1]) then
Descuadre := Descuadre - cxGridView.DataController.Summary.FooterSummaryValues[1];
eDescuadre.Value := Descuadre;
end;
procedure TfrViewApuntes.cxGridViewDEBEPropertiesEditValueChanged(Sender: TObject);
begin
inherited;
{
//Tengo que hacer esto para que se haga un post del apunte y pueda ver el nuevo valor
if cxGridView.Controller.EditingController.IsEditing then
cxGridView.Controller.EditingController.Edit.PostEditValue;
FController.AsignarDEBE(Apuntes);
}
end;
procedure TfrViewApuntes.cxGridViewHABERPropertiesEditValueChanged(
@ -129,11 +150,10 @@ procedure TfrViewApuntes.cxGridViewHABERPropertiesEditValueChanged(
begin
inherited;
//Tengo que hacer esto para que se haga un post del apunte y pueda ver el nuevo valor
{ if cxGridView.Controller.EditingController.IsEditing then
if cxGridView.Controller.EditingController.IsEditing then
cxGridView.Controller.EditingController.Edit.PostEditValue;
FController.AsignarHABER(Apuntes);
}
end;
procedure TfrViewApuntes.cxGridViewIDCustomDrawCell(

19
Source/Modulos/Contabilidad/Views/uViewDiario.dfm
View File

@ -4,9 +4,14 @@ inherited frViewDiario: TfrViewDiario
DataController.KeyFieldNames = 'ID_ASIENTO;ID_APUNTE'
DataController.Summary.FooterSummaryItems = <
item
Format = '0 ejercicios'
Kind = skCount
Column = cxGridViewREF_SUBCUENTA
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = cxGridViewDEBE
end
item
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = cxGridViewHABER
end>
OptionsBehavior.PullFocusing = True
object cxGridViewID_ASIENTO: TcxGridDBColumn
@ -23,13 +28,15 @@ inherited frViewDiario: TfrViewDiario
Visible = False
end
object cxGridViewFECHA_ASIENTO: TcxGridDBColumn
Caption = 'Fecha asiento'
DataBinding.FieldName = 'FECHA_ASIENTO'
end
object cxGridViewORDEN: TcxGridDBColumn
DataBinding.FieldName = 'ORDEN'
Caption = 'Orden asiento'
DataBinding.FieldName = 'ORDEN_ASIENTO'
end
object cxGridViewREF_SUBCUENTA: TcxGridDBColumn
Caption = 'Referencia'
Caption = 'Ref. subcuenta'
DataBinding.FieldName = 'REF_SUBCUENTA'
PropertiesClassName = 'TcxTextEditProperties'
SortIndex = 0
@ -37,7 +44,7 @@ inherited frViewDiario: TfrViewDiario
Width = 304
end
object cxGridViewSUBCUENTA: TcxGridDBColumn
Caption = 'SubCuenta'
Caption = 'Subcuenta'
DataBinding.FieldName = 'SUBCUENTA'
Visible = False
end

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

6
Source/Servidor/FactuGES_Server.dproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -29,10 +29,6 @@
<Borland.ProjectType/>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 19 de noviembre de 2007 18:58</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

2
Source/Servidor/FactuGES_Server.rc
View File

@ -14,7 +14,7 @@ BEGIN
BEGIN
VALUE "FileVersion", "1.0.0.0\0"
VALUE "ProductVersion", "1.0.0.0\0"
VALUE "CompileDate", "domingo, 09 de diciembre de 2007 18:02\0"
VALUE "CompileDate", "jueves, 13 de diciembre de 2007 13:39\0"
END
END
BLOCK "VarFileInfo"