diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB
index f4317862..8a1a4d4a 100644
Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ
diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas
index db91e2c9..ff54e160 100644
--- a/Source/Modulos/Contactos/Controller/uClientesController.pas
+++ b/Source/Modulos/Contactos/Controller/uClientesController.pas
@@ -338,6 +338,8 @@ begin
end;
end;
+ {
+ // Por ahora no existe el concepto de direcciones de entrega asi que esto está desactivado
if Result and (AContacto.Direcciones.RecordCount = 0) then
if (ShowConfirmMessage('El cliente no tiene direcciones asociadas',
AContacto.NOMBRE + ' no tiene ninguna dirección de envío dada de alta, ' + #10#13 +
@@ -345,7 +347,7 @@ begin
begin
FDireccionesController.CopiarDireccionFiscal(AContacto, AContacto.Direcciones);
FDireccionesController.Ver(AContacto.Direcciones);
- end;
+ end;}
end;
end;
diff --git a/Source/Modulos/Contactos/Controller/uContactosController.pas b/Source/Modulos/Contactos/Controller/uContactosController.pas
index e01530df..46ca370d 100644
--- a/Source/Modulos/Contactos/Controller/uContactosController.pas
+++ b/Source/Modulos/Contactos/Controller/uContactosController.pas
@@ -88,6 +88,7 @@ begin
begin
ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
USUARIO := AppFactuGES.UsuarioActivo.UserName;
+ REFERENCIA := '';
end;
Result.Post;
diff --git a/Source/Modulos/Contactos/Data/Contactos_data.dproj b/Source/Modulos/Contactos/Data/Contactos_data.dproj
index f9d3f422..b456abaa 100644
--- a/Source/Modulos/Contactos/Data/Contactos_data.dproj
+++ b/Source/Modulos/Contactos/Data/Contactos_data.dproj
@@ -49,23 +49,27 @@
MainSource
-
-
-
-
-
-
+
+
+
+
+
+
+ TDAClientDataModule
+ TDAClientDataModule
+ TDAClientDataModule
+ TDAClientDataModule
diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
index a752c916..f53d5462 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
@@ -7,6 +7,164 @@ inherited DataModuleClientes: TDataModuleClientes
inherited Bin2DataStreamer: TDABin2DataStreamer
Top = 136
end
+ inherited tbl_Contactos: TDAMemDataTable
+ Fields = <
+ item
+ Name = 'ID'
+ DataType = datAutoInc
+ GeneratorName = 'GEN_CONTACTOS_ID'
+ ServerAutoRefresh = True
+ DictionaryEntry = 'Contactos_ID'
+ InPrimaryKey = True
+ end
+ item
+ Name = 'ID_CATEGORIA'
+ DataType = datInteger
+ end
+ item
+ Name = 'NIF_CIF'
+ DataType = datString
+ Size = 15
+ DisplayLabel = 'NIF/CIF'
+ DictionaryEntry = 'Contactos_NIF_CIF'
+ end
+ item
+ Name = 'NOMBRE'
+ DataType = datString
+ Size = 255
+ Required = True
+ DisplayLabel = 'Nombre'
+ DictionaryEntry = 'Contactos_NOMBRE'
+ end
+ item
+ Name = 'PERSONA_CONTACTO'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Persona de contacto'
+ DictionaryEntry = 'Contactos_PERSONA_CONTACTO'
+ end
+ item
+ Name = 'CALLE'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Direcci'#243'n'
+ DictionaryEntry = 'Contactos_CALLE'
+ end
+ item
+ Name = 'POBLACION'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Poblaci'#243'n'
+ DictionaryEntry = 'Contactos_POBLACION'
+ end
+ item
+ Name = 'PROVINCIA'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Provincia'
+ DictionaryEntry = 'Contactos_PROVINCIA'
+ end
+ item
+ Name = 'CODIGO_POSTAL'
+ DataType = datString
+ Size = 10
+ DisplayLabel = 'C'#243'digo postal'
+ DictionaryEntry = 'Contactos_CODIGO_POSTAL'
+ end
+ item
+ Name = 'TELEFONO_1'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'Tlf. trabajo'
+ DictionaryEntry = 'Contactos_TELEFONO_1'
+ end
+ item
+ Name = 'TELEFONO_2'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'Tlf. particular'
+ DictionaryEntry = 'Contactos_TELEFONO_2'
+ end
+ item
+ Name = 'MOVIL_1'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'M'#243'vil'
+ DictionaryEntry = 'Contactos_MOVIL_1'
+ end
+ item
+ Name = 'MOVIL_2'
+ DataType = datString
+ Size = 25
+ DictionaryEntry = 'Contactos_MOVIL_2'
+ end
+ item
+ Name = 'FAX'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'Fax'
+ DictionaryEntry = 'Contactos_FAX'
+ end
+ item
+ Name = 'EMAIL_1'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'E-mail trabajo'
+ DictionaryEntry = 'Contactos_EMAIL_1'
+ end
+ item
+ Name = 'EMAIL_2'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'E-mail particular'
+ DictionaryEntry = 'Contactos_EMAIL_2'
+ end
+ item
+ Name = 'PAGINA_WEB'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Web'
+ DictionaryEntry = 'Contactos_PAGINA_WEB'
+ end
+ item
+ Name = 'NOTAS'
+ DataType = datMemo
+ BlobType = dabtMemo
+ DisplayLabel = 'Observaciones'
+ DictionaryEntry = 'Contactos_NOTAS'
+ end
+ item
+ Name = 'FECHA_ALTA'
+ DataType = datDateTime
+ DisplayLabel = 'Fecha de alta'
+ DictionaryEntry = 'Contactos_FECHA_ALTA'
+ end
+ item
+ Name = 'FECHA_MODIFICACION'
+ DataType = datDateTime
+ DisplayLabel = 'Fecha de modificaci'#243'n'
+ DictionaryEntry = 'Contactos_FECHA_MODIFICACION'
+ end
+ item
+ Name = 'USUARIO'
+ DataType = datString
+ Size = 20
+ DisplayLabel = 'Usuario'
+ DictionaryEntry = 'Contactos_USUARIO'
+ end
+ item
+ Name = 'ID_EMPRESA'
+ DataType = datInteger
+ end
+ item
+ Name = 'REFERENCIA'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Referencia'
+ ServerAutoRefresh = True
+ DictionaryEntry = 'Contactos_REFERENCIA'
+ end>
+ end
inherited ds_Contactos: TDADataSource
DataSet = tbl_Contactos.Dataset
end
@@ -169,6 +327,7 @@ inherited DataModuleClientes: TDataModuleClientes
Name = 'REFERENCIA'
DataType = datString
Size = 255
+ ServerAutoRefresh = True
DictionaryEntry = 'Clientes_REFERENCIA'
end
item
diff --git a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
index 2586822a..d80d16ea 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
@@ -1,4 +1,162 @@
inherited DataModuleEmpleados: TDataModuleEmpleados
+ inherited tbl_Contactos: TDAMemDataTable
+ Fields = <
+ item
+ Name = 'ID'
+ DataType = datAutoInc
+ GeneratorName = 'GEN_CONTACTOS_ID'
+ ServerAutoRefresh = True
+ DictionaryEntry = 'Contactos_ID'
+ InPrimaryKey = True
+ end
+ item
+ Name = 'ID_CATEGORIA'
+ DataType = datInteger
+ end
+ item
+ Name = 'NIF_CIF'
+ DataType = datString
+ Size = 15
+ DisplayLabel = 'NIF/CIF'
+ DictionaryEntry = 'Contactos_NIF_CIF'
+ end
+ item
+ Name = 'NOMBRE'
+ DataType = datString
+ Size = 255
+ Required = True
+ DisplayLabel = 'Nombre'
+ DictionaryEntry = 'Contactos_NOMBRE'
+ end
+ item
+ Name = 'PERSONA_CONTACTO'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Persona de contacto'
+ DictionaryEntry = 'Contactos_PERSONA_CONTACTO'
+ end
+ item
+ Name = 'CALLE'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Direcci'#243'n'
+ DictionaryEntry = 'Contactos_CALLE'
+ end
+ item
+ Name = 'POBLACION'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Poblaci'#243'n'
+ DictionaryEntry = 'Contactos_POBLACION'
+ end
+ item
+ Name = 'PROVINCIA'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Provincia'
+ DictionaryEntry = 'Contactos_PROVINCIA'
+ end
+ item
+ Name = 'CODIGO_POSTAL'
+ DataType = datString
+ Size = 10
+ DisplayLabel = 'C'#243'digo postal'
+ DictionaryEntry = 'Contactos_CODIGO_POSTAL'
+ end
+ item
+ Name = 'TELEFONO_1'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'Tlf. trabajo'
+ DictionaryEntry = 'Contactos_TELEFONO_1'
+ end
+ item
+ Name = 'TELEFONO_2'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'Tlf. particular'
+ DictionaryEntry = 'Contactos_TELEFONO_2'
+ end
+ item
+ Name = 'MOVIL_1'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'M'#243'vil'
+ DictionaryEntry = 'Contactos_MOVIL_1'
+ end
+ item
+ Name = 'MOVIL_2'
+ DataType = datString
+ Size = 25
+ DictionaryEntry = 'Contactos_MOVIL_2'
+ end
+ item
+ Name = 'FAX'
+ DataType = datString
+ Size = 25
+ DisplayLabel = 'Fax'
+ DictionaryEntry = 'Contactos_FAX'
+ end
+ item
+ Name = 'EMAIL_1'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'E-mail trabajo'
+ DictionaryEntry = 'Contactos_EMAIL_1'
+ end
+ item
+ Name = 'EMAIL_2'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'E-mail particular'
+ DictionaryEntry = 'Contactos_EMAIL_2'
+ end
+ item
+ Name = 'PAGINA_WEB'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Web'
+ DictionaryEntry = 'Contactos_PAGINA_WEB'
+ end
+ item
+ Name = 'NOTAS'
+ DataType = datMemo
+ BlobType = dabtMemo
+ DisplayLabel = 'Observaciones'
+ DictionaryEntry = 'Contactos_NOTAS'
+ end
+ item
+ Name = 'FECHA_ALTA'
+ DataType = datDateTime
+ DisplayLabel = 'Fecha de alta'
+ DictionaryEntry = 'Contactos_FECHA_ALTA'
+ end
+ item
+ Name = 'FECHA_MODIFICACION'
+ DataType = datDateTime
+ DisplayLabel = 'Fecha de modificaci'#243'n'
+ DictionaryEntry = 'Contactos_FECHA_MODIFICACION'
+ end
+ item
+ Name = 'USUARIO'
+ DataType = datString
+ Size = 20
+ DisplayLabel = 'Usuario'
+ DictionaryEntry = 'Contactos_USUARIO'
+ end
+ item
+ Name = 'ID_EMPRESA'
+ DataType = datInteger
+ end
+ item
+ Name = 'REFERENCIA'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Referencia'
+ ServerAutoRefresh = True
+ DictionaryEntry = 'Contactos_REFERENCIA'
+ end>
+ end
inherited ds_Contactos: TDADataSource
DataSet = tbl_Contactos.Dataset
end
@@ -162,6 +320,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
DataType = datString
Size = 255
DisplayLabel = 'Referencia'
+ ServerAutoRefresh = True
DictionaryEntry = 'Agentes_REFERENCIA'
end
item
diff --git a/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm b/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm
index 90782bd9..acc78d38 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm
@@ -1,6 +1,6 @@
inherited DataModuleProveedores: TDataModuleProveedores
- Height = 442
- Width = 763
+ Height = 311
+ Width = 550
inherited ds_Contactos: TDADataSource
DataSet = tbl_Contactos.Dataset
end
@@ -43,6 +43,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
Name = 'ID'
DataType = datAutoInc
GeneratorName = 'GEN_CONTACTOS_ID'
+ ServerAutoRefresh = True
DictionaryEntry = 'Contactos_ID'
InPrimaryKey = True
end
@@ -78,14 +79,14 @@ inherited DataModuleProveedores: TDataModuleProveedores
Name = 'CALLE'
DataType = datString
Size = 255
- DisplayLabel = 'Direcci'#195#179'n'
+ DisplayLabel = 'Direcci'#243'n'
DictionaryEntry = 'Contactos_CALLE'
end
item
Name = 'POBLACION'
DataType = datString
Size = 255
- DisplayLabel = 'Poblaci'#195#179'n'
+ DisplayLabel = 'Poblaci'#243'n'
DictionaryEntry = 'Contactos_POBLACION'
end
item
@@ -99,7 +100,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 10
- DisplayLabel = 'C'#195#179'digo postal'
+ DisplayLabel = 'C'#243'digo postal'
DictionaryEntry = 'Contactos_CODIGO_POSTAL'
end
item
@@ -120,7 +121,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
Name = 'MOVIL_1'
DataType = datString
Size = 25
- DisplayLabel = 'M'#195#179'vil'
+ DisplayLabel = 'M'#243'vil'
DictionaryEntry = 'Contactos_MOVIL_1'
end
item
@@ -189,6 +190,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
DataType = datString
Size = 255
DisplayLabel = 'Referencia'
+ ServerAutoRefresh = True
DictionaryEntry = 'Proveedores_REFERENCIA'
end
item
@@ -208,7 +210,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
Name = 'CODIGO_ASIGNADO'
DataType = datString
Size = 255
- DisplayLabel = 'C'#195#179'digo asignado'
+ DisplayLabel = 'C'#243'digo asignado'
DictionaryEntry = 'Proveedores_CODIGO_ASIGNADO'
end
item
@@ -220,7 +222,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
Name = 'REGIMEN_IVA'
DataType = datString
Size = 255
- DisplayLabel = 'R'#195#169'gimen de IVA'
+ DisplayLabel = 'R'#233'gimen de IVA'
DictionaryEntry = 'Proveedores_REGIMEN_IVA'
end
item
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index b96c9e71..de168eb0 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -5,7 +5,7 @@ inherited fEditorCliente: TfEditorCliente
ClientHeight = 585
ClientWidth = 656
ExplicitWidth = 664
- ExplicitHeight = 612
+ ExplicitHeight = 619
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -65,7 +65,7 @@ inherited fEditorCliente: TfEditorCliente
inherited pgPaginas: TPageControl
Width = 656
Height = 490
- ActivePage = pagDatosComerciales
+ ActivePage = pagDirecciones
ExplicitWidth = 656
ExplicitHeight = 490
inherited pagGeneral: TTabSheet
@@ -120,28 +120,28 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 269
end
inherited eCalle: TcxDBTextEdit
- Top = 294
- ExplicitTop = 294
+ Top = 267
+ ExplicitTop = 267
ExplicitWidth = 268
Width = 268
end
inherited eProvincia: TcxDBTextEdit
- Top = 348
- ExplicitTop = 348
+ Top = 321
+ ExplicitTop = 321
ExplicitWidth = 268
Width = 268
end
inherited ePoblacion: TcxDBTextEdit
- Top = 321
- ExplicitTop = 321
+ Top = 294
+ ExplicitTop = 294
ExplicitWidth = 78
Width = 78
end
inherited eCodigoPostal: TcxDBTextEdit
Left = 339
- Top = 321
+ Top = 294
ExplicitLeft = 339
- ExplicitTop = 321
+ ExplicitTop = 294
end
inherited eObservaciones: TcxDBMemo
Top = 399
@@ -181,7 +181,6 @@ inherited fEditorCliente: TfEditorCliente
ExplicitLeft = 432
ExplicitTop = 315
ExplicitWidth = 275
- ExplicitHeight = 21
Width = 275
end
inherited eTlfParticular: TcxDBTextEdit
@@ -205,6 +204,8 @@ inherited fEditorCliente: TfEditorCliente
Top = 84
ExplicitLeft = 527
ExplicitTop = 84
+ ExplicitWidth = 140
+ Width = 140
end
inherited eFax: TcxDBTextEdit
Left = 527
@@ -220,6 +221,12 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 158
Width = 158
end
+ inherited eCodigoAsignado: TcxDBTextEdit
+ Top = 111
+ ExplicitTop = 111
+ ExplicitWidth = 227
+ Width = 227
+ end
inherited eNIFCIF: TcxDBTextEdit
Left = 226
Top = 30
@@ -246,12 +253,6 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 121
Width = 121
end
- inherited eCodigoAsignado: TcxDBTextEdit
- Top = 111
- ExplicitTop = 111
- ExplicitWidth = 227
- Width = 227
- end
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 527
Top = 217
@@ -267,8 +268,8 @@ inherited fEditorCliente: TfEditorCliente
Width = 102
end
inherited ePersonaContacto: TcxDBTextEdit
- Top = 267
- ExplicitTop = 267
+ Top = 348
+ ExplicitTop = 348
ExplicitWidth = 253
Width = 253
end
@@ -336,21 +337,20 @@ inherited fEditorCliente: TfEditorCliente
LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 648
inherited Label1: TLabel
- Left = 340
+ Left = 397
Top = 30
- Width = 229
- Caption =
- 'Puede indicar el d'#237'a del mes que el cliente desea realizar el pa' +
- 'go de sus recibos.'
- ExplicitLeft = 340
+ Width = 206
+ Height = 39
+ ExplicitLeft = 397
ExplicitTop = 30
- ExplicitWidth = 229
+ ExplicitWidth = 206
+ ExplicitHeight = 39
end
inherited eDiasVencimiento: TcxDBSpinEdit
- Left = 466
- Top = 62
- ExplicitLeft = 466
- ExplicitTop = 62
+ Left = 464
+ Top = 75
+ ExplicitLeft = 464
+ ExplicitTop = 75
ExplicitWidth = 160
Width = 160
end
@@ -373,9 +373,9 @@ inherited fEditorCliente: TfEditorCliente
Width = 121
end
inherited bFormasPago: TButton
- Left = 180
+ Left = 237
Top = 57
- ExplicitLeft = 180
+ ExplicitLeft = 237
ExplicitTop = 57
end
inherited eIVA: TcxDBLookupComboBox
@@ -385,18 +385,11 @@ inherited fEditorCliente: TfEditorCliente
Width = 121
end
inherited bTiposIVA: TButton
- Left = 180
+ Left = 237
Top = 84
- ExplicitLeft = 180
+ ExplicitLeft = 237
ExplicitTop = 84
end
- inherited dxLayoutGroup1: TdxLayoutGroup
- inherited dxLayoutControl1Group5: TdxLayoutGroup
- inherited dxLayoutControl1Item2: TdxLayoutItem
- Caption = 'D'#237'a del mes para el pago:'
- end
- end
- end
end
end
end
@@ -434,34 +427,6 @@ inherited fEditorCliente: TfEditorCliente
inherited ToolBar1: TToolBar
Width = 648
ExplicitWidth = 648
- inherited ToolButton1: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 62
- end
- inherited ToolButton4: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 74
- end
- inherited ToolButton5: TToolButton
- Top = 0
- ExplicitTop = 0
- end
- inherited ToolButton2: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 67
- end
- inherited ToolButton6: TToolButton
- Top = 0
- ExplicitTop = 0
- end
- inherited ToolButton7: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 117
- end
end
end
end
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
index 49fce0d6..65af220d 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
@@ -7,7 +7,6 @@ inherited fEditorContacto: TfEditorContacto
ClientWidth = 632
Scaled = False
ExplicitWidth = 640
- ExplicitHeight = 488
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
index 55901294..161c413d 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
@@ -9,9 +9,6 @@ inherited fEditorContactos: TfEditorContactos
Caption = 'Lista de contactos'
end
inherited TBXDock: TTBXDock
- inherited tbxMain: TTBXToolbar
- ExplicitWidth = 543
- end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 269
inherited tbxEditFiltro: TTBXEditItem
@@ -26,17 +23,4 @@ inherited fEditorContactos: TfEditorContactos
ExplicitLeft = 334
end
end
- inherited EditorActionList: TActionList
- inherited actPrevisualizar: TAction
- Visible = True
- end
- inherited actImprimir: TAction
- Visible = True
- end
- end
- inherited GridPopupMenu: TPopupMenu
- inherited Duplicar1: TMenuItem
- Visible = False
- end
- end
end
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.pas b/Source/Modulos/Contactos/Views/uEditorContactos.pas
index 921ef705..087817ff 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.pas
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.pas
@@ -152,8 +152,6 @@ procedure TfEditorContactos.DuplicarInterno;
var
AContacto : IBizContacto;
begin
-AppFactuGES.ShowCapado;
-{
inherited;
AContacto := FController.Duplicar(Contactos);
try
@@ -161,7 +159,6 @@ AppFactuGES.ShowCapado;
finally
actRefrescar.Execute;
end;
-}
end;
procedure TfEditorContactos.EliminarInterno;
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm
index 92177670..f66629a0 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm
@@ -1,29 +1,29 @@
inherited frViewCliente: TfrViewCliente
- Width = 646
+ Width = 742
Height = 470
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
- ExplicitWidth = 646
+ ExplicitWidth = 742
ExplicitHeight = 470
inherited dxLayoutControlContacto: TdxLayoutControl
- Width = 646
+ Width = 742
Height = 470
ExplicitWidth = 646
ExplicitHeight = 470
inherited PngSpeedButton1: TPngSpeedButton
- Left = 585
- ExplicitLeft = 585
+ Left = 681
+ ExplicitLeft = 681
end
inherited PngSpeedButton2: TPngSpeedButton
- Left = 585
- ExplicitLeft = 585
+ Left = 681
+ ExplicitLeft = 681
end
inherited PngSpeedButton3: TPngSpeedButton
- Left = 585
- ExplicitLeft = 585
+ Left = 681
+ ExplicitLeft = 681
end
object Label1: TLabel [3]
- Left = 373
+ Left = 428
Top = 280
Width = 269
Height = 39
@@ -35,37 +35,37 @@ inherited frViewCliente: TfrViewCliente
end
inherited eCalle: TcxDBTextEdit
Left = 132
- Top = 304
- TabOrder = 9
+ Top = 277
+ TabOrder = 8
ExplicitLeft = 132
- ExplicitTop = 304
+ ExplicitTop = 277
ExplicitWidth = 175
Width = 175
end
inherited eProvincia: TcxDBTextEdit
Left = 132
- Top = 358
- TabOrder = 12
+ Top = 331
+ TabOrder = 11
ExplicitLeft = 132
- ExplicitTop = 358
+ ExplicitTop = 331
ExplicitWidth = 167
Width = 167
end
inherited ePoblacion: TcxDBTextEdit
Left = 132
- Top = 331
- TabOrder = 10
+ Top = 304
+ TabOrder = 9
ExplicitLeft = 132
- ExplicitTop = 331
+ ExplicitTop = 304
ExplicitWidth = 71
Width = 71
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 278
- Top = 331
- TabOrder = 11
- ExplicitLeft = 278
- ExplicitTop = 331
+ Left = 333
+ Top = 304
+ TabOrder = 10
+ ExplicitLeft = 333
+ ExplicitTop = 304
end
inherited eObservaciones: TcxDBMemo
Top = 415
@@ -164,7 +164,7 @@ inherited frViewCliente: TfrViewCliente
Width = 113
end
object cxDBCheckBox1: TcxDBCheckBox [13]
- Left = 373
+ Left = 428
Top = 325
Caption = 'Permitir el acceso de este cliente a la tienda web'
DataBinding.DataField = 'TIENDA_WEB'
@@ -189,30 +189,30 @@ inherited frViewCliente: TfrViewCliente
Width = 249
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 468
+ Left = 523
TabOrder = 14
- ExplicitLeft = 468
+ ExplicitLeft = 523
ExplicitWidth = 157
Width = 157
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 468
+ Left = 523
TabOrder = 13
- ExplicitLeft = 468
+ ExplicitLeft = 523
ExplicitWidth = 157
Width = 157
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 468
+ Left = 523
TabOrder = 15
- ExplicitLeft = 468
+ ExplicitLeft = 523
ExplicitWidth = 157
Width = 157
end
inherited eFax: TcxDBTextEdit
- Left = 468
+ Left = 523
TabOrder = 16
- ExplicitLeft = 468
+ ExplicitLeft = 523
ExplicitWidth = 157
Width = 157
end
@@ -223,50 +223,28 @@ inherited frViewCliente: TfrViewCliente
Width = 135
end
inherited eNIFCIF: TcxDBTextEdit
- Left = 259
- ExplicitLeft = 259
+ Left = 291
+ ExplicitLeft = 291
ExplicitWidth = 58
Width = 58
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
- Left = 468
+ Left = 523
Properties.Prefix = 'mailto:'
TabOrder = 17
- ExplicitLeft = 468
+ ExplicitLeft = 523
ExplicitWidth = 128
Width = 128
end
inherited eMailParticular: TcxDBHyperLinkEdit
- Left = 468
+ Left = 523
Properties.Prefix = 'mailto:'
TabOrder = 18
- ExplicitLeft = 468
+ ExplicitLeft = 523
ExplicitWidth = 128
Width = 128
end
- inherited ePaginaWeb: TcxDBHyperLinkEdit
- Left = 468
- TabOrder = 19
- ExplicitLeft = 468
- ExplicitWidth = 128
- Width = 128
- end
- inherited eReferencia: TcxDBTextEdit
- Left = 132
- ExplicitLeft = 132
- ExplicitWidth = 38
- Width = 38
- end
- inherited ePersonaContacto: TcxDBTextEdit
- Left = 132
- Top = 277
- TabOrder = 8
- ExplicitLeft = 132
- ExplicitTop = 277
- ExplicitWidth = 256
- Width = 256
- end
- object eCodigoAsignado: TcxDBTextEdit [25]
+ object eCodigoAsignado: TcxDBTextEdit [22]
Left = 132
Top = 109
DataBinding.DataField = 'CODIGO_ASIGNADO'
@@ -286,6 +264,28 @@ inherited frViewCliente: TfrViewCliente
TabOrder = 4
Width = 227
end
+ inherited ePaginaWeb: TcxDBHyperLinkEdit
+ Left = 523
+ TabOrder = 19
+ ExplicitLeft = 523
+ ExplicitWidth = 128
+ Width = 128
+ end
+ inherited eReferencia: TcxDBTextEdit
+ Left = 132
+ ExplicitLeft = 132
+ ExplicitWidth = 38
+ Width = 38
+ end
+ inherited ePersonaContacto: TcxDBTextEdit
+ Left = 132
+ Top = 358
+ TabOrder = 12
+ ExplicitLeft = 132
+ ExplicitTop = 358
+ ExplicitWidth = 256
+ Width = 256
+ end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
AutoAligns = [aaHorizontal]
AlignVert = avBottom
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm
index 2bd03d8e..20e53a66 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm
@@ -56,19 +56,30 @@ inherited frViewClientes: TfrViewClientes
DataBinding.FieldName = 'NOMBRE_COMERCIAL'
Width = 164
end
- object cxGridViewAGENTE: TcxGridDBColumn
- DataBinding.FieldName = 'AGENTE'
- Visible = False
+ end
+ end
+ inherited frViewFiltroBase1: TfrViewFiltroBase
+ inherited TBXDockablePanel1: TTBXDockablePanel
+ inherited dxLayoutControl1: TdxLayoutControl
+ inherited txtFiltroTodo: TcxTextEdit
+ ExplicitWidth = 273
+ Width = 273
+ end
+ inherited edtFechaIniFiltro: TcxDateEdit
+ ExplicitWidth = 121
+ Width = 121
+ end
+ inherited edtFechaFinFiltro: TcxDateEdit
+ ExplicitWidth = 284
+ Width = 284
+ end
end
end
end
inherited pnlAgrupaciones: TTBXDockablePanel
- ExplicitWidth = 128
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
inherited TBXToolbar1: TTBXToolbar
- object TBXItem2: TTBXItem
- Action = actAgente
- end
+ Visible = False
end
end
end
@@ -89,13 +100,6 @@ inherited frViewClientes: TfrViewClientes
inherited cxViewGridPopupMenu: TcxGridPopupMenu
Left = 32
end
- inherited ActionList1: TActionList
- object actAgente: TAction
- Caption = 'Agente'
- OnExecute = actAgenteExecute
- OnUpdate = actAgenteUpdate
- end
- end
inherited dxPrintStyleManager1: TdxPrintStyleManager
inherited dxPrintStyleManager1Style1: TdxPSPrintStyle
BuiltInStyle = True
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas
index 5fd03fc6..9cc273d2 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.pas
+++ b/Source/Modulos/Contactos/Views/uViewClientes.pas
@@ -25,11 +25,6 @@ type
cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn;
cxGridViewBLOQUEADO: TcxGridDBColumn;
cxGridViewTiendaWeb: TcxGridDBColumn;
- actAgente: TAction;
- cxGridViewAGENTE: TcxGridDBColumn;
- TBXItem2: TTBXItem;
- procedure actAgenteExecute(Sender: TObject);
- procedure actAgenteUpdate(Sender: TObject);
end;
@@ -41,24 +36,4 @@ uses uViewGridBase;
{$R *.dfm}
-procedure TfrViewClientes.actAgenteExecute(Sender: TObject);
-begin
- if (cxGridViewAGENTE.GroupIndex < 0) then
- begin
- cxGridViewAGENTE.GroupIndex := cxGridView.GroupedColumnCount;
- cxGridViewAGENTE.Visible := False;
- end
- else
- begin
- cxGridViewAGENTE.GroupIndex := -1;
- cxGridViewAGENTE.Visible := True;
- end;
-end;
-
-procedure TfrViewClientes.actAgenteUpdate(Sender: TObject);
-begin
- inherited;
- (Sender as TAction).Checked := not (cxGridViewAGENTE.GroupIndex < 0);
-end;
-
end.
diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm
index 62c87a14..cd573b59 100644
--- a/Source/Modulos/Contactos/Views/uViewContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm
@@ -104,7 +104,7 @@ inherited frViewContacto: TfrViewContacto
end
object eCalle: TcxDBTextEdit
Left = 115
- Top = 169
+ Top = 142
DataBinding.DataField = 'CALLE'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@@ -117,12 +117,12 @@ inherited frViewContacto: TfrViewContacto
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 4
+ TabOrder = 3
Width = 181
end
object eProvincia: TcxDBTextEdit
Left = 115
- Top = 223
+ Top = 196
DataBinding.DataField = 'PROVINCIA'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@@ -135,12 +135,12 @@ inherited frViewContacto: TfrViewContacto
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 7
+ TabOrder = 6
Width = 133
end
object ePoblacion: TcxDBTextEdit
Left = 115
- Top = 196
+ Top = 169
DataBinding.DataField = 'POBLACION'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@@ -153,12 +153,12 @@ inherited frViewContacto: TfrViewContacto
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 5
+ TabOrder = 4
Width = 111
end
object eCodigoPostal: TcxDBTextEdit
Left = 303
- Top = 196
+ Top = 169
DataBinding.DataField = 'CODIGO_POSTAL'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@@ -171,7 +171,7 @@ inherited frViewContacto: TfrViewContacto
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 6
+ TabOrder = 5
Width = 65
end
object eObservaciones: TcxDBMemo
@@ -376,6 +376,7 @@ inherited frViewContacto: TfrViewContacto
Top = 28
DataBinding.DataField = 'REFERENCIA'
DataBinding.DataSource = dsContacto
+ Enabled = False
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Color = clWindow
@@ -384,6 +385,7 @@ inherited frViewContacto: TfrViewContacto
Style.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
+ StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
@@ -393,7 +395,7 @@ inherited frViewContacto: TfrViewContacto
end
object ePersonaContacto: TcxDBTextEdit
Left = 115
- Top = 142
+ Top = 223
DataBinding.DataField = 'PERSONA_CONTACTO'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@@ -407,7 +409,7 @@ inherited frViewContacto: TfrViewContacto
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 3
+ TabOrder = 7
Width = 256
end
object dxLayoutControlContactoGroup_Root: TdxLayoutGroup
@@ -458,11 +460,6 @@ inherited frViewContacto: TfrViewContacto
object dxLayoutControlContactoGroup3: TdxLayoutGroup
AutoAligns = [aaHorizontal]
Caption = 'Direcci'#243'n'
- object dxLayoutControlContactoItem167: TdxLayoutItem
- Caption = 'Persona contacto:'
- Control = ePersonaContacto
- ControlOptions.ShowBorder = False
- end
object dxLayoutControlContactoItem1: TdxLayoutItem
Caption = 'Calle:'
Control = eCalle
@@ -491,6 +488,11 @@ inherited frViewContacto: TfrViewContacto
Control = eProvincia
ControlOptions.ShowBorder = False
end
+ object dxLayoutControlContactoItem167: TdxLayoutItem
+ Caption = 'Persona contacto:'
+ Control = ePersonaContacto
+ ControlOptions.ShowBorder = False
+ end
end
end
object dxLayoutControlContactoGroup6: TdxLayoutGroup
@@ -502,13 +504,12 @@ inherited frViewContacto: TfrViewContacto
object dxLayoutControlContactoGroup2: TdxLayoutGroup
Caption = 'Tel'#233'fonos'
object dxLayoutControlContactoItem10: TdxLayoutItem
- Caption = 'Tlf. trabajo:'
+ Caption = 'Tel'#233'fono 1:'
Control = eTlfTrabajo
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem9: TdxLayoutItem
- Caption = 'Tlf. particular:'
- Visible = False
+ Caption = 'Tel'#233'fono 2:'
Control = eTlfParticular
ControlOptions.ShowBorder = False
end
diff --git a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm
index 862fd540..b3d07cf0 100644
--- a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm
+++ b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm
@@ -75,5 +75,33 @@ inherited frViewDireccionesEntrega: TfrViewDireccionesEntrega
inherited ToolBar1: TToolBar
Width = 583
ExplicitWidth = 583
+ inherited ToolButton1: TToolButton
+ Top = 0
+ ExplicitTop = 0
+ ExplicitWidth = 62
+ end
+ inherited ToolButton4: TToolButton
+ Top = 0
+ ExplicitTop = 0
+ ExplicitWidth = 74
+ end
+ inherited ToolButton5: TToolButton
+ Top = 0
+ ExplicitTop = 0
+ end
+ inherited ToolButton2: TToolButton
+ Top = 0
+ ExplicitTop = 0
+ ExplicitWidth = 67
+ end
+ inherited ToolButton6: TToolButton
+ Top = 0
+ ExplicitTop = 0
+ end
+ inherited ToolButton7: TToolButton
+ Top = 0
+ ExplicitTop = 0
+ ExplicitWidth = 117
+ end
end
end
diff --git a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
index 5bd6e451..9e6b0567 100644
--- a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
+++ b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
@@ -24,6 +24,7 @@ type
cxGridViewEMAIL: TcxGridDBColumn;
cxGridViewPORTE: TcxGridDBColumn;
procedure cxGridViewDblClick(Sender: TObject);
+ procedure actEliminarExecute(Sender: TObject);
protected
procedure AnadirInterno; override;
procedure ModificarInterno; override;
@@ -36,7 +37,13 @@ implementation
{$R *.dfm}
uses
- uDireccionesContactoController, uBizDireccionesContacto;
+ uDialogUtils, uDireccionesContactoController, uBizDireccionesContacto;
+
+procedure TfrViewDireccionesEntrega.actEliminarExecute(Sender: TObject);
+begin
+ if (ShowConfirmMessage('Eliminar una dirección', '¿Desea eliminar esta dirección?') = IDYES) then
+ inherited;
+end;
procedure TfrViewDireccionesEntrega.AnadirInterno;
begin
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
index fad2e9eb..20dcc102 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
@@ -8,37 +8,37 @@ inherited frViewEmpleado: TfrViewEmpleado
ExplicitHeight = 391
inherited eCalle: TcxDBTextEdit
Left = 121
- Top = 193
- TabOrder = 7
+ Top = 166
+ TabOrder = 6
ExplicitLeft = 121
- ExplicitTop = 193
+ ExplicitTop = 166
ExplicitWidth = 260
Width = 260
end
inherited eProvincia: TcxDBTextEdit
Left = 121
- Top = 247
- TabOrder = 10
+ Top = 220
+ TabOrder = 9
ExplicitLeft = 121
- ExplicitTop = 247
+ ExplicitTop = 220
ExplicitWidth = 260
Width = 260
end
inherited ePoblacion: TcxDBTextEdit
Left = 121
- Top = 220
- TabOrder = 8
+ Top = 193
+ TabOrder = 7
ExplicitLeft = 121
- ExplicitTop = 220
+ ExplicitTop = 193
ExplicitWidth = 159
Width = 159
end
inherited eCodigoPostal: TcxDBTextEdit
Left = 348
- Top = 220
- TabOrder = 9
+ Top = 193
+ TabOrder = 8
ExplicitLeft = 348
- ExplicitTop = 220
+ ExplicitTop = 193
end
inherited eObservaciones: TcxDBMemo
Top = 304
@@ -51,29 +51,17 @@ inherited frViewEmpleado: TfrViewEmpleado
Left = 538
TabOrder = 12
ExplicitLeft = 538
+ ExplicitWidth = 91
+ Width = 91
end
inherited eTlfTrabajo: TcxDBTextEdit
Left = 538
TabOrder = 11
ExplicitLeft = 538
+ ExplicitWidth = 127
+ Width = 127
end
- inherited eTlfMovil: TcxDBTextEdit
- Left = 538
- TabOrder = 13
- ExplicitLeft = 538
- end
- inherited eFax: TcxDBTextEdit
- Left = 538
- TabOrder = 14
- ExplicitLeft = 538
- end
- inherited eNombre: TcxDBTextEdit
- Left = 121
- ExplicitLeft = 121
- ExplicitWidth = 263
- Width = 263
- end
- object eFechaNacimiento: TcxDBDateEdit [13]
+ object eFechaNacimiento: TcxDBDateEdit [10]
Left = 121
Top = 82
DataBinding.DataField = 'FECHA_NACIMIENTO'
@@ -90,7 +78,7 @@ inherited frViewEmpleado: TfrViewEmpleado
TabOrder = 3
Width = 121
end
- object eFechaAltaEmpresa: TcxDBDateEdit [14]
+ object eFechaAltaEmpresa: TcxDBDateEdit [11]
Left = 262
Top = 82
DataBinding.DataField = 'FECHA_ALTA_EMPRESA'
@@ -107,29 +95,27 @@ inherited frViewEmpleado: TfrViewEmpleado
TabOrder = 4
Width = 235
end
- inherited eNIFCIF: TcxDBTextEdit
- Left = 289
- ExplicitLeft = 289
- ExplicitWidth = 100
- Width = 100
- end
- inherited eMailTrabajo: TcxDBHyperLinkEdit
+ inherited eTlfMovil: TcxDBTextEdit
Left = 538
- Properties.Prefix = 'mailto:'
- TabOrder = 15
+ TabOrder = 13
ExplicitLeft = 538
- ExplicitWidth = 129
- Width = 129
+ ExplicitWidth = 155
+ Width = 155
end
- inherited eMailParticular: TcxDBHyperLinkEdit
+ inherited eFax: TcxDBTextEdit
Left = 538
- Properties.Prefix = 'mailto:'
- TabOrder = 16
+ TabOrder = 14
ExplicitLeft = 538
- ExplicitWidth = 165
- Width = 165
+ ExplicitWidth = 121
+ Width = 121
end
- object cbCategoria: TcxDBComboBox [18]
+ inherited eNombre: TcxDBTextEdit
+ Left = 121
+ ExplicitLeft = 121
+ ExplicitWidth = 263
+ Width = 263
+ end
+ object cbCategoria: TcxDBComboBox [15]
Left = 121
Top = 109
DataBinding.DataField = 'CATEGORIA'
@@ -153,6 +139,28 @@ inherited frViewEmpleado: TfrViewEmpleado
TabOrder = 5
Width = 225
end
+ inherited eNIFCIF: TcxDBTextEdit
+ Left = 255
+ ExplicitLeft = 255
+ ExplicitWidth = 100
+ Width = 100
+ end
+ inherited eMailTrabajo: TcxDBHyperLinkEdit
+ Left = 538
+ Properties.Prefix = 'mailto:'
+ TabOrder = 15
+ ExplicitLeft = 538
+ ExplicitWidth = 129
+ Width = 129
+ end
+ inherited eMailParticular: TcxDBHyperLinkEdit
+ Left = 538
+ Properties.Prefix = 'mailto:'
+ TabOrder = 16
+ ExplicitLeft = 538
+ ExplicitWidth = 165
+ Width = 165
+ end
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 538
TabOrder = 17
@@ -163,13 +171,17 @@ inherited frViewEmpleado: TfrViewEmpleado
inherited eReferencia: TcxDBTextEdit
Left = 121
ExplicitLeft = 121
+ ExplicitWidth = 38
+ Width = 38
end
inherited ePersonaContacto: TcxDBTextEdit
Left = 121
- Top = 166
- TabOrder = 6
+ Top = 247
+ TabOrder = 10
ExplicitLeft = 121
- ExplicitTop = 166
+ ExplicitTop = 247
+ ExplicitWidth = 256
+ Width = 256
end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
@@ -217,8 +229,11 @@ inherited frViewEmpleado: TfrViewEmpleado
end
inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
inherited dxLayoutControlContactoGroup2: TdxLayoutGroup
+ inherited dxLayoutControlContactoItem10: TdxLayoutItem
+ Caption = 'Tlf. trabajo:'
+ end
inherited dxLayoutControlContactoItem9: TdxLayoutItem
- Visible = True
+ Caption = 'Tlf. particular:'
end
inherited dxLayoutControlContactoItem12: TdxLayoutItem
Visible = False
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.pas b/Source/Modulos/Contactos/Views/uViewEmpleado.pas
index af7814bf..7677e0b9 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleado.pas
+++ b/Source/Modulos/Contactos/Views/uViewEmpleado.pas
@@ -7,7 +7,8 @@ uses
Dialogs, uViewContacto, dxLayoutLookAndFeels, DB, uDADataTable,
dxLayoutControl, cxMemo, cxDBEdit, cxContainer, cxEdit, cxTextEdit, cxControls,
cxMaskEdit, cxSpinEdit, ImgList, PngImageList, ActnList, cxHyperLinkEdit,
- Buttons, PngSpeedButton, cxDropDownEdit, cxCalendar, cxGraphics, uGruposEmpleadoController;
+ Buttons, PngSpeedButton, cxDropDownEdit, cxCalendar, cxGraphics, uGruposEmpleadoController,
+ uDAInterfaces;
type
IViewEmpleado = interface(IViewContacto)
diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
index 8617c312..c013eed6 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
@@ -1,25 +1,28 @@
inherited frViewProveedor: TfrViewProveedor
+ Width = 799
Height = 454
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
+ ExplicitWidth = 799
ExplicitHeight = 454
inherited dxLayoutControlContacto: TdxLayoutControl
+ Width = 799
Height = 454
ExplicitHeight = 454
inherited PngSpeedButton1: TPngSpeedButton
- Left = 613
- ExplicitLeft = 613
+ Left = 738
+ ExplicitLeft = 738
end
inherited PngSpeedButton2: TPngSpeedButton
- Left = 613
- ExplicitLeft = 613
+ Left = 738
+ ExplicitLeft = 738
end
inherited PngSpeedButton3: TPngSpeedButton
- Left = 613
- ExplicitLeft = 613
+ Left = 738
+ ExplicitLeft = 738
end
object Label1: TLabel [3]
- Left = 370
+ Left = 438
Top = 307
Width = 342
Height = 26
@@ -30,37 +33,37 @@ inherited frViewProveedor: TfrViewProveedor
end
inherited eCalle: TcxDBTextEdit
Left = 134
- Top = 304
- TabOrder = 9
+ Top = 277
+ TabOrder = 8
ExplicitLeft = 134
- ExplicitTop = 304
+ ExplicitTop = 277
ExplicitWidth = 264
Width = 264
end
inherited eProvincia: TcxDBTextEdit
Left = 134
- Top = 358
- TabOrder = 12
+ Top = 331
+ TabOrder = 11
ExplicitLeft = 134
- ExplicitTop = 358
+ ExplicitTop = 331
ExplicitWidth = 264
Width = 264
end
inherited ePoblacion: TcxDBTextEdit
Left = 134
- Top = 331
- TabOrder = 10
+ Top = 304
+ TabOrder = 9
ExplicitLeft = 134
- ExplicitTop = 331
+ ExplicitTop = 304
ExplicitWidth = 163
Width = 163
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 275
- Top = 331
- TabOrder = 11
- ExplicitLeft = 275
- ExplicitTop = 331
+ Left = 343
+ Top = 304
+ TabOrder = 10
+ ExplicitLeft = 343
+ ExplicitTop = 304
end
inherited eObservaciones: TcxDBMemo
Top = 415
@@ -70,7 +73,7 @@ inherited frViewProveedor: TfrViewProveedor
Height = 20
end
object cxDBCheckBox1: TcxDBCheckBox [9]
- Left = 370
+ Left = 438
Top = 280
Caption = 'Incluir este proveedor en la tienda web'
DataBinding.DataField = 'TIENDA_WEB'
@@ -200,30 +203,30 @@ inherited frViewProveedor: TfrViewProveedor
Width = 221
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 465
+ Left = 533
TabOrder = 14
- ExplicitLeft = 465
+ ExplicitLeft = 533
ExplicitWidth = 91
Width = 91
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 465
+ Left = 533
TabOrder = 13
- ExplicitLeft = 465
+ ExplicitLeft = 533
ExplicitWidth = 127
Width = 127
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 465
+ Left = 533
TabOrder = 15
- ExplicitLeft = 465
+ ExplicitLeft = 533
ExplicitWidth = 155
Width = 155
end
inherited eFax: TcxDBTextEdit
- Left = 465
+ Left = 533
TabOrder = 16
- ExplicitLeft = 465
+ ExplicitLeft = 533
ExplicitWidth = 121
Width = 121
end
@@ -234,31 +237,31 @@ inherited frViewProveedor: TfrViewProveedor
Width = 221
end
inherited eNIFCIF: TcxDBTextEdit
- Left = 207
- ExplicitLeft = 207
+ Left = 217
+ ExplicitLeft = 217
ExplicitWidth = 205
Width = 205
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
- Left = 465
+ Left = 533
Properties.Prefix = 'mailto:'
TabOrder = 17
- ExplicitLeft = 465
+ ExplicitLeft = 533
ExplicitWidth = 133
Width = 133
end
inherited eMailParticular: TcxDBHyperLinkEdit
- Left = 465
+ Left = 533
Properties.Prefix = 'mailto:'
TabOrder = 18
- ExplicitLeft = 465
+ ExplicitLeft = 533
ExplicitWidth = 133
Width = 133
end
inherited ePaginaWeb: TcxDBHyperLinkEdit
- Left = 465
+ Left = 533
TabOrder = 19
- ExplicitLeft = 465
+ ExplicitLeft = 533
ExplicitWidth = 133
Width = 133
end
@@ -270,10 +273,10 @@ inherited frViewProveedor: TfrViewProveedor
end
inherited ePersonaContacto: TcxDBTextEdit
Left = 134
- Top = 277
- TabOrder = 8
+ Top = 358
+ TabOrder = 12
ExplicitLeft = 134
- ExplicitTop = 277
+ ExplicitTop = 358
ExplicitWidth = 256
Width = 256
end
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
index 37730c25..d95a3fce 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
@@ -51,8 +51,8 @@ inherited frViewProveedores: TfrViewProveedores
Width = 483
ExplicitWidth = 483
inherited edtFechaFinFiltro: TcxDateEdit
- ExplicitWidth = 206
- Width = 206
+ ExplicitWidth = 228
+ Width = 228
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel