Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subida de la version 1.2.0 lista para subida de el jueves, se hace tag tambien (se habilita los inventarios de obras)

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@474 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-07-30 16:25:35 +00:00
parent 4f2e9ffbc3
commit 9ee2b0303a
68 changed files with 2208 additions and 832 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Iconos/Inventario/16x16/InventarioObras.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
Resources/Iconos/Inventario/24x24/InventarioObras.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
Resources/Iconos/Inventario/24x24/Thumbs.db
View File

Binary file not shown.

BIN
Resources/Iconos/Inventario/28x28/InventarioObras.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
Resources/Iconos/Obras/16x16/Obras.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
Resources/Iconos/Obras/24x24/Obras.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
Resources/Iconos/Obras/28x28/Obras.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

102
Source/Base/Base.dproj
View File

@ -53,57 +53,57 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Articulos\adortl.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\adortl.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxIntl6D11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxIntlPrintSys3D11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Articulos\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Articulos\designide.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\designide.dcp" />
<DCCReference Include="..\Modulos\Articulos\dsnap.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\dsnap.dcp" />
<DCCReference Include="..\Modulos\Articulos\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\GUISDK_D11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Articulos\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Articulos\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Articulos\Jcl.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\Jcl.dcp" />
<DCCReference Include="..\Modulos\Articulos\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Articulos\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Articulos\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Articulos\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Articulos\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Articulos\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Articulos\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\RemObjects_Indy_D11.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\rtl.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\rtl.dcp" />
<DCCReference Include="..\Modulos\Articulos\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Articulos\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Articulos\vcl.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\vcl.dcp" />
<DCCReference Include="..\Modulos\Articulos\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Articulos\vcldb.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\vcldb.dcp" />
<DCCReference Include="..\Modulos\Articulos\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Articulos\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Articulos\vclx.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\vclx.dcp" />
<DCCReference Include="..\Modulos\Articulos\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Inventario\Model\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>

9
Source/Base/Utiles/uDataTableUtils.pas
View File

@ -84,8 +84,8 @@ begin
end; end;
ASource.Filter := ''; ASource.Filter := '';
if ASource.Active then // if ASource.Active then
ASource.Close; // ASource.Close;
//Si no hay elemento seleccionados filtramos para que ATarget se quede vacia //Si no hay elemento seleccionados filtramos para que ATarget se quede vacia
if (AObj.SelectedRecords.Count = 0) then if (AObj.SelectedRecords.Count = 0) then
@ -98,7 +98,6 @@ begin
ASource.Filter := ASource.Filter + ' or '; ASource.Filter := ASource.Filter + ' or ';
ASource.Filter := ASource.Filter + '(ID = ' + IntToStr(AObj.SelectedRecords.Items[i]) + ')'; ASource.Filter := ASource.Filter + '(ID = ' + IntToStr(AObj.SelectedRecords.Items[i]) + ')';
end; end;
ASource.Filtered := True; ASource.Filtered := True;
end; end;
@ -112,8 +111,8 @@ begin
ATarget.LogicalName := ASource.LogicalName; // We need to specify new dataset LogicalName ATarget.LogicalName := ASource.LogicalName; // We need to specify new dataset LogicalName
ATarget.RemoteFetchEnabled := False; // "Desconectamos" la tabla destino del servidor ATarget.RemoteFetchEnabled := False; // "Desconectamos" la tabla destino del servidor
if not ASource.Active then // if not ASource.Active then
ASource.Open; // ASource.Open;
ASource.First; ASource.First;
DADataStreamer.WriteDataset(DABin, ASource, [woRows, woSchema], -1); DADataStreamer.WriteDataset(DABin, ASource, [woRows, woSchema], -1);

2
Source/Cliente/FactuGES.dproj
View File

@ -54,7 +54,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">1</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</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">1.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.1.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><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">2</VersionInfo><VersionInfo Name="Release">0</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">1.2.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.2.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>

8
Source/Cliente/FactuGES.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1,1,0,0 FILEVERSION 1,2,0,0
PRODUCTVERSION 1,1,0,0 PRODUCTVERSION 1,2,0,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", "1.1.0.0\0" VALUE "FileVersion", "1.2.0.0\0"
VALUE "InternalName", "FactuGES\0" VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0" VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "1.1.0.0\0" VALUE "ProductVersion", "1.2.0.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

16
Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dproj
View File

@ -48,14 +48,14 @@
<DelphiCompile Include="AlbaranesProveedor_controller.dpk"> <DelphiCompile Include="AlbaranesProveedor_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Lib\AlbaranesProveedor_data.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\AlbaranesProveedor_data.dcp" />
<DCCReference Include="..\..\Lib\AlbaranesProveedor_model.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\AlbaranesProveedor_model.dcp" />
<DCCReference Include="..\..\Lib\Articulos_controller.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\Articulos_controller.dcp" />
<DCCReference Include="..\..\Lib\Contactos_controller.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\Contactos_controller.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\Inventario_model.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\Inventario_model.dcp" />
<DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\PedidosProveedor_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" /> <DCCReference Include="..\..\Pedidos a proveedor\PedidosProveedor_model.dcp" />
<DCCReference Include="uAlbaranesProveedorController.pas" /> <DCCReference Include="uAlbaranesProveedorController.pas" />
<DCCReference Include="uAlbaranesProveedorReportController.pas" /> <DCCReference Include="uAlbaranesProveedorReportController.pas" />
<DCCReference Include="uArticulosAlbaranProveedorController.pas" /> <DCCReference Include="uArticulosAlbaranProveedorController.pas" />

1
Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
View File

@ -337,7 +337,6 @@ begin
AInventarioRecibido.DataTable.Active := True; AInventarioRecibido.DataTable.Active := True;
end; end;
Self.Anadir(AAlbaran);
CopiarPedidoAAlbaran(APedido, AAlbaran); CopiarPedidoAAlbaran(APedido, AAlbaran);
CopiarArticulosAAlbaran(APedido, AAlbaran, AInventarioRecibido); CopiarArticulosAAlbaran(APedido, AAlbaran, AInventarioRecibido);
RecalcularImportes(AAlbaran); RecalcularImportes(AAlbaran);

23
Source/Modulos/Albaranes de proveedor/Controller/uDetallesAlbaranProveedorController.pas
View File

@ -42,7 +42,7 @@ type
implementation implementation
uses Variants, uDialogUtils, uControllerDetallesBase, uDataModuleAlbaranesProveedor, uArticulosAlbaranProveedorController, uses uDAInterfaces, Variants, uDialogUtils, uControllerDetallesBase, uDataModuleAlbaranesProveedor, uArticulosAlbaranProveedorController,
uDataTableUtils, uCalculosUtils, schArticulosClient_Intf; uDataTableUtils, uCalculosUtils, schArticulosClient_Intf;
{ TDetallesAlbaranProveedorController } { TDetallesAlbaranProveedorController }
@ -126,6 +126,9 @@ end;
procedure TDetallesAlbaranProveedorController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesAlbaranProveedorController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
var
AField: TDAField;
begin begin
if Assigned(AArticulos) then if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
@ -135,8 +138,22 @@ begin
//Sobreescribimos el id del articulo por el campo ID_ARTICULO que nos hemos tenido que crear para //Sobreescribimos el id del articulo por el campo ID_ARTICULO que nos hemos tenido que crear para
//almacenar el codigo de artículo ya que ID esta destinado a ID_ARTICULO||ID_PROVEEDOR, para identificar de forma //almacenar el codigo de artículo ya que ID esta destinado a ID_ARTICULO||ID_PROVEEDOR, para identificar de forma
//unica los articulos desglosados por proveedor. //unica los articulos desglosados por proveedor.
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AArticulos.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant; //Validamos la existencia de todos los campos necesarios
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_FABRICANTE).AsVariant := AArticulos.DataTable.FieldByName(fld_ArticulosREFERENCIA_FABR).AsVariant; AField := AArticulos.DataTable.FindField(CAMPO_ID_ARTICULOS);
if Assigned(AField) then
begin
// if not ADetalles.DataTable.Editing then
// ADetalles.DataTable.Edit;
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AField.AsVariant;
end;
AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
if Assigned(AField) then
begin
// if not ADetalles.DataTable.Editing then
// ADetalles.DataTable.Edit;
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
end;
end; end;
procedure TDetallesAlbaranProveedorController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesAlbaranProveedorController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);

14
Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas
View File

@ -45,7 +45,7 @@ implementation
{ TDetallesFacturaProveedorController } { TDetallesFacturaProveedorController }
uses Variants, uDataModuleFacturasProveedor, uArticulosFacturaProveedorController, uses uDAInterfaces, Variants, uDataModuleFacturasProveedor, uArticulosFacturaProveedorController,
uControllerDetallesBase, Dialogs, SysUtils, uDialogUtils, uCalculosUtils, schArticulosClient_Intf; uControllerDetallesBase, Dialogs, SysUtils, uDialogUtils, uCalculosUtils, schArticulosClient_Intf;
procedure TDetallesFacturaProveedorController.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor); procedure TDetallesFacturaProveedorController.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor);
@ -132,6 +132,9 @@ begin
end; end;
procedure TDetallesFacturaProveedorController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesFacturaProveedorController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
var
AField: TDAField;
begin begin
if Assigned(AArticulos) then if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
@ -141,8 +144,13 @@ begin
//Sobreescribimos el id del articulo por el campo ID_ARTICULO que nos hemos tenido que crear para //Sobreescribimos el id del articulo por el campo ID_ARTICULO que nos hemos tenido que crear para
//almacenar el codigo de artículo ya que ID esta destinado a ID_ARTICULO||ID_PROVEEDOR, para identificar de forma //almacenar el codigo de artículo ya que ID esta destinado a ID_ARTICULO||ID_PROVEEDOR, para identificar de forma
//unica los articulos desglosados por proveedor. //unica los articulos desglosados por proveedor.
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AArticulos.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant; AField := AArticulos.DataTable.FindField(CAMPO_ID_ARTICULOS);
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_FABRICANTE).AsVariant := AArticulos.DataTable.FieldByName(fld_ArticulosREFERENCIA_FABR).AsVariant; if Assigned(AField) then
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AField.AsVariant;
AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
if Assigned(AField) then
ADetalles.DataTable.FieldByName(fld_ArticulosREFERENCIA_FABR).AsVariant := AField.AsVariant;
end; end;
procedure TDetallesFacturaProveedorController.ValidarCampos(DataTable: TDADataTable); procedure TDetallesFacturaProveedorController.ValidarCampos(DataTable: TDADataTable);

4
Source/Modulos/Inventario/Controller/Inventario_controller.dpk
View File

@ -32,7 +32,9 @@ requires
PresupuestosCliente_model, PresupuestosCliente_model,
PresupuestosCliente_controller, PresupuestosCliente_controller,
PedidosProveedor_controller, PedidosProveedor_controller,
PedidosProveedor_model; PedidosProveedor_model,
Obras_controller,
Obras_model;
contains contains
uIEditorInventario in 'View\uIEditorInventario.pas', uIEditorInventario in 'View\uIEditorInventario.pas',

18
Source/Modulos/Inventario/Controller/Inventario_controller.dproj
View File

@ -46,14 +46,16 @@
<DelphiCompile Include="Inventario_controller.dpk"> <DelphiCompile Include="Inventario_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Almacenes_controller.dcp" /> <DCCReference Include="..\..\Lib\Almacenes_controller.dcp" />
<DCCReference Include="..\Articulos_controller.dcp" /> <DCCReference Include="..\..\Lib\Articulos_controller.dcp" />
<DCCReference Include="..\Inventario_data.dcp" /> <DCCReference Include="..\..\Lib\Inventario_data.dcp" />
<DCCReference Include="..\Inventario_model.dcp" /> <DCCReference Include="..\..\Lib\Inventario_model.dcp" />
<DCCReference Include="..\PedidosProveedor_controller.dcp" /> <DCCReference Include="..\..\Lib\Obras_controller.dcp" />
<DCCReference Include="..\PedidosProveedor_model.dcp" /> <DCCReference Include="..\..\Lib\Obras_model.dcp" />
<DCCReference Include="..\PresupuestosCliente_controller.dcp" /> <DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
<DCCReference Include="..\PresupuestosCliente_model.dcp" /> <DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" />
<DCCReference Include="..\..\Lib\PresupuestosCliente_controller.dcp" />
<DCCReference Include="..\..\Lib\PresupuestosCliente_model.dcp" />
<DCCReference Include="..\Utiles\uInventarioUtils.pas"> <DCCReference Include="..\Utiles\uInventarioUtils.pas">
<Form>dmInventarioUtils</Form> <Form>dmInventarioUtils</Form>
<DesignClass>TDataModule</DesignClass> <DesignClass>TDataModule</DesignClass>

4
Source/Modulos/Inventario/Controller/View/uIEditorInventario.pas
View File

@ -8,6 +8,10 @@ uses
type type
IEditorInventario = interface(IEditorGridBase) IEditorInventario = interface(IEditorGridBase)
['{D9C21CA9-5923-4F89-ABBC-81128D2F5272}'] ['{D9C21CA9-5923-4F89-ABBC-81128D2F5272}']
function GetTipoInventario: String;
procedure SetTipoInventario(const Value: String);
property TipoInventario: String read GetTipoInventario write SetTipoInventario;
function GetInventario: IBizInventario; function GetInventario: IBizInventario;
procedure SetInventario(const Value: IBizInventario); procedure SetInventario(const Value: IBizInventario);
property Inventario: IBizInventario read GetInventario write SetInventario; property Inventario: IBizInventario read GetInventario write SetInventario;

179
Source/Modulos/Inventario/Controller/uInventarioController.pas
View File

@ -6,9 +6,13 @@ interface
uses uses
Classes, SysUtils, uDADataTable, uControllerBase, uEditorDBItem, Classes, SysUtils, uDADataTable, uControllerBase, uEditorDBItem,
uIDataModuleInventario, uBizInventario, uArticulosInventarioController, uIDataModuleInventario, uBizInventario, uArticulosInventarioController,
uAlmacenesController, uPresupuestosClienteController, uBizPresupuestosCliente, uAlmacenesController, uObrasController, uPresupuestosClienteController,
uPedidosProveedorController, uBizPedidosProveedor, uBizArticulos, uBizPresupuestosCliente, uPedidosProveedorController, uBizPedidosProveedor,
uBizAlmacenes; uBizArticulos, uBizAlmacenes, uBizObras;
const
CTE_INV_ALMACEN = 'ALMACEN';
CTE_INV_OBRA = 'OBRA';
type type
IInventarioController = interface(IObservador) IInventarioController = interface(IObservador)
@ -19,14 +23,16 @@ type
function Trasladar(AInventario : IBizInventario; Todos: Boolean): Boolean; function Trasladar(AInventario : IBizInventario; Todos: Boolean): Boolean;
// procedure RecibirArticulos(Const APedido: IBizPedidoProveedor; Const CodigoAlmacenDes: Integer); overload; // procedure RecibirArticulos(Const APedido: IBizPedidoProveedor; Const CodigoAlmacenDes: Integer); overload;
// procedure RecibirPedidos(Const CodigoAlmacenDes: Integer); // procedure RecibirPedidos(Const CodigoAlmacenDes: Integer);
procedure Reservar(AInventario : IBizInventario); procedure Reservar(AInventario: IBizInventario; Const CodigoAlmacenDestino: Integer);
function Liberar(AInventario : IBizInventario): Boolean; function Liberar(AInventario : IBizInventario): Boolean;
function Ver(AArticulos: IBizInventario; AInventario : IBizInventario; APedido: IBizPedidoProveedor = Nil): Boolean; function Ver(AArticulos: IBizInventario; AInventario : IBizInventario; APedido: IBizPedidoProveedor = Nil): Boolean;
procedure VerTodos(AInventario: IBizInventario); procedure VerTodos(AInventario: IBizInventario; const pTipoInventario: String);
procedure VerReservas(AArticulo: IBizInventario); procedure VerReservas(AArticulo: IBizInventario);
function BuscarTodos: IBizInventario; function BuscarTodos: IBizInventario;
function BuscarTodosAlmacenes: IBizInventario;
function BuscarTodosObras: IBizInventario;
function Buscar(const ID_ALMACEN: Integer): IBizInventario; function Buscar(const ID_ALMACEN: Integer): IBizInventario;
function BuscarDetalleReservas: IBizDetalleReservas; function BuscarDetalleReservas: IBizDetalleReservas;
function ExtraerSeleccionados(AArticulos: IBizInventario) : IBizInventario; function ExtraerSeleccionados(AArticulos: IBizInventario) : IBizInventario;
@ -44,25 +50,31 @@ type
procedure SetAlmacenesController(const Value: IAlmacenesController); procedure SetAlmacenesController(const Value: IAlmacenesController);
property AlmacenesController: IAlmacenesController read GetAlmacenesController write SetAlmacenesController; property AlmacenesController: IAlmacenesController read GetAlmacenesController write SetAlmacenesController;
function GetObrasController: IObrasController;
procedure SetObrasController(const Value: IObrasController);
property ObrasController: IObrasController read GetObrasController write SetObrasController;
procedure Copiar(AArticulos: IBizInventario; ADetalles: IDAStronglyTypedDataTable; AInventario: IBizInventario); overload; procedure Copiar(AArticulos: IBizInventario; ADetalles: IDAStronglyTypedDataTable; AInventario: IBizInventario); overload;
end; end;
TInventarioController = class(TObservador, IInventarioController) TInventarioController = class(TObservador, IInventarioController)
private private
FAlmacenesController: IAlmacenesController; FAlmacenesController: IAlmacenesController;
FObrasController: IObrasController;
FArticulosController : IArticulosInventarioController; FArticulosController : IArticulosInventarioController;
FPresupuestosClienteController : IPresupuestosClienteController; FPresupuestosClienteController : IPresupuestosClienteController;
FPedidosProveedorController : IPedidosProveedorController; FPedidosProveedorController : IPedidosProveedorController;
function GetAlmacenesController: IAlmacenesController; function GetAlmacenesController: IAlmacenesController;
function GetObrasController: IObrasController;
function GetArticulosController: IArticulosInventarioController; function GetArticulosController: IArticulosInventarioController;
function GetPresupuestosClienteController: IPresupuestosClienteController; function GetPresupuestosClienteController: IPresupuestosClienteController;
function GetPedidosProveedorController: IPedidosProveedorController; function GetPedidosProveedorController: IPedidosProveedorController;
procedure SetAlmacenesController(const Value: IAlmacenesController); procedure SetAlmacenesController(const Value: IAlmacenesController);
procedure SetObrasController(const Value: IObrasController);
procedure SetArticulosController(const Value: IArticulosInventarioController); procedure SetArticulosController(const Value: IArticulosInventarioController);
procedure SetPresupuestosClienteController(const Value: IPresupuestosClienteController); procedure SetPresupuestosClienteController(const Value: IPresupuestosClienteController);
procedure SetPedidosProveedorController(const Value: IPedidosProveedorController); procedure SetPedidosProveedorController(const Value: IPedidosProveedorController);
function Reservar(AInventario : IBizInventario; Todos: Boolean; Const APedido: IBizPresupuestoCliente): Boolean; overload;
function Liberar(AInventario : IBizInventario; Todos: Boolean): Boolean; overload; function Liberar(AInventario : IBizInventario; Todos: Boolean): Boolean; overload;
function EntradaSalidaArticulos(AArticulos, AInventario : IBizInventario; APedido: IBizPedidoProveedor = Nil): Boolean; overload; function EntradaSalidaArticulos(AArticulos, AInventario : IBizInventario; APedido: IBizPedidoProveedor = Nil): Boolean; overload;
@ -89,6 +101,7 @@ type
public public
property AlmacenesController: IAlmacenesController read GetAlmacenesController write SetAlmacenesController; property AlmacenesController: IAlmacenesController read GetAlmacenesController write SetAlmacenesController;
property ObrasController: IObrasController read GetObrasController write SetObrasController;
property ArticulosController: IArticulosInventarioController read GetArticulosController write SetArticulosController; property ArticulosController: IArticulosInventarioController read GetArticulosController write SetArticulosController;
property PresupuestosClienteController: IPresupuestosClienteController read GetPresupuestosClienteController write SetPresupuestosClienteController; property PresupuestosClienteController: IPresupuestosClienteController read GetPresupuestosClienteController write SetPresupuestosClienteController;
property PedidosProveedorController: IPedidosProveedorController read GetPedidosProveedorController write SetPedidosProveedorController; property PedidosProveedorController: IPedidosProveedorController read GetPedidosProveedorController write SetPedidosProveedorController;
@ -104,6 +117,8 @@ type
function Buscar(const ID_ALMACEN: Integer): IBizInventario; function Buscar(const ID_ALMACEN: Integer): IBizInventario;
function BuscarTodos: IBizInventario; function BuscarTodos: IBizInventario;
function BuscarTodosAlmacenes: IBizInventario;
function BuscarTodosObras: IBizInventario;
function BuscarDetalleReservas: IBizDetalleReservas; function BuscarDetalleReservas: IBizDetalleReservas;
function ElegirArticulos(AArticulos : IBizInventario; AMensaje: String; AMultiSelect: Boolean): IBizInventario; function ElegirArticulos(AArticulos : IBizInventario; AMensaje: String; AMultiSelect: Boolean): IBizInventario;
function ExtraerSeleccionados(AArticulos: IBizInventario) : IBizInventario; function ExtraerSeleccionados(AArticulos: IBizInventario) : IBizInventario;
@ -116,8 +131,9 @@ type
procedure TrasladarArticulosLibre(AInventario: IBizInventario; Const CodigoAlmacenOrigen: Integer; Const CodigoAlmacenDestino: Integer); procedure TrasladarArticulosLibre(AInventario: IBizInventario; Const CodigoAlmacenOrigen: Integer; Const CodigoAlmacenDestino: Integer);
function EntradaPedido(AInventario: IBizInventario; APedido: IBizPedidoProveedor; ADetalles: IDAStronglyTypedDataTable; var ADetallesFinal: IBizInventario): Boolean; function EntradaPedido(AInventario: IBizInventario; APedido: IBizPedidoProveedor; ADetalles: IDAStronglyTypedDataTable; var ADetallesFinal: IBizInventario): Boolean;
function SalidaAlbaran(AInventario: IBizInventario; Const CodigoAlmacenOrigen: Integer; ADetalles: IDAStronglyTypedDataTable): Boolean; function SalidaAlbaran(AInventario: IBizInventario; Const CodigoAlmacenOrigen: Integer; ADetalles: IDAStronglyTypedDataTable): Boolean;
procedure Reservar(AInventario: IBizInventario; Const CodigoAlmacenDestino: Integer);
procedure VerTodos(AInventario: IBizInventario); procedure VerTodos(AInventario: IBizInventario; const pTipoInventario: String);
function Ver(AArticulos: IBizInventario; AInventario : IBizInventario; APedido: IBizPedidoProveedor = Nil): Boolean; function Ver(AArticulos: IBizInventario; AInventario : IBizInventario; APedido: IBizPedidoProveedor = Nil): Boolean;
procedure VerReservas(AArticulo: IBizInventario); procedure VerReservas(AArticulo: IBizInventario);
@ -125,7 +141,6 @@ type
function Guardar(AArticulos : IBizInventario; const FechaMovimiento: TDateTime; const CausaMovimiento: String): Boolean; function Guardar(AArticulos : IBizInventario; const FechaMovimiento: TDateTime; const CausaMovimiento: String): Boolean;
function Liberar(AInventario : IBizInventario): Boolean; overload; function Liberar(AInventario : IBizInventario): Boolean; overload;
procedure Reservar(AInventario : IBizInventario); overload;
end; end;
implementation implementation
@ -139,7 +154,7 @@ uses
uControllerDetallesBase, uDialogUtils, uFactuGES_App, uControllerDetallesBase, uDialogUtils, uFactuGES_App,
uIEditorEntradaSalidaArticulos, schArticulosClient_Intf, uIEditorEntradaSalidaArticulos, schArticulosClient_Intf,
uIEditorElegirArticulosAlmacen, uInventarioUtils, uIEditorElegirArticulosAlmacen, uInventarioUtils,
uIEditorDetalleReservas; uIEditorDetalleReservas, schAlmacenesClient_Intf;
{ TInventarioController } { TInventarioController }
@ -195,6 +210,54 @@ begin
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
end; end;
function TInventarioController.BuscarTodosAlmacenes: IBizInventario;
var
Condicion: TDAWhereExpression;
begin
ShowHourglassCursor;
try
Result := BuscarTodos;
// Filtrar los pedidos pendientes de recepcion
with Result.DataTable.DynamicWhere do
begin
// (TIPO_ALMACEN <> ALMACEN)
Condicion := NewBinaryExpression(NewField('', fld_InventarioTIPO_ALMACEN), NewConstant(CTE_INV_ALMACEN, datString), dboEqual);
if IsEmpty then
Expression := Condicion
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
finally
HideHourglassCursor;
end;
end;
function TInventarioController.BuscarTodosObras: IBizInventario;
var
Condicion: TDAWhereExpression;
begin
ShowHourglassCursor;
try
Result := BuscarTodos;
// Filtrar los pedidos pendientes de recepcion
with Result.DataTable.DynamicWhere do
begin
// (TIPO_ALMACEN <> ALMACEN)
Condicion := NewBinaryExpression(NewField('', fld_InventarioTIPO_ALMACEN), NewConstant(CTE_INV_OBRA, datString), dboEqual);
if IsEmpty then
Expression := Condicion
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
finally
HideHourglassCursor;
end;
end;
procedure TInventarioController.Copiar(AArticulos: IBizInventario; ADetalles: IDAStronglyTypedDataTable; AInventario: IBizInventario); procedure TInventarioController.Copiar(AArticulos: IBizInventario; ADetalles: IDAStronglyTypedDataTable; AInventario: IBizInventario);
{ {
Procedimiento que copia en AArticulos, todos los detalles pasados por parametro ADetalles Procedimiento que copia en AArticulos, todos los detalles pasados por parametro ADetalles
@ -284,6 +347,7 @@ begin
AsignarDataModule; AsignarDataModule;
FArticulosController := TArticulosInventarioController.Create; FArticulosController := TArticulosInventarioController.Create;
FAlmacenesController := TAlmacenesController.Create; FAlmacenesController := TAlmacenesController.Create;
FObrasController := TObrasController.Create;
FPresupuestosClienteController := TPresupuestosClienteController.Create; FPresupuestosClienteController := TPresupuestosClienteController.Create;
FPedidosProveedorController := TPedidosProveedorController.Create; FPedidosProveedorController := TPedidosProveedorController.Create;
end; end;
@ -316,6 +380,7 @@ begin
FDataModule := Nil; FDataModule := Nil;
FArticulosController := Nil; FArticulosController := Nil;
FAlmacenesController := Nil; FAlmacenesController := Nil;
FObrasController := Nil;
FPresupuestosClienteController := Nil; FPresupuestosClienteController := Nil;
FPedidosProveedorController := Nil; FPedidosProveedorController := Nil;
inherited; inherited;
@ -497,7 +562,7 @@ begin
end; end;
end; end;
procedure TInventarioController.VerTodos(AInventario: IBizInventario); procedure TInventarioController.VerTodos(AInventario: IBizInventario; const pTipoInventario: String);
var var
AEditor : IEditorInventario; AEditor : IEditorInventario;
begin begin
@ -509,6 +574,7 @@ begin
with AEditor do with AEditor do
begin begin
Controller := Self; //OJO ORDEN MUY IMPORTANTE Controller := Self; //OJO ORDEN MUY IMPORTANTE
TipoInventario := pTipoInventario;
Inventario := AInventario; Inventario := AInventario;
MultiSelect := False; MultiSelect := False;
ShowEmbedded; ShowEmbedded;
@ -671,6 +737,23 @@ begin
// //
end; end;
procedure TInventarioController.Reservar(AInventario: IBizInventario; const CodigoAlmacenDestino: Integer);
var
AArticulos: IBizInventario;
begin
try
AArticulos := Buscar(ID_NULO);
//Se queda en la clase de negocio para así todos y cada uno de los artículos que
//se agreguen se asigne automáticamente el codigo de almacen destino en OnNewRecord
// AArticulos.TipoMovimiento := tEntradaLibre;
// AArticulos.IDAlmacenDestino := CodigoAlmacenDestino;
EntradaSalidaArticulos(AArticulos, AInventario);
finally
AArticulos := Nil;
end;
end;
{procedure TInventarioController.RecibirPedidos(const CodigoAlmacenDes: Integer); {procedure TInventarioController.RecibirPedidos(const CodigoAlmacenDes: Integer);
var var
APedido: IBizPedidoProveedor; APedido: IBizPedidoProveedor;
@ -688,72 +771,6 @@ begin
end;} end;}
procedure TInventarioController.Reservar(AInventario : IBizInventario);
var
APresupuesto: IBizPresupuestoCliente;
begin
if not Assigned(AInventario) then
exit;
try
APresupuesto := FPresupuestosClienteController.BuscarPendientes;
APresupuesto := FPresupuestosClienteController.ElegirPresupuestos(APresupuesto, '', False);
if Assigned(APresupuesto) then
Reservar(AInventario, False, APresupuesto);
finally
APresupuesto := Nil;
end;
end;
function TInventarioController.Reservar(AInventario : IBizInventario; Todos: Boolean; const APedido: IBizPresupuestoCliente): Boolean;
begin
Result := False;
{ if not Assigned(AInventario) then
exit;
try
with AInventario.DataTable do
begin
if not Active then
Active := True;
if Todos then
begin
First;
while not EOF do
begin
Edit;
AInventario.ID_PEDIDO_CLIENTE := APedido.ID;
AInventario.REFERENCIA_PED_CLI := APedido.REFERENCIA;
Post;
Next;
end;
end
else
begin
Edit;
AInventario.ID_PEDIDO_CLIENTE := APedido.ID;
AInventario.REFERENCIA_PED_CLI := APedido.REFERENCIA;
Post;
end;
ApplyUpdates;
Result := True;
end;
except
on E: EDAApplyUpdateFailed do
begin
AInventario.DataTable.CancelUpdates;
showmessage('Error al reservar para el pedido');
end;
end;
}
end;
function TInventarioController.SalidaAlbaran(AInventario: IBizInventario; const CodigoAlmacenOrigen: Integer; ADetalles: IDAStronglyTypedDataTable): Boolean; function TInventarioController.SalidaAlbaran(AInventario: IBizInventario; const CodigoAlmacenOrigen: Integer; ADetalles: IDAStronglyTypedDataTable): Boolean;
var var
AArticulos: IBizInventario; AArticulos: IBizInventario;
@ -797,6 +814,11 @@ begin
FAlmacenesController := Value; FAlmacenesController := Value;
end; end;
procedure TInventarioController.SetObrasController(const Value: IObrasController);
begin
FObrasController := Value;
end;
procedure TInventarioController.SetArticulosController(const Value: IArticulosInventarioController); procedure TInventarioController.SetArticulosController(const Value: IArticulosInventarioController);
begin begin
FArticulosController := Value FArticulosController := Value
@ -911,6 +933,11 @@ begin
Result := FAlmacenesController; Result := FAlmacenesController;
end; end;
function TInventarioController.GetObrasController: IObrasController;
begin
Result := FObrasController;
end;
function TInventarioController.GetArticulosController: IArticulosInventarioController; function TInventarioController.GetArticulosController: IArticulosInventarioController;
begin begin
Result := FArticulosController; Result := FArticulosController;

7
Source/Modulos/Inventario/Data/uDataModuleInventario.dfm
View File

@ -207,14 +207,17 @@ inherited DataModuleInventario: TDataModuleInventario
DisplayLabel = 'Pendiente de recibir' DisplayLabel = 'Pendiente de recibir'
DictionaryEntry = 'INVENTARIO_PENDIENTE_RECEPCION' DictionaryEntry = 'INVENTARIO_PENDIENTE_RECEPCION'
end end
item
Name = 'TIPO_ALMACEN'
DataType = datString
Size = 10
end
item item
Name = 'ID' Name = 'ID'
DataType = datInteger DataType = datInteger
LogChanges = False
DisplayLabel = 'INVENTARIO_ID' DisplayLabel = 'INVENTARIO_ID'
DictionaryEntry = 'INVENTARIO_ID' DictionaryEntry = 'INVENTARIO_ID'
InPrimaryKey = True InPrimaryKey = True
Calculated = True
end end
item item
Name = 'CANTIDAD' Name = 'CANTIDAD'

26
Source/Modulos/Inventario/Inventario_Group.groupproj
View File

@ -11,6 +11,8 @@
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" /> <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
<Projects Include="..\Articulos\Views\Articulos_view.dproj" /> <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
<Projects Include="..\Contactos\Views\Contactos_view.dproj" /> <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
<Projects Include="..\Obras\Controller\Obras_controller.dproj" />
<Projects Include="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" />
<Projects Include="Controller\Inventario_controller.dproj" /> <Projects Include="Controller\Inventario_controller.dproj" />
<Projects Include="Data\Inventario_data.dproj" /> <Projects Include="Data\Inventario_data.dproj" />
<Projects Include="Model\Inventario_model.dproj" /> <Projects Include="Model\Inventario_model.dproj" />
@ -95,6 +97,15 @@
<Target Name="Inventario_controller:Make"> <Target Name="Inventario_controller:Make">
<MSBuild Projects="Controller\Inventario_controller.dproj" Targets="Make" /> <MSBuild Projects="Controller\Inventario_controller.dproj" Targets="Make" />
</Target> </Target>
<Target Name="PedProv_AlbProv_relation">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="" />
</Target>
<Target Name="PedProv_AlbProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PedProv_AlbProv_relation:Make">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="Inventario_view"> <Target Name="Inventario_view">
<MSBuild Projects="Views\Inventario_view.dproj" Targets="" /> <MSBuild Projects="Views\Inventario_view.dproj" Targets="" />
</Target> </Target>
@ -131,14 +142,23 @@
<Target Name="FactuGES_Server:Make"> <Target Name="FactuGES_Server:Make">
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" /> <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
</Target> </Target>
<Target Name="Obras_controller">
<MSBuild Projects="..\Obras\Controller\Obras_controller.dproj" Targets="" />
</Target>
<Target Name="Obras_controller:Clean">
<MSBuild Projects="..\Obras\Controller\Obras_controller.dproj" Targets="Clean" />
</Target>
<Target Name="Obras_controller:Make">
<MSBuild Projects="..\Obras\Controller\Obras_controller.dproj" Targets="Make" />
</Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;PedProv_AlbProv_relation;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server;Obras_controller" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;Inventario_model:Clean;Inventario_data:Clean;Inventario_controller:Clean;Inventario_view:Clean;Inventario_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;Inventario_model:Clean;Inventario_data:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;Inventario_view:Clean;Inventario_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;Obras_controller:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;Inventario_model:Make;Inventario_data:Make;Inventario_controller:Make;Inventario_view:Make;Inventario_plugin:Make;FactuGES:Make;FactuGES_Server:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;Inventario_model:Make;Inventario_data:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;Inventario_view:Make;Inventario_plugin:Make;FactuGES:Make;FactuGES_Server:Make;Obras_controller:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

53
Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
View File

@ -9,8 +9,8 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_Inventario = '{0C73DA8F-2528-4826-B262-E5B7F28AE644}'; RID_Inventario = '{EF34850B-0D51-4B0C-8CD5-4C9DD0CEA30A}';
RID_DetalleReservas = '{EC76928D-0721-4595-BB59-A63FA3CD75DF}'; RID_DetalleReservas = '{B4EFAB5C-C1A7-4932-991F-C6641A5456CD}';
{ Data table names } { Data table names }
nme_Inventario = 'Inventario'; nme_Inventario = 'Inventario';
@ -28,6 +28,7 @@ const
fld_InventarioUNIDADES_ALMACEN = 'UNIDADES_ALMACEN'; fld_InventarioUNIDADES_ALMACEN = 'UNIDADES_ALMACEN';
fld_InventarioRESERVA = 'RESERVA'; fld_InventarioRESERVA = 'RESERVA';
fld_InventarioPENDIENTE_RECEPCION = 'PENDIENTE_RECEPCION'; fld_InventarioPENDIENTE_RECEPCION = 'PENDIENTE_RECEPCION';
fld_InventarioTIPO_ALMACEN = 'TIPO_ALMACEN';
fld_InventarioID = 'ID'; fld_InventarioID = 'ID';
fld_InventarioCANTIDAD = 'CANTIDAD'; fld_InventarioCANTIDAD = 'CANTIDAD';
fld_InventarioFECHA_MOVIMIENTO = 'FECHA_MOVIMIENTO'; fld_InventarioFECHA_MOVIMIENTO = 'FECHA_MOVIMIENTO';
@ -46,11 +47,12 @@ const
idx_InventarioUNIDADES_ALMACEN = 8; idx_InventarioUNIDADES_ALMACEN = 8;
idx_InventarioRESERVA = 9; idx_InventarioRESERVA = 9;
idx_InventarioPENDIENTE_RECEPCION = 10; idx_InventarioPENDIENTE_RECEPCION = 10;
idx_InventarioID = 11; idx_InventarioTIPO_ALMACEN = 11;
idx_InventarioCANTIDAD = 12; idx_InventarioID = 12;
idx_InventarioFECHA_MOVIMIENTO = 13; idx_InventarioCANTIDAD = 13;
idx_InventarioCAUSA = 14; idx_InventarioFECHA_MOVIMIENTO = 14;
idx_InventarioTIPO = 15; idx_InventarioCAUSA = 15;
idx_InventarioTIPO = 16;
{ DetalleReservas fields } { DetalleReservas fields }
fld_DetalleReservasID_ALB = 'ID_ALB'; fld_DetalleReservasID_ALB = 'ID_ALB';
@ -89,7 +91,7 @@ const
type type
{ IInventario } { IInventario }
IInventario = interface(IDAStronglyTypedDataTable) IInventario = interface(IDAStronglyTypedDataTable)
['{01E8B549-9E00-473C-8C13-6230053472A1}'] ['{42DB1B40-71E1-454F-93DC-E35E6FE3EEE1}']
{ Property getters and setters } { Property getters and setters }
function GetID_ALMACENValue: Integer; function GetID_ALMACENValue: Integer;
procedure SetID_ALMACENValue(const aValue: Integer); procedure SetID_ALMACENValue(const aValue: Integer);
@ -135,6 +137,10 @@ type
procedure SetPENDIENTE_RECEPCIONValue(const aValue: Int64); procedure SetPENDIENTE_RECEPCIONValue(const aValue: Int64);
function GetPENDIENTE_RECEPCIONIsNull: Boolean; function GetPENDIENTE_RECEPCIONIsNull: Boolean;
procedure SetPENDIENTE_RECEPCIONIsNull(const aValue: Boolean); procedure SetPENDIENTE_RECEPCIONIsNull(const aValue: Boolean);
function GetTIPO_ALMACENValue: String;
procedure SetTIPO_ALMACENValue(const aValue: String);
function GetTIPO_ALMACENIsNull: Boolean;
procedure SetTIPO_ALMACENIsNull(const aValue: Boolean);
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
function GetIDIsNull: Boolean; function GetIDIsNull: Boolean;
@ -180,6 +186,8 @@ type
property RESERVAIsNull: Boolean read GetRESERVAIsNull write SetRESERVAIsNull; property RESERVAIsNull: Boolean read GetRESERVAIsNull write SetRESERVAIsNull;
property PENDIENTE_RECEPCION: Int64 read GetPENDIENTE_RECEPCIONValue write SetPENDIENTE_RECEPCIONValue; property PENDIENTE_RECEPCION: Int64 read GetPENDIENTE_RECEPCIONValue write SetPENDIENTE_RECEPCIONValue;
property PENDIENTE_RECEPCIONIsNull: Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull; property PENDIENTE_RECEPCIONIsNull: Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull;
property TIPO_ALMACEN: String read GetTIPO_ALMACENValue write SetTIPO_ALMACENValue;
property TIPO_ALMACENIsNull: Boolean read GetTIPO_ALMACENIsNull write SetTIPO_ALMACENIsNull;
property ID: Integer read GetIDValue write SetIDValue; property ID: Integer read GetIDValue write SetIDValue;
property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull; property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue; property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue;
@ -241,6 +249,10 @@ type
procedure SetPENDIENTE_RECEPCIONValue(const aValue: Int64); virtual; procedure SetPENDIENTE_RECEPCIONValue(const aValue: Int64); virtual;
function GetPENDIENTE_RECEPCIONIsNull: Boolean; virtual; function GetPENDIENTE_RECEPCIONIsNull: Boolean; virtual;
procedure SetPENDIENTE_RECEPCIONIsNull(const aValue: Boolean); virtual; procedure SetPENDIENTE_RECEPCIONIsNull(const aValue: Boolean); virtual;
function GetTIPO_ALMACENValue: String; virtual;
procedure SetTIPO_ALMACENValue(const aValue: String); virtual;
function GetTIPO_ALMACENIsNull: Boolean; virtual;
procedure SetTIPO_ALMACENIsNull(const aValue: Boolean); virtual;
function GetIDValue: Integer; virtual; function GetIDValue: Integer; virtual;
procedure SetIDValue(const aValue: Integer); virtual; procedure SetIDValue(const aValue: Integer); virtual;
function GetIDIsNull: Boolean; virtual; function GetIDIsNull: Boolean; virtual;
@ -285,6 +297,8 @@ type
property RESERVAIsNull: Boolean read GetRESERVAIsNull write SetRESERVAIsNull; property RESERVAIsNull: Boolean read GetRESERVAIsNull write SetRESERVAIsNull;
property PENDIENTE_RECEPCION: Int64 read GetPENDIENTE_RECEPCIONValue write SetPENDIENTE_RECEPCIONValue; property PENDIENTE_RECEPCION: Int64 read GetPENDIENTE_RECEPCIONValue write SetPENDIENTE_RECEPCIONValue;
property PENDIENTE_RECEPCIONIsNull: Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull; property PENDIENTE_RECEPCIONIsNull: Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull;
property TIPO_ALMACEN: String read GetTIPO_ALMACENValue write SetTIPO_ALMACENValue;
property TIPO_ALMACENIsNull: Boolean read GetTIPO_ALMACENIsNull write SetTIPO_ALMACENIsNull;
property ID: Integer read GetIDValue write SetIDValue; property ID: Integer read GetIDValue write SetIDValue;
property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull; property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue; property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue;
@ -304,7 +318,7 @@ type
{ IDetalleReservas } { IDetalleReservas }
IDetalleReservas = interface(IDAStronglyTypedDataTable) IDetalleReservas = interface(IDAStronglyTypedDataTable)
['{FF881AE1-5043-485D-9E10-52B956FB4276}'] ['{BFD1131A-A0B0-4AA4-B8A0-84D8F5D873EF}']
{ Property getters and setters } { Property getters and setters }
function GetID_ALBValue: Integer; function GetID_ALBValue: Integer;
procedure SetID_ALBValue(const aValue: Integer); procedure SetID_ALBValue(const aValue: Integer);
@ -751,6 +765,27 @@ begin
DataTable.Fields[idx_InventarioPENDIENTE_RECEPCION].AsVariant := Null; DataTable.Fields[idx_InventarioPENDIENTE_RECEPCION].AsVariant := Null;
end; end;
function TInventarioDataTableRules.GetTIPO_ALMACENValue: String;
begin
result := DataTable.Fields[idx_InventarioTIPO_ALMACEN].AsString;
end;
procedure TInventarioDataTableRules.SetTIPO_ALMACENValue(const aValue: String);
begin
DataTable.Fields[idx_InventarioTIPO_ALMACEN].AsString := aValue;
end;
function TInventarioDataTableRules.GetTIPO_ALMACENIsNull: boolean;
begin
result := DataTable.Fields[idx_InventarioTIPO_ALMACEN].IsNull;
end;
procedure TInventarioDataTableRules.SetTIPO_ALMACENIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_InventarioTIPO_ALMACEN].AsVariant := Null;
end;
function TInventarioDataTableRules.GetIDValue: Integer; function TInventarioDataTableRules.GetIDValue: Integer;
begin begin
result := DataTable.Fields[idx_InventarioID].AsInteger; result := DataTable.Fields[idx_InventarioID].AsInteger;

51
Source/Modulos/Inventario/Model/schInventarioServer_Intf.pas
View File

@ -9,13 +9,13 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_InventarioDelta = '{552B07EE-8CC1-4A6C-ACC8-1B9D569F37CD}'; RID_InventarioDelta = '{44A696E0-2F61-4AFE-9226-6DC8AEC03305}';
RID_DetalleReservasDelta = '{0640D81A-8FD0-47AB-AB37-F4A91844711C}'; RID_DetalleReservasDelta = '{44070FBD-E2B5-4D2E-AE8F-5AA97849CBA6}';
type type
{ IInventarioDelta } { IInventarioDelta }
IInventarioDelta = interface(IInventario) IInventarioDelta = interface(IInventario)
['{552B07EE-8CC1-4A6C-ACC8-1B9D569F37CD}'] ['{44A696E0-2F61-4AFE-9226-6DC8AEC03305}']
{ Property getters and setters } { Property getters and setters }
function GetOldID_ALMACENValue : Integer; function GetOldID_ALMACENValue : Integer;
function GetOldID_ARTICULOValue : Integer; function GetOldID_ARTICULOValue : Integer;
@ -28,6 +28,7 @@ type
function GetOldUNIDADES_ALMACENValue : Int64; function GetOldUNIDADES_ALMACENValue : Int64;
function GetOldRESERVAValue : Int64; function GetOldRESERVAValue : Int64;
function GetOldPENDIENTE_RECEPCIONValue : Int64; function GetOldPENDIENTE_RECEPCIONValue : Int64;
function GetOldTIPO_ALMACENValue : String;
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldCANTIDADValue : Integer; function GetOldCANTIDADValue : Integer;
function GetOldFECHA_MOVIMIENTOValue : DateTime; function GetOldFECHA_MOVIMIENTOValue : DateTime;
@ -46,6 +47,7 @@ type
property OldUNIDADES_ALMACEN : Int64 read GetOldUNIDADES_ALMACENValue; property OldUNIDADES_ALMACEN : Int64 read GetOldUNIDADES_ALMACENValue;
property OldRESERVA : Int64 read GetOldRESERVAValue; property OldRESERVA : Int64 read GetOldRESERVAValue;
property OldPENDIENTE_RECEPCION : Int64 read GetOldPENDIENTE_RECEPCIONValue; property OldPENDIENTE_RECEPCION : Int64 read GetOldPENDIENTE_RECEPCIONValue;
property OldTIPO_ALMACEN : String read GetOldTIPO_ALMACENValue;
property OldID : Integer read GetOldIDValue; property OldID : Integer read GetOldIDValue;
property OldCANTIDAD : Integer read GetOldCANTIDADValue; property OldCANTIDAD : Integer read GetOldCANTIDADValue;
property OldFECHA_MOVIMIENTO : DateTime read GetOldFECHA_MOVIMIENTOValue; property OldFECHA_MOVIMIENTO : DateTime read GetOldFECHA_MOVIMIENTOValue;
@ -124,6 +126,12 @@ type
function GetOldPENDIENTE_RECEPCIONIsNull: Boolean; virtual; function GetOldPENDIENTE_RECEPCIONIsNull: Boolean; virtual;
procedure SetPENDIENTE_RECEPCIONValue(const aValue: Int64); virtual; procedure SetPENDIENTE_RECEPCIONValue(const aValue: Int64); virtual;
procedure SetPENDIENTE_RECEPCIONIsNull(const aValue: Boolean); virtual; procedure SetPENDIENTE_RECEPCIONIsNull(const aValue: Boolean); virtual;
function GetTIPO_ALMACENValue: String; virtual;
function GetTIPO_ALMACENIsNull: Boolean; virtual;
function GetOldTIPO_ALMACENValue: String; virtual;
function GetOldTIPO_ALMACENIsNull: Boolean; virtual;
procedure SetTIPO_ALMACENValue(const aValue: String); virtual;
procedure SetTIPO_ALMACENIsNull(const aValue: Boolean); virtual;
function GetIDValue: Integer; virtual; function GetIDValue: Integer; virtual;
function GetIDIsNull: Boolean; virtual; function GetIDIsNull: Boolean; virtual;
function GetOldIDValue: Integer; virtual; function GetOldIDValue: Integer; virtual;
@ -200,6 +208,10 @@ type
property PENDIENTE_RECEPCIONIsNull : Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull; property PENDIENTE_RECEPCIONIsNull : Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull;
property OldPENDIENTE_RECEPCION : Int64 read GetOldPENDIENTE_RECEPCIONValue; property OldPENDIENTE_RECEPCION : Int64 read GetOldPENDIENTE_RECEPCIONValue;
property OldPENDIENTE_RECEPCIONIsNull : Boolean read GetOldPENDIENTE_RECEPCIONIsNull; property OldPENDIENTE_RECEPCIONIsNull : Boolean read GetOldPENDIENTE_RECEPCIONIsNull;
property TIPO_ALMACEN : String read GetTIPO_ALMACENValue write SetTIPO_ALMACENValue;
property TIPO_ALMACENIsNull : Boolean read GetTIPO_ALMACENIsNull write SetTIPO_ALMACENIsNull;
property OldTIPO_ALMACEN : String read GetOldTIPO_ALMACENValue;
property OldTIPO_ALMACENIsNull : Boolean read GetOldTIPO_ALMACENIsNull;
property ID : Integer read GetIDValue write SetIDValue; property ID : Integer read GetIDValue write SetIDValue;
property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull; property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull;
property OldID : Integer read GetOldIDValue; property OldID : Integer read GetOldIDValue;
@ -229,7 +241,7 @@ type
{ IDetalleReservasDelta } { IDetalleReservasDelta }
IDetalleReservasDelta = interface(IDetalleReservas) IDetalleReservasDelta = interface(IDetalleReservas)
['{0640D81A-8FD0-47AB-AB37-F4A91844711C}'] ['{44070FBD-E2B5-4D2E-AE8F-5AA97849CBA6}']
{ Property getters and setters } { Property getters and setters }
function GetOldID_ALBValue : Integer; function GetOldID_ALBValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -786,6 +798,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPENDIENTE_RECEPCION] := Null; BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPENDIENTE_RECEPCION] := Null;
end; end;
function TInventarioBusinessProcessorRules.GetTIPO_ALMACENValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO_ALMACEN];
end;
function TInventarioBusinessProcessorRules.GetTIPO_ALMACENIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO_ALMACEN]);
end;
function TInventarioBusinessProcessorRules.GetOldTIPO_ALMACENValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioTIPO_ALMACEN];
end;
function TInventarioBusinessProcessorRules.GetOldTIPO_ALMACENIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioTIPO_ALMACEN]);
end;
procedure TInventarioBusinessProcessorRules.SetTIPO_ALMACENValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO_ALMACEN] := aValue;
end;
procedure TInventarioBusinessProcessorRules.SetTIPO_ALMACENIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO_ALMACEN] := Null;
end;
function TInventarioBusinessProcessorRules.GetIDValue: Integer; function TInventarioBusinessProcessorRules.GetIDValue: Integer;
begin begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID]; result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID];

34
Source/Modulos/Inventario/Model/uBizInventario.pas
View File

@ -57,6 +57,9 @@ type
FSeleccionableInterface : ISeleccionable; FSeleccionableInterface : ISeleccionable;
procedure OnNewRecord(Sender: TDADataTable); override; procedure OnNewRecord(Sender: TDADataTable); override;
procedure OnCalcFields(Sender: TDADataTable); override; procedure OnCalcFields(Sender: TDADataTable); override;
procedure BeforeOpen(Sender: TDADataTable); override;
procedure AfterOpen(Sender: TDADataTable); override;
public public
property IDAlmacenOrigen: Integer read GetIDAlmacenOrigen write SetIDAlmacenOrigen; property IDAlmacenOrigen: Integer read GetIDAlmacenOrigen write SetIDAlmacenOrigen;
@ -66,16 +69,45 @@ type
write FSeleccionableInterface implements ISeleccionable; write FSeleccionableInterface implements ISeleccionable;
constructor Create(aDataTable: TDADataTable); override; constructor Create(aDataTable: TDADataTable); override;
destructor Destroy; override; destructor Destroy; override;
end; end;
implementation implementation
uses uses
Dialogs, uDACDSDataTable, SysUtils; Dialogs, uDataTableUtils, SysUtils;
{ TBizInventario } { TBizInventario }
procedure TBizInventario.AfterOpen(Sender: TDADataTable);
var
Contador: Integer;
begin
inherited;
DesconectarTabla(Sender);
Sender.First;
Contador := 1;
while not Sender.EOF do
begin
if not Sender.Editing then
Sender.Edit;
Sender.FieldByName('ID').AsInteger := Contador;
Inc(Contador);
Sender.Next;
end;
ConectarTabla(Sender);
//
end;
procedure TBizInventario.BeforeOpen(Sender: TDADataTable);
begin
inherited;
//
end;
constructor TBizInventario.Create(aDataTable: TDADataTable); constructor TBizInventario.Create(aDataTable: TDADataTable);
begin begin
inherited; inherited;

375
Source/Modulos/Inventario/Plugin/uPluginInventario.dfm
View File

@ -1,6 +1,6 @@
object PluginInventario: TPluginInventario object PluginInventario: TPluginInventario
OldCreateOrder = True OldCreateOrder = True
DefaultAction = actInventario DefaultAction = actInventarioAlmacenes
Description = 'Ventas' Description = 'Ventas'
ModuleMenu = MainMenu ModuleMenu = MainMenu
ModuleName = 'Articulos' ModuleName = 'Articulos'
@ -38,6 +38,125 @@ object PluginInventario: TPluginInventario
49454E44AE426082} 49454E44AE426082}
Name = 'PngImage0' Name = 'PngImage0'
Background = clWindow Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
F80000000970485973000017120000171201679FD25200000A4F694343505068
6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
D0A7FB93199393FF040398F3FC63332DDB0000037E4944415478DAB5956B4814
5114C7FFB36EEEBABDD436B7759932821E3ECAB0A2829028E8F165890AFC9298
211551585F2C30CAB23765D1CB4F69D193D4D42CCD945EE6AED96E62BA695204
5AF6D834132D9D999DEE9DD8A1CB6EB6411DB8730E9C73FFBF33F70C77385996
F13F8DA3006EDBF34924CE1C69D0A7FC0BD1DEFEEFF9C4652367FA2B2F202F8E
0F4B090E31FCB5D8FA8410D8DA25CCE383149F7B7F017274566C9756E613C05A
05109BF144760DE8FEE9D14C7CD388D725C99C0AF8D6DAEAB7D0B523598D2FBB
CEA9717689169956D1EF1E9AA3C6009A0ECDF15B3C50C74117A3C7F9C25C58AD
56489204A7D3898E8E0E582C16444F9B0283C1408629C0E391D1D53B889A87F7
15C85F01F2AE9F41626222445144555515789E87DBED865EAF476CF454E88339
683480461B02FA613E78548BD4D4D4C0013BF6A5232D2D0D76BB1D3D3D3DE8EC
EC84FBB31B13A2A2305CAF832C0D82D370883099611A3B16A1A343E17AF90A01
03D66C5A8D654B96C2E170A0BBE70BFAFBFAA0D56A214822BABF74210832A441
01D3E2E2C19BCD88248BD30E0B1C80AE79D89A138B6164535070309658D729F9
A6BA5B88B4F078F7B61D2DAD6D58959C8E83599BB160EE7C841B8D8101A8E9CC
0B814FF73050B014B61527113739920CDC832B9923D5DAE3D531A8B8730FF667
2DA8ADBC88F819F17F06783C8050FF138262565C24EBFAAED1D890928286867C
241D8D41D9ED6A027881FD97DAB1785CCDD000AFB8F7887E7D83C951110AA468
4F180328B97917B6672E1CBEFA6EE8CF948A4BE4E17104299DFF6A143089372A
F992EC310CA0A8F80E6A9DCD3856F0E1F700AF383D02A5CBC2C788881887C7B6
462C5A9EA08A8B928C5B078C0CE05AC16D7244CD3871C3ED1FE0151F1424459C
AE9BA5760630DE1CAE365079C4C4002E5D2B2380269C2EEDF605D08EBCC3F38A
8B44A8BCEC0903B09842D59AEA63660670E17229EA1B5DBE8086FDB3FD8A535F
59FE9401988CA3D4DA07272C0C20EF62319C4D2DBE00C7DE04BFE24A97954E06
600C1BA1D6D69CE20303D4ED9EE9575CE9B2BA8101848E32A879DBD90981016A
77CE80D3D5AE0C9A0E50104432680102B93DFB3E7C55015131260295C8AD2A29
57B76C5FCE00366F3FA868F8007EF7C3518A37CE52FCC78FEF9155D8C1E4B698
931980263A43CDA9008EE330949557B864DA3DB5ECAC24A6F8F806C873E37FC6
14F0A6AD99C90704F8935108F5E9B9F011FA01A02CD0CAC3EA09BB0000000049
454E44AE426082}
Name = 'PngImage1'
Background = clWindow
end> end>
Left = 232 Left = 232
Top = 16 Top = 16
@ -47,11 +166,17 @@ object PluginInventario: TPluginInventario
Images = LargeImages Images = LargeImages
Left = 40 Left = 40
Top = 72 Top = 72
object actInventario: TAction object actInventarioAlmacenes: TAction
Category = 'Log'#237'stica' Category = 'Log'#237'stica'
Caption = 'Inventario' Caption = 'Inventario almacenes'
ImageIndex = 0 ImageIndex = 0
OnExecute = actInventarioExecute OnExecute = actInventarioAlmacenesExecute
end
object actInventarioObras: TAction
Category = 'Log'#237'stica'
Caption = 'Inventario obras'
ImageIndex = 1
OnExecute = actInventarioObrasExecute
end end
end end
object MainMenu: TMainMenu object MainMenu: TMainMenu
@ -62,7 +187,11 @@ object PluginInventario: TPluginInventario
Caption = 'Log'#237'stica' Caption = 'Log'#237'stica'
object Inventario1: TMenuItem object Inventario1: TMenuItem
Tag = 201 Tag = 201
Action = actInventario Action = actInventarioAlmacenes
end
object Inventarioobras1: TMenuItem
Tag = 202
Action = actInventarioObras
end end
end end
end end
@ -86,6 +215,114 @@ object PluginInventario: TPluginInventario
972843D0010013390BFAA171B8130000000049454E44AE426082} 972843D0010013390BFAA171B8130000000049454E44AE426082}
Name = 'PngImage0' Name = 'PngImage0'
Background = clWindow Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000000970485973000017120000171201679FD25200000A4F694343505068
6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
D0A7FB93199393FF040398F3FC63332DDB0000021C4944415478DAA5D35F4853
511C07F0EF316E2B9415697FAC07B382C8FE80084151180441113DD98B0F8938
154B0A6C0F850A428E15ACAD62222B7C0C8A0A378649890F1258CBB659C32D73
73AEF46EDC6E8A989BD7DD3F79AFECE665348A7E703887C3F97ECE39700E9124
09FF534406484B606FD1E26CF85FC36CFE967D0AB0B571482A293FFCC7858D15
1BE1F0A6D47E38781AC7CB0611F307A002D4171FA2B75BD450E90D2B8EEE1170
A898C3149BC6EE224A837A26458CC50B7E03DF1D95E03C04BA831BC0994E4167
EE475B9B0946E315582C5DD0EB2918EA6A55C06A7B88B7612E3760329BB130BF
80197A1AC9541282C083883CB6EF2846537D3D9EF50EE406128904ECF61E545D
BC006189C5C0F37B601806573B9DB0DCEFC24F36921B104509CB6961A5F1087A
7A41C2D578E42AC0F5079FE10F4561EB7EA105E4E26E9E05657AA98C33E1D452
1AE31F9CD0C52EA1DBA9C7B5BB9F108A7C83D13A927D82BCB1FD10274AC1B7BB
94700699F0B9913F5DA3004D777C88C4E2D9805CED1D4FD1DC7C0EEBA9756A78
991711F1BBB1295EAB0086CE117CA599DCC0EA1556C3695EC0E4A81B858C4101
6A3ADE21CEFCD002B4FD04A8955D33C0DAB03C8E7DECC3B6D90605A86E1D063B
37A705A66CC7E01A7C8F907706072A76653D673AF81A2737DF52803397FB9439
0D203F65B9EA2A77A26788CE024AA800ACE7DFC0D1CFE055B215248F5AF31B09
F9ABDFF7B8AA4C5A8C1E4183F7891AF8058C8F6E7D811958CE0000000049454E
44AE426082}
Name = 'PngImage1'
Background = clWindow
end> end>
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
Left = 308 Left = 308
@ -126,6 +363,134 @@ object PluginInventario: TPluginInventario
000049454E44AE426082} 000049454E44AE426082}
Name = 'PngImage0' Name = 'PngImage0'
Background = clWindow Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
940000000970485973000017120000171201679FD25200000A4F694343505068
6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
D0A7FB93199393FF040398F3FC63332DDB000004B04944415478DABDD67B4C53
571C07F06FA13C04078C7729B025FE3343E24CF6401797CD2D4360C07C2C716E
411424D3315444C76002C2D01133064A1C18916A79D95943794D60328A2F3694
97E29430E312B7964769850D37E8E3ECDE164EB94241B2E92FB93DE7DE73FAFB
DCF33BF726974708C1D30C1E0BF2783C58EDEE2606A67D6291BBCC64B13FD609
374880BFEB7FCA17BFCA0D925B5A0C6A4639FDEBF7C2D1A9B1C23B4E85183DF6
0ACF08F2B73512FDB8D672366261E53CF376A447BD85EA1E0D3ADB3B39FD1EC1
0914FDF512F22702A12B0A32839E776F3DB9723231B824C00CBAC65F23BD194B
1FEB8F47BE3942FBBBF6ECE29C3F1AECF8542C49BD6D2EA9DBCEEB64F8E8CBC6
81F19F6796CF2ED054BAFDFB0F62EFDE38E8F57A747474A0A1A10A41411110FA
78C3D9D9190E0E0E4C95B5301808D47F4EE078410E9252B221A9BB8CB446E65A
49C8ECA05D803DA05E090C35635C1A0CBBAFCE53303A7A13743A1DC4E2B3080C
5C06954A057B7B7BF83FE70F274707D8DB324FBC1560C55F04F68DFBB6301FCF
BF1886B40603D4A5A10B03939393111B1B8BE2E20A0885AE502A95500DAB98D5
B9C0E5591738DADB81E827C0B3E2C1D34B002F0F0FB8306325156214F78730E0
BB0B0323A33623644D30DADBDBA1197980876363E0F3F9D0EA75D03C50C31A04
FA092D5C5CDD2110FAC24F20800F737474B7A158190C7559D8C24036121276C2
866F036B5B5BA4A5651AF74B5454001FA11F147FDCC79DDE3E7C917E88D96703
B6C56CC2EB2B5E636E6E00C58A355097872F1CD41B0C4C32626C598C4D2CDAB7
88F3906D48D7D0F1ECAC143CB3D80622451086CB234CA07B7C1B51E5BF3A2F38
1BC6F6C5498ED8BE650BBABA4EE1839C00C8E5174DE3CCA1D5E99177380DD291
500C57BC3709C6B512D5B1956690CF743C5673404B187BAD2C653107BCD024A7
73D979F29FBA915EF70F86CFAC35811E3B2E93A18255B424F45D94CD8EB1773D
1D95A43A73C086C6668AB1C7A56B37915EFB378625EB26C18F5BC8D0F1372C96
14193573AE507AC085037E5FDF4431B6AC57DB7B18F02103AE37819EB1723278
E24DF3EA98954D0F7D7A95458C6D2B335D39604DDD0F14D3316D5BD72F385033
06D5771B26C198263278F26D0A884B9AE1E9E98D2BAD3790FCF9BA3931F65A55
961B07945537508C9DDF7EF30E53A4310C4D815E5B1BC98028C8881998F3D252
39053FDBB7764E8C6D6B0F7970C073B27AE33E4F95B5FB761F326423183AB771
128CAA2703A7838D189BA4BCBC858289891173625A9D010D87BD38E019691D67
0F7B7A7F45A6740883559126D03BB28E28C4A134B1447289820909E114D3E90C
D33073C92EE408386099A486626CB0E0971225066AB74E821F5593DFC56134B1
F4EC150A7E1A1FCA59E1A3187BAD3957C801C5E555149B02B3CAEFA3FF7CAC09
F4F9B092DC1585D1C4B2CA560A7E12173227C6B6178FFA714051A98CF3941BC1
927BE86FDC61027DD79790DEB28D10497FA4939C6087518C3FD65780FE6A0807
4C4CFD7AC69C83A7FAA06C8A378182D5B9A4DFC99D0E9E7EDF97AE30AB73625E
30CF673307FC6D69D28C3982511514CD09932565C0E983D9D1CB2978B245312F
98F4C21EAC586EEAB3E0B83066D67914E4FD0F1FC079DB61BCE9DD85B0988C7E
083FCDF817B51A2205660D9F400000000049454E44AE426082}
Name = 'PngImage1'
Background = clWindow
end> end>
Left = 232 Left = 232
Top = 80 Top = 80

24
Source/Modulos/Inventario/Plugin/uPluginInventario.pas
View File

@ -12,7 +12,7 @@ type
end; end;
TPluginInventario = class(TModuleController, IMCInventario) TPluginInventario = class(TModuleController, IMCInventario)
actInventario: TAction; actInventarioAlmacenes: TAction;
ExtraImages: TPngImageList; ExtraImages: TPngImageList;
LargeImages: TPngImageList; LargeImages: TPngImageList;
MainMenu: TMainMenu; MainMenu: TMainMenu;
@ -20,7 +20,10 @@ type
SmallImages: TPngImageList; SmallImages: TPngImageList;
Logstica1: TMenuItem; Logstica1: TMenuItem;
Inventario1: TMenuItem; Inventario1: TMenuItem;
procedure actInventarioExecute(Sender: TObject); actInventarioObras: TAction;
Inventarioobras1: TMenuItem;
procedure actInventarioAlmacenesExecute(Sender: TObject);
procedure actInventarioObrasExecute(Sender: TObject);
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -42,15 +45,26 @@ end;
exports exports
GetModule name GET_MODULE_FUNC; GetModule name GET_MODULE_FUNC;
procedure TPluginInventario.actInventarioExecute(Sender: TObject); procedure TPluginInventario.actInventarioAlmacenesExecute(Sender: TObject);
var var
AInventarioController : IInventarioController; AInventarioController : IInventarioController;
AInventario : IBizInventario; AInventario : IBizInventario;
begin begin
AInventarioController := TInventarioController.Create; AInventarioController := TInventarioController.Create;
AInventario := (AInventarioController.BuscarTodos as IBizInventario); AInventario := (AInventarioController.BuscarTodosAlmacenes as IBizInventario);
AInventarioController.VerTodos(AInventario); AInventarioController.VerTodos(AInventario, CTE_INV_ALMACEN);
end;
procedure TPluginInventario.actInventarioObrasExecute(Sender: TObject);
var
AInventarioController : IInventarioController;
AInventario : IBizInventario;
begin
AInventarioController := TInventarioController.Create;
AInventario := (AInventarioController.BuscarTodosObras as IBizInventario);
AInventarioController.VerTodos(AInventario, CTE_INV_OBRA);
end; end;
constructor TPluginInventario.Create(AOwner: TComponent); constructor TPluginInventario.Create(AOwner: TComponent);

42
Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
View File

@ -23,14 +23,14 @@ object srvInventario: TsrvInventario
'A, REFERENCIA, FAMILIA,'#10' DESCRIPCION,'#10'/* REFERENCIA_PROV a' + 'A, REFERENCIA, FAMILIA,'#10' DESCRIPCION,'#10'/* REFERENCIA_PROV a' +
's REFERENCIA_PROVEEDOR, PRECIO_NETO, COSTE_UNIDADES, SE ELIMINA' + 's REFERENCIA_PROVEEDOR, PRECIO_NETO, COSTE_UNIDADES, SE ELIMINA' +
'N LOS PRECIOS CON HASTA SABER QUE DECISIONES SE TOMAN*/'#10' STOC' + 'N LOS PRECIOS CON HASTA SABER QUE DECISIONES SE TOMAN*/'#10' STOC' +
'K, UNIDADES_ALMACEN, RESERVA, PENDIENTE_RECEPCION,'#10' '#10' /*'#10' ' + 'K, UNIDADES_ALMACEN, RESERVA, PENDIENTE_RECEPCION, TIPO_ALMACEN,' +
' NO BORRAR YA QUE SIRVE PARA LAS ENTRADAS Y SALIDAS DE ALMACEN' + #10' '#10' /*'#10' NO BORRAR YA QUE SIRVE PARA LAS ENTRADAS Y SALI' +
'(TABLA MOVIMIENTOS)'#10' DEBERIA GENERAR UNA TABLA DE MOVIMIENTOS' + 'DAS DE ALMACEN(TABLA MOVIMIENTOS)'#10' DEBERIA GENERAR UNA TABLA ' +
' INDEPENDIENTE DEL INVENTARIO PERO POR FALTA'#10' DE TIEMPO Y FIA' + 'DE MOVIMIENTOS INDEPENDIENTE DEL INVENTARIO PERO POR FALTA'#10' D' +
'BILIDAD YA QUE AHORA FUNCIONA TODO, CREAMOS ESTOS CAMPOS FICTICI' + 'E TIEMPO Y FIABILIDAD YA QUE AHORA FUNCIONA TODO, CREAMOS ESTOS ' +
'OS'#10' */'#10#10' 0 as ID, 0 as CANTIDAD, current_date as FECHA_MOV' + 'CAMPOS FICTICIOS'#10' */'#10#10' 0 as ID, 0 as CANTIDAD, current_dat' +
'IMIENTO, NULL as CAUSA, NULL as TIPO'#10#10#10'FROM V_INVENTARIO'#10'where {' + 'e as FECHA_MOVIMIENTO, NULL as CAUSA, NULL as TIPO'#10#10#10'FROM V_INVE' +
'where}'#10'ORDER BY ID_ARTICULO'#10 'NTARIO'#10'where {where}'#10'ORDER BY ID_ARTICULO'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -49,6 +49,10 @@ object srvInventario: TsrvInventario
DatasetField = 'ID_EMPRESA' DatasetField = 'ID_EMPRESA'
TableField = 'ID_EMPRESA' TableField = 'ID_EMPRESA'
end end
item
DatasetField = 'REFERENCIA'
TableField = 'REFERENCIA'
end
item item
DatasetField = 'FAMILIA' DatasetField = 'FAMILIA'
TableField = 'FAMILIA' TableField = 'FAMILIA'
@ -61,6 +65,10 @@ object srvInventario: TsrvInventario
DatasetField = 'STOCK' DatasetField = 'STOCK'
TableField = 'STOCK' TableField = 'STOCK'
end end
item
DatasetField = 'UNIDADES_ALMACEN'
TableField = 'UNIDADES_ALMACEN'
end
item item
DatasetField = 'RESERVA' DatasetField = 'RESERVA'
TableField = 'RESERVA' TableField = 'RESERVA'
@ -69,6 +77,10 @@ object srvInventario: TsrvInventario
DatasetField = 'PENDIENTE_RECEPCION' DatasetField = 'PENDIENTE_RECEPCION'
TableField = 'PENDIENTE_RECEPCION' TableField = 'PENDIENTE_RECEPCION'
end end
item
DatasetField = 'ID'
TableField = 'ID'
end
item item
DatasetField = 'CANTIDAD' DatasetField = 'CANTIDAD'
TableField = 'CANTIDAD' TableField = 'CANTIDAD'
@ -86,12 +98,8 @@ object srvInventario: TsrvInventario
TableField = 'TIPO' TableField = 'TIPO'
end end
item item
DatasetField = 'REFERENCIA' DatasetField = 'TIPO_ALMACEN'
TableField = 'REFERENCIA' TableField = 'TIPO_ALMACEN'
end
item
DatasetField = 'UNIDADES_ALMACEN'
TableField = 'UNIDADES_ALMACEN'
end> end>
end> end>
Name = 'Inventario' Name = 'Inventario'
@ -155,12 +163,16 @@ object srvInventario: TsrvInventario
DataType = datLargeInt DataType = datLargeInt
DictionaryEntry = 'INVENTARIO_PENDIENTE_RECEPCION' DictionaryEntry = 'INVENTARIO_PENDIENTE_RECEPCION'
end end
item
Name = 'TIPO_ALMACEN'
DataType = datString
Size = 10
end
item item
Name = 'ID' Name = 'ID'
DataType = datInteger DataType = datInteger
DictionaryEntry = 'INVENTARIO_ID' DictionaryEntry = 'INVENTARIO_ID'
InPrimaryKey = True InPrimaryKey = True
Calculated = True
end end
item item
Name = 'CANTIDAD' Name = 'CANTIDAD'

BIN
Source/Modulos/Inventario/Views/Inventario_view.dpk
View File

Binary file not shown.

13
Source/Modulos/Inventario/Views/Inventario_view.dproj
View File

