Archivado/Varela_PuntosVenta
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Archivado:2.1.2
Branches Tags
Archivado:master
Archivado:2.1.4
Archivado:2.1.3
Archivado:2.1.2
Archivado:2.1.1
Archivado:DA5-D2007
Archivado:Mis%20documentos
Archivado:DA3-D7
Archivado:1.1.1
Archivado:1.1.0
...
compare: Archivado:master
Branches Tags
Archivado:master
Archivado:2.1.4
Archivado:2.1.3
Archivado:2.1.2
Archivado:2.1.1
Archivado:DA5-D2007
Archivado:Mis%20documentos
Archivado:DA3-D7
Archivado:1.1.1
Archivado:1.1.0

8 Commits
2.1.2 ... master

Author SHA1 Message Date
roberto
317f5186b4 Se arregla la vista RDX_V_VENTASEDI_RESUELTAS para que se coja el valor y cantidad del articulo corregido 
git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@129 1c943782-d109-9647-9548-93b3ac332352
 2009-09-23 16:54:23 +00:00
roberto
c81c21ce62 git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@128 1c943782-d109-9647-9548-93b3ac332352 2009-09-23 16:30:42 +00:00
david
4c9129f541 Lib. GUISDK -> Cambio de ruta 
git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@127 1c943782-d109-9647-9548-93b3ac332352
 2009-02-27 10:46:22 +00:00
david
0a0319219b - Incremento de versión en el cliente (2.1.6) 
git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@126 1c943782-d109-9647-9548-93b3ac332352
 2008-10-16 16:20:07 +00:00
david
c10fbb7772 - Máscaras de formato en sumatorios del grid: en ciertos casos, se falsean los valores. 
- Poner en el grid de devoluciones y traspasos el código del artículo en las cabeceras de los grupos.


git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@125 1c943782-d109-9647-9548-93b3ac332352
 2008-10-16 16:11:19 +00:00
david
2fcba2db5f Se cambia la vista RDX_V_STOCK_INVENTARIO para que tenga en cuenta los ajustes de traspasos que habian dejado de tenerse en cuenta, y se arreglan las recepciones que no se podía hacer ajustes 
git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@124 1c943782-d109-9647-9548-93b3ac332352
 2008-07-09 11:01:22 +00:00
david
e2a1f9f312 Arreglado fallo en el esquema del módulo de recepciones porque no se podía cambiar de estado a las tuplas. 
git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@122 1c943782-d109-9647-9548-93b3ac332352
 2008-05-19 15:04:59 +00:00
david
014683ebe3 - Incremento de versión (2.1.3) 
- Arreglos en filtros de stock.

git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@120 1c943782-d109-9647-9548-93b3ac332352
 2008-05-10 11:41:06 +00:00
41 changed files with 406 additions and 210 deletions
Show Stats Expand all files Collapse all files

12
Database/2.2 - vistas ventas.sql
View File

@ -148,12 +148,14 @@ SELECT
TIPO_PRODUTO = ISNULL(PRODUTOS.TIPO_PRODUTO, RDX_V_VENTASEDI.TIPO_PRODUTO), TIPO_PRODUTO = ISNULL(PRODUTOS.TIPO_PRODUTO, RDX_V_VENTASEDI.TIPO_PRODUTO),
GRUPO_PRODUTO = ISNULL(PRODUTOS.GRUPO_PRODUTO, RDX_V_VENTASEDI.GRUPO_PRODUTO), GRUPO_PRODUTO = ISNULL(PRODUTOS.GRUPO_PRODUTO, RDX_V_VENTASEDI.GRUPO_PRODUTO),
PRODUTOS.COLECAO, PRODUTOS.COLECAO,
DESC_COLECAO = ISNULL(COLECOES.DESC_COLECAO, RDX_V_VENTASEDI.DESC_COLECAO), DESC_COLECAO = ISNULL(COLECOES.DESC_COLECAO, RDX_V_VENTASEDI.DESC_COLECAO),
RDX_V_VENTASEDI.VALVEN, VALVEN = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.VALVEN, RDX_V_VENTASEDI.VALVEN),
RDX_V_VENTASEDI.CANVEN, CANVEN = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANVEN, RDX_V_VENTASEDI.CANVEN),
RDX_V_VENTASEDI.CANDEV, RDX_V_VENTASEDI.CANDEV,
RDX_V_VENTASEDI.CANVENNET, CANVENNET = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANVENNET, RDX_V_VENTASEDI.CANVENNET),
RDX_V_VENTASEDI.CANESP
CANESP = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANESP, RDX_V_VENTASEDI.CANESP)
FROM RDX_V_VENTASEDI FROM RDX_V_VENTASEDI
LEFT JOIN RDX_V_REFERENCIAS_RESUELTAS ON ( LEFT JOIN RDX_V_REFERENCIAS_RESUELTAS ON (
(RDX_V_REFERENCIAS_RESUELTAS.NUMINF = RDX_V_VENTASEDI.NUMINF) AND (RDX_V_REFERENCIAS_RESUELTAS.NUMINF = RDX_V_VENTASEDI.NUMINF) AND

3
Database/2.3 - vistas stock.sql
View File

@ -94,8 +94,7 @@ FULL OUTER JOIN RDX_V_TRASPASOS_AJUSTES_DESGLOSADO ON
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI.TALLA) AND (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI.TALLA) AND
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA) AND (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA)
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TIPO = RDX_V_INVENTARIOEDI.TIPOCANT)
FULL OUTER JOIN RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO ON FULL OUTER JOIN RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO ON
(RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND (RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND
(RDX_V_INVENTARIOEDI.CENTRO = RDX_V_INVENTARIOEDI.CENTRO2) AND (RDX_V_INVENTARIOEDI.CENTRO = RDX_V_INVENTARIOEDI.CENTRO2) AND

24
Source/Base/Base.dproj
View File

@ -46,30 +46,6 @@
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

2
Source/Base/Base.drc
View File

@ -29,4 +29,4 @@ END
/* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */ /* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */
/* C:\Varela_D2007\Source\Base\uViewGrid.dfm */ /* C:\Varela_D2007\Source\Base\uViewGrid.dfm */
/* C:\Varela_D2007\Source\Base\Base.res */ /* C:\Varela_D2007\Source\Base\Base.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2C.tmp */

2
Source/CargaEDI/CargaEDI.dproj
View File

@ -43,7 +43,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>

2
Source/CargaEDI/CargaEDI.drc
View File

@ -15,4 +15,4 @@ 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\uCargaEDI.dfm */
/* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */ /* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1B.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */

8
Source/CargaEDI/CargaEDI.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Varela_D2007\Resources\Iconos\CargaEDI.ico" MAINICON ICON "C:\Varela_D2007\Resources\Iconos\CargaEDI.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,1,2,0 FILEVERSION 2,1,6,0
PRODUCTVERSION 2,1,2,0 PRODUCTVERSION 2,1,6,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -12,8 +12,8 @@ BEGIN
BEGIN BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "FileVersion", "2.1.2.0\0" VALUE "FileVersion", "2.1.6.0\0"
VALUE "ProductVersion", "2.1.2.0\0" VALUE "ProductVersion", "2.1.6.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/CargaEDI/CargaEDI.res
View File

Binary file not shown.

2
Source/Cliente/AdminPV.dproj
View File

@ -42,7 +42,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

2
Source/Cliente/AdminPV.drc
View File

@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */ /* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */
/* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */ /* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */
/* C:\Varela_D2007\Source\Cliente\AdminPV.res */ /* C:\Varela_D2007\Source\Cliente\AdminPV.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf19.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */

10
Source/Cliente/AdminPV.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico" MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,1,2,0 FILEVERSION 2,1,6,0
PRODUCTVERSION 2,1,2,0 PRODUCTVERSION 2,1,6,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,11 +13,11 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.1.2.0\0" VALUE "FileVersion", "2.1.6.0\0"
VALUE "InternalName", "Administración de puntos de venta\0" VALUE "InternalName", "Administración de puntos de venta\0"
VALUE "ProductName", "Administración de puntos de venta\0" VALUE "ProductName", "Administración de puntos de venta\0"
VALUE "ProductVersion", "2.1.2.0\0" VALUE "ProductVersion", "2.1.6.0\0"
VALUE "CompileDate", "miércoles, 07 de mayo de 2008 18:40\0" VALUE "CompileDate", "jueves, 16 de octubre de 2008 18:17\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Cliente/AdminPV.res
View File

Binary file not shown.

2
Source/ControlesBase/ControlesBase.drc
View File

@ -26,4 +26,4 @@ END
/* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlBase.dfm */ /* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlBase.dfm */
/* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewPeriodoFechas.dfm */ /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewPeriodoFechas.dfm */
/* C:\Varela_D2007\Source\ControlesBase\ControlesBase.res */ /* C:\Varela_D2007\Source\ControlesBase\ControlesBase.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2E.tmp */

2
Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
View File

@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uPluginControllerDevoluciones.dfm */ /* 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\uEditorAjustarDevoluciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.res */ /* 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\dtf3E.tmp */

2
Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm
View File

@ -23,7 +23,7 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
Column = cxGridViewDIFERENCIA Column = cxGridViewDIFERENCIA
end end
item item
Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades' Format = ',0;-,0'
Kind = skSum Kind = skSum
Column = cxGridViewDIFERENCIA Column = cxGridViewDIFERENCIA
end> end>

2
Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
View File

@ -634,7 +634,7 @@ var
begin begin
inherited; inherited;
Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index]; Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index]; Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
AText := 'Producto: ' + Val1 + ' - Color: ' + Val2; AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
end; end;

2
Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
View File

@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uEditorHistorialCargasEDI.dfm */ /* 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\uPluginControllerFicherosEDI.dfm */
/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.res */ /* 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\dtf34.tmp */

2
Source/Modulos/Parametros/Cliente/Parametros.drc
View File

@ -17,4 +17,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosColeccion.dfm */ /* 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\uViewParametrosFecha.dfm */
/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.res */ /* 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\dtf30.tmp */

8
Source/Modulos/Recepciones/Cliente/Recepciones.dpk
View File

@ -70,7 +70,10 @@ requires
dxPSLnksD10, dxPSLnksD10,
designide, designide,
vclshlctrls, vclshlctrls,
dclcxLibraryD10; dclcxLibraryD10,
dxLayoutControlD10,
DataAbstract_Core_D11,
RemObjects_Core_D11;
contains contains
uPluginControllerRecepciones in 'uPluginControllerRecepciones.pas' {ModuleRecepciones: TModuleController}, uPluginControllerRecepciones in 'uPluginControllerRecepciones.pas' {ModuleRecepciones: TModuleController},
@ -79,6 +82,7 @@ contains
uViewListaRecepciones in 'uViewListaRecepciones.pas' {frViewListaRecepciones: TCustomView}, uViewListaRecepciones in 'uViewListaRecepciones.pas' {frViewListaRecepciones: TCustomView},
uEditorListaRecepciones in 'uEditorListaRecepciones.pas' {fEditorListaRecepciones: TCustomEditor}, uEditorListaRecepciones in 'uEditorListaRecepciones.pas' {fEditorListaRecepciones: TCustomEditor},
uViewListaRecepcionesAlbaran in 'uViewListaRecepcionesAlbaran.pas' {frViewListaRecepcionesAlbaran: TCustomView}, uViewListaRecepcionesAlbaran in 'uViewListaRecepcionesAlbaran.pas' {frViewListaRecepcionesAlbaran: TCustomView},
uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor}; uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor},
uEditorAjustarRecepciones in 'uEditorAjustarRecepciones.pas' {fEditorAjustarRecepciones: TCustomEditor};
end. end.

99
Source/Modulos/Recepciones/Cliente/Recepciones.dproj
View File

@ -1,4 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{5990f68e-d16f-46ae-93db-ba7d141d4021}</ProjectGuid> <ProjectGuid>{5990f68e-d16f-46ae-93db-ba7d141d4021}</ProjectGuid>
<MainSource>Recepciones.dpk</MainSource> <MainSource>Recepciones.dpk</MainSource>
@ -46,8 +47,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages> <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">Recepciones.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">Recepciones.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
@ -57,55 +56,52 @@
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Reglas\uBizRecepciones.pas" /> <DCCReference Include="..\Reglas\uBizRecepciones.pas" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" /> <DCCReference Include="adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" /> <DCCReference Include="bdertl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ControlesBase.dcp" /> <DCCReference Include="ControlesBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD10.dcp" /> <DCCReference Include="cxDataD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD10.dcp" /> <DCCReference Include="cxEditorsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD10.dcp" /> <DCCReference Include="cxExportD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD10.dcp" /> <DCCReference Include="cxExtEditorsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxGridD10.dcp" /> <DCCReference Include="cxGridD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" /> <DCCReference Include="cxLibraryD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD10.dcp" /> <DCCReference Include="cxPageControlD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxTreeListD10.dcp" /> <DCCReference Include="cxTreeListD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" /> <DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dclcxLibraryD10.dcp" /> <DCCReference Include="dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" /> <DCCReference Include="dclcxLibraryD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" /> <DCCReference Include="designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxComnD10.dcp" /> <DCCReference Include="dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD10.dcp" /> <DCCReference Include="dxComnD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD10.dcp" /> <DCCReference Include="dxLayoutControlD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGridLnkD10.dcp" /> <DCCReference Include="dxPSCoreD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSLnksD10.dcp" /> <DCCReference Include="dxPScxCommonD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" /> <DCCReference Include="dxPScxGridLnkD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" /> <DCCReference Include="dxPSLnksD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" /> <DCCReference Include="dxThemeD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" /> <DCCReference Include="GUISDK_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" /> <DCCReference Include="Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCustomD11R.dcp" /> <DCCReference Include="JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" /> <DCCReference Include="JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" /> <DCCReference Include="JvCustomD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" /> <DCCReference Include="JvGlobusD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" /> <DCCReference Include="JvPageCompsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Parametros.dcp" /> <DCCReference Include="JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" /> <DCCReference Include="JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" /> <DCCReference Include="Parametros.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" /> <DCCReference Include="PluginSDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" /> <DCCReference Include="PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tb2k_D10.dcp" /> <DCCReference Include="PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_D10.dcp" /> <DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" /> <DCCReference Include="rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" /> <DCCReference Include="tb2k_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" /> <DCCReference Include="tbx_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclshlctrls.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="uDataModuleRecepciones.pas"> <DCCReference Include="uDataModuleRecepciones.pas">
<Form>dmRecepciones</Form> <Form>dmRecepciones</Form>
<DesignClass>TDAClientDataModule</DesignClass> <DesignClass>TDAClientDataModule</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uEditorAjustarRecepciones.pas" />
<DCCReference Include="uEditorListaRecepciones.pas"> <DCCReference Include="uEditorListaRecepciones.pas">
<Form>fEditorListaRecepciones</Form> <Form>fEditorListaRecepciones</Form>
<DesignClass>TCustomEditor</DesignClass> <DesignClass>TCustomEditor</DesignClass>
@ -126,6 +122,13 @@
<Form>frViewListaRecepcionesAlbaran</Form> <Form>frViewListaRecepcionesAlbaran</Form>
<DesignClass>TCustomView</DesignClass> <DesignClass>TCustomView</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclshlctrls.dcp" />
<DCCReference Include="VclSmp.dcp" />
<DCCReference Include="vclx.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

3
Source/Modulos/Recepciones/Cliente/Recepciones.drc
View File

@ -18,5 +18,6 @@ END
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uViewListaRecepcionesAlbaran.dfm */ /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uViewListaRecepcionesAlbaran.dfm */
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorListaRecepcionesAlbaran.dfm */ /* 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\uPluginControllerRecepciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorAjustarRecepciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */ /* 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\dtf3C.tmp */

4
Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm
View File

@ -76,7 +76,6 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN' Name = 'ALBARAN'
DataType = datString DataType = datString
Size = 7 Size = 7
LogChanges = False
ReadOnly = True ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN' DictionaryEntry = 'Recepciones_ALBARAN'
end end
@ -377,7 +376,6 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN' Name = 'ALBARAN'
DataType = datString DataType = datString
Size = 7 Size = 7
LogChanges = False
ReadOnly = True ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN' DictionaryEntry = 'Recepciones_ALBARAN'
end end
@ -678,7 +676,6 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN' Name = 'ALBARAN'
DataType = datString DataType = datString
Size = 7 Size = 7
LogChanges = False
ReadOnly = True ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN' DictionaryEntry = 'Recepciones_ALBARAN'
end end
@ -920,7 +917,6 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN' Name = 'ALBARAN'
DataType = datString DataType = datString
Size = 7 Size = 7
LogChanges = False
ReadOnly = True ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN' DictionaryEntry = 'Recepciones_ALBARAN'
end end

5
Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
View File

@ -4,6 +4,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
Caption = 'Control de recepciones' Caption = 'Control de recepciones'
ClientHeight = 664 ClientHeight = 664
ClientWidth = 816 ClientWidth = 816
ExplicitTop = -106
ExplicitWidth = 824 ExplicitWidth = 824
ExplicitHeight = 691 ExplicitHeight = 691
PixelsPerInch = 96 PixelsPerInch = 96
@ -117,7 +118,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
end end
item item
Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades' Format = ',0;-,0'
Kind = skSum Kind = skSum
Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
end> end>
@ -1634,7 +1635,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
inherited dsDataTable: TDADataSource [10] inherited dsDataTable: TDADataSource [10]
Top = 136 Top = 136
end end
inherited GridPopupMenu: TPopupMenu inherited GridPopupMenu: TPopupMenu [11]
Left = 112 Left = 112
Top = 128 Top = 128
object Cambiarelestado1: TMenuItem [3] object Cambiarelestado1: TMenuItem [3]

