diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index a40078f..1f1b905 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -46,6 +46,27 @@
Package
FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
VCL for the Web Design Package for CodeGear RAD Studio
CodeGear WebSnap Components
CodeGear SOAP Components
@@ -60,13 +81,13 @@
MainSource
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm
index b5c73f1..1cd400b 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm
@@ -1,5 +1,6 @@
inherited fEditorPerfilUsuario: TfEditorPerfilUsuario
Caption = 'fEditorPerfilUsuario'
+ ExplicitWidth = 320
ExplicitHeight = 492
PixelsPerInch = 96
TextHeight = 13
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas
index 63600e5..7583f8c 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas
@@ -33,7 +33,7 @@ type
procedure GuardarInterno;
procedure EliminarInterno;
procedure ActualizarEstadoEditor;
- function HayDatos: Boolean;
+
//Si queremos crear otra vista para el editor heredado solo tendriamos que
//sobreescribir este metodo
procedure AsignarVista; virtual;
@@ -179,12 +179,6 @@ begin
end;
end;
-function TfEditorPerfilUsuario.HayDatos: Boolean;
-begin
- Result := Assigned(dsDataTable.DataTable) and (dsDataTable.DataTable.State <> dsInactive)
- and (not dsDataTable.DataTable.IsEmpty);
-end;
-
procedure TfEditorPerfilUsuario.PonerTitulos(const ATitulo: string);
var
FTitulo : String;
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm
index 5c93909..f9a774b 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm
@@ -1,5 +1,6 @@
inherited fEditorUsuario: TfEditorUsuario
Caption = 'fEditorUsuario'
+ ExplicitWidth = 320
ExplicitHeight = 492
PixelsPerInch = 96
TextHeight = 13
@@ -42,9 +43,12 @@ inherited fEditorUsuario: TfEditorUsuario
ReadOnly = False
ExplicitLeft = 8
ExplicitTop = 8
+ ExplicitWidth = 656
+ ExplicitHeight = 370
inherited dxLayoutControlArticulo: TdxLayoutControl
Width = 656
LookAndFeel = dxLayoutOfficeLookAndFeel1
+ ExplicitWidth = 656
inherited PngSpeedButton3: TPngSpeedButton
Top = 84
ExplicitTop = 84
@@ -113,6 +117,8 @@ inherited fEditorUsuario: TfEditorUsuario
end
inherited JvFormStorage: TJvFormStorage [7]
end
+ inherited JvAppRegistryStorage: TJvAppRegistryStorage [8]
+ end
inherited dsDataTable: TDADataSource
OnDataChange = dsDataTableDataChange
Top = 80
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas
index 87a8742..32ee8d2 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas
@@ -45,7 +45,6 @@ type
procedure ActualizarEstadoEditor;
procedure PonerTitulos(const ATitulo: string = '');
- function HayDatos: Boolean;
function GetViewUsuario: IViewUsuario;
procedure SetViewUsuario(const Value: IViewUsuario);
property ViewUsuario: IViewUsuario read GetViewUsuario write SetViewUsuario;
@@ -225,12 +224,6 @@ begin
end
end;
-function TfEditorUsuario.HayDatos: Boolean;
-begin
- Result := Assigned(dsDataTable.DataTable) and (dsDataTable.DataTable.State <> dsInactive)
- and (not dsDataTable.DataTable.IsEmpty);
-end;
-
procedure TfEditorUsuario.PonerTitulos(const ATitulo: string);
var
FTitulo : String;
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas b/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas
index cc59191..f3136ba 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas
@@ -35,7 +35,6 @@ type
private
FUsuarios : IBizUsuario;
FController : IUsuariosController;
- function HayDatos: Boolean;
protected
function GetController : IUsuariosController;
procedure SetController (const Value : IUsuariosController);
@@ -43,7 +42,7 @@ type
function GetUsuarios: IBizUsuario;
procedure SetUsuarios(const Value: IBizUsuario);
- procedure ActualizarEstadoEditor;
+ procedure ActualizarEstadoEditor;
procedure NuevoInterno;
procedure EliminarInterno;
procedure ModificarInterno;
@@ -90,12 +89,6 @@ begin
FController.AdministrarAccesos(FUsuarios);
end;
-function TfEditorUsuarios.HayDatos: Boolean;
-begin
- Result := Assigned(dsDataTable.DataTable) and (dsDataTable.DataTable.State <> dsInactive)
- and (not dsDataTable.DataTable.IsEmpty);
-end;
-
procedure TfEditorUsuarios.actControlAccesoUpdate(Sender: TObject);
begin
inherited;
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 7f91f97..ef68c67 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -40,6 +40,36 @@
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/Base.drc b/Source/Base/Base.drc
index 85a0fd7..2502b2e 100644
--- a/Source/Base/Base.drc
+++ b/Source/Base/Base.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\Base.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf8F.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1.tmp */
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 45dc55f..01cbcba 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Base/uEditorBase.dfm b/Source/Base/uEditorBase.dfm
index 893cd2b..b99e388 100644
--- a/Source/Base/uEditorBase.dfm
+++ b/Source/Base/uEditorBase.dfm
@@ -15,6 +15,8 @@ object fEditorBase: TfEditorBase
Position = poDefault
OnCloseQuery = FormCloseQuery
OnShow = FormShow
+ InstanceID = 0
+ ReadOnly = False
PixelsPerInch = 96
TextHeight = 13
object JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Base/uEditorBase.pas b/Source/Base/uEditorBase.pas
index 3848e93..ab93ea1 100644
Binary files a/Source/Base/uEditorBase.pas and b/Source/Base/uEditorBase.pas differ
diff --git a/Source/Base/uEditorDBBase.pas b/Source/Base/uEditorDBBase.pas
index 823359f..5408f3e 100644
--- a/Source/Base/uEditorDBBase.pas
+++ b/Source/Base/uEditorDBBase.pas
@@ -36,6 +36,7 @@ type
{ Private declarations }
protected
function GetModified: Boolean; override;
+ function HayDatos: Boolean; virtual;
published
end;
@@ -200,6 +201,12 @@ begin
Result := DataTableModified(dsDataTable.DataTable) or inherited GetModified;
end;
+function TfEditorDBBase.HayDatos: Boolean;
+begin
+ Result := Assigned(dsDataTable.DataTable) and (dsDataTable.DataTable.State <> dsInactive)
+ and (not dsDataTable.DataTable.IsEmpty);
+end;
+
procedure TfEditorDBBase.FormCloseQuery(Sender: TObject;
var CanClose: Boolean);
begin
diff --git a/Source/Base/uEditorGridBase.dfm b/Source/Base/uEditorGridBase.dfm
index 609b031..c6a0e0c 100644
--- a/Source/Base/uEditorGridBase.dfm
+++ b/Source/Base/uEditorGridBase.dfm
@@ -66,7 +66,7 @@ inherited fEditorGridBase: TfEditorGridBase
CloseButton = False
DefaultDock = TBXDock
DockMode = dmCannotFloatOrChangeDocks
- DockPos = 392
+ DockPos = 440
DockRow = 1
DragHandleStyle = dhNone
Images = SmallImages
@@ -134,6 +134,7 @@ inherited fEditorGridBase: TfEditorGridBase
Caption = 'Quitar filtro y ver todo'
ImageIndex = 19
OnExecute = actQuitarFiltroExecute
+ OnUpdate = actQuitarFiltroUpdate
end
object actDuplicar: TAction
Category = 'Archivo'
diff --git a/Source/Base/uEditorGridBase.pas b/Source/Base/uEditorGridBase.pas
index da01dff..7902cc4 100644
Binary files a/Source/Base/uEditorGridBase.pas and b/Source/Base/uEditorGridBase.pas differ
diff --git a/Source/Base/uEditorItem.dfm b/Source/Base/uEditorItem.dfm
index 36a7056..9155998 100644
--- a/Source/Base/uEditorItem.dfm
+++ b/Source/Base/uEditorItem.dfm
@@ -25,13 +25,8 @@ inherited fEditorItem: TfEditorItem
ActivePage = pagGeneral
Align = alClient
TabOrder = 1
- ExplicitHeight = 406
object pagGeneral: TTabSheet
Caption = 'General'
- ExplicitLeft = 0
- ExplicitTop = 0
- ExplicitWidth = 0
- ExplicitHeight = 0
end
end
inherited TBXDock: TTBXDock
@@ -55,7 +50,7 @@ inherited fEditorItem: TfEditorItem
inherited StatusBar: TStatusBar
Top = 489
Width = 678
- ExplicitTop = 482
+ ExplicitTop = 489
ExplicitWidth = 678
end
inherited EditorActionList: TActionList
diff --git a/Source/Base/uEditorPreview.dfm b/Source/Base/uEditorPreview.dfm
index af16215..f9464b3 100644
--- a/Source/Base/uEditorPreview.dfm
+++ b/Source/Base/uEditorPreview.dfm
@@ -5,8 +5,6 @@ inherited fEditorPreview: TfEditorPreview
WindowState = wsMaximized
OnDestroy = FormDestroy
OnResize = FormResize
- ExplicitWidth = 320
- ExplicitHeight = 240
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/CargaEDI/CargaEDI.drc b/Source/CargaEDI/CargaEDI.drc
index d5333cf..5cb6cf0 100644
--- a/Source/CargaEDI/CargaEDI.drc
+++ b/Source/CargaEDI/CargaEDI.drc
@@ -12,7 +12,7 @@ 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\Source\CargaEDI\uCargaEDI.dfm */
/* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */
-/* C:\Varela_D2007\Source\CargaEDI\CargaEDI.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1B.tmp */
diff --git a/Source/Cliente/AdminPV.drc b/Source/Cliente/AdminPV.drc
index 5b22127..503dc27 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 */
/* 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\dtf19.tmp */
diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc
index 43a0745..48011ba 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", "2.1.2.0\0"
- VALUE "CompileDate", "martes, 06 de mayo de 2008 16:51\0"
+ VALUE "CompileDate", "miércoles, 07 de mayo de 2008 18:40\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res
index 378d523..d85ca4b 100644
Binary files a/Source/Cliente/AdminPV.res and b/Source/Cliente/AdminPV.res differ
diff --git a/Source/ControlesBase/ControlesBase.drc b/Source/ControlesBase/ControlesBase.drc
index dce79c4..9b01f71 100644
--- a/Source/ControlesBase/ControlesBase.drc
+++ b/Source/ControlesBase/ControlesBase.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\ControlesBase.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf91.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3.tmp */
diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk
index f615d24..8401dca 100644
--- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk
+++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk
@@ -65,13 +65,25 @@ requires
bdertl,
VclSmp,
dxLayoutControlD10,
- Parametros;
+ Parametros,
+ dxPScxCommonD10,
+ dxPSLnksD10,
+ designide,
+ xmlrtl,
+ vclshlctrls,
+ dxPScxGridLnkD10,
+ dclcxLibraryD10,
+ DataAbstract_Core_D11,
+ RemObjects_Core_D11,
+ cfpack_d11,
+ ccpackD11;
contains
uPluginControllerDevoluciones in 'uPluginControllerDevoluciones.pas' {ModuleDevoluciones: TModuleController},
uBizDevoluciones in '..\Reglas\uBizDevoluciones.pas',
uDataModuleDevoluciones in 'uDataModuleDevoluciones.pas' {dmDevoluciones: TDAClientDataModule},
uEditorListaDevoluciones in 'uEditorListaDevoluciones.pas' {fEditorListaDevoluciones: TCustomEditor},
- uEditorAjustarDevoluciones in 'uEditorAjustarDevoluciones.pas' {fEditorAjustarRecepciones};
+ uEditorAjustarDevoluciones in 'uEditorAjustarDevoluciones.pas' {fEditorAjustarRecepciones},
+ uViewListaDevoluciones in 'uViewListaDevoluciones.pas';
end.
diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj
index 39f764a..ad17f9e 100644
--- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj
+++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj
@@ -1,4 +1,5 @@
-
+
+
{b18cc884-6459-4d3a-be2f-ae618ad4aa76}
Devoluciones.dpk
@@ -56,6 +57,8 @@
+
+
@@ -65,11 +68,17 @@
+
+
+
+
+
+
@@ -84,6 +93,7 @@
+
@@ -102,12 +112,15 @@
TModuleController
+
+
+