@ -39,17 +39,18 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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.0.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><Source><Source Name="MainSource">Inventario_view.dpk</Source></Source></Delphi.Personality></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">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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.0.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><Source><Source Name="MainSource">Inventario_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup> <ItemGroup>
<DelphiCompile Include="Inventario_view.dpk"> <DelphiCompile Include="Inventario_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\..\GUIBase\Articulos_view.dcp" /> <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
<DCCReference Include="..\..\..\GUIBase\GUIBase.dcp" /> <DCCReference Include="..\..\Lib\GUIBase.dcp" />
<DCCReference Include="..\..\..\GUIBase\Inventario_controller.dcp" /> <DCCReference Include="..\..\Lib\Inventario_controller.dcp" />
<DCCReference Include="..\..\..\GUIBase\Inventario_model.dcp" /> <DCCReference Include="..\..\Lib\Inventario_model.dcp" />
<DCCReference Include="..\..\Lib\PedProv_AlbProv_relation.dcp" />
<DCCReference Include="uEditorDetalleReservas.pas"> <DCCReference Include="uEditorDetalleReservas.pas">
<Form>fEditorDetalleReservas</Form> <Form>fEditorDetalleReservas</Form>
<DesignClass>TfEditorDetalleReservas</DesignClass> <DesignClass>TfEditorDetalleReservas</DesignClass>
@ -91,7 +92,7 @@
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line
[Exception Log] [Exception Log]
EurekaLog Version=6006 EurekaLog Version=6011
Activate=0 Activate=0
Activate Handle=1 Activate Handle=1
Save Log File=1 Save Log File=1

51
Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm
View File

@ -2,7 +2,6 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
Caption = 'Seleccionar art'#237'culos' Caption = 'Seleccionar art'#237'culos'
ClientWidth = 656 ClientWidth = 656
ExplicitWidth = 664 ExplicitWidth = 664
ExplicitHeight = 567
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object JvgWizardHeader1: TJvgWizardHeader [0] object JvgWizardHeader1: TJvgWizardHeader [0]
@ -56,13 +55,16 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
Align = alLeft Align = alLeft
DockPos = -6 DockPos = -6
ExplicitWidth = 274 ExplicitWidth = 284
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
inherited TBXItem4: TTBXItem inherited TBXItem4: TTBXItem
Visible = False Visible = False
end end
inherited TBXItem57: TTBXItem
Visible = False
end
inherited TBXItem6: TTBXItem inherited TBXItem6: TTBXItem
Visible = False Visible = False
end end
@ -71,12 +73,12 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
end end
end end
inherited tbxFiltro: TTBXToolbar inherited tbxFiltro: TTBXToolbar
Left = 274 Left = 284
Top = 23 Top = 23
Align = alLeft Align = alLeft
DockPos = 101 DockPos = 101
DockRow = 1 DockRow = 1
ExplicitLeft = 274 ExplicitLeft = 284
ExplicitTop = 23 ExplicitTop = 23
inherited TBXItem34: TTBXItem inherited TBXItem34: TTBXItem
Action = actQuitarFiltro2 Action = actQuitarFiltro2
@ -86,12 +88,14 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
ExplicitWidth = 656 ExplicitWidth = 656
end end
inherited TBXTMain2: TTBXToolbar inherited TBXTMain2: TTBXToolbar
Left = 543 Left = 559
Top = 23 Top = 23
DockPos = 559 DockPos = 559
DockRow = 1 DockRow = 1
ExplicitLeft = 543 Visible = False
ExplicitLeft = 559
ExplicitTop = 23 ExplicitTop = 23
ExplicitWidth = 36
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
@ -143,15 +147,15 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
Top = 136 Top = 136
Width = 656 Width = 656
Height = 336 Height = 336
ExplicitTop = 162 ExplicitTop = 136
ExplicitWidth = 656 ExplicitWidth = 656
ExplicitHeight = 310 ExplicitHeight = 336
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 656 Width = 656
Height = 208 Height = 208
RootLevelOptions.DetailTabsPosition = dtpNone RootLevelOptions.DetailTabsPosition = dtpNone
ExplicitWidth = 656 ExplicitWidth = 656
ExplicitHeight = 182 ExplicitHeight = 208
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.DefaultGroupSummaryItems = < DataController.Summary.DefaultGroupSummaryItems = <
item item
@ -181,19 +185,19 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
Width = 656 Width = 656
ExplicitWidth = 656 ExplicitWidth = 656
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 468 ExplicitWidth = 561
Width = 468 Width = 561
end
inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 246
Width = 246
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 381
ExplicitLeft = 381
ExplicitWidth = 241 ExplicitWidth = 241
Width = 241 Width = 241
end end
inherited eLista: TcxComboBox
Left = 628
ExplicitLeft = 628
ExplicitWidth = 20
Width = 20
end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 656 Width = 656
@ -207,7 +211,7 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
end end
inherited pnlAgrupaciones: TTBXDockablePanel inherited pnlAgrupaciones: TTBXDockablePanel
Top = 310 Top = 310
ExplicitTop = 284 ExplicitTop = 310
ExplicitWidth = 656 ExplicitWidth = 656
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 656 Width = 656
@ -223,6 +227,14 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
BuiltInReportLink = True BuiltInReportLink = True
end end
end end
inherited cxViewGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
item
GridView = frViewInventario1.cxGridView
HitTypes = [gvhtCell]
Index = 0
end>
end
end end
inherited EditorActionList: TActionList [9] inherited EditorActionList: TActionList [9]
Left = 112 Left = 112
@ -233,6 +245,9 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
inherited actTrasladar: TAction inherited actTrasladar: TAction
Visible = False Visible = False
end end
inherited actReservados: TAction
Visible = False
end
end end
inherited dsDataTable: TDADataSource inherited dsDataTable: TDADataSource
Top = 192 Top = 192

112
Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm
View File

@ -1,26 +1,132 @@
inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo
Caption = 'fEditorElegirArticulosCatalogo' Caption = 'fEditorElegirArticulosCatalogo'
ExplicitHeight = 478 ClientHeight = 577
ClientWidth = 697
ExplicitWidth = 705
ExplicitHeight = 611
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvgWizardHeader1: TJvgWizardHeader
Width = 697
end
inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 697
inherited Image1: TImage
Left = 670
end
end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 697
inherited tbxMenu: TTBXToolbar
ExplicitWidth = 697
end
inherited TBXTMain2: TTBXToolbar inherited TBXTMain2: TTBXToolbar
DockPos = 401 DockPos = 401
end end
end end
inherited frViewArticulos1: TfrViewArticulos inherited StatusBar: TJvStatusBar
Top = 558
Width = 697
end
inherited frViewBarraSeleccion1: TfrViewBarraSeleccion
Top = 509
Width = 697
inherited JvFooter1: TJvFooter
Width = 697
inherited bSeleccionar: TJvFooterBtn
Left = 485
end
inherited bCancelar: TJvFooterBtn
Left = 589
ExplicitLeft = 589
end
end
end
inline frViewElegirArticulosCatalogo1: TfrViewElegirArticulosCatalogo [5]
Left = 0
Top = 136
Width = 697
Height = 373
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 4
ReadOnly = False
ExplicitLeft = -59
ExplicitTop = -18
inherited cxGrid: TcxGrid
Width = 697
Height = 245
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
Format = '0 Art'#237'culos'
Kind = skCount
Column = frViewElegirArticulosCatalogo1.cxGridViewDESCRIPCION
end>
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 697
inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl
Width = 697
inherited eLista: TcxComboBox
ExplicitWidth = 304
Width = 304
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 697
inherited tbxBotones: TTBXToolbar
Width = 687
end
end
end
end
inherited pnlAgrupaciones: TTBXDockablePanel
Top = 347
ExplicitWidth = 715
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 697
inherited TBXToolbar1: TTBXToolbar
Width = 687
end
end
end
inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 39658.667338495370000000
BuiltInReportLink = True BuiltInReportLink = True
end end
end end
inherited cxViewGridPopupMenu: TcxGridPopupMenu inherited cxViewGridPopupMenu: TcxGridPopupMenu
PopupMenus = < PopupMenus = <
item item
GridView = frViewArticulos1.cxGridView GridView = frViewElegirArticulosCatalogo1.cxGridView
HitTypes = [gvhtCell] HitTypes = [gvhtCell]
Index = 0 Index = 0
end> end>
end end
end end
inherited SmallImages: TPngImageList [6]
end
inherited LargeImages: TPngImageList [7]
end
inherited JvFormStorage: TJvFormStorage [8]
end
inherited EditorActionList: TActionList [9]
end
inherited dsDataTable: TDADataSource [10]
end
inherited JvAppRegistryStorage: TJvAppRegistryStorage [11]
end
inherited StatusBarImages: TPngImageList [12]
end
inherited GridPopupMenu: TPopupMenu [13]
end
end end

7
Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas
View File

@ -10,10 +10,11 @@ uses
JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock, JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
JvgWizardHeader, uIEditorElegirArticulosCatalogo, uDAInterfaces, JvgWizardHeader, uIEditorElegirArticulosCatalogo, uDAInterfaces,
uViewGridBase, uViewGrid, uViewArticulos; uViewGridBase, uViewGrid, uViewArticulos, uViewElegirArticulosCatalogo;
type type
TfEditorElegirArticulosCatalogo = class(TfEditorElegirArticulos, IEditorElegirArticulosCatalogo) TfEditorElegirArticulosCatalogo = class(TfEditorElegirArticulos, IEditorElegirArticulosCatalogo)
frViewElegirArticulosCatalogo1: TfrViewElegirArticulosCatalogo;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
end; end;
@ -22,10 +23,6 @@ type
implementation implementation
{$R *.dfm} {$R *.dfm}
uses uViewElegirArticulosCatalogo;
{ TfEditorElegirArticulosCatalogo }
{ TfEditorElegirArticulosCatalogo } { TfEditorElegirArticulosCatalogo }
constructor TfEditorElegirArticulosCatalogo.Create(AOwner: TComponent); constructor TfEditorElegirArticulosCatalogo.Create(AOwner: TComponent);

268
Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm
View File

@ -8,7 +8,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Caption = 'Entrada de art'#237'culos en almac'#233'n' Caption = 'Entrada de art'#237'culos en '
inherited Image1: TImage inherited Image1: TImage
Picture.Data = { Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
@ -32,10 +32,11 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 277 ExplicitWidth = 164
object TBXItem7: TTBXItem [16] object TBXItem7: TTBXItem [16]
Action = actAnchoAuto Action = actAnchoAuto
DisplayMode = nbdmImageAndText DisplayMode = nbdmImageAndText
Visible = False
end end
end end
inherited tbxMenu: TTBXToolbar inherited tbxMenu: TTBXToolbar
@ -50,14 +51,17 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end end
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Top = 254 Top = 257
Height = 283 Height = 277
MultiLine = True MultiLine = True
Visible = False Visible = False
ExplicitTop = 254 ExplicitTop = 257
ExplicitHeight = 283 ExplicitHeight = 277
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitHeight = 255 ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 638
ExplicitHeight = 249
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
@ -68,163 +72,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end> end>
ExplicitTop = 537 ExplicitTop = 537
end end
inline frViewListaArticulos: TfrViewEntradaSalidaArticulos [4] object ToolBar1: TToolBar [4]
AlignWithMargins = True
Left = 3
Top = 257
Width = 646
Height = 277
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
Padding.Left = 5
Padding.Top = 5
Padding.Right = 5
Padding.Bottom = 3
ParentFont = False
TabOrder = 4
ReadOnly = False
ExplicitLeft = 3
ExplicitTop = 257
ExplicitWidth = 646
ExplicitHeight = 277
inherited cxGrid: TcxGrid
Left = 5
Top = 107
Width = 636
Height = 141
ExplicitLeft = 5
ExplicitTop = 107
ExplicitWidth = 636
ExplicitHeight = 141
inherited cxGridView: TcxGridDBTableView
OptionsCustomize.ColumnsQuickCustomization = False
OptionsData.Editing = True
OptionsSelection.CellSelect = True
OptionsView.ShowEditButtons = gsebForFocusedRecord
inherited cxGridViewRecID: TcxGridDBColumn
Styles.Content = frViewListaArticulos.cxStyleOdd
end
inherited cxGridViewID: TcxGridDBColumn
Styles.Content = frViewListaArticulos.cxStyleOdd
end
inherited cxGridViewID_ARTICULO: TcxGridDBColumn
Visible = False
Styles.Content = frViewListaArticulos.cxStyleOdd
end
inherited cxGridViewREFERENCIA: TcxGridDBColumn [3]
PropertiesClassName = 'TcxTextEditProperties'
Properties.ReadOnly = True
end
inherited cxGridViewREFERENCIA_PROV: TcxGridDBColumn [4]
PropertiesClassName = 'TcxTextEditProperties'
Properties.ReadOnly = True
end
inherited cxGridViewDESCRIPCION: TcxGridDBColumn [5]
Caption = 'Descripci'#243'n'
Properties.ReadOnly = True
Options.Editing = False
Width = 300
end
inherited cxGridViewCANTIDAD: TcxGridDBColumn [6]
Caption = 'Cantidad'
PropertiesClassName = 'TcxSpinEditProperties'
Properties.CanEdit = True
Properties.ExceptionOnInvalidInput = False
Properties.SpinButtons.Position = sbpVert
Properties.SpinButtons.ShowFastButtons = False
Properties.UseCtrlIncrement = False
Properties.ValidateOnEnter = True
Properties.OnGetValue = nil
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
Styles.Content = frViewListaArticulos.cxStyleFiltered
end
inherited cxGridViewSTOCK: TcxGridDBColumn [7]
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.ReadOnly = True
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
inherited cxGridViewID_PEDIDO_PROVEEDOR: TcxGridDBColumn [8]
Visible = False
Styles.Content = frViewListaArticulos.cxStyleOdd
end
inherited cxGridViewID_PEDIDO_CLIENTE: TcxGridDBColumn [9]
Styles.Content = frViewListaArticulos.cxStyleOdd
end
inherited cxGridViewREFERENCIA_PED_CLI: TcxGridDBColumn [10]
Styles.Content = frViewListaArticulos.cxStyleOdd
end
inherited cxGridViewID_EMPRESA: TcxGridDBColumn [11]
Styles.Content = frViewListaArticulos.cxStyleOdd
end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Left = 5
Top = 5
Width = 636
ExplicitLeft = 5
ExplicitTop = 5
ExplicitWidth = 636
inherited TBXDockablePanel1: TTBXDockablePanel
ExplicitWidth = 636
inherited dxLayoutControl1: TdxLayoutControl
Width = 636
ExplicitWidth = 636
inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 273
Width = 273
end
inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 121
Width = 121
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 393
ExplicitLeft = 393
ExplicitWidth = 121
Width = 121
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 636
ExplicitWidth = 636
inherited tbxBotones: TTBXToolbar
Width = 626
ExplicitWidth = 626
end
end
end
end
inherited pnlAgrupaciones: TTBXDockablePanel
Left = 5
Top = 248
ExplicitLeft = 5
ExplicitTop = 248
ExplicitWidth = 636
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 636
ExplicitWidth = 636
inherited TBXToolbar1: TTBXToolbar
Width = 626
ExplicitWidth = 626
end
end
end
inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 39253.501954571760000000
BuiltInReportLink = True
end
end
end
object ToolBar1: TToolBar [5]
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 224 Top = 224
@ -244,23 +92,23 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
ParentShowHint = False ParentShowHint = False
ShowCaptions = True ShowCaptions = True
ShowHint = True ShowHint = True
TabOrder = 5 TabOrder = 4
Transparent = True Transparent = True
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 0 Left = 0
Top = 2 Top = 0
Action = actAnadirInventario Action = actAnadirInventario
AutoSize = True AutoSize = True
end end
object ToolButton2: TToolButton object ToolButton2: TToolButton
Left = 112 Left = 112
Top = 2 Top = 0
Action = actEliminarInventario Action = actEliminarInventario
AutoSize = True AutoSize = True
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 235 Left = 235
Top = 2 Top = 0
Width = 8 Width = 8
Caption = 'ToolButton6' Caption = 'ToolButton6'
ImageIndex = 2 ImageIndex = 2
@ -268,12 +116,12 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 243 Left = 243
Top = 2 Top = 0
Action = actAnchoAuto Action = actAnchoAuto
AutoSize = True AutoSize = True
end end
end end
object TBXDockPaneles: TTBXDock [6] object TBXDockPaneles: TTBXDock [5]
Left = 0 Left = 0
Top = 76 Top = 76
Width = 652 Width = 652
@ -346,7 +194,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 1 TabOrder = 1
Width = 2357 Width = 3397
end end
end end
object pnlEntradaPedido: TTBXDockablePanel object pnlEntradaPedido: TTBXDockablePanel
@ -463,6 +311,84 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end end
end end
end end
inline frViewEntradaSalidaArticulos1: TfrViewEntradaSalidaArticulos [6]
Left = 0
Top = 254
Width = 652
Height = 283
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 6
ReadOnly = False
ExplicitTop = 254
ExplicitWidth = 652
ExplicitHeight = 283
inherited cxGrid: TcxGrid
Width = 652
Height = 155
ExplicitWidth = 652
ExplicitHeight = 155
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 652
ExplicitWidth = 652
inherited TBXDockablePanel1: TTBXDockablePanel
ExplicitWidth = 652
inherited dxLayoutControl1: TdxLayoutControl
Width = 652
ExplicitWidth = 652
inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 555
Width = 555
end
inherited eLista: TcxComboBox
ExplicitWidth = 259
Width = 259
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 652
ExplicitWidth = 652
inherited tbxBotones: TTBXToolbar
Width = 642
ExplicitWidth = 642
end
end
end
end
inherited pnlAgrupaciones: TTBXDockablePanel
Top = 257
ExplicitTop = 257
ExplicitWidth = 652
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 652
ExplicitWidth = 652
inherited TBXToolbar1: TTBXToolbar
Width = 642
ExplicitWidth = 642
end
end
end
inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 39658.663276539350000000
BuiltInReportLink = True
end
end
inherited cxViewGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
item
GridView = frViewEntradaSalidaArticulos1.cxGridView
HitTypes = [gvhtCell]
Index = 0
end>
end
end
inherited EditorActionList: TActionList [7] inherited EditorActionList: TActionList [7]
Top = 56 Top = 56
inherited actNuevo: TAction inherited actNuevo: TAction

58
Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas
View File

@ -14,11 +14,15 @@ uses
JvStatusBar, Grids, DBGrids, cxLabel, cxControls, cxContainer, cxEdit, JvStatusBar, Grids, DBGrids, cxLabel, cxControls, cxContainer, cxEdit,
cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, cxMemo, ToolWin, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, cxMemo, ToolWin,
dxLayoutControl, cxStyles, StdCtrls, Buttons, TBXDkPanels, uBizPedidosProveedor, dxLayoutControl, cxStyles, StdCtrls, Buttons, TBXDkPanels, uBizPedidosProveedor,
uDAInterfaces; uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel,
dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue;
type type
TfEditorEntradaSalidaArticulos = class(TfEditorDBItem, IEditorEntradaSalidaArticulos) TfEditorEntradaSalidaArticulos = class(TfEditorDBItem, IEditorEntradaSalidaArticulos)
frViewListaArticulos: TfrViewEntradaSalidaArticulos;
actAnadirInventario: TAction; actAnadirInventario: TAction;
actEliminarInventario: TAction; actEliminarInventario: TAction;
actAnchoAuto: TAction; actAnchoAuto: TAction;
@ -44,6 +48,7 @@ type
edtSituacion: TLabel; edtSituacion: TLabel;
Label7: TLabel; Label7: TLabel;
edtProveedor: TLabel; edtProveedor: TLabel;
frViewEntradaSalidaArticulos1: TfrViewEntradaSalidaArticulos;
procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction); procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
procedure actAnadirInventarioExecute(Sender: TObject); procedure actAnadirInventarioExecute(Sender: TObject);
procedure actEliminarInventarioExecute(Sender: TObject); procedure actEliminarInventarioExecute(Sender: TObject);
@ -84,7 +89,7 @@ type
implementation implementation
uses uEditorBase, uBizAlmacenes, schAlmacenesClient_Intf; uses uEditorBase, uBizAlmacenes, uBizObras, schAlmacenesClient_Intf;
{$R *.dfm} {$R *.dfm}
//uses uEditorUtils; //uses uEditorUtils;
@ -148,7 +153,7 @@ begin
else else
dsDataTable.DataTable := NIL; dsDataTable.DataTable := NIL;
frViewListaArticulos.dsDataSource.DataTable := dsDataTable.DataTable; frViewEntradaSalidaArticulos1.dsDataSource.DataTable := dsDataTable.DataTable;
// PonerEtiquetasEnEditor // PonerEtiquetasEnEditor
end; end;
@ -199,6 +204,9 @@ procedure TfEditorEntradaSalidaArticulos.FormShow(Sender: TObject);
var var
AAlmacenOrigen: IBizAlmacen; AAlmacenOrigen: IBizAlmacen;
AAlmacenDestino: IBizAlmacen; AAlmacenDestino: IBizAlmacen;
AObraOrigen: IBizObra;
AObraDestino: IBizObra;
begin begin
inherited; inherited;
@ -208,35 +216,59 @@ begin
//Titulos //Titulos
try try
AAlmacenOrigen := Controller.AlmacenesController.Buscar(FArticulos.IDAlmacenOrigen); AAlmacenOrigen := Controller.AlmacenesController.Buscar(FArticulos.IDAlmacenOrigen);
AAlmacenDestino:= Controller.AlmacenesController.Buscar(FArticulos.IDAlmacenDestino);
AAlmacenOrigen.DataTable.Active := True; AAlmacenOrigen.DataTable.Active := True;
AObraOrigen := Controller.ObrasController.Buscar(FArticulos.IDAlmacenOrigen);
AObraOrigen.DataTable.Active := True;
AAlmacenDestino:= Controller.AlmacenesController.Buscar(FArticulos.IDAlmacenDestino);
AAlmacenDestino.DataTable.Active := True; AAlmacenDestino.DataTable.Active := True;
AObraDestino:= Controller.ObrasController.Buscar(FArticulos.IDAlmacenDestino);
AObraDestino.DataTable.Active := True;
case FArticulos.TipoMovimiento of case FArticulos.TipoMovimiento of
tEntradaLibre : tEntradaLibre :
begin begin
FTitulo := 'Entrada de artículos en el almacén "' + AAlmacenDestino.NOMBRE + '"'; if AAlmacenDestino.RecordCount > 0 then
FTitulo := 'Entrada de artículos en "' + AAlmacenDestino.NOMBRE + '"'
else
FTitulo := 'Entrada de artículos en "' + AObraDestino.NOMBRE + '"';
actGuardarCerrar.Caption := 'Realizar la entrada de los artículos'; actGuardarCerrar.Caption := 'Realizar la entrada de los artículos';
end; end;
tEntradaPedidoProveedor : tEntradaPedidoProveedor :
begin begin
FTitulo := 'Entrada por pedido de artículos, en el almacén "' + AAlmacenDestino.NOMBRE + '"'; if AAlmacenDestino.RecordCount > 0 then
FTitulo := 'Entrada por pedido de artículos, en "' + AAlmacenDestino.NOMBRE + '"'
else
FTitulo := 'Entrada por pedido de artículos, en "' + AObraDestino.NOMBRE + '"';
actGuardarCerrar.Caption := 'Realizar la entrada de los artículos'; actGuardarCerrar.Caption := 'Realizar la entrada de los artículos';
end; end;
tSalidaLibre, tSalidaAlbaranCliente : tSalidaLibre, tSalidaAlbaranCliente :
begin begin
FTitulo := 'Salida de artículos en el almacén "' + AAlmacenOrigen.NOMBRE + '"'; if AAlmacenOrigen.RecordCount > 0 then
FTitulo := 'Salida de artículos en "' + AAlmacenOrigen.NOMBRE + '"'
else
FTitulo := 'Salida de artículos en "' + AObraOrigen.NOMBRE + '"';
actGuardarCerrar.Caption := 'Realizar la salida de los artículos'; actGuardarCerrar.Caption := 'Realizar la salida de los artículos';
end; end;
tTraslado: tTraslado:
begin begin
FTitulo := 'Traslado de artículos desde el almacén "' + AAlmacenOrigen.NOMBRE + '" hasta el almacén "' + AAlmacenDestino.NOMBRE + '"'; if AAlmacenOrigen.RecordCount > 0 then
FTitulo := 'Traslado de artículos desde "' + AAlmacenOrigen.NOMBRE
else
FTitulo := 'Traslado de artículos desde "' + AObraOrigen.NOMBRE;
if AAlmacenDestino.RecordCount > 0 then
FTitulo := FTitulo + '" hasta "' + AAlmacenDestino.NOMBRE + '"'
else
FTitulo := FTitulo + '" hasta "' + AObraDestino.NOMBRE + '"';
actGuardarCerrar.Caption := 'Realizar el traslado de los artículos'; actGuardarCerrar.Caption := 'Realizar el traslado de los artículos';
end; end;
end; end;
finally finally
AAlmacenOrigen := Nil; AAlmacenOrigen := Nil;
AAlmacenDestino:= Nil; AAlmacenDestino:= Nil;
AObraOrigen := Nil;
AObraDestino:= Nil;
end; end;
//Botones de añadir y eliminar //Botones de añadir y eliminar
@ -249,7 +281,7 @@ begin
actAnadirInventario.Visible := True; actAnadirInventario.Visible := True;
actEliminarInventario.Enabled := True; actEliminarInventario.Enabled := True;
actEliminarInventario.Visible := True; actEliminarInventario.Visible := True;
frViewListaArticulos.cxGridViewCANTIDAD.Properties.ReadOnly := False; frViewEntradaSalidaArticulos1.cxGridViewCANTIDAD.Properties.ReadOnly := False;
end; end;
tEntradaPedidoProveedor, tSalidaAlbaranCliente : tEntradaPedidoProveedor, tSalidaAlbaranCliente :
begin begin
@ -261,9 +293,9 @@ begin
actEliminarInventario.Enabled := False; actEliminarInventario.Enabled := False;
actEliminarInventario.Visible := False; actEliminarInventario.Visible := False;
if (FArticulos.TipoMovimiento = tSalidaAlbaranCliente) then if (FArticulos.TipoMovimiento = tSalidaAlbaranCliente) then
frViewListaArticulos.cxGridViewCANTIDAD.Properties.ReadOnly := True frViewEntradaSalidaArticulos1.cxGridViewCANTIDAD.Properties.ReadOnly := True
else else
frViewListaArticulos.cxGridViewCANTIDAD.Properties.ReadOnly := False; frViewEntradaSalidaArticulos1.cxGridViewCANTIDAD.Properties.ReadOnly := False;
end; end;
end; end;
@ -272,7 +304,7 @@ end;
procedure TfEditorEntradaSalidaArticulos.actAnchoAutoExecute(Sender: TObject); procedure TfEditorEntradaSalidaArticulos.actAnchoAutoExecute(Sender: TObject);
begin begin
frViewListaArticulos.cxGridView.ApplyBestFit; frViewEntradaSalidaArticulos1.cxGridView.ApplyBestFit;
end; end;
procedure TfEditorEntradaSalidaArticulos.actEliminarInventarioExecute(Sender: TObject); procedure TfEditorEntradaSalidaArticulos.actEliminarInventarioExecute(Sender: TObject);

