diff --git a/Build/Installer.fbl6 b/Build/Installer.fbl6
index 4a190b7..f244ae1 100644
Binary files a/Build/Installer.fbl6 and b/Build/Installer.fbl6 differ
diff --git a/Build/Installer.fbpInf b/Build/Installer.fbpInf
index da9b90a..65c346d 100644
--- a/Build/Installer.fbpInf
+++ b/Build/Installer.fbpInf
@@ -6,7 +6,7 @@
-
+
@@ -14,8 +14,8 @@
- 00:00:00
- 30/12/1899
- True
+ 00:08:17
+ 27/07/2011 16:10:24
+ False
diff --git a/Build/Installer.fbz6 b/Build/Installer.fbz6
index d503aad..0a8a8f0 100644
Binary files a/Build/Installer.fbz6 and b/Build/Installer.fbz6 differ
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
index 93585fb..d8a4ca9 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
@@ -3,7 +3,7 @@ inherited fEditorEmpresa: TfEditorEmpresa
Top = 291
HorzScrollBar.Visible = False
VertScrollBar.Visible = False
- Caption = 'Ficha de empresa'
+ Caption = 'Ficha del farmac'#233'utico'
ClientHeight = 554
ClientWidth = 674
Scaled = False
@@ -13,7 +13,7 @@ inherited fEditorEmpresa: TfEditorEmpresa
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 674
- Caption = 'Empresa'
+ Caption = 'Farmac'#233'utico'
ExplicitWidth = 674
inherited Image1: TImage
Left = 541
@@ -352,18 +352,6 @@ inherited fEditorEmpresa: TfEditorEmpresa
inherited ToolBar1: TToolBar
Width = 660
ExplicitWidth = 660
- inherited ToolButton1: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton4: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton2: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton7: TToolButton
- ExplicitWidth = 113
- end
end
end
end
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas
index 4bf25c8..561834c 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas
+++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas
@@ -25,6 +25,7 @@ type
procedure FormShow(Sender: TObject);
procedure actRefrescarUpdate(Sender: TObject);
procedure dsDataTableDataChange(Sender: TObject; Field: TField);
+ procedure actEliminarUpdate(Sender: TObject);
private
FController : IEmpresasController;
FEmpresa: IBizEmpresa;
@@ -54,6 +55,7 @@ type
implementation
{$R *.dfm}
+{$INCLUDE ..\..\..\Etiquetas.inc}
uses
uCustomEditor, uDataModuleEmpresas;
@@ -94,9 +96,9 @@ begin
if (ATitulo = '') and Assigned(FEmpresa) then
begin
if Length(FEmpresa.Nombre) = 0 then
- FTitulo := 'Nueva empresa'
+ FTitulo := 'Nuevo farmacéutico'
else
- FTitulo := 'Empresa' + ' - ' + FEmpresa.Nombre
+ FTitulo := 'Farmacéutico' + ' - ' + FEmpresa.Nombre
end;
inherited PonerTitulos(FTitulo);
@@ -141,13 +143,23 @@ begin
raise Exception.Create('No hay ninguna vista asignada');
if not Assigned(Empresa) then
- raise Exception.Create('No hay ningún Empresa asignado');
+ raise Exception.Create('No hay ningún farmacéutico asignado');
Empresa.DataTable.Active := True;
+
// FViewEmpresa.ShowEmbedded(pagGeneral);
FViewEmpresa.SetFocus;
end;
+procedure TfEditorEmpresa.actEliminarUpdate(Sender: TObject);
+begin
+ {$IFDEF MULTIEMPRESA}
+ inherited;
+ {$ELSE}
+ (Sender as TAction).Enabled := False;
+ {$ENDIF}
+end;
+
procedure TfEditorEmpresa.actRefrescarUpdate(Sender: TObject);
begin
if Assigned(dsDataTable.DataTable) then
@@ -183,7 +195,10 @@ end;
procedure TfEditorEmpresa.EliminarInterno;
begin
inherited;
- FController.Eliminar(FEmpresa);
+ {$IFDEF MULTIEMPRESA}
+ FController.Eliminar(FEmpresa);
+ {$ELSE}
+ {$ENDIF}
end;
end.
diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
index 4681127..df37140 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
@@ -477,12 +477,14 @@ inherited frViewEmpresa: TfrViewEmpresa
object dxLayoutControl1Item15: TdxLayoutItem
Caption = 'Registro mercantil:'
CaptionOptions.AlignVert = tavTop
+ Visible = False
Control = memRegistroMercantil
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Group13: TdxLayoutGroup
Caption = 'Datos cat'#225'logo art'#237'culos'
+ Visible = False
LayoutDirection = ldHorizontal
object dxLayoutControl1Item18: TdxLayoutItem
Caption = 'Margen de venta:'
@@ -585,6 +587,7 @@ inherited frViewEmpresa: TfrViewEmpresa
end
object dxLayoutControl1Group5: TdxLayoutGroup
Caption = 'Correo electr'#243'nico e internet'
+ Visible = False
object dxLayoutControl1Item7: TdxLayoutItem
Caption = 'Correo de trabajo:'
Control = eMailTrabajo
@@ -647,8 +650,8 @@ inherited frViewEmpresa: TfrViewEmpresa
end
end
object DADataSource: TDADataSource
- Left = 16
- Top = 56
+ Left = 24
+ Top = 104
end
object ActionList1: TActionList
Images = SmallImages
@@ -716,6 +719,6 @@ inherited frViewEmpresa: TfrViewEmpresa
end
object OpenDialog1: TOpenDialog
Left = 384
- Top = 256
+ Top = 280
end
end
diff --git a/Source/Cliente/Utiles/uClienteUtils.pas b/Source/Cliente/Utiles/uClienteUtils.pas
index 2f5827d..89184e3 100644
--- a/Source/Cliente/Utiles/uClienteUtils.pas
+++ b/Source/Cliente/Utiles/uClienteUtils.pas
@@ -12,7 +12,7 @@ implementation
function EsUnModulo(AMenuItem : TMenuItem) : Boolean;
begin
- Result := (AMenuItem.Tag >= 0) and (AMenuItem.Tag < 9000)
+ Result := (AMenuItem.Tag >= 0) and (AMenuItem.Tag < 9000);
end;
diff --git a/Source/Cliente/Utiles/uNavPaneUtils.pas b/Source/Cliente/Utiles/uNavPaneUtils.pas
index 7e9658c..206ab61 100644
--- a/Source/Cliente/Utiles/uNavPaneUtils.pas
+++ b/Source/Cliente/Utiles/uNavPaneUtils.pas
@@ -14,7 +14,7 @@ implementation
uses
ComCtrls, Classes, Math, TBXDkPanels, StrUtils, SysUtils,
- ExtCtrls, Graphics, Dialogs;
+ ExtCtrls, Graphics, Dialogs, uClienteUtils;
procedure PopulateNavPagePane(AParentControl : TWinControl;
@@ -28,7 +28,8 @@ begin
for ItemIndex := 0 to (AMenuItem.Count - 1) do
begin
if ((not AMenuItem[ItemIndex].IsLine) // que no sea una línea separadora
- and (AMenuItem[ItemIndex].Count = 0)) // y que no sea el padre de un submenú
+ and (AMenuItem[ItemIndex].Count = 0) // y que no sea el padre de un submenú
+ and EsUnModulo(AMenuItem[ItemIndex]))
then
with TTBXLink.Create(Application) do
begin
diff --git a/Source/Cliente/uAcercaDe.pas b/Source/Cliente/uAcercaDe.pas
index d579690..312711e 100644
--- a/Source/Cliente/uAcercaDe.pas
+++ b/Source/Cliente/uAcercaDe.pas
@@ -42,7 +42,7 @@ begin
try
with Obj do
begin
- memModulos.Lines.Add(ProductName + ' - Versi¢n ' + FileVersion);
+ memModulos.Lines.Add(ProductName + ' - Versión ' + FileVersion);
memModulos.Lines.Add(CompanyName);
memModulos.Lines.Add('');
{ memModulos.Lines.Add('Se autoriza el uso de este programa a:');
@@ -56,7 +56,7 @@ begin
begin
memModulos.Lines.Add('');
memModulos.Lines.Add('');
- memModulos.Lines.Add('M¢dulos disponibles:');
+ memModulos.Lines.Add('Módulos disponibles:');
for i := 0 to (HostManager.ModulesCount - 1) do
memModulos.Lines.Add(' - ' + FHostManager.Modules[i].Module.ModuleName +
' - v. ' + FHostManager.Modules[i].Module.Version);
diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm
index 5e12076..f297f26 100644
--- a/Source/Cliente/uPantallaPrincipal.dfm
+++ b/Source/Cliente/uPantallaPrincipal.dfm
@@ -34,7 +34,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
ParentColor = True
Align = alClient
TabOrder = 0
- ExplicitHeight = 531
object JvSyncSplitter1: TJvSyncSplitter
Left = 215
Top = 5
@@ -89,7 +88,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
NavPanelHotTrackFont.Style = []
SmallImages = ModulesSmallImageList
OnChange = JvNavigationPaneChange
- ExplicitHeight = 521
object pagInicio: TJvNavPanelPage
Left = 0
Top = 0
@@ -102,7 +100,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
Background.Transparent = False
Caption = 'Inicio'
ImageIndex = 0
- ExplicitHeight = 448
object Panel1: TPanel
Left = 0
Top = 382
@@ -112,7 +109,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
Color = clWindow
ParentBackground = False
TabOrder = 1
- ExplicitTop = 362
object Label1: TLabel
Left = 38
Top = 29
@@ -165,7 +161,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
BoundLines = [blLeft, blTop, blRight, blBottom]
Caption = 'pnlBorde'
Align = alClient
- ExplicitHeight = 521
object pnlMain: TTBXAlignmentPanel
Left = 1
Top = 1
@@ -174,7 +169,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
Align = alClient
Color = clWindow
TabOrder = 0
- ExplicitHeight = 519
object lblBienvenido: TLabel
Left = 8
Top = 8
@@ -232,7 +226,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
Tag = 0
end>
UseSystemFont = False
- ExplicitTop = 531
end
object XPManifest1: TXPManifest
Left = 248
@@ -290,7 +283,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
object actMenuVentas: TAction
Category = 'Menus'
Caption = 'Ventas'
- OnExecute = actMenuVentasExecute
OnUpdate = actMenuComprasUpdate
end
object actVerPanel: TAction
@@ -316,8 +308,9 @@ object fPantallaPrincipal: TfPantallaPrincipal
OnUpdate = actMenuComprasUpdate
end
object actInformacionEmpresa: TAction
- Category = 'Empresa'
- Caption = 'Informaci'#243'n de empresa'
+ Category = 'Farmac'#233'utico'
+ Caption = 'Farmac'#233'utico'
+ ImageIndex = 0
OnExecute = actInformacionEmpresaExecute
OnUpdate = actMenuComprasUpdate
end
@@ -517,114 +510,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
Left = 160
Top = 182
end
- object HostMenu: TJvMainMenu
- Images = ModulesSmallImageList
- Style = msItemPainter
- ImageMargin.Left = 0
- ImageMargin.Top = 0
- ImageMargin.Right = 0
- ImageMargin.Bottom = 0
- ImageSize.Height = 0
- ImageSize.Width = 0
- ItemPainter = JvXPMenuItemPainter1
- Left = 248
- Top = 168
- object Archivo2_OLD: TMenuItem
- Tag = -90000
- Caption = 'Archivo'
- object Cambiarmicontrasea2_OLD: TMenuItem
- Tag = 1
- Action = actCambiarPass
- end
- object N3_OLD: TMenuItem
- Tag = 2
- Caption = '-'
- end
- object Paneldeadministracin2_OLD: TMenuItem
- Tag = 4
- Action = actAdministracion
- Visible = False
- end
- object N4_OLD: TMenuItem
- Tag = 5
- Caption = '-'
- end
- object Salir2_OLD: TMenuItem
- Tag = 6
- Action = actSalir
- end
- end
- object Edicin1_OLD: TMenuItem
- Tag = -80000
- Caption = 'Ver'
- object Paneldeexploracin1: TMenuItem
- Action = actVerPanel
- end
- object Paneldeexploracin2: TMenuItem
- Tag = 1
- Action = actVerBarraEstado
- end
- end
- object Opciones1_OLD: TMenuItem
- Tag = -70000
- Caption = 'Opciones'
- object Configurarconexin2_OLD: TMenuItem
- Tag = 101
- Action = actConexion
- end
- object N2: TMenuItem
- Tag = 102
- Caption = '-'
- end
- object Administracin1: TMenuItem
- Tag = 200
- Caption = 'Administraci'#243'n'
- object Usuarios1: TMenuItem
- Tag = 1
- Caption = 'Usuarios'
- OnClick = Usuarios1Click
- end
- object Perfiles1: TMenuItem
- Tag = 2
- Caption = 'Perfiles de usuario'
- OnClick = Perfiles1Click
- end
- end
- end
- object Ayuda2_OLD: TMenuItem
- Tag = -60000
- Caption = 'Ayuda'
- object Acercade2_OLD: TMenuItem
- Action = actAcerca
- end
- end
- object N1: TMenuItem
- Tag = -1
- Caption = '|'
- end
- object Empresa1_OLD: TMenuItem
- Tag = 1000
- Caption = 'Empresa'
- object Listadeempresas1_OLD: TMenuItem
- Caption = 'Selecci'#243'n de empresas'
- OnClick = Listadeempresas1_OLDClick
- end
- object N1_OLD: TMenuItem
- Tag = 100
- Caption = '-'
- end
- object Informacindeempresa1: TMenuItem
- Tag = 10
- Action = actInformacionEmpresa
- end
- end
- end
- object JvXPMenuItemPainter1: TJvXPMenuItemPainter
- SelectionFrameBrush.Color = 13811126
- SelectionFramePen.Color = 6956042
- Left = 288
- Top = 168
- end
object StatusPanelImageList: TPngImageList
PngImages = <
item
@@ -682,30 +567,42 @@ object fPantallaPrincipal: TfPantallaPrincipal
Bitmap = {}
end
object MainMenu1: TMainMenu
- Left = 352
- Top = 168
+ Left = 344
+ Top = 128
object Archivo1: TMenuItem
- Tag = -9000
+ Tag = 1
Caption = '&Archivo'
+ object Informacindeempresa2: TMenuItem
+ Tag = 100
+ Action = actInformacionEmpresa
+ end
+ object Datos1: TMenuItem
+ Tag = 200
+ Caption = 'Datos'
+ end
+ object N4: TMenuItem
+ Tag = 18000
+ Caption = '-'
+ end
+ object Cambiarmicontrasea1: TMenuItem
+ Tag = 19000
+ Action = actCambiarPass
+ end
object Configurarconexin1: TMenuItem
- Tag = 1
+ Tag = 19001
Action = actConexion
end
- object Paneldeadministracin1: TMenuItem
- Tag = 2
- Action = actAdministracion
- end
object N3: TMenuItem
- Tag = 3
+ Tag = 19003
Caption = '-'
end
object Salir1: TMenuItem
- Tag = 4
+ Tag = 19004
Action = actSalir
end
end
object Ver1: TMenuItem
- Tag = 7000
+ Tag = 10000
Caption = '&Ver'
object Paneldeexploracin3: TMenuItem
Tag = 1
@@ -716,12 +613,8 @@ object fPantallaPrincipal: TfPantallaPrincipal
Action = actVerBarraEstado
end
end
- object Opciones1: TMenuItem
- Tag = 8000
- Caption = '&Opciones'
- end
object Acerca1: TMenuItem
- Tag = 9000
+ Tag = 20000
Action = actAcerca
end
end
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index faf26fd..2da89dc 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -39,27 +39,10 @@ type
actConexion: TAction;
actAcerca: TAction;
pnlBorde: TJvXPContainer;
- HostMenu: TJvMainMenu;
- JvXPMenuItemPainter1: TJvXPMenuItemPainter;
- Archivo2_OLD: TMenuItem;
- Ayuda2_OLD: TMenuItem;
- Cambiarmicontrasea2_OLD: TMenuItem;
- N3_OLD: TMenuItem;
- Configurarconexin2_OLD: TMenuItem;
- Paneldeadministracin2_OLD: TMenuItem;
- N4_OLD: TMenuItem;
- Salir2_OLD: TMenuItem;
- Acercade2_OLD: TMenuItem;
lblBienvenido: TLabel;
Label22: TLabel;
TBXStatusBar1: TTBXStatusBar;
StatusPanelImageList: TPngImageList;
- Empresa1_OLD: TMenuItem;
- Listadeempresas1_OLD: TMenuItem;
- N1_OLD: TMenuItem;
- Opciones1_OLD: TMenuItem;
- Edicin1_OLD: TMenuItem;
- N1: TMenuItem;
actMenuCompras: TAction;
actMenuLogistica: TAction;
actMenuVentas: TAction;
@@ -69,27 +52,22 @@ type
Image1: TImage;
actVerPanel: TAction;
actVerBarraEstado: TAction;
- Paneldeexploracin1: TMenuItem;
- Paneldeexploracin2: TMenuItem;
- Informacindeempresa1: TMenuItem;
- Administracin1: TMenuItem;
- N2: TMenuItem;
- Usuarios1: TMenuItem;
- Perfiles1: TMenuItem;
actMenuEmpresa: TAction;
actMenuInformes: TAction;
actInformacionEmpresa: TAction;
MainMenu1: TMainMenu;
Archivo1: TMenuItem;
Ver1: TMenuItem;
- Opciones1: TMenuItem;
Acerca1: TMenuItem;
N3: TMenuItem;
Salir1: TMenuItem;
Paneldeexploracin3: TMenuItem;
Barradeestado1: TMenuItem;
Configurarconexin1: TMenuItem;
- Paneldeadministracin1: TMenuItem;
+ N4: TMenuItem;
+ Informacindeempresa2: TMenuItem;
+ Cambiarmicontrasea1: TMenuItem;
+ Datos1: TMenuItem;
procedure FormCreate(Sender: TObject);
procedure Salir1Click(Sender: TObject);
procedure actSalirExecute(Sender: TObject);
@@ -102,7 +80,6 @@ type
procedure actMenuComprasExecute(Sender: TObject);
procedure actMenuComprasUpdate(Sender: TObject);
procedure actMenuLogisticaExecute(Sender: TObject);
- procedure actMenuVentasExecute(Sender: TObject);
procedure actActualizacionesExecute(Sender: TObject);
procedure actVerPanelUpdate(Sender: TObject);
procedure actVerPanelExecute(Sender: TObject);
@@ -241,11 +218,6 @@ begin
Close;
end;
-procedure TfPantallaPrincipal.actMenuVentasExecute(Sender: TObject);
-begin
- //
-end;
-
procedure TfPantallaPrincipal.actVerBarraEstadoExecute(Sender: TObject);
begin
TBXStatusBar1.Visible := not TBXStatusBar1.Visible;
@@ -511,11 +483,6 @@ constructor TfPantallaPrincipal.Create(AOwner: TComponent);
begin
inherited;
- {$IFDEF MULTIEMPRESA}
- {$ELSE}
- Listadeempresas1_OLD.Destroy;
- {$ENDIF}
-
FContenido := NIL;
with AppFactuGES.ModuleManager do
diff --git a/Source/GUIBase/GUIBase.identcache b/Source/GUIBase/GUIBase.identcache
index 6ba7aed..5ad8345 100644
Binary files a/Source/GUIBase/GUIBase.identcache and b/Source/GUIBase/GUIBase.identcache differ
diff --git a/Source/GUIBase/uViewBase.pas b/Source/GUIBase/uViewBase.pas
index f3ea698..1beca83 100644
--- a/Source/GUIBase/uViewBase.pas
+++ b/Source/GUIBase/uViewBase.pas
@@ -8,14 +8,13 @@ uses
type
IViewBase = interface(ICustomView)
- ['{82FBDF28-9C5F-4922-952E-0E84D67FE4BB}']
+ ['{724D4E2A-909F-418A-9677-8A7B825D639A}']
procedure Refresh;
end;
TfrViewBase = class(TCustomView, IViewBase)
protected
procedure SetReadOnly(Value: Boolean); override;
-
public
procedure Refresh; virtual;
end;
diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm
index fecbcd7..4525e24 100644
--- a/Source/GUIBase/uViewGrid.dfm
+++ b/Source/GUIBase/uViewGrid.dfm
@@ -16,8 +16,8 @@ inherited frViewGrid: TfrViewGrid
Font.Style = []
ParentFont = False
TabOrder = 0
- LookAndFeel.Kind = lfOffice11
- LookAndFeel.NativeStyle = False
+ LookAndFeel.Kind = lfStandard
+ LookAndFeel.NativeStyle = True
object cxGridView: TcxGridDBTableView
OnDblClick = cxGridViewDblClick
NavigatorButtons.ConfirmDelete = False
@@ -198,7 +198,7 @@ inherited frViewGrid: TfrViewGrid
PrinterPage.ScaleMode = smFit
PrinterPage._dxMeasurementUnits_ = 0
PrinterPage._dxLastMU_ = 2
- ReportDocument.CreationDate = 40859.929126655090000000
+ ReportDocument.CreationDate = 40862.560173483800000000
StyleManager = dmBase.dxPrintStyleManager1
OptionsCards.Shadow.Depth = 0
OptionsExpanding.ExpandGroupRows = True
diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas
index 5c49ae0..5ba29f5 100644
--- a/Source/GUIBase/uViewGrid.pas
+++ b/Source/GUIBase/uViewGrid.pas
@@ -24,7 +24,7 @@ uses
type
IViewGrid = interface(IViewGridBase)
- ['{72D18E2E-DF9F-4F6B-9A5A-76AC1A6C1D62}']
+ ['{D6D79E4F-15DD-439E-B1DF-7EC05300A307}']
end;
TfrViewGrid = class(TfrViewGridBase, IViewGrid)
diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.identcache b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.identcache
index e5daa19..1569e54 100644
Binary files a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.identcache and b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.identcache differ
diff --git a/Source/Modulos/Contactos/Contactos_Group.groupproj b/Source/Modulos/Contactos/Contactos_Group.groupproj
index 77573b2..6f2239b 100644
--- a/Source/Modulos/Contactos/Contactos_Group.groupproj
+++ b/Source/Modulos/Contactos/Contactos_Group.groupproj
@@ -6,9 +6,8 @@
-
+
-
@@ -94,24 +93,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -121,14 +102,23 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
index adc8a6e..8a05387 100644
--- a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
+++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
@@ -2,7 +2,7 @@ object PluginContactos: TPluginContactos
OldCreateOrder = True
Description = 'Contactos'
ModuleMenu = MainMenu
- ModuleName = 'Contactos'
+ ModuleName = 'Pacientes'
SmallImages = SmallImages
LargeImages = LargeImages
Author = 'Rodax Software'
@@ -228,16 +228,13 @@ object PluginContactos: TPluginContactos
Images = SmallImages
Left = 40
Top = 16
- object Empresa1: TMenuItem
- Caption = 'Empresa'
- GroupIndex = 1
- end
object Ventas1: TMenuItem
- Caption = 'Pacientes'
+ Caption = '&Archivo'
SubMenuImages = SmallImages
GroupIndex = 1
ImageIndex = 0
object Pacientes1: TMenuItem
+ Tag = 500
Action = actPacientes
end
end
diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas b/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
index 0d65ee2..74b1566 100644
--- a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
+++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
@@ -20,7 +20,6 @@ type
ModuleActionList: TActionList;
SmallImages: TPngImageList;
Ventas1: TMenuItem;
- Empresa1: TMenuItem;
Pacientes1: TMenuItem;
procedure actPacientesExecute(Sender: TObject);
procedure actPacientesUpdate(Sender: TObject);
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index fbfe1a2..88d8b7f 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -53,12 +53,8 @@
-
-
-
-
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.identcache b/Source/Modulos/Contactos/Views/Contactos_view.identcache
index 9b9871a..fa55325 100644
Binary files a/Source/Modulos/Contactos/Views/Contactos_view.identcache and b/Source/Modulos/Contactos/Views/Contactos_view.identcache differ
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res
index 8b251f3..1641339 100644
Binary files a/Source/Modulos/Contactos/Views/Contactos_view.res and b/Source/Modulos/Contactos/Views/Contactos_view.res differ
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
index c8ab0b2..6453257 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
@@ -4,32 +4,31 @@ inherited fEditorContacto: TfEditorContacto
HorzScrollBar.Visible = False
VertScrollBar.Visible = False
Caption = 'Ficha de contacto'
- ClientWidth = 632
+ ClientWidth = 724
Scaled = False
- ExplicitWidth = 640
- ExplicitHeight = 240
+ ExplicitWidth = 732
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
- Width = 632
+ Width = 724
Caption = 'Contacto'
ExplicitWidth = 632
inherited Image1: TImage
- Left = 499
+ Left = 591
ExplicitLeft = 607
end
inherited lblDesbloquear: TcxLabel
- Left = 534
+ Left = 626
ExplicitLeft = 534
- AnchorX = 579
+ AnchorX = 671
AnchorY = 14
end
end
inherited TBXDock: TTBXDock
- Width = 632
+ Width = 724
ExplicitWidth = 632
inherited tbxMain: TTBXToolbar
- ExplicitWidth = 488
+ ExplicitWidth = 511
inherited TBXItem2: TTBXItem
Visible = False
end
@@ -39,7 +38,7 @@ inherited fEditorContacto: TfEditorContacto
end
inherited tbxMenu: TTBXToolbar
DockPos = 0
- ExplicitWidth = 632
+ ExplicitWidth = 724
inherited TBXSubmenuItem4: TTBXSubmenuItem
inherited TBXItem8: TTBXItem
Visible = False
@@ -50,15 +49,6 @@ inherited fEditorContacto: TfEditorContacto
inherited TBXItem10: TTBXItem
Visible = False
end
- inherited TBXItem21: TTBXItem
- Visible = False
- end
- inherited TBXItem22: TTBXItem
- Visible = False
- end
- inherited TBXItem9: TTBXItem
- Visible = False
- end
end
inherited TBXSubmenuItem1: TTBXSubmenuItem
inherited TBXItem32: TTBXItem
@@ -74,22 +64,22 @@ inherited fEditorContacto: TfEditorContacto
end
end
inherited pgPaginas: TPageControl
- Width = 626
- ActivePage = pagDatosBancarios
+ Width = 718
ExplicitWidth = 626
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
- ExplicitWidth = 618
+ ExplicitWidth = 710
ExplicitHeight = 332
end
object pagDatosBancarios: TTabSheet
Caption = 'Datos bancarios'
ImageIndex = 1
+ ExplicitWidth = 618
inline frViewListaDatosBancarios: TfrViewListaDatosBancarios
Left = 0
Top = 0
- Width = 618
+ Width = 710
Height = 332
Align = alClient
Font.Charset = DEFAULT_CHARSET
@@ -103,36 +93,25 @@ inherited fEditorContacto: TfEditorContacto
ExplicitWidth = 618
ExplicitHeight = 332
inherited cxGrid: TcxGrid
- Width = 618
+ Width = 710
Height = 307
ExplicitWidth = 618
ExplicitHeight = 307
end
inherited ToolBar1: TToolBar
- Width = 618
+ Width = 710
ExplicitWidth = 618
- inherited ToolButton1: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton4: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton2: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton7: TToolButton
- ExplicitWidth = 113
- end
end
end
end
object pagPersonal: TTabSheet
Caption = 'Personal'
ImageIndex = 2
+ ExplicitWidth = 618
inline frViewPersonalContacto1: TfrViewPersonalContacto
Left = 0
Top = 0
- Width = 618
+ Width = 710
Height = 332
Align = alClient
Font.Charset = DEFAULT_CHARSET
@@ -146,32 +125,20 @@ inherited fEditorContacto: TfEditorContacto
ExplicitWidth = 618
ExplicitHeight = 332
inherited cxGrid: TcxGrid
- Width = 618
+ Width = 710
Height = 307
- ExplicitWidth = 618
+ ExplicitWidth = 710
ExplicitHeight = 307
end
inherited ToolBar1: TToolBar
- Width = 618
- ExplicitWidth = 618
- inherited ToolButton1: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton4: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton2: TToolButton
- ExplicitWidth = 113
- end
- inherited ToolButton7: TToolButton
- ExplicitWidth = 113
- end
+ Width = 710
+ ExplicitWidth = 710
end
end
end
end
inherited StatusBar: TJvStatusBar
- Width = 632
+ Width = 724
Panels = <
item
Width = 200
@@ -202,14 +169,7 @@ inherited fEditorContacto: TfEditorContacto
object dxLayoutLookAndFeel: TdxLayoutLookAndFeelList
Left = 320
Top = 248
- object dxLayoutOfficeLookAndFeel: TdxLayoutOfficeLookAndFeel
- GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET
- GroupOptions.CaptionOptions.Font.Color = clWindowText
- GroupOptions.CaptionOptions.Font.Height = -11
- GroupOptions.CaptionOptions.Font.Name = 'Tahoma'
- GroupOptions.CaptionOptions.Font.Style = [fsBold]
- GroupOptions.CaptionOptions.TextColor = clHighlight
- GroupOptions.CaptionOptions.UseDefaultFont = False
+ object dxLayoutStandardLookAndFeel1: TdxLayoutStandardLookAndFeel
end
end
end
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.pas b/Source/Modulos/Contactos/Views/uEditorContacto.pas
index f30a956..283a14a 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.pas
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.pas
@@ -21,10 +21,10 @@ type
TfEditorContacto = class(TfEditorDBItem, IEditorContacto)
pagDatosBancarios: TTabSheet;
dxLayoutLookAndFeel: TdxLayoutLookAndFeelList;
- dxLayoutOfficeLookAndFeel: TdxLayoutOfficeLookAndFeel;
frViewListaDatosBancarios: TfrViewListaDatosBancarios;
pagPersonal: TTabSheet;
frViewPersonalContacto1: TfrViewPersonalContacto;
+ dxLayoutStandardLookAndFeel1: TdxLayoutStandardLookAndFeel;
procedure FormShow(Sender: TObject);
procedure dsDataTableDataChange(Sender: TObject; Field: TField);
protected
diff --git a/Source/Modulos/Contactos/Views/uEditorPaciente.dfm b/Source/Modulos/Contactos/Views/uEditorPaciente.dfm
index cc0d5ec..5d56cf3 100644
--- a/Source/Modulos/Contactos/Views/uEditorPaciente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorPaciente.dfm
@@ -12,41 +12,37 @@ inherited fEditorPaciente: TfEditorPaciente
inherited Image1: TImage
Left = 902
Picture.Data = {
- 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
- 0000180806000000E0773DF80000000970485973000017120000171201679FD2
- 520000000467414D410000AA11B57D14DC000003E54944415478DADD955D6C14
- 5514C7FF33B36D77D952281050902FCB8A74AB8D402DEDBA76B1A64896501142
- B028A105DAB47C941A890A292D1FF2D1E00B06358527134D782A1F29840A4429
- 25D604B5A8444C7830354AA8752DDBD9D9D99DB9D77B6767A69D661FED0BB399
- 9C7B6736E777CEFF9C7347A094623C2FE1F100745CFF795C286B5E29106C00DB
- 180FF99E27450C6BAE09617B40D7990505D1A8F19E101D3AE196DAD6F82FBBDF
- A8D987BEABED4E0077A60C0DE2D78BEDF8FD9B0EC8B28CA827170BCB5F4761C5
- DB70B927994E4C8754B7D7945BE68007C1D7EBB6A60124D418EE7C7E1CA4F702
- 2231050F878731A8C431202B78B1AA162FBDD90C486E23729ED1D1F31969A5A9
- 0B0D61436DB3135019F2E36EF745F49FD90B414D201257F1AF40E19A96838107
- 0F31F0288EC6CFBAE07DD26F46CD65647270D9A899914EA1D1944C5575FB9D80
- D565F9B87ABA1583D7BE404214214DCAC60CDF2C3CE39B8EC8DFFFE05CC74D84
- 6B0F604E4915AB8268383C71C99D36832DC108DEAA6F7102563140E7478DD086
- EEC0E79F87291327C0EB11118BCAC81029AE7FFD0366966E832FB81144108D68
- ADA272ED3592D2DECA64D38E5627201C5C84B30737635AE61F08BC5C00558E43
- 61FA27985C2E11E8EAFA0EF35EDB83FCE00626896076162F2A9765B473628037
- EF3AE804AC0C3C8B530DAFB236BA8F70E5327833DC88C754482C7A5989E2CBB3
- DD285AB71F4BC25B98448211A56E69CFB33023B7C0358D879C8015A50BF16973
- 0DEEF55C4645E83914E64F413291448224D17BBB1FB77AEE21DCF2318A8AD7B2
- 76E63520C64DCCF6E4B3414DB998C1D6A631808A121FFA6EF4E0A796D3C8F5C6
- E1298940CA5531709F42E99D0C817890D7DE84F94FF8ED880F9CEC4C5BE4DDD5
- E5A87DE7B013505EBC00DD4D9F60EAED3FA16851C4973F40CED22494CE89F0FE
- 32035474E16E2013853BAB91E3CE75E86D4F314D3DE33EEBDE3DE2042C5F9A87
- 1B45DB317942162455042D559053C0D4BE928DD85F2C0B68901F25F05B830F2B
- D6541B83F6E1A9CB6933D8B92984FA3D479D80D0923C5C2BAA47B63B035EC105
- 9A4D206501AE6117D4A40E59D3580308F8FEA9382ACFB419DD43471D13562DA8
- D9510DEF1D7302822F3C8D4B8BB761BAC70B8F4B42A628B17162DDC2A659D535
- C4182496D0F0E3A22CAC3FD1C29C11B4B577A5CDA061631976BC3F0610289C8F
- 6F3BBF427F6F1FD44814601DC465607D0A2231505626A45953915F16C0CCD973
- 0D9DC9E813D43A81CD5AECFAE0B81350F2FC1CB3B7C9C884EAB0F7464BEAA39C
- 5A00E33D6CCB01FCD7B8B7CD0928F6CF368FE05427A48668044638CC76689DFB
- 23DF0D0B0A3393DDFBC6005A8F9CFCDFBF6836603CAF7107FC0730314BFE0CBC
- 83B80000000049454E44AE426082}
+ 0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018
+ 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
+ 4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000
+ 80E8000075300000EA6000003A98000017709CBA513C00000009704859730000
+ 17110000171101CA26F33F0000033249444154484BD5955D4853611880EBB26E
+ 122AFB5543FAB98AE8A68B8AA82E12FBB569CBB625951914044575D12FD14549
+ 68991168A469A536742D878A95A925599ACEE66F6B9B6E6EFEE62ACD2CCB783A
+ E7804BDB9905E5451FBCE78773789EF77DBF73BE6F2230615C872818CF1857B8
+ D41DF1905BD2C078C4288170E319DFBEB8713C3FC3AB1C0DD577D5D88D99231F
+ 7BAE8786BE333838C4C0C057FAFABFF0BE77809E77FD74F6F4B13464BFF8DECF
+ 0A46125C956769BEAFA2265D41C9D575142484627EA91D25190BDED6F5C1B7C0
+ 517E9C37D92A9AB4BBA8BCB18DE22B1B309C5F4DC6A9C538CDA59264187E24ED
+ 3372D1DAFE4E5ED0DF5D4D9D4E4D458A42802B2541CD4D2515D7C3C8BBB09C27
+ 59073D70B9B688998BF016975B5ED063BBC7ABCC708C694A5E0B15D8F53138F4
+ D158B334D40A525DEC324FCF7BFBE4B3172BB2D8DFFA16580D6A5C8618BA0A0E
+ D06ED88743B71BAB30D18DE911E4262AE8FF348808777FF844B7FB231DDDBD38
+ 3BDF636F73D3DCDA23C19B6C5DF2825E57052D058725A853BF4738EFC2A6D560
+ BEB39DAAE42D14E7C4FF11BCFE4D87EF4976962761D54649595BB254BCBEADA4
+ 2E358CC28408CC7595BFCD5C849B9ADA7C0B4A5D46F2333554A546604A0DA7EA
+ FA660CC2679A9A760C53836DCCB60CC3AB1B9CF282C7A64E561C7DC4ACBDB7D9
+ 9FB091A2CC43DC4A8A62495C22D31589EC3C7D0F93CDE2E9B9E6683A725159EB
+ F016D83AFAD87DE10973C373F08BCC6361740AE7F465ECBD96CFCC9D5A66280D
+ CC5E9F82FA8496D2FAFA51132A665ED3E8A2AAAE9517263BCF8CCDDE82ECB216
+ 16476610B8310BFF1D0FF0D3E4B3302683803D3AA6A81E324B994740481A93D7
+ 5C447D321B7373B76CF662454F5F5ABD0597F50D4C5D9B4470E84DE684DF679A
+ AA882942257E9185F86F2F24604B36C16B9399B43C96A551D768B474526B6EF7
+ CA5C84975458BC05778B6D2CD89A4CE09A2BCC0B4D676E580E73B6E54AB2804D
+ 5A824352F05F19CFE455E7511DD749705F73202B107FFD72A31DD5193DF31597
+ 080A8B237073BC1071046DBA48D08658166992B955543666E6225C56F0EB723B
+ 725DB13ADE4A3DFF5D5B86E1B282916BF9DFC26505E206F1AFC3B3E1FCD79BFE
+ 0F0C3193ED9F6605AA0000000049454E44AE426082}
ExplicitLeft = 645
end
inherited lblDesbloquear: TcxLabel
@@ -61,6 +57,7 @@ inherited fEditorPaciente: TfEditorPaciente
ExplicitWidth = 929
inherited tbxMain: TTBXToolbar
DockPos = 0
+ ExplicitWidth = 330
end
inherited tbxMenu: TTBXToolbar
ExplicitWidth = 929
@@ -69,12 +66,9 @@ inherited fEditorPaciente: TfEditorPaciente
inherited pgPaginas: TPageControl
Width = 923
Height = 482
- ActivePage = pagGeneral
ExplicitWidth = 923
ExplicitHeight = 482
inherited pagGeneral: TTabSheet
- ExplicitLeft = 0
- ExplicitTop = 0
ExplicitWidth = 915
ExplicitHeight = 454
inline frViewPaciente1: TfrViewPaciente
@@ -96,241 +90,194 @@ inherited fEditorPaciente: TfEditorPaciente
inherited dxLayoutControlContacto: TdxLayoutControl
Width = 915
Height = 454
- LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 915
ExplicitHeight = 454
inherited PngSpeedButton1: TPngSpeedButton
Left = 870
- Top = 218
ExplicitLeft = 870
- ExplicitTop = 218
end
inherited PngSpeedButton2: TPngSpeedButton
Left = 870
- Top = 190
ExplicitLeft = 870
- ExplicitTop = 190
end
inherited PngSpeedButton3: TPngSpeedButton
Left = 870
- Top = 162
ExplicitLeft = 870
- ExplicitTop = 162
end
inherited eCalle: TcxDBTextEdit
- Top = 216
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 216
ExplicitWidth = 341
Width = 341
end
inherited cbProvincia: TcxDBComboBox
- Top = 243
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 243
ExplicitWidth = 240
Width = 240
end
inherited cbPoblacion: TcxDBComboBox
- Top = 270
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 270
ExplicitWidth = 341
Width = 341
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 397
- Top = 243
+ Left = 396
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 397
- ExplicitTop = 243
+ ExplicitLeft = 396
end
inherited eObservaciones: TcxDBMemo
- Top = 348
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 348
ExplicitWidth = 871
ExplicitHeight = 63
Height = 63
Width = 871
end
inherited eFechaNacimiento: TcxDBDateEdit
- Top = 111
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 111
ExplicitWidth = 341
Width = 341
end
inherited eNumeroSS: TcxDBTextEdit
- Top = 84
- ExplicitTop = 84
ExplicitWidth = 166
Width = 166
end
inherited eFechaBaja: TcxDBDateEdit
- Top = 138
Properties.ImmediatePost = True
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 138
ExplicitWidth = 341
Width = 341
end
inherited eCausaBaja: TcxDBTextEdit
- Top = 165
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 165
ExplicitWidth = 341
Width = 341
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 585
- Top = 57
+ Left = 586
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 585
- ExplicitTop = 57
+ ExplicitLeft = 586
ExplicitWidth = 308
Width = 308
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 585
- Top = 30
+ Left = 586
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 585
- ExplicitTop = 30
+ ExplicitLeft = 586
ExplicitWidth = 308
Width = 308
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 585
- Top = 84
+ Left = 586
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 585
- ExplicitTop = 84
+ ExplicitLeft = 586
ExplicitWidth = 308
Width = 308
end
inherited eFax: TcxDBTextEdit
- Left = 585
- Top = 111
+ Left = 586
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 585
- ExplicitTop = 111
+ ExplicitLeft = 586
ExplicitWidth = 308
Width = 308
end
inherited eNombre: TcxDBTextEdit
- Top = 57
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 57
ExplicitWidth = 341
Width = 341
end
inherited eNIFCIF: TcxDBTextEdit
Left = 259
- Top = 30
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 259
- ExplicitTop = 30
ExplicitWidth = 203
Width = 203
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
- Left = 585
- Top = 162
+ Left = 586
Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 585
- ExplicitTop = 162
+ ExplicitLeft = 586
ExplicitWidth = 279
Width = 279
end
inherited eMailParticular: TcxDBHyperLinkEdit
- Left = 585
- Top = 190
+ Left = 586
Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 585
- ExplicitTop = 190
+ ExplicitLeft = 586
ExplicitWidth = 279
Width = 279
end
inherited ePaginaWeb: TcxDBHyperLinkEdit
- Left = 585
- Top = 217
+ Left = 586
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 585
- ExplicitTop = 217
+ ExplicitLeft = 586
ExplicitWidth = 279
Width = 279
end
inherited eReferencia: TcxDBTextEdit
- Top = 30
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 30
ExplicitWidth = 105
Width = 105
end
inherited ePersonaContacto: TcxDBTextEdit
- Top = 297
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 297
ExplicitWidth = 341
Width = 341
end
@@ -368,18 +315,6 @@ inherited fEditorPaciente: TfEditorPaciente
inherited ToolBar1: TToolBar
Width = 915
ExplicitWidth = 915
- 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
@@ -401,18 +336,6 @@ inherited fEditorPaciente: TfEditorPaciente
inherited ToolBar1: TToolBar
Width = 915
ExplicitWidth = 915
- 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
@@ -424,6 +347,15 @@ inherited fEditorPaciente: TfEditorPaciente
ExplicitWidth = 929
end
inherited EditorActionList: TActionList
+ inherited actConfPagina: TAction
+ Visible = False
+ end
+ inherited actPrevisualizar: TAction
+ Visible = False
+ end
+ inherited actImprimir: TAction
+ Visible = False
+ end
object actGruposPaciente: TAction
Category = 'Acciones'
Caption = 'Categorias de empleado'
diff --git a/Source/Modulos/Contactos/Views/uEditorPaciente.pas b/Source/Modulos/Contactos/Views/uEditorPaciente.pas
index e496b6f..497eb3c 100644
--- a/Source/Modulos/Contactos/Views/uEditorPaciente.pas
+++ b/Source/Modulos/Contactos/Views/uEditorPaciente.pas
@@ -1,4 +1,4 @@
-unit uEditorPaciente;
+unit uEditorPaciente;
interface
@@ -13,7 +13,7 @@ uses
uViewDetallesGenerico, uViewContactoDatosBancarios, dxLayoutLookAndFeels,
dxLayoutControl, cxContainer, cxEdit, cxTextEdit, cxMemo, cxDBEdit, cxControls,
uDAInterfaces, uViewContactoListaDatosBancarios, uViewPersonalContacto,
- cxLabel;
+ cxLabel, dxGDIPlusClasses;
type
TfEditorPaciente = class(TfEditorContacto, IEditorPaciente)
diff --git a/Source/Modulos/Contactos/Views/uEditorPacientes.dfm b/Source/Modulos/Contactos/Views/uEditorPacientes.dfm
index 68798bd..c634e02 100644
--- a/Source/Modulos/Contactos/Views/uEditorPacientes.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorPacientes.dfm
@@ -2,6 +2,7 @@ inherited fEditorPacientes: TfEditorPacientes
Caption = 'fEditorPacientes'
ClientWidth = 786
ExplicitWidth = 794
+ ExplicitHeight = 538
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -48,7 +49,7 @@ inherited fEditorPacientes: TfEditorPacientes
Width = 786
ExplicitWidth = 786
inherited tbxMain: TTBXToolbar
- ExplicitWidth = 775
+ ExplicitWidth = 474
inherited TBXItem2: TTBXItem
ImageIndex = 22
Images = SmallImages
@@ -57,6 +58,11 @@ inherited fEditorPacientes: TfEditorPacientes
inherited tbxMenu: TTBXToolbar
ExplicitWidth = 786
end
+ inherited TBXTMain2: TTBXToolbar
+ Left = 275
+ DockPos = 275
+ ExplicitLeft = 275
+ end
end
inherited StatusBar: TJvStatusBar
Width = 786
@@ -184,13 +190,17 @@ inherited fEditorPacientes: TfEditorPacientes
inherited EditorActionList: TActionList [4]
Left = 72
Top = 160
+ inherited actConfPagina: TAction
+ Visible = False
+ end
inherited actPrevisualizar: TAction
Enabled = True
- Visible = True
end
inherited actImprimir: TAction
Enabled = True
- Visible = True
+ end
+ inherited actExportarExcel: TAction
+ Visible = False
end
end
inherited SmallImages: TPngImageList [5]
diff --git a/Source/Modulos/Contactos/Views/uViewPacientes.dfm b/Source/Modulos/Contactos/Views/uViewPacientes.dfm
index ad176be..74c3afe 100644
--- a/Source/Modulos/Contactos/Views/uViewPacientes.dfm
+++ b/Source/Modulos/Contactos/Views/uViewPacientes.dfm
@@ -1,5 +1,11 @@
inherited frViewPacientes: TfrViewPacientes
+ Width = 754
+ Height = 502
+ ExplicitWidth = 754
+ ExplicitHeight = 502
inherited cxGrid: TcxGrid
+ Width = 754
+ Height = 374
RootLevelOptions.DetailTabsPosition = dtpTop
OnActiveTabChanged = cxGridActiveTabChanged
inherited cxGridView: TcxGridDBTableView
@@ -10,9 +16,13 @@ inherited frViewPacientes: TfrViewPacientes
FieldName = 'ID'
Column = cxGridViewNIF_CIF
end>
+ OptionsView.GroupRowStyle = grsStandard
inherited cxGridViewICONO: TcxGridDBColumn
VisibleForCustomization = False
end
+ inherited cxGridViewREFERENCIA: TcxGridDBColumn
+ Width = 134
+ end
inherited cxGridViewNIF_CIF: TcxGridDBColumn
Caption = 'DNI'
Visible = False
@@ -20,10 +30,12 @@ inherited frViewPacientes: TfrViewPacientes
end
inherited cxGridViewNOMBRE: TcxGridDBColumn
Caption = 'Nombre y apellidos'
+ Width = 328
end
object cxGridViewNUMERO_SS: TcxGridDBColumn [5]
Caption = 'N'#250'mero SS'
DataBinding.FieldName = 'NUMERO_SS'
+ Width = 128
end
inherited cxGridViewCALLE: TcxGridDBColumn
VisibleForCustomization = False
@@ -34,6 +46,7 @@ inherited frViewPacientes: TfrViewPacientes
object cxGridViewFECHA_BAJA: TcxGridDBColumn
Caption = 'Fecha de baja'
DataBinding.FieldName = 'FECHA_BAJA'
+ Width = 128
end
object cxGridViewFECHA_NACIMIENTO: TcxGridDBColumn
Caption = 'Fecha de nacim.'
@@ -52,8 +65,10 @@ inherited frViewPacientes: TfrViewPacientes
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
+ Width = 754
inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl
+ Width = 754
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
@@ -69,26 +84,41 @@ inherited frViewPacientes: TfrViewPacientes
Width = 238
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 263
+ Left = 351
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 263
+ ExplicitLeft = 351
ExplicitWidth = 205
Width = 205
end
inherited eLista: TcxComboBox
- Left = 451
+ Left = 599
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 451
+ ExplicitLeft = 599
ExplicitWidth = 140
Width = 140
end
end
+ inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+ Width = 754
+ inherited tbxBotones: TTBXToolbar
+ Width = 744
+ end
+ end
+ end
+ end
+ inherited pnlAgrupaciones: TTBXDockablePanel
+ Top = 476
+ inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+ Width = 754
+ inherited TBXToolbar1: TTBXToolbar
+ Width = 744
+ end
end
end
inherited dxComponentPrinter: TdxComponentPrinter
diff --git a/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm b/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm
index f98d2d3..e828f6d 100644
--- a/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm
+++ b/Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm
@@ -22,7 +22,7 @@ object PluginReferencias: TPluginReferencias
Left = 40
Top = 72
object actReferencias: TAction
- Category = 'Referencias'
+ Category = 'Archivo'
Caption = 'Referencias'
ImageIndex = 0
OnExecute = actReferenciasExecute
@@ -34,16 +34,16 @@ object PluginReferencias: TPluginReferencias
Left = 40
Top = 16
object Referencias: TMenuItem
- Caption = 'Empresa'
+ Caption = '&Archivo'
SubMenuImages = SmallImages
- object N1: TMenuItem
- Tag = 18990
- Caption = '-'
- end
- object Referencias1: TMenuItem
- Tag = 19001
- Action = actReferencias
- SubMenuImages = SmallImages
+ object Datos1: TMenuItem
+ Tag = 200
+ Caption = '&Datos'
+ object Referencias1: TMenuItem
+ Tag = 100
+ Action = actReferencias
+ SubMenuImages = SmallImages
+ end
end
end
end
diff --git a/Source/Modulos/Referencias/Plugin/uPluginReferencias.pas b/Source/Modulos/Referencias/Plugin/uPluginReferencias.pas
index e83ff6d..85e8225 100644
--- a/Source/Modulos/Referencias/Plugin/uPluginReferencias.pas
+++ b/Source/Modulos/Referencias/Plugin/uPluginReferencias.pas
@@ -20,7 +20,7 @@ type
SmallImages: TPngImageList;
Referencias: TMenuItem;
Referencias1: TMenuItem;
- N1: TMenuItem;
+ Datos1: TMenuItem;
procedure actReferenciasExecute(Sender: TObject);
procedure actReferenciasUpdate(Sender: TObject);
public
diff --git a/Source/Modulos/Referencias/Referencias_Group.groupproj b/Source/Modulos/Referencias/Referencias_Group.groupproj
index 05bf85e..6d78691 100644
--- a/Source/Modulos/Referencias/Referencias_Group.groupproj
+++ b/Source/Modulos/Referencias/Referencias_Group.groupproj
@@ -6,9 +6,7 @@
-
-
@@ -93,32 +91,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
\ No newline at end of file
diff --git a/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm b/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm
index 6b2d050..935d8c1 100644
--- a/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm
+++ b/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm
@@ -3,7 +3,7 @@ object PluginUnidadesMedida: TPluginUnidadesMedida
DefaultAction = actUnidadesMedida
Description = 'Tipos de IVA'
ModuleMenu = MainMenu
- ModuleName = 'Tipos de IVA'
+ ModuleName = 'Unidades de medida'
SmallImages = SmallImages
LargeImages = LargeImages
Author = 'Rodax Software S.L.'
@@ -51,10 +51,13 @@ object PluginUnidadesMedida: TPluginUnidadesMedida
Left = 40
Top = 16
object Ventas1: TMenuItem
- Caption = 'Datos'
- object UnidadesMedida1: TMenuItem
- Tag = 313
- Action = actUnidadesMedida
+ Caption = '&Archivo'
+ object Datos1: TMenuItem
+ Caption = '&Datos'
+ object UnidadesMedida1: TMenuItem
+ Tag = 313
+ Action = actUnidadesMedida
+ end
end
end
end
diff --git a/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.pas b/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.pas
index dbea8e5..3367890 100644
--- a/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.pas
+++ b/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.pas
@@ -20,6 +20,7 @@ type
SmallImages: TPngImageList;
Ventas1: TMenuItem;
UnidadesMedida1: TMenuItem;
+ Datos1: TMenuItem;
procedure actUnidadesMedidaExecute(Sender: TObject);
public
constructor Create(AOwner: TComponent); override;