2
Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm
View File

@ -23,7 +23,7 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
Column = cxGridBandedViewDIFERENCIA Column = cxGridBandedViewDIFERENCIA
end end
item item
Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades' Format = ',0;-,0'
Kind = skSum Kind = skSum
Column = cxGridBandedViewDIFERENCIA Column = cxGridBandedViewDIFERENCIA
end> end>

147
Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm
View File

@ -1320,162 +1320,153 @@ object srvRecepciones: TsrvRecepciones
DataType = datString DataType = datString
Size = 7 Size = 7
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'ESTADO_ALBARAN' Name = 'ESTADO_ALBARAN'
DataType = datString DataType = datString
Size = 15 Size = 15
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'OBSERVACIONES_ALBARAN' Name = 'OBSERVACIONES_ALBARAN'
DataType = datString DataType = datString
Size = 255 Size = 255
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'CONTABILIZAR_ALBARAN' Name = 'CONTABILIZAR_ALBARAN'
DataType = datString DataType = datString
Size = 1 Size = 1
Value = '' Value = ''
ParamType = daptInput end
item
Name = 'RR36'
DataType = datInteger
Value = ''
end end
item item
Name = 'RR38' Name = 'RR38'
DataType = datFloat DataType = datInteger
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'RR40' Name = 'RR40'
DataType = datFloat DataType = datInteger
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'RR42' Name = 'RR42'
DataType = datFloat DataType = datInteger
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'RR44' Name = 'RR44'
DataType = datFloat DataType = datInteger
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'RR46' Name = 'RR46'
DataType = datFloat DataType = datInteger
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'RR48' Name = 'RR48'
DataType = datFloat DataType = datInteger
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'APROBADO' Name = 'APROBADO'
DataType = datString DataType = datString
Size = 1 Size = 1
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'FECHA' Name = 'FECHA'
DataType = datDateTime DataType = datDateTime
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'CENTRO' Name = 'CENTRO'
DataType = datString DataType = datString
Size = 17 Size = 17
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'CODIGO' Name = 'CODIGO'
DataType = datString DataType = datString
Size = 12 Size = 12
Value = '' Value = ''
ParamType = daptInput
end end
item item
Name = 'COLOR' Name = 'COLOR'
DataType = datString DataType = datString
Size = 10 Size = 10
Value = '' Value = ''
ParamType = daptInput
end> end>
Statements = < Statements = <
item item
Connection = 'GFT_VARELA' Connection = 'GFT_VARELA'
TargetTable = 'RDX_V_CONTROL_RECEPCION'
SQL = SQL =
'begin'#10' declare @rowcount_var int'#10' declare @ALBARAN char(7)' + 'begin'#10' declare @rowcount_var int'#10' declare @ALBARAN char(7)' +
#10' declare @ESTADO_ALBARAN varchar(20)'#10' declare @OBSERVACIO' + #10' declare @ESTADO_ALBARAN varchar(20)'#10' declare @OBSERVACIO' +
'NES_ALBARAN varchar(255)'#10' declare @CONTABILIZAR_ALBARAN char(' + 'NES_ALBARAN varchar(255)'#10' declare @CONTABILIZAR_ALBARAN char(' +
'1)'#10#10' declare @RR38 numeric(15,0)'#10' declare @RR40 numeric(15' + '1)'#10#10' declare @RR36 numeric(15,0)'#10' declare @RR38 numeric(15' +
',0)'#10' declare @RR42 numeric(15,0)'#10' declare @RR44 numeric(15' + ',0)'#10' declare @RR40 numeric(15,0)'#10' declare @RR42 numeric(15' +
',0)'#10' declare @RR46 numeric(15,0)'#10' declare @RR48 numeric(15' + ',0)'#10' declare @RR44 numeric(15,0)'#10' declare @RR46 numeric(15' +
',0)'#10' declare @RR_S numeric(15,0)'#10' declare @RR_M numeric(15' + ',0)'#10' declare @RR48 numeric(15,0)'#10' declare @RR_S numeric(15' +
',0)'#10' declare @RR_L numeric(15,0)'#10' declare @RR_XL numeric(1' + ',0)'#10' declare @RR_M numeric(15,0)'#10' declare @RR_L numeric(15' +
'5,0)'#10#10' declare @APROBADO char(1)'#10' declare @FECHA datetime'#10 + ',0)'#10' declare @RR_XL numeric(15,0)'#10#10' declare @APROBADO char' +
' declare @CENTRO varchar(17)'#10' declare @CODIGO varchar(12)'#10 + '(1)'#10' declare @FECHA datetime'#10' declare @CENTRO varchar(17)'#10 +
' declare @COLOR varchar(10)'#10' '#10' declare @TIPO_TALLAJE sm' + ' declare @CODIGO varchar(12)'#10' declare @COLOR varchar(10)'#10' ' +
'allint'#10#10' set @ALBARAN = :ALBARAN'#10' set @ESTADO_ALBARAN = :E' + ' '#10' declare @TIPO_TALLAJE smallint'#10#10' set @ALBARAN = :ALBA' +
'STADO_ALBARAN'#10' set @OBSERVACIONES_ALBARAN = :OBSERVACIONES_AL' + 'RAN'#10' set @ESTADO_ALBARAN = :ESTADO_ALBARAN'#10' set @OBSERVACI' +
'BARAN'#10' set @CONTABILIZAR_ALBARAN = :CONTABILIZAR_ALBARAN'#10#10' ' + 'ONES_ALBARAN = :OBSERVACIONES_ALBARAN'#10' set @CONTABILIZAR_ALBA' +
' set @RR38 = :RR38'#10' set @RR40 = :RR40'#10' set @RR42 = :RR42'#10' ' + 'RAN = :CONTABILIZAR_ALBARAN'#10#10' set @RR36 = :RR36'#10' set @RR38' +
' set @RR44 = :RR44'#10' set @RR46 = :RR46'#10' set @RR48 = :RR48' + ' = :RR38'#10' set @RR40 = :RR40'#10' set @RR42 = :RR42'#10' set @RR' +
#10' set @RR_S = :RR38'#10' set @RR_M = :RR40'#10' set @RR_L = :RR' + '44 = :RR44'#10' set @RR46 = :RR46'#10' set @RR48 = :RR48'#10' set @' +
'42'#10' set @RR_XL = :RR44'#10#10' set @APROBADO = :APROBADO'#10' set' + 'RR_S = :RR38'#10' set @RR_M = :RR40'#10' set @RR_L = :RR42'#10' set' +
' @FECHA = :FECHA'#10' set @CENTRO = :CENTRO'#10' set @CODIGO = :CO' + ' @RR_XL = :RR44'#10#10' set @APROBADO = :APROBADO'#10' set @FECHA = ' +
'DIGO'#10' set @COLOR = :COLOR'#10#10#10' /* **************************' + ':FECHA'#10' set @CENTRO = :CENTRO'#10' set @CODIGO = :CODIGO'#10' s' +
'********* */'#10' if @ALBARAN <> '#39#39#10' begin'#10' update RDX' + 'et @COLOR = :COLOR'#10#10#10' /* *********************************** ' +
'_AJUSTES_ALBARAN set'#10#9' ESTADO = @ESTADO_ALBARAN,'#10#9' O' + '*/'#10' if @ALBARAN <> '#39#39#10' begin'#10' update RDX_AJUSTES_A' +
'BSERVACIONES = @OBSERVACIONES_ALBARAN,'#10#9' CONTABILIZAR = @C' + 'LBARAN set'#10#9' ESTADO = @ESTADO_ALBARAN,'#10#9' OBSERVACION' +
'ONTABILIZAR_ALBARAN'#10' where RDX_AJUSTES_ALBARAN.ALBARAN =' + 'ES = @OBSERVACIONES_ALBARAN,'#10#9' CONTABILIZAR = @CONTABILIZA' +
' @ALBARAN'#10#10#9' select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10' if @ROW' + 'R_ALBARAN'#10' where RDX_AJUSTES_ALBARAN.ALBARAN = @ALBARAN'#10 +
'COUNT_VAR = 0'#10#9' begin'#10' insert into RDX_AJUSTES_ALBAR' + #10#9' select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10' if @ROWCOUNT_VAR ' +
'AN'#10' (ALBARAN, ESTADO, OBSERVACIONES, CONTABIL' + '= 0'#10#9' begin'#10' insert into RDX_AJUSTES_ALBARAN'#10' ' +
'IZAR)'#10' values (@ALBARAN, @ESTADO_ALBARAN,'#10' ' + ' (ALBARAN, ESTADO, OBSERVACIONES, CONTABILIZAR)'#10' ' +
' @OBSERVACIONES_ALBARAN, @CONTABILIZAR_ALBARAN)'#10#10' ' + ' values (@ALBARAN, @ESTADO_ALBARAN,'#10' ' +
' select @ROWCOUNT_VAR = @@ROWCOUNT'#10' end'#10' end'#10 + ' @OBSERVACIONES_ALBARAN, @CONTABILIZAR_ALBARAN)'#10#10' se' +
#10#10' /* ARREGLO PARA QUE SOPORTE LOS NUEVOS TALLAJES*** */'#10' ' + 'lect @ROWCOUNT_VAR = @@ROWCOUNT'#10' end'#10' end'#10#10#10' /* A' +
#10' execute RDX_P_TIPO_TALLAJE @CODIGO, @TIPO_TALLAJE OUTPUT'#10#10' ' + 'RREGLO PARA QUE SOPORTE LOS NUEVOS TALLAJES*** */'#10' '#10' execu' +
' if @TIPO_TALLAJE = 1'#10' begin'#10' set @RR_S = NULL'#10' ' + 'te RDX_P_TIPO_TALLAJE @CODIGO, @TIPO_TALLAJE OUTPUT'#10#10' if @TIP' +
' set @RR_M = NULL'#10' set @RR_L = NULL'#10' set @RR_XL = NU' + 'O_TALLAJE = 1'#10' begin'#10' set @RR_S = NULL'#10' set @RR_M' +
'LL'#10' end'#10#10' if @TIPO_TALLAJE = 2'#10' begin'#10' set @RR38 ' + ' = NULL'#10' set @RR_L = NULL'#10' set @RR_XL = NULL'#10' end' +
'= NULL'#10' set @RR40 = NULL'#10' set @RR42 = NULL'#10' se' + #10#10' if @TIPO_TALLAJE = 2'#10' begin'#10' set @RR36 = NULL'#10' ' +
't @RR44 = NULL'#10' set @RR46 = NULL'#10' set @RR48 = NULL'#10' ' + ' set @RR38 = NULL'#10' set @RR40 = NULL'#10' set @RR42 = ' +
' end'#10#10' '#10' /* *********************************** */'#10#9'upda' + 'NULL'#10' set @RR44 = NULL'#10' set @RR46 = NULL'#10' set ' +
'te RDX_RECEPCION_AJUSTES set'#10#9' CANT38 = @RR38,'#10#9' ' + '@RR48 = NULL'#10' end'#10#10' '#10' /* ******************************' +
' CANT40 = @RR40,'#10#9' CANT42 = @RR42,'#10#9' CAN' + '***** */'#10#9'update RDX_RECEPCION_AJUSTES set'#10#9' CANT36 = ' +
'T44 = @RR44,'#10#9' CANT46 = @RR46,'#10#9' CANT48 = @R' + '@RR36,'#10#9' CANT38 = @RR38,'#10#9' CANT40 = @RR40,'#10#9 +
'R48,'#10#9' CANT_S = @RR_S,'#10#9' CANT_M = @RR_M,'#10#9' ' + ' CANT42 = @RR42,'#10#9' CANT44 = @RR44,'#10#9' ' +
' CANT_L = @RR_L,'#10#9' CANT_XL = @RR_XL,'#10' ' + ' CANT46 = @RR46,'#10#9' CANT48 = @RR48,'#10#9' CANT_' +
' APROBADO = @APROBADO,'#10' FECHACAMBIO = CURRENT' + 'S = @RR_S,'#10#9' CANT_M = @RR_M,'#10#9' CANT_L = @RR_' +
'_TIMESTAMP'#10#9'where'#10' (RDX_RECEPCION_AJUSTES.CENTRO = @' + 'L,'#10#9' CANT_XL = @RR_XL,'#10' APROBADO = @APRO' +
'CENTRO and'#10#9' RDX_RECEPCION_AJUSTES.CODIGO = @CODIGO and'#10#9' ' + 'BADO,'#10' FECHACAMBIO = CURRENT_TIMESTAMP'#10#9'where'#10' ' +
' RDX_RECEPCION_AJUSTES.COLOR = @COLOR and'#10#9' RDX_RECEPCIO' + ' (RDX_RECEPCION_AJUSTES.CENTRO = @CENTRO and'#10#9' RDX_' +
'N_AJUSTES.FECHA = @FECHA)'#10#10#9'select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10#9 + 'RECEPCION_AJUSTES.CODIGO = @CODIGO and'#10#9' RDX_RECEPCION_AJUS' +
'if @ROWCOUNT_VAR = 0'#10' begin'#10' insert into RDX_RECE' + 'TES.COLOR = @COLOR and'#10#9' RDX_RECEPCION_AJUSTES.FECHA = @FEC' +
'PCION_AJUSTES'#10' (FECHA, CENTRO, CODIGO, COLOR,'#10' ' + 'HA)'#10#10#9'select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10#9'if @ROWCOUNT_VAR = 0'#10' ' +
' APROBADO, FECHACAMBIO,'#10' CANT38, CA' + ' begin'#10' insert into RDX_RECEPCION_AJUSTES'#10' ' +
'NT40, CANT42,'#10' CANT44, CANT46, CANT48,'#10' ' + ' (FECHA, CENTRO, CODIGO, COLOR,'#10' APROBADO' +
' CANT_S, CANT_M, CANT_L, CANT_XL)'#10' values ('#10' ' + ', FECHACAMBIO, CANT36,'#10' CANT38, CANT40, CANT42,'#10 +
' @FECHA, @CENTRO, @CODIGO,'#10' @COLOR, @' + ' CANT44, CANT46, CANT48,'#10' CANT_S' +
'APROBADO, CURRENT_TIMESTAMP,'#10' @RR38, @RR40, @RR4' + ', CANT_M, CANT_L, CANT_XL)'#10' values ('#10' @F' +
'2,'#10' @RR44, @RR46, @RR48,'#10' @RR_S,' + 'ECHA, @CENTRO, @CODIGO,'#10' @COLOR, @APROBADO, CURR' +
' @RR_M, @RR_L, @RR_XL)'#10#10' select @ROWCOUNT_VAR = @@ROWCOU' + 'ENT_TIMESTAMP, @RR36,'#10' @RR38, @RR40, @RR42,'#10' ' +
'NT'#10' end'#10'end'#10 ' @RR44, @RR46, @RR48,'#10' @RR_S, @RR_M,' +
' @RR_L, @RR_XL)'#10#10' select @ROWCOUNT_VAR = @@ROWCOUNT'#10' ' +
' end'#10'end'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = <> ColumnMappings = <>
end> end>
@ -1578,9 +1569,7 @@ object srvRecepciones: TsrvRecepciones
Name = 'Recepciones_ALBARAN' Name = 'Recepciones_ALBARAN'
DataType = datString DataType = datString
Size = 7 Size = 7
LogChanges = False
DisplayLabel = 'ALBARAN' DisplayLabel = 'ALBARAN'
ReadOnly = True
end end
item item
Name = 'Recepciones_ESTADO_ALBARAN' Name = 'Recepciones_ESTADO_ALBARAN'