68
Source/Modulos/Inventario/Views/uEditorInventario.dfm
View File

@ -38,12 +38,52 @@ inherited fEditorInventario: TfEditorInventario
426082} 426082}
ExplicitLeft = 603 ExplicitLeft = 603
end end
object Image2: TImage
Left = 615
Top = 0
Width = 27
Height = 27
Align = alRight
Center = True
Picture.Data = {
0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018
000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000
80E8000075300000EA6000003A98000017709CBA513C00000009704859730000
17110000171101CA26F33F000002E249444154484BB596EF4B535118C7E7BBDE
F43F44D12B0982FE808892B437BDCB428B2CB04C4C1B16A312417AE10FCA5F69
12A5D39A59B417196413CD10225743A7A9ED8777FEDAD4E9DDA64DC7FCD5B73D
C78ECD7BEE9C825D78B8EC9EBBCFE73CCF79CEBD370180E6BF1E4C706BE05024
1AF6DF73602F82588C49C75F41C391479338F6C4B7EB78FA2D840C6310FCBC9C
7314C5F98560122E48BC634642AE754FE3E0D9A68DDA530624A00B6A11EED180
477D7D3D78D0BDD1BF9563822022523D088EE03EE8F57A040201C8B28CF6F676
0637994C989C18834F9E857FCE03D9EB8663C4C5C6762DA03F499204BBDD8E9A
9A1AB4B6B6325073733306ACBD700CF761C4D607D7880D92D3C6C6B694285E06
3A9D8E090C06036A6B6B51505080AC1B59282E2D41755505AACA4B515D5986D7
2D2FF1B9D304ABC5CCE49B6B104F907EE922836BB55A645CBD82D4F3A9484B4F
C3B90BA9484A494272CA29249D3C8E9B79B9282B2986A1A97177028C9F405E5E
0E6EE76BA1BBAB4397D9C982666F341AD9393B3B9B5D3B7D26190F8A8A58A63B
CA802D7444004BA4A374C90C220796E09583A8B8AED98C0387136173CD426FEC
46E6B5CC9D09D6D7B1D9A64AB8C7BBC0E0E19ECBE8A9D3800483CE193C7BD3C5
BA8824DB66C0E1D4A6CA0C083E31151004FDB629D4BDEA88DFA6045F595DDF98
7DA42CD1412522F8A8DB27087A87DC78FCC2B4BD80C343E155049796D1D8F409
6D1F8771BFB085D59FC39DE3B22030F78FA352FF21B680C317432B580886E19F
0F090269C207C7D81C8625AF20F8D23B8A87CFDFAB0B56D77E23BCBC8668F8AC
7F511070F80FC7B420E8FE2EA90B62C1A7E77E09029A39C1FB7E7A0401955035
03B59913DC3D332F0838DC3238B97381B22C1C3EE6F10B029A39C1694195FB20
6606B4A07CFB777CB5A3AD7B08EF3AAD786BB26C11D026A23EA756A46E510AA8
3CAA258AF5C2A1EBD4A214D4AECAFB9482E8F17FEFE4389F157C0FD03E50DE4A
027A4CF0478580DA8BCF16FEC0539BE71FEB8EC0C6C326A8B30000000049454E
44AE426082}
Transparent = True
ExplicitLeft = 603
end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 669 Width = 669
ExplicitWidth = 669 ExplicitWidth = 669
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 668 ExplicitWidth = 669
object TBXSeparatorItem84: TTBXSeparatorItem [6] object TBXSeparatorItem84: TTBXSeparatorItem [6]
end end
object TBXItem54: TTBXItem [7] object TBXItem54: TTBXItem [7]
@ -170,19 +210,25 @@ inherited fEditorInventario: TfEditorInventario
Width = 669 Width = 669
ExplicitWidth = 669 ExplicitWidth = 669
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 468 ExplicitWidth = 572
Width = 468 Width = 572
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 246 ExplicitWidth = 246
Width = 246 Width = 246
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 412 Left = 350
ExplicitLeft = 412 ExplicitLeft = 350
ExplicitWidth = 205 ExplicitWidth = 205
Width = 205 Width = 205
end end
inherited eLista: TcxComboBox
Left = 592
ExplicitLeft = 592
ExplicitWidth = 67
Width = 67
end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 669 Width = 669
@ -215,6 +261,14 @@ inherited fEditorInventario: TfEditorInventario
BuiltInReportLink = True BuiltInReportLink = True
end end
end end
inherited cxViewGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
item
GridView = frViewInventario1.cxGridView
HitTypes = [gvhtCell]
Index = 0
end>
end
end end
inherited EditorActionList: TActionList [4] inherited EditorActionList: TActionList [4]
Left = 88 Left = 88
@ -257,10 +311,9 @@ inherited fEditorInventario: TfEditorInventario
object actReservar: TAction object actReservar: TAction
Category = 'Logistica' Category = 'Logistica'
Caption = 'Reservar' Caption = 'Reservar'
Enabled = False
ImageIndex = 25 ImageIndex = 25
Visible = False
OnExecute = actReservarExecute OnExecute = actReservarExecute
OnUpdate = actReservarUpdate
end end
object actLiberar: TAction object actLiberar: TAction
Category = 'Logistica' Category = 'Logistica'
@ -284,6 +337,7 @@ inherited fEditorInventario: TfEditorInventario
end end
object actReservados: TAction object actReservados: TAction
Caption = 'Ver reservados' Caption = 'Ver reservados'
Enabled = False
ImageIndex = 25 ImageIndex = 25
OnExecute = actReservadosExecute OnExecute = actReservadosExecute
OnUpdate = actReservadosUpdate OnUpdate = actReservadosUpdate

198
Source/Modulos/Inventario/Views/uEditorInventario.pas
View File

@ -12,9 +12,10 @@ uses
uViewBase, uViewBarraSeleccion, JvComponentBase, uEditorGridBase, uViewBase, uViewBarraSeleccion, JvComponentBase, uEditorGridBase,
uIEditorInventario, uBizInventario, uViewGridBase, uInventarioController, uIEditorInventario, uBizInventario, uViewGridBase, uInventarioController,
JvExComCtrls, JvStatusBar, uViewGrid2Niveles, JSDialog, uBizAlmacenes, JvExComCtrls, JvStatusBar, uViewGrid2Niveles, JSDialog, uBizAlmacenes,
uDAInterfaces; uDAInterfaces, dxGDIPlusClasses;
type type
TEnumSeleccion = (tAlmacen, tObra, tAlmacenObra);
TfEditorInventario = class(TfEditorGridBase, IEditorInventario) TfEditorInventario = class(TfEditorGridBase, IEditorInventario)
actRecibirPedido: TAction; actRecibirPedido: TAction;
@ -31,13 +32,13 @@ type
JsElegirAlmacenDialog: TJSDialog; JsElegirAlmacenDialog: TJSDialog;
actReservados: TAction; actReservados: TAction;
TBXItem38: TTBXItem; TBXItem38: TTBXItem;
Image2: TImage;
procedure actModificarExecute(Sender: TObject); procedure actModificarExecute(Sender: TObject);
procedure actRecibirPedidoExecute(Sender: TObject); procedure actRecibirPedidoExecute(Sender: TObject);
procedure actTrasladarExecute(Sender: TObject); procedure actTrasladarExecute(Sender: TObject);
procedure actReservarExecute(Sender: TObject); procedure actReservarExecute(Sender: TObject);
procedure actLiberarExecute(Sender: TObject); procedure actLiberarExecute(Sender: TObject);
procedure actTrasladarUpdate(Sender: TObject); procedure actTrasladarUpdate(Sender: TObject);
procedure actReservarUpdate(Sender: TObject);
procedure actLiberarUpdate(Sender: TObject); procedure actLiberarUpdate(Sender: TObject);
procedure actExpandirExecute(Sender: TObject); procedure actExpandirExecute(Sender: TObject);
procedure actContraerExecute(Sender: TObject); procedure actContraerExecute(Sender: TObject);
@ -47,16 +48,17 @@ type
procedure actReservadosExecute(Sender: TObject); procedure actReservadosExecute(Sender: TObject);
private private
function SeleccionarAlmacen(Descripcion: String): Integer; function Seleccionar(Descripcion: String; TipoSeleccion: TEnumSeleccion): Integer;
function DarIDAlmacenSeleccionado(Descripcion: String): Integer; function DarIDAlmacenSeleccionado(Descripcion: String): Integer;
function DarIDObraSeleccionada(Descripcion: String): Integer;
function GetAlmacenes: IBizAlmacen;
procedure SetAlmacenes (const Value : IBizAlmacen);
protected protected
FTipoInventario: String;
FInventario: IBizInventario; FInventario: IBizInventario;
FController : IInventarioController; FController : IInventarioController;
function GetTipoInventario: String;
procedure SetTipoInventario(const Value: String);
function GetInventario: IBizInventario; function GetInventario: IBizInventario;
procedure SetInventario(const Value: IBizInventario); procedure SetInventario(const Value: IBizInventario);
function GetController : IInventarioController; virtual; function GetController : IInventarioController; virtual;
@ -72,7 +74,7 @@ type
procedure PrevisualizarInterno; override; procedure PrevisualizarInterno; override;
public public
property Almacenes: IBizAlmacen read GetAlmacenes write SetAlmacenes; property TipoInventario: String read GetTipoInventario write SetTipoInventario;
property Inventario: IBizInventario read GetInventario write SetInventario; property Inventario: IBizInventario read GetInventario write SetInventario;
property Controller : IInventarioController read GetController write SetController; property Controller : IInventarioController read GetController write SetController;
property ArticulosSeleccionados: IBizInventario read GetArticulosSeleccionados; property ArticulosSeleccionados: IBizInventario read GetArticulosSeleccionados;
@ -89,9 +91,8 @@ implementation
uses uses
cxControls, uGridStatusUtils, uDataModuleInventario, uDataModuleUsuarios, cxControls, uGridStatusUtils, uDataModuleInventario, uDataModuleUsuarios,
uEditorBase, uDBSelectionListUtils, cxGridDBTableView, cxGridCustomTableView, uEditorBase, uDBSelectionListUtils, cxGridDBTableView, cxGridCustomTableView,
uAlmacenesController, uFactuGES_App, uAlmacenesController, uFactuGES_App, uGenerarAlbaranesProvUtils,
//uGenerarAlbaranesProvUtils, schInventarioClient_Intf, uBizObras;
schInventarioClient_Intf;
{, uDBSelectionList, uDataModulePedidosProveedor, {, uDBSelectionList, uDataModulePedidosProveedor,
uBizPedidosProveedor, uBizMontajes, uDataModuleMontajes; uBizPedidosProveedor, uBizMontajes, uDataModuleMontajes;
@ -112,7 +113,15 @@ end;
function TfEditorInventario.DarIDAlmacenSeleccionado(Descripcion: String): Integer; function TfEditorInventario.DarIDAlmacenSeleccionado(Descripcion: String): Integer;
begin begin
if (ViewGrid._Grid.ActiveLevel.Tag = -1) then if (ViewGrid._Grid.ActiveLevel.Tag = -1) then
Result := SeleccionarAlmacen(Descripcion) Result := Seleccionar(Descripcion, tAlmacen)
else
Result := ViewGrid._Grid.ActiveLevel.Tag;
end;
function TfEditorInventario.DarIDObraSeleccionada(Descripcion: String): Integer;
begin
if (ViewGrid._Grid.ActiveLevel.Tag = -1) then
Result := Seleccionar(Descripcion, TObra)
else else
Result := ViewGrid._Grid.ActiveLevel.Tag; Result := ViewGrid._Grid.ActiveLevel.Tag;
end; end;
@ -127,7 +136,11 @@ procedure TfEditorInventario.EliminarInterno;
var var
IDAlmacenOrigen: Integer; IDAlmacenOrigen: Integer;
begin begin
IDAlmacenOrigen := darIDAlmacenSeleccionado('Elija el almacén donde se realizará la salida'); if (TipoInventario = CTE_INV_ALMACEN) then
IDAlmacenOrigen := darIDAlmacenSeleccionado('Elija el almacén donde se realizará la salida')
else
IDAlmacenOrigen := DarIDObraSeleccionada('Elija la obra donde se realizará la salida');
if IDAlmacenOrigen <> -1 then if IDAlmacenOrigen <> -1 then
begin begin
FController.SalidaArticulosLibre(FInventario, IDAlmacenOrigen); FController.SalidaArticulosLibre(FInventario, IDAlmacenOrigen);
@ -167,14 +180,6 @@ begin
(Sender as TAction).Enabled := (Inventario.RESERVA > 0); (Sender as TAction).Enabled := (Inventario.RESERVA > 0);
end; end;
function TfEditorInventario.GetAlmacenes: IBizAlmacen;
begin
Result := Nil;
if Assigned(ViewGrid) then
Result := (ViewGrid as IViewInventario).Almacenes;
end;
function TfEditorInventario.GetArticulosSeleccionados: IBizInventario; function TfEditorInventario.GetArticulosSeleccionados: IBizInventario;
begin begin
SeleccionarFilasDesdeGrid((ViewGrid as IViewInventario)._FocusedView, (Inventario as ISeleccionable).SelectedRecords); SeleccionarFilasDesdeGrid((ViewGrid as IViewInventario)._FocusedView, (Inventario as ISeleccionable).SelectedRecords);
@ -197,6 +202,11 @@ begin
Result := ViewGrid.MultiSelect; Result := ViewGrid.MultiSelect;
end; end;
function TfEditorInventario.GetTipoInventario: String;
begin
Result := FTipoInventario;
end;
procedure TfEditorInventario.ImprimirInterno; procedure TfEditorInventario.ImprimirInterno;
begin begin
inherited; inherited;
@ -206,7 +216,11 @@ procedure TfEditorInventario.NuevoInterno;
var var
IDAlmacenDestino: Integer; IDAlmacenDestino: Integer;
begin begin
IDAlmacenDestino := darIDAlmacenSeleccionado('Elija el almacén donde se realizará la entrada'); if (TipoInventario = CTE_INV_ALMACEN) then
IDAlmacenDestino := DarIDAlmacenSeleccionado('Elija el almacén donde se realizará la entrada')
else
IDAlmacenDestino := DarIDObraSeleccionada('Elija la obra donde se realizará la entrada');
if IDAlmacenDestino <> -1 then if IDAlmacenDestino <> -1 then
begin begin
FController.EntradaArticulosLibre(FInventario, IDAlmacenDestino); FController.EntradaArticulosLibre(FInventario, IDAlmacenDestino);
@ -218,7 +232,19 @@ procedure TfEditorInventario.PonerTitulos(const ATitulo: string);
var var
FTitulo : String; FTitulo : String;
begin begin
FTitulo := 'Inventario de articulos en almacenes - ' + AppFactuGES.EmpresaActiva.NOMBRE; if (TipoInventario = CTE_INV_ALMACEN) then
begin
FTitulo := 'Inventario de articulos en almacenes - ' + AppFactuGES.EmpresaActiva.NOMBRE;
Image2.Visible := False;
Image1.Visible := True;
end
else
begin
FTitulo := 'Inventario de articulos en obras - ' + AppFactuGES.EmpresaActiva.NOMBRE;
Image2.Visible := True;
Image1.Visible := False;
end;
inherited PonerTitulos(FTitulo); inherited PonerTitulos(FTitulo);
end; end;
@ -227,31 +253,61 @@ begin
inherited; inherited;
end; end;
function TfEditorInventario.SeleccionarAlmacen(Descripcion: String): Integer; function TfEditorInventario.Seleccionar(Descripcion: String; TipoSeleccion: TEnumSeleccion): Integer;
var var
AAlmacenes : IBizAlmacen; AAlmacenes : IBizAlmacen;
AObras : IBizObra;
Respuesta : integer; Respuesta : integer;
begin begin
Result := -1; Result := -1;
JsElegirAlmacenDialog.Instruction.Text := Descripcion; AAlmacenes := Controller.AlmacenesController.BuscarTodos;
with JsElegirAlmacenDialog.RadioButtons do AObras := Controller.ObrasController.BuscarTodos;
begin AAlmacenes.DataTable.Active := True;
Clear; AObras.DataTable.Active := True;
AAlmacenes := Almacenes;
AAlmacenes.First; JsElegirAlmacenDialog.Content.Clear;
while not AAlmacenes.EOF do case TipoSeleccion of
begin tAlmacen: JsElegirAlmacenDialog.Content.Add('¿Sobre que almacén desea realizar la operación?');
with Add do tObra: JsElegirAlmacenDialog.Content.Add('¿Sobre que obra desea realizar la operación?');
begin tAlmacenObra: JsElegirAlmacenDialog.Content.Add('¿Sobre que almacén / obra desea realizar la operación?');
Caption := AAlmacenes.NOMBRE;
Value := 1000 + AAlmacenes.ID;
end;
//Asi sabemos que solo va a intentar chequear el primero si hemos añadido al menos un item
Items[0].Checked := True;
AAlmacenes.Next;
end;
end; end;
JsElegirAlmacenDialog.Instruction.Text := Descripcion;
JsElegirAlmacenDialog.RadioButtons.Clear;
if TipoSeleccion in [tAlmacen, tAlmacenObra] then
with JsElegirAlmacenDialog.RadioButtons do
begin
AAlmacenes.First;
while not AAlmacenes.EOF do
begin
with Add do
begin
Caption := AAlmacenes.NOMBRE;
Value := 1000 + AAlmacenes.ID;
end;
//Asi sabemos que solo va a intentar chequear el primero si hemos añadido al menos un item
Items[0].Checked := True;
AAlmacenes.Next;
end;
end;
if TipoSeleccion in [tObra, tAlmacenObra] then
with JsElegirAlmacenDialog.RadioButtons do
begin
AObras.First;
while not AObras.EOF do
begin
with Add do
begin
Caption := AObras.NOMBRE;
Value := 1000 + AObras.ID;
end;
//Asi sabemos que solo va a intentar chequear el primero si hemos añadido al menos un item
Items[0].Checked := True;
AObras.Next;
end;
end;
//Sacar la pantalla de selección y devolver el almacén seleccionado. //Sacar la pantalla de selección y devolver el almacén seleccionado.
Respuesta := JsElegirAlmacenDialog.Execute; Respuesta := JsElegirAlmacenDialog.Execute;
@ -259,21 +315,9 @@ begin
Result := JsElegirAlmacenDialog.RadioResult - 1000; Result := JsElegirAlmacenDialog.RadioResult - 1000;
end; end;
procedure TfEditorInventario.SetAlmacenes(const Value: IBizAlmacen);
begin
if Assigned(ViewGrid) then
(ViewGrid as IViewInventario).Almacenes := Value;
end;
procedure TfEditorInventario.SetController(const Value: IInventarioController); procedure TfEditorInventario.SetController(const Value: IInventarioController);
begin begin
FController := Value; FController := Value;
if Assigned(FController) then
begin
if Assigned(ViewGrid) then
Almacenes := FController.AlmacenesController.BuscarTodos;
end;
end; end;
procedure TfEditorInventario.SetInventario(const Value: IBizInventario); procedure TfEditorInventario.SetInventario(const Value: IBizInventario);
@ -290,10 +334,29 @@ begin
ViewGrid.MultiSelect := AValue; ViewGrid.MultiSelect := AValue;
end; end;
procedure TfEditorInventario.SetTipoInventario(const Value: String);
begin
FTipoInventario := Value;
if not Assigned(FController) then
raise Exception.Create('No hay ningún controlador asignado');
if (FTipoInventario = CTE_INV_ALMACEN) then
begin
if Assigned(ViewGrid) then
(ViewGrid as IViewInventario).Almacenes := FController.AlmacenesController.BuscarTodos;
end
else if (FTipoInventario = CTE_INV_OBRA) then
begin
if Assigned(ViewGrid) then
(ViewGrid as IViewInventario).Obras := FController.ObrasController.BuscarTodos;
end;
end;
procedure TfEditorInventario.actRecibirPedidoExecute(Sender: TObject); procedure TfEditorInventario.actRecibirPedidoExecute(Sender: TObject);
begin begin
inherited; inherited;
// RecibirPedidoProv; RecibirPedidoProv;
RefrescarInterno; RefrescarInterno;
end; end;
@ -301,10 +364,14 @@ procedure TfEditorInventario.actTrasladarExecute(Sender: TObject);
var var
IDAlmacenOrigen, IDAlmacenDestino: Integer; IDAlmacenOrigen, IDAlmacenDestino: Integer;
begin begin
IDAlmacenOrigen := DarIDAlmacenSeleccionado('Elija el almacén de origen (de donde salen los artículos)'); if (TipoInventario = CTE_INV_ALMACEN) then
IDAlmacenOrigen := DarIDAlmacenSeleccionado('Elija el almacén de origen (de donde salen los artículos)')
else
IDAlmacenOrigen := DarIDObraSeleccionada('Elija la obra de origen (de donde salen los artículos)');
if IDAlmacenOrigen <> -1 then if IDAlmacenOrigen <> -1 then
begin begin
IDAlmacenDestino := SeleccionarAlmacen('Elija el almacén de destino (donde entran los artículos)'); IDAlmacenDestino := Seleccionar('Elija el almacén u obra de destino (donde entran los artículos)', tAlmacenObra);
if IDAlmacenDestino <> -1 then if IDAlmacenDestino <> -1 then
begin begin
FController.TrasladarArticulosLibre(FInventario, IDAlmacenOrigen, IDAlmacenDestino); FController.TrasladarArticulosLibre(FInventario, IDAlmacenOrigen, IDAlmacenDestino);
@ -314,9 +381,15 @@ begin
end; end;
procedure TfEditorInventario.actReservarExecute(Sender: TObject); procedure TfEditorInventario.actReservarExecute(Sender: TObject);
var
IDAlmacenDestino: Integer;
begin begin
Controller.Reservar(Inventario); IDAlmacenDestino := darIDAlmacenSeleccionado('Elija el almacén donde desea reservar el material');
RefrescarInterno; if IDAlmacenDestino <> -1 then
begin
FController.EntradaArticulosLibre(FInventario, IDAlmacenDestino);
RefrescarInterno;
end;
end; end;
procedure TfEditorInventario.actContraerExecute(Sender: TObject); procedure TfEditorInventario.actContraerExecute(Sender: TObject);
@ -348,17 +421,6 @@ begin
} }
end; end;
procedure TfEditorInventario.actReservarUpdate(Sender: TObject);
begin
inherited;
{
if Assigned(dsDataTable.DataTable) then
(Sender as TAction).Enabled := (not dsDataTable.DataTable.IsEmpty)
else
(Sender as TAction).Enabled := False;
}
end;
procedure TfEditorInventario.actLiberarUpdate(Sender: TObject); procedure TfEditorInventario.actLiberarUpdate(Sender: TObject);
begin begin
inherited; inherited;

