diff --git a/Source/Base/Base.drc b/Source/Base/Base.drc index 2502b2e..47ebfe2 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\dtf1.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2E.tmp */ diff --git a/Source/CargaEDI/CargaEDI.drc b/Source/CargaEDI/CargaEDI.drc index 5cb6cf0..f3730d1 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\dtf1B.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */ diff --git a/Source/Cliente/AdminPV.dproj b/Source/Cliente/AdminPV.dproj index e206700..9a8debd 100644 --- a/Source/Cliente/AdminPV.dproj +++ b/Source/Cliente/AdminPV.dproj @@ -42,7 +42,7 @@ Delphi.Personality VCLApplication - FalseTrueFalseTrueFalse2120FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.2.0Administración de puntos de ventaAdministración de puntos de venta2.1.2.0 + FalseTrueFalseTrueFalse2130FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.3.0Administración de puntos de ventaAdministración de puntos de venta2.1.3.0miércoles, 07 de mayo de 2008 18:40 CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components diff --git a/Source/Cliente/AdminPV.drc b/Source/Cliente/AdminPV.drc index 503dc27..560f833 100644 --- a/Source/Cliente/AdminPV.drc +++ b/Source/Cliente/AdminPV.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */ /* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */ /* C:\Varela_D2007\Source\Cliente\AdminPV.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf19.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */ diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc index 48011ba..998e11f 100644 --- a/Source/Cliente/AdminPV.rc +++ b/Source/Cliente/AdminPV.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico" 1 VERSIONINFO -FILEVERSION 2,1,2,0 -PRODUCTVERSION 2,1,2,0 +FILEVERSION 2,1,3,0 +PRODUCTVERSION 2,1,3,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,11 +13,11 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.1.2.0\0" + VALUE "FileVersion", "2.1.3.0\0" 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", "miércoles, 07 de mayo de 2008 18:40\0" + VALUE "ProductVersion", "2.1.3.0\0" + VALUE "CompileDate", "viernes, 09 de mayo de 2008 11:23\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res index d85ca4b..d01abb0 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 9b01f71..6f297c8 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\dtf3.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf30.tmp */ diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc index eb5ca16..c2bf136 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\dtf13.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf40.tmp */ diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc index 416f400..1cf1173 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\dtf9.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf36.tmp */ diff --git a/Source/Modulos/Parametros/Cliente/Parametros.drc b/Source/Modulos/Parametros/Cliente/Parametros.drc index b2412f3..0a9da68 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\dtf5.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf32.tmp */ diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.drc b/Source/Modulos/Recepciones/Cliente/Recepciones.drc index 19fc03a..a437c7b 100644 --- a/Source/Modulos/Recepciones/Cliente/Recepciones.drc +++ b/Source/Modulos/Recepciones/Cliente/Recepciones.drc @@ -19,4 +19,4 @@ END /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorListaRecepcionesAlbaran.dfm */ /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uPluginControllerRecepciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf11.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3E.tmp */ diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc index 036c3db..0bbef16 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\dtfF.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */ diff --git a/Source/Modulos/Stock/Cliente/Stock.drc b/Source/Modulos/Stock/Cliente/Stock.drc index 715efad..33e5f04 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\dtf17.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */ diff --git a/Source/Modulos/Stock/Cliente/uDataModuleStock.dfm b/Source/Modulos/Stock/Cliente/uDataModuleStock.dfm index f6dc9f9..41ea15f 100644 --- a/Source/Modulos/Stock/Cliente/uDataModuleStock.dfm +++ b/Source/Modulos/Stock/Cliente/uDataModuleStock.dfm @@ -1,8 +1,8 @@ object dmStock: TdmStock OldCreateOrder = True OnCreate = DAClientDataModuleCreate - Height = 322 - Width = 267 + Height = 331 + Width = 500 object RORemoteService: TRORemoteService Message = dmBase.ROMessage Channel = dmBase.ROChannel diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm index c49b97c..2111bcf 100644 --- a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm +++ b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm @@ -182,7 +182,7 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI Margins.Top = 0 Margins.Right = 0 Margins.Bottom = 0 - ActivePage = tabInventario + ActivePage = tabDesglose Align = alClient MultiLine = True TabHeight = 10 diff --git a/Source/Modulos/Stock/Reglas/uBizStock.pas b/Source/Modulos/Stock/Reglas/uBizStock.pas index 9f0ff64..5e56ffd 100644 --- a/Source/Modulos/Stock/Reglas/uBizStock.pas +++ b/Source/Modulos/Stock/Reglas/uBizStock.pas @@ -30,15 +30,31 @@ type end; TBizStockEDIDataTableRules = class(TStockEDIDataTableRules, IBizStockEDI) + procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest); + procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest); + public + constructor Create(aDataTable: TDADataTable); override; end; TBizStockEDIInventarioDataTableRules = class(TStockEDIInventarioDataTableRules, IBizStockEDIInventario) + procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest); + procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest); + public + constructor Create(aDataTable: TDADataTable); override; end; TBizStockVARELADataTableRules = class(TStockVARELADataTableRules, IBizStockVARELA) + procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest); + procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest); + public + constructor Create(aDataTable: TDADataTable); override; end; TBizStockPrendasCentrosDataTableRules = class(TStockPrendasCentrosDataTableRules, IBizStockPrendasCentros) + procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest); + procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest); + public + constructor Create(aDataTable: TDADataTable); override; end; @@ -47,6 +63,104 @@ implementation {uses Dialogs, uEditorUtils, uDataModuleVentasTerminadas;} +{ TBizStockPrendasCentrosDataTableRules } + +constructor TBizStockPrendasCentrosDataTableRules.Create( + aDataTable: TDADataTable); +begin + inherited; + if Assigned(DataTable) then + begin + DataTable.OnBeforeDataRequestCall := OnBeforeDataRequestCall; + DataTable.OnBeforeSchemaCall := OnBeforeSchemaCall; + end; +end; + +procedure TBizStockPrendasCentrosDataTableRules.OnBeforeDataRequestCall( + DataTable: TDADataTable; Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + +procedure TBizStockPrendasCentrosDataTableRules.OnBeforeSchemaCall( + DataTable: TDADataTable; Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + +{ TBizStockEDIDataTableRules } + +constructor TBizStockEDIDataTableRules.Create(aDataTable: TDADataTable); +begin + inherited; + if Assigned(DataTable) then + begin + DataTable.OnBeforeDataRequestCall := OnBeforeDataRequestCall; + DataTable.OnBeforeSchemaCall := OnBeforeSchemaCall; + end; +end; + +procedure TBizStockEDIDataTableRules.OnBeforeDataRequestCall( + DataTable: TDADataTable; Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + +procedure TBizStockEDIDataTableRules.OnBeforeSchemaCall(DataTable: TDADataTable; + Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + +{ TBizStockEDIInventarioDataTableRules } + +constructor TBizStockEDIInventarioDataTableRules.Create( + aDataTable: TDADataTable); +begin + inherited; + if Assigned(DataTable) then + begin + DataTable.OnBeforeDataRequestCall := OnBeforeDataRequestCall; + DataTable.OnBeforeSchemaCall := OnBeforeSchemaCall; + end; +end; + +procedure TBizStockEDIInventarioDataTableRules.OnBeforeDataRequestCall( + DataTable: TDADataTable; Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + +procedure TBizStockEDIInventarioDataTableRules.OnBeforeSchemaCall( + DataTable: TDADataTable; Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + +{ TBizStockVARELADataTableRules } + +constructor TBizStockVARELADataTableRules.Create(aDataTable: TDADataTable); +begin + inherited; + if Assigned(DataTable) then + begin + DataTable.OnBeforeDataRequestCall := OnBeforeDataRequestCall; + DataTable.OnBeforeSchemaCall := OnBeforeSchemaCall; + end; +end; + +procedure TBizStockVARELADataTableRules.OnBeforeDataRequestCall( + DataTable: TDADataTable; Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + +procedure TBizStockVARELADataTableRules.OnBeforeSchemaCall( + DataTable: TDADataTable; Request: TDARemoteRequest); +begin + Request.ParamByName('UserFilter').AsString := DataTable.Where.Clause; +end; + initialization RegisterDataTableRules(BIZ_STOCK_EDI, TBizStockEDIDataTableRules); RegisterDataTableRules(BIZ_STOCK_EDIINVENTARIO, TBizStockEDIInventarioDataTableRules); diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.drc b/Source/Modulos/Traspasos/Cliente/Traspasos.drc index 133e88a..e680f60 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\dtf15.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf42.tmp */ diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc index f180e9c..23a3e99 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\dtfD.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3A.tmp */ diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc index 76ae2b2..ed60e90 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\dtfB.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf38.tmp */ diff --git a/Source/Servidor/AdminPV_Server.dproj b/Source/Servidor/AdminPV_Server.dproj index 0204c93..87109eb 100644 --- a/Source/Servidor/AdminPV_Server.dproj +++ b/Source/Servidor/AdminPV_Server.dproj @@ -44,7 +44,7 @@ Delphi.Personality VCLApplication - FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2120FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.2.0AdminPV_Server2.1.2.0AdminPV_Server.dpr + FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2130FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.3.0AdminPV_Server2.1.3.0miércoles, 07 de mayo de 2008 18:40AdminPV_Server.dpr ExpressPrinting System by Developer Express Inc. CodeGear WebSnap Components CodeGear SOAP Components diff --git a/Source/Servidor/AdminPV_Server.drc b/Source/Servidor/AdminPV_Server.drc index 95c0758..eaa1aa8 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\dtf1D.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4A.tmp */ diff --git a/Source/Servidor/AdminPV_Server.rc b/Source/Servidor/AdminPV_Server.rc index becca36..691c632 100644 --- a/Source/Servidor/AdminPV_Server.rc +++ b/Source/Servidor/AdminPV_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,1,2,0 -PRODUCTVERSION 2,1,2,0 +FILEVERSION 2,1,3,0 +PRODUCTVERSION 2,1,3,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.1.2.0\0" + VALUE "FileVersion", "2.1.3.0\0" VALUE "ProductName", "AdminPV_Server\0" - VALUE "ProductVersion", "2.1.2.0\0" - VALUE "CompileDate", "miércoles, 07 de mayo de 2008 18:40\0" + VALUE "ProductVersion", "2.1.3.0\0" + VALUE "CompileDate", "viernes, 09 de mayo de 2008 11:23\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/AdminPV_Server.res b/Source/Servidor/AdminPV_Server.res index 482e9d5..d4aadac 100644 Binary files a/Source/Servidor/AdminPV_Server.res and b/Source/Servidor/AdminPV_Server.res differ diff --git a/Tools/midas.dll b/Tools/midas.dll new file mode 100644 index 0000000..7b11def Binary files /dev/null and b/Tools/midas.dll differ