2
Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
View File

@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uPluginControllerReferenciaGenerica.dfm */ /* 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\uEditorCambioReferenciaGenerica.dfm */
/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.res */ /* 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\dtf3A.tmp */

2
Source/Modulos/Stock/Cliente/Stock.drc
View File

@ -21,4 +21,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uEditorControlStockVARELA.dfm */ /* 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\uPluginControllerStock.dfm */
/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.res */ /* 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\dtf42.tmp */

4
Source/Modulos/Stock/Cliente/uDataModuleStock.dfm
View File

@ -1,8 +1,8 @@
object dmStock: TdmStock object dmStock: TdmStock
OldCreateOrder = True OldCreateOrder = True
OnCreate = DAClientDataModuleCreate OnCreate = DAClientDataModuleCreate
Height = 322 Height = 331
Width = 267 Width = 500
object RORemoteService: TRORemoteService object RORemoteService: TRORemoteService
Message = dmBase.ROMessage Message = dmBase.ROMessage
Channel = dmBase.ROChannel Channel = dmBase.ROChannel

2
Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm
View File

@ -182,7 +182,7 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
Margins.Top = 0 Margins.Top = 0
Margins.Right = 0 Margins.Right = 0
Margins.Bottom = 0 Margins.Bottom = 0
ActivePage = tabInventario ActivePage = tabDesglose
Align = alClient Align = alClient
MultiLine = True MultiLine = True
TabHeight = 10 TabHeight = 10