20
Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm
View File

@ -1,27 +1,7 @@
inherited frViewElegirArticulosCatalogo: TfrViewElegirArticulosCatalogo inherited frViewElegirArticulosCatalogo: TfrViewElegirArticulosCatalogo
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
Visible = False
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn
Visible = False
end
inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
Visible = False
end
inherited cxGridViewPRECIO_PORTE: TcxGridDBColumn
Visible = False
end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TTBXDockablePanel inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 273
Width = 273
end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121

8
Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas
View File

@ -12,7 +12,13 @@ uses
uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView,
cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg,
ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase,
uDAInterfaces; uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel,
dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue,
dxSkinscxPCPainter;
type type
IViewElegirArticulosCatalogo = interface(IViewArticulos) IViewElegirArticulosCatalogo = interface(IViewArticulos)

22
Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
View File

@ -3,6 +3,8 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.KeyFieldNames = 'ID_ALMACEN;ID_ARTICULO' DataController.KeyFieldNames = 'ID_ALMACEN;ID_ARTICULO'
DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoFocusTopRowAfterSorting, dcoImmediatePost] DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoFocusTopRowAfterSorting, dcoImmediatePost]
OptionsData.Editing = True
OptionsSelection.CellSelect = True
object cxGridViewRecID: TcxGridDBColumn object cxGridViewRecID: TcxGridDBColumn
DataBinding.FieldName = 'RecID' DataBinding.FieldName = 'RecID'
Visible = False Visible = False
@ -10,12 +12,16 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
object cxGridViewID: TcxGridDBColumn object cxGridViewID: TcxGridDBColumn
DataBinding.FieldName = 'ID' DataBinding.FieldName = 'ID'
Visible = False Visible = False
VisibleForCustomization = False
end end
object cxGridViewID_ARTICULO: TcxGridDBColumn object cxGridViewID_ARTICULO: TcxGridDBColumn
DataBinding.FieldName = 'ID_ARTICULO' DataBinding.FieldName = 'ID_ARTICULO'
Visible = False
VisibleForCustomization = False
end end
object cxGridViewID_PEDIDO_PROVEEDOR: TcxGridDBColumn object cxGridViewID_PEDIDO_PROVEEDOR: TcxGridDBColumn
DataBinding.FieldName = 'ID_PEDIDO_PROVEEDOR' DataBinding.FieldName = 'ID_PEDIDO_PROVEEDOR'
Visible = False
end end
object cxGridViewID_PEDIDO_CLIENTE: TcxGridDBColumn object cxGridViewID_PEDIDO_CLIENTE: TcxGridDBColumn
DataBinding.FieldName = 'ID_PEDIDO_CLIENTE' DataBinding.FieldName = 'ID_PEDIDO_CLIENTE'
@ -38,6 +44,7 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
PropertiesClassName = 'TcxRichEditProperties' PropertiesClassName = 'TcxRichEditProperties'
end end
object cxGridViewCANTIDAD: TcxGridDBColumn object cxGridViewCANTIDAD: TcxGridDBColumn
Caption = 'Cantidad'
DataBinding.FieldName = 'CANTIDAD' DataBinding.FieldName = 'CANTIDAD'
PropertiesClassName = 'TcxSpinEditProperties' PropertiesClassName = 'TcxSpinEditProperties'
Properties.Alignment.Horz = taRightJustify Properties.Alignment.Horz = taRightJustify
@ -58,20 +65,31 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
inherited TBXDockablePanel1: TTBXDockablePanel inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 273 ExplicitWidth = 510
Width = 273 Width = 510
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 225
ExplicitLeft = 225
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
end end
inherited eLista: TcxComboBox
Left = 383
ExplicitLeft = 383
ExplicitWidth = 214
Width = 214
end
end end
end end
end end
inherited pnlAgrupaciones: TTBXDockablePanel
ExplicitWidth = 607
end
inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 39253.500748333330000000 ReportDocument.CreationDate = 39253.500748333330000000

8
Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas
View File

@ -14,7 +14,13 @@ uses
cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
uAlmacenesController, uBizAlmacenes, TB2Item, TBX, TB2Dock, TB2Toolbar, uAlmacenesController, uBizAlmacenes, TB2Item, TBX, TB2Dock, TB2Toolbar,
uDataModuleInventario, cxRichEdit, cxTextEdit, dxPgsDlg, TBXDkPanels, uDataModuleInventario, cxRichEdit, cxTextEdit, dxPgsDlg, TBXDkPanels,
uViewFiltroBase, cxSpinEdit, uDAInterfaces; uViewFiltroBase, cxSpinEdit, uDAInterfaces, dxSkinsCore, dxSkinBlack,
dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary,
dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
dxSkinXmas2008Blue, dxSkinscxPCPainter;
type type
IViewViewEntradaSalidaArticulos = interface(IViewGrid) IViewViewEntradaSalidaArticulos = interface(IViewGrid)

13
Source/Modulos/Inventario/Views/uViewInventario.dfm
View File

@ -48,6 +48,16 @@ inherited frViewInventario: TfrViewInventario
end> end>
OptionsCustomize.ColumnHidingOnGrouping = False OptionsCustomize.ColumnHidingOnGrouping = False
OptionsCustomize.GroupBySorting = True OptionsCustomize.GroupBySorting = True
object cxGridViewID: TcxGridDBColumn
DataBinding.FieldName = 'ID'
Visible = False
VisibleForCustomization = False
end
object cxGridViewID_ARTICULO: TcxGridDBColumn
DataBinding.FieldName = 'ID_ARTICULO'
Visible = False
VisibleForCustomization = False
end
object cxGridViewID_ALMACEN: TcxGridDBColumn object cxGridViewID_ALMACEN: TcxGridDBColumn
DataBinding.FieldName = 'ID_ALMACEN' DataBinding.FieldName = 'ID_ALMACEN'
Visible = False Visible = False
@ -147,6 +157,9 @@ inherited frViewInventario: TfrViewInventario
Caption = 'Todos los almacenes' Caption = 'Todos los almacenes'
end end
end end
inherited pnlAgrupaciones: TTBXDockablePanel
ExplicitWidth = 607
end
inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 38673.741107951390000000 ReportDocument.CreationDate = 38673.741107951390000000

46
Source/Modulos/Inventario/Views/uViewInventario.pas
View File

@ -20,7 +20,7 @@ uses
dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black,
dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters,
dxSkinValentine, dxSkinXmas2008Blue, dxSkinscxPCPainter; dxSkinValentine, dxSkinXmas2008Blue, dxSkinscxPCPainter, uBizObras;
type type
IViewInventario = interface(IViewGrid) IViewInventario = interface(IViewGrid)
@ -31,6 +31,9 @@ type
function GetAlmacenes: IBizAlmacen; function GetAlmacenes: IBizAlmacen;
procedure SetAlmacenes(const Value: IBizAlmacen); procedure SetAlmacenes(const Value: IBizAlmacen);
property Almacenes: IBizAlmacen read GetAlmacenes write SetAlmacenes; property Almacenes: IBizAlmacen read GetAlmacenes write SetAlmacenes;
function GetObras: IBizObra;
procedure SetObras(const Value: IBizObra);
property Obras: IBizObra read GetObras write SetObras;
end; end;
TfrViewInventario = class(TfrViewGrid, IViewInventario) TfrViewInventario = class(TfrViewGrid, IViewInventario)
@ -48,6 +51,8 @@ type
cxGridViewUNIDADES_ALMACEN: TcxGridDBColumn; cxGridViewUNIDADES_ALMACEN: TcxGridDBColumn;
cxGridViewPRECIO_NETO: TcxGridDBColumn; cxGridViewPRECIO_NETO: TcxGridDBColumn;
cxGridViewCOSTE_UNIDADES: TcxGridDBColumn; cxGridViewCOSTE_UNIDADES: TcxGridDBColumn;
cxGridViewID: TcxGridDBColumn;
cxGridViewID_ARTICULO: TcxGridDBColumn;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
@ -56,13 +61,16 @@ type
private private
//Filtros relativos a la vista //Filtros relativos a la vista
procedure AnadirFiltroAlmacenes; procedure AnadirFiltroAlmacenesObras;
protected protected
FAlmacenes: IBizAlmacen; FAlmacenes: IBizAlmacen;
FObras: IBizObra;
FInventario: IBizInventario; FInventario: IBizInventario;
function GetAlmacenes: IBizAlmacen; function GetAlmacenes: IBizAlmacen;
procedure SetAlmacenes(const Value: IBizAlmacen); procedure SetAlmacenes(const Value: IBizAlmacen);
function GetObras: IBizObra;
procedure SetObras(const Value: IBizObra);
function GetInventario: IBizInventario; function GetInventario: IBizInventario;
procedure SetInventario(const Value: IBizInventario); procedure SetInventario(const Value: IBizInventario);
public public
@ -76,7 +84,7 @@ implementation
uses uDataModuleInventario, schInventarioClient_Intf; uses uDataModuleInventario, schInventarioClient_Intf;
procedure TfrViewInventario.AnadirFiltroAlmacenes; procedure TfrViewInventario.AnadirFiltroAlmacenesObras;
var var
FFiltro : TcxFilterCriteriaItemList; FFiltro : TcxFilterCriteriaItemList;
CodigoAlmacen: String; CodigoAlmacen: String;
@ -97,7 +105,7 @@ procedure TfrViewInventario.AnadirOtrosFiltros;
begin begin
inherited; inherited;
AnadirFiltroAlmacenes; AnadirFiltroAlmacenesObras;
//Finalmente activamos el filtro si tenemos algo //Finalmente activamos el filtro si tenemos algo
if cxGridView.DataController.Filter.IsEmpty if cxGridView.DataController.Filter.IsEmpty
@ -132,6 +140,7 @@ end;
destructor TfrViewInventario.Destroy; destructor TfrViewInventario.Destroy;
begin begin
FAlmacenes := Nil; FAlmacenes := Nil;
FObras := Nil;
FInventario := Nil; FInventario := Nil;
inherited; inherited;
end; end;
@ -146,6 +155,11 @@ begin
Result := FInventario; Result := FInventario;
end; end;
function TfrViewInventario.GetObras: IBizObra;
begin
Result := FObras;
end;
procedure TfrViewInventario.SetAlmacenes(const Value: IBizAlmacen); procedure TfrViewInventario.SetAlmacenes(const Value: IBizAlmacen);
var var
Nivel: TcxGridLevel; Nivel: TcxGridLevel;
@ -154,6 +168,7 @@ begin
if Assigned(FAlmacenes) then if Assigned(FAlmacenes) then
begin begin
cxGridLevel.Caption := 'Todos los almacenes';
if not FAlmacenes.DataTable.Active then if not FAlmacenes.DataTable.Active then
FAlmacenes.DataTable.Active := True; FAlmacenes.DataTable.Active := True;
@ -177,4 +192,27 @@ begin
dsDataSource.DataTable := Nil; dsDataSource.DataTable := Nil;
end; end;
procedure TfrViewInventario.SetObras(const Value: IBizObra);
var
Nivel: TcxGridLevel;
begin
FObras := Value;
if Assigned(FObras) then
begin
cxGridLevel.Caption := 'Todos las obras';
if not FObras.DataTable.Active then
FObras.DataTable.Active := True;
FObras.First;
while not FObras.EOF do
begin
Nivel := cxGrid.Levels.Add;
Nivel.Caption := FObras.NOMBRE;
Nivel.Tag := FObras.ID;
FObras.Next;
end;
end;
end;
end. end.

352
Source/Modulos/Obras/Plugin/uPluginObras.dfm
View File

@ -16,24 +16,107 @@ object PluginObras: TPluginObras
item item
PngImage.Data = { PngImage.Data = {
89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D 89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
F80000000970485973000017120000171201679FD252000001D44944415478DA F80000000970485973000017120000171201679FD25200000A4F694343505068
B5D4BD4B027118C0F1E737D552D0105843616F838519166551345443A32D2E0D 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
D15863FF416B2141353544144A2004114144431695841445D00BE950E7905618 DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
742F2257CFD9D9EFCE3BEF4EF001797E9CFAFD1C8A125114A19C43648010A2F9 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
8205AF5D7C611296C3FE33961802189F5909C13B1383EFF427B05FB94738B409 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
76BB0DC6E756FEAE7D289EF7EF3E422010280E941ADF589E8754A3AF3820C7F1 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
0DA9D798A5785D8D0D6EAB87F5013A8E81D46BDC521C471750C731F0CEC44DC5 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
5B1B9A41E00510848C36B038D15410C7F3C1FAB261BCABC3998BF31969472B07 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
0A81D97E52D20F62D0E381CCEF5DF3129043CE494F21B03445C4B1D169C36036 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
9B95223C27C0D17E181CCE36E963A19163C1551A40C731747274019DDDED529C 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
460EBF1CD601751CCF91D328F40DBA81653905B2976CB10668C5715F5DDEC2D0 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
88473AD3C80ED3681ED08BE3BEBBB997001C1AD98ED79B038AC5F14E9FEE9FF3 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
008D6C3DD41A03EA38FBCDE501FE6F332F090520236BD755C5013A22A8367D3D 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
F9962C00562315100C06FFFF21D480D938EE743AAD00E4389E3581E1A149D371 BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
FC0E388ECD03745C17F0F4FA4CC77164401DD705DC2EAFE9B80CE03FA73AAE0B EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
9C733EB03A5A714DA05C5376E00756B52DFEBD3C9AE50000000049454E44AE42 E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
6082} 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
Name = 'PngImage1' 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
D0A7FB93199393FF040398F3FC63332DDB000001EF4944415478DAED954D6813
4114C77F936E93351E2CD2A6A661B137ED8798631524F4648A879C442F952610
1AF1528FDE042939892D06E9C9F8015E54F0A642A47E1B0F0945A46A453C188D
D4356D900A4DB21DB32B49A3B4B055EB297F1818E6CD7BBF796FDE30424AC966
4A34017F0D587E2EEA1BAECD5EACAF87C361914C26D774366D567021EC015C7D
2A976F4E110A85300C836C364B2E97C3E7F3D1DBB30BB7DB5D0D5466654552F8
56E2F1C3FB16644380E4F50B0402012A950AA9540A4DD3D0751D5555E9EFDD8D
EA14381CE050B660867CF0E829914844D8069C1A1F231A8D924EA729168BE4F3
79F4AF3A3BBBBBD9AABA904609E110783ABD747674D0B6AD8DD9B977F633183E
7198A1834132990C0BC545BE2F2DA1280A65A3C2C26281162446A94CCF1E3F9A
D74B577508A5D53E80C23E4E9EEBA7B5EAD4E274121F8F5B1799383F29BB7C1A
9F3E7EE0F59BB7241209113C34240F0CEC677B7BBBFD2E727907E1CB34CB3782
B8E2B745CD3E797CB5CB26EEF5F17EEEA5651B8D8D4AFF5EBFBD77506FD55BBF
06AF01622323CCCC5CE2E8D955400DB2A112AD97C17A0053F64A543D79A3FE29
C0D495ABD3D2E3D9C193672F3873FA88ED1235014DC07F04DCB9FBCADA343FFF
9963C3839B03304F6F6AAD0C06FC3FE77F0C307FA64635FA98B68918D6C2D814
E277DF1F53A696913F975F460000000049454E44AE426082}
Name = 'PngImage0'
Background = clWindow Background = clWindow
end> end>
Left = 232 Left = 232
@ -69,26 +152,100 @@ object PluginObras: TPluginObras
item item
PngImage.Data = { PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000000970485973000017120000171201679FD2520000022E4944415478DA 610000000970485973000017120000171201679FD25200000A4F694343505068
8D93CF6BD36018C7BF6997A45DD376EA70CA18D31D44981741280C44119DA83D 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
C87619781A1EFD1BC49B2028B28353141111A43BE8CD934E65A8D4A1686B61B5 DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
A31DD8CCBAFEDAACEDF226B389EFFB26CBCC54E6030FEFCB4B3E9FE79B9744B0 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
2C0B8220E0F7BA3AB2D75A282DE07F4AD82C60F0851B8F50530BF85EF98A6236 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
8DCCAB69B0B366BD8C95B24ACF4BB877FD226AFD635EC13A5CF99243A356869A 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
4D51F8398799EC476D09E5621E0F6F5EC6C8D938EE7C503604EB7055CDA34127 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
A8B90C3ECD3CE570A35AA2FD0DCB4B2AEE4F5CC29953C35094102667655B706D 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
7480C3F97412AD951AAAC502E6DEBCE47031974673B942BB8AA9DB57103F7D12 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
9D9D413ED4154C8C0BD6FCE7AD2F6C2816C3CE9E6E8862077C3E9F57307CE2FC 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
1F80655A308C35E844C7B3273318D8D78FE8B6282449A41211B7DE05FE2D304D 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
13866EC34433F0FAC55BF4EDE945A42B0C910A6459C6DD94F27781D936F964B2 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
AADB02DAEF9329ECEEED4138A240944548B2840773DBBD02B637596C6238205D 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
352AD175643E66B1A3BB0B0A15489204292061AAB0CB2B68D3C96B34367120BE BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
3AB2F96C01E1A8825028083920F35778BCD8B721387E6C9C42060788465C50A3 EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
12B24AB0582C2110946907282C61BA3588442221B882C343E75C50A30093B104 E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
84D849EAD53AFC1D7E0ECFFA631C76FF0526387470D4135977405B62A0D56CB2 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
C791891C71618FE0C0FEB873618623B2E33361FB679B4A340A1FF5C01E41928C 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
6DF9256E8659FD02D3B7960923D6946A0000000049454E44AE426082} 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
Name = 'PngImage1' 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
D0A7FB93199393FF040398F3FC63332DDB000001014944415478DA63FCFFFF3F
032580717019F0F324239CC36EFE9F3120B9E7BF8EE44F8696966AC69A9A5614
9B4062580D60D7E660F8D9EAC0C0DEBE1DACA9A4249BA1A7672A031F1F2B434A
72225C6D5FFF2CB021780D686D6FFFFFF9E36786A7CF9E307CFBFE8DE1EFDF3F
0C8CFFFE30884B483264A6A632AC5EBF1BBF0B5EBC78F17FCA94B970E77694FA
FF7FF5EA1543DFC2E38C392575FFBFBCB98BDF00F4003B3993F1FFEC8D3C0C73
B67D86CB61C4C2CF4ACFFFD834C30C98BE818F61C1F68FD80D00B980E9AA3AC3
BFDB8A385D80D70010A86D58F9BFB9219C3C178C00038E4F52FD3F73FB2BFC06
30323232E0CA60CB42B5FF7FBDAFC7907A6639DC0000A2ACDE77DC4275670000
000049454E44AE426082}
Name = 'PngImage0'
Background = clWindow Background = clWindow
end> end>
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
@ -103,24 +260,107 @@ object PluginObras: TPluginObras
item item
PngImage.Data = { PngImage.Data = {
89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
940000000970485973000017120000171201679FD2520000020F4944415478DA 940000000970485973000017120000171201679FD25200000A4F694343505068
E5D4DB2B04511800F06FB659D7CD2D892816B984258992242129E5924BDEE491 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
47FF81571E9495072F44BB1EF69127CAA5DC436E895C4A92AC6CC48E9961EC39 DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
63C7EEEC65CEAC6D5F7CF575E69C33F3FD3AA773861204014219D4FF02298AF2 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
FAD2709B5EB8BEBF0E18195B17A4C28A20C2FA8D16E059065EACF7F0FE6203FB 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
AB986B9619D0EB93A169D0E8757E7A6C089ED2BBC1643291814E4C2CF0EC13F3 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
368FB0AE8E5618DF0E27038381A1200283851181C1C414C191F6CC3F611DED2D 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
A0D150E4E0402515F0A56CACAF83C8A808A069DA0DF50B8EF65242437D1F11C0 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
B13C701C87DBA58555282E2B045A4B83D691AE685040578C6339585DDC808292 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
3C0CC9D13F83728CE378D858D981DC826C8CC9D189DD88C0C10F86151119BAB7 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
7D08593919222843270F74EAC1AFCF2FBC126F181A3FDA3F85F4CC34097245A7 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
4EE2D4814A18EA9F1D5F404A6A1284858779A0B3E789E42009869E2FCF6F2031 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
29016FA11C9DBB4A26034931D691B73777101B1F8341396AB94D53064930C6FE 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
21818F0F5688D6454907C589CE5BB3C16C36BBFF3EE5605D6DAF072616E781E7 BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
C53196FD5D1DEADB9E6D18D06A7F4FE73263C018AAEB17ACAAEC715FCD4F515F EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
186ADFDFDE1C975C23615B9A720953042BCA3A556168FB19C68EBF47E8A1AEDA E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
0D53044B0DADAA30144EF038A6C60353048BF29B55614ED017A6086E32DD1048 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
F8C2FC82A1889083DF93D867F65E51168D0000000049454E44AE426082} 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
D0A7FB93199393FF040398F3FC63332DDB000002054944415478DAEDD6BF4B1B
611807F0EF1B2FB9335A7395269A5CB57F8050BAC50A0E5D3422B8AA83558460
C4622BB8041D0A55B228543C6AB24849068776D0499D9C442C24A838F8637028
6D283DA3B658C88FF3F52E92346925C1D338681E3878EF7D9F7B3EF7BCDCC14B
28A5B8CD2045F0FE81A3A3E3E907C6C64648E6FDBFA1AEE705A3EBE4BF02AC9D
9214363C3C005996110A85B0BCBC80A6A63608B66A984C26188D46A5601C6767
1491DF31F8662631312192BC205BC70191E7C0CF15443F3BC07A16D3606F6F27
128904FCFE4FB0DB9F429224701C87DA27B5A82833823310E874808E29855AFA
83773A0BBD12E876BBA9D3E9C4ECEC1C04A112E17018D2A1A474C7837FC8A38C
6341E518888EC052654595D90C5E590BCCF9D3E895C0AEEE97B4A5D981603088
A39363FC393D05C33088CB091C1D4750020A3916075FF90856E1316AAC56D894
2BB4F9451BA8C6D0D020D5337A94180CF08C7B92F3E2F414B50935F8FEED2B76
76F7218A17C51DAD2DB4B1BE4179B91FDAC1CB62AA3FFB437B3D43D3F97DAE3E
FAA05C7FF3A0ABA7071B1B1FD131598783BDEDAC7C15F5797D39404619985FDC
1898F3B748A1C9C17C7EECDA6021B6342FA876961905DF527F60855A2CD5585D
DBC2BBB7ED85DDD222580435816260895680C52F44F1AACB71073BD402D63FBB
186B0209F99B9F5ACF9CBB2CDEBB904C7CE3CD7D30BBF563E239AD31EAD8FE92
1DB50000000049454E44AE426082}
Name = 'PngImage0' Name = 'PngImage0'
Background = clWindow Background = clWindow
end> end>

44
Source/Modulos/Obras/Views/uEditorObra.dfm
View File

