From aadab9491fe5ec797255fa4ef6e10637fbd3d282 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 7 May 2008 16:47:05 +0000 Subject: [PATCH] - Ajustes para nuevas tallas 'jeans' 36-46 en ventas - Repaso general git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@117 1c943782-d109-9647-9548-93b3ac332352 --- Source/ApplicationBase/ApplicationBase.dproj | 35 +- .../Usuarios/Views/uEditorPerfilUsuario.dfm | 1 + .../Usuarios/Views/uEditorPerfilUsuario.pas | 8 +- .../Usuarios/Views/uEditorUsuario.dfm | 6 + .../Usuarios/Views/uEditorUsuario.pas | 7 - .../Usuarios/Views/uEditorUsuarios.pas | 9 +- Source/Base/Base.dproj | 30 + Source/Base/Base.drc | 2 +- Source/Base/Base.res | Bin 4748 -> 384 bytes Source/Base/uEditorBase.dfm | 2 + Source/Base/uEditorBase.pas | Bin 6067 -> 6065 bytes Source/Base/uEditorDBBase.pas | 7 + Source/Base/uEditorGridBase.dfm | 3 +- Source/Base/uEditorGridBase.pas | Bin 5972 -> 6190 bytes Source/Base/uEditorItem.dfm | 7 +- Source/Base/uEditorPreview.dfm | 2 - Source/CargaEDI/CargaEDI.drc | 4 +- Source/Cliente/AdminPV.drc | 4 +- Source/Cliente/AdminPV.rc | 2 +- Source/Cliente/AdminPV.res | Bin 18468 -> 18472 bytes Source/ControlesBase/ControlesBase.drc | 2 +- .../Devoluciones/Cliente/Devoluciones.dpk | 16 +- .../Devoluciones/Cliente/Devoluciones.dproj | 15 +- .../Devoluciones/Cliente/Devoluciones.drc | 4 +- .../FicherosEDI/Cliente/FicherosEDI.drc | 2 +- .../Modulos/Parametros/Cliente/Parametros.drc | 2 +- .../Recepciones/Cliente/Recepciones.drc | 4 +- .../Cliente/ReferenciaGenerica.drc | 4 +- .../uEditorListaReferenciaGenerica.dfm | 6 +- .../Cliente/uViewListaReferenciaGenerica.dfm | 26 +- .../Cliente/uViewListaReferenciaGenerica.pas | 2 +- Source/Modulos/Stock/Cliente/Stock.drc | 4 +- .../Modulos/Traspasos/Cliente/Traspasos.drc | 4 +- .../VentasProceso/Cliente/VentasProceso.drc | 4 +- .../Cliente/VentasTerminadas.drc | 4 +- Source/Servidor/AdminPV_Server.dproj | 411 ++- Source/Servidor/AdminPV_Server.drc | 2971 ++++++++++++++++- Source/Servidor/AdminPV_Server.rc | 2 +- Source/Servidor/AdminPV_Server.res | Bin 23336 -> 23340 bytes 39 files changed, 3287 insertions(+), 325 deletions(-) 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 - - - - - - - + + + + + + +
DataModuleEmpresasObj
 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 45dc55f7e508c2aadceb4f8bfc5080153c1b52cf..01cbcba5c522d4341b374ed55ece934f71eafc4c 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&1)oO5XLJepe&2#;C*uNAUVh=d+&(4um?YIom`vX7lLeHS8qb+Kbagvr2mJd z=PWtqD9j$byGIXV`~0fj>YkZQVq!y0y&v_~^Hja{zSFds*@2|*L)2V*e%;UcUD@pT z-2VQ(`)TyH8V8ai$&RS*lvEcnpYGCT*v*wp+Fc)g*7;Yqk{jGC8O%pW7aAkaj-i+H)%$#se=n^d0dxj@`?CHTJeXblZsiQn4#; z;)larTK+a4{3BqK;~~##CkNN+yB+@I$Mf%N$p7KMgBX2}l!I2baBv>WtMQXle0m(% z!z;3U;knszwriTjHwKM$eVoiR>!nS;C%} z=Gu<6*hu7mM!$>o;DbTT5qE37Y_cEt^4&;;yZC+K_Qc;dt@p{dHQEPkYOs?7y5O#1 zivxYlB|fp@8|^&05<5OMHmf6Ux9MUG4)oc7$DRv&0#E5$dcwMh-P<=AzIqiFcgST})7$=9$ z0c>Ov`|p_I4ky}h^&AMxYf;=n)4#5*+-n^;oZ$gm{$fu{{K=sj<0t1Pzr;^|IMcyn zbWd{^QpflG+$Puw`qaR)^FUK`+$kGky992@1oA=bh{?ZgkgJ$}!> zd^u*#-iDasXD;s?&ynV$?xlsD@l*S;KUxdE1k4oXX>W=#hj^PV`#P9pB zHt~9%YWbHP^X{_?ET7lfyc?Oz^FZ7C&362#Y2q$>hkwPN`0l&l2X@T2O{rh`jr@z7 z#u5w7I|4cdpPM=GJ(!pKjTj1kx1 zBgUv7;^Q5NbME8nb59MmDPGus&mG8r6~2;>lIU&LZsTwze(H0n{VM+hwDYd3nQzvN&G^e{AVpvI`R+lXu(Q#Hx^0|FO+A9fu% z!S`*RZ&d=s}zcA}H__yRQ$xF!#$)d=aG;-JHOrIT)h1o9h!t7P~enS`& zVO7HH`^9emrkPD8egC?BZ13A6`$Y1AeJY*L>URykX6Spy!GV9(;48?E9qIGOf&18( zA9eIhZTuE;wDUkC$M)E2{eEPhtM$kcYR7x1HqZ0DKmWm>*(=^pU6tOR?fGo!x;ppY z$M%CgweReSeQOV;zqhaD`H6jFr<(uCZKjH9stBj{KpbE+wb$e??T@wQsXf!`Q?2BA z&)$(uifIk@pULXfzOoDW%RDv?HJW^XAbvoADzBGhMMej=|U KhkN(`*!vewsZSLE 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 3848e9355803105cf8a80611101f19a0fc7df199..ab93ea139b8897f8483d4565d9c234de95a19071 100644 GIT binary patch delta 7 Ocmdn2zfpg~MsWZQzymt~ delta 10 Rcmdm}zgd67MsX$v1^^dx13dr$ 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 da01dff8fd578c24a2e044ecd73491326e329531..7902cc41df98460655681b4f108bce05d306ab15 100644 GIT binary patch delta 90 zcmcbjx6WXLCFf)X4t}1%(#(>?BDc((lA`>{enL{4%{l!zCfo8#Pu?rQ4-`P9KiVi9%;tnHU%VP{#&M 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 378d523e66cb69909b9fea036ff427ef07dea082..d85ca4b5cfc9e57a01d04c774ec6cdf9733dbf83 100644 GIT binary patch delta 82 zcmZ27fpNtI#ti|kj5{U=y2=B|Lf2?UiOFYOl^MTm{^;7x$eh8TGP&MeUObcGB|{NI mGDAK?4nrzKF@p|+0)qjA`Q-KPs_YgFRtzQ#29xi)y8{4r + + {b18cc884-6459-4d3a-be2f-ae618ad4aa76} Devoluciones.dpk @@ -56,6 +57,8 @@ + + @@ -65,11 +68,17 @@ + + + + + + @@ -84,6 +93,7 @@ + @@ -102,12 +112,15 @@
ModuleDevoluciones
TModuleController + + +