114
Source/Modulos/Stock/Reglas/uBizStock.pas
View File

@ -30,15 +30,31 @@ type
end; end;
TBizStockEDIDataTableRules = class(TStockEDIDataTableRules, IBizStockEDI) TBizStockEDIDataTableRules = class(TStockEDIDataTableRules, IBizStockEDI)
procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest);
procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest);
public
constructor Create(aDataTable: TDADataTable); override;
end; end;
TBizStockEDIInventarioDataTableRules = class(TStockEDIInventarioDataTableRules, IBizStockEDIInventario) TBizStockEDIInventarioDataTableRules = class(TStockEDIInventarioDataTableRules, IBizStockEDIInventario)
procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest);
procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest);
public
constructor Create(aDataTable: TDADataTable); override;
end; end;
TBizStockVARELADataTableRules = class(TStockVARELADataTableRules, IBizStockVARELA) TBizStockVARELADataTableRules = class(TStockVARELADataTableRules, IBizStockVARELA)
procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest);
procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest);
public
constructor Create(aDataTable: TDADataTable); override;
end; end;
TBizStockPrendasCentrosDataTableRules = class(TStockPrendasCentrosDataTableRules, IBizStockPrendasCentros) TBizStockPrendasCentrosDataTableRules = class(TStockPrendasCentrosDataTableRules, IBizStockPrendasCentros)
procedure OnBeforeDataRequestCall(DataTable: TDADataTable; Request: TDARemoteRequest);
procedure OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest);
public
constructor Create(aDataTable: TDADataTable); override;
end; end;
@ -47,6 +63,104 @@ implementation
{uses {uses
Dialogs, uEditorUtils, uDataModuleVentasTerminadas;} 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 initialization
RegisterDataTableRules(BIZ_STOCK_EDI, TBizStockEDIDataTableRules); RegisterDataTableRules(BIZ_STOCK_EDI, TBizStockEDIDataTableRules);
RegisterDataTableRules(BIZ_STOCK_EDIINVENTARIO, TBizStockEDIInventarioDataTableRules); RegisterDataTableRules(BIZ_STOCK_EDIINVENTARIO, TBizStockEDIInventarioDataTableRules);

2
Source/Modulos/Traspasos/Cliente/Traspasos.drc
View File

@ -18,4 +18,4 @@ END
/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uPluginControllerTraspasos.dfm */ /* 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\uEditorAjustarTraspasos.dfm */
/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.res */ /* 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\dtf40.tmp */

2
Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas
View File

@ -581,7 +581,7 @@ var
begin begin
inherited; inherited;
Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index]; Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index]; Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
AText := 'Producto: ' + Val1 + ' - Color: ' + Val2; AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
end; end;

