diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas
index c1ef3fe3..6b47b0e2 100644
--- a/Source/ApplicationBase/uFactuGES_App.pas
+++ b/Source/ApplicationBase/uFactuGES_App.pas
@@ -120,6 +120,7 @@ type
procedure AfterLoadModule(Sender: TObject; AModuleInfo: TModuleInfo);
procedure RegisterModule(AModuleInfo : TModuleInfo);
+ procedure PonerTiendaPorDefecto;
protected
procedure DoMainForm;
@@ -212,18 +213,20 @@ begin
end;
procedure TAppFactuGES.CargarModulos;
-var
- Fichero : String;
begin
if not Assigned(FDoLoadModulesEvent) then
raise Exception.Create('Evento para la carga de los módulos de la aplicación no asignado (CargarModulos)');
FDoLoadModulesEvent();
+end;
+
//TEMPORAL
+procedure TAppFactuGES.PonerTiendaPorDefecto;
+var
+ Fichero : String;
+begin
Fichero := ExtractFileDir(ParamStr(0))+ '\' + 'FACTUGES.INI';
- if not FileExists(Fichero) then
- raise Exception.Create('No se ha encontrado el fichero de configuración' + #10#13 + Fichero);
with TIniFile.Create(Fichero) do
begin
@@ -231,7 +234,6 @@ begin
VAR_TIENDA := ReadString ('VARIABLES', 'Tienda', 'Todas');
Free;
end;
-
end;
constructor TAppFactuGES.Create;
@@ -389,12 +391,13 @@ begin
//ShowSplashForm;
CargarModulos;
DoMainForm;
+ PonerTiendaPorDefecto;
finally
HideHourglassCursor;
HideSplashForm;
end;
- end;
- Application.Run;
+ Application.Run;
+ end;
Terminate;
end;
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 8706ea4f..63747715 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,6 +44,13 @@
Package
FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
+
+
+
+
+
+
+
VCL for the Web Design Package for CodeGear RAD Studio
CodeGear WebSnap Components
CodeGear SOAP Components
@@ -58,48 +65,48 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm
index 59acd12a..710cebe7 100644
--- a/Source/Cliente/uPantallaPrincipal.dfm
+++ b/Source/Cliente/uPantallaPrincipal.dfm
@@ -2,8 +2,8 @@ object fPantallaPrincipal: TfPantallaPrincipal
Left = 358
Top = 250
Caption = 'Pantalla principal'
- ClientHeight = 601
- ClientWidth = 751
+ ClientHeight = 599
+ ClientWidth = 836
Color = clWindow
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -14,7 +14,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
OldCreateOrder = False
Position = poScreenCenter
Visible = True
- WindowState = wsMaximized
OnClose = FormClose
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate
@@ -24,8 +23,8 @@ object fPantallaPrincipal: TfPantallaPrincipal
object pnlContenido: TTBXAlignmentPanel
Left = 0
Top = 0
- Width = 751
- Height = 579
+ Width = 836
+ Height = 577
Margins.Left = 5
Margins.Top = 5
Margins.Right = 5
@@ -33,11 +32,13 @@ object fPantallaPrincipal: TfPantallaPrincipal
ParentColor = True
Align = alClient
TabOrder = 0
+ ExplicitWidth = 751
+ ExplicitHeight = 579
object JvSyncSplitter1: TJvSyncSplitter
Left = 215
Top = 5
Width = 5
- Height = 569
+ Height = 567
ResizeStyle = rsPattern
ExplicitLeft = 210
ExplicitHeight = 570
@@ -46,7 +47,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
Left = 5
Top = 5
Width = 210
- Height = 569
+ Height = 567
ActivePage = pagInicio
Align = alLeft
AutoHeaders = True
@@ -87,11 +88,12 @@ object fPantallaPrincipal: TfPantallaPrincipal
NavPanelHotTrackFont.Style = []
SmallImages = ModulesSmallImageList
OnChange = JvNavigationPaneChange
+ ExplicitHeight = 569
object pagInicio: TJvNavPanelPage
Left = 0
Top = 0
Width = 208
- Height = 496
+ Height = 494
Background.Stretch = False
Background.Proportional = False
Background.Center = False
@@ -99,15 +101,17 @@ object fPantallaPrincipal: TfPantallaPrincipal
Background.Transparent = False
Caption = 'Inicio'
ImageIndex = 0
+ ExplicitHeight = 496
object Panel1: TPanel
Left = 0
- Top = 410
+ Top = 408
Width = 208
Height = 86
Align = alBottom
Color = clWindow
ParentBackground = False
TabOrder = 1
+ ExplicitTop = 410
object Label1: TLabel
Left = 38
Top = 29
@@ -154,20 +158,24 @@ object fPantallaPrincipal: TfPantallaPrincipal
object pnlBorde: TJvXPContainer
Left = 220
Top = 5
- Width = 526
- Height = 569
+ Width = 611
+ Height = 567
BoundColor = clActiveCaption
BoundLines = [blLeft, blTop, blRight, blBottom]
Caption = 'pnlBorde'
Align = alClient
+ ExplicitWidth = 526
+ ExplicitHeight = 569
object pnlMain: TTBXAlignmentPanel
Left = 1
Top = 1
- Width = 524
- Height = 567
+ Width = 609
+ Height = 565
Align = alClient
Color = clWindow
TabOrder = 0
+ ExplicitWidth = 524
+ ExplicitHeight = 567
object lblBienvenido: TLabel
Left = 8
Top = 8
@@ -204,8 +212,8 @@ object fPantallaPrincipal: TfPantallaPrincipal
end
object TBXStatusBar1: TTBXStatusBar
Left = 0
- Top = 579
- Width = 751
+ Top = 577
+ Width = 836
Images = StatusPanelImageList
Panels = <
item
@@ -226,6 +234,8 @@ object fPantallaPrincipal: TfPantallaPrincipal
Tag = 0
end>
UseSystemFont = False
+ ExplicitTop = 579
+ ExplicitWidth = 751
end
object XPManifest1: TXPManifest
Left = 248
@@ -518,6 +528,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
object JvFormStorage: TJvFormStorage
AppStorage = JvAppRegistryStorage
AppStoragePath = 'fPantallaPrincipal\'
+ Options = []
VersionCheck = fpvcNocheck
StoredProps.Strings = (
'JvNavigationPane.Visible'
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 0b92d3c0..a00f5062 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -185,6 +185,12 @@ end;
procedure TfPantallaPrincipal.FormShow(Sender: TObject);
begin
InicializarUI;
+
+ { Go full screen }
+ WindowState := wsmaximized;
+ ClientWidth := Screen.Width ;
+ ClientHeight := Screen.Height;
+ Refresh;
end;
procedure TfPantallaPrincipal.RefrescarUI;
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index b4bbe1e1..630e0107 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -50,30 +50,30 @@
Delphi.Personality
Package
-FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0GUIBase.dpk
+FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0GUIBase.dpk
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 8b251f31..1641339f 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm
index 1d32df43..8a20caa8 100644
--- a/Source/GUIBase/uEditorBase.dfm
+++ b/Source/GUIBase/uEditorBase.dfm
@@ -2,8 +2,8 @@ object fEditorBase: TfEditorBase
Left = 222
Top = 127
Caption = 'EditorBase'
- ClientHeight = 456
- ClientWidth = 793
+ ClientHeight = 509
+ ClientWidth = 946
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -23,7 +23,7 @@ object fEditorBase: TfEditorBase
object JvNavPanelHeader: TJvNavPanelHeader
Left = 0
Top = 49
- Width = 793
+ Width = 946
Align = alTop
Caption = 'Editor'
Font.Charset = DEFAULT_CHARSET
@@ -37,9 +37,9 @@ object fEditorBase: TfEditorBase
ImageIndex = 0
StyleManager = dmBase.StyleManager
ParentStyleManager = False
- ExplicitWidth = 795
+ ExplicitWidth = 793
object Image1: TImage
- Left = 768
+ Left = 919
Top = 0
Width = 27
Height = 27
@@ -71,9 +71,9 @@ object fEditorBase: TfEditorBase
object TBXDock: TTBXDock
Left = 0
Top = 0
- Width = 793
+ Width = 946
Height = 49
- ExplicitWidth = 795
+ ExplicitWidth = 793
object tbxMain: TTBXToolbar
Left = 0
Top = 23
@@ -246,12 +246,12 @@ object fEditorBase: TfEditorBase
end
object StatusBar: TJvStatusBar
Left = 0
- Top = 437
- Width = 793
+ Top = 490
+ Width = 946
Height = 19
Panels = <>
- ExplicitTop = 439
- ExplicitWidth = 795
+ ExplicitTop = 437
+ ExplicitWidth = 793
end
object EditorActionList: TActionList
Images = SmallImages
@@ -1665,6 +1665,7 @@ object fEditorBase: TfEditorBase
object JvFormStorage: TJvFormStorage
AppStorage = JvAppRegistryStorage
AppStoragePath = 'fEditorBase\'
+ Options = []
VersionCheck = fpvcNocheck
StoredValues = <>
Left = 392
diff --git a/Source/GUIBase/uEditorDBBase.dfm b/Source/GUIBase/uEditorDBBase.dfm
index 17a586d2..2d7383e6 100644
--- a/Source/GUIBase/uEditorDBBase.dfm
+++ b/Source/GUIBase/uEditorDBBase.dfm
@@ -29,7 +29,6 @@ inherited fEditorDBBase: TfEditorDBBase
inherited StatusBar: TJvStatusBar
Top = 435
Width = 646
- ExplicitTop = 437
ExplicitWidth = 648
end
inherited EditorActionList: TActionList
diff --git a/Source/GUIBase/uEditorGridBase.dfm b/Source/GUIBase/uEditorGridBase.dfm
index 23d50433..addf1687 100644
--- a/Source/GUIBase/uEditorGridBase.dfm
+++ b/Source/GUIBase/uEditorGridBase.dfm
@@ -718,7 +718,7 @@ inherited fEditorGridBase: TfEditorGridBase
Name = 'PngImage21'
Background = clWindow
end>
- Left = 403
+ Left = 411
Top = 128
Bitmap = {}
end
@@ -1510,14 +1510,14 @@ inherited fEditorGridBase: TfEditorGridBase
Name = 'PngImage21'
Background = clWindow
end>
- Left = 435
+ Left = 443
Top = 128
Bitmap = {}
end
inherited JvFormStorage: TJvFormStorage
OnSavePlacement = JvFormStorageSavePlacement
OnRestorePlacement = JvFormStorageRestorePlacement
- Left = 400
+ Left = 408
Top = 160
end
inherited dsDataTable: TDADataSource
@@ -1525,7 +1525,7 @@ inherited fEditorGridBase: TfEditorGridBase
Top = 112
end
inherited JvAppRegistryStorage: TJvAppRegistryStorage
- Left = 432
+ Left = 440
Top = 160
end
object GridPopupMenu: TPopupMenu
diff --git a/Source/Modulos/Contactos/Data/Contactos_data.res b/Source/Modulos/Contactos/Data/Contactos_data.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Contactos/Data/Contactos_data.res and b/Source/Modulos/Contactos/Data/Contactos_data.res differ
diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
index f3f6f90a..cb2a0008 100644
--- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
+++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
@@ -3,7 +3,7 @@ unit schContactosClient_Intf;
interface
uses
- Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+ Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
const
{ Data table rules ids
@@ -541,7 +541,7 @@ type
end;
{ TSubCuentasContactoDataTableRules }
- TSubCuentasContactoDataTableRules = class(TDADataTableRules, ISubCuentasContacto)
+ TSubCuentasContactoDataTableRules = class(TIntfObjectDADataTableRules, ISubCuentasContacto)
private
protected
{ Property getters and setters }
@@ -749,7 +749,7 @@ type
end;
{ TContactosDataTableRules }
- TContactosDataTableRules = class(TDADataTableRules, IContactos)
+ TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -935,7 +935,7 @@ type
end;
{ TGruposClienteDataTableRules }
- TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente)
+ TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente)
private
protected
{ Property getters and setters }
@@ -1024,7 +1024,7 @@ type
end;
{ TDatosBancariosDataTableRules }
- TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios)
+ TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios)
private
protected
{ Property getters and setters }
@@ -1334,7 +1334,7 @@ type
end;
{ TClientesDataTableRules }
- TClientesDataTableRules = class(TDADataTableRules, IClientes)
+ TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -1825,7 +1825,7 @@ type
end;
{ TProveedoresDataTableRules }
- TProveedoresDataTableRules = class(TDADataTableRules, IProveedores)
+ TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -2276,7 +2276,7 @@ type
end;
{ TEmpleadosDataTableRules }
- TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados)
+ TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados)
private
f_NOTAS: IROStrings;
f_FORMACION_BASE: IROStrings;
@@ -2603,7 +2603,7 @@ type
end;
{ TDireccionesContactoDataTableRules }
- TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto)
+ TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -2759,7 +2759,7 @@ type
end;
{ TClientesDescuentosDataTableRules }
- TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos)
+ TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos)
private
protected
{ Property getters and setters }
@@ -2824,7 +2824,7 @@ type
end;
{ TProcedenciasClienteDataTableRules }
- TProcedenciasClienteDataTableRules = class(TDADataTableRules, IProcedenciasCliente)
+ TProcedenciasClienteDataTableRules = class(TIntfObjectDADataTableRules, IProcedenciasCliente)
private
protected
{ Property getters and setters }
@@ -2871,7 +2871,7 @@ type
end;
{ TGruposProveedorDataTableRules }
- TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor)
+ TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor)
private
protected
{ Property getters and setters }
@@ -2918,7 +2918,7 @@ type
end;
{ TGruposEmpleadoDataTableRules }
- TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado)
+ TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado)
private
protected
{ Property getters and setters }
@@ -3078,7 +3078,7 @@ type
end;
{ TContactos_RefreshDataTableRules }
- TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh)
+ TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
diff --git a/Source/Servicios/RODLFILE.res b/Source/Servicios/RODLFILE.res
index bbf8d508..85f38fb9 100644
Binary files a/Source/Servicios/RODLFILE.res and b/Source/Servicios/RODLFILE.res differ
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 9f04790d..971dcb1e 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index fda7b3b6..8e4b531c 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -30,6 +30,9 @@
FalseTrueFalseTrueFalse2190FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.9.0FactuGES (Servidor)2.1.9.0miércoles, 09 de abril de 2008 20:40
+
+
+
RemObjects Pascal Script - RemObjects SDK 3.0 Integration
FactuGES_Server.dpr
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 98044f8d..4ec51495 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.1.9.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.1.9.0\0"
- VALUE "CompileDate", "miércoles, 23 de abril de 2008 12:32\0"
+ VALUE "CompileDate", "jueves, 24 de abril de 2008 11:59\0"
END
END
BLOCK "VarFileInfo"