diff --git a/Build/Build.fbp5 b/Build/Build.fbp5
index 6e979b67..defe384e 100644
--- a/Build/Build.fbp5
+++ b/Build/Build.fbp5
@@ -2968,8 +2968,13 @@ Comments=
Contactos
0
+<<<<<<< .mine
+ Contactos
+ True
+=======
Contactos
False
+>>>>>>> .r42
True
False
True
diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB
index b0e119f8..b2bac923 100644
Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ
diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index d1a47461..23b3fd1e 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -1066,7 +1066,7 @@ SELECT
PROVEEDORES_DATOS.CERTIFICACION
FROM
PROVEEDORES_DATOS
- INNER JOIN V_CONTACTOS ON (PROVEEDORES_DATOS.ID_PROVEEDOR = V_CONTACTOS.ID)
+ LEFT OUTER JOIN V_CONTACTOS ON (PROVEEDORES_DATOS.ID_PROVEEDOR = V_CONTACTOS.ID)
WHERE
V_CONTACTOS.ID_CATEGORIA = 2;
@@ -1106,7 +1106,7 @@ SELECT V_CONTACTOS.ID,
EMPLEADOS_DATOS.EXPERIENCIA
FROM V_CONTACTOS
-INNER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)
+LEFT OUTER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)
WHERE V_CONTACTOS.ID_CATEGORIA = 3;
SET TERM ^ ;
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 8b251f31..1641339f 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 2b0c2d3f..b741b0ab 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -57,22 +57,22 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm
index 8bcc1eda..e658abbe 100644
--- a/Source/GUIBase/uViewGrid.dfm
+++ b/Source/GUIBase/uViewGrid.dfm
@@ -19,7 +19,7 @@ inherited frViewGrid: TfrViewGrid
LookAndFeel.Kind = lfOffice11
LookAndFeel.NativeStyle = True
object cxGridView: TcxGridDBTableView
- OnDblClick = cxGridViewDblClick
+ OnDblClick = cxGridViewDblClick
NavigatorButtons.ConfirmDelete = False
FilterBox.Visible = fvNever
DataController.DataSource = dsDataSource
@@ -107,6 +107,7 @@ inherited frViewGrid: TfrViewGrid
SupportedDocks = [dkStandardDock, dkMultiDock]
TabOrder = 2
Visible = False
+ ExplicitWidth = 128
object TBXAlignmentPanel1: TTBXAlignmentPanel
Left = 0
Top = 0
@@ -154,7 +155,7 @@ inherited frViewGrid: TfrViewGrid
PrinterPage.ScaleMode = smFit
PrinterPage._dxMeasurementUnits_ = 0
PrinterPage._dxLastMU_ = 2
- ReportDocument.CreationDate = 39296.809313506940000000
+ ReportDocument.CreationDate = 39367.963260995370000000
StyleManager = dxPrintStyleManager1
OptionsCards.Shadow.Depth = 0
OptionsExpanding.ExpandGroupRows = True
diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas
index cf63992e..9bab8383 100644
--- a/Source/GUIBase/uViewGrid.pas
+++ b/Source/GUIBase/uViewGrid.pas
@@ -1,4 +1,4 @@
-{*******************************************************}
+{*******************************************************}
{ }
{ Administración de puntos de venta }
{ }
@@ -21,7 +21,7 @@ uses
dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg,
cxIntlPrintSys3, dxPSPrvwAdv, uViewGridBase, cxGridCustomPopupMenu,
cxGridPopupMenu, uViewFiltroBase, ComCtrls, cxPC, ImgList, PngImageList,
- TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg;
+ TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg, uDAInterfaces;
type
IViewGrid = interface(IViewGridBase)
diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas
index 293a96de..4e4c072e 100644
--- a/Source/GUIBase/uViewGridBase.pas
+++ b/Source/GUIBase/uViewGridBase.pas
@@ -19,7 +19,7 @@ uses
DBGrids, JvComponent, JvFormAutoSize, dxPSGlbl, dxPSUtl, dxPSEngn,
dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg,
- cxIntlPrintSys3, dxPSPrvwAdv, uGridUtils, uViewFiltroBase;
+ cxIntlPrintSys3, dxPSPrvwAdv, uGridUtils, uViewFiltroBase, uDAInterfaces;
type
IViewGridBase = interface(IViewBase)
diff --git a/Source/Modulos/Contactos/Contactos_Group.groupproj b/Source/Modulos/Contactos/Contactos_Group.groupproj
new file mode 100644
index 00000000..99210e36
--- /dev/null
+++ b/Source/Modulos/Contactos/Contactos_Group.groupproj
@@ -0,0 +1,124 @@
+
+
+ {9e374daa-b130-47db-a2de-c184f072bea0}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Default.Personality
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.dpk b/Source/Modulos/Contactos/Controller/Contactos_controller.dpk
index a97bbbff..79dd733e 100644
--- a/Source/Modulos/Contactos/Controller/Contactos_controller.dpk
+++ b/Source/Modulos/Contactos/Controller/Contactos_controller.dpk
@@ -29,6 +29,7 @@ requires
vcl,
Base,
GUIBase,
+ ApplicationBase,
Contactos_model,
Contactos_data;
diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
index 13542221..4d1e07ae 100644
--- a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
+++ b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
@@ -43,9 +43,6 @@
Package
FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
-
-
JCL Debug IDE extension
JCL Project Analyzer
JCL Open and Save IDE dialogs with favorite folders
@@ -56,6 +53,7 @@
MainSource
+
@@ -93,7 +91,6 @@
-
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dpk b/Source/Modulos/Contactos/Views/Contactos_view.dpk
index 9ab5f3cf..ca77ad23 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dpk
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dpk
@@ -29,6 +29,7 @@ requires
vcl,
Base,
GUIBase,
+ ApplicationBase,
FormasPago_model,
FormasPago_controller,
TiposIVA_model,
diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas
index 1ee94a2f..bab316d5 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,
- TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog;
+ TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;
type
TfEditorClientes = class(TfEditorContactos, IEditorClientes)
@@ -159,7 +159,8 @@ procedure TfEditorClientes.PonerTitulos(const ATitulo: string);
var
FTitulo : String;
begin
- FTitulo := 'Lista de clientes - ' + dmUsuarios.EmpresaActual.NOMBRE;
+ // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+// FTitulo := 'Lista de clientes - ' + dmUsuarios.EmpresaActual.NOMBRE;
inherited PonerTitulos(FTitulo);
end;
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
index 432d0a42..49fce0d6 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
@@ -7,7 +7,7 @@ inherited fEditorContacto: TfEditorContacto
ClientWidth = 632
Scaled = False
ExplicitWidth = 640
- ExplicitHeight = 240
+ ExplicitHeight = 488
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.pas b/Source/Modulos/Contactos/Views/uEditorContacto.pas
index 927b27ae..047966c2 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.pas
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.pas
@@ -13,7 +13,8 @@ uses
JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase,
uIEditorContacto, uContactosController, TBXStatusBars, JvExComCtrls,
- JvStatusBar, uViewContactoDatosBancarios, dxLayoutLookAndFeels, JvLabel;
+ JvStatusBar, uViewContactoDatosBancarios, dxLayoutLookAndFeels, JvLabel,
+ uDAInterfaces;
type
TfEditorContacto = class(TfEditorDBItem, IEditorContacto)
@@ -101,7 +102,8 @@ begin
inherited PonerTitulos(FTitulo);
- Self.Caption := FTitulo + ' (' + dmUsuarios.EmpresaActual.NOMBRE + ')';
+// OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+// Self.Caption := FTitulo + ' (' + dmUsuarios.EmpresaActual.NOMBRE + ')';
end;
procedure TfEditorContacto.SetContacto(const Value: IBizContacto);
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
index b46aee58..55901294 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
@@ -2,8 +2,7 @@ inherited fEditorContactos: TfEditorContactos
Left = 285
Top = 448
Caption = 'Lista de contactos'
- ExplicitWidth = 320
- ExplicitHeight = 240
+ ExplicitHeight = 471
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.pas b/Source/Modulos/Contactos/Views/uEditorContactos.pas
index b4592bea..92521459 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.pas
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.pas
@@ -46,7 +46,7 @@ implementation
uses
uCustomEditor, uDataModuleContactos,
- uEditorDBBase,
+ uEditorDBBase, uFactuGES_App,
cxGrid, cxGridCustomTableView, uDBSelectionListUtils;
{$R *.dfm}
@@ -101,8 +101,9 @@ var
FTitulo : String;
begin
FTitulo := ATitulo;
- if FTitulo = '' then
- FTitulo := 'Lista de contactos - ' + dmUsuarios.EmpresaActual.NOMBRE;
+ // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+{ if FTitulo = '' then
+ FTitulo := 'Lista de contactos - ' + dmUsuarios.EmpresaActual.NOMBRE;}
inherited PonerTitulos(FTitulo);
end;
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
index 0ecd12d8..09805033 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
@@ -1,6 +1,5 @@
inherited fEditorEmpleados: TfEditorEmpleados
Caption = 'fEditorEmpleados'
- ExplicitWidth = 551
ExplicitHeight = 478
PixelsPerInch = 96
TextHeight = 13
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
index 18daf1b0..83f4c208 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
@@ -10,7 +10,7 @@ uses
TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
JvExControls, JvComponent, JvNavigationPane, uViewGridBase, uViewGrid,
uViewContactos, uViewEmpleados, uIEditorEmpleados, pngimage, TBXStatusBars,
- JvExComCtrls, JvStatusBar, JSDialog, uContactosController;
+ JvExComCtrls, JvStatusBar, JSDialog, uContactosController, uDAInterfaces;
type
TfEditorEmpleados = class(TfEditorContactos, IEditorEmpleados)
@@ -139,7 +139,8 @@ procedure TfEditorEmpleados.PonerTitulos(const ATitulo: string);
var
FTitulo : String;
begin
- FTitulo := 'Lista de empleados - ' + dmUsuarios.EmpresaActual.NOMBRE;
+// ojooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+// FTitulo := 'Lista de empleados - ' + dmUsuarios.EmpresaActual.NOMBRE;
inherited PonerTitulos(FTitulo);
end;
diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm
index bfc66ea5..e3ca1eb8 100644
--- a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm
@@ -3,7 +3,7 @@ inherited fEditorProveedor: TfEditorProveedor
ClientHeight = 590
ClientWidth = 648
ExplicitWidth = 656
- ExplicitHeight = 624
+ ExplicitHeight = 617
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -148,6 +148,24 @@ inherited fEditorProveedor: TfEditorProveedor
ExplicitWidth = 310
Width = 310
end
+ inherited cxDBCheckBox2: TcxDBCheckBox
+ Top = 189
+ ExplicitTop = 189
+ ExplicitWidth = 326
+ Width = 326
+ end
+ inherited eCertificaciones: TcxDBTextEdit
+ Top = 216
+ ExplicitTop = 216
+ ExplicitWidth = 227
+ Width = 227
+ end
+ inherited cbGrupoProveedor: TcxDBComboBox
+ Top = 138
+ ExplicitTop = 138
+ ExplicitWidth = 227
+ Width = 227
+ end
inherited eTlfParticular: TcxDBTextEdit
Left = 486
Top = 57
@@ -164,6 +182,18 @@ inherited fEditorProveedor: TfEditorProveedor
ExplicitWidth = 172
Width = 172
end
+ inherited eDescripcionProveedor: TcxDBTextEdit
+ Top = 84
+ ExplicitTop = 84
+ ExplicitWidth = 221
+ Width = 221
+ end
+ inherited eCodigoAsignado: TcxDBTextEdit
+ Top = 111
+ ExplicitTop = 111
+ ExplicitWidth = 221
+ Width = 221
+ end
inherited eTlfMovil: TcxDBTextEdit
Left = 486
Top = 84
@@ -186,24 +216,6 @@ inherited fEditorProveedor: TfEditorProveedor
ExplicitWidth = 263
Width = 263
end
- inherited cxDBCheckBox2: TcxDBCheckBox
- Top = 189
- ExplicitTop = 189
- ExplicitWidth = 326
- Width = 326
- end
- inherited eCertificaciones: TcxDBTextEdit
- Top = 216
- ExplicitTop = 216
- ExplicitWidth = 227
- Width = 227
- end
- inherited cbGrupoProveedor: TcxDBComboBox
- Top = 138
- ExplicitTop = 138
- ExplicitWidth = 227
- Width = 227
- end
inherited eNIFCIF: TcxDBTextEdit
Left = 210
Top = 30
@@ -230,18 +242,6 @@ inherited fEditorProveedor: TfEditorProveedor
ExplicitWidth = 165
Width = 165
end
- inherited eDescripcionProveedor: TcxDBTextEdit
- Top = 84
- ExplicitTop = 84
- ExplicitWidth = 221
- Width = 221
- end
- inherited eCodigoAsignado: TcxDBTextEdit
- Top = 111
- ExplicitTop = 111
- ExplicitWidth = 221
- Width = 221
- end
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 486
Top = 217
@@ -259,8 +259,8 @@ inherited fEditorProveedor: TfEditorProveedor
inherited ePersonaContacto: TcxDBTextEdit
Top = 267
ExplicitTop = 267
- ExplicitWidth = 256
- Width = 256
+ ExplicitWidth = 253
+ Width = 253
end
end
end
@@ -277,10 +277,6 @@ inherited fEditorProveedor: TfEditorProveedor
Width = 640
LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 640
- inherited eEntidad: TcxDBTextEdit
- ExplicitWidth = 114
- Width = 114
- end
inherited eSucursal: TcxDBTextEdit
Left = 325
ExplicitLeft = 325
@@ -322,50 +318,36 @@ inherited fEditorProveedor: TfEditorProveedor
LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 640
inherited Label1: TLabel
- Left = 416
+ Left = 415
Top = 30
- Width = 190
- ExplicitLeft = 416
+ ExplicitLeft = 415
ExplicitTop = 30
- ExplicitWidth = 190
end
inherited cbRegimenIVA: TcxDBComboBox
Top = 30
ExplicitTop = 30
- ExplicitWidth = 121
- Width = 121
end
inherited cbFormaPago: TcxDBLookupComboBox
Top = 57
ExplicitTop = 57
- ExplicitWidth = 121
- Width = 121
end
inherited bFormasPago: TButton
- Left = 256
Top = 57
- ExplicitLeft = 256
ExplicitTop = 57
end
inherited eIVA: TcxDBLookupComboBox
Top = 84
ExplicitTop = 84
- ExplicitWidth = 121
- Width = 121
end
inherited bTiposIVA: TButton
- Left = 256
Top = 84
- ExplicitLeft = 256
ExplicitTop = 84
end
inherited eDescuento: TcxDBSpinEdit
- Left = 460
+ Left = 459
Top = 62
- ExplicitLeft = 460
+ ExplicitLeft = 459
ExplicitTop = 62
- ExplicitWidth = 73
- Width = 73
end
end
end
diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.pas b/Source/Modulos/Contactos/Views/uEditorProveedor.pas
index 4b48ad21..98f7f0f0 100644
--- a/Source/Modulos/Contactos/Views/uEditorProveedor.pas
+++ b/Source/Modulos/Contactos/Views/uEditorProveedor.pas
@@ -13,7 +13,8 @@ uses
uIEditorProveedor, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit,
cxSpinEdit, cxDBEdit, pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar,
dxLayoutLookAndFeels, uViewContactoDatosBancarios, uBizContactos,
- uViewProveedorDatosComerciales, uViewDetallesGenerico, uViewDireccionesEntrega;
+ uViewProveedorDatosComerciales, uViewDetallesGenerico, uViewDireccionesEntrega,
+ uDAInterfaces;
type
TfEditorProveedor = class(TfEditorContacto, IEditorProveedor)
diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm
index 334aa1ef..923b8875 100644
--- a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm
@@ -1,5 +1,7 @@
inherited fEditorProveedores: TfEditorProveedores
Caption = 'fEditorProveedores'
+ ExplicitWidth = 320
+ ExplicitHeight = 240
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.pas b/Source/Modulos/Contactos/Views/uEditorProveedores.pas
index 6a146a33..942e9e8c 100644
--- a/Source/Modulos/Contactos/Views/uEditorProveedores.pas
+++ b/Source/Modulos/Contactos/Views/uEditorProveedores.pas
@@ -11,7 +11,7 @@ uses
JvExControls, JvComponent, JvNavigationPane,
uIEditorProveedores, uViewGridBase, uViewGrid, uViewContactos, uViewProveedores,
- pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog;
+ pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;
type
TfEditorProveedores = class(TfEditorContactos, IEditorProveedores)
@@ -138,7 +138,8 @@ procedure TfEditorProveedores.PonerTitulos(const ATitulo: string);
var
FTitulo : String;
begin
- FTitulo := 'Lista de proveedores - ' + dmUsuarios.EmpresaActual.NOMBRE;
+// OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+// FTitulo := 'Lista de proveedores - ' + dmUsuarios.EmpresaActual.NOMBRE;
inherited PonerTitulos(FTitulo);
end;
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm
index bf928ec1..2bd03d8e 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm
@@ -62,25 +62,8 @@ inherited frViewClientes: TfrViewClientes
end
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 = 201
- Width = 201
- end
- end
- end
- end
inherited pnlAgrupaciones: TTBXDockablePanel
+ ExplicitWidth = 128
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
inherited TBXToolbar1: TTBXToolbar
object TBXItem2: TTBXItem
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas
index de9f092e..5fd03fc6 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.pas
+++ b/Source/Modulos/Contactos/Views/uViewClientes.pas
@@ -13,7 +13,8 @@ uses
dxPSFillPatterns, dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore,
dxPScxCommon, cxImageComboBox, cxGridCustomPopupMenu, cxGridPopupMenu,
dxPScxGridLnk, ExtCtrls, JvComponentBase, JvBalloonHint, JvHint,
- uViewFiltroBase, dxPgsDlg, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock;
+ uViewFiltroBase, dxPgsDlg, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock,
+ uDAInterfaces;
type
IViewClientes = interface(IViewContactos)
diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm
index d122e107..9a88d414 100644
--- a/Source/Modulos/Contactos/Views/uViewContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm
@@ -12,7 +12,7 @@ inherited frViewContactos: TfrViewContactos
DataController.KeyFieldNames = 'ID'
DataController.Summary.FooterSummaryItems = <
item
- Format = '0 clientes'
+ Format = '0 clientes'
Kind = skCount
FieldName = 'ID'
Column = cxGridViewNOMBRE
@@ -98,23 +98,17 @@ inherited frViewContactos: TfrViewContactos
inherited dxLayoutControl1: TdxLayoutControl
Width = 557
ExplicitWidth = 557
- inherited txtFiltroTodo: TcxTextEdit
- ExplicitWidth = 273
- Width = 273
- end
- inherited edtFechaIniFiltro: TcxDateEdit
- ExplicitWidth = 121
- Width = 121
- end
inherited edtFechaFinFiltro: TcxDateEdit
- ExplicitWidth = 201
- Width = 201
+ ExplicitWidth = 284
+ Width = 284
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 557
+ ExplicitWidth = 557
inherited tbxBotones: TTBXToolbar
Width = 547
+ ExplicitWidth = 547
end
end
end
diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas
index 402ea141..14eb0a64 100644
--- a/Source/Modulos/Contactos/Views/uViewContactos.pas
+++ b/Source/Modulos/Contactos/Views/uViewContactos.pas
@@ -13,7 +13,8 @@ uses
dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk,
udatamoduleclientes, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase,
- ComCtrls, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg;
+ ComCtrls, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg,
+ uDAInterfaces;
type
IViewContactos = interface(IViewGrid)
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
index 9980a1ed..d80002e7 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
@@ -31,21 +31,20 @@ inherited frViewEmpleados: TfrViewEmpleados
inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl
- inherited txtFiltroTodo: TcxTextEdit
- ExplicitWidth = 457
- Width = 457
- end
inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 239
Width = 239
end
inherited edtFechaFinFiltro: TcxDateEdit
- ExplicitWidth = 219
- Width = 219
+ ExplicitWidth = 207
+ Width = 207
end
end
end
end
+ inherited pnlAgrupaciones: TTBXDockablePanel
+ ExplicitWidth = 128
+ end
inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 39211.791248726860000000
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.pas b/Source/Modulos/Contactos/Views/uViewEmpleados.pas
index 840724b8..b244977b 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleados.pas
+++ b/Source/Modulos/Contactos/Views/uViewEmpleados.pas
@@ -11,7 +11,7 @@ uses
cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, uDADataTable,
cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
- TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase;
+ TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, uDAInterfaces;
type
IViewEmpleados = interface(IViewContactos)
diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
index 6288153c..6a3856e5 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
@@ -7,16 +7,16 @@ inherited frViewProveedor: TfrViewProveedor
Height = 454
ExplicitHeight = 454
inherited PngSpeedButton1: TPngSpeedButton
- Left = 612
- ExplicitLeft = 612
+ Left = 613
+ ExplicitLeft = 613
end
inherited PngSpeedButton2: TPngSpeedButton
- Left = 612
- ExplicitLeft = 612
+ Left = 613
+ ExplicitLeft = 613
end
inherited PngSpeedButton3: TPngSpeedButton
- Left = 612
- ExplicitLeft = 612
+ Left = 613
+ ExplicitLeft = 613
end
object Label1: TLabel [3]
Left = 366
@@ -94,21 +94,7 @@ inherited frViewProveedor: TfrViewProveedor
TabOrder = 20
Width = 310
end
- inherited eTlfParticular: TcxDBTextEdit
- Left = 461
- TabOrder = 14
- ExplicitLeft = 461
- ExplicitWidth = 91
- Width = 91
- end
- inherited eTlfTrabajo: TcxDBTextEdit
- Left = 461
- TabOrder = 13
- ExplicitLeft = 461
- ExplicitWidth = 127
- Width = 127
- end
- object cxDBCheckBox2: TcxDBCheckBox [12]
+ object cxDBCheckBox2: TcxDBCheckBox [10]
Left = 22
Top = 193
Caption = 'El proveedor est'#225' homologado'
@@ -132,7 +118,7 @@ inherited frViewProveedor: TfrViewProveedor
TabOrder = 6
Width = 326
end
- object eCertificaciones: TcxDBTextEdit [13]
+ object eCertificaciones: TcxDBTextEdit [11]
Left = 124
Top = 220
DataBinding.DataField = 'CERTIFICACION'
@@ -151,7 +137,7 @@ inherited frViewProveedor: TfrViewProveedor
TabOrder = 7
Width = 227
end
- object cbGrupoProveedor: TcxDBComboBox [14]
+ object cbGrupoProveedor: TcxDBComboBox [12]
Left = 124
Top = 136
DataBinding.DataField = 'GRUPO_PROVEEDOR'
@@ -175,27 +161,17 @@ inherited frViewProveedor: TfrViewProveedor
TabOrder = 5
Width = 227
end
- inherited eTlfMovil: TcxDBTextEdit
+ inherited eTlfParticular: TcxDBTextEdit
Left = 461
- TabOrder = 15
+ TabOrder = 14
ExplicitLeft = 461
- ExplicitWidth = 155
- Width = 155
end
- inherited eFax: TcxDBTextEdit
+ inherited eTlfTrabajo: TcxDBTextEdit
Left = 461
- TabOrder = 16
+ TabOrder = 13
ExplicitLeft = 461
- ExplicitWidth = 121
- Width = 121
end
- inherited eNombre: TcxDBTextEdit
- Left = 124
- ExplicitLeft = 124
- ExplicitWidth = 221
- Width = 221
- end
- object eDescripcionProveedor: TcxDBTextEdit [18]
+ object eDescripcionProveedor: TcxDBTextEdit [15]
Left = 124
Top = 82
DataBinding.DataField = 'DESCRIPCION_PROVEEDOR'
@@ -214,7 +190,7 @@ inherited frViewProveedor: TfrViewProveedor
TabOrder = 3
Width = 221
end
- object eCodigoAsignado: TcxDBTextEdit [19]
+ object eCodigoAsignado: TcxDBTextEdit [16]
Left = 124
Top = 109
DataBinding.DataField = 'CODIGO_ASIGNADO'
@@ -233,6 +209,20 @@ inherited frViewProveedor: TfrViewProveedor
TabOrder = 4
Width = 221
end
+ inherited eTlfMovil: TcxDBTextEdit
+ Left = 461
+ TabOrder = 15
+ ExplicitLeft = 461
+ end
+ inherited eFax: TcxDBTextEdit
+ Left = 461
+ TabOrder = 16
+ ExplicitLeft = 461
+ end
+ inherited eNombre: TcxDBTextEdit
+ Left = 124
+ ExplicitLeft = 124
+ end
inherited eNIFCIF: TcxDBTextEdit
Left = 197
ExplicitLeft = 197
@@ -244,29 +234,21 @@ inherited frViewProveedor: TfrViewProveedor
Properties.Prefix = 'mailto:'
TabOrder = 17
ExplicitLeft = 461
- ExplicitWidth = 133
- Width = 133
end
inherited eMailParticular: TcxDBHyperLinkEdit
Left = 461
Properties.Prefix = 'mailto:'
TabOrder = 18
ExplicitLeft = 461
- ExplicitWidth = 133
- Width = 133
end
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 461
TabOrder = 19
ExplicitLeft = 461
- ExplicitWidth = 133
- Width = 133
end
inherited eReferencia: TcxDBTextEdit
Left = 124
ExplicitLeft = 124
- ExplicitWidth = 38
- Width = 38
end
inherited ePersonaContacto: TcxDBTextEdit
Left = 124
@@ -274,8 +256,6 @@ inherited frViewProveedor: TfrViewProveedor
TabOrder = 8
ExplicitLeft = 124
ExplicitTop = 277
- ExplicitWidth = 256
- Width = 256
end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.pas b/Source/Modulos/Contactos/Views/uViewProveedor.pas
index 736a3b13..37421b40 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedor.pas
+++ b/Source/Modulos/Contactos/Views/uViewProveedor.pas
@@ -8,7 +8,7 @@ uses
dxLayoutControl, cxMemo, cxDBEdit, cxContainer, cxEdit, cxTextEdit, cxControls,
cxMaskEdit, cxSpinEdit, ImgList, PngImageList, ActnList, cxHyperLinkEdit,
Buttons, PngSpeedButton, StdCtrls, cxCheckBox, cxGraphics, cxDropDownEdit,
- uGruposProveedorController;
+ uGruposProveedorController, uDAInterfaces;
type
IViewProveedor = interface(IViewContacto)
diff --git a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas
index 912bedf6..5c2040f0 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas
+++ b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas
@@ -7,7 +7,8 @@ uses
Dialogs, uViewBase, cxGraphics, DB, uDADataTable, dxLayoutControl,
cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
cxDBLookupEdit, cxDBLookupComboBox, cxControls, cxSpinEdit, cxDBEdit,
- uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController;
+ uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController,
+ uDAInterfaces;
type
IViewProveedorDatosComerciales = interface(IViewBase)
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
index 52cd0199..37730c25 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 = 149
- Width = 149
+ ExplicitWidth = 206
+ Width = 206
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.pas b/Source/Modulos/Contactos/Views/uViewProveedores.pas
index 2f747b0b..a4adcdb4 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedores.pas
+++ b/Source/Modulos/Contactos/Views/uViewProveedores.pas
@@ -11,7 +11,8 @@ uses
cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, uDADataTable,
cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
- TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox;
+ TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox,
+ uDAInterfaces;
type
IViewProveedores = interface(IViewContactos)
diff --git a/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc b/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc
index 79a33f19..e82889d5 100644
--- a/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc
+++ b/Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc
@@ -12,6 +12,6 @@ STRINGTABLE
BEGIN
END
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.DFM */
+/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.dfm */
/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.res */
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1E.tmp */
diff --git a/Source/Modulos/Tipos de IVA/Data/uDataModuleTiposIVA.pas b/Source/Modulos/Tipos de IVA/Data/uDataModuleTiposIVA.pas
index de0b5caf..fde2aa0d 100644
--- a/Source/Modulos/Tipos de IVA/Data/uDataModuleTiposIVA.pas
+++ b/Source/Modulos/Tipos de IVA/Data/uDataModuleTiposIVA.pas
@@ -93,7 +93,6 @@ begin
// (ID = :ID)
with Result.DataTable.DynamicWhere do
begin
- Clear;
Expression := NewBinaryExpression(NewField('', fld_TiposIVAID),
NewConstant(ID, datInteger), dboEqual);
end;
diff --git a/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc b/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc
index 464611e3..2ce70245 100644
--- a/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc
+++ b/Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc
@@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.res */
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C.tmp */
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index dbd9d23d..216441f9 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,106 +1,106 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
-
-
- Delphi.Personality
-
-
- FalseTrueFalseTrueFalse3000FalseFalseFalseFalseFalse308212523.0.0.03.0.0.0domingo, 30 de septiembre de 2007 20:47
- RemObjects Pascal Script - RemObjects SDK 3.0 Integration
- FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
+ FactuGES_Server.dpr
+ Debug
+ AnyCPU
+ DCC32
+ ..\..\Output\Debug\Servidor\FactuGES_Server.exe
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+
+
+ Delphi.Personality
+
+
+FalseTrueFalseTrueFalse3000FalseFalseFalseFalseFalse308212523.0.0.03.0.0.0domingo, 30 de septiembre de 2007 20:47
+ RemObjects Pascal Script - RemObjects SDK 3.0 Integration
+ FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+