2
Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
View File

@ -20,4 +20,4 @@ END
/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlVentaProceso.dfm */ /* 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\uEditorControlVentaProceso.dfm */
/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.res */ /* 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\dtf38.tmp */

2
Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
View File

@ -22,4 +22,4 @@ END
/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uPluginControllerVentasTerminadas.dfm */ /* 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\uEditorControlVentasTerminadas.dfm */
/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.res */ /* 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\dtf36.tmp */

2
Source/Servidor/AdminPV_Server.dproj
View File

@ -44,7 +44,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
<Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages> <Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>

4
Source/Servidor/AdminPV_Server.drc
View File

@ -2977,8 +2977,8 @@ END
/* C:\Varela_D2007\Source\Servidor\Services\EDI_Sales\uDataModuleEDI_Sales.dfm */ /* C:\Varela_D2007\Source\Servidor\Services\EDI_Sales\uDataModuleEDI_Sales.dfm */
/* C:\Varela_D2007\Source\Servidor\uAcercaDe.dfm */ /* C:\Varela_D2007\Source\Servidor\uAcercaDe.dfm */
/* C:\Varela_D2007\Source\Servidor\fServerForm.dfm */ /* C:\Varela_D2007\Source\Servidor\fServerForm.dfm */
/* C:\Varela_D2007\Source\Servidor\EDI\EDI_Inventary_Impl.dfm */
/* C:\Varela_D2007\Source\Servidor\Services\EDI_Inventary\uDataModuleEDI_Inventary.dfm */ /* C:\Varela_D2007\Source\Servidor\Services\EDI_Inventary\uDataModuleEDI_Inventary.dfm */
/* C:\Varela_D2007\Source\Servidor\EDI\EDI_Inventary_Impl.dfm */
/* C:\Varela_D2007\Source\Servidor\Services\Login\srvLogin_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\Services\Login\srvLogin_Impl.dfm */
/* C:\Varela_D2007\Source\Servidor\srvInformes_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\srvInformes_Impl.dfm */
/* C:\Varela_D2007\Source\Servidor\Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.dfm */
@ -2995,4 +2995,4 @@ END
/* C:\Varela_D2007\Source\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.dfm */ /* C:\Varela_D2007\Source\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.dfm */
/* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */ /* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */
/* C:\Varela_D2007\Source\Servidor\RODLFILE.res */ /* C:\Varela_D2007\Source\Servidor\RODLFILE.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1D.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */

10
Source/Servidor/AdminPV_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,1,2,0 FILEVERSION 2,1,4,0
PRODUCTVERSION 2,1,2,0 PRODUCTVERSION 2,1,4,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.1.2.0\0" VALUE "FileVersion", "2.1.4.0\0"
VALUE "ProductName", "AdminPV_Server\0" VALUE "ProductName", "AdminPV_Server\0"
VALUE "ProductVersion", "2.1.2.0\0" VALUE "ProductVersion", "2.1.4.0\0"
VALUE "CompileDate", "miércoles, 07 de mayo de 2008 18:40\0" VALUE "CompileDate", "jueves, 16 de octubre de 2008 18:17\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Servidor/AdminPV_Server.res
View File

Binary file not shown.

8
Source/Servidor/EDI/EDI_Inventary_Impl.dfm
View File

@ -1,7 +1,9 @@
inherited EDI_Inventary: TEDI_Inventary object EDI_Inventary: TEDI_Inventary
OldCreateOrder = True OldCreateOrder = True
Left = 200 OnAfterProcessTransactionAction = pptaNone
Top = 200 ExportedDataTables = <>
CacheElements = <>
Options = [rsoProcessDeltasWithoutUpdateRules]
Height = 300 Height = 300
Width = 300 Width = 300
end end

113
Source/Servidor/EDI/EDI_Inventary_Impl.pas
View File