@ -17,27 +17,29 @@ inherited fEditorObra: TfEditorObra
inherited Image1: TImage inherited Image1: TImage
Left = 605 Left = 605
Picture.Data = { Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00 0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018
00001C0806000000720DDF940000000970485973000017120000171201679FD2 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
520000000467414D410000B18E7CFB51930000020F4944415478DAE5D4DB2B04 4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000
511800F06FB659D7CD2D892816B984258992242129E5924BDEE49147FF81571E 80E8000075300000EA6000003A98000017709CBA513C00000009704859730000
9495072F44BB1EF69127CAA5DC436E895C4A92AC6CC48E9961EC3963C7EEEC65 17110000171101CA26F33F000001C149444154484BED564D4B025114B55D3FA3
CEAC6D5F7CF575E69C33F3FD3AA773861204014219D4FF02298AF2FAD2709B5E 4DAB7E444449DA0FC8428B3EC032A96428182209A4851F8B4C515A894A8A2DDC
B8BEBF0E18195B17A4C28A20C2FA8D16E059065EACF7F0FE6203FBAB986B9619 B82985A2A581A4B4103547FA5C54532EDAB83B791F8C98683E29770DDCC5CC65
D0EB93A169D0E8757E7A6C089ED2BBC1643291814E4C2CF0EC13F3368FB0AE8E CE79E7BC731F6F0080AAAF0F11F4B3FA0ACEDCE9E7EAB9086A6915940A040250
5618DF0E27038381A1200283851181C1C414C191F6CC3F611DED2DA0D150E4E0 8A7E6E7E6FED35F6B69B0202C7E72082C120AAD52A6459462A956244C964128F
402515F0A56CACAF83C8A808A069DA0DF50B8EF65242437D1F11C0B13C701C87 0F7778975FF1F1F60CF9E509A57285F57A26A09F244942B15884CFE743229160
DBA58555282E2B045A4B83D691AE685040578C6339585DDC8082923C0CC9D13F 40D1681437B96B94F259940B5954CA0548B705D663E9E455208A2223884422F0
83728CE378D858D981DC826C8CC9D189DD88C0C10F86151119BAB77D08593919 FBFDB05AAD30AD9960773AE0F5B8E13970C27BE8C249EC1897E749E432578C9C
222843270F74EAC1AFCF2FBC126F181A3FDA3F85F4CC34097245A74EE2D4814A 9BC0303FC7C00541C0E2F21274333AE80D7A4CCFEAA0D6AAA1D14E403D3E8A0D
18EA9F1D5F404A6A1284858779A0B3E789E42009869E2FCF6F203129016FA11C CB265C0E3B22E1506F04B81F83C5B28EED2D01E28EC83CA6A2D5C7E371A6C26C
9DBB4A26034931D691B73777101B1F8341396AB94D53064930C6FE21818F0F56 36B3EF93531AECDB6C4C299702B6D1750264EA8912350D700273AFAAA0D4D0F0
88D6454907C589CE5BB3C16C36BBFF3EE5605D6DAF072616E781E7C53196FD5D 48A3675C31F211104823AA2DE00A412DBD80F4910ACD04D423122E0514D39F14
1DEADB9E6D18D06A7F4FE73263C018AAEB17ACAAEC715FCD4F515F186ADFDFDE 7422E01FB4FACAC91AA59A9347F6FC8A80C042E10B9C9EE5B1BB17FBE67F378B
1C975C23615B9A720953042BCA3A556168FB19C68EBF47E8A1AEDA0D53044B0D B814FC13744DD1BF455C165144A928AEADA7EF9FCC8132039DE6808E89764705
ADAA30144EF038A6C60353048BF29B55614ED017A6086E32DD1048F8C2FC82A1 F71CB45E6B9A55504F39ECDA5D7FBE002E8A0FD064A100E60000000049454E44
889083DF93D867F65E51168D0000000049454E44AE426082} AE426082}
ExplicitLeft = 607 ExplicitLeft = 605
ExplicitTop = -3
ExplicitHeight = 27
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock

2
Source/Modulos/Obras/Views/uEditorObra.pas
View File

@ -13,7 +13,7 @@ uses
JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase, JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase,
uViewObras, uIEditorObra, uObrasController, JvExComCtrls, uViewObras, uIEditorObra, uObrasController, JvExComCtrls,
JvStatusBar, dxLayoutLookAndFeels, uDAInterfaces; JvStatusBar, dxLayoutLookAndFeels, uDAInterfaces, dxGDIPlusClasses;
type type
TfEditorObra = class(TfEditorDBItem, IEditorObra) TfEditorObra = class(TfEditorDBItem, IEditorObra)

93
Source/Modulos/Obras/Views/uEditorObras.dfm
View File

@ -5,37 +5,42 @@ inherited fEditorObras: TfEditorObras
ClientHeight = 503 ClientHeight = 503
ClientWidth = 853 ClientWidth = 853
ExplicitWidth = 861 ExplicitWidth = 861
ExplicitHeight = 530 ExplicitHeight = 537
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 853 Width = 853
Caption = 'Lista de obras' Caption = 'Lista de obras'
ExplicitWidth = 853
inherited Image1: TImage inherited Image1: TImage
Left = 826 Left = 826
Picture.Data = { Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018
0000180806000000E0773DF80000000970485973000017120000171201679FD2 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
520000000467414D410000B18E7CFB5193000001D44944415478DAB5D4BD4B02 4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000
7118C0F1E737D552D0105843616F838519166551345443A32D2E0DD15863FF41 80E8000075300000EA6000003A98000017709CBA513C00000009704859730000
6B2141353544144A2004114144431695841445D00BE950E7905618742F2257CF 17110000171101CA26F33F000001C149444154484BED564D4B025114B55D3FA3
D9D9EFCE3BEF4EF001797E9CFAFD1C8A125114A19C43648010A2F98205AF5D7C 4DAB7E444449DA0FC8428B3EC032A96428182209A4851F8B4C515A894A8A2DDC
611296C3FE33961802189F5909C13B1383EFF427B05FB94738B40976BB0DC6E7 B82985A2A581A4B4103547FA5C54532EDAB83B791F8C98683E29770DDCC5CC65
56FEAE7D289EF7EF3E422010280E941ADF589E8754A3AF3820C7F10DA9D798A5 CE79E7BC731F6F0080AAAF0F11F4B3FA0ACEDCE9E7EAB9086A6915940A040250
785D8D0D6EAB87F5013A8E81D46BDC521C471750C731F0CEC44DC55B1B9A41E0 8A7E6E7E6FED35F6B69B0202C7E72082C120AAD52A6459462A956244C964128F
0510848C36B038D15410C7F3C1FAB261BCABC3998BF31969472B070A81D97E52 0F7778975FF1F1F60CF9E509A57285F57A26A09F244942B15884CFE743229160
D20F62D0E381CCEF5DF3129043CE494F21B03445C4B1D169C360369B95223C27 40D1681437B96B94F259940B5954CA0548B705D663E9E455208A2223884422F0
C0D17E181CCE36E963A19163C1551A40C731747274019DDDED529C460EBF1CD6 FBFDB05AAD30AD9960773AE0F5B8E13970C27BE8C249EC1897E749E432578C9C
01751CCF91D328F40DBA81653905B2976CB10668C5715F5DDEC2D088473AD3C8 9BC0303FC7C00541C0E2F21274333AE80D7A4CCFEAA0D6AAA1D14E403D3E8A0D
0ED3681ED08BE3BEBBB997001C1AD98ED79B038AC5F14E9FEE9FF3008D6C3DD4 CB265C0E3B22E1506F04B81F83C5B28EED2D01E28EC83CA6A2D5C7E371A6C26C
1A03EA38FBCDE501FE6F332F090520236BD755C5013A22A8367D3DF9962C0056 36B3EF93531AECDB6C4C299702B6D1750264EA8912350D700273AFAAA0D4D0F0
2315100C06FFFF21D480D938EE743AAD00E4389E3581E1A149D371FC0E388ECD 48A3675C31F211104823AA2DE00A412DBD80F4910ACD04D423122E0514D39F14
03745C17F0F4FA4CC77164401DD705DC2EAFE9B80CE03FA73AAE0B9C733EB03A 7422E01FB4FACAC91AA59A9347F6FC8A80C042E10B9C9EE5B1BB17FBE67F378B
5A714DA05C5376E00756B52DFEBD3C9AE50000000049454E44AE426082} B814FC13744DD1BF455C165144A928AEADA7EF9FCC8132039DE6808E89764705
F71CB45E6B9A55504F39ECDA5D7FBE002E8A0FD064A100E60000000049454E44
AE426082}
ExplicitLeft = 826
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 853 Width = 853
ExplicitWidth = 853
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 474 ExplicitWidth = 474
end end
@ -60,6 +65,8 @@ inherited fEditorObras: TfEditorObras
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
Top = 484 Top = 484
Width = 853 Width = 853
ExplicitTop = 484
ExplicitWidth = 853
end end
inline frViewObras1: TfrViewObras [3] inline frViewObras1: TfrViewObras [3]
Left = 0 Left = 0
@ -76,13 +83,13 @@ inherited fEditorObras: TfEditorObras
TabOrder = 3 TabOrder = 3
ReadOnly = False ReadOnly = False
ExplicitTop = 102 ExplicitTop = 102
ExplicitWidth = 543 ExplicitWidth = 853
ExplicitHeight = 323 ExplicitHeight = 382
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 853 Width = 853
Height = 254 Height = 254
ExplicitWidth = 543 ExplicitWidth = 853
ExplicitHeight = 195 ExplicitHeight = 254
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = < DataController.Summary.FooterSummaryItems = <
item item
@ -97,47 +104,53 @@ inherited fEditorObras: TfEditorObras
end end
inherited frViewFiltroBase1: TfrViewFiltroBase inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 853 Width = 853
ExplicitWidth = 543 ExplicitWidth = 853
inherited TBXDockablePanel1: TTBXDockablePanel inherited TBXDockablePanel1: TTBXDockablePanel
ExplicitWidth = 543 ExplicitWidth = 853
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 853 Width = 853
ExplicitWidth = 543 ExplicitWidth = 853
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 273 ExplicitWidth = 756
Width = 273 Width = 756
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 523 Left = 225
ExplicitLeft = 523 ExplicitLeft = 225
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
end end
inherited eLista: TcxComboBox
Left = 383
ExplicitLeft = 383
ExplicitWidth = 460
Width = 460
end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 853 Width = 853
ExplicitWidth = 543 ExplicitWidth = 853
inherited tbxBotones: TTBXToolbar inherited tbxBotones: TTBXToolbar
Width = 843 Width = 843
ExplicitWidth = 533 ExplicitWidth = 843
end end
end end
end end
end end
inherited pnlAgrupaciones: TTBXDockablePanel inherited pnlAgrupaciones: TTBXDockablePanel
Top = 356 Top = 356
ExplicitTop = 297 ExplicitTop = 356
ExplicitWidth = 543 ExplicitWidth = 853
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 853 Width = 853
ExplicitWidth = 543 ExplicitWidth = 853
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
Width = 843 Width = 843
ExplicitWidth = 533 ExplicitWidth = 843
end end
end end
end end
@ -147,6 +160,14 @@ inherited fEditorObras: TfEditorObras
BuiltInReportLink = True BuiltInReportLink = True
end end
end end
inherited cxViewGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
item
GridView = frViewObras1.cxGridView
HitTypes = [gvhtCell]
Index = 0
end>
end
end end
inherited EditorActionList: TActionList [4] inherited EditorActionList: TActionList [4]
inherited actNuevo: TAction inherited actNuevo: TAction

2
Source/Modulos/Obras/Views/uEditorObras.pas
View File

@ -12,7 +12,7 @@ uses
JvAppRegistryStorage, JvFormPlacement, ExtCtrls, uCustomView, uViewBase, JvAppRegistryStorage, JvFormPlacement, ExtCtrls, uCustomView, uViewBase,
uViewBarraSeleccion, pngimage, uIEditorObras, uEditorGridBase, uViewBarraSeleccion, pngimage, uIEditorObras, uEditorGridBase,
JvComponentBase, uViewGridBase, uObrasController, JvExComCtrls, JvComponentBase, uViewGridBase, uObrasController, JvExComCtrls,
JvStatusBar, uDAInterfaces; JvStatusBar, uDAInterfaces, dxGDIPlusClasses;
type type
TfEditorObras = class(TfEditorGridBase, IEditorObras) TfEditorObras = class(TfEditorGridBase, IEditorObras)

10
Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.dproj
View File

@ -42,17 +42,17 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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.0.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><Source><Source Name="MainSource">PedidosProveedor_controller.dpk</Source></Source></Delphi.Personality></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">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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.0.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><Source><Source Name="MainSource">PedidosProveedor_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup> <ItemGroup>
<DelphiCompile Include="PedidosProveedor_controller.dpk"> <DelphiCompile Include="PedidosProveedor_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" /> <DCCReference Include="..\Articulos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="..\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" /> <DCCReference Include="..\Contactos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_data.dcp" /> <DCCReference Include="..\PedidosProveedor_data.dcp" />
<DCCReference Include="uArticulosPedidoProveedorController.pas" /> <DCCReference Include="uArticulosPedidoProveedorController.pas" />
<DCCReference Include="uDetallesPedidoProveedorController.pas" /> <DCCReference Include="uDetallesPedidoProveedorController.pas" />
<DCCReference Include="uPedidosProveedorController.pas" /> <DCCReference Include="uPedidosProveedorController.pas" />

16
Source/Modulos/Pedidos a proveedor/Controller/uDetallesPedidoProveedorController.pas
View File

@ -44,8 +44,8 @@ type
implementation implementation
uses Variants, uControllerDetallesBase, uDataModulePedidosProveedor, uses uDAInterfaces, Variants, uControllerDetallesBase, uDataModulePedidosProveedor,
uCalculosUtils, schArticulosClient_Intf, uArticulosPedidoProveedorController; uCalculosUtils, schArticulosClient_Intf, schPedidosProveedorClient_Intf, uArticulosPedidoProveedorController;
{ TDetallesPedidoProveedorController } { TDetallesPedidoProveedorController }
@ -131,6 +131,9 @@ begin
end; end;
procedure TDetallesPedidoProveedorController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesPedidoProveedorController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
var
AField: TDAField;
begin begin
if Assigned(AArticulos) then if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
@ -140,8 +143,13 @@ begin
//Sobreescribimos el id del articulo por el campo ID_ARTICULO que nos hemos tenido que crear para //Sobreescribimos el id del articulo por el campo ID_ARTICULO que nos hemos tenido que crear para
//almacenar el codigo de artículo ya que ID esta destinado a ID_ARTICULO||ID_PROVEEDOR, para identificar de forma //almacenar el codigo de artículo ya que ID esta destinado a ID_ARTICULO||ID_PROVEEDOR, para identificar de forma
//unica los articulos desglosados por proveedor. //unica los articulos desglosados por proveedor.
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AArticulos.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant; AField := AArticulos.DataTable.FindField(CAMPO_ID_ARTICULOS);
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_FABRICANTE).AsVariant := AArticulos.DataTable.FieldByName(fld_ArticulosREFERENCIA_FABR).AsVariant; if Assigned(AField) then
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AField.AsVariant;
AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
if Assigned(AField) then
ADetalles.DataTable.FieldByName(fld_PedidosProveedor_DetallesREFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
end; end;
procedure TDetallesPedidoProveedorController.ValidarCampos(DataTable: TDADataTable); procedure TDetallesPedidoProveedorController.ValidarCampos(DataTable: TDADataTable);

1
Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm
View File

@ -65,7 +65,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor
DataType = datString DataType = datString
Size = 255 Size = 255
DisplayLabel = 'Situaci'#243'n' DisplayLabel = 'Situaci'#243'n'
ServerAutoRefresh = True
DictionaryEntry = 'PedidosProveedor_SITUACION' DictionaryEntry = 'PedidosProveedor_SITUACION'
end end
item item

12
Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas
View File

@ -9,9 +9,9 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_PedidosProveedor = '{1BAF4489-05BC-4C3E-AAF7-5604255E75A6}'; RID_PedidosProveedor = '{7262F144-AFC8-4C3F-BDB1-7DCA530FA007}';
RID_PedidosProveedor_Detalles = '{C7CF951C-E104-4383-AEEE-DC34A4847225}'; RID_PedidosProveedor_Detalles = '{42853D51-F307-4A55-8733-7E97B1BBE2C5}';
RID_PedidosProveedor_Articulos_Pendientes = '{3D5DFDE8-42A0-4486-A19B-7C47F4653765}'; RID_PedidosProveedor_Articulos_Pendientes = '{29ECEF41-2FBF-4B35-95F8-2814C683C0BE}';
{ Data table names } { Data table names }
nme_PedidosProveedor = 'PedidosProveedor'; nme_PedidosProveedor = 'PedidosProveedor';
@ -151,7 +151,7 @@ const
type type
{ IPedidosProveedor } { IPedidosProveedor }
IPedidosProveedor = interface(IDAStronglyTypedDataTable) IPedidosProveedor = interface(IDAStronglyTypedDataTable)
['{FA6782F5-4952-44C2-A6E4-D90334BA0165}'] ['{C7AA3400-0782-43E4-A8E0-1D46A319FE67}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -618,7 +618,7 @@ type
{ IPedidosProveedor_Detalles } { IPedidosProveedor_Detalles }
IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable) IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
['{F68FA01A-DC79-4527-8703-BD179714133A}'] ['{D2228AB6-71FA-4D37-BC2B-CC8C876D874A}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -833,7 +833,7 @@ type
{ IPedidosProveedor_Articulos_Pendientes } { IPedidosProveedor_Articulos_Pendientes }
IPedidosProveedor_Articulos_Pendientes = interface(IDAStronglyTypedDataTable) IPedidosProveedor_Articulos_Pendientes = interface(IDAStronglyTypedDataTable)
['{FFB6E00C-F16C-4572-8302-31F1A81CC1B7}'] ['{75AEDA92-EDCE-4DB4-B6D5-842A0CB0089C}']
{ Property getters and setters } { Property getters and setters }
function GetID_PEDIDOValue: Integer; function GetID_PEDIDOValue: Integer;
procedure SetID_PEDIDOValue(const aValue: Integer); procedure SetID_PEDIDOValue(const aValue: Integer);

12
Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas
View File

@ -9,14 +9,14 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_PedidosProveedorDelta = '{E8E75AC0-29B8-481F-9C3F-A460D71254FA}'; RID_PedidosProveedorDelta = '{9F7A7FAB-A180-489C-84CF-53D88D983493}';
RID_PedidosProveedor_DetallesDelta = '{6E916BA7-53EB-4766-A941-A18AEFAFC127}'; RID_PedidosProveedor_DetallesDelta = '{64CB7A14-E112-4098-8E88-9FC36AD11C6A}';
RID_PedidosProveedor_Articulos_PendientesDelta = '{F05589C9-FDA3-4BBA-856B-2CFEA98D9AEC}'; RID_PedidosProveedor_Articulos_PendientesDelta = '{EACFA00B-DB63-4873-AC25-DED6C2914365}';
type type
{ IPedidosProveedorDelta } { IPedidosProveedorDelta }
IPedidosProveedorDelta = interface(IPedidosProveedor) IPedidosProveedorDelta = interface(IPedidosProveedor)
['{E8E75AC0-29B8-481F-9C3F-A460D71254FA}'] ['{9F7A7FAB-A180-489C-84CF-53D88D983493}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -484,7 +484,7 @@ type
{ IPedidosProveedor_DetallesDelta } { IPedidosProveedor_DetallesDelta }
IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles) IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
['{6E916BA7-53EB-4766-A941-A18AEFAFC127}'] ['{64CB7A14-E112-4098-8E88-9FC36AD11C6A}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_PEDIDOValue : Integer; function GetOldID_PEDIDOValue : Integer;
@ -698,7 +698,7 @@ type
{ IPedidosProveedor_Articulos_PendientesDelta } { IPedidosProveedor_Articulos_PendientesDelta }
IPedidosProveedor_Articulos_PendientesDelta = interface(IPedidosProveedor_Articulos_Pendientes) IPedidosProveedor_Articulos_PendientesDelta = interface(IPedidosProveedor_Articulos_Pendientes)
['{F05589C9-FDA3-4BBA-856B-2CFEA98D9AEC}'] ['{EACFA00B-DB63-4873-AC25-DED6C2914365}']
{ Property getters and setters } { Property getters and setters }
function GetOldID_PEDIDOValue : Integer; function GetOldID_PEDIDOValue : Integer;
function GetOldREFERENCIAValue : String; function GetOldREFERENCIAValue : String;

45
Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.dproj
View File

@ -42,21 +42,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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.0.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">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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.0.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\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages> <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages> <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">PedidosProveedor_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">PedidosProveedor_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@ -66,23 +52,18 @@
<DelphiCompile Include="PedidosProveedor_plugin.dpk"> <DelphiCompile Include="PedidosProveedor_plugin.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationB.dcp" /> <DCCReference Include="..\ApplicationBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBaPedidosProveedor_model.dcp" /> <DCCReference Include="..\Articulos_view.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" /> <DCCReference Include="..\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBasePedidosProveedor_model.dcp" /> <DCCReference Include="..\Contactos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBasPedidosProveedor_model.dcp" /> <DCCReference Include="..\Contactos_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBPedidosProveedor_model.dcp" /> <DCCReference Include="..\Contactos_view.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" /> <DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="..\Obras_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" /> <DCCReference Include="..\Obras_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" /> <DCCReference Include="..\PedidosProveedor_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" /> <DCCReference Include="..\PedidosProveedor_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" /> <DCCReference Include="..\PedidosProveedor_view.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Obras_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Obras_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_view.dcp" />
<DCCReference Include="uPluginPedidosProveedor.pas"> <DCCReference Include="uPluginPedidosProveedor.pas">
<Form>PluginPedidosProveedor</Form> <Form>PluginPedidosProveedor</Form>
</DCCReference> </DCCReference>

1
Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm
View File

@ -207,7 +207,6 @@ object srvPedidosProveedor: TsrvPedidosProveedor
Name = 'SITUACION' Name = 'SITUACION'
DataType = datString DataType = datString
Size = 255 Size = 255
ServerAutoRefresh = True
DictionaryEntry = 'PedidosProveedor_SITUACION' DictionaryEntry = 'PedidosProveedor_SITUACION'
end end
item item

40
Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk
View File

@ -46,7 +46,42 @@ requires
dbrtl, dbrtl,
vcljpg, vcljpg,
vcldb, vcldb,
PedProv_AlbProv_relation; PedProv_AlbProv_relation,
DataAbstract_Core_D11,
dsnap,
adortl,
RemObjects_Core_D11,
GUISDK_D11,
xmlrtl,
cfpack_d11,
vclx,
vclactnband,
designide,
ccpackD11,
dxLayoutControlD11,
dxComnD11,
dxSkinsCoreD11,
dxSkinsdxLCPainterD11,
dxSkinOffice2007BlackD11,
dxSkinBlackD11,
dxSkinBlueD11,
dxSkinCaramelD11,
dxSkinCoffeeD11,
dxSkinGlassOceansD11,
dxSkiniMaginaryD11,
dxSkinLilianD11,
dxSkinLiquidSkyD11,
dxSkinLondonLiquidSkyD11,
dxSkinMcSkinD11,
dxSkinMoneyTwinsD11,
dxSkinOffice2007BlueD11,
dxSkinOffice2007GreenD11,
dxSkinOffice2007PinkD11,
dxSkinOffice2007SilverD11,
dxSkinSilverD11,
dxSkinStardustD11,
dxSkinValentineD11,
dxSkinXmas2008BlueD11;
contains contains
uPedidosProveedorViewRegister in 'uPedidosProveedorViewRegister.pas', uPedidosProveedorViewRegister in 'uPedidosProveedorViewRegister.pas',
@ -63,6 +98,7 @@ contains
uEditorElegirArticulosPedidoProveedor in 'uEditorElegirArticulosPedidoProveedor.pas' {fEditorElegirArticulosPedidoProveedor: TForm}, uEditorElegirArticulosPedidoProveedor in 'uEditorElegirArticulosPedidoProveedor.pas' {fEditorElegirArticulosPedidoProveedor: TForm},
uEditorSituacionPedidoProveedor in 'uEditorSituacionPedidoProveedor.pas' {fEditorSituacionPedidoProveedor: TfEditorSituacionPedidoProveedor}, uEditorSituacionPedidoProveedor in 'uEditorSituacionPedidoProveedor.pas' {fEditorSituacionPedidoProveedor: TfEditorSituacionPedidoProveedor},
uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame}, uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame},
uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedido}; uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorSituacionPedidoProveedor},
uViewObraReserva in 'uViewObraReserva.pas' {frViewObraReserva: TFrame};
end. end.

83
Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj
View File

