diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index da57b9d..905ff98 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -45,6 +45,8 @@
Package
FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
+
+
Microsoft Office 2000 Sample Automation Server Wrapper Components
Microsoft Office XP Sample Automation Server Wrapper Components
Base.dpk
@@ -54,57 +56,57 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm
index bd3ea88..e9ec65a 100644
--- a/Source/Cliente/uPantallaPrincipal.dfm
+++ b/Source/Cliente/uPantallaPrincipal.dfm
@@ -36,7 +36,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
TabOrder = 0
ShowCaption = False
ShowCaptionWhenDocked = False
- ExplicitHeight = 517
object JvSyncSplitter1: TJvSyncSplitter
Left = 210
Top = 0
@@ -91,7 +90,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
NavPanelHotTrackFont.Style = []
SmallImages = ModulesSmallImageList
OnChange = JvNavigationPaneChange
- ExplicitHeight = 517
object pagInicio: TJvNavPanelPage
Left = 0
Top = 0
@@ -104,7 +102,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
Background.Transparent = False
Caption = 'Inicio'
ImageIndex = 0
- ExplicitHeight = 444
object Panel1: TPanel
Left = 0
Top = 374
@@ -114,7 +111,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
Color = clWindow
ParentBackground = False
TabOrder = 1
- ExplicitTop = 358
object Label1: TLabel
Left = 38
Top = 29
@@ -167,7 +163,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
BoundLines = [blLeft, blTop, blRight, blBottom]
Caption = 'pnlBorde'
Align = alClient
- ExplicitHeight = 517
object pnlMain: TSpTBXDockablePanel
Left = 1
Top = 1
@@ -178,7 +173,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
TabOrder = 0
ShowCaption = False
ShowCaptionWhenDocked = False
- ExplicitHeight = 515
object lblBienvenido: TLabel
Left = 8
Top = 8
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index b87dd96..88f517e 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -150,7 +150,7 @@ uses
uSplash, uAcercaDe, UxTheme, Themes, uMenuUtils, uBizEmpresas,
uFactuGES_App, uDMBase, uDataModuleConexion,
uModuleController, uMainMenuController, uNavPaneController,
- uDialogUtils, cxControls;
+ uDialogUtils, cxControls, SpTBXSkins;
{$R *.dfm}
@@ -328,41 +328,44 @@ var
AListaEmpresas : IBizEmpresa;
i : Integer;
begin
- ShowHourglassCursor;
+ ShowHourglassCursor;
try
- for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
- MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
+ // Set skin type to sknTBX
+ SkinManager.ChangeControlSkinType(Self, sknSkin);
- MainMenuController.SortMenuByTag;
- MainMenuController.InitMainMenu;
+ for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
+ MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
- for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
- NavPaneController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
+ MainMenuController.SortMenuByTag;
+ MainMenuController.InitMainMenu;
- NavPaneController.InitNavPane;
+ for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
+ NavPaneController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
- try
- AListaEmpresas := AppFactuGES.EmpresasController.BuscarTodos;
- if Assigned(AListaEmpresas) then
- begin
- AListaEmpresas.Active := True;
+ NavPaneController.InitNavPane;
- if AListaEmpresas.RecordCount = 1 then
+ try
+ AListaEmpresas := AppFactuGES.EmpresasController.BuscarTodos;
+ if Assigned(AListaEmpresas) then
begin
- // Oculto la página de inicio para que no parezca
- // que se pueden manejar varias empresas.
- JvNavigationPane.ActivePageIndex := 1;
- pagInicio.PageList := NIL;
- pagInicio.Visible := False;
+ AListaEmpresas.Active := True;
+
+ if AListaEmpresas.RecordCount = 1 then
+ begin
+ // Oculto la página de inicio para que no parezca
+ // que se pueden manejar varias empresas.
+ JvNavigationPane.ActivePageIndex := 1;
+ pagInicio.PageList := NIL;
+ pagInicio.Visible := False;
+ end;
end;
+
+ finally
+ AListaEmpresas.Close;
+ AListaEmpresas := NIL;
end;
- finally
- AListaEmpresas.Close;
- AListaEmpresas := NIL;
- end;
-
- RefrescarUI;
+ RefrescarUI;
finally
HideHourglassCursor;
end;
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index a11bfcb..89f5ab3 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -59,32 +59,32 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/uEditorGridBase.pas b/Source/GUIBase/uEditorGridBase.pas
index 5d8c01d..2c73250 100644
--- a/Source/GUIBase/uEditorGridBase.pas
+++ b/Source/GUIBase/uEditorGridBase.pas
@@ -47,6 +47,7 @@ type
Imprimir1: TMenuItem;
TBXSeparatorItem14: TSpTBXSeparatorItem;
TBXItem33: TSpTBXItem;
+ TBControlItem1: TTBControlItem;
N3: TMenuItem;
Actualizar1: TMenuItem;
TBXItem34: TSpTBXItem;
diff --git a/Source/GUIBase/uViewDetallesGenerico.dfm b/Source/GUIBase/uViewDetallesGenerico.dfm
index ec237dc..02cbcb2 100644
--- a/Source/GUIBase/uViewDetallesGenerico.dfm
+++ b/Source/GUIBase/uViewDetallesGenerico.dfm
@@ -10,7 +10,7 @@ inherited frViewDetallesGenerico: TfrViewDetallesGenerico
Height = 332
Align = alClient
TabOrder = 0
- LookAndFeel.Kind = lfOffice11
+ LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
object cxGridView: TcxGridDBTableView
NavigatorButtons.ConfirmDelete = False
diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm
index d93b848..b837a68 100644
--- a/Source/GUIBase/uViewGrid.dfm
+++ b/Source/GUIBase/uViewGrid.dfm
@@ -1,13 +1,13 @@
inherited frViewGrid: TfrViewGrid
Width = 607
- Height = 441
+ Height = 393
ExplicitWidth = 607
- ExplicitHeight = 441
+ ExplicitHeight = 393
object cxGrid: TcxGrid [0]
Left = 0
Top = 102
Width = 607
- Height = 211
+ Height = 265
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -16,8 +16,9 @@ inherited frViewGrid: TfrViewGrid
Font.Style = []
ParentFont = False
TabOrder = 0
- LookAndFeel.Kind = lfOffice11
- LookAndFeel.NativeStyle = False
+ LookAndFeel.Kind = lfStandard
+ LookAndFeel.NativeStyle = True
+ ExplicitHeight = 211
object cxGridView: TcxGridDBTableView
OnDblClick = cxGridViewDblClick
NavigatorButtons.ConfirmDelete = False
@@ -141,9 +142,9 @@ inherited frViewGrid: TfrViewGrid
end
object pnlAgrupaciones: TSpTBXDockablePanel
Left = 0
- Top = 313
+ Top = 367
Width = 607
- Height = 128
+ Height = 26
Caption = 'pnlAgrupaciones'
Align = alBottom
TabOrder = 2
@@ -160,7 +161,6 @@ inherited frViewGrid: TfrViewGrid
TabOrder = 0
ShowCaption = False
ShowCaptionWhenDocked = False
- ExplicitTop = 10
object TBXToolbar1: TSpTBXToolbar
Left = 0
Top = 0
@@ -170,7 +170,6 @@ inherited frViewGrid: TfrViewGrid
AutoResize = False
TabOrder = 0
Caption = 'TBXToolbar1'
- ExplicitTop = 10
object TBXItem1: TSpTBXItem
Action = actQuitarAgrupaciones
end
@@ -203,7 +202,7 @@ inherited frViewGrid: TfrViewGrid
PrinterPage.ScaleMode = smFit
PrinterPage._dxMeasurementUnits_ = 0
PrinterPage._dxLastMU_ = 2
- ReportDocument.CreationDate = 40200.437038078700000000
+ ReportDocument.CreationDate = 40200.519988935190000000
StyleManager = dmBase.dxPrintStyleManager1
OptionsCards.Shadow.Depth = 0
OptionsExpanding.ExpandGroupRows = True
@@ -227,8 +226,8 @@ inherited frViewGrid: TfrViewGrid
end
end
object dxPSEngineController1: TdxPSEngineController
- Active = True
- DialogsLookAndFeel.Kind = lfOffice11
+ DialogsLookAndFeel.Kind = lfStandard
+ DialogsLookAndFeel.NativeStyle = True
PreviewDialogStyle = 'Advanced'
Left = 336
Top = 128
diff --git a/Source/GUIBase/uViewGrid2Niveles.dfm b/Source/GUIBase/uViewGrid2Niveles.dfm
index be16c2f..183a850 100644
--- a/Source/GUIBase/uViewGrid2Niveles.dfm
+++ b/Source/GUIBase/uViewGrid2Niveles.dfm
@@ -16,7 +16,7 @@ inherited frViewGrid2Niveles: TfrViewGrid2Niveles
Font.Style = []
ParentFont = False
TabOrder = 0
- LookAndFeel.Kind = lfOffice11
+ LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
object cxGridView1N: TcxGridDBTableView
OnDblClick = cxGridView1NDblClick
@@ -88,8 +88,8 @@ inherited frViewGrid2Niveles: TfrViewGrid2Niveles
end
end
object dxPSEngineController1: TdxPSEngineController
- LookAndFeel = pslfOffice11
- UseNativeLookAndFeel = False
+ DialogsLookAndFeel.Kind = lfStandard
+ DialogsLookAndFeel.NativeStyle = True
Left = 336
Top = 128
end
diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm
index 65016ad..a26494d 100644
--- a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm
@@ -2,16 +2,16 @@ inherited fEditorArticulos: TfEditorArticulos
Left = 489
Top = 325
Caption = 'Lista de art'#237'culos'
- ClientWidth = 657
- ExplicitWidth = 665
+ ClientWidth = 822
+ ExplicitWidth = 830
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
- Width = 657
+ Width = 822
Caption = 'Lista de articulos'
ExplicitWidth = 657
inherited Image1: TImage
- Left = 630
+ Left = 795
Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00
00001C0806000000720DDF940000000970485973000017120000171201679FD2
@@ -30,7 +30,7 @@ inherited fEditorArticulos: TfEditorArticulos
end
end
inherited TBXDock: TSpTBXDock
- Width = 657
+ Width = 822
ExplicitWidth = 657
inherited tbxMain: TSpTBXToolbar
ExplicitWidth = 632
@@ -47,7 +47,7 @@ inherited fEditorArticulos: TfEditorArticulos
end
end
inherited tbxMenu: TSpTBXToolbar
- ExplicitWidth = 657
+ ExplicitWidth = 822
end
inherited TBXTMain2: TSpTBXToolbar
Left = 287
@@ -56,31 +56,34 @@ inherited fEditorArticulos: TfEditorArticulos
end
end
inherited StatusBar: TJvStatusBar
- Width = 657
+ Width = 822
ExplicitWidth = 657
end
object pgPaginas: TPageControl [3]
AlignWithMargins = True
Left = 3
Top = 105
- Width = 651
+ Width = 816
Height = 377
ActivePage = pagArticulos
Align = alClient
TabOrder = 3
OnChange = pgPaginasChange
+ ExplicitWidth = 651
object pagArticulos: TTabSheet
Caption = 'Todos los art'#237'culos'
+ ExplicitWidth = 643
end
object pagArticulosPorProveedor: TTabSheet
Caption = 'Art'#237'culos por proveedor'
Enabled = False
ImageIndex = 1
TabVisible = False
+ ExplicitWidth = 643
inline frViewArticulosPorProveedor1: TfrViewArticulosPorProveedor
Left = 0
Top = 0
- Width = 643
+ Width = 808
Height = 349
Align = alClient
Font.Charset = DEFAULT_CHARSET
@@ -94,10 +97,10 @@ inherited fEditorArticulos: TfEditorArticulos
ExplicitWidth = 643
ExplicitHeight = 349
inherited cxGrid: TcxGrid
- Width = 643
+ Width = 808
Height = 119
- ExplicitWidth = 643
- ExplicitHeight = 221
+ ExplicitWidth = 808
+ ExplicitHeight = 119
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
@@ -108,13 +111,13 @@ inherited fEditorArticulos: TfEditorArticulos
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
- Width = 643
+ Width = 808
ExplicitWidth = 643
inherited TBXDockablePanel1: TSpTBXDockablePanel
- Width = 643
+ Width = 808
ExplicitWidth = 643
inherited dxLayoutControl1: TdxLayoutControl
- Width = 643
+ Width = 808
ExplicitWidth = 643
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
@@ -131,29 +134,29 @@ inherited fEditorArticulos: TfEditorArticulos
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 353
+ Left = 456
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 353
+ ExplicitLeft = 456
end
inherited eLista: TcxComboBox
- Left = 596
+ Left = 766
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 596
+ ExplicitLeft = 766
ExplicitWidth = 20
Width = 20
end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 633
+ Width = 798
ExplicitWidth = 633
inherited tbxBotones: TSpTBXToolbar
- Width = 633
+ Width = 798
ExplicitWidth = 633
end
end
@@ -161,15 +164,16 @@ inherited fEditorArticulos: TfEditorArticulos
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
Top = 221
- Width = 643
+ Width = 808
ExplicitTop = 323
ExplicitWidth = 643
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 643
+ Width = 808
+ ExplicitTop = 0
ExplicitWidth = 643
inherited TBXToolbar1: TSpTBXToolbar
- Width = 643
- ExplicitWidth = 633
+ Width = 808
+ ExplicitWidth = 643
end
end
end
@@ -193,7 +197,7 @@ inherited fEditorArticulos: TfEditorArticulos
inline frViewArticulos1: TfrViewArticulos [4]
Left = 0
Top = 102
- Width = 657
+ Width = 822
Height = 383
Align = alClient
Font.Charset = DEFAULT_CHARSET
@@ -208,8 +212,8 @@ inherited fEditorArticulos: TfEditorArticulos
ExplicitWidth = 657
ExplicitHeight = 383
inherited cxGrid: TcxGrid
- Width = 657
- Height = 153
+ Width = 822
+ Height = 256
ExplicitWidth = 657
ExplicitHeight = 153
inherited cxGridView: TcxGridDBTableView
@@ -222,13 +226,13 @@ inherited fEditorArticulos: TfEditorArticulos
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
- Width = 657
+ Width = 822
ExplicitWidth = 657
inherited TBXDockablePanel1: TSpTBXDockablePanel
- Width = 657
+ Width = 822
ExplicitWidth = 657
inherited dxLayoutControl1: TdxLayoutControl
- Width = 657
+ Width = 822
ExplicitWidth = 657
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
@@ -245,44 +249,44 @@ inherited fEditorArticulos: TfEditorArticulos
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 372
+ Left = 463
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 372
+ ExplicitLeft = 463
end
inherited eLista: TcxComboBox
- Left = 627
+ Left = 779
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 627
+ ExplicitLeft = 779
ExplicitWidth = 20
Width = 20
end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 647
+ Width = 812
ExplicitWidth = 647
inherited tbxBotones: TSpTBXToolbar
- Width = 647
+ Width = 812
ExplicitWidth = 647
end
end
end
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
- Top = 255
- Width = 657
- ExplicitTop = 255
- ExplicitWidth = 657
+ Top = 358
+ Width = 822
+ ExplicitTop = 358
+ ExplicitWidth = 822
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 657
+ Width = 822
ExplicitWidth = 657
inherited TBXToolbar1: TSpTBXToolbar
- Width = 657
+ Width = 822
ExplicitWidth = 657
end
end
diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
index 3e21a4d..640909b 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
@@ -1,6 +1,6 @@
inherited frViewArticulo: TfrViewArticulo
- Width = 729
- Height = 304
+ Width = 610
+ Height = 405
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@@ -9,18 +9,18 @@ inherited frViewArticulo: TfrViewArticulo
object dxLayoutControlArticulo: TdxLayoutControl
Left = 0
Top = 0
- Width = 729
- Height = 304
+ Width = 610
+ Height = 405
Align = alClient
- ParentBackground = True
TabOrder = 0
TabStop = False
ExplicitWidth = 451
+ ExplicitHeight = 304
DesignSize = (
- 729
- 304)
+ 610
+ 405)
object PngSpeedButton2: TPngSpeedButton
- Left = 667
+ Left = 548
Top = 358
Width = 23
Height = 22
@@ -47,7 +47,7 @@ inherited frViewArticulo: TfrViewArticulo
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
end
object PngSpeedButton1: TPngSpeedButton
- Left = 667
+ Left = 548
Top = 386
Width = 23
Height = 22
@@ -296,7 +296,7 @@ inherited frViewArticulo: TfrViewArticulo
Width = 171
end
object eCodigo: TcxDBTextEdit
- Left = 425
+ Left = 362
Top = 28
DataBinding.DataField = 'CODIGOTECNICO'
DataBinding.DataSource = dsViewArticulo
@@ -344,7 +344,7 @@ inherited frViewArticulo: TfrViewArticulo
Width = 727
end
object ePrecio: TcxDBCurrencyEdit
- Left = 541
+ Left = 456
Top = 109
DataBinding.DataField = 'PRECIO'
DataBinding.DataSource = dsViewArticulo
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
index 4866f24..989f98c 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
@@ -1,12 +1,12 @@
inherited frViewArticulos: TfrViewArticulos
Width = 715
- Height = 462
+ Height = 457
OnShow = CustomViewShow
ExplicitWidth = 715
- ExplicitHeight = 462
+ ExplicitHeight = 457
inherited cxGrid: TcxGrid
Width = 715
- Height = 232
+ Height = 330
ExplicitWidth = 715
ExplicitHeight = 232
inherited cxGridView: TcxGridDBTableView
@@ -107,6 +107,8 @@ inherited frViewArticulos: TfrViewArticulos
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 272
+ Width = 272
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 376
@@ -115,6 +117,8 @@ inherited frViewArticulos: TfrViewArticulos
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 376
+ ExplicitWidth = 221
+ Width = 221
end
inherited eLista: TcxComboBox
Left = 634
@@ -155,12 +159,15 @@ inherited frViewArticulos: TfrViewArticulos
end
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
- Top = 334
+ Top = 432
Width = 715
- ExplicitTop = 334
+ Height = 25
+ ExplicitTop = 432
ExplicitWidth = 715
+ ExplicitHeight = 25
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 715
+ ExplicitTop = 0
ExplicitWidth = 715
inherited TBXToolbar1: TSpTBXToolbar
Width = 715
@@ -185,6 +192,9 @@ inherited frViewArticulos: TfrViewArticulos
BuiltInReportLink = True
end
end
+ inherited dxPSEngineController1: TdxPSEngineController
+ Active = True
+ end
inherited ActionList1: TActionList
Left = 360
Top = 280
diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm
index 9b906a3..7cc30a8 100644
--- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm
@@ -56,10 +56,10 @@ inherited fEditorClientes: TfEditorClientes
object TBXSubmenuItem3: TSpTBXSubmenuItem [13]
Caption = 'Documentos relacionados'
DisplayMode = nbdmImageAndText
- DropdownCombo = True
ImageIndex = 24
Images = SmallImages
Visible = False
+ DropdownCombo = True
object TBXItem43: TSpTBXItem
Action = actDocumentosPresupuestos
end
@@ -78,17 +78,17 @@ inherited fEditorClientes: TfEditorClientes
ExplicitWidth = 857
inherited TBXSubmenuItemAcciones: TSpTBXSubmenuItem
object TBXItem381: TSpTBXItem
- Action = actGruposCliente
Caption = 'Ver grupos de cliente...'
+ Action = actGruposCliente
Images = SmallImages
end
object TBXSeparatorItem171: TSpTBXSeparatorItem
end
object TBXSubmenuItem2: TSpTBXSubmenuItem
Caption = 'Documentos relacionados'
- DropdownCombo = True
ImageIndex = 24
Images = SmallImages
+ DropdownCombo = True
object TBXItem40: TSpTBXItem
Action = actDocumentosPresupuestos
end
@@ -105,9 +105,7 @@ inherited fEditorClientes: TfEditorClientes
end
end
inherited TBXTMain2: TSpTBXToolbar
- Left = 275
DockPos = 275
- ExplicitLeft = 275
end
end
inherited StatusBar: TJvStatusBar
@@ -137,7 +135,7 @@ inherited fEditorClientes: TfEditorClientes
Width = 857
Height = 270
ExplicitWidth = 857
- ExplicitHeight = 270
+ ExplicitHeight = 168
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
@@ -151,6 +149,7 @@ inherited fEditorClientes: TfEditorClientes
Width = 857
ExplicitWidth = 857
inherited TBXDockablePanel1: TSpTBXDockablePanel
+ Width = 857
ExplicitWidth = 857
inherited dxLayoutControl1: TdxLayoutControl
Width = 857
@@ -193,8 +192,8 @@ inherited fEditorClientes: TfEditorClientes
end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 857
- ExplicitWidth = 857
+ Width = 847
+ ExplicitWidth = 847
inherited tbxBotones: TSpTBXToolbar
Width = 847
ExplicitWidth = 847
@@ -208,14 +207,15 @@ inherited fEditorClientes: TfEditorClientes
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
Top = 372
+ Width = 857
ExplicitTop = 372
ExplicitWidth = 857
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 857
ExplicitWidth = 857
inherited TBXToolbar1: TSpTBXToolbar
- Width = 847
- ExplicitWidth = 847
+ Width = 857
+ ExplicitWidth = 857
end
end
end
@@ -225,6 +225,9 @@ inherited fEditorClientes: TfEditorClientes
BuiltInReportLink = True
end
end
+ inherited dxPSEngineController1: TdxPSEngineController
+ Active = True
+ end
inherited cxViewGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
item
diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas
index 8f4e072..70e40a8 100644
--- a/Source/Modulos/Contactos/Views/uEditorClientes.pas
+++ b/Source/Modulos/Contactos/Views/uEditorClientes.pas
@@ -12,7 +12,7 @@ uses
uViewBase, uViewBarraSeleccion, ExtCtrls, pngimage, JvComponentBase,
uIEditorClientes, uViewGridBase, uViewGrid, uViewContactos, uViewClientes,
- JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;
+ JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces, TntStdCtrls, SpTBXEditors;
type
TfEditorClientes = class(TfEditorContactos, IEditorClientes)
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
index c8bbff5..c034405 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
@@ -11,13 +11,14 @@ inherited fEditorContactos: TfEditorContactos
end
inherited TBXDock: TSpTBXDock
inherited tbxFiltro: TSpTBXToolbar
- ExplicitWidth = 269
- inherited tbxEditFiltro: TSpTBXEditItem
- EditOptions = [tboUseEditWhenVertical]
- end
+ ExplicitWidth = 287
inherited TBXItem37: TSpTBXItem
Visible = False
end
+ inherited cbxListaAnos: TSpTBXComboBox
+ Left = 129
+ ExplicitLeft = 129
+ end
end
inherited tbxMenu: TSpTBXToolbar
object TBXSubmenuItemAcciones: TSpTBXSubmenuItem [4]
@@ -25,8 +26,9 @@ inherited fEditorContactos: TfEditorContactos
end
end
inherited TBXTMain2: TSpTBXToolbar
- Left = 318
- ExplicitLeft = 318
+ Left = 287
+ DockPos = 286
+ ExplicitLeft = 287
end
end
inherited EditorActionList: TActionList
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.pas b/Source/Modulos/Contactos/Views/uEditorContactos.pas
index 9f8be73..0251b9a 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.pas
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.pas
@@ -13,7 +13,7 @@ uses
uViewBarraSeleccion, JvComponentBase, uContactosController,
uIEditorContactos, pngimage, JvExComCtrls, JvStatusBar,
- uDAInterfaces;
+ uDAInterfaces, StdCtrls, TntStdCtrls, SpTBXEditors;
type
TfEditorContactos = class(TfEditorGridBase, IEditorContactos)
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
index b2891c8..106867f 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
@@ -2,6 +2,7 @@ inherited fEditorEmpleados: TfEditorEmpleados
Caption = 'fEditorEmpleados'
ClientWidth = 786
ExplicitWidth = 794
+ ExplicitHeight = 538
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -48,7 +49,7 @@ inherited fEditorEmpleados: TfEditorEmpleados
Width = 786
ExplicitWidth = 786
inherited tbxMain: TSpTBXToolbar
- ExplicitWidth = 632
+ ExplicitWidth = 775
inherited TBXItem2: TSpTBXItem
ImageIndex = 22
Images = SmallImages
@@ -66,7 +67,7 @@ inherited fEditorEmpleados: TfEditorEmpleados
Left = 0
Top = 102
Width = 786
- Height = 323
+ Height = 383
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -78,12 +79,12 @@ inherited fEditorEmpleados: TfEditorEmpleados
ReadOnly = False
ExplicitTop = 102
ExplicitWidth = 786
- ExplicitHeight = 323
+ ExplicitHeight = 383
inherited cxGrid: TcxGrid
Width = 786
- Height = 195
+ Height = 255
ExplicitWidth = 786
- ExplicitHeight = 195
+ ExplicitHeight = 255
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
@@ -98,28 +99,49 @@ inherited fEditorEmpleados: TfEditorEmpleados
Width = 786
ExplicitWidth = 786
inherited TBXDockablePanel1: TSpTBXDockablePanel
+ Width = 786
ExplicitWidth = 786
inherited dxLayoutControl1: TdxLayoutControl
Width = 786
ExplicitWidth = 786
inherited txtFiltroTodo: TcxTextEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 689
Width = 689
end
inherited edtFechaIniFiltro: TcxDateEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 290
Width = 290
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 394
- ExplicitLeft = 394
+ Left = 324
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 324
ExplicitWidth = 382
Width = 382
end
+ inherited eLista: TcxComboBox
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 97
+ Width = 97
+ end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 786
- ExplicitWidth = 786
+ Width = 776
+ ExplicitWidth = 776
inherited tbxBotones: TSpTBXToolbar
Width = 776
ExplicitWidth = 776
@@ -132,15 +154,16 @@ inherited fEditorEmpleados: TfEditorEmpleados
end
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
- Top = 297
- ExplicitTop = 297
+ Top = 357
+ Width = 786
+ ExplicitTop = 357
ExplicitWidth = 786
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 786
ExplicitWidth = 786
inherited TBXToolbar1: TSpTBXToolbar
- Width = 776
- ExplicitWidth = 776
+ Width = 786
+ ExplicitWidth = 786
end
end
end
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
index ae4fb51..6afc187 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
@@ -10,7 +10,8 @@ uses
TB2ExtItems, SpTBXItem, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
JvExControls, JvComponent, JvNavigationPane, uViewGridBase, uViewGrid,
uViewContactos, uViewEmpleados, uIEditorEmpleados, pngimage,
- JvExComCtrls, JvStatusBar, JSDialog, uContactosController, uDAInterfaces;
+ JvExComCtrls, JvStatusBar, JSDialog, uContactosController, uDAInterfaces,
+ StdCtrls, TntStdCtrls, SpTBXEditors;
type
TfEditorEmpleados = class(TfEditorContactos, IEditorEmpleados)
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm
index 9488c0c..8160532 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm
@@ -82,6 +82,7 @@ inherited frViewClientes: TfrViewClientes
Width = 793
ExplicitWidth = 793
inherited TBXDockablePanel1: TSpTBXDockablePanel
+ Width = 793
ExplicitWidth = 793
inherited dxLayoutControl1: TdxLayoutControl
Width = 793
@@ -124,7 +125,7 @@ inherited frViewClientes: TfrViewClientes
end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 793
+ Width = 783
ExplicitWidth = 793
inherited tbxBotones: TSpTBXToolbar
Width = 783
@@ -135,13 +136,14 @@ inherited frViewClientes: TfrViewClientes
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
Top = 423
- ExplicitTop = 423
+ Width = 793
+ ExplicitTop = 422
ExplicitWidth = 793
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 793
ExplicitWidth = 793
inherited TBXToolbar1: TSpTBXToolbar
- Width = 783
+ Width = 793
Visible = False
ExplicitWidth = 783
end
@@ -156,6 +158,7 @@ inherited frViewClientes: TfrViewClientes
end
end
inherited dxPSEngineController1: TdxPSEngineController
+ Active = True
Left = 104
end
inherited cxStyleRepository1: TcxStyleRepository
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas
index fad8578..8cd0913 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.pas
+++ b/Source/Modulos/Contactos/Views/uViewClientes.pas
@@ -14,7 +14,10 @@ uses
dxPScxCommon, cxImageComboBox, cxGridCustomPopupMenu, cxGridPopupMenu,
dxPScxGrid6Lnk, ExtCtrls, JvComponentBase, JvBalloonHint, JvHint,
uViewFiltroBase, dxPgsDlg, TB2Item, SpTBXItem, TB2Toolbar, SpTBXDkPanels, TB2Dock,
- uDAInterfaces, cxTextEdit, Menus, uCustomView, uViewBase;
+ uDAInterfaces, cxTextEdit, Menus, uCustomView, uViewBase, cxLookAndFeels,
+ cxLookAndFeelPainters, dxPSPDFExportCore, dxPSPDFExport, cxDrawTextUtils,
+ dxPSPrVwStd, dxPSPrVwAdv, dxPScxEditorProducers, dxPScxExtEditorProducers,
+ dxPScxPageControlProducer;
type
IViewClientes = interface(IViewContactos)
diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm
index b2a4d16..9d334c7 100644
--- a/Source/Modulos/Contactos/Views/uViewContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm
@@ -12,7 +12,6 @@ inherited frViewContacto: TfrViewContacto
ParentBackground = True
TabOrder = 0
TabStop = False
- AutoContentSizes = [acsWidth, acsHeight]
object PngSpeedButton1: TPngSpeedButton
Left = 629
Top = 222
@@ -445,7 +444,6 @@ inherited frViewContacto: TfrViewContacto
Top = 28
DataBinding.DataField = 'REFERENCIA'
DataBinding.DataSource = dsContacto
- Enabled = False
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Color = clWindow
@@ -512,194 +510,194 @@ inherited frViewContacto: TfrViewContacto
Width = 256
end
object dxLayoutControlContactoGroup_Root: TdxLayoutGroup
- ShowCaption = False
+ AlignHorz = ahParentManaged
+ AlignVert = avParentManaged
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
ShowBorder = False
object dxLayoutControlContactoGroup9: TdxLayoutGroup
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControlContactoGroup4: TdxLayoutGroup
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
ShowBorder = False
object dxLayoutControlContactoGroup1: TdxLayoutGroup
- AutoAligns = [aaHorizontal]
AlignVert = avClient
- Caption = 'Datos generales'
+ CaptionOptions.Text = 'Datos generales'
+ ButtonOptions.Buttons = <>
object dxLayoutControlContactoGroup16: TdxLayoutGroup
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControlContactoItem25: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'C'#243'digo:'
+ CaptionOptions.Text = 'C'#243'digo:'
Control = eReferencia
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem14: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'NIF/CIF:'
+ CaptionOptions.Text = 'NIF/CIF:'
Control = eNIFCIF
ControlOptions.ShowBorder = False
end
end
object dxLayoutControlContactoItem13: TdxLayoutItem
- Caption = 'Nombre:'
+ CaptionOptions.Text = 'Nombre:'
Control = eNombre
ControlOptions.ShowBorder = False
end
end
object dxLayoutControlContactoGroup3: TdxLayoutGroup
- AutoAligns = [aaHorizontal]
- Caption = 'Direcci'#243'n'
+ AlignVert = avTop
+ CaptionOptions.Text = 'Direcci'#243'n'
+ ButtonOptions.Buttons = <>
object dxLayoutControlContactoItem1: TdxLayoutItem
- Caption = 'Calle:'
+ CaptionOptions.Text = 'Calle:'
Control = eCalle
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoGroup10: TdxLayoutGroup
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControlContactoItem2: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'Provincia:'
+ CaptionOptions.Text = 'Provincia:'
Control = cbProvincia
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem4: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahRight
- Caption = 'C.P.:'
+ CaptionOptions.Text = 'C.P.:'
Control = eCodigoPostal
ControlOptions.ShowBorder = False
end
end
object dxLayoutControlContactoItem3: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'Poblaci'#243'n:'
+ CaptionOptions.Text = 'Poblaci'#243'n:'
Control = cbPoblacion
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem116: TdxLayoutItem
- Caption = 'Pa'#237's:'
+ CaptionOptions.Text = 'Pa'#237's:'
Control = ePais
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem167: TdxLayoutItem
- Caption = 'Persona contacto:'
+ CaptionOptions.Text = 'Persona contacto:'
Control = ePersonaContacto
ControlOptions.ShowBorder = False
end
end
end
object dxLayoutControlContactoGroup6: TdxLayoutGroup
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
ShowBorder = False
object dxLayoutControlContactoGroup2: TdxLayoutGroup
- Caption = 'Tel'#233'fonos'
+ CaptionOptions.Text = 'Tel'#233'fonos'
+ ButtonOptions.Buttons = <>
object dxLayoutControlContactoItem10: TdxLayoutItem
- Caption = 'Tel'#233'fono 1:'
+ CaptionOptions.Text = 'Tel'#233'fono 1:'
Control = eTlfTrabajo
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem9: TdxLayoutItem
- Caption = 'Tel'#233'fono 2:'
+ CaptionOptions.Text = 'Tel'#233'fono 2:'
Control = eTlfParticular
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem11: TdxLayoutItem
- Caption = 'M'#243'vil:'
+ CaptionOptions.Text = 'M'#243'vil:'
Control = eTlfMovil
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem12: TdxLayoutItem
- Caption = 'Fax:'
+ CaptionOptions.Text = 'Fax:'
Control = eFax
ControlOptions.ShowBorder = False
end
end
object dxLayoutControlContactoGroup5: TdxLayoutGroup
- Caption = 'Correo electr'#243'nico e internet'
+ CaptionOptions.Text = 'Correo electr'#243'nico e internet'
+ ButtonOptions.Buttons = <>
object dxLayoutControlContactoGroup12: TdxLayoutGroup
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControlContactoItem7: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'Correo de trabajo:'
+ CaptionOptions.Text = 'Correo de trabajo:'
Control = eMailTrabajo
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem18: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahRight
- Caption = 'PngSpeedButton3'
- ShowCaption = False
+ CaptionOptions.Text = 'PngSpeedButton3'
+ CaptionOptions.Visible = False
Control = PngSpeedButton3
ControlOptions.ShowBorder = False
end
end
object dxLayoutControlContactoGroup110: TdxLayoutGroup
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControlContactoGroup13: TdxLayoutGroup
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
ShowBorder = False
object dxLayoutControlContactoItem6: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'Correo particular:'
+ CaptionOptions.Text = 'Correo particular:'
Control = eMailParticular
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem5: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'P'#225'gina web:'
+ CaptionOptions.Text = 'P'#225'gina web:'
Control = ePaginaWeb
ControlOptions.ShowBorder = False
end
end
object dxLayoutControlContactoGroup11: TdxLayoutGroup
- AutoAligns = [aaVertical]
AlignHorz = ahRight
- ShowCaption = False
+ CaptionOptions.Visible = False
+ ButtonOptions.Buttons = <>
Hidden = True
ShowBorder = False
object dxLayoutControlContactoItem17: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahRight
- Caption = 'PngSpeedButton2'
- ShowCaption = False
+ CaptionOptions.Text = 'PngSpeedButton2'
+ CaptionOptions.Visible = False
Control = PngSpeedButton2
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem15: TdxLayoutItem
- AutoAligns = [aaVertical]
AlignHorz = ahRight
- Caption = 'PngSpeedButton1'
- ShowCaption = False
+ CaptionOptions.Text = 'PngSpeedButton1'
+ CaptionOptions.Visible = False
Control = PngSpeedButton1
ControlOptions.ShowBorder = False
end
@@ -709,14 +707,13 @@ inherited frViewContacto: TfrViewContacto
end
end
object dxLayoutControlContactoGroup7: TdxLayoutGroup
- AutoAligns = [aaHorizontal]
AlignVert = avClient
- Caption = 'Observaciones'
+ CaptionOptions.Text = 'Observaciones'
+ ButtonOptions.Buttons = <>
object dxLayoutControlContactoItem8: TdxLayoutItem
- AutoAligns = [aaHorizontal]
AlignVert = avClient
- Caption = 'cxDBMemo1'
- ShowCaption = False
+ CaptionOptions.Text = 'cxDBMemo1'
+ CaptionOptions.Visible = False
Control = eObservaciones
ControlOptions.ShowBorder = False
end
diff --git a/Source/Modulos/Contactos/Views/uViewContacto.pas b/Source/Modulos/Contactos/Views/uViewContacto.pas
index e58c24d..543df82 100644
--- a/Source/Modulos/Contactos/Views/uViewContacto.pas
+++ b/Source/Modulos/Contactos/Views/uViewContacto.pas
@@ -9,7 +9,8 @@ uses
JvComponent, JvFormAutoSize, cxControls, cxContainer, cxEdit, cxTextEdit,
cxDBEdit, dxLayoutControl, dxLayoutLookAndFeels, cxMemo, cxHyperLinkEdit,
ImgList, ActnList, PngImageList, PngSpeedButton, uDAInterfaces, uContactosController,
- cxGraphics, cxMaskEdit, cxDropDownEdit;
+ cxGraphics, cxMaskEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters,
+ dxLayoutcxEditAdapters;
type
IViewContacto = interface(IViewBase)
diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm
index a5f83c1..a028983 100644
--- a/Source/Modulos/Contactos/Views/uViewContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm
@@ -101,6 +101,7 @@ inherited frViewContactos: TfrViewContactos
Width = 557
ExplicitWidth = 557
inherited TBXDockablePanel1: TSpTBXDockablePanel
+ Width = 557
ExplicitWidth = 557
inherited dxLayoutControl1: TdxLayoutControl
Width = 557
@@ -122,12 +123,12 @@ inherited frViewContactos: TfrViewContactos
Width = 121
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 161
+ Left = 175
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 161
+ ExplicitLeft = 175
ExplicitWidth = 322
Width = 322
end
@@ -139,7 +140,7 @@ inherited frViewContactos: TfrViewContactos
end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 557
+ Width = 547
ExplicitWidth = 557
inherited tbxBotones: TSpTBXToolbar
Width = 547
@@ -150,13 +151,14 @@ inherited frViewContactos: TfrViewContactos
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
Top = 432
- ExplicitTop = 432
+ Width = 557
+ ExplicitTop = 431
ExplicitWidth = 557
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 557
ExplicitWidth = 557
inherited TBXToolbar1: TSpTBXToolbar
- Width = 547
+ Width = 557
ExplicitWidth = 547
end
end
diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas
index 339ae87..85d51f8 100644
--- a/Source/Modulos/Contactos/Views/uViewContactos.pas
+++ b/Source/Modulos/Contactos/Views/uViewContactos.pas
@@ -14,7 +14,9 @@ uses
dxPSEdgePatterns, dxPSCore, dxPScxCommon,
uDataModuleClientes, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase,
ComCtrls, TB2Item, SpTBXItem, TB2Toolbar, dxPgsDlg, dxPScxGrid6Lnk, uDAInterfaces, SpTBXDkPanels,
- TB2Dock, uCustomView, uViewBase;
+ TB2Dock, uCustomView, uViewBase, cxLookAndFeels, cxLookAndFeelPainters,
+ dxPSPDFExportCore, dxPSPDFExport, cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv,
+ dxPScxEditorProducers, dxPScxExtEditorProducers, dxPScxPageControlProducer;
type
IViewContactos = interface(IViewGrid)
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
index 515d817..d2fd025 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
@@ -47,16 +47,38 @@ inherited frViewEmpleados: TfrViewEmpleados
inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TSpTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl
+ inherited txtFiltroTodo: TcxTextEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ end
inherited edtFechaIniFiltro: TcxDateEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 238
Width = 238
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 342
- ExplicitLeft = 342
+ Left = 263
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 263
ExplicitWidth = 205
Width = 205
end
+ inherited eLista: TcxComboBox
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 140
+ Width = 140
+ end
end
end
end
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.pas b/Source/Modulos/Contactos/Views/uViewEmpleados.pas
index 89131a2..5937325 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleados.pas
+++ b/Source/Modulos/Contactos/Views/uViewEmpleados.pas
@@ -12,7 +12,10 @@ uses
cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
SpTBXItem, TB2Toolbar, SpTBXDkPanels, TB2Dock, uViewFiltroBase, uDAInterfaces,
- Menus;
+ Menus, cxLookAndFeels, cxLookAndFeelPainters, dxPSPDFExportCore,
+ dxPSPDFExport, cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv,
+ dxPScxEditorProducers, dxPScxExtEditorProducers, dxPScxPageControlProducer,
+ uCustomView, uViewBase;
type
IViewEmpleados = interface(IViewContactos)
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
index 0aa1dd2..e8606db 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
@@ -51,6 +51,7 @@ inherited frViewProveedores: TfrViewProveedores
Width = 483
ExplicitWidth = 483
inherited TBXDockablePanel1: TSpTBXDockablePanel
+ Width = 483
ExplicitWidth = 483
inherited dxLayoutControl1: TdxLayoutControl
Width = 483
@@ -72,12 +73,12 @@ inherited frViewProveedores: TfrViewProveedores
Width = 125
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 157
+ Left = 172
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 157
+ ExplicitLeft = 172
ExplicitWidth = 244
Width = 244
end
@@ -89,8 +90,8 @@ inherited frViewProveedores: TfrViewProveedores
end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
- Width = 483
- ExplicitWidth = 483
+ Width = 473
+ ExplicitWidth = 473
inherited tbxBotones: TSpTBXToolbar
Width = 473
ExplicitWidth = 473
@@ -100,14 +101,15 @@ inherited frViewProveedores: TfrViewProveedores
end
inherited pnlAgrupaciones: TSpTBXDockablePanel
Top = 409
+ Width = 483
ExplicitTop = 409
ExplicitWidth = 483
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 483
ExplicitWidth = 483
inherited TBXToolbar1: TSpTBXToolbar
- Width = 473
- ExplicitWidth = 473
+ Width = 483
+ ExplicitWidth = 483
end
end
end
@@ -117,6 +119,9 @@ inherited frViewProveedores: TfrViewProveedores
BuiltInReportLink = True
end
end
+ inherited dxPSEngineController1: TdxPSEngineController
+ Active = True
+ end
inherited GridPNGImageList: TPngImageList
PngImages = <
item
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.pas b/Source/Modulos/Contactos/Views/uViewProveedores.pas
index 15b6b57..b61ac1b 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedores.pas
+++ b/Source/Modulos/Contactos/Views/uViewProveedores.pas
@@ -12,7 +12,10 @@ uses
cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
SpTBXItem, TB2Toolbar, SpTBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox,
- uDAInterfaces, Menus, uCustomView, uViewBase;
+ uDAInterfaces, Menus, uCustomView, uViewBase, cxLookAndFeels,
+ cxLookAndFeelPainters, dxPSPDFExportCore, dxPSPDFExport, cxDrawTextUtils,
+ dxPSPrVwStd, dxPSPrVwAdv, dxPScxEditorProducers, dxPScxExtEditorProducers,
+ dxPScxPageControlProducer;
type
IViewProveedores = interface(IViewContactos)
diff --git a/Source/Modulos/Contactos/Views/uViewVendedor.dfm b/Source/Modulos/Contactos/Views/uViewVendedor.dfm
index dfdaa4d..202be24 100644
--- a/Source/Modulos/Contactos/Views/uViewVendedor.dfm
+++ b/Source/Modulos/Contactos/Views/uViewVendedor.dfm
@@ -67,7 +67,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 16
+ TabOrder = 17
end
object edtComision: TcxDBSpinEdit [8]
Left = 121
@@ -105,7 +105,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 10
+ TabOrder = 11
ExplicitLeft = 463
ExplicitWidth = 91
Width = 91
@@ -116,7 +116,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 9
+ TabOrder = 10
ExplicitLeft = 463
ExplicitWidth = 127
Width = 127
@@ -127,7 +127,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 11
+ TabOrder = 12
ExplicitLeft = 463
ExplicitWidth = 155
Width = 155
@@ -138,7 +138,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 12
+ TabOrder = 13
ExplicitLeft = 463
ExplicitWidth = 121
Width = 121
@@ -170,7 +170,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 13
+ TabOrder = 14
ExplicitLeft = 463
ExplicitWidth = 129
Width = 129
@@ -182,7 +182,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 14
+ TabOrder = 15
ExplicitLeft = 463
ExplicitWidth = 165
Width = 165
@@ -193,7 +193,7 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 15
+ TabOrder = 16
ExplicitLeft = 463
ExplicitWidth = 165
Width = 165
@@ -214,25 +214,32 @@ inherited frViewVendedor: TfrViewVendedor
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 8
+ TabOrder = 9
ExplicitLeft = 121
ExplicitWidth = 152
Width = 152
end
+ inherited ePais: TcxDBTextEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 8
+ end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
inherited dxLayoutControlContactoGroup16: TdxLayoutGroup
inherited dxLayoutControlContactoItem14: TdxLayoutItem
- Caption = 'DNI:'
+ CaptionOptions.Text = 'DNI:'
end
end
inherited dxLayoutControlContactoItem13: TdxLayoutItem
- Caption = 'Nombre y apellidos:'
+ CaptionOptions.Text = 'Nombre y apellidos:'
end
object dxLayoutControlContactoItem20: TdxLayoutItem
- Caption = 'Comisi'#243'n:'
+ CaptionOptions.Text = 'Comisi'#243'n:'
Control = edtComision
ControlOptions.ShowBorder = False
end
diff --git a/Source/Modulos/Contactos/Views/uViewVendedor.pas b/Source/Modulos/Contactos/Views/uViewVendedor.pas
index 00234ce..39f4b96 100644
--- a/Source/Modulos/Contactos/Views/uViewVendedor.pas
+++ b/Source/Modulos/Contactos/Views/uViewVendedor.pas
@@ -9,7 +9,8 @@ uses
cxMaskEdit, cxSpinEdit, ImgList, PngImageList, ActnList, cxHyperLinkEdit,
Buttons, PngSpeedButton, cxDropDownEdit, cxCalendar, cxGraphics,
uDAInterfaces, uCustomView, uViewBase, uBizContactos,
- uViewObservaciones;
+ uViewObservaciones, cxLookAndFeels, cxLookAndFeelPainters,
+ dxLayoutcxEditAdapters;
type
IViewVendedor = interface(IViewContacto)
@@ -22,7 +23,6 @@ type
private
FDataItem : TDADataTable;
- FListaUsuarios : TStringList;
function GetDataItem: TDADataTable;
procedure SetDataItem(const Value: TDADataTable);
diff --git a/Source/Modulos/Contactos/Views/uViewVendedores.pas b/Source/Modulos/Contactos/Views/uViewVendedores.pas
index a3a33cf..fb7d050 100644
--- a/Source/Modulos/Contactos/Views/uViewVendedores.pas
+++ b/Source/Modulos/Contactos/Views/uViewVendedores.pas
@@ -12,7 +12,9 @@ uses
cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
SpTBXItem, TB2Toolbar, SpTBXDkPanels, TB2Dock, uViewFiltroBase, uDAInterfaces,
- uCustomView, uViewBase;
+ uCustomView, uViewBase, cxLookAndFeels, cxLookAndFeelPainters,
+ dxPSPDFExportCore, dxPSPDFExport, cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv,
+ dxPScxEditorProducers, dxPScxExtEditorProducers, dxPScxPageControlProducer;
type
IViewVendedores = interface(IViewContactos)
diff --git a/Source/Modulos/Referencias/Views/uEditorReferencias.dfm b/Source/Modulos/Referencias/Views/uEditorReferencias.dfm
index 3cdda89..b8fd162 100644
--- a/Source/Modulos/Referencias/Views/uEditorReferencias.dfm
+++ b/Source/Modulos/Referencias/Views/uEditorReferencias.dfm
@@ -55,8 +55,8 @@ object fEditorReferencias: TfEditorReferencias
Height = 328
Align = alClient
TabOrder = 0
- LookAndFeel.Kind = lfOffice11
- LookAndFeel.NativeStyle = True
+ LookAndFeel.Kind = lfStandard
+ LookAndFeel.NativeStyle = True
object ListaReferenciasView: TcxGridDBTableView
NavigatorButtons.ConfirmDelete = False
FilterBox.Visible = fvNever
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index c63c78e..9bb3fec 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index b3752cb..fdb7b47 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
BEGIN
VALUE "FileVersion", "1.0.0.0\0"
VALUE "ProductVersion", "1.0.0.0\0"
- VALUE "CompileDate", "viernes, 22 de enero de 2010 10:34\0"
+ VALUE "CompileDate", "viernes, 22 de enero de 2010 12:49\0"
END
END
BLOCK "VarFileInfo"