@ -12,7 +12,7 @@ unit EDI_Inventary_Impl;
interface interface
uses uses
{vcl:} Classes, SysUtils, {vcl:} Classes, SysUtils,
{RemObjects:} uROXMLIntf, uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions, {RemObjects:} uROXMLIntf, uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions,
{Required:} uRORemoteDataModule, {Required:} uRORemoteDataModule,
{Ancestor Implementation:} DARemoteService_Impl, {Ancestor Implementation:} DARemoteService_Impl,
@ -23,6 +23,7 @@ type
{ TEDI_Inventary } { TEDI_Inventary }
TEDI_Inventary = class(TDARemoteService, IEDI_Inventary) TEDI_Inventary = class(TDARemoteService, IEDI_Inventary)
private private
procedure InsertarLog(OK: Boolean; Error_msg: String);
protected protected
{ IEDI_Inventary methods } { IEDI_Inventary methods }
function CargarFicheroEDI(const FicheroCAB: String; const FicheroLIN: String; const FicheroCANT: String; out MsgError: String): Boolean; function CargarFicheroEDI(const FicheroCAB: String; const FicheroLIN: String; const FicheroCANT: String; out MsgError: String): Boolean;
@ -32,7 +33,8 @@ implementation
{$R *.dfm} {$R *.dfm}
uses uses
{Generated:} VARELA_Invk; {Generated:} VARELA_Invk, uDataModuleServer,
EDI_Log_Impl, JclFileUtils, DateUtils, uDataModuleEDI_Inventary;
procedure Create_EDI_Inventary(out anInstance : IUnknown); procedure Create_EDI_Inventary(out anInstance : IUnknown);
begin begin
@ -41,9 +43,116 @@ end;
{ EDI_Inventary } { EDI_Inventary }
function TEDI_Inventary.CargarFicheroEDI(const FicheroCAB: String; const FicheroLIN: String; const FicheroCANT: String; out MsgError: String): Boolean; function TEDI_Inventary.CargarFicheroEDI(const FicheroCAB: String; const FicheroLIN: String; const FicheroCANT: String; out MsgError: String): Boolean;
var
ADirEntrada : String;
ADirTemp : String;
NumRegNuevos : Integer;
bCargarFicheros: Boolean;
procedure GuardarFicheros;
var
AAlmacen : String;
ADate : String;
begin
DateTimeToString(ADate, 'yyyymmddhhnn', Now);
AAlmacen := PathAddSeparator(dmServer.FDirAlmacen);
AAlmacen := PathAddSeparator(AAlmacen + ADate);
if not DirectoryExists(AAlmacen) then
ForceDirectories(AAlmacen);
FileMove(ADirTemp + FicheroCAB, AAlmacen + FicheroCAB);
FileMove(ADirTemp + FicheroLIN, AAlmacen + FicheroLIN);
FileMove(ADirTemp + FicheroCANT, AAlmacen + FicheroCANT);
DeleteDirectory(ADirTemp, False);
end;
begin begin
Result := False;
// Hay que comprobar que existen los ficheros.
ADirEntrada := PathAddSeparator(dmServer.FDirEntrada);
if not FileExists(ADirEntrada + FicheroCAB) or
not FileExists(ADirEntrada + FicheroLIN) or
not FileExists(ADirEntrada + FicheroCANT) then
begin
MsgError := 'No hay ficheros de datos';
InsertarLog(False, MsgError + ' (CargarFicheroEDI1 INV)');
end
else begin
// Muevo los ficheros de carga a un directorio temporal
ADirTemp := PathAddSeparator(ADirEntrada + GetTempDirectory(ADirEntrada));
try
if not DirectoryExists(ADirTemp) then
ForceDirectories(ADirTemp);
if not FileMove(ADirEntrada + FicheroCAB, ADirTemp + FicheroCAB) then
begin
MsgError := 'No se ha podido mover FicheroCAB';
bCargarFicheros := False;
end;
if not FileMove(ADirEntrada + FicheroLIN, ADirTemp + FicheroLIN) then
begin
MsgError := 'No se ha podido mover FicheroLIN';
bCargarFicheros := False;
end;
if not FileMove(ADirEntrada + FicheroCANT, ADirTemp + FicheroCANT) then
begin
MsgError := 'No se ha podido mover FicheroCANT';
bCargarFicheros := False;
end;
except
on E: Exception do
begin
MsgError := E.Message;
InsertarLog(False, MsgError + ' (CargarFicheroEDI2 INV)');
Exit;
end;
end;
try
if bCargarFicheros then
begin
try
dmEDIInventary.CargarFicheros (ADirTemp + FicheroCAB, ADirTemp + FicheroLIN, ADirTemp + FicheroCANT, NumRegNuevos);
if NumRegNuevos > 0 then
InsertarLog(True, Format('Se han cargado %d registros de inventario nuevos', [NumRegNuevos]))
else
InsertarLog(True, 'El fichero se ha cargado pero no hay registros de inventario nuevos');
Result := True;
finally
GuardarFicheros;
dmServer.BorrarFicherosDeCargaAntiguos;
end;
end
else
InsertarLog(False, MsgError + ' (CargarFicheroEDI3 INV)');
except
on E: Exception do
begin
MsgError := E.Message;
InsertarLog(False, MsgError + ' (CargarFicheroEDI3 INV)');
end;
end;
end;
end; end;
procedure TEDI_Inventary.InsertarLog(OK: Boolean; Error_msg: String);
var
LogService : IEDI_Log;
begin
LogService := EDI_Log_Impl.TEDI_Log.Create(Self);
try
LogService.InsertarLog(Now, 'INVRPT', OK, Error_msg);
finally
LogService := nil;
end;
end;
initialization initialization
TROClassFactory.Create('EDI_Inventary', Create_EDI_Inventary, TEDI_Inventary_Invoker); TROClassFactory.Create('EDI_Inventary', Create_EDI_Inventary, TEDI_Inventary_Invoker);

BIN
Tools/midas.dll Normal file
View File

Binary file not shown.