@ -49,28 +49,57 @@
<DelphiCompile Include="PedidosProveedor_view.dpk"> <DelphiCompile Include="PedidosProveedor_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Almacenes_controller.dcp" /> <DCCReference Include="adortl.dcp" />
<DCCReference Include="..\Almacenes_model.dcp" /> <DCCReference Include="Almacenes_controller.dcp" />
<DCCReference Include="..\Articulos_view.dcp" /> <DCCReference Include="Almacenes_model.dcp" />
<DCCReference Include="..\Contactos_controller.dcp" /> <DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="..\Contactos_model.dcp" /> <DCCReference Include="ccpackD11.dcp" />
<DCCReference Include="..\Contactos_view.dcp" /> <DCCReference Include="cfpack_d11.dcp" />
<DCCReference Include="..\cxDataD11.dcp" /> <DCCReference Include="Contactos_controller.dcp" />
<DCCReference Include="..\cxEditorsD11.dcp" /> <DCCReference Include="Contactos_model.dcp" />
<DCCReference Include="..\cxLibraryD11.dcp" /> <DCCReference Include="Contactos_view.dcp" />
<DCCReference Include="..\dbrtl.dcp" /> <DCCReference Include="cxDataD11.dcp" />
<DCCReference Include="..\dxGDIPlusD11.dcp" /> <DCCReference Include="cxEditorsD11.dcp" />
<DCCReference Include="..\dxThemeD11.dcp" /> <DCCReference Include="cxLibraryD11.dcp" />
<DCCReference Include="..\GUIBase.dcp" /> <DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Obras_controller.dcp" /> <DCCReference Include="dbrtl.dcp" />
<DCCReference Include="..\Obras_model.dcp" /> <DCCReference Include="designide.dcp" />
<DCCReference Include="..\PedidosProveedor_controller.dcp" /> <DCCReference Include="dsnap.dcp" />
<DCCReference Include="..\PedidosProveedor_model.dcp" /> <DCCReference Include="dxComnD11.dcp" />
<DCCReference Include="..\PedProv_AlbProv_relation.dcp" /> <DCCReference Include="dxGDIPlusD11.dcp" />
<DCCReference Include="..\rtl.dcp" /> <DCCReference Include="dxLayoutControlD11.dcp" />
<DCCReference Include="..\vcl.dcp" /> <DCCReference Include="dxSkinBlackD11.dcp" />
<DCCReference Include="..\vcldb.dcp" /> <DCCReference Include="dxSkinBlueD11.dcp" />
<DCCReference Include="..\vcljpg.dcp" /> <DCCReference Include="dxSkinCaramelD11.dcp" />
<DCCReference Include="dxSkinCoffeeD11.dcp" />
<DCCReference Include="dxSkinGlassOceansD11.dcp" />
<DCCReference Include="dxSkiniMaginaryD11.dcp" />
<DCCReference Include="dxSkinLilianD11.dcp" />
<DCCReference Include="dxSkinLiquidSkyD11.dcp" />
<DCCReference Include="dxSkinLondonLiquidSkyD11.dcp" />
<DCCReference Include="dxSkinMcSkinD11.dcp" />
<DCCReference Include="dxSkinMoneyTwinsD11.dcp" />
<DCCReference Include="dxSkinOffice2007BlackD11.dcp" />
<DCCReference Include="dxSkinOffice2007BlueD11.dcp" />
<DCCReference Include="dxSkinOffice2007GreenD11.dcp" />
<DCCReference Include="dxSkinOffice2007PinkD11.dcp" />
<DCCReference Include="dxSkinOffice2007SilverD11.dcp" />
<DCCReference Include="dxSkinsCoreD11.dcp" />
<DCCReference Include="dxSkinsdxLCPainterD11.dcp" />
<DCCReference Include="dxSkinSilverD11.dcp" />
<DCCReference Include="dxSkinStardustD11.dcp" />
<DCCReference Include="dxSkinValentineD11.dcp" />
<DCCReference Include="dxSkinXmas2008BlueD11.dcp" />
<DCCReference Include="dxThemeD11.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="GUISDK_D11.dcp" />
<DCCReference Include="Obras_controller.dcp" />
<DCCReference Include="Obras_model.dcp" />
<DCCReference Include="PedidosProveedor_controller.dcp" />
<DCCReference Include="PedidosProveedor_model.dcp" />
<DCCReference Include="PedProv_AlbProv_relation.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas"> <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
<Form>fEditorDireccionEntregaPedidoProveedor </Form> <Form>fEditorDireccionEntregaPedidoProveedor </Form>
<DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass> <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>
@ -116,6 +145,10 @@
<Form>frViewElegirArticulosPedidosProveedor</Form> <Form>frViewElegirArticulosPedidosProveedor</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uViewObraReserva.pas">
<Form>frViewObraReserv</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="uViewPedidoProveedor.pas"> <DCCReference Include="uViewPedidoProveedor.pas">
<Form>frViewPedidoProveedor</Form> <Form>frViewPedidoProveedor</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
@ -128,6 +161,12 @@
<Form>frViewProveedorPedido</Form> <Form>frViewProveedorPedido</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclx.dcp" />
<DCCReference Include="xmlrtl.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

15
Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm
View File

@ -11,6 +11,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
DesignSize = ( DesignSize = (
586 586
@ -25,7 +26,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
object rdxDestino1: TRadioButton object rdxDestino1: TRadioButton
Left = 10 Left = 10
Top = 10 Top = 10
Width = 255 Width = 566
Height = 17 Height = 17
Action = actListaAlmacenes Action = actListaAlmacenes
TabOrder = 0 TabOrder = 0
@ -34,7 +35,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
object rdxDestino2: TRadioButton object rdxDestino2: TRadioButton
Left = 10 Left = 10
Top = 110 Top = 110
Width = 287 Width = 566
Height = 17 Height = 17
Action = actOtro Action = actOtro
TabOrder = 4 TabOrder = 4
@ -68,7 +69,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 1 TabOrder = 1
Width = 425 Width = 551
end end
object bModificar: TBitBtn object bModificar: TBitBtn
Left = 448 Left = 448
@ -83,7 +84,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
Left = 25 Left = 25
Top = 133 Top = 133
Width = 551 Width = 551
Height = 177 Height = 264
AutoSize = False AutoSize = False
BevelKind = bkFlat BevelKind = bkFlat
TabOrder = 5 TabOrder = 5
@ -101,7 +102,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
Left = 25 Left = 25
Top = 83 Top = 83
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'ID_OBRA' DataBinding.DataField = 'ID_ALMACEN'
DataBinding.DataSource = dsPedido DataBinding.DataSource = dsPedido
Properties.DropDownListStyle = lsFixedList Properties.DropDownListStyle = lsFixedList
Properties.ImmediatePost = True Properties.ImmediatePost = True
@ -141,9 +142,11 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
Properties.ReadOnly = True Properties.ReadOnly = True
Properties.OnButtonClick = edtEntregarAPropertiesButtonClick Properties.OnButtonClick = edtEntregarAPropertiesButtonClick
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Color = clWindow Style.Color = clWindow
Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.NativeStyle = True
Style.ButtonStyle = bts3D
StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.Kind = lfStandard
@ -151,7 +154,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 7 TabOrder = 7
Width = 121 Width = 506
end end
object dxLayoutGroup1: TdxLayoutGroup object dxLayoutGroup1: TdxLayoutGroup
ShowCaption = False ShowCaption = False

11
Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas
View File

@ -9,7 +9,12 @@ uses
cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable, cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable,
ActnList, uBizAlmacenes, uAlmacenesController, uPedidosProveedorController, ActnList, uBizAlmacenes, uAlmacenesController, uPedidosProveedorController,
Buttons, uDAInterfaces, uBizObras, uObrasController, cxButtonEdit, cxDBEdit, Buttons, uDAInterfaces, uBizObras, uObrasController, cxButtonEdit, cxDBEdit,
ExtCtrls; ExtCtrls, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee,
dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black,
dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters,
dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter;
type type
IViewDireccionEntregaPedidoProv = interface(IViewBase) IViewDireccionEntregaPedidoProv = interface(IViewBase)
@ -130,7 +135,6 @@ begin
if Assigned(FPedido) and Assigned(FAlmacenes) then if Assigned(FPedido) and Assigned(FAlmacenes) then
begin begin
FPedido.Edit; FPedido.Edit;
FPedido.ID_OBRA := 0;
FPedido.CALLE := FAlmacenes.CALLE; FPedido.CALLE := FAlmacenes.CALLE;
FPedido.POBLACION := FAlmacenes.POBLACION; FPedido.POBLACION := FAlmacenes.POBLACION;
FPedido.POBLACION := FAlmacenes.POBLACION; FPedido.POBLACION := FAlmacenes.POBLACION;
@ -145,7 +149,6 @@ begin
if Assigned(FPedido) and Assigned(FObras) then if Assigned(FPedido) and Assigned(FObras) then
begin begin
FPedido.Edit; FPedido.Edit;
FPedido.ID_ALMACEN := 0;
FPedido.CALLE := FObras.CALLE; FPedido.CALLE := FObras.CALLE;
FPedido.POBLACION := FObras.POBLACION; FPedido.POBLACION := FObras.POBLACION;
FPedido.POBLACION := FObras.POBLACION; FPedido.POBLACION := FObras.POBLACION;
@ -276,7 +279,7 @@ begin
dsPedido.DataTable := FPedido.DataTable; dsPedido.DataTable := FPedido.DataTable;
cbListaAlmacenes.Properties.OnValidate := cbListaAlmacenesPropertiesValidate; cbListaAlmacenes.Properties.OnValidate := cbListaAlmacenesPropertiesValidate;
cbListaObras.Properties.OnValidate := cbListaObrasPropertiesValidate; cbListaObras.Properties.OnValidate := cbListaAlmacenesPropertiesValidate;
if (FPedido.EsNuevo) then if (FPedido.EsNuevo) then
CambioDireccionAlmacen CambioDireccionAlmacen

70
Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.dfm Normal file
View File

@ -0,0 +1,70 @@
inherited frViewObraReserva: TfrViewObraReserva
Width = 586
Height = 46
ExplicitWidth = 586
ExplicitHeight = 46
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 586
Height = 46
Align = alClient
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
DesignSize = (
586
46)
object cbListaObrasReserva: TcxDBLookupComboBox
Left = 25
Top = 10
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'ID_OBRA'
DataBinding.DataSource = dsPedido
Properties.DropDownListStyle = lsFixedList
Properties.ImmediatePost = True
Properties.KeyFieldNames = 'ID'
Properties.ListColumns = <
item
FieldName = 'NOMBRE'
end>
Properties.ListOptions.AnsiSort = True
Properties.ListOptions.GridLines = glNone
Properties.ListOptions.ShowHeader = False
Properties.ListOptions.SyncMode = True
Properties.ListSource = dsObras
Properties.PostPopupValueOnTab = True
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0
Width = 551
end
object dxLayoutGroup1: TdxLayoutGroup
ShowCaption = False
Hidden = True
ShowBorder = False
object dxLayoutControl1Item6: TdxLayoutItem
Offsets.Left = 15
ShowCaption = False
Control = cbListaObrasReserva
ControlOptions.ShowBorder = False
end
end
end
object dsPedido: TDADataSource
Left = 320
Top = 8
end
object dsObras: TDADataSource
Left = 288
Top = 8
end
end

87
Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.pas Normal file
View File

@ -0,0 +1,87 @@
unit uViewObraReserva;
interface
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewBase, uBizPedidosProveedor, cxGraphics, dxLayoutControl, cxMemo,
cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable,
ActnList, uBizAlmacenes, uAlmacenesController, uPedidosProveedorController,
Buttons, uDAInterfaces, uBizObras, uObrasController, cxButtonEdit, cxDBEdit,
ExtCtrls, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee,
dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black,
dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters,
dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter;
type
IViewDireccionEntregaPedidoProv = interface(IViewBase)
['{7467855C-066F-4A60-B88F-2837C8050B1E}']
function GetPedidoProveedor: IBizPedidoProveedor;
procedure SetPedidoProveedor(const Value: IBizPedidoProveedor);
property PedidoProveedor: IBizPedidoProveedor read GetPedidoProveedor write SetPedidoProveedor;
end;
TfrViewObraReserva = class(TfrViewBase, IViewDireccionEntregaPedidoProv)
dxLayoutControl1: TdxLayoutControl;
dxLayoutGroup1: TdxLayoutGroup;
dsPedido: TDADataSource;
dxLayoutControl1Item6: TdxLayoutItem;
cbListaObrasReserva: TcxDBLookupComboBox;
dsObras: TDADataSource;
protected
FObrasController : IObrasController;
FObras: IBizObra;
FPedido : IBizPedidoProveedor;
FController : IPedidosProveedorController;
function GetPedidoProveedor: IBizPedidoProveedor;
procedure SetPedidoProveedor(const Value: IBizPedidoProveedor);
public
property PedidoProveedor: IBizPedidoProveedor read GetPedidoProveedor write SetPedidoProveedor;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end;
implementation
{$R *.dfm}
uses
uEditorRegistryUtils, uCustomView, uEditorElegirPersonaContactoPedido;
constructor TfrViewObraReserva.Create(AOwner: TComponent);
begin
inherited;
FController := TPedidosProveedorController.Create;
FObrasController := TObrasController.Create;
FObras := FObrasController.BuscarTodos;
FObras.DataTable.Active := True;
dsObras.DataTable := FObras.DataTable;
end;
destructor TfrViewObraReserva.Destroy;
begin
FObrasController := Nil;
FObras := Nil;
FController := NIL;
inherited;
end;
function TfrViewObraReserva.GetPedidoProveedor: IBizPedidoProveedor;
begin
Result := FPedido;
end;
procedure TfrViewObraReserva.SetPedidoProveedor(
const Value: IBizPedidoProveedor);
begin
dsPedido.DataTable := nil;
FPedido := Value;
dsPedido.DataTable := FPedido.DataTable;
end;
end.

218
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm
View File

@ -13,6 +13,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
DesignSize = ( DesignSize = (
787 787
@ -37,7 +38,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 1 TabOrder = 1
Width = 127 Width = 240
end end
object edtFechaConfirmacion: TcxDBDateEdit object edtFechaConfirmacion: TcxDBDateEdit
Left = 137 Left = 137
@ -58,7 +59,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 7 TabOrder = 7
Width = 63 Width = 240
end end
object edtFechaEntrega: TcxDBDateEdit object edtFechaEntrega: TcxDBDateEdit
Left = 137 Left = 137
@ -77,10 +78,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 8 TabOrder = 8
Width = 55 Width = 240
end end
object memObservaciones: TcxDBMemo object memObservaciones: TcxDBMemo
Left = 407 Left = 526
Top = 213 Top = 213
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataField = 'OBSERVACIONES'
@ -93,9 +94,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 11 TabOrder = 12
Height = 287 Height = 380
Width = 333 Width = 358
end end
object eReferencia: TcxDBTextEdit object eReferencia: TcxDBTextEdit
Left = 137 Left = 137
@ -117,13 +118,13 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0 TabOrder = 0
Width = 143 Width = 240
end end
inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
Left = 22 Left = 22
Top = 279 Top = 279
Width = 325 Width = 355
Height = 194 Height = 314
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
@ -134,46 +135,56 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
ReadOnly = False ReadOnly = False
ExplicitLeft = 22 ExplicitLeft = 22
ExplicitTop = 279 ExplicitTop = 279
ExplicitWidth = 325 ExplicitWidth = 355
ExplicitHeight = 194 ExplicitHeight = 314
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 325 Width = 355
Height = 194 Height = 314
ExplicitWidth = 325 ExplicitWidth = 355
ExplicitHeight = 194 ExplicitHeight = 314
inherited Bevel1: TBevel inherited Bevel1: TBevel
Top = 272 Top = 190
Width = 529 Width = 529
ExplicitTop = 272 ExplicitTop = 190
ExplicitWidth = 529 ExplicitWidth = 529
end end
inherited rdxDestino1: TRadioButton inherited rdxDestino1: TRadioButton
Width = 255 Width = 335
ExplicitWidth = 255 ExplicitWidth = 335
end end
inherited rdxDestino2: TRadioButton inherited rdxDestino2: TRadioButton
Width = 287 Width = 335
ExplicitWidth = 287 ExplicitWidth = 335
end end
inherited cbListaAlmacenes: TcxDBLookupComboBox inherited cbListaAlmacenes: TcxDBLookupComboBox
ExplicitWidth = 425 ExplicitWidth = 320
Width = 425 Width = 320
end end
inherited bModificar: TBitBtn inherited bModificar: TBitBtn
Left = 217 Left = 336
Top = 241 Top = 159
ExplicitLeft = 217 ExplicitLeft = 336
ExplicitTop = 241 ExplicitTop = 159
end end
inherited txtDireccion: TStaticText inherited txtDireccion: TStaticText
Height = 177 Width = 320
ExplicitHeight = 177 Height = 102
ExplicitWidth = 320
ExplicitHeight = 102
end
inherited RadioButton1: TRadioButton
Width = 335
ExplicitWidth = 335
end
inherited cbListaObras: TcxDBLookupComboBox
ExplicitWidth = 320
Width = 320
end end
inherited edtEntregarA: TcxDBButtonEdit inherited edtEntregarA: TcxDBButtonEdit
Top = 283 Top = 201
ExplicitTop = 283 ExplicitTop = 201
ExplicitWidth = 121 ExplicitWidth = 275
Width = 121 Width = 275
end end
end end
inherited ActionList1: TActionList inherited ActionList1: TActionList
@ -215,10 +226,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 2 TabOrder = 2
Width = 32 Width = 102
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 245 Left = 364
Top = 82 Top = 82
Width = 132 Width = 132
Height = 21 Height = 21
@ -245,7 +256,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 6 TabOrder = 6
Width = 195 Width = 240
end end
object eReferenciaPedidoCli: TcxTextEdit object eReferenciaPedidoCli: TcxTextEdit
Left = 137 Left = 137
@ -268,10 +279,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 4 TabOrder = 4
Width = 78 Width = 102
end end
object bVerPedidoCliente: TButton object bVerPedidoCliente: TButton
Left = 245 Left = 364
Top = 109 Top = 109
Width = 132 Width = 132
Height = 23 Height = 23
@ -279,9 +290,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
TabOrder = 5 TabOrder = 5
end end
inline frViewProveedorPedido1: TfrViewProveedorPedido inline frViewProveedorPedido1: TfrViewProveedorPedido
Left = 407 Left = 526
Top = 28 Top = 28
Width = 92 Width = 358
Height = 149 Height = 149
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -289,58 +300,74 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Font.Style = [] Font.Style = []
ParentFont = False ParentFont = False
TabOrder = 11
ReadOnly = False
ExplicitLeft = 526
ExplicitTop = 28
ExplicitWidth = 358
ExplicitHeight = 149
inherited dxLayoutControl1: TdxLayoutControl
Width = 358
Height = 266
ExplicitWidth = 358
ExplicitHeight = 266
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 230
Width = 230
end
inherited edtNIFCIF: TcxDBTextEdit
ExplicitWidth = 230
Width = 230
end
inherited edtCalle: TcxDBTextEdit
ExplicitWidth = 230
Width = 230
end
inherited edtPoblacion: TcxDBTextEdit
ExplicitWidth = 112
Width = 112
end
inherited edtProvincia: TcxDBTextEdit
ExplicitWidth = 230
Width = 230
end
inherited edtCodigoPostal: TcxDBTextEdit
Left = 249
ExplicitLeft = 249
end
inherited Button3: TBitBtn
Left = 133
ExplicitLeft = 133
end
inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 230
Width = 230
end
inherited edtReferenciaAsignada: TcxDBTextEdit
Left = 210
ExplicitLeft = 210
end
inherited edtFax: TcxDBTextEdit
ExplicitWidth = 37
Width = 37
end
end
end
inline frViewObraReserva1: TfrViewObraReserva
Left = 137
Top = 547
Width = 586
Height = 46
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 10 TabOrder = 10
ReadOnly = False ReadOnly = False
ExplicitLeft = 407 ExplicitLeft = 137
ExplicitTop = 28 ExplicitTop = 547
ExplicitWidth = 92
ExplicitHeight = 149
inherited dxLayoutControl1: TdxLayoutControl
Width = 92
Height = 266
ExplicitWidth = 92
ExplicitHeight = 266
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 276
Width = 276
end
inherited edtNIFCIF: TcxDBTextEdit
ExplicitWidth = 276
Width = 276
end
inherited edtCalle: TcxDBTextEdit
ExplicitWidth = 276
Width = 276
end
inherited edtPoblacion: TcxDBTextEdit
ExplicitWidth = 158
Width = 158
end
inherited edtProvincia: TcxDBTextEdit
ExplicitWidth = 276
Width = 276
end
inherited edtCodigoPostal: TcxDBTextEdit
Left = 266
ExplicitLeft = 266
end
inherited Button3: TBitBtn
Left = 150
ExplicitLeft = 150
end
inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 585
Width = 585
end
inherited edtReferenciaAsignada: TcxDBTextEdit
Left = 227
ExplicitLeft = 227
end
inherited edtFax: TcxDBTextEdit
ExplicitWidth = 169
Width = 169
end
end
end end
object dxLayoutControl1Group_Root: TdxLayoutGroup object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False ShowCaption = False
@ -447,6 +474,15 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
end end
object dxLayoutControl1Group11: TdxLayoutGroup
Caption = 'Datos de reserva'
object dxLayoutControl1Item13: TdxLayoutItem
Caption = 'Reservar para obra:'
Control = frViewObraReserva1
ControlOptions.AutoColor = True
ControlOptions.ShowBorder = False
end
end
end end
object dxLayoutControl1Group3: TdxLayoutGroup object dxLayoutControl1Group3: TdxLayoutGroup
AutoAligns = [aaVertical] AutoAligns = [aaVertical]

12
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas
View File

@ -13,7 +13,13 @@ uses
uViewDireccionEntregaPedidoProv, cxLookupEdit, cxDBLookupEdit, uViewDireccionEntregaPedidoProv, cxLookupEdit, cxDBLookupEdit,
// uBizPedidosCliente, uPedidosClienteController, // uBizPedidosCliente, uPedidosClienteController,
cxDBLookupComboBox, uFormasPagoController, ActnList, uDAInterfaces, uBizFormasPago, cxDBLookupComboBox, uFormasPagoController, ActnList, uDAInterfaces, uBizFormasPago,
uViewProveedorPedido; uViewProveedorPedido, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel,
dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue,
dxSkinsdxLCPainter, uViewObraReserva;
type type
IViewPedidoProveedor = interface(IViewBase) IViewPedidoProveedor = interface(IViewBase)
@ -68,6 +74,9 @@ type
actVerPedidoCli: TAction; actVerPedidoCli: TAction;
dxLayoutControl1Item1: TdxLayoutItem; dxLayoutControl1Item1: TdxLayoutItem;
frViewProveedorPedido1: TfrViewProveedorPedido; frViewProveedorPedido1: TfrViewProveedorPedido;
dxLayoutControl1Item13: TdxLayoutItem;
frViewObraReserva1: TfrViewObraReserva;
dxLayoutControl1Group11: TdxLayoutGroup;
procedure CustomViewCreate(Sender: TObject); procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject); procedure CustomViewDestroy(Sender: TObject);
procedure bFormasPagoClick(Sender: TObject); procedure bFormasPagoClick(Sender: TObject);
@ -208,6 +217,7 @@ begin
frViewProveedorPedido1.Proveedor := FPedido.Proveedor; frViewProveedorPedido1.Proveedor := FPedido.Proveedor;
frViewDireccionEntregaPedidoProv1.PedidoProveedor := FPedido; frViewDireccionEntregaPedidoProv1.PedidoProveedor := FPedido;
frViewObraReserva1.PedidoProveedor := FPedido;
end; end;
procedure TfrViewPedidoProveedor.SetViewProveedorPedido(const Value: TfrViewDatosYSeleccionProveedor); procedure TfrViewPedidoProveedor.SetViewProveedorPedido(const Value: TfrViewDatosYSeleccionProveedor);

8
Source/Modulos/Pedidos a proveedor/Views/uViewProveedorPedido.pas
View File

@ -6,7 +6,13 @@ uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewDatosYSeleccionProveedor, ImgList, PngImageList, ActnList, DB, Dialogs, uViewDatosYSeleccionProveedor, ImgList, PngImageList, ActnList, DB,
uDAInterfaces, uDADataTable, dxLayoutControl, StdCtrls, Buttons, cxContainer, uDAInterfaces, uDADataTable, dxLayoutControl, StdCtrls, Buttons, cxContainer,
cxEdit, cxTextEdit, cxDBEdit, cxControls; cxEdit, cxTextEdit, cxDBEdit, cxControls, dxSkinsCore, dxSkinBlack,
dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary,
dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
dxSkinXmas2008Blue, dxSkinsdxLCPainter;
type type
TfrViewProveedorPedido = class(TfrViewDatosYSeleccionProveedor) TfrViewProveedorPedido = class(TfrViewDatosYSeleccionProveedor)

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

10
Source/Servidor/FactuGES_Server.dpr
View File

@ -110,16 +110,12 @@ uses
uBizEmpresasServer in '..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas', uBizEmpresasServer in '..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas',
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
schAlmacenesClient_Intf in '..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas', schAlmacenesClient_Intf in '..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas',
schAlmacenesServer_Intf in '..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas', schAlmacenesServer_Intf in '..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas',
schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas', schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
@ -127,7 +123,11 @@ uses
schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas', schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas'; schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas';
{$R *.res} {$R *.res}
{$R ..\Servicios\RODLFile.res} {$R ..\Servicios\RODLFile.res}

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -35,7 +35,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/> <Borland.ProjectType/>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</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.1.0.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.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 21 de julio de 2008 17:10</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">0</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.2.0.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.2.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 30 de julio de 2008 12:48</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
<ItemGroup> <ItemGroup>

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1,1,0,0 FILEVERSION 1,2,0,0
PRODUCTVERSION 1,1,0,0 PRODUCTVERSION 1,2,0,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -12,9 +12,9 @@ BEGIN
BEGIN BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "FileVersion", "1.1.0.0\0" VALUE "FileVersion", "1.2.0.0\0"
VALUE "ProductVersion", "1.1.0.0\0" VALUE "ProductVersion", "1.2.0.0\0"
VALUE "CompileDate", "lunes, 21 de julio de 2008 18:43\0" VALUE "CompileDate", "miércoles, 30 de julio de 2008 18:17\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"