From 278216e83b42074c9beddc7982c8095b61f45322 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 10 Oct 2007 08:51:38 +0000 Subject: [PATCH] git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/branches/D2007-DA5@42 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Build/Build.fbp5 | 1290 ++++++++--------- .../Empresas/Data/uDataModuleEmpresas.pas | 38 - .../Empresas/Views/uEditorEmpresa.dfm | 12 - Source/Base/Base.dpk | 3 +- Source/Base/Base.dproj | 97 +- .../ClassRegistry/uInformeRegistryUtils.pas | 4 +- Source/Cliente/FactuGES.drc | 6 +- Source/Cliente/uPantallaPrincipal.dfm | 25 +- Source/Cliente/uPantallaPrincipal.pas | 9 +- Source/FactuGES_Group.groupproj | 152 +- Source/GUIBase/GUIBase.drc | 2 +- .../Modulos/Contactos/Data/Contactos_data.dpk | 1 - .../Contactos/Data/Contactos_data.dproj | 9 +- .../Contactos/Model/Contactos_model.dpk | 3 +- .../Contactos/Model/Contactos_model.dproj | 23 +- .../Contactos/Views/Contactos_view.dproj | 508 ++++++- .../Contactos/Views/Contactos_view.res | Bin 384 -> 4748 bytes .../Controller/Familias_controller.dproj | 42 +- .../Controller/Familias_controller.rc | 22 + .../Controller/Familias_controller.res | Bin 5056 -> 4748 bytes .../Modulos/Familias/Data/Familias_data.dpk | 4 +- .../Modulos/Familias/Data/Familias_data.dproj | 29 +- Source/Modulos/Familias/Data/Familias_data.rc | 22 + .../Modulos/Familias/Data/Familias_data.res | Bin 5056 -> 4748 bytes .../Familias/Data/uDataModuleFamilias.dfm | 180 +-- .../Familias/Data/uDataModuleFamilias.pas | 42 +- .../Modulos/Familias/Model/Familias_model.dpk | 5 +- .../Familias/Model/Familias_model.dproj | 27 +- .../Modulos/Familias/Model/Familias_model.rc | 22 + .../Modulos/Familias/Model/Familias_model.res | Bin 5056 -> 4748 bytes .../Familias/Plugin/Familias_plugin.dproj | 17 +- .../Familias/Plugin/Familias_plugin.rc | 22 + .../Familias/Plugin/Familias_plugin.res | Bin 5056 -> 4748 bytes .../Modulos/Familias/Views/Familias_view.dpk | 1 + .../Familias/Views/Familias_view.dproj | 51 +- .../Modulos/Familias/Views/Familias_view.rc | 22 + .../Modulos/Familias/Views/Familias_view.res | Bin 5056 -> 4748 bytes .../Controller/FormasPago_controller.dpk | 1 + .../Controller/FormasPago_controller.dproj | 539 +------ .../Controller/FormasPago_controller.rc | 22 + .../Controller/FormasPago_controller.res | Bin 5056 -> 384 bytes .../Controller/uFormasPagoController.pas | 10 +- .../Formas de pago/Data/FormasPago_data.dpk | 1 + .../Formas de pago/Data/FormasPago_data.dproj | 524 +------ .../Formas de pago/Data/FormasPago_data.rc | 22 + .../Formas de pago/Data/FormasPago_data.res | Bin 5056 -> 384 bytes .../Data/uDataModuleFormasPago.pas | 4 +- .../Model/FormasPago_model.dproj | 19 - .../Formas de pago/Model/FormasPago_model.res | Bin 4748 -> 384 bytes .../Plugin/FormasPago_plugin.dpk | 1 + .../Plugin/FormasPago_plugin.dproj | 531 +------ .../Plugin/FormasPago_plugin.rc | 22 + .../Plugin/FormasPago_plugin.res | Bin 5056 -> 384 bytes .../Formas de pago/Views/FormasPago_view.dpk | 4 +- .../Views/FormasPago_view.dproj | 59 +- .../Formas de pago/Views/FormasPago_view.res | Bin 4748 -> 384 bytes .../Controller/TiposIVA_controller.dpk | 3 +- .../Controller/TiposIVA_controller.dproj | 10 +- .../Tipos de IVA/Data/TiposIVA_data.dpk | 2 + .../Tipos de IVA/Data/TiposIVA_data.dproj | 10 +- .../Tipos de IVA/Data/TiposIVA_data.res | Bin 384 -> 4748 bytes .../Tipos de IVA/Data/uDataModuleTiposIVA.dfm | 4 +- .../Tipos de IVA/Data/uDataModuleTiposIVA.pas | 6 +- .../Tipos de IVA/Model/TiposIVA_model.dpk | 4 +- .../Tipos de IVA/Model/TiposIVA_model.dproj | 489 +------ .../Tipos de IVA/Plugin/TiposIVA_plugin.dpk | 3 + .../Tipos de IVA/Plugin/TiposIVA_plugin.dproj | 12 +- .../Tipos de IVA/TiposIVA_Group.groupproj | 30 +- .../Tipos de IVA/Views/TiposIVA_view.dpk | 5 +- .../Tipos de IVA/Views/TiposIVA_view.dproj | 12 +- Source/Servidor/FactuGES_Server.RES | Bin 23204 -> 23204 bytes Source/Servidor/FactuGES_Server.drc | 578 ++++---- Source/Servidor/FactuGES_Server.rc | 2 +- 73 files changed, 1985 insertions(+), 3634 deletions(-) diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index 0c78dbc4..6e979b67 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -1009,14 +1009,14 @@ Comments= 0 Módulos - False + True True False True False 0 - True + False 0 1000 False @@ -2307,654 +2307,12 @@ Comments= - - Contactos - 0 - - Contactos - True - True - False - True - False - - 0 - False - 0 - 1000 - False - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - True - True - False - False - False - False - False - False - False - False - 3082 - - 1 - 0 - 0 - False - 0 - %source_path%\Modulos\Contactos\Model\Contactos_model.dpk - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - False - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - True - True - False - False - False - False - False - False - False - False - 3082 - - 1 - 0 - 0 - False - 0 - %source_path%\Modulos\Contactos\Data\Contactos_data.dpk - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - False - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - True - True - False - False - False - False - False - False - False - False - 3082 - - 1 - 0 - 0 - False - 0 - %source_path%\Modulos\Contactos\Controller\Contactos_controller.dpk - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - False - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - True - True - False - False - False - False - False - False - False - False - 3082 - - 1 - 0 - 0 - False - 0 - %source_path%\Modulos\Contactos\Views\Contactos_view.dpk - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - False - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - True - True - False - False - False - False - False - False - False - False - 3082 - - 1 - 0 - 0 - False - 0 - %source_path%\Modulos\Contactos\Plugin\Contactos_plugin.dpk - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - False - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - Familias 0 Familias - False + True True False True @@ -3606,6 +2964,648 @@ Comments= + + Contactos + 0 + + Contactos + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + %source_path%\Modulos\Contactos\Model\Contactos_model.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + False + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + %source_path%\Modulos\Contactos\Data\Contactos_data.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + False + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + %source_path%\Modulos\Contactos\Controller\Contactos_controller.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + False + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + %source_path%\Modulos\Contactos\Views\Contactos_view.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + False + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + %source_path%\Modulos\Contactos\Plugin\Contactos_plugin.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + False + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + diff --git a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas index a2070ab3..87ab37d2 100644 --- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas +++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas @@ -21,24 +21,11 @@ type ds_EmpresasDatosBanco: TDADataSource; procedure DAClientDataModuleCreate(Sender: TObject); private - FEmpresaActual: IBizEmpresa; - function _GetDatosBancarios : IBizEmpresasDatosBancarios; - -{ function GetEmpresas: TIntegerList; - - procedure SetEmpresaActual(const Value: IBizEmpresa); - function GetIDEmpresaActual: Integer; - procedure SetIDEmpresaActual(const Value: Integer);} public function GetItem(const ID : Integer) : IBizEmpresa; function NewItem : IBizEmpresa; function GetItems : IBizEmpresa; - -{ property IDEmpresaActual : Integer read GetIDEmpresaActual write SetIDEmpresaActual; - property EmpresaActual : IBizEmpresa read FEmpresaActual write SetEmpresaActual; - property Empresas : TIntegerList read GetEmpresas;} - end; @@ -52,7 +39,6 @@ uses procedure TDataModuleEmpresas.DAClientDataModuleCreate(Sender: TObject); begin - FEmpresaActual := nil; RORemoteService.Channel := dmConexion.Channel; RORemoteService.Message := dmConexion.Message; end; @@ -100,30 +86,6 @@ begin Result := GetItem(ID_NULO) end; -{procedure TDataModuleEmpresas.SetEmpresaActual(const Value: IBizEmpresa); -begin - FEmpresaActual := Value; - FEmpresaActual.DataTable.Active := True; -end; - -procedure TDataModuleEmpresas.SetIDEmpresaActual(const Value: Integer); -var - AEmpresasController : IEmpresasController; - AEmpresa : IBizEmpresa; -begin - AEmpresasController := TEmpresasController.Create; - AEmpresa := AEmpresasController.Buscar(Value); - AEmpresa.DataTable.Active := True; - - if not AEmpresa.IsEmpty then - begin - FEmpresaActual := AEmpresa; - FEmpresaActual.DataTable.Active := True; - end - else - FEmpresaActual := NIL; -end;} - function TDataModuleEmpresas._GetDatosBancarios: IBizEmpresasDatosBancarios; var ADatosBancarios : TDAMemDataTable; diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm index dc0c2224..c04cfe4b 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm @@ -269,18 +269,6 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited ToolBar1: TToolBar Width = 666 ExplicitWidth = 666 - inherited ToolButton1: TToolButton - ExplicitWidth = 62 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 74 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 67 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 117 - end end end end diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk index e8f89dce..834a1bab 100644 --- a/Source/Base/Base.dpk +++ b/Source/Base/Base.dpk @@ -74,7 +74,8 @@ requires designide, xmlrtl, VclSmp, - pckMD5; + pckMD5, + JvCmpD11R; contains uDataTableUtils in 'Utiles\uDataTableUtils.pas', diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index f73bd5a1..82444630 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -51,55 +51,56 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
 diff --git a/Source/Base/Utiles/ClassRegistry/uInformeRegistryUtils.pas b/Source/Base/Utiles/ClassRegistry/uInformeRegistryUtils.pas index f8a58c58..72b6e90a 100644 --- a/Source/Base/Utiles/ClassRegistry/uInformeRegistryUtils.pas +++ b/Source/Base/Utiles/ClassRegistry/uInformeRegistryUtils.pas @@ -44,8 +44,8 @@ end; function TInformeRegistry.CreateInforme(const aClassOrDisplayname: String; aOwner: TComponent): TInterfacedObject; begin - if not Assigned(AOwner) then - AOwner := Application; +{ if not Assigned(AOwner) then + AOwner := Application;} Result := CreateObject( aClassOrDisplayname) as TInterfacedObject; end; diff --git a/Source/Cliente/FactuGES.drc b/Source/Cliente/FactuGES.drc index 0f3f9197..d7f8b7a3 100644 --- a/Source/Cliente/FactuGES.drc +++ b/Source/Cliente/FactuGES.drc @@ -12,10 +12,10 @@ STRINGTABLE BEGIN END -/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */ -/* C:\Codigo Tecsitel\Lib\JVCL\JvXPCore.res */ +/* c:\archivos de programa\codegear\rad studio\5.0\lib\WindowsXP.res */ +/* C:\Codigo Tecsitel\Lib\jvcl\JvXPCore.res */ /* C:\Codigo Tecsitel\Source\Cliente\uSplash.dfm */ /* C:\Codigo Tecsitel\Source\Cliente\uAcercaDe.dfm */ /* C:\Codigo Tecsitel\Source\Cliente\uPantallaPrincipal.dfm */ /* C:\Codigo Tecsitel\Source\Cliente\FactuGES.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3B.tmp */ +/* C:\Codigo Tecsitel\Source\Cliente\FactuGES.drf */ diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index b8814ccf..47f5d928 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -2,7 +2,7 @@ object fPantallaPrincipal: TfPantallaPrincipal Left = 358 Top = 250 Caption = 'Pantalla principal' - ClientHeight = 582 + ClientHeight = 601 ClientWidth = 751 Color = clWindow Font.Charset = DEFAULT_CHARSET @@ -23,7 +23,7 @@ object fPantallaPrincipal: TfPantallaPrincipal Left = 0 Top = 0 Width = 751 - Height = 560 + Height = 579 Margins.Left = 5 Margins.Top = 5 Margins.Right = 5 @@ -31,12 +31,11 @@ object fPantallaPrincipal: TfPantallaPrincipal ParentColor = True Align = alClient TabOrder = 0 - ExplicitHeight = 541 object JvSyncSplitter1: TJvSyncSplitter Left = 215 Top = 5 Width = 5 - Height = 550 + Height = 569 ResizeStyle = rsPattern ExplicitLeft = 210 ExplicitHeight = 570 @@ -45,7 +44,7 @@ object fPantallaPrincipal: TfPantallaPrincipal Left = 5 Top = 5 Width = 210 - Height = 550 + Height = 569 ActivePage = pagInicio Align = alLeft AutoHeaders = True @@ -86,12 +85,11 @@ object fPantallaPrincipal: TfPantallaPrincipal NavPanelHotTrackFont.Style = [] SmallImages = ModulesSmallImageList OnChange = JvNavigationPaneChange - ExplicitHeight = 531 object pagInicio: TJvNavPanelPage Left = 0 Top = 0 Width = 208 - Height = 477 + Height = 496 Background.Stretch = False Background.Proportional = False Background.Center = False @@ -99,17 +97,15 @@ object fPantallaPrincipal: TfPantallaPrincipal Background.Transparent = False Caption = 'Inicio' ImageIndex = 0 - ExplicitHeight = 458 object Panel1: TPanel Left = 0 - Top = 391 + Top = 410 Width = 208 Height = 86 Align = alBottom Color = clWindow ParentBackground = False TabOrder = 1 - ExplicitTop = 372 object Label1: TLabel Left = 38 Top = 29 @@ -157,21 +153,19 @@ object fPantallaPrincipal: TfPantallaPrincipal Left = 220 Top = 5 Width = 526 - Height = 550 + Height = 569 BoundColor = clActiveCaption BoundLines = [blLeft, blTop, blRight, blBottom] Caption = 'pnlBorde' Align = alClient - ExplicitHeight = 531 object pnlMain: TTBXAlignmentPanel Left = 1 Top = 1 Width = 524 - Height = 548 + Height = 567 Align = alClient Color = clWindow TabOrder = 0 - ExplicitHeight = 529 object lblBienvenido: TLabel Left = 8 Top = 8 @@ -208,7 +202,7 @@ object fPantallaPrincipal: TfPantallaPrincipal end object TBXStatusBar1: TTBXStatusBar Left = 0 - Top = 560 + Top = 579 Width = 751 Images = StatusPanelImageList Panels = < @@ -230,7 +224,6 @@ object fPantallaPrincipal: TfPantallaPrincipal Tag = 0 end> UseSystemFont = False - ExplicitTop = 541 end object XPManifest1: TXPManifest Left = 248 diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index e1e4a276..7440e6e2 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -478,11 +478,12 @@ end; procedure TfPantallaPrincipal.CargarModulos; begin - //HostManager.LoadModule('Empresas_plugin.bpl'); - //HostManager.LoadModule('FormasPago_plugin.bpl'); - //HostManager.LoadModule('TiposIVA_plugin.bpl'); + HostManager.LoadModule('FormasPago_plugin.bpl'); + HostManager.LoadModule('TiposIVA_plugin.bpl'); + HostManager.LoadModule('Familias_plugin.bpl'); + // HostManager.LoadModule('Almacenes_plugin.bpl'); -// HostManager.LoadModule('Familias_plugin.bpl'); + // HostManager.LoadModule('Articulos_plugin.bpl'); // HostManager.LoadModule('Inventario_plugin.bpl'); diff --git a/Source/FactuGES_Group.groupproj b/Source/FactuGES_Group.groupproj index a090f7e3..d3bb445e 100644 --- a/Source/FactuGES_Group.groupproj +++ b/Source/FactuGES_Group.groupproj @@ -4,20 +4,20 @@ + - - + - - - - - + + + + + @@ -28,9 +28,6 @@ - - - @@ -57,15 +54,6 @@ - - - - - - - - - @@ -75,77 +63,14 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -237,6 +162,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -292,13 +262,13 @@ - + - + - + \ No newline at end of file diff --git a/Source/GUIBase/GUIBase.drc b/Source/GUIBase/GUIBase.drc index 5dd2a2d9..c1adf14b 100644 --- a/Source/GUIBase/GUIBase.drc +++ b/Source/GUIBase/GUIBase.drc @@ -35,4 +35,4 @@ END /* C:\Codigo Tecsitel\Source\GUIBase\uDialogBase.dfm */ /* C:\Codigo Tecsitel\Source\GUIBase\uViewGrid.dfm */ /* C:\Codigo Tecsitel\Source\GUIBase\GUIBase.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf37.tmp */ +/* C:\Codigo Tecsitel\Source\GUIBase\GUIBase.drf */ diff --git a/Source/Modulos/Contactos/Data/Contactos_data.dpk b/Source/Modulos/Contactos/Data/Contactos_data.dpk index 22fc93c9..fed1a9d1 100644 --- a/Source/Modulos/Contactos/Data/Contactos_data.dpk +++ b/Source/Modulos/Contactos/Data/Contactos_data.dpk @@ -23,7 +23,6 @@ package Contactos_data; {$MINENUMSIZE 1} {$IMAGEBASE $400000} {$IMPLICITBUILD ON} -{%TogetherDiagram 'ModelSupport_Contactos_data\default.txaPackage'} requires rtl, diff --git a/Source/Modulos/Contactos/Data/Contactos_data.dproj b/Source/Modulos/Contactos/Data/Contactos_data.dproj index 884d6893..a5a57570 100644 --- a/Source/Modulos/Contactos/Data/Contactos_data.dproj +++ b/Source/Modulos/Contactos/Data/Contactos_data.dproj @@ -50,11 +50,10 @@ MainSource - - - - - + + + +
