diff --git a/Source/Base/BaseD10.dproj b/Source/Base/BaseD10.dproj
index b4be50a..5a7732f 100644
--- a/Source/Base/BaseD10.dproj
+++ b/Source/Base/BaseD10.dproj
@@ -40,6 +40,12 @@
Package
FalseTrueFalseFalseFalseTrueC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2000FalseFalseFalseFalseFalse308212522.0.0.01.0.0.0
+
+
+
+
+
+
CodeGear WebSnap Components
CodeGear SOAP Components
Microsoft Office XP Sample Automation Server Wrapper Components
diff --git a/Source/Base/BaseD10.drc b/Source/Base/BaseD10.drc
index 7867c96..6319435 100644
--- a/Source/Base/BaseD10.drc
+++ b/Source/Base/BaseD10.drc
@@ -29,4 +29,4 @@ END
/* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */
/* C:\Varela_D2007\Source\Base\uViewGrid.dfm */
/* C:\Varela_D2007\Source\Base\BaseD10.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf21.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2.tmp */
diff --git a/Source/CargaEDI/CargaEDI.drc b/Source/CargaEDI/CargaEDI.drc
index 4184c89..8d0b00e 100644
--- a/Source/CargaEDI/CargaEDI.drc
+++ b/Source/CargaEDI/CargaEDI.drc
@@ -15,4 +15,4 @@ END
/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
/* C:\Varela_D2007\Source\CargaEDI\uCargaEDI.dfm */
/* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3B.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C.tmp */
diff --git a/Source/Cliente/AdminPV.drc b/Source/Cliente/AdminPV.drc
index 611cb1f..f6efbf9 100644
--- a/Source/Cliente/AdminPV.drc
+++ b/Source/Cliente/AdminPV.drc
@@ -12,10 +12,10 @@ STRINGTABLE
BEGIN
END
-/* c:\archivos de programa\codegear\rad studio\5.0\Lib\WindowsXP.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
/* C:\Varela_D2007\Lib\JVCL\JvXPCore.res */
-/* uSplash.dfm */
-/* uAcercaDe.dfm */
+/* C:\Varela_D2007\Source\Cliente\uSplash.dfm */
+/* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */
/* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */
/* C:\Varela_D2007\Source\Cliente\AdminPV.res */
-/* C:\Varela_D2007\Source\Cliente\AdminPV.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1A.tmp */
diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc
index 1ffb66d..38bf708 100644
--- a/Source/Cliente/AdminPV.rc
+++ b/Source/Cliente/AdminPV.rc
@@ -17,7 +17,7 @@ BEGIN
VALUE "InternalName", "Administración de puntos de venta\0"
VALUE "ProductName", "Administración de puntos de venta\0"
VALUE "ProductVersion", "1.0.0.0\0"
- VALUE "CompileDate", "martes, 15 de abril de 2008 10:40\0"
+ VALUE "CompileDate", "miércoles, 16 de abril de 2008 10:43\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res
index 5088fb3..d79605d 100644
Binary files a/Source/Cliente/AdminPV.res and b/Source/Cliente/AdminPV.res differ
diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm
index 30a59bf..15731ba 100644
--- a/Source/Cliente/uPantallaPrincipal.dfm
+++ b/Source/Cliente/uPantallaPrincipal.dfm
@@ -499,23 +499,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
object Archivo2_OLD: TMenuItem
Tag = -90000
Caption = 'Archivo'
- object Cambiarmicontrasea2_OLD: TMenuItem
- Tag = 1
- Action = actCambiarPass
- end
- object N3_OLD: TMenuItem
- Tag = 2
- Caption = '-'
- end
- object Paneldeadministracin2_OLD: TMenuItem
- Tag = 4
- Action = actAdministracion
- Visible = False
- end
- object N4_OLD: TMenuItem
- Tag = 5
- Caption = '-'
- end
object Salir2_OLD: TMenuItem
Tag = 6
Action = actSalir
@@ -535,9 +518,9 @@ object fPantallaPrincipal: TfPantallaPrincipal
object Opciones1_OLD: TMenuItem
Tag = -70000
Caption = 'Opciones'
- object Configuraractualizaciones1: TMenuItem
- Tag = 100
- Action = actActualizaciones
+ object Cambiarmicontrasea2_OLD: TMenuItem
+ Tag = 1
+ Action = actCambiarPass
end
object Configurarconexin2_OLD: TMenuItem
Tag = 101
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 90a29dc..8bc22b9 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -44,10 +44,7 @@ type
Archivo2_OLD: TMenuItem;
Ayuda2_OLD: TMenuItem;
Cambiarmicontrasea2_OLD: TMenuItem;
- N3_OLD: TMenuItem;
Configurarconexin2_OLD: TMenuItem;
- Paneldeadministracin2_OLD: TMenuItem;
- N4_OLD: TMenuItem;
Salir2_OLD: TMenuItem;
Acercade2_OLD: TMenuItem;
lblBienvenido: TLabel;
@@ -63,7 +60,6 @@ type
Label1: TLabel;
Image1: TImage;
actActualizaciones: TAction;
- Configuraractualizaciones1: TMenuItem;
actVerPanel: TAction;
actVerBarraEstado: TAction;
Paneldeexploracin1: TMenuItem;
diff --git a/Source/ControlesBase/ControlesBaseD10.drc b/Source/ControlesBase/ControlesBaseD10.drc
index 6dfb8f4..9932e46 100644
--- a/Source/ControlesBase/ControlesBaseD10.drc
+++ b/Source/ControlesBase/ControlesBaseD10.drc
@@ -26,4 +26,4 @@ END
/* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlBase.dfm */
/* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewPeriodoFechas.dfm */
/* C:\Varela_D2007\Source\ControlesBase\ControlesBaseD10.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf23.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4.tmp */
diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
index e0876fa..62e5ac9 100644
--- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
+++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
@@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uPluginControllerDevoluciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorAjustarDevoluciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf33.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf14.tmp */
diff --git a/Source/Modulos/Devoluciones/Cliente/uDataModuleDevoluciones.dfm b/Source/Modulos/Devoluciones/Cliente/uDataModuleDevoluciones.dfm
index 274d149..a9aa09c 100644
--- a/Source/Modulos/Devoluciones/Cliente/uDataModuleDevoluciones.dfm
+++ b/Source/Modulos/Devoluciones/Cliente/uDataModuleDevoluciones.dfm
@@ -803,92 +803,9 @@ object dmDevoluciones: TdmDevoluciones
end
object DARemoteDataAdapter: TDARemoteDataAdapter
GetSchemaCall.RemoteService = RORemoteService
- GetSchemaCall.MethodName = 'GetSchemaAsXML'
- GetSchemaCall.Params = <
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- end>
- GetSchemaCall.Default = False
- GetSchemaCall.IncomingSchemaParameter = 'Result'
- GetSchemaCall.OutgoingFilterParameter = 'aFilter'
GetDataCall.RemoteService = RORemoteService
- GetDataCall.MethodName = 'GetDatasetDataEx'
- GetDataCall.Params = <
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- Value = Null
- end
- item
- Name = 'DatasetName'
- DataType = rtString
- Flag = fIn
- end
- item
- Name = 'Params'
- DataType = rtUserDefined
- Flag = fIn
- TypeName = 'TDADatasetParamArray'
- Value = Null
- end
- item
- Name = 'UserFilter'
- DataType = rtString
- Flag = fIn
- Value = Null
- end
- item
- Name = 'IncludeSchema'
- DataType = rtBoolean
- Flag = fIn
- end
- item
- Name = 'MaxRecords'
- DataType = rtInteger
- Flag = fIn
- end>
- GetDataCall.Default = False
- GetDataCall.OutgoingTableNamesParameter = 'DatasetName'
- GetDataCall.OutgoingTableRequestInfosParameter = 'aTableRequestInfoArray'
- GetDataCall.IncomingDataParameter = 'Result'
- GetDataCall.OutgoingParamsParameter = 'Params'
- GetDataCall.OutgoingIncludeSchemaParameter = 'IncludeSchema'
- GetDataCall.OutgoingMaxRecordsParameter = 'MaxRecords'
UpdateDataCall.RemoteService = RORemoteService
- UpdateDataCall.MethodName = 'UpdateData'
- UpdateDataCall.Params = <
- item
- Name = 'Delta'
- DataType = rtBinary
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- end>
- UpdateDataCall.Default = False
- UpdateDataCall.OutgoingDeltaParameter = 'Delta'
- UpdateDataCall.IncomingDeltaParameter = 'Result'
GetScriptsCall.RemoteService = RORemoteService
- GetScriptsCall.MethodName = 'GetDatasetScripts'
- GetScriptsCall.Params = <
- item
- Name = 'DatasetNames'
- DataType = rtString
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- end>
- GetScriptsCall.Default = False
- GetScriptsCall.OutgoingTableNamesParameter = 'DatasetNames'
- GetScriptsCall.IncomingScriptParameter = 'Result'
RemoteService = RORemoteService
DataStreamer = dmBase.DABINAdapter
Left = 40
diff --git a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm
index 8dc8243..d41817a 100644
--- a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm
+++ b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm
@@ -5,7 +5,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
ClientHeight = 637
ClientWidth = 901
ExplicitWidth = 909
- ExplicitHeight = 671
+ ExplicitHeight = 664
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -21,7 +21,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
Width = 901
ExplicitWidth = 901
inherited tbxMain: TTBXToolbar
- ExplicitWidth = 583
+ ExplicitWidth = 581
object TBXSubmenuItem2: TTBXSubmenuItem [5]
Caption = 'Cambiar el estado'
DropdownCombo = True
@@ -49,8 +49,8 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
ExplicitWidth = 901
end
inherited tbxFiltro: TTBXToolbar
- Left = 583
- ExplicitLeft = 583
+ Left = 581
+ ExplicitLeft = 581
end
end
inherited StatusBar: TStatusBar
@@ -103,7 +103,6 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
inherited cxGrid: TcxGrid
Width = 901
Height = 453
- ExplicitTop = 60
ExplicitWidth = 901
ExplicitHeight = 453
inherited cxGridView: TcxGridDBTableView
@@ -128,7 +127,6 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
inherited TBXDockablePanel1: TTBXDockablePanel
ExplicitWidth = 901
inherited frViewParametrosCentro1: TfrViewParametrosCentro
- ExplicitHeight = 41
inherited dxLayoutControl1: TdxLayoutControl
inherited ccbCentro: TJvCheckedComboBox
Width = 392
@@ -139,12 +137,11 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
inherited TBXLabel1: TTBXLabel
Width = 901
ExplicitWidth = 901
- ExplicitHeight = 19
end
inherited pnlAgrupaciones: TTBXAlignmentPanel
Width = 476
- ExplicitHeight = 41
- inherited TBXButton3: TTBXButton
+ ExplicitWidth = 476
+ inherited Button1: TButton
Action = actRefrescar
end
end
diff --git a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas
index 34c26de..5338f35 100644
--- a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas
+++ b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas
@@ -18,7 +18,7 @@ uses
JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
JvExControls, JvComponent, JvNavigationPane, TBXDkPanels,
- uViewParametrosControlGrid, uViewParametrosCentro, uDAInterfaces;
+ uViewParametrosControlGrid, uViewParametrosCentro, uDAInterfaces, pngimage;
type
@@ -184,6 +184,7 @@ end;
procedure TfEditorListaDevoluciones.actRefrescarExecute(Sender: TObject);
begin
ShowHourglassCursor;
+ actRefrescar.Enabled := False;
Items.DataTable.Active := False;
Application.ProcessMessages;
ViewGrid._FocusedView.BeginUpdate;
@@ -211,9 +212,10 @@ begin
finally
ViewGrid._FocusedView.EndUpdate;
- HideHourglassCursor;
ViewGrid.ExpandirTodo;
ViewGrid.GotoFirst;
+ actRefrescar.Enabled := True;
+ HideHourglassCursor;
end;
end;
diff --git a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm
index c43767a..d706d1a 100644
--- a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm
+++ b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm
@@ -1,11 +1,11 @@
inherited frViewListaDevoluciones: TfrViewListaDevoluciones
- Width = 466
+ Width = 829
Height = 477
- ExplicitWidth = 466
+ ExplicitWidth = 829
ExplicitHeight = 477
inherited cxGrid: TcxGrid
Top = 60
- Width = 466
+ Width = 829
Height = 417
ExplicitTop = 60
ExplicitWidth = 466
@@ -317,6 +317,7 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
FloatingHeight = 60
SupportedDocks = [dkStandardDock, dkMultiDock]
TabOrder = 1
+ ExplicitWidth = 466
inline frViewParametrosCentro1: TfrViewParametrosCentro
Left = 0
Top = 19
@@ -340,40 +341,39 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
object TBXLabel1: TTBXLabel
Left = 0
Top = 0
- Width = 466
+ Width = 829
Height = 19
Margins.Left = 5
Margins.Top = 5
Align = alTop
Caption = 'Par'#225'metros de consulta'
+ Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
- ParentColor = True
ParentFont = False
Underline = True
+ ExplicitWidth = 466
end
object pnlAgrupaciones: TTBXAlignmentPanel
Left = 425
Top = 19
- Width = 41
+ Width = 404
Height = 41
Align = alClient
AutoSize = True
+ Color = clBtnFace
TabOrder = 2
- object TBXButton3: TTBXButton
- Tag = 3
- Left = 8
+ ExplicitWidth = 41
+ object Button1: TButton
+ Left = 6
Top = 10
Width = 90
Height = 21
- AutoSize = False
Caption = 'Consultar'
- ImageIndex = 0
TabOrder = 0
- Wrapping = twEndEllipsis
end
end
end
diff --git a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
index 8529efc..04828ec 100644
--- a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
+++ b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
@@ -91,7 +91,7 @@ type
frViewParametrosCentro1: TfrViewParametrosCentro;
TBXLabel1: TTBXLabel;
pnlAgrupaciones: TTBXAlignmentPanel;
- TBXButton3: TTBXButton;
+ Button1: TButton;
procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure cxGridBandedViewRR38GetDisplayText(
@@ -539,7 +539,7 @@ begin
if Assigned(FItems) then
Items.DataTable.Active := False;
- ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+ ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
ShowHourglassCursor;
try
@@ -552,7 +552,7 @@ begin
Exit;
end
else begin
- AWhereCentro := AWhereCentro + ' FILIAL in (';
+ AWhereCentro := AWhereCentro + ' CENTRO in (';
for i := 0 to ACentrosList.Count - 1 do
begin
if i > 0 then
diff --git a/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.pas b/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.pas
index e52bb6e..6be2903 100644
--- a/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.pas
+++ b/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.pas
@@ -10,16 +10,16 @@ unit srvDevoluciones_Impl;
interface
uses
- {vcl:} Classes, SysUtils,
+ {vcl:} Classes, SysUtils,
{RemObjects:} uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions,
- {Ancestor Implementation:} DARemoteService_Impl,
- {Used RODLs:} DataAbstract3_Intf,
+ {Ancestor Implementation:} DataAbstractService_Impl,
+ {Used RODLs:} DataAbstract4_Intf,
{Generated:} VARELA_Intf, uDAScriptingProvider, uDABusinessProcessor,
uDAClasses, uDADataTable, uDABINAdapter, uDADataStreamer;
type
{ TsrvDevoluciones }
- TsrvDevoluciones = class(TDARemoteService, IsrvDevoluciones)
+ TsrvDevoluciones = class(TDataAbstractService, IsrvDevoluciones)
bpDevoluciones: TDABusinessProcessor;
bpDevolucionesAprobadas: TDABusinessProcessor;
bpDevolucionesPendientes: TDABusinessProcessor;
diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
index 75a4936..49a13f0 100644
--- a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
+++ b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
@@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uEditorHistorialCargasEDI.dfm */
/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uPluginControllerFicherosEDI.dfm */
/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf29.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfA.tmp */
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dpk b/Source/Modulos/Parametros/Cliente/Parametros.dpk
index b1bae2b..90f6401 100644
--- a/Source/Modulos/Parametros/Cliente/Parametros.dpk
+++ b/Source/Modulos/Parametros/Cliente/Parametros.dpk
@@ -31,7 +31,6 @@ requires
BaseD10,
ControlesBaseD10;
-
contains
uDataModuleParametros in 'uDataModuleParametros.pas' {dmParametros: TDAClientDataModule},
schParametrosClient_Intf in '..\Reglas\schParametrosClient_Intf.pas',
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dproj b/Source/Modulos/Parametros/Cliente/Parametros.dproj
index 3400e7c..8fcd636 100644
--- a/Source/Modulos/Parametros/Cliente/Parametros.dproj
+++ b/Source/Modulos/Parametros/Cliente/Parametros.dproj
@@ -54,13 +54,8 @@
-
-
-
-
-
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.drc b/Source/Modulos/Parametros/Cliente/Parametros.drc
index 3028e6b..d1a383d 100644
--- a/Source/Modulos/Parametros/Cliente/Parametros.drc
+++ b/Source/Modulos/Parametros/Cliente/Parametros.drc
@@ -17,4 +17,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosColeccion.dfm */
/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosFecha.dfm */
/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf25.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf6.tmp */
diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.drc b/Source/Modulos/Recepciones/Cliente/Recepciones.drc
index e545707..1894a1d 100644
--- a/Source/Modulos/Recepciones/Cliente/Recepciones.drc
+++ b/Source/Modulos/Recepciones/Cliente/Recepciones.drc
@@ -20,4 +20,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uPluginControllerRecepciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorAjustarRecepciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf31.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf12.tmp */
diff --git a/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm
index 8853e30..5af9f23 100644
--- a/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm
@@ -971,96 +971,9 @@ object dmRecepciones: TdmRecepciones
end
object DARemoteDataAdapter: TDARemoteDataAdapter
GetSchemaCall.RemoteService = RORemoteService
- GetSchemaCall.MethodName = 'GetSchemaAsXML'
- GetSchemaCall.Params = <
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- Value = Null
- end>
- GetSchemaCall.Default = False
- GetSchemaCall.IncomingSchemaParameter = 'Result'
- GetSchemaCall.OutgoingFilterParameter = 'aFilter'
GetDataCall.RemoteService = RORemoteService
- GetDataCall.MethodName = 'GetDatasetDataEx'
- GetDataCall.Params = <
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- Value = Null
- end
- item
- Name = 'DatasetName'
- DataType = rtString
- Flag = fIn
- Value = 'Recepciones'
- end
- item
- Name = 'Params'
- DataType = rtUserDefined
- Flag = fIn
- TypeName = 'TDADatasetParamArray'
- Value = Null
- end
- item
- Name = 'UserFilter'
- DataType = rtString
- Flag = fIn
- Value = Null
- end
- item
- Name = 'IncludeSchema'
- DataType = rtBoolean
- Flag = fIn
- Value = False
- end
- item
- Name = 'MaxRecords'
- DataType = rtInteger
- Flag = fIn
- Value = -1
- end>
- GetDataCall.Default = False
- GetDataCall.OutgoingTableNamesParameter = 'DatasetName'
- GetDataCall.OutgoingTableRequestInfosParameter = 'aTableRequestInfoArray'
- GetDataCall.IncomingDataParameter = 'Result'
- GetDataCall.OutgoingParamsParameter = 'Params'
- GetDataCall.OutgoingIncludeSchemaParameter = 'IncludeSchema'
- GetDataCall.OutgoingMaxRecordsParameter = 'MaxRecords'
UpdateDataCall.RemoteService = RORemoteService
- UpdateDataCall.MethodName = 'UpdateData'
- UpdateDataCall.Params = <
- item
- Name = 'Delta'
- DataType = rtBinary
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- end>
- UpdateDataCall.Default = False
- UpdateDataCall.OutgoingDeltaParameter = 'Delta'
- UpdateDataCall.IncomingDeltaParameter = 'Result'
GetScriptsCall.RemoteService = RORemoteService
- GetScriptsCall.MethodName = 'GetDatasetScripts'
- GetScriptsCall.Params = <
- item
- Name = 'DatasetNames'
- DataType = rtString
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- end>
- GetScriptsCall.Default = False
- GetScriptsCall.OutgoingTableNamesParameter = 'DatasetNames'
- GetScriptsCall.IncomingScriptParameter = 'Result'
RemoteService = RORemoteService
DataStreamer = dmBase.DABINAdapter
Left = 64
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
index d379974..83a5883 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
@@ -151,7 +151,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
Height = 41
ExplicitWidth = 391
ExplicitHeight = 41
- inherited TBXButton3: TTBXButton
+ inherited Button1: TButton
Action = actRefrescar
end
end
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas
index 73cbdd1..171995f 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas
@@ -18,7 +18,7 @@ uses
JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
JvExControls, JvComponent, JvNavigationPane, StdCtrls, TBXDkPanels,
- uViewParametrosCentro, uViewParametrosControlGrid, uDAInterfaces;
+ uViewParametrosCentro, uViewParametrosControlGrid, uDAInterfaces, pngimage;
const
CM_SETFOCUSEDRECORD = WM_USER + 1002;
@@ -188,6 +188,7 @@ end;
procedure TfEditorListaRecepciones.actRefrescarExecute(Sender: TObject);
begin
ShowHourglassCursor;
+ actRefrescar.Enabled := False;
Items.DataTable.Active := False;
Application.ProcessMessages;
ViewGrid._FocusedView.BeginUpdate;
@@ -214,6 +215,7 @@ begin
inherited;
finally
ViewGrid._FocusedView.EndUpdate;
+ actRefrescar.Enabled := True;
HideHourglassCursor;
ViewGrid.ExpandirTodo;
ViewGrid.GotoFirst;
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.dfm b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.dfm
index ba23d72..f9790ae 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.dfm
@@ -5,7 +5,7 @@ inherited fEditorListaRecepcionesAlbaran: TfEditorListaRecepcionesAlbaran
ClientHeight = 637
ClientWidth = 842
ExplicitWidth = 850
- ExplicitHeight = 671
+ ExplicitHeight = 664
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -94,7 +94,6 @@ inherited fEditorListaRecepcionesAlbaran: TfEditorListaRecepcionesAlbaran
inherited cxGrid: TcxGrid
Width = 842
Height = 453
- ExplicitTop = 60
ExplicitWidth = 842
ExplicitHeight = 453
inherited cxGridView: TcxGridDBTableView
@@ -114,28 +113,28 @@ inherited fEditorListaRecepcionesAlbaran: TfEditorListaRecepcionesAlbaran
end
inherited TBXDockablePanel1: TTBXDockablePanel
ExplicitWidth = 842
- inherited frViewParametrosCentro1: TfrViewParametrosCentro
- ExplicitHeight = 41
- inherited dxLayoutControl1: TdxLayoutControl
- inherited ccbCentro: TJvCheckedComboBox
- Width = 392
- ExplicitWidth = 392
- end
- end
- end
inherited TBXLabel1: TTBXLabel
Width = 842
ExplicitWidth = 842
- ExplicitHeight = 19
end
inherited pnlAgrupaciones: TTBXAlignmentPanel
- Width = 417
- ExplicitWidth = 417
- ExplicitHeight = 41
- inherited TBXButton3: TTBXButton
+ Width = 297
+ ExplicitWidth = 297
+ inherited Button1: TButton
Action = actRefrescar
end
end
+ inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+ inherited frViewParametrosCentro1: TfrViewParametrosCentro
+ Align = alLeft
+ inherited dxLayoutControl1: TdxLayoutControl
+ inherited ccbCentro: TJvCheckedComboBox
+ Width = 392
+ ExplicitWidth = 392
+ end
+ end
+ end
+ end
end
inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink1: TdxGridReportLink
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.pas b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.pas
index 71ce949..9b37db9 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.pas
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.pas
@@ -17,7 +17,7 @@ uses
JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList,
StdActns, ActnList, ComCtrls, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock,
TB2Toolbar, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, StdCtrls,
- uViewListaRecepcionesAlbaran, uDAInterfaces;
+ uViewListaRecepcionesAlbaran, uDAInterfaces, pngimage;
type
@@ -145,6 +145,7 @@ end;
procedure TfEditorListaRecepcionesAlbaran.actRefrescarExecute(Sender: TObject);
begin
ShowHourglassCursor;
+ actRefrescar.Enabled := False;
Items.DataTable.Active := False;
Application.ProcessMessages;
ViewGrid._FocusedView.BeginUpdate;
@@ -175,6 +176,7 @@ begin
_FocusedView.EndUpdate;
GotoFirst;
end;
+ actRefrescar.Enabled := True;
HideHourglassCursor;
end;
end;
diff --git a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm
index 5ca9829..22c2073 100644
--- a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm
@@ -4,9 +4,9 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
ExplicitWidth = 695
ExplicitHeight = 477
inherited cxGrid: TcxGrid
- Top = 128
+ Top = 61
Width = 695
- Height = 349
+ Height = 416
ExplicitTop = 128
ExplicitWidth = 695
ExplicitHeight = 349
@@ -350,7 +350,7 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
Left = 0
Top = 19
Width = 425
- Height = 109
+ Height = 42
Align = alLeft
TabOrder = 0
ReadOnly = False
@@ -375,12 +375,12 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
Margins.Top = 5
Align = alTop
Caption = 'Par'#225'metros de consulta'
+ Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
- ParentColor = True
ParentFont = False
Underline = True
end
@@ -388,21 +388,20 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
Left = 425
Top = 19
Width = 270
- Height = 109
+ Height = 42
Align = alClient
AutoSize = True
+ Color = clBtnFace
TabOrder = 2
- object TBXButton3: TTBXButton
- Tag = 3
- Left = 8
+ ExplicitLeft = 431
+ ExplicitTop = 0
+ object Button1: TButton
+ Left = 6
Top = 10
Width = 90
Height = 21
- AutoSize = False
Caption = 'Consultar'
- ImageIndex = 0
TabOrder = 0
- Wrapping = twEndEllipsis
end
end
end
diff --git a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas
index b91a2be..64a5caa 100644
--- a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas
+++ b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas
@@ -92,7 +92,7 @@ type
frViewParametrosCentro1: TfrViewParametrosCentro;
TBXLabel1: TTBXLabel;
pnlAgrupaciones: TTBXAlignmentPanel;
- TBXButton3: TTBXButton;
+ Button1: TButton;
procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure cxGridBandedViewRR38GetDisplayText(
@@ -540,7 +540,7 @@ begin
if Assigned(FItems) then
Items.DataTable.Active := False;
- ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+ ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
ShowHourglassCursor;
try
@@ -553,7 +553,7 @@ begin
Exit;
end
else begin
- AWhereCentro := AWhereCentro + ' FILIAL in (';
+ AWhereCentro := AWhereCentro + ' CENTRO in (';
for i := 0 to ACentrosList.Count - 1 do
begin
if i > 0 then
diff --git a/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.dfm b/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.dfm
index a1f98bc..7642922 100644
--- a/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.dfm
@@ -99,26 +99,6 @@ inherited frViewListaRecepcionesAlbaran: TfrViewListaRecepcionesAlbaran
FloatingHeight = 60
SupportedDocks = [dkStandardDock, dkMultiDock]
TabOrder = 1
- inline frViewParametrosCentro1: TfrViewParametrosCentro
- Left = 0
- Top = 19
- Width = 425
- Height = 41
- Align = alLeft
- TabOrder = 0
- ReadOnly = False
- ExplicitTop = 19
- ExplicitWidth = 425
- ExplicitHeight = 41
- inherited dxLayoutControl1: TdxLayoutControl
- Width = 425
- ExplicitWidth = 425
- inherited ccbCentro: TJvCheckedComboBox
- Width = 392
- ExplicitWidth = 392
- end
- end
- end
object TBXLabel1: TTBXLabel
Left = 0
Top = 0
@@ -128,34 +108,58 @@ inherited frViewListaRecepcionesAlbaran: TfrViewListaRecepcionesAlbaran
Margins.Top = 5
Align = alTop
Caption = 'Par'#225'metros de consulta'
+ Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
- ParentColor = True
ParentFont = False
Underline = True
end
object pnlAgrupaciones: TTBXAlignmentPanel
- Left = 425
+ Left = 545
Top = 19
- Width = 270
+ Width = 150
Height = 41
Align = alClient
AutoSize = True
- TabOrder = 2
- object TBXButton3: TTBXButton
- Tag = 3
- Left = 8
+ Color = clBtnFace
+ TabOrder = 1
+ object Button1: TButton
+ Left = 6
Top = 10
Width = 90
Height = 21
- AutoSize = False
Caption = 'Consultar'
- ImageIndex = 0
TabOrder = 0
- Wrapping = twEndEllipsis
+ end
+ end
+ object TBXAlignmentPanel1: TTBXAlignmentPanel
+ Left = 0
+ Top = 19
+ Width = 545
+ Height = 41
+ Align = alLeft
+ TabOrder = 2
+ inline frViewParametrosCentro1: TfrViewParametrosCentro
+ Left = 0
+ Top = 0
+ Width = 545
+ Height = 41
+ Align = alClient
+ TabOrder = 0
+ ReadOnly = False
+ ExplicitWidth = 545
+ ExplicitHeight = 41
+ inherited dxLayoutControl1: TdxLayoutControl
+ Width = 545
+ ExplicitWidth = 545
+ inherited ccbCentro: TJvCheckedComboBox
+ Width = 392
+ ExplicitWidth = 392
+ end
+ end
end
end
end
diff --git a/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.pas b/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.pas
index 685931c..47d0024 100644
--- a/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.pas
+++ b/Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.pas
@@ -64,7 +64,8 @@ type
frViewParametrosCentro1: TfrViewParametrosCentro;
TBXLabel1: TTBXLabel;
pnlAgrupaciones: TTBXAlignmentPanel;
- TBXButton3: TTBXButton;
+ TBXAlignmentPanel1: TTBXAlignmentPanel;
+ Button1: TButton;
procedure cxGridViewALBARANGetDataText(Sender: TcxCustomGridTableItem;
ARecordIndex: Integer; var AText: String);
protected
@@ -125,7 +126,7 @@ begin
if Assigned(FItems) then
Items.DataTable.Active := False;
- ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+ ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
ShowHourglassCursor;
try
@@ -138,7 +139,7 @@ begin
Exit;
end
else begin
- AWhereCentro := AWhereCentro + ' FILIAL in (';
+ AWhereCentro := AWhereCentro + ' CENTRO in (';
for i := 0 to ACentrosList.Count - 1 do
begin
if i > 0 then
diff --git a/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm b/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm
index 585cfcd..cb0fa5c 100644
--- a/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm
+++ b/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm
@@ -1,13 +1,10 @@
object srvRecepciones: TsrvRecepciones
OldCreateOrder = True
SessionManager = dmServer.SessionManager
- AcquireConnection = True
ServiceSchema = schRecepciones
- ServiceAdapter = DABINAdapter
- OnAfterProcessTransactionAction = pptaNone
+ ServiceDataStreamer = DABINAdapter
+ AllowWhereSQL = True
ExportedDataTables = <>
- CacheElements = <>
- Options = [rsoProcessDeltasWithoutUpdateRules]
Height = 300
Width = 300
object schRecepciones: TDASchema
diff --git a/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.pas b/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.pas
index 0e9d902..16f6e86 100644
--- a/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.pas
+++ b/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.pas
@@ -12,15 +12,15 @@ interface
uses
{vcl:} Classes, SysUtils,
{RemObjects:} uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions,
- {Ancestor Implementation:} DARemoteService_Impl,
- {Used RODLs:} DataAbstract3_Intf,
+ {Ancestor Implementation:} DataAbstractService_Impl,
+ {Used RODLs:} DataAbstract4_Intf,
uDAScriptingProvider, uDABusinessProcessor,
{Generated:} VARELA_Intf, uDAClasses,
uDAInterfaces, uDADataTable, uDABINAdapter, uDADataStreamer;
type
{ TsrvRecepciones }
- TsrvRecepciones = class(TDARemoteService, IsrvRecepciones)
+ TsrvRecepciones = class(TDataAbstractService, IsrvRecepciones)
bpRecepciones: TDABusinessProcessor;
bpRecepcionesAprobadas: TDABusinessProcessor;
bpRecepcionesPendientes: TDABusinessProcessor;
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj
index 4a2e3ff..e3e2557 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj
@@ -53,60 +53,64 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TDAClientDataModule
+ TCustomEditor
+ TModuleController
+ TCustomView
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
index cb83596..105c6ef 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
@@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uPluginControllerReferenciaGenerica.dfm */
/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorCambioReferenciaGenerica.dfm */
/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2F.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf10.tmp */
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.dfm b/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.dfm
index 5945136..ae067f8 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.dfm
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.dfm
@@ -7,107 +7,12 @@ object dmReferenciaGenerica: TdmReferenciaGenerica
Message = dmBase.ROMessage
Channel = dmBase.ROChannel
ServiceName = 'srvReferenciaGenerica'
- Left = 40
- Top = 32
+ Left = 56
+ Top = 40
end
object ds_ReferenciaGenerica: TDADataSource
Left = 192
- Top = 96
- end
- object DARemoteDataAdapter: TDARemoteDataAdapter
- GetSchemaCall.RemoteService = RORemoteService
- GetSchemaCall.MethodName = 'GetSchemaAsXML'
- GetSchemaCall.Params = <
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- Value = Null
- end>
- GetSchemaCall.Default = False
- GetSchemaCall.IncomingSchemaParameter = 'Result'
- GetSchemaCall.OutgoingFilterParameter = 'aFilter'
- GetDataCall.RemoteService = RORemoteService
- GetDataCall.MethodName = 'GetDatasetData'
- GetDataCall.Params = <
- item
- Name = 'DatasetName'
- DataType = rtString
- Flag = fIn
- Value = 'ReferenciaGenerica'
- end
- item
- Name = 'Params'
- DataType = rtString
- Flag = fIn
- Value = Null
- end
- item
- Name = 'IncludeSchema'
- DataType = rtBoolean
- Flag = fIn
- Value = False
- end
- item
- Name = 'MaxRecords'
- DataType = rtInteger
- Flag = fIn
- Value = -1
- end
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- Value = Null
- end>
- GetDataCall.Default = False
- GetDataCall.OutgoingTableNamesParameter = 'DatasetName'
- GetDataCall.OutgoingTableRequestInfosParameter = 'aTableRequestInfoArray'
- GetDataCall.IncomingDataParameter = 'Result'
- GetDataCall.OutgoingParamsParameter = 'Params'
- GetDataCall.OutgoingIncludeSchemaParameter = 'IncludeSchema'
- GetDataCall.OutgoingMaxRecordsParameter = 'MaxRecords'
- UpdateDataCall.RemoteService = RORemoteService
- UpdateDataCall.MethodName = 'UpdateData'
- UpdateDataCall.Params = <
- item
- Name = 'Delta'
- DataType = rtBinary
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- end>
- UpdateDataCall.Default = False
- UpdateDataCall.OutgoingDeltaParameter = 'Delta'
- UpdateDataCall.IncomingDeltaParameter = 'Result'
- GetScriptsCall.RemoteService = RORemoteService
- GetScriptsCall.MethodName = 'GetDatasetScripts'
- GetScriptsCall.Params = <
- item
- Name = 'DatasetNames'
- DataType = rtString
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- end>
- GetScriptsCall.Default = False
- GetScriptsCall.OutgoingTableNamesParameter = 'DatasetNames'
- GetScriptsCall.IncomingScriptParameter = 'Result'
- RemoteService = RORemoteService
- DataStreamer = DABinDataStreamer1
- Left = 40
- Top = 96
- end
- object DABinDataStreamer1: TDABinDataStreamer
- IsCompatibleV4 = False
- Left = 40
- Top = 160
+ Top = 104
end
object tbl_ReferenciaGenerica: TDACDSDataTable
RemoteUpdatesOptions = []
@@ -218,7 +123,7 @@ object dmReferenciaGenerica: TdmReferenciaGenerica
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]
- RemoteDataAdapter = DARemoteDataAdapter
+ RemoteDataAdapter = DARemoteDataAdapter1
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'ReferenciaGenerica'
@@ -226,4 +131,14 @@ object dmReferenciaGenerica: TdmReferenciaGenerica
Left = 192
Top = 40
end
+ object DARemoteDataAdapter1: TDARemoteDataAdapter
+ GetSchemaCall.RemoteService = RORemoteService
+ GetDataCall.RemoteService = RORemoteService
+ UpdateDataCall.RemoteService = RORemoteService
+ GetScriptsCall.RemoteService = RORemoteService
+ RemoteService = RORemoteService
+ DataStreamer = dmBase.DABINAdapter
+ Left = 56
+ Top = 104
+ end
end
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.pas b/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.pas
index f85d1b1..13f9a7d 100644
Binary files a/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.pas and b/Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.pas differ
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.dfm b/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.dfm
index 3bc1743..f1cc6d9 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.dfm
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.dfm
@@ -107,7 +107,6 @@ inherited fEditorListaReferenciaGenerica: TfEditorListaReferenciaGenerica
inherited TBXLabel1: TTBXLabel
Width = 901
ExplicitWidth = 901
- ExplicitHeight = 19
end
inherited pnlAgrupaciones: TTBXAlignmentPanel
Width = 476
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.pas b/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.pas
index 214be64..88bfea2 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.pas
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.pas
@@ -18,7 +18,7 @@ uses
TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls, JvExControls, JvComponent,
JvNavigationPane, uBizReferenciaGenerica, uCustomView, uViewBase,
uViewControlGrid, uViewListaReferenciaGenerica, uViewGridBase, uViewGrid,
- JvTabBar, Grids, DBGrids, StdCtrls, Buttons, uDAInterfaces;
+ JvTabBar, Grids, DBGrids, StdCtrls, Buttons, uDAInterfaces, pngimage;
type
IEditorListaReferenciaGenerica = interface(IEditorGridBase)
@@ -338,9 +338,7 @@ begin
inherited;
finally
- dsDataTable.DataTable := Items.DataTable;
ViewGrid._FocusedView.EndUpdate;
- Items.DataTable.Active := True;
ViewGrid.ContraerTodo;
ViewGrid.GotoFirst;
HideHourglassCursor;
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.dfm b/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.dfm
index 885dcb5..6cc4a5d 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.dfm
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.dfm
@@ -5,7 +5,9 @@ inherited frViewListaReferenciaGenerica: TfrViewListaReferenciaGenerica
Top = 60
Width = 504
Height = 208
+ ExplicitTop = 60
ExplicitWidth = 504
+ ExplicitHeight = 208
inherited cxGridView: TcxGridDBTableView
OnMouseDown = cxGridViewMouseDown
FilterBox.Visible = fvNever
@@ -132,9 +134,6 @@ inherited frViewListaReferenciaGenerica: TfrViewListaReferenciaGenerica
FloatingHeight = 60
SupportedDocks = [dkStandardDock, dkMultiDock]
TabOrder = 1
- ExplicitLeft = 8
- ExplicitTop = 8
- ExplicitWidth = 128
inline frViewParametrosCentro1: TfrViewParametrosCentro
Left = 0
Top = 19
@@ -172,8 +171,6 @@ inherited frViewListaReferenciaGenerica: TfrViewListaReferenciaGenerica
ParentColor = True
ParentFont = False
Underline = True
- ExplicitWidth = 128
- ExplicitHeight = 32
end
object pnlAgrupaciones: TTBXAlignmentPanel
Left = 425
@@ -183,7 +180,6 @@ inherited frViewListaReferenciaGenerica: TfrViewListaReferenciaGenerica
Align = alClient
AutoSize = True
TabOrder = 2
- ExplicitWidth = 251
object TBXButton3: TTBXButton
Tag = 3
Left = 8
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.pas b/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.pas
index 5a29f52..3c48aff 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.pas
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.pas
@@ -186,13 +186,14 @@ var
ACentrosList : TStringList;
AWhereCentro : String;
AWhere : String;
+ AWhereBuilder : TDAWhereBuilder;
i : integer;
begin
ACentrosList := Nil;
if Assigned(FItems) then
Items.DataTable.Active := False;
- ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+ ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
ShowHourglassCursor;
try
@@ -205,7 +206,7 @@ begin
Exit;
end
else begin
- AWhereCentro := AWhereCentro + ' FILIAL in (';
+ AWhereCentro := AWhereCentro + ' CODCENTRO in (';
for i := 0 to ACentrosList.Count - 1 do
begin
if i > 0 then
@@ -218,12 +219,10 @@ begin
AWhere := '';
if AWhereCentro <> '' then
- begin
AWhere := AWhere + AWhereCentro;
- end;
-// Items.DataTable.Where.Clear;
-// Items.DataTable.Where.AddText(AWhere, False);
+ Items.DataTable.Where.Clear;
+ Items.DataTable.Where.AddText(AWhere, False);
Items.DataTable.Active := True;
finally
diff --git a/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.dfm b/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.dfm
index 66cdd08..eff85e7 100644
--- a/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.dfm
+++ b/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.dfm
@@ -2,13 +2,10 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
OldCreateOrder = True
OnCreate = DARemoteServiceCreate
SessionManager = dmServer.SessionManager
- AcquireConnection = True
ServiceSchema = schReferenciaGenerica
- ServiceAdapter = DABINAdapter
- OnAfterProcessTransactionAction = pptaNone
+ ServiceDataStreamer = DABINAdapter
+ AllowWhereSQL = True
ExportedDataTables = <>
- CacheElements = <>
- Options = [rsoProcessDeltasWithoutUpdateRules]
Height = 362
Width = 469
object schReferenciaGenerica: TDASchema
@@ -292,8 +289,8 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
' CODVENDEDOR + '#39' - '#39' + VENDEDOR'#10' ' +
' END,'#10' NUMTALON, CODIGO_BARRA, CODIGO, PRODUCTO, COLOR, TA' +
'LLA, VTAPROCESO,'#10' VTAFINAL, VTATERM, VALTOT, ESTADO, FECHACAM' +
- 'BIO'#10' FROM'#10' RDX_V_REFERENCIA_GENERICA'#10'ORDER BY CENTRO, VENDED' +
- 'OR, FECHA'#10
+ 'BIO'#10' FROM'#10' RDX_V_REFERENCIA_GENERICA'#10'WHERE {where}'#10'ORDER BY ' +
+ 'CENTRO, VENDEDOR, FECHA'#10
StatementType = stSQL
ColumnMappings = <
item
@@ -774,21 +771,21 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
ReferencedDataset = 'ReferenciaGenerica'
ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
UpdateMode = updWhereKeyOnly
- Left = 208
+ Left = 200
Top = 32
end
object frxDBCabecera: TfrxDBDataset
UserName = 'frxReferenciasGenericas'
CloseDataSource = False
DataSource = dsReferenciasGenericas
- Left = 120
- Top = 128
+ Left = 136
+ Top = 104
end
object dsReferenciasGenericas: TDADataSource
DataSet = tbl_ReferenciasGenericas.Dataset
DataTable = tbl_ReferenciasGenericas
- Left = 120
- Top = 176
+ Left = 136
+ Top = 152
end
object frxReport1: TfrxReport
Version = '3.23.7'
@@ -813,8 +810,8 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
''
'end.')
StoreInDFM = False
- Left = 40
- Top = 128
+ Left = 56
+ Top = 104
Datasets = <
item
DataSet = frxDBCabecera
@@ -870,8 +867,8 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
IndexDefs = <>
- Left = 120
- Top = 232
+ Left = 136
+ Top = 208
end
object ADOConnection1: TADOConnection
ConnectionString =
@@ -880,7 +877,7 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
'st'
Provider = 'SQLNCLI.1'
Left = 344
- Top = 136
+ Top = 104
end
object ADOQuery1: TADOQuery
Connection = ADOConnection1
@@ -924,12 +921,12 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
'FROM RDX_V_REFERENCIA_GENERICA'
'ORDER BY CENTRO, VENDEDOR, FECHA')
Left = 344
- Top = 200
+ Top = 168
end
object DataSource1: TDataSource
DataSet = ADOQuery1
Left = 240
- Top = 144
+ Top = 104
end
object DABINAdapter: TDABINAdapter
Left = 336
diff --git a/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.pas b/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.pas
index 47b0d33..8091cbe 100644
--- a/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.pas
+++ b/Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.pas
@@ -12,8 +12,8 @@ interface
uses
{vcl:} Classes, SysUtils,
{RemObjects:} uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions,
- {Ancestor Implementation:} DARemoteService_Impl,
- {Used RODLs:} DataAbstract3_Intf,
+ {Ancestor Implementation:} DataAbstractService_Impl,
+ {Used RODLs:} DataAbstract4_Intf,
{Generated:} VARELA_Intf, uDAClasses, uDAScriptingProvider,
uDABusinessProcessor, uDADataTable, uDACDSDataTable, frxClass, DB,
frxDBSet, ADODB, uDAInterfaces, uROClient, uROEventRepository,
@@ -21,7 +21,7 @@ uses
type
{ TsrvReferenciaGenerica }
- TsrvReferenciaGenerica = class(TDARemoteService, IsrvReferenciaGenerica)
+ TsrvReferenciaGenerica = class(TDataAbstractService, IsrvReferenciaGenerica)
bpReferenciaGenerica: TDABusinessProcessor;
frxDBCabecera: TfrxDBDataset;
dsReferenciasGenericas: TDADataSource;
@@ -102,8 +102,8 @@ begin
ds.Where.AddText(AWhere);
AStream.Clear;
- ServiceAdapter.WriteDataset(AStream, ds, [woRows, woSchema], -1);
- ServiceAdapter.ReadDataset(AStream, tbl_ReferenciasGenericas, TRUE, '', TRUE, TRUE);
+ ServiceDataStreamer.WriteDataset(AStream, ds, [woRows, woSchema], -1);
+ ServiceDataStreamer.ReadDataset(AStream, tbl_ReferenciasGenericas, TRUE, '', TRUE, TRUE);
frxReport1.LoadFromFile(DarRutaInformes + 'InformeReferenciaGenerica.fr3', True);
frxReport1.PrepareReport;
diff --git a/Source/Modulos/Stock/Cliente/Stock.drc b/Source/Modulos/Stock/Cliente/Stock.drc
index 3b21d59..ea27c74 100644
--- a/Source/Modulos/Stock/Cliente/Stock.drc
+++ b/Source/Modulos/Stock/Cliente/Stock.drc
@@ -21,4 +21,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uEditorControlStockVARELA.dfm */
/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uPluginControllerStock.dfm */
/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf37.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf18.tmp */
diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.drc b/Source/Modulos/Traspasos/Cliente/Traspasos.drc
index bbdfcc2..3bd1ac5 100644
--- a/Source/Modulos/Traspasos/Cliente/Traspasos.drc
+++ b/Source/Modulos/Traspasos/Cliente/Traspasos.drc
@@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uPluginControllerTraspasos.dfm */
/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uEditorAjustarTraspasos.dfm */
/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf35.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf16.tmp */
diff --git a/Source/Modulos/Traspasos/Cliente/uDataModuleTraspasos.dfm b/Source/Modulos/Traspasos/Cliente/uDataModuleTraspasos.dfm
index 826eb11..9cbc9f8 100644
--- a/Source/Modulos/Traspasos/Cliente/uDataModuleTraspasos.dfm
+++ b/Source/Modulos/Traspasos/Cliente/uDataModuleTraspasos.dfm
@@ -636,92 +636,9 @@ object dmTraspasos: TdmTraspasos
end
object DARemoteDataAdapter: TDARemoteDataAdapter
GetSchemaCall.RemoteService = RORemoteService
- GetSchemaCall.MethodName = 'GetSchemaAsXML'
- GetSchemaCall.Params = <
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- end>
- GetSchemaCall.Default = False
- GetSchemaCall.IncomingSchemaParameter = 'Result'
- GetSchemaCall.OutgoingFilterParameter = 'aFilter'
GetDataCall.RemoteService = RORemoteService
- GetDataCall.MethodName = 'GetDatasetDataEx'
- GetDataCall.Params = <
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- Value = Null
- end
- item
- Name = 'DatasetName'
- DataType = rtString
- Flag = fIn
- end
- item
- Name = 'Params'
- DataType = rtUserDefined
- Flag = fIn
- TypeName = 'TDADatasetParamArray'
- Value = Null
- end
- item
- Name = 'UserFilter'
- DataType = rtString
- Flag = fIn
- Value = Null
- end
- item
- Name = 'IncludeSchema'
- DataType = rtBoolean
- Flag = fIn
- end
- item
- Name = 'MaxRecords'
- DataType = rtInteger
- Flag = fIn
- end>
- GetDataCall.Default = False
- GetDataCall.OutgoingTableNamesParameter = 'DatasetName'
- GetDataCall.OutgoingTableRequestInfosParameter = 'aTableRequestInfoArray'
- GetDataCall.IncomingDataParameter = 'Result'
- GetDataCall.OutgoingParamsParameter = 'Params'
- GetDataCall.OutgoingIncludeSchemaParameter = 'IncludeSchema'
- GetDataCall.OutgoingMaxRecordsParameter = 'MaxRecords'
UpdateDataCall.RemoteService = RORemoteService
- UpdateDataCall.MethodName = 'UpdateData'
- UpdateDataCall.Params = <
- item
- Name = 'Delta'
- DataType = rtBinary
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtBinary
- Flag = fResult
- end>
- UpdateDataCall.Default = False
- UpdateDataCall.OutgoingDeltaParameter = 'Delta'
- UpdateDataCall.IncomingDeltaParameter = 'Result'
GetScriptsCall.RemoteService = RORemoteService
- GetScriptsCall.MethodName = 'GetDatasetScripts'
- GetScriptsCall.Params = <
- item
- Name = 'DatasetNames'
- DataType = rtString
- Flag = fIn
- end
- item
- Name = 'Result'
- DataType = rtString
- Flag = fResult
- end>
- GetScriptsCall.Default = False
- GetScriptsCall.OutgoingTableNamesParameter = 'DatasetNames'
- GetScriptsCall.IncomingScriptParameter = 'Result'
RemoteService = RORemoteService
DataStreamer = dmBase.DABINAdapter
Left = 40
diff --git a/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.dfm b/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.dfm
index 788f17f..ef76fc0 100644
--- a/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.dfm
+++ b/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.dfm
@@ -5,7 +5,7 @@ inherited fEditorListaTraspasos: TfEditorListaTraspasos
ClientHeight = 625
ClientWidth = 901
ExplicitWidth = 909
- ExplicitHeight = 659
+ ExplicitHeight = 652
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -21,7 +21,7 @@ inherited fEditorListaTraspasos: TfEditorListaTraspasos
Width = 901
ExplicitWidth = 901
inherited tbxMain: TTBXToolbar
- ExplicitWidth = 571
+ ExplicitWidth = 569
object TBXSubmenuItem2: TTBXSubmenuItem [5]
Caption = 'Cambiar el estado'
DropdownCombo = True
@@ -49,8 +49,8 @@ inherited fEditorListaTraspasos: TfEditorListaTraspasos
ExplicitWidth = 901
end
inherited tbxFiltro: TTBXToolbar
- Left = 571
- ExplicitLeft = 571
+ Left = 569
+ ExplicitLeft = 569
end
end
inherited StatusBar: TStatusBar
@@ -124,12 +124,11 @@ inherited fEditorListaTraspasos: TfEditorListaTraspasos
inherited TBXLabel1: TTBXLabel
Width = 901
ExplicitWidth = 901
- ExplicitHeight = 19
end
inherited pnlAgrupaciones: TTBXAlignmentPanel
Width = 476
ExplicitWidth = 476
- inherited TBXButton3: TTBXButton
+ inherited Button1: TButton
Action = actRefrescar
end
end
diff --git a/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas b/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas
index 9ce9a31..9c276f2 100644
--- a/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas
+++ b/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas
@@ -18,7 +18,7 @@ uses
JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
JvExControls, JvComponent, JvNavigationPane, StdCtrls,
- uViewListaTraspasos, uBizTraspasos, uDAInterfaces;
+ uViewListaTraspasos, uBizTraspasos, uDAInterfaces, pngimage;
const
CM_SETFOCUSEDRECORD = WM_USER + 1002;
@@ -189,6 +189,7 @@ end;
procedure TfEditorListaTraspasos.actRefrescarExecute(Sender: TObject);
begin
ShowHourglassCursor;
+ actRefrescar.Enabled := False;
Items.DataTable.Active := False;
Application.ProcessMessages;
ViewGrid._FocusedView.BeginUpdate;
@@ -220,6 +221,7 @@ begin
Items.DataTable.Active := True;
ViewGrid.ContraerTodo;
ViewGrid.GotoFirst;
+ actRefrescar.Enabled := True;
HideHourglassCursor;
end;
end;
diff --git a/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.dfm b/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.dfm
index 3d929da..53b6b8d 100644
--- a/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.dfm
+++ b/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.dfm
@@ -250,12 +250,12 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
Margins.Top = 5
Align = alTop
Caption = 'Par'#225'metros de consulta'
+ Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
- ParentColor = True
ParentFont = False
Underline = True
end
@@ -266,18 +266,15 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
Height = 41
Align = alClient
AutoSize = True
+ Color = clBtnFace
TabOrder = 2
- object TBXButton3: TTBXButton
- Tag = 3
- Left = 8
+ object Button1: TButton
+ Left = 6
Top = 10
Width = 90
Height = 21
- AutoSize = False
Caption = 'Consultar'
- ImageIndex = 0
TabOrder = 0
- Wrapping = twEndEllipsis
end
end
end
diff --git a/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas b/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas
index 7ad0af1..6644e3b 100644
--- a/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas
+++ b/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas
@@ -82,7 +82,7 @@ type
frViewParametrosCentro1: TfrViewParametrosCentro;
TBXLabel1: TTBXLabel;
pnlAgrupaciones: TTBXAlignmentPanel;
- TBXButton3: TTBXButton;
+ Button1: TButton;
procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure cxGridBandedViewRR38GetDisplayText(
diff --git a/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.pas b/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.pas
index bfd4368..b8762be 100644
--- a/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.pas
+++ b/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.pas
@@ -12,14 +12,14 @@ interface
uses
{vcl:} Classes, SysUtils,
{RemObjects:} uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions,
- {Ancestor Implementation:} DARemoteService_Impl,
- {Used RODLs:} DataAbstract3_Intf,
+ {Ancestor Implementation:} DataAbstractService_Impl,
+ {Used RODLs:} DataAbstract4_Intf,
{Generated:} VARELA_Intf, uDADataTable, uDABINAdapter, uDAClasses,
uDAScriptingProvider, uDABusinessProcessor, uDADataStreamer;
type
{ TsrvTraspasos }
- TsrvTraspasos = class(TDARemoteService, IsrvTraspasos)
+ TsrvTraspasos = class(TDataAbstractService, IsrvTraspasos)
DABINAdapter: TDABINAdapter;
bpTraspasos: TDABusinessProcessor;
bpTraspasosAprobadas: TDABusinessProcessor;
diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
index f95d6f8..a4436af 100644
--- a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
+++ b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
@@ -20,4 +20,4 @@ END
/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlVentaProceso.dfm */
/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uEditorControlVentaProceso.dfm */
/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2D.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE.tmp */
diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
index b1e5c9a..c24488a 100644
--- a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
+++ b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
@@ -22,4 +22,4 @@ END
/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uPluginControllerVentasTerminadas.dfm */
/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uEditorControlVentasTerminadas.dfm */
/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2B.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfC.tmp */
diff --git a/Source/Servicios/VARELA_Intf.pas b/Source/Servicios/VARELA_Intf.pas
index ee861ce..16f3730 100644
--- a/Source/Servicios/VARELA_Intf.pas
+++ b/Source/Servicios/VARELA_Intf.pas
@@ -309,7 +309,7 @@ type
end;
{ IsrvReferenciaGenerica }
- IsrvReferenciaGenerica = interface(IDARemoteService)
+ IsrvReferenciaGenerica = interface(IDataAbstractService)
['{994518CC-96BD-4976-ABC6-9B421A4B65D3}']
function GetProducto(const Codigo: String; const Talla: String; const Color: String; out CodigoBarras: String; out Descripcion: String): Boolean;
function GenerateReport(const Centro: String; const Vendedor: String; const Estado: String; const FiltroUsuario: String): Binary;
@@ -322,7 +322,7 @@ type
end;
{ TsrvReferenciaGenerica_Proxy }
- TsrvReferenciaGenerica_Proxy = class(TDARemoteService_Proxy, IsrvReferenciaGenerica)
+ TsrvReferenciaGenerica_Proxy = class(TDataAbstractService_Proxy, IsrvReferenciaGenerica)
protected
function __GetInterfaceName:string; override;
@@ -332,7 +332,7 @@ type
end;
{ IsrvRecepciones }
- IsrvRecepciones = interface(IDARemoteService)
+ IsrvRecepciones = interface(IDataAbstractService)
['{02EB4B9C-155E-477C-AE2D-3E73B7846AB3}']
end;
@@ -342,14 +342,14 @@ type
end;
{ TsrvRecepciones_Proxy }
- TsrvRecepciones_Proxy = class(TDARemoteService_Proxy, IsrvRecepciones)
+ TsrvRecepciones_Proxy = class(TDataAbstractService_Proxy, IsrvRecepciones)
protected
function __GetInterfaceName:string; override;
end;
{ IsrvDevoluciones }
- IsrvDevoluciones = interface(IDARemoteService)
+ IsrvDevoluciones = interface(IDataAbstractService)
['{87C31D12-C353-437F-A7A3-10882373AB54}']
end;
@@ -359,14 +359,14 @@ type
end;
{ TsrvDevoluciones_Proxy }
- TsrvDevoluciones_Proxy = class(TDARemoteService_Proxy, IsrvDevoluciones)
+ TsrvDevoluciones_Proxy = class(TDataAbstractService_Proxy, IsrvDevoluciones)
protected
function __GetInterfaceName:string; override;
end;
{ IsrvTraspasos }
- IsrvTraspasos = interface(IDARemoteService)
+ IsrvTraspasos = interface(IDataAbstractService)
['{47DA82A0-51AD-477A-85B3-CE9EEAAB29D6}']
end;
@@ -376,7 +376,7 @@ type
end;
{ TsrvTraspasos_Proxy }
- TsrvTraspasos_Proxy = class(TDARemoteService_Proxy, IsrvTraspasos)
+ TsrvTraspasos_Proxy = class(TDataAbstractService_Proxy, IsrvTraspasos)
protected
function __GetInterfaceName:string; override;
diff --git a/Source/Servicios/VARELA_Invk.pas b/Source/Servicios/VARELA_Invk.pas
index 55ecb3c..61d812a 100644
--- a/Source/Servicios/VARELA_Invk.pas
+++ b/Source/Servicios/VARELA_Invk.pas
@@ -88,7 +88,7 @@ type
procedure Invoke_InsertarLog(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
end;
- TsrvReferenciaGenerica_Invoker = class(TDARemoteService_Invoker)
+ TsrvReferenciaGenerica_Invoker = class(TDataAbstractService_Invoker)
private
protected
published
@@ -97,19 +97,19 @@ type
procedure Invoke_PasarProductosAEspera(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
end;
- TsrvRecepciones_Invoker = class(TDARemoteService_Invoker)
+ TsrvRecepciones_Invoker = class(TDataAbstractService_Invoker)
private
protected
published
end;
- TsrvDevoluciones_Invoker = class(TDARemoteService_Invoker)
+ TsrvDevoluciones_Invoker = class(TDataAbstractService_Invoker)
private
protected
published
end;
- TsrvTraspasos_Invoker = class(TDARemoteService_Invoker)
+ TsrvTraspasos_Invoker = class(TDataAbstractService_Invoker)
private
protected
published
diff --git a/Source/Servidor/AdminPV_Server.drc b/Source/Servidor/AdminPV_Server.drc
index f59d72c..591ce71 100644
--- a/Source/Servidor/AdminPV_Server.drc
+++ b/Source/Servidor/AdminPV_Server.drc
@@ -2995,4 +2995,4 @@ END
/* C:\Varela_D2007\Source\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.dfm */
/* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */
/* C:\Varela_D2007\Source\Servidor\RODLFILE.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3D.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1E.tmp */
diff --git a/Source/Servidor/AdminPV_Server.rc b/Source/Servidor/AdminPV_Server.rc
index aa00def..02db1c3 100644
--- a/Source/Servidor/AdminPV_Server.rc
+++ b/Source/Servidor/AdminPV_Server.rc
@@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.1.1.0\0"
VALUE "ProductName", "AdminPV_Server\0"
VALUE "ProductVersion", "2.1.1.0\0"
- VALUE "CompileDate", "martes, 15 de abril de 2008 10:40\0"
+ VALUE "CompileDate", "miércoles, 16 de abril de 2008 10:43\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Servidor/AdminPV_Server.res b/Source/Servidor/AdminPV_Server.res
index c79e02b..7fcfeb4 100644
Binary files a/Source/Servidor/AdminPV_Server.res and b/Source/Servidor/AdminPV_Server.res differ
diff --git a/Source/Servidor/RODLFILE.res b/Source/Servidor/RODLFILE.res
index 59b56ed..07eee6a 100644
Binary files a/Source/Servidor/RODLFILE.res and b/Source/Servidor/RODLFILE.res differ
diff --git a/Source/Servidor/VARELA.RODL b/Source/Servidor/VARELA.RODL
index 21ffe7c..dd2393b 100644
--- a/Source/Servidor/VARELA.RODL
+++ b/Source/Servidor/VARELA.RODL
@@ -248,7 +248,7 @@
-
+
@@ -295,7 +295,7 @@
-
+
@@ -304,7 +304,7 @@
-
+
@@ -313,7 +313,7 @@
-
+