DataModuleClientes
diff --git a/Source/Modulos/Contactos/Model/Contactos_model.dpk b/Source/Modulos/Contactos/Model/Contactos_model.dpk index 45bd3f8c..541319f4 100644 --- a/Source/Modulos/Contactos/Model/Contactos_model.dpk +++ b/Source/Modulos/Contactos/Model/Contactos_model.dpk @@ -28,7 +28,8 @@ requires rtl, vcl, Base, - Empresas_controller; + GUIBase, + ApplicationBase; contains uBizContactosDatosBancarios in 'uBizContactosDatosBancarios.pas', diff --git a/Source/Modulos/Contactos/Model/Contactos_model.dproj b/Source/Modulos/Contactos/Model/Contactos_model.dproj index 4a496e10..fbeb16d3 100644 --- a/Source/Modulos/Contactos/Model/Contactos_model.dproj +++ b/Source/Modulos/Contactos/Model/Contactos_model.dproj @@ -49,12 +49,25 @@ MainSource + + + + + + + + + + + + + + + + + + - - - - - diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj index e1ada366..dd47503e 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dproj +++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj @@ -42,23 +42,24 @@ Delphi.Personality Package -FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0Contactos_view.dpk +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0Contactos_view.dpk MainSource - - - - - - - - - - + + + + + + + + + + +
fEditorCliente
@@ -156,6 +157,489 @@
frViewProveedores
 - + + diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/Modulos/Familias/Controller/Familias_controller.dproj b/Source/Modulos/Familias/Controller/Familias_controller.dproj index 5df20ed9..467cc692 100644 --- a/Source/Modulos/Familias/Controller/Familias_controller.dproj +++ b/Source/Modulos/Familias/Controller/Familias_controller.dproj @@ -46,41 +46,13 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/Source/Modulos/Familias/Controller/Familias_controller.rc b/Source/Modulos/Familias/Controller/Familias_controller.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Familias/Controller/Familias_controller.rc +++ b/Source/Modulos/Familias/Controller/Familias_controller.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Familias/Controller/Familias_controller.res b/Source/Modulos/Familias/Controller/Familias_controller.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch delta 90 zcmX@0-lMufM^MRuk%2*hfq~)we*qu{a)7{qfr|&s01^(2ll=reL|7OgQZQi#h6N0h bR|zUH)i6vxCnz@AM95&WjZ=fY delta 393 zcmeBCJ)pipM^LGRiGe|Zfq~)we*qw71hN#*ce3gLmj10~U`3$)X1q_J{c?^{den2{xAr-Dg3#`VCA(J5oDCz>l z#SF;|ML>Q5LkW<~2kHWY$qxmM>meq30>w&zDvN-0B2XWynQCAYeSq@mU|Ep;1wflY zW~MV_0ChqD#AbxL5TJ@gh7_Q_Tp(S diff --git a/Source/Modulos/Familias/Data/Familias_data.dpk b/Source/Modulos/Familias/Data/Familias_data.dpk index 89c056c0..d99e5821 100644 --- a/Source/Modulos/Familias/Data/Familias_data.dpk +++ b/Source/Modulos/Familias/Data/Familias_data.dpk @@ -26,11 +26,9 @@ package Familias_data; requires rtl, - dbrtl, vcl, - dsnap, - vcldb, Base, + GUIBase, ApplicationBase, Familias_model; diff --git a/Source/Modulos/Familias/Data/Familias_data.dproj b/Source/Modulos/Familias/Data/Familias_data.dproj index 6dc2b0fa..d0fb29da 100644 --- a/Source/Modulos/Familias/Data/Familias_data.dproj +++ b/Source/Modulos/Familias/Data/Familias_data.dproj @@ -46,18 +46,23 @@ MainSource - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
DataModuleFamilias
 diff --git a/Source/Modulos/Familias/Data/Familias_data.rc b/Source/Modulos/Familias/Data/Familias_data.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Familias/Data/Familias_data.rc +++ b/Source/Modulos/Familias/Data/Familias_data.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Familias/Data/Familias_data.res b/Source/Modulos/Familias/Data/Familias_data.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch delta 90 zcmX@0-lMufM^MRuk%2*hfq~)we*qu{a)7{qfr|&s01^(2ll=reL|7OgQZQi#h6N0h bR|zUH)i6vxCnz@AM95&WjZ=fY delta 393 zcmeBCJ)pipM^LGRiGe|Zfq~)we*qw71hN#*ce3gLmj10~U`3$)X1q_J{c?^{den2{xAr-Dg3#`VCA(J5oDCz>l z#SF;|ML>Q5LkW<~2kHWY$qxmM>meq30>w&zDvN-0B2XWynQCAYeSq@mU|Ep;1wflY zW~MV_0ChqD#AbxL5TJ@gh7_Q_Tp(S diff --git a/Source/Modulos/Familias/Data/uDataModuleFamilias.dfm b/Source/Modulos/Familias/Data/uDataModuleFamilias.dfm index 9411f06c..97ccd415 100644 --- a/Source/Modulos/Familias/Data/uDataModuleFamilias.dfm +++ b/Source/Modulos/Familias/Data/uDataModuleFamilias.dfm @@ -1,186 +1,50 @@ object DataModuleFamilias: TDataModuleFamilias OldCreateOrder = True OnCreate = DAClientDataModuleCreate - RemoteService = RORemoteService - Adapter = DABinAdapter - SchemaCall.MethodName = 'GetSchemaAsXML' - SchemaCall.Params = < - item - Name = 'Result' - ParamType = fResult - DataType = rtString - end> - Height = 414 - Width = 518 + Height = 176 + Width = 361 object RORemoteService: TRORemoteService + Message = dmConexion.ROMessage + Channel = dmConexion.ROChannel ServiceName = 'srvFamilias' - Message = ROBinMessage1 - Channel = ROWinInetHTTPChannel1 Left = 48 Top = 24 end - object DABinAdapter: TDABINAdapter - Left = 48 - Top = 80 + object rda_Familias: TDARemoteDataAdapter + GetSchemaCall.RemoteService = RORemoteService + GetDataCall.RemoteService = RORemoteService + UpdateDataCall.RemoteService = RORemoteService + GetScriptsCall.RemoteService = RORemoteService + RemoteService = RORemoteService + DataStreamer = Bin2DataStreamer + Left = 203 + Top = 23 end - object DADesigntimeCall1: TDADesigntimeCall - RemoteRequest.MethodName = 'Login' - RemoteRequest.Params = < - item - Name = 'Result' - ParamType = fResult - DataType = rtBoolean - end - item - Name = 'User' - ParamType = fIn - DataType = rtString - Value = 'Administrador' - end - item - Name = 'Password' - ParamType = fIn - DataType = rtString - Value = '1' - end - item - Name = 'LoginInfo' - ParamType = fOut - DataType = rtUserDefined - UserClassName = 'TRdxLoginInfo' - end> - RemoteService = LoginRemoteService + object Bin2DataStreamer: TDABin2DataStreamer Left = 48 - Top = 160 + Top = 88 end - object LoginRemoteService: TRORemoteService - ServiceName = 'srvLogin' - Message = ROBinMessage1 - Channel = ROWinInetHTTPChannel1 - Left = 48 - Top = 216 - end - object ROWinInetHTTPChannel1: TROWinInetHTTPChannel - ServerLocators = <> - DispatchOptions = [] - ProbeServers = False - ProbeFrequency = 60000 - UserAgent = 'RemObjects SDK' - TargetURL = 'http://localhost:8099/bin' - Left = 48 - Top = 272 - end - object ROBinMessage1: TROBinMessage - Left = 48 - Top = 324 - end - object tbl_Familias: TDACDSDataTable + object tbl_Familias: TDAMemDataTable RemoteUpdatesOptions = [] Fields = < item Name = 'DESCRIPCION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = True - Calculated = False - Lookup = False - LookupCache = False end> Params = <> - MasterMappingMode = mmDataRequest StreamingOptions = [soDisableEventsWhileStreaming] - SchemaCall.MethodName = 'GetDatasetSchema' - SchemaCall.Params = < - item - Name = 'Result' - ParamType = fResult - DataType = rtBinary - end - item - Name = 'aDatasetName' - ParamType = fIn - DataType = rtString - Value = 'Familias' - end> - DataRequestCall.MethodName = 'GetDatasetDataEx' - DataRequestCall.Params = < - item - Name = 'Result' - ParamType = fResult - DataType = rtBinary - end - item - Name = 'DatasetName' - ParamType = fIn - DataType = rtString - Value = 'Familias' - end - item - Name = 'Params' - ParamType = fIn - DataType = rtUserDefined - UserClassName = 'TDADatasetParamArray' - end - item - Name = 'UserFilter' - ParamType = fIn - DataType = rtString - Value = '' - end - item - Name = 'IncludeSchema' - ParamType = fIn - DataType = rtBoolean - Value = False - end - item - Name = 'MaxRecords' - ParamType = fIn - DataType = rtInteger - Value = -1 - end> - DataUpdateCall.MethodName = 'UpdateData' - DataUpdateCall.Params = < - item - Name = 'Result' - ParamType = fResult - DataType = rtBinary - end - item - Name = 'Delta' - ParamType = fIn - DataType = rtBinary - end> - ScriptCall.MethodName = 'GetDatasetScripts' - ScriptCall.Params = < - item - Name = 'Result' - ParamType = fResult - DataType = rtString - Value = '' - end - item - Name = 'DatasetNames' - ParamType = fIn - DataType = rtString - Value = 'Familias' - end> - ReadOnly = False - RemoteService = RORemoteService - Adapter = DABinAdapter + RemoteDataAdapter = rda_Familias DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'Familias' - IndexDefs = <> - Left = 248 - Top = 104 + Left = 280 + Top = 24 end object ds_Familias: TDADataSource + DataSet = tbl_Familias.Dataset DataTable = tbl_Familias - Left = 248 - Top = 40 + Left = 280 + Top = 88 end end diff --git a/Source/Modulos/Familias/Data/uDataModuleFamilias.pas b/Source/Modulos/Familias/Data/uDataModuleFamilias.pas index 81837378..4a66623a 100644 --- a/Source/Modulos/Familias/Data/uDataModuleFamilias.pas +++ b/Source/Modulos/Familias/Data/uDataModuleFamilias.pas @@ -3,27 +3,20 @@ unit uDataModuleFamilias; interface uses - SysUtils, Classes, DB, uDAClientDataModule, uDADataTable, uDABINAdapter, - uDAScriptingProvider, uDACDSDataTable, uROWinInetHttpChannel, uROTypes, - uROServiceComponent, uRORemoteService, uROClient, uROBinMessage, - uDADesigntimeCall, - uIDataModuleFamilias, uBizFamilias; + SysUtils, Classes, DB, uIDataModuleFamilias, uBizFamilias, uDAInterfaces, uDADataTable, + uDAScriptingProvider, uDAMemDataTable, uDADataStreamer, uDABin2DataStreamer, + uDARemoteDataAdapter, uROClient, uRORemoteService; type - TDataModuleFamilias = class(TDAClientDataModule, IDataModuleFamilias) + TDataModuleFamilias = class(TDataModule, IDataModuleFamilias) RORemoteService: TRORemoteService; - DABinAdapter: TDABINAdapter; - DADesigntimeCall1: TDADesigntimeCall; - LoginRemoteService: TRORemoteService; - ROWinInetHTTPChannel1: TROWinInetHTTPChannel; - ROBinMessage1: TROBinMessage; - tbl_Familias: TDACDSDataTable; + rda_Familias: TDARemoteDataAdapter; + Bin2DataStreamer: TDABin2DataStreamer; + tbl_Familias: TDAMemDataTable; ds_Familias: TDADataSource; procedure DAClientDataModuleCreate(Sender: TObject); - protected - function _CloneDataTable (const ADataTable : TDACDSDataTable): TDACDSDataTable; overload; - procedure AsignarClaseNegocio(var AFamilia: TDACDSDataTable); virtual; + procedure AsignarClaseNegocio(AFamilia: TDADataTable); public function GetItems : IBizFamilia; end; @@ -32,12 +25,12 @@ implementation {$R *.DFM} uses - FactuGES_Intf, uDataModuleConexion, uDataTableUtils, cxControls, uDAInterfaces, + FactuGES_Intf, uDataModuleConexion, uDataTableUtils, cxControls, schFamiliasClient_Intf; { TdmFamilias } -procedure TDataModuleFamilias.AsignarClaseNegocio(var AFamilia: TDACDSDataTable); +procedure TDataModuleFamilias.AsignarClaseNegocio(AFamilia: TDADataTable); begin AFamilia.BusinessRulesID := BIZ_CLIENT_FAMILIA; end; @@ -48,24 +41,13 @@ begin RORemoteService.Message := dmConexion.Message; end; -function TDataModuleFamilias._CloneDataTable(const ADataTable : TDACDSDataTable): TDACDSDataTable; -begin - Result := NIL; - - if not Assigned(ADataTable) then - raise Exception.Create ('No se ha asignado la tabla de origen (CloneDataTable)'); - - Result := TDACDSDataTable.Create(NIL); - CloneDataTable(ADataTable, Result); -end; - function TDataModuleFamilias.GetItems: IBizFamilia; var - AFamilia : TDACDSDataTable; + AFamilia : TDAMemDataTable; begin ShowHourglassCursor; try - AFamilia := _CloneDataTable(tbl_Familias); + AFamilia := CloneDataTable(tbl_Familias); AsignarClaseNegocio(AFamilia); Result := (AFamilia as IBizFamilia); finally diff --git a/Source/Modulos/Familias/Model/Familias_model.dpk b/Source/Modulos/Familias/Model/Familias_model.dpk index 9bacc3c4..49b0a991 100644 --- a/Source/Modulos/Familias/Model/Familias_model.dpk +++ b/Source/Modulos/Familias/Model/Familias_model.dpk @@ -26,12 +26,9 @@ package Familias_model; requires rtl, - dsnap, - dbrtl, - vcldb, vcl, - adortl, Base, + GUIBase, ApplicationBase; contains diff --git a/Source/Modulos/Familias/Model/Familias_model.dproj b/Source/Modulos/Familias/Model/Familias_model.dproj index e3440bc3..4e04c5fa 100644 --- a/Source/Modulos/Familias/Model/Familias_model.dproj +++ b/Source/Modulos/Familias/Model/Familias_model.dproj @@ -46,14 +46,25 @@ MainSource - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/Source/Modulos/Formas de pago/Controller/FormasPago_controller.rc b/Source/Modulos/Formas de pago/Controller/FormasPago_controller.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Formas de pago/Controller/FormasPago_controller.rc +++ b/Source/Modulos/Formas de pago/Controller/FormasPago_controller.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Formas de pago/Controller/FormasPago_controller.res b/Source/Modulos/Formas de pago/Controller/FormasPago_controller.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib + DEBUG Delphi.Personality @@ -46,525 +47,14 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
DataModuleFormasPago
 - diff --git a/Source/Modulos/Formas de pago/Data/FormasPago_data.rc b/Source/Modulos/Formas de pago/Data/FormasPago_data.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Formas de pago/Data/FormasPago_data.rc +++ b/Source/Modulos/Formas de pago/Data/FormasPago_data.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Formas de pago/Data/FormasPago_data.res b/Source/Modulos/Formas de pago/Data/FormasPago_data.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5 MainSource - - - - - - - - - - - - - - - - - - - diff --git a/Source/Modulos/Formas de pago/Model/FormasPago_model.res b/Source/Modulos/Formas de pago/Model/FormasPago_model.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dpk b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dpk index 702bca7c..8e486515 100644 --- a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dpk +++ b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dpk @@ -23,6 +23,7 @@ package FormasPago_plugin; {$MINENUMSIZE 1} {$IMAGEBASE $400000} {$IMPLICITBUILD ON} +{$DEFINE DEBUG} requires rtl, diff --git a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj index bac5f0a5..e6a2ae38 100644 --- a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj +++ b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj @@ -34,6 +34,7 @@ ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib + DEBUG Delphi.Personality @@ -46,527 +47,15 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - diff --git a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.rc b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.rc +++ b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.res b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib + DEBUG Delphi.Personality @@ -47,48 +48,12 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
fEditorFormaPago
 @@ -96,8 +61,10 @@
fEditorFormasPago
 + + diff --git a/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dpk b/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dpk index ce61896a..5d6dbe51 100644 --- a/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dpk +++ b/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dpk @@ -28,6 +28,9 @@ requires rtl, vcl, PluginSDK_D10R, + Base, + GUIBase, + ApplicationBase, TiposIVA_model, TiposIVA_controller, TiposIVA_view; diff --git a/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj b/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj index 3339fa69..a50bc0c9 100644 --- a/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj +++ b/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj @@ -40,23 +40,27 @@ Delphi.Personality Package -FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0TiposIVA_plugin.dpk +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0TiposIVA_plugin.dpk MainSource + + + + - - + + + - diff --git a/Source/Modulos/Tipos de IVA/TiposIVA_Group.groupproj b/Source/Modulos/Tipos de IVA/TiposIVA_Group.groupproj index 386d722a..82224ea8 100644 --- a/Source/Modulos/Tipos de IVA/TiposIVA_Group.groupproj +++ b/Source/Modulos/Tipos de IVA/TiposIVA_Group.groupproj @@ -4,9 +4,9 @@ + - - + @@ -17,7 +17,7 @@ Default.Personality - + @@ -29,22 +29,22 @@ - + - + - + - - + + - - + + - - + + @@ -92,13 +92,13 @@ - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dpk b/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dpk index acf5d8a7..6446b0fc 100644 --- a/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dpk +++ b/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dpk @@ -28,10 +28,11 @@ requires rtl, vcl, Base, + GUIBase, + ApplicationBase, TiposIVA_model, TiposIVA_data, - TiposIVA_controller, - JvCmpD11R; + TiposIVA_controller; contains uTiposIVAViewRegister in 'uTiposIVAViewRegister.pas', diff --git a/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dproj b/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dproj index 7d31171c..25a82069 100644 --- a/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dproj +++ b/Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dproj @@ -40,26 +40,20 @@ Delphi.Personality Package -FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0TiposIVA_view.dpk +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0TiposIVA_view.dpk MainSource + - + - -
fEditorTipoIVA
- - -
fEditorTiposIVA
- - diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 9f93a263659f9fa842b90c55df6b3624dd505838..3855865612fadc8a09de817006be1b670a854aa0 100644 GIT binary patch delta 23 ecmZ3om2t^d#tk7+oJI`B3|0)L45pJ~quc>q8V0ri delta 23 dcmZ3om2t^d#tk7+oQ4dR3|0(4a&l~xI{;lr2D<