Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 3.0.5 Se modifican informes para poner nuevo pie LOPD y etiquetas cambios solicitados por Miguel, así como poder ver factura generada de proveedor.

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@157 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2021-05-04 09:12:20 +00:00
parent 6bdce50a89
commit 7d913cce91
58 changed files with 1903 additions and 615 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

96
Source/Base/Base.dproj
View File

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

2
Source/Cliente/FactuGES.dproj
View File

@ -51,7 +51,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<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">3</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">3.0.2.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">3.0.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">5</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">3.0.5.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">3.0.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

2
Source/Cliente/uPantallaPrincipal.dfm
View File

@ -274,7 +274,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
Category = 'Menus'
Caption = 'Log'#237'stica'
OnExecute = actMenuLogisticaExecute
OnUpdate = actMenuComprasUpdate
OnUpdate = actMenuLogisticaUpdate
end
object actMenuVentas: TAction
Category = 'Menus'

7
Source/Cliente/uPantallaPrincipal.pas
View File

@ -124,6 +124,7 @@ type
procedure actMenuInformesExecute(Sender: TObject);
procedure Listadeempresas1_OLDClick(Sender: TObject);
procedure actInformacionEmpresaExecute(Sender: TObject);
procedure actMenuLogisticaUpdate(Sender: TObject);
private
FContenido : TCustomEditor;
procedure ShowEmbedded(AEditor : ICustomEditor);
@ -418,6 +419,12 @@ begin
//
end;
procedure TfPantallaPrincipal.actMenuLogisticaUpdate(Sender: TObject);
begin
(Sender as TAction).Enabled := AppFactuGES.EmpresaActiva.ID = 1;
(Sender as TAction).Visible := AppFactuGES.EmpresaActiva.ID = 1;
end;
procedure TfPantallaPrincipal.ExecuteActionMenu(Sender: TObject);
var
i : integer;

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Presupuestos de cliente\Base.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\frx11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\frxe11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\fs11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\Base.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\frx11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\frxe11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\fs11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vclx.dcp" />
<DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form>
</DCCReference>

4
Source/Informes/1/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/1/InfAlbaranProveedor.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/1/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

6
Source/Informes/1/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/1/InfPedidoProveedor.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/1/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

31
Source/Informes/InfEtiquetasAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

23
Source/Informes/InfEtiquetasContratoCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

44
Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj
View File

@ -9,6 +9,7 @@
<Projects Include="..\..\Cliente\FactuGES.dproj" />
<Projects Include="..\..\GUIBase\GUIBase.dproj" />
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
<Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" />
<Projects Include="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" />
<Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" />
<Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
@ -26,6 +27,7 @@
<Projects Include="..\Presupuestos de cliente\Model\PresupuestosCliente_model.dproj" />
<Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
<Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
<Projects Include="..\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.dproj" />
<Projects Include="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" />
<Projects Include="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" />
<Projects Include="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" />
@ -204,6 +206,15 @@
<Target Name="ConCli_AlbCli_relation:Make">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="PreCli_ConCli_relation">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="" />
</Target>
<Target Name="PreCli_ConCli_relation:Clean">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PreCli_ConCli_relation:Make">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="ContratosCliente_view">
<MSBuild Projects="Views\ContratosCliente_view.dproj" Targets="" />
</Target>
@ -240,15 +251,6 @@
<Target Name="FactuGES_Server:Make">
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
</Target>
<Target Name="PreCli_ConCli_relation">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="" />
</Target>
<Target Name="PreCli_ConCli_relation:Clean">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PreCli_ConCli_relation:Make">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="PresupuestosCliente_view">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" />
</Target>
@ -321,14 +323,32 @@
<Target Name="AlbaranesProveedor_controller:Make">
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Make" />
</Target>
<Target Name="AlbaranesCliente_view">
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="" />
</Target>
<Target Name="AlbaranesCliente_view:Clean">
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Clean" />
</Target>
<Target Name="AlbaranesCliente_view:Make">
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Make" />
</Target>
<Target Name="AlbProv_FacProv_relation">
<MSBuild Projects="..\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.dproj" Targets="" />
</Target>
<Target Name="AlbProv_FacProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.dproj" Targets="Clean" />
</Target>
<Target Name="AlbProv_FacProv_relation:Make">
<MSBuild Projects="..\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;PresupuestosCliente_model;PresupuestosCliente_controller;ContratosCliente_model;ContratosCliente_data;ContratosCliente_controller;FacturasCliente_controller;ConCli_FacCli_relation;ConCli_AlbCli_relation;ContratosCliente_view;ContratosCliente_plugin;FactuGES;FactuGES_Server;PreCli_ConCli_relation;PresupuestosCliente_view;FacturasCliente_view;AlbCli_FacCli_relation;AlbaranesProveedor_view;PedidosProveedor_model;PedidosProveedor_view;PedProv_AlbProv_relation;AlbaranesProveedor_controller" />
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;PresupuestosCliente_model;PresupuestosCliente_controller;ContratosCliente_model;ContratosCliente_data;ContratosCliente_controller;FacturasCliente_controller;ConCli_FacCli_relation;ConCli_AlbCli_relation;PreCli_ConCli_relation;ContratosCliente_view;ContratosCliente_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view;FacturasCliente_view;AlbCli_FacCli_relation;AlbaranesProveedor_view;PedidosProveedor_model;PedidosProveedor_view;PedProv_AlbProv_relation;AlbaranesProveedor_controller;AlbaranesCliente_view;AlbProv_FacProv_relation" />
</Target>
<Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PresupuestosCliente_model:Clean;PresupuestosCliente_controller:Clean;ContratosCliente_model:Clean;ContratosCliente_data:Clean;ContratosCliente_controller:Clean;FacturasCliente_controller:Clean;ConCli_FacCli_relation:Clean;ConCli_AlbCli_relation:Clean;ContratosCliente_view:Clean;ContratosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PreCli_ConCli_relation:Clean;PresupuestosCliente_view:Clean;FacturasCliente_view:Clean;AlbCli_FacCli_relation:Clean;AlbaranesProveedor_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_view:Clean;PedProv_AlbProv_relation:Clean;AlbaranesProveedor_controller:Clean" />
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PresupuestosCliente_model:Clean;PresupuestosCliente_controller:Clean;ContratosCliente_model:Clean;ContratosCliente_data:Clean;ContratosCliente_controller:Clean;FacturasCliente_controller:Clean;ConCli_FacCli_relation:Clean;ConCli_AlbCli_relation:Clean;PreCli_ConCli_relation:Clean;ContratosCliente_view:Clean;ContratosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean;FacturasCliente_view:Clean;AlbCli_FacCli_relation:Clean;AlbaranesProveedor_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_view:Clean;PedProv_AlbProv_relation:Clean;AlbaranesProveedor_controller:Clean;AlbaranesCliente_view:Clean;AlbProv_FacProv_relation:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PresupuestosCliente_model:Make;PresupuestosCliente_controller:Make;ContratosCliente_model:Make;ContratosCliente_data:Make;ContratosCliente_controller:Make;FacturasCliente_controller:Make;ConCli_FacCli_relation:Make;ConCli_AlbCli_relation:Make;ContratosCliente_view:Make;ContratosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PreCli_ConCli_relation:Make;PresupuestosCliente_view:Make;FacturasCliente_view:Make;AlbCli_FacCli_relation:Make;AlbaranesProveedor_view:Make;PedidosProveedor_model:Make;PedidosProveedor_view:Make;PedProv_AlbProv_relation:Make;AlbaranesProveedor_controller:Make" />
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PresupuestosCliente_model:Make;PresupuestosCliente_controller:Make;ContratosCliente_model:Make;ContratosCliente_data:Make;ContratosCliente_controller:Make;FacturasCliente_controller:Make;ConCli_FacCli_relation:Make;ConCli_AlbCli_relation:Make;PreCli_ConCli_relation:Make;ContratosCliente_view:Make;ContratosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make;FacturasCliente_view:Make;AlbCli_FacCli_relation:Make;AlbaranesProveedor_view:Make;PedidosProveedor_model:Make;PedidosProveedor_view:Make;PedProv_AlbProv_relation:Make;AlbaranesProveedor_controller:Make;AlbaranesCliente_view:Make;AlbProv_FacProv_relation:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

36
Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas
View File

@ -65,6 +65,9 @@ type
procedure EnviarContratoPorEMail(AContrato : IBizContratoCliente);
function CambiarSituacion(AContrato : IBizContratoCliente; Situacion: String; FechaDecision: TDateTime; AllItems: Boolean = false): Boolean;
procedure EtiquetasPreview(AContrato : IBizContratoCliente; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer);
procedure EtiquetasPrint(AContrato : IBizContratoCliente; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer);
function DarListaAnosContratos: TStringList;
procedure FiltrarAno(AContrato: IBizContratoCliente; ADynWhereDataTable: WideString; const Ano: String);
procedure VerListadoBeneficios;
@ -144,6 +147,9 @@ type
procedure EnviarContratoPorEMail(AContrato : IBizContratoCliente);
function CambiarSituacion(AContrato : IBizContratoCliente; Situacion: String; FechaDecision: TDateTime; AllItems: Boolean = false): Boolean;
procedure EtiquetasPreview(AContrato : IBizContratoCliente; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer);
procedure EtiquetasPrint(AContrato : IBizContratoCliente; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer);
function DarListaAnosContratos: TStringList;
procedure FiltrarAno(AContrato: IBizContratoCliente; ADynWhereDataTable: WideString; const Ano: String);
procedure VerListadoBeneficios;
@ -384,8 +390,8 @@ begin
with AContratoActual.Detalles do
begin
ACadena := '';
ACadena := 'Presupuesto ' + AListaPresupuestos.REFERENCIA + ' con fecha ' + DateToStr(AListaPresupuestos.FECHA_PRESUPUESTO) +' aceptado el ' + DateToStr(AListaPresupuestos.FECHA_DECISION);
ACadena := ACadena + #13 + ' referencia: ' + AListaPresupuestos.REFERENCIA_CLIENTE;
ACadena := 'Presupuesto ' + AListaPresupuestos.REFERENCIA + ' - ' + DateToStr(AListaPresupuestos.FECHA_PRESUPUESTO);
ACadena := ACadena + #13 + ' Ref. ' + AListaPresupuestos.REFERENCIA_CLIENTE;
Edit;
CONCEPTO := ACadena;
Post;
@ -974,6 +980,32 @@ begin
Result := True;
end;
procedure TContratosClienteController.EtiquetasPreview(AContrato: IBizContratoCliente; const AAgencia, AReferencia: String;
const ANumEtiquetas, AEtiquetaIni: Integer);
var
AReportController : IContratosClienteReportController;
begin
AReportController := TContratosClienteReportController.Create;
try
AReportController.EtiquetasPreview(AContrato.ID, AAgencia, AReferencia, ANumEtiquetas, AEtiquetaIni);
finally
AReportController := NIL;
end;
end;
procedure TContratosClienteController.EtiquetasPrint(AContrato: IBizContratoCliente; const AAgencia, AReferencia: String;
const ANumEtiquetas, AEtiquetaIni: Integer);
var
AReportController : IContratosClienteReportController;
begin
AReportController := TContratosClienteReportController.Create;
try
AReportController.EtiquetasPrint(AContrato.ID, AAgencia, AReferencia, ANumEtiquetas, AEtiquetaIni);
finally
AReportController := NIL;
end;
end;
procedure TContratosClienteController.RecalcularImportes(
AContrato: IBizContratoCliente);
var

57
Source/Modulos/Contratos de cliente/Controller/uContratosClienteReportController.pas
View File

@ -17,6 +17,8 @@ type
const VerImprimirPrecios: Boolean = False; const VerImprimirTotales: Boolean = False; const VerImprimirRefProveedor: Boolean = False;
const VerImprimirObservaciones: Boolean = False; const VerImprimirIncidencias: Boolean = False);
function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
procedure EtiquetasPreview(const AID : integer; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer = 1; const AEtiquetaIni: Integer = 1);
procedure EtiquetasPrint(const AID : integer; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer);
end;
TContratosClienteReportController = class(TControllerBase, IContratosClienteReportController)
@ -34,6 +36,8 @@ type
const VerImprimirPrecios: Boolean = False; const VerImprimirTotales: Boolean = False; const VerImprimirRefProveedor: Boolean = False;
const VerImprimirObservaciones: Boolean = False; const VerImprimirIncidencias: Boolean = False);
function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
procedure EtiquetasPreview(const AID : integer; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer = 1; const AEtiquetaIni: Integer = 1);
procedure EtiquetasPrint(const AID : integer; Const AAgencia: String; const AReferencia: String; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer);
end;
@ -65,6 +69,59 @@ begin
inherited;
end;
procedure TContratosClienteReportController.EtiquetasPreview(const AID: integer; const AAgencia, AReferencia: String; const ANumEtiquetas,
AEtiquetaIni: Integer);
var
AStream: Binary;
AEditor : IEditorContratosClientePreview;
begin
AEditor := NIL;
AStream := FDataModule.GetEtiquetas(AID, AAgencia, aReferencia, ANumEtiquetas, AEtiquetaIni);
try
CreateEditor('EditorContratosClientePreview', IEditorContratosClientePreview, AEditor);
if Assigned(AEditor) then
try
AEditor.LoadFromStream(AStream);
AEditor.Preview;
finally
AEditor.Release;
AEditor := NIL;
end;
finally
FreeAndNil(AStream);
end;
end;
procedure TContratosClienteReportController.EtiquetasPrint(const AID: integer; const AAgencia, AReferencia: String; const ANumEtiquetas,
AEtiquetaIni: Integer);
var
AStream: Binary;
AEditor : IEditorContratosClientePreview;
begin
AEditor := NIL;
ShowHourglassCursor;
try
AStream := FDataModule.GetEtiquetas(AID, AAgencia, AReferencia, ANumEtiquetas, AEtiquetaIni);
try
CreateEditor('EditorContratosClientePreview', IEditorContratosClientePreview, AEditor);
if Assigned(AEditor) then
try
AEditor.LoadFromStream(AStream);
AEditor.Print;
finally
AEditor.Release;
AEditor := Nil;
end;
finally
FreeAndNil(AStream);
end;
finally
HideHourglassCursor;
end;
end;
function TContratosClienteReportController.ExportToPDF(const AID: Integer;
const AFileName: String): Boolean;
{var

8
Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.pas
View File

@ -52,6 +52,8 @@ type
const VerImprimirPrecios: Boolean = False; const VerImprimirTotales: Boolean = False; const VerImprimirRefProveedor: Boolean = False;
const VerImprimirObservaciones: Boolean = False; const VerImprimirIncidencias: Boolean = False): Binary;
function GetEtiquetas(const AID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer): Binary;
function GetAnosItems : TStringList;
function GetContratosClienteBeneficios : IBizContratosClienteBeneficios;
end;
@ -181,6 +183,12 @@ begin
end;
function TDataModuleContratosCliente.GetEtiquetas(const AID: Integer; const AAgencia, ARefPedido: Variant; const ANumEtiquetas,
AEtiquetaIni: Integer): Binary;
begin
Result := (RORemoteService as IsrvContratosCliente).GenerarInformeEtiquetas(AID, AAgencia, ARefPedido, ANumEtiquetas, AEtiquetaIni)
end;
function TDataModuleContratosCliente.GetItem(const ID: Integer): IBizContratoCliente;
var
Condicion: TDAWhereExpression;

1
Source/Modulos/Contratos de cliente/Model/Data/uIDataModuleContratosClienteReport.pas
View File

@ -14,6 +14,7 @@ type
function GetRptPDFContrato(const AID: Integer; const VerLogotipo: Boolean;
const VerImprimirPrecios: Boolean = False; const VerImprimirTotales: Boolean = False; const VerImprimirRefProveedor: Boolean = False;
const VerImprimirObservaciones: Boolean = False; const VerImprimirIncidencias: Boolean = False): Binary;
function GetEtiquetas(const AID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer): Binary;
end;
implementation

28
Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
View File

@ -9,13 +9,13 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_Valores = '{00950C9F-3C0E-4384-8F5F-8D5B986FFD3C}';
RID_Propiedades = '{FD2B8573-731E-425A-AFCD-43695556F4F9}';
RID_ListaAnosContratos = '{D12AE8AC-742F-4849-8CDB-1DFBDF17CB3E}';
RID_ContratosClienteBeneficios = '{BFD9857D-FFF0-4664-8ABF-742B1783C4F5}';
RID_ContratosCliente = '{B04C1A81-6448-4F1C-94BF-3799E0433F6D}';
RID_TiposCapitulos = '{1928D386-F965-4F72-9277-50CBFEF81572}';
RID_ContratosCliente_Detalles = '{3FC0F387-A276-49DC-85A1-7970110566CE}';
RID_Valores = '{F8B6F26D-032D-4A9A-86BC-3653978ECE17}';
RID_Propiedades = '{C4AE18DF-6020-4467-BF22-4BDBC7E303CA}';
RID_ListaAnosContratos = '{907EAF2B-5DAA-4CA2-8629-F8A08A77F1BD}';
RID_ContratosClienteBeneficios = '{09EDCDAA-B1DE-4EE3-BE2B-CD3E5E13E09A}';
RID_ContratosCliente = '{F8E2106B-A375-4CF2-9588-3B6E681FAB37}';
RID_TiposCapitulos = '{37F9F608-A228-4CBD-BDAE-F23B0A86E5A5}';
RID_ContratosCliente_Detalles = '{7171D48A-CEAE-4E75-989D-1E2B42144FA1}';
{ Data table names }
nme_Valores = 'Valores';
@ -261,7 +261,7 @@ const
type
{ IValores }
IValores = interface(IDAStronglyTypedDataTable)
['{5D9011E6-D896-4A0E-A54D-4EEBBDCDCB2D}']
['{AC9EB3D4-F956-46D3-85DE-B58EDFCA3A6F}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -320,7 +320,7 @@ type
{ IPropiedades }
IPropiedades = interface(IDAStronglyTypedDataTable)
['{67303838-FB10-4B4D-93AC-7AE3E8DFF959}']
['{0E9D305B-8105-4698-B5E6-81D5BCEC50D1}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -379,7 +379,7 @@ type
{ IListaAnosContratos }
IListaAnosContratos = interface(IDAStronglyTypedDataTable)
['{C04F03C6-E41E-406B-BCC7-21F80327A0CE}']
['{573A0052-813A-4526-A721-0BF791519BC9}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@ -414,7 +414,7 @@ type
{ IContratosClienteBeneficios }
IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
['{310BF2BD-F3AB-49EB-B1AD-95EB739E4084}']
['{B62B9CFF-5CF7-4A23-9C52-D6C4A49050B4}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -617,7 +617,7 @@ type
{ IContratosCliente }
IContratosCliente = interface(IDAStronglyTypedDataTable)
['{17F07CFD-CE56-41C1-ABA3-84A2003212C5}']
['{6851D77E-DDB5-4088-A8F0-8363CCD53AA1}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1327,7 +1327,7 @@ type
}
{ ITiposCapitulos }
ITiposCapitulos = interface(IDAStronglyTypedDataTable)
['{92B0A9C9-D2F7-45F7-888B-FEB043E3FB23}']
['{A2E853A0-E31D-4D44-9855-820CDFFC36EE}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1422,7 +1422,7 @@ type
{ IContratosCliente_Detalles }
IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{C7692BDF-2B09-4581-A624-AD101BAF3417}']
['{2FC1C803-A267-4C6A-8ABD-41D00BA4338C}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);

28
Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas
View File

@ -9,18 +9,18 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_ValoresDelta = '{A722C059-2F12-41F9-A113-93534ABBC807}';
RID_PropiedadesDelta = '{68873676-2EA3-47C8-B322-707CD8A8B7D3}';
RID_ListaAnosContratosDelta = '{A56B54B6-30F0-4BA4-927A-8C6E54F746CA}';
RID_ContratosClienteBeneficiosDelta = '{21A88120-1D73-4516-8DDB-C7075C1FFD8D}';
RID_ContratosClienteDelta = '{124CFEA1-C11A-4838-93D3-83F30385BD57}';
RID_TiposCapitulosDelta = '{8A04F5B4-9934-4228-B499-05697F987ED3}';
RID_ContratosCliente_DetallesDelta = '{5C443914-A231-4D30-840D-BA25D9E47768}';
RID_ValoresDelta = '{F01C60FF-A9FF-4C56-A1B5-00F28F30BA67}';
RID_PropiedadesDelta = '{28AC15F6-D117-4ACE-A740-B50E05B0CFF0}';
RID_ListaAnosContratosDelta = '{CAF4B4B2-6B63-4B1A-BAC0-4011A5E53F6C}';
RID_ContratosClienteBeneficiosDelta = '{1F2067BF-7070-4B04-BC79-AA2ACB1DBA6F}';
RID_ContratosClienteDelta = '{95CAE9B6-D652-4987-AFB2-57DC7C73D22A}';
RID_TiposCapitulosDelta = '{F2B25CC5-1DB9-4100-8041-BA5742867047}';
RID_ContratosCliente_DetallesDelta = '{EA940846-A19E-43E6-865E-BD60E06F5EEC}';
type
{ IValoresDelta }
IValoresDelta = interface(IValores)
['{A722C059-2F12-41F9-A113-93534ABBC807}']
['{F01C60FF-A9FF-4C56-A1B5-00F28F30BA67}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_PROPIEDADValue : Integer;
@ -78,7 +78,7 @@ type
{ IPropiedadesDelta }
IPropiedadesDelta = interface(IPropiedades)
['{68873676-2EA3-47C8-B322-707CD8A8B7D3}']
['{28AC15F6-D117-4ACE-A740-B50E05B0CFF0}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -136,7 +136,7 @@ type
{ IListaAnosContratosDelta }
IListaAnosContratosDelta = interface(IListaAnosContratos)
['{A56B54B6-30F0-4BA4-927A-8C6E54F746CA}']
['{CAF4B4B2-6B63-4B1A-BAC0-4011A5E53F6C}']
{ Property getters and setters }
function GetOldANOValue : String;
@ -170,7 +170,7 @@ type
{ IContratosClienteBeneficiosDelta }
IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
['{21A88120-1D73-4516-8DDB-C7075C1FFD8D}']
['{1F2067BF-7070-4B04-BC79-AA2ACB1DBA6F}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldREFERENCIAValue : String;
@ -372,7 +372,7 @@ type
{ IContratosClienteDelta }
IContratosClienteDelta = interface(IContratosCliente)
['{124CFEA1-C11A-4838-93D3-83F30385BD57}']
['{95CAE9B6-D652-4987-AFB2-57DC7C73D22A}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -1082,7 +1082,7 @@ type
{ ITiposCapitulosDelta }
ITiposCapitulosDelta = interface(ITiposCapitulos)
['{8A04F5B4-9934-4228-B499-05697F987ED3}']
['{F2B25CC5-1DB9-4100-8041-BA5742867047}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldPOSICIONValue : Integer;
@ -1176,7 +1176,7 @@ type
{ IContratosCliente_DetallesDelta }
IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
['{5C443914-A231-4D30-840D-BA25D9E47768}']
['{EA940846-A19E-43E6-865E-BD60E06F5EEC}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTRATOValue : Integer;

28
Source/Modulos/Contratos de cliente/Model/uBizContratosClienteServer.pas
View File

@ -15,6 +15,8 @@ type
FReferenciaAutomatica : Boolean;
function DarReferencia : String;
function IncrementarReferencia : Boolean;
procedure LiberarPresupuestosDelContrato(aChange: TDADeltaChange);
protected
procedure BeforeProcessDelta(Sender: TDABusinessProcessor;
const aDelta: IDADelta); override;
@ -50,6 +52,10 @@ begin
FReferenciaAutomatica := False;
end;
end;
ctDelete: begin
LiberarPresupuestosDelContrato(aChange);
end;
end;
end;
@ -102,6 +108,28 @@ begin
Result := AReferenciasService.IncrementarValorReferencia(ACodigoReferencia, Self.REFERENCIA, ID_EMPRESA, ID_TIENDA)
end;
procedure TBizContratosClienteServer.LiberarPresupuestosDelContrato(aChange: TDADeltaChange);
var
ASchema : TDASchema;
ACurrentConn : IDAConnection;
ACommand : IDASQLCommand;
begin
ASchema := BusinessProcessor.Schema;
ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
//En el caso de borrar un contrato se comprueban los presupuestos asociados para liberarlos para generar otro contrato.
ACommand := ASchema.NewCommand(ACurrentConn, 'LiberarPresupuestosDelContrato');
try
with ACommand do
begin
ParamByName('ID_CONTRATO').Value := aChange.OldValueByName[fld_ContratosClienteID];
Execute;
end;
finally
ACommand := NIL;
end;
end;
initialization
RegisterBusinessProcessorRules(BIZ_SERVER_CONTRATOS_CLIENTE, TBizContratosClienteServer);

236
Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm
View File

@ -201,6 +201,140 @@ object RptContratosCliente: TRptContratosCliente
DataType = datBlob
end>
end
item
Params = <
item
Name = 'ID_CONTRATO'
Value = ''
end
item
Name = 'REF_PEDIDO'
Value = ''
end
item
Name = 'AGENCIA'
Value = ''
end
item
Name = 'NUM_ETIQUETAS'
Value = ''
end
item
Name = 'ETIQUETA_INI'
Value = ''
end>
Statements = <
item
Connection = 'IBX'
ConnectionType = 'Interbase'
Default = True
Name = 'IBX'
SQL =
'select *'#10'from PROC_ETIQUETAS_CONTRATO(:ID_CONTRATO, :REF_PEDIDO,' +
' :AGENCIA, :NUM_ETIQUETAS, :ETIQUETA_INI)'#10#10
StatementType = stSQL
ColumnMappings = <
item
DatasetField = 'AGENCIA'
TableField = 'AGENCIA'
end
item
DatasetField = 'BULTO'
TableField = 'BULTO'
end
item
DatasetField = 'NUM_BULTOS'
TableField = 'NUM_BULTOS'
end
item
DatasetField = 'DESTINATARIO'
TableField = 'DESTINATARIO'
end
item
DatasetField = 'TELEFONO'
TableField = 'TELEFONO'
end
item
DatasetField = 'CALLE'
TableField = 'CALLE'
end
item
DatasetField = 'CODIGO_POSTAL'
TableField = 'CODIGO_POSTAL'
end
item
DatasetField = 'POBLACION'
TableField = 'POBLACION'
end
item
DatasetField = 'PROVINCIA'
TableField = 'PROVINCIA'
end
item
DatasetField = 'REF_PEDIDO'
TableField = 'REF_PEDIDO'
end
item
DatasetField = 'REF_CLIENTE'
TableField = 'REF_CLIENTE'
end>
end>
Name = 'Informe_Detalles_Etiquetas'
Fields = <
item
Name = 'AGENCIA'
DataType = datString
Size = 255
end
item
Name = 'BULTO'
DataType = datInteger
end
item
Name = 'NUM_BULTOS'
DataType = datInteger
end
item
Name = 'DESTINATARIO'
DataType = datString
Size = 255
end
item
Name = 'TELEFONO'
DataType = datString
Size = 255
end
item
Name = 'CALLE'
DataType = datString
Size = 255
end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 255
end
item
Name = 'POBLACION'
DataType = datString
Size = 255
end
item
Name = 'PROVINCIA'
DataType = datString
Size = 255
end
item
Name = 'REF_PEDIDO'
DataType = datString
Size = 255
end
item
Name = 'REF_CLIENTE'
DataType = datString
Size = 255
end>
end
item
Params = <
item
@ -1694,4 +1828,106 @@ object RptContratosCliente: TRptContratosCliente
Left = 352
Top = 304
end
object frxDBEtiquetas: TfrxDBDataset
UserName = 'frxDBEtiquetas'
CloseDataSource = False
DataSource = DADataEtiquetas
BCDToCurrency = False
Left = 528
Top = 16
end
object DADataEtiquetas: TDADataSource
DataSet = tbl_Etiquetas.Dataset
DataTable = tbl_Etiquetas
Left = 528
Top = 72
end
object tbl_Etiquetas: TDAMemDataTable
RemoteUpdatesOptions = []
Fields = <
item
Name = 'AGENCIA'
DataType = datString
Size = 255
end
item
Name = 'BULTO'
DataType = datInteger
end
item
Name = 'NUM_BULTOS'
DataType = datInteger
end
item
Name = 'DESTINATARIO'
DataType = datString
Size = 255
end
item
Name = 'TELEFONO'
DataType = datString
Size = 255
end
item
Name = 'CALLE'
DataType = datString
Size = 255
end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 255
end
item
Name = 'POBLACION'
DataType = datString
Size = 255
end
item
Name = 'PROVINCIA'
DataType = datString
Size = 255
end
item
Name = 'REF_PEDIDO'
DataType = datString
Size = 255
end
item
Name = 'REF_CLIENTE'
DataType = datString
Size = 255
end>
Params = <
item
Name = 'ID_CONTRATO'
Value = ''
end
item
Name = 'REF_PEDIDO'
Value = ''
end
item
Name = 'AGENCIA'
Value = ''
end
item
Name = 'NUM_ETIQUETAS'
Value = ''
end
item
Name = 'ETIQUETA_INI'
Value = ''
end>
MasterMappingMode = mmDataRequest
LogChanges = False
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = DABin2DataStreamer1
LogicalName = 'Informe_Detalles_Etiquetas'
IndexDefs = <>
Left = 528
Top = 128
end
end

40
Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.pas
View File

@ -69,6 +69,9 @@ type
tbl_Condiciones: TDAMemDataTable;
schReport: TDASchema;
DataDictionary: TDADataDictionary;
frxDBEtiquetas: TfrxDBDataset;
DADataEtiquetas: TDADataSource;
tbl_Etiquetas: TDAMemDataTable;
procedure DataModuleCreate(Sender: TObject);
procedure DataModuleDestroy(Sender: TObject);
function frxReportUserFunction(const MethodName: string;
@ -101,6 +104,7 @@ type
function GenerarContratoEnPDF(const ListaID : TIntegerArray; const NombreEmpresa: AnsiString;
const VerLogotipo: Boolean = True; const VerPrecios: Boolean = True; const VerTotales: Boolean = True): Binary;
function GenerarInformeListadoContratos(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
function GenerarEtiquetas(const AID : Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer; const AEtiquetaIni: Integer): Binary;
end;
implementation
@ -116,6 +120,7 @@ const
rptInforme = 'InfContratoCliente.fr3';
rptInformeListadoContratosDesglosado = 'InformeListadoContratosDesglosado.fr3';
rptInformeListadoContratos = 'InformeListadoContratos.fr3';
rptInfEtiquetas = 'InfEtiquetasContratoCliente.fr3';
{ Dataset names for schReport }
ds_InformeListadoContratosResumen = 'InformeListadoContratosResumen';
@ -170,6 +175,41 @@ begin
end;
end;
function TRptContratosCliente.GenerarEtiquetas(const AID: Integer;
const AAgencia, ARefPedido: Variant; const ANumEtiquetas,
AEtiquetaIni: Integer): Binary;
var
AInforme: Variant;
begin
Result := Binary.Create;
FConnection.BeginTransaction;
try
tbl_Etiquetas.ParamByName('ID_CONTRATO').AsInteger := AID;
tbl_Etiquetas.ParamByName('AGENCIA').AsString := AAgencia;
tbl_Etiquetas.ParamByName('REF_PEDIDO').AsString := ARefPedido;
tbl_Etiquetas.ParamByName('NUM_ETIQUETAS').AsInteger := ANumEtiquetas;
tbl_Etiquetas.ParamByName('ETIQUETA_INI').AsInteger := AEtiquetaIni;
tbl_Etiquetas.Active := True;
AInforme := DarRutaFichero(DarRutaInformes, rptInfEtiquetas, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString);
if VarIsNull(AInforme) then
raise Exception.Create (('Error Servidor: GenerarEtiquetas, no encuentra informe' + rptInfEtiquetas));
frxReport.LoadFromFile(AInforme, True);
// if withRefCliente then
// frxReport.Variables.Variables['withRefCliente'] := 1
// else
// frxReport.Variables.Variables['withRefCliente'] := 0;
frxReport.PrepareReport(False);
frxReport.PreviewPages.SaveToStream(Result);
finally
FConnection.RollbackTransaction;
end;
end;
procedure TRptContratosCliente.IniciarParametrosInforme;
var
ATextos : TStringList;

22
Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm
View File

@ -1366,6 +1366,28 @@ object srvContratosCliente: TsrvContratosCliente
end>
Name = 'Insert_ContratosCliente'
end
item
Params = <
item
Name = 'ID_CONTRATO'
DataType = datInteger
Value = ''
end>
Statements = <
item
Connection = 'IBX'
ConnectionType = 'Interbase'
Default = True
TargetTable = 'PRESUPUESTOS_CLIENTE'
Name = 'IBX'
SQL =
'UPDATE PRESUPUESTOS_CLIENTE'#10'SET ID_CONTRATO = NULL'#10'WHERE ID_CONT' +
'RATO = :ID_CONTRATO'#10
StatementType = stSQL
ColumnMappings = <>
end>
Name = 'LiberarPresupuestosDelContrato'
end
item
Params = <
item

18
Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.pas
View File

@ -35,7 +35,8 @@ type
{ IsrvContratosCliente methods }
function GenerarInforme(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean; const VerPrecios: Boolean; const VerTotales: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean; const VerPrecios: Boolean; const VerTotales: Boolean): Binary;
function GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary;
end;
implementation
@ -104,6 +105,21 @@ begin
end;
end;
function TsrvContratosCliente.GenerarInformeEtiquetas(const ID: Integer;
const AAgencia, ARefPedido: Variant; const ANumEtiquetas,
AEtiquetaIni: Integer): Binary;
var
AReportGenerator : TRptContratosCliente;
begin
AReportGenerator := TRptContratosCliente.Create(nil);
try
Result := AReportGenerator.GenerarEtiquetas(ID, AAgencia, ARefPedido, ANumEtiquetas, AEtiquetaIni);
finally
FreeAndNIL(AReportGenerator);
end;
end;
initialization
TROClassFactory.Create('srvContratosCliente', Create_srvContratosCliente, TsrvContratosCliente_Invoker);

3
Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk
View File

@ -95,6 +95,7 @@ contains
uEditorContratosClienteBeneficios in 'uEditorContratosClienteBeneficios.pas' {fEditorContratosClienteBeneficios: TFrame},
uDialogOpcionesImpresionContratosCliente in 'uDialogOpcionesImpresionContratosCliente.pas' {fDialogOpcionesImpresionContratosCliente: T},
uViewDireccionEntregaContratoCli in 'uViewDireccionEntregaContratoCli.pas' {frViewDireccionEntregaContratoCli: TFrame},
uEditorDireccionEntregaContratoCliente in 'uEditorDireccionEntregaContratoCliente.pas' {fEditorDireccionEntregaContratoCliente: TFrame};
uEditorDireccionEntregaContratoCliente in 'uEditorDireccionEntregaContratoCliente.pas' {fEditorDireccionEntregaContratoCliente: TFrame},
uDialogOpcionesImpresionEtiquetasContratosCliente in 'uDialogOpcionesImpresionEtiquetasContratosCliente.pas' {fDialogOpcionesImpresionEtiquetasContratosCliente: TfDialogOpcionesImpresionEtiquetasContratosCliente};
end.

108
Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj
View File

@ -49,63 +49,60 @@
<DelphiCompile Include="ContratosCliente_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\Lib\adortl.dcp" />
<DCCReference Include="..\..\Lib\Articulos_view.dcp" />
<DCCReference Include="..\..\Lib\Base.dcp" />
<DCCReference Include="..\..\Lib\ConCli_AlbCli_relation.dcp" />
<DCCReference Include="..\..\Lib\ConCli_FacCli_relation.dcp" />
<DCCReference Include="..\..\Lib\ContratosCliente_controller.dcp" />
<DCCReference Include="..\..\Lib\ContratosCliente_model.dcp" />
<DCCReference Include="..\..\Lib\cxDataD11.dcp" />
<DCCReference Include="..\..\Lib\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Lib\cxExportD11.dcp" />
<DCCReference Include="..\..\Lib\cxExtEditorsD11.dcp" />
<DCCReference Include="..\..\Lib\cxGridD11.dcp" />
<DCCReference Include="..\..\Lib\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Lib\cxPageControlD11.dcp" />
<DCCReference Include="..\..\Lib\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\dbrtl.dcp" />
<DCCReference Include="..\..\Lib\dclcxLibraryD11.dcp" />
<DCCReference Include="..\..\Lib\dcldxCoreD11.dcp" />
<DCCReference Include="..\..\Lib\designide.dcp" />
<DCCReference Include="..\..\Lib\dsnap.dcp" />
<DCCReference Include="..\..\Lib\dxComnD11.dcp" />
<DCCReference Include="..\..\Lib\dxCoreD11.dcp" />
<DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Lib\dxLayoutControlD11.dcp" />
<DCCReference Include="..\..\Lib\dxPSCoreD11.dcp" />
<DCCReference Include="..\..\Lib\dxPScxCommonD11.dcp" />
<DCCReference Include="..\..\Lib\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\..\Lib\dxPSLnksD11.dcp" />
<DCCReference Include="..\..\Lib\dxThemeD11.dcp" />
<DCCReference Include="..\..\Lib\GestorInformes_controller.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\GUISDK_D11R.dcp" />
<DCCReference Include="..\..\Lib\Jcl.dcp" />
<DCCReference Include="..\..\Lib\JclVcl.dcp" />
<DCCReference Include="..\..\Lib\JvCoreD11R.dcp" />
<DCCReference Include="..\..\Lib\JvPageCompsD11R.dcp" />
<DCCReference Include="..\..\Lib\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\..\Lib\JvSystemD11R.dcp" />
<DCCReference Include="..\..\Lib\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Lib\PNG_D10.dcp" />
<DCCReference Include="..\..\Lib\PreCli_ConCli_relation.dcp" />
<DCCReference Include="..\..\Lib\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\rtl.dcp" />
<DCCReference Include="..\..\Lib\tb2k_d10.dcp" />
<DCCReference Include="..\..\Lib\tbx_d10.dcp" />
<DCCReference Include="..\..\Lib\vcl.dcp" />
<DCCReference Include="..\..\Lib\vclactnband.dcp" />
<DCCReference Include="..\..\Lib\vcldb.dcp" />
<DCCReference Include="..\..\Lib\vcljpg.dcp" />
<DCCReference Include="..\..\Lib\vclshlctrls.dcp" />
<DCCReference Include="..\..\Lib\vclx.dcp" />
<DCCReference Include="..\..\Lib\xmlrtl.dcp" />
<DCCReference Include="adortl.dcp" />
<DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="Base.dcp" />
<DCCReference Include="ConCli_AlbCli_relation.dcp" />
<DCCReference Include="ConCli_FacCli_relation.dcp" />
<DCCReference Include="ContratosCliente_controller.dcp" />
<DCCReference Include="ContratosCliente_model.dcp" />
<DCCReference Include="cxDataD11.dcp" />
<DCCReference Include="cxEditorsD11.dcp" />
<DCCReference Include="cxExportD11.dcp" />
<DCCReference Include="cxExtEditorsD11.dcp" />
<DCCReference Include="cxGridD11.dcp" />
<DCCReference Include="cxLibraryD11.dcp" />
<DCCReference Include="cxPageControlD11.dcp" />
<DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="dbrtl.dcp" />
<DCCReference Include="dclcxLibraryD11.dcp" />
<DCCReference Include="dcldxCoreD11.dcp" />
<DCCReference Include="designide.dcp" />
<DCCReference Include="dsnap.dcp" />
<DCCReference Include="dxComnD11.dcp" />
<DCCReference Include="dxCoreD11.dcp" />
<DCCReference Include="dxGDIPlusD11.dcp" />
<DCCReference Include="dxLayoutControlD11.dcp" />
<DCCReference Include="dxPSCoreD11.dcp" />
<DCCReference Include="dxPScxCommonD11.dcp" />
<DCCReference Include="dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="dxPSLnksD11.dcp" />
<DCCReference Include="dxThemeD11.dcp" />
<DCCReference Include="GestorInformes_controller.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="GUISDK_D11R.dcp" />
<DCCReference Include="Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" />
<DCCReference Include="JvPageCompsD11R.dcp" />
<DCCReference Include="JvStdCtrlsD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" />
<DCCReference Include="PngComponentsD10.dcp" />
<DCCReference Include="PNG_D10.dcp" />
<DCCReference Include="PreCli_ConCli_relation.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="tb2k_d10.dcp" />
<DCCReference Include="tbx_d10.dcp" />
<DCCReference Include="uContratosClienteViewRegister.pas" />
<DCCReference Include="uDialogOpcionesImpresionContratosCliente.pas">
<Form>fDialogOpcionesImpresionContratosCliente</Form>
<DesignClass>T</DesignClass>
</DCCReference>
<DCCReference Include="uDialogOpcionesImpresionEtiquetasContratosCliente.pas">
<Form>fDialogOpcionesImpresionEtiquetasContratosCliente</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="uEditorContratoCliente.pas">
<Form>fEditorPresupuestoCliente</Form>
<DesignClass>TfEditorPedidoCliente</DesignClass>
@ -166,6 +163,13 @@
<Form>frViewElegirArticulosContratosCliente</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclshlctrls.dcp" />
<DCCReference Include="vclx.dcp" />
<DCCReference Include="xmlrtl.dcp" />
</ItemGroup>
</Project>
<!-- EurekaLog First Line

549
Source/Modulos/Contratos de cliente/Views/uDialogOpcionesImpresionEtiquetasContratosCliente.dfm Normal file
View File

@ -0,0 +1,549 @@
inherited fDialogOpcionesImpresionEtiquetasContratosCliente: TfDialogOpcionesImpresionEtiquetasContratosCliente
Caption = 'Opciones para el contrato de cliente'
ClientHeight = 391
ClientWidth = 502
ExplicitWidth = 508
ExplicitHeight = 427
PixelsPerInch = 96
TextHeight = 13
inherited Bevel2: TBevel
Width = 502
ExplicitWidth = 393
end
inherited Bevel3: TBevel
Top = 347
Width = 502
ExplicitTop = 195
ExplicitWidth = 393
end
inherited pnlBotones: TPanel
Top = 349
Width = 502
ExplicitTop = 349
ExplicitWidth = 502
inherited btnAceptar: TButton
Left = 318
ExplicitLeft = 318
end
inherited btnCancelar: TButton
Left = 397
ExplicitLeft = 397
end
end
inherited pnlHeader: TPanel
Width = 502
ExplicitWidth = 502
inherited lblTitle: TLabel
Width = 452
Caption = 'Indique las siguiente opciones para la impresi'#243'n de etiquetas:'
ExplicitWidth = 348
end
inherited lblComments: TLabel
Width = 427
Height = 27
Visible = False
end
end
inherited pnlCuerpo: TPanel
Width = 502
Height = 281
ExplicitWidth = 502
ExplicitHeight = 281
object Label1: TLabel
Left = 25
Top = 29
Width = 42
Height = 13
Caption = 'Agencia:'
end
object Label2: TLabel
Left = 25
Top = 76
Width = 50
Height = 13
Caption = 'Pedido n'#186':'
end
object Label3: TLabel
Left = 25
Top = 129
Width = 104
Height = 13
Caption = 'N'#250'mero de etiquetas:'
end
object Image1: TImage
AlignWithMargins = True
Left = 276
Top = -1
Width = 197
Height = 276
Picture.Data = {
0A544A504547496D6167659B330000FFD8FFE000104A46494600010200006400
640000FFEC00114475636B79000100040000003C0000FFEE000E41646F626500
64C000000001FFDB0084000604040405040605050609060506090B080606080B
0C0A0A0B0A0A0C100C0C0C0C0C0C100C0E0F100F0E0C1313141413131C1B1B1B
1C1F1F1F1F1F1F1F1F1F1F010707070D0C0D181010181A1511151A1F1F1F1F1F
1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
1F1F1F1F1F1F1F1F1F1F1F1FFFC00011080220018003011100021101031101FF
C400930001010101010101010100000000000000000807030605040102010101
00000000000000000000000000000001100001020400060F06040304060A0300
000001020304050611915607081821D11292B2D213D3145474945516383141B4
E475365161223271421581522333A1728243341762A253B3242585A5B5579395
2611010100000000000000000000000000000001FFDA000C0301000211031100
3F00D2B399A4B5AB9BFBA625B952A5CFCDCD43830E3AC696E4793548A8AA89FA
DED5C2983F003CAEBB361F80D5714BF3A035D9B0FC06AB8A5F9D01AECD87E035
5C52FCE80D766C3F01AAE297E7406BB361F80D5714BF3A035D9B0FC06AB8A5F9
D01AECD87E0355C52FCE80D766C3F01AAE297E7406BB361F80D5714BF3A035D9
B0FC06AB8A5F9D01AECD87E0355C52FCE80D766C3F01AAE297E7406BB361F80D
5714BF3A035D9B0FC06AB8A5F9D01AECD87E0355C52FCE80D766C3F01AAE297E
7406BB361F80D5714BF3A035D9B0FC06AB8A5F9D01AECD87E0355C52FCE80D76
6C3F01AAE297E7406BB361F80D5714BF3A035D9B0FC06AB8A5F9D03F9AECD85E
0355C52FCE81FDD766C3F01AAE297E7406BB361F80D5714BF3A035D9B0FC06AB
8A5F9D01AECD87E0355C52FCE80D766C3F01AAE297E7406BB361F80D5714BF3A
035D9B0FC06AB8A5F9D01AECD87E0355C52FCE80D766C3F01AAE297E7406BB36
1F80D5714BF3A035D9B0FC06AB8A5F9D01AECD87E0355C52FCE80D766C3F01AA
E297E7406BB361F80D5714BF3A035D9B0FC06AB8A5F9D01AECD87E0355C52FCE
80D766C3F01AAE297E7406BB361F80D5714BF3A035D9B0FC06AB8A5F9D01AECD
87E0355C52FCE80D766C3F01AAE297E7406BB361F80D5714BF3A035D9B0FC06A
B8A5F9D03D9E6A7488B6739170CC50E974C9D9398979574E3A24D725B8563223
21AB5370F7AE1C31100CF2E3631FA6950DAF6A39AB26985AE4C29FF031FF0010
292E8123D5E16F1BB403A048F5785BC6ED00E8123D5E16F1BB403A048F5785BC
6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5E16F1BB403A048F5785
BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5E16F1BB403A048F57
85BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5E16F1BB403A048F
5785BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5E16F1BB403A04
8F5785BC6ED00E8123D5E16F1BB403A048F5785BC6ED018D694D2B2D0EC8A22C
382C62AD764D155AD44D8DCC5FC100D97A0C975785BC6ED00E8123D5E16F1BB4
03A048F5785BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5E16F1B
B403A048F5785BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5E16F
1BB403A048F5785BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5E1
6F1BB403A048F5785BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123D5
E16F1BB403A048F5785BC6ED00E8123D5E16F1BB403A048F5785BC6ED00E8123
D5E16F1BB403A048F5785BC6ED013AE6BDAD6E96D7EB5A88D6A4945C0889813F
CC94038DC1EB5687D8D3E063814B800000000000000000000000000000000000
00318D2A7EC7A27D7A4B83140D9C000000000000000000000000000000000000
00026FCD97AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C000000000000000
000000000000000000000018C6953F63D13EBD25C18A06CE0000000000000000
00000000000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818
E052E00000000000000000000000000000000000000C634A9FB1E89F5E92E0C5
036700000000000000000000000000000000000000009BF365EAE2FEEC517872
8070B83D6AD0FB1A7C0C70297000000000000000000000000000000000000006
31A54FD8F44FAF49706281B38000000000000000000000000000000000000000
4DF9B2F5717F7628BC3940385C1EB5687D8D3E063814B800000000000000003C
05F39EBB46CDBB28D6B54E0CE4C54EB6B0925FA2320BD90D2346E458B1B77161
B9A8AEFC1ABB0807BF0000000000000000000C634A9FB1E89F5E92E0C5036700
00000000000003F255EA72F4AA54ED4E651CB2D21022CCC646222B959058AF76
E515530AE06EC6C8133CF698D7055675F2B65D99127118985AE8EE891E2AA61F
DCE812CDFD3BF503A5BDA63D4252B2DA75FB6C3A970D55122C79648AC8B0B0AE
0473A5A3A6E95BF8E0761FC1140A629F3F255191979F918CD98929B86D8D2D1E
1AE16BE1C444735CD5FC15140EE000000000000000009BF365EAE2FEEC517872
8070B83D6AD0FB1A7C0C702970000000000000003C16776DECE956E97230337D
5B97A24E438CE74F469973988F84ACC0D6B55B066170A3B67D880483715A179D
AD9F0B7A4AF1A9C3ABD6E667A9D3716761C68D308E6449A46B515F1D909F8537
1ECC18113D805F600000000000000000018C6953F63D13EBD25C18A06CE00000
00000000007E7A953E56A34E9AA7CDB37729390624BCC31155AAE8715AAC7A61
4C0A985ABEE03F3D0ADDA15BF4E874DA24840A748C24C0C97976361B7F8AE0FD
CABEF55D95031BD30681489CCD62D5E3C267F52A64DC0E853181394DCC67F271
21EEBDBB9722EE953F16A01F574519C9C99CCB529B32E73DB2F1E6A0CBB9D870
F24D8CE722615F6A22B9513101AF8000000000000000026FCD97AB8BFBB145E1
CA01C2E0F5AB43EC69F031C0A5C000000000000000011FE90FEA66D6FF00D23E
31C058000000000000000000018C6953F63D13EBD25C18A06CE0000000000000
00000123692B7FCE670AEFA6E6BECE67F504959B4E94E85B29167D11D0F71BAF
6243976B9DBB77B30E1C3FB70814BE6EECE95B32CAA45B32CEDDB69D0119162A
7B22467AAC48D113F27C57B9500F44000000000000000009BF365EAE2FEEC517
8728070B83D6AD0FB1A7C0C702970000000000000000047FA43FA99B5BFF0048
F8C701600000000000000000000631A54FD8F44FAF49706281B3800000000000
00000278CFF67E67214DBB3759BFDDCEDCF3EEE893B372B85EE80E89FA560405
6FFBF5FE677FBBFF005BF687A8CC0E61E4B3794CFEA75548735774F313A54C26
0736598ED958105DC37A7EE5FC900D7C00000000000000000026FCD97AB8BFBB
145E1CA01C2E0F5AB43EC69F031C0A5C000000000000000CFF003C19E0A666CA
994F9F9FA7C6A843A8467406320398C56AB19BBC2BBB0240CE667829977E75E8
F7ACB53E3CACA537A17292911CC74477448EB15D815BFA7F522E04029BCD6E92
F41CE15D6CB764A8D35251DF062C7E5E34486E6224244554C0DD9C2B840D9000
0000000000000018C6953F63D13EBD25C18A06CE000000000000000794CEBC5B
82166E2E17DBA930EADF4388922926C74498E51D813FC26B11CEDD6055C1B94C
204779B37E7AB37B3B3351A4E6DA627AA933B1FD46A348A9C68F0D8A9FA99096
1BA13588EFE65C1857DEB800D1BFE7EE94DFFD73FF00B2D5F9E0355CC65FD9D3
BB7FADF9F2DCF2FF0042E8BFD37FF053725CB72BCB72DFF14F89BBDC726CFDBE
CC3B3ED40354000000000000000004DF9B2F5717F7628BC3940385C1EB5687D8
D3E063814B80000000000000000000000000000000000000318D2A7EC7A27D7A
4B83140D9C00000000000000000000000000000000000000026FCD97AB8BFBB1
45E1CA01C2E0F5AB43EC69F031C0A5C000000000000000000000000000000000
000018C6953F63D13EBD25C18A06CE0000000000000000000000000000000000
00000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818E052E0000000000000
0000000000000000000000000C634A9FB1E89F5E92E0C5036700000000000000
000000000000000000000000009BF365EAE2FEEC5178728070B83D6AD0FB1A7C
0C7029700000000000000000000000000000000000000631A54FD8F44FAF4970
6281B380000000000000000000000000000000000000004DF9B2F5717F7628BC
3940385C1EB5687D8D3E063814B8000000000000000000000000000000000000
0318D2A7EC7A27D7A4B83140D9C0000000000000000000000000000000000000
0026FCD97AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C0000000000000000
00000000000000000000018C6953F63D13EBD25C18A06CE00000000000000000
0000000000000000000000137E6CBD5C5FDD8A2F0E500F3F9CE96BA2674B3A74
0B5A6E048D75F250FA1CD4D3777058A92B155FBA6EE5F870B3749EC034AF2DE9
4D95B43EEBF2E03CB7A53656D0FBAFCB80F2DE94D95B43EEBF2E03CB7A53656D
0FBAFCB80F2DE94D95B43EEBF2E03CB7A53656D0FBAFCB80F2DE94D95B43EEBF
2E03CB7A53656D0FBAFCB80F2DE94D95B43EEBF2E03CB7A53656D0FBAFCB80F2
DE94D95B43EEBF2E03CB7A53656D0FBAFCB80F2DE94D95B43EEBF2E03CB7A536
56D0FBAFCB80F2DE94D95B43EEBF2E03CB7A53656D0FBAFCB80F2DE94D95B43E
EBF2E03CB7A53656D0FBAFCB80F2DE94D95B43EEBF2E03CB7A53656D0FBAFCB8
0F2DE94D95B43EEBF2E03CB7A53656D0FBAFCB819DE7C28F9ED94B6A9B12F2AF
532A34F75525D92B064E0F26F6CD2B5FC9BDCBC943C2D44DD614C241A2796B4A
6CAEA1775F9728796F4A6CADA1F75F9701E5BD29B2B687DD7E5C0796F4A6CADA
1F75F9701E5BD29B2B687DD7E5C0796F4A6CADA1F75F9701E5BD29B2B687DD7E
5C0796F4A6CADA1F75F9701E5BD29B2B687DD7E5C0796F4A6CADA1F75F9701E5
BD29B2B687DD7E5C0796F4A6CADA1F75F9701E5BD29B2B687DD7E5C0796F4A6C
ADA1F75F9701E5BD29B2B687DD7E5C0796F4A6CADA1F75F9701E5BD29B2B687D
D7E5C0796F4A6CADA1F75F9701E5BD29B2B687DD7E5C0796F4A6CADA1F75F970
1E5BD29B2B687DD7E5C0796F4A6CADA1F75F9701E5BD29B2B687DD7E5C0F0398
A8170CBE93378C1B8E660CE56D94F8A93D332CDDC427BF9595D963772CC09B9C
1EE03F6DC1EB5687D8D3E063814B800000000000000000000000000000000000
00318D2A7EC7A27D7A4B83140D9C000000000000000000000000000000000000
00026FCD97AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C000000000000000
000000000000000000000018C6953F63D13EBD25C18A06CE0000000000000000
00000000000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818
E052E00000000000000000000000000000000000000C634A9FB1E89F5E92E0C5
036700000000000000000000000000000000000000009BF365EAE2FEEC517872
8070B83D6AD0FB1A7C0C70297000000000000000000000000000000000000006
43A4EA22D8B49C2987FF003EA7709E06BC000000000000000000000000000000
000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818E052E000000000
00000000000000000000000000000C8B49CFB1693F5EA7709E06BA0000000000
00000000000000000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F6
34F818E052E0000000000000007E1AC57A87449459CACD425A9B289ED8F37159
05987F0DD3D5A9840F14FD213330C98E8EB75C9AC4C38374D48AE67FF9118ACF
F481ED68B5DA2D7241950A34FCBD464626C3266562322C3554F6A6E98AA9853D
E9ED403F700000000000000000322D273EC5A4FD7A9DC2781AE8000000000000
0000007C6817A59D315A5A140AED3A2D6D1EF86B4A64DC074D23E1B55D11BC82
3F94C2C6B555C9B9D84403EC80000000000000000004DF9B2F5717F7628BC394
0385C1EB5687D8D3E063814B80000000000000018E677B47F5CE65EF4CA9D42A
8B2143A7C8F47890A026EA6624558CF7AA33769C9B1372E4FD4A8EFC307BC0E0
BA22666D64565925A7923EE77293BD2DFCAE1FEF6E7072587FD8C006299B4FEB
99A7D23FC950A71F334D9A9B653E6E1FB1B1A0CDC36C4968AE66156B62339463
B0A6CA6CA7B1540B5400000000000000001916939F62D27EBD4EE13C0D740000
000000000000189E90B9EC98B5A0C2B3ED3DD4CDEF59DCC282D829BB7CAB232A
358E46A22E18D130E086DF77EE5F7228609989B7EAD6F693147A3D61C8EAA4A4
49D6CEAA39627F8AEA6C77B915EBFB9515D8157F102E70000000000000000000
9BF365EAE2FEEC5178728070B83D6AD0FB1A7C0C702970000000000000000061
B9C4D2C2D2B42B554B7E151E7E7AB54C88B05E8EE460CAB9E8D454548A8F8913
06CFFD901E5F3119B6AF5D97ECC678AED99957C48F15F1E9B25291A1CC272AF6
726D57BA13A2358C830F0358C576EF0E0DD60C1B214D00000000000000000322
D273EC5A4FD7A9DC2781AE800000000000000198E7D73CF4FCDBDBB8206E266E
6A8B5CDA4C8AECA27B963C544FF76C55D84FE65D84F7AA0795D1EF32F50A6C78
99C4BE3773579D5D5D1E0C398D97CAB636CB9EF4F746888BFEC37F4EC6CA019D
5B9EB6E2F6D9FF00FE323015E80000000000000000004DF9B2F5717F7628BC39
40385C1EB5687D8D3E063814B800000000000000003E055B37D6256163BAA96F
5367624CAAAC78B1A520BE239CBFCCB115BBBDD7E78708129D498FCCA691D292
36DC6890EDDAAC494598A739EAF6ACACE3F937C35C38775C93D1CE86ABB29B1B
2BB3842CB00000000000000000645A4E7D8B49FAF53B84F035D0000000000000
00254CEEE69F3D750CF7CF5E96B5119509480E947D2262626245D0DAE832B09A
B8204CC66AA6E2323D5374DFDDFABF303F6F4DD387C3E5F7D46E740C6A991B3C
899F57C59380C5CE772F31BA80AB29B8E57A2BF96D973BA37F91BAFE6FE1B205
AF9AD899C08966CABAFF0086D85732C48DD298CE415119CA2F25FF000CAE85FB
307B140F58000000000000000009BF365EAE2FEEC5178728070B83D6AD0FB1A7
C0C70297000000000000000328B9B48DB32D3CE14F5A173428D20C976408902A
AC6AC782E48D09AF5488C62728C56ABBF951D87F203EB4DE90199B959074F3EE
A928909A9879384E7458CBF92416356261FF006409AA9516A39F1D2260D66525
A242A053E3C08D11CF4FF264249C8E623D530A23E3BD170370EC2B97DCDC205A
C00000000000000000C8B49CFB1693F5EA7709E06BA000000000000000000121
5B9EB6E2F6D9FF00FE323015E80000000000000000004DF9B2F5717F7628BC39
40385C1EB5687D8D3E063814B8000000000000001E36F6CCEE6E2F58AB3170D1
60CCCF2B519D3E1ABE04C606EC370C584AC73B07B91D8500F08CD0FF0033CD98
E5559517C3C387A3BA6BF47F0C28C47FFD60353B4ECCB5ED1A5A52EDCA6C1A74
9A2EE9CC848BBA7BBFBD122395CF88EFCDCAAA07DA00000000000000000635A5
42AA58349C0B83FF003D92F67FAB15451B2800000000000000000079096CD266
F65AF75BE20D2B717439F122AD43A44CAFEB8B0960BD79258AB07661B953F67F
A40F5E000000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F81
8E052E00000000000000000000000000000000000000C674AAFB0693F5D92E0C
5251B31400000000000000000000000000000000000000137E6CBD5C5FDD8A2F
0E500E1707AD5A1F634F818E052E000000000000000000000000000000000000
00C674AAFB0693F5D92E0C5251B3140000000000000000000000000000000000
0000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818E052E00000000000000
000000000000000000000000C674AAFB0693F5D92E0C5251B314000000000000
00000000000000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F
818E052E00000000000000000000000000000000000000C674AAFB0693F5D92E
0C5251B31400000000000000000000000000000000000000137E6CBD5C5FDD8A
2F0E500E1707AD5A1F634F818E052E0000000000000000000000000000000000
0000C674AAFB0693F5D92E0C5146CC0000000000000000000000000000000000
00000137E6CBD5C5FDD8A2F0E500F3F9CFB69972E9654EA23E76669CD9B92868
B3924FE4E3B3712B1627E876CE0C3B9C0BF901A3EACD2996F71F7B4E280D59A5
32DEE3EF69C501AB34A65BDC7DED38A0356694CB7B8FBDA71406ACD2996F71F7
B4E280D59A532DEE3EF69C501AB34A65BDC7DED38A0356694CB7B8FBDA71406A
CD2996F71F7B4E280D59A532DEE3EF69C503FBAB2539765F7A5C6E5FC7A5A714
06AC74BCB2B8FBE271406AC74BCB2B8FBE271406AC74BCB2B8FBE271406AC74B
CB2B8FBE271406AC74BCB2B8FBE271406AC74BCB2B8FBE271406AC74BCB2B8FB
E271406AC74BCB2B8FBE271406AC74BCB2B8FBE271406AC74BCB2B8FBE271406
AC74BCB2B8FBE27140CF33DF99892B42D690A8C1B86AF5374C54E5E51604FCC2
4586D48AD7AF28D6EE53F5B773B0A41A1EAC74BCB2B8FBE2714A1AB1D2F2CAE3
EF89C501AB1D2F2CAE3EF89C501AB1D2F2CAE3EF89C501AB1D2F2CAE3EF89C50
1AB1D2F2CAE3EF89C501AB1D2F2CAE3EF89C501AB1D2F2CAE3EF89C501AB1D2F
2CAE3EF89C501AB1D2F2CAE3EF89C501AB1D2F2CAE3EF89C501AB1D2F2CAE3EF
89C501AB1D2F2CAE3EF89C501AB2C8A7ECBDAE36A7E1D2D38A07F356694CB7B8
FBDA71406ACD2996F71F7B4E280D59A532DEE3EF69C501AB34A65BDC7DED38A0
356694CB7B8FBDA71406ACD2996F71F7B4E280D59A532DEE3EF69C501AB34A65
BDC7DED38A0356694CB7B8FBDA7140F07989A0B681A4CDE3476CDC79F6C9D3E2
C349B9B76EE3C4C31655D8623B630AEC81FBAE0F5AB43EC69F031C0A5C000000
000000000000000000000000000000018CE955F60D27EBB25C18A4A366280000
000000000000000000000000000000000026FCD97AB8BFBB145E1CA01C2E0F5A
B43EC69F031C0A5C000000000000000000000000000000000000018CE955F60D
27EBB25C18A4A366280000000000000000000000000000000000000026FCD97A
B8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C00000000000000000000000000
0000000000018CE955F60D27EBB25C18A4A36628000000000000000000000000
0000000000000026FCD97AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C0000
00000000000000000000000000000000018CE955F60D27EBB25C18A4A3662800
00000000000000000000000000000000000026FCD97AB8BFBB145E1CA01C2E0F
5AB43EC69F031C0A5C000000000000000000000000000000000000018CE955F6
0D27EBB25C18A4A366280000000000000000000000000000000000000026FCD9
7AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C000000000000000F9B5CB9AD
BA041851ABB5693A4C18CE5641893D310A59AF7226156B562B988AB83F003E3F
FCD8CD665950FF00FD94A73807FB839D2CD9468CC8306EEA2C58D15C8C870D95
194739CE72E046B512261555503D380000000000000000319D2ABEC1A4FD764B
8314946CC5000000000000000039CC4C4BCB40893131159060426ABE2C588E46
B1AD4D95573970222201E0E7F3FF0099A91987408F75C93A2355515602BE6198
53FE9C16C467FA40F6745AD52AB74B97AAD266A1CED3A69AAE979984B858F445
56AAA2FF00145403F68000000000000000026FCD97AB8BFBB145E1CA01C2E0F5
AB43EC69F031C0A5C0000000000000009B74DDFB4EDBEDF17FEE40E164688B9B
6AED9740AE4E54AB30E6EAB4D949D986418F2A90DB12620322BD188E967391A8
E76C6155FE207A3A6E8719B2A7D46567E0D4EB4E8D291A1C786D7C79456ABA1B
91E88E449545C1853F1037600000000000000000633A557D8349FAEC97062928
D98A000000000000000AA8D4573970226CAAAFB11008FEE6AEDE1A41E72E3DA5
409D591B1E96F73A2476E1582E8509DB9E9515A8A9CABE2393FC162FB13F0FD4
A06A94FD10B33D2D24D8133027A763E0C0E9B8B34E63D57DEA8D8490D89BD035
1B2AD2A75A16C48DB94D8916248D3DAF64BBE3AB5D1372F88E8981CAD4622E0D
DE0F601F6C0000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F
818E052E0000000000000004DBA6EFDA76DF6F8BFF0072079FB3B4C4A3D02D6A
1D062DB5311D2932129231265932C4DDACB4164273DAC587EF56E144DD01B7E6
BF3EB626717772F498D1252AF09AAF8B4A9C46B23EE13DAF86AD5732237FD55C
29EF44034300000000000000000633A557D8349FAEC97062928D98A000000000
000003C467BAB91A899A6BA6A301EB0E3B64624185113DAD7CCAA406B93F3458
BB004AD985CF25233776BD525A4289335EBBAB1368AC95808AC624B40849C92B
E223623D7F5C488BB96B3FB53081EFB5C0BBA9137052E9B122494A455C187771
A5E260F7AB123C2DCBD513DD853F88142D957ADBB79DBD2F5EA04CF48918F85A
A8BFA624288DC1BA85159B3B97B70ECA7F6A61454503EE800000000000000002
6FCD97AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C000000000000000FCF3
94DA74EBA13A72560CCBA0AABA0AC686D88AC55F6AB7748B81763DC07F666424
26A5BA2CD4B428F2AA888B022B1AF87813611372E454022BCEED024B357A4151
E76D84E852B1D652AB0652161DC4348B1DF063C16A6C7E87F24EFD387060760F
6016D80000000000000000319D2ABEC1A4FD764B8314946CC500000000000000
197693B02246CC6DCEC86985C8D947AA7FD1873D01EE5DEB540F25A194A537FE
594ECEC2810927DD538F0266651889155AD8505EC639F8374AD447E144C38364
0D8AF7B4693775AF50B7EA70591A5E761398C57A61E4E2EE57938ACFC1CC76CA
2A013268455A9B6D72E4A1ABD564E34AC29D462FB1B12144E49553F0DD362A61
FE08056E000000000000000009BF365EAE2FEEC5178728070B83D6AD0FB1A7C0
C7029700000000000000032ECE0E9016BD817D4B5B571CB47872937210A7A1D5
20272A8C7448D1A13991212607EE539145473774BB3EC03E83B480CCD364167B
CD724B051BBADC22BD6360C187FC8DCF2B87F2DC8135C2989BCFB690F2B50919
78ACB769EF80AF8911BB30E9F26FDDFF0089FB9AD74788AEDCB7F177E4A05AA0
0000000000000000C674AAFB0693F5D92E0C5251B314000000000000007C8BBE
DC96B96D6AB5BF32BB88354958B2AB13061DC2C462B5AF44FC58EC0E4FE0049F
A3DE71A1E69EEDAE58B7CA2D325E626130CCBD1793813509159BA76C61E4A333
7381E9B1B0D5FDAB85036ACE969119BDB7AD29D8946ADCA562B73301D0E9B2B2
119931822C46AB5B122BA12B9AC6B17F52E1545F727B40F19A1AE6FAA14AA0D4
EEEA8417415AD7270298C7A2A3965A12AB9F1702FF002C47AA6E7FD5C3EC5029
0000000000000000004DF9B2F5717F7628BC3940385C1EB5687D8D3E063814B8
000000000000001E4EF7CD55817BEE1D7351E14F4C4387C9429B457C29863115
5C8D6C584E63F728E72AA355706CAEC6CA819F3743FCCF24CA4656545D0D170F
4759AFF0D763060C28C47FFD60352B4ACAB56D0A5A532DCA6C2A749E1457B61A
2ABDEE44C1BA8911CAE7C477E6E5503ED80000000000000000319D2ABEC1A4FD
764B8314946CC500000000000000003C5DFF0099ECDF5FBC9C4B8A98D8D3B05B
B8833F05CE8330D6A2E1DCAC462A6E9BB2B81AFC289EE03CA5BDA2A667A8D3D0
E75D4F8F538909DBA870EA11962C245FCE13121B1FFC1E8A806BD0E1B21B1B0E
1B5190D888D631A98111136111113DC07F40000000000000000137E6CBD5C5FD
D8A2F0E500E1707AD5A1F634F818E052E0000000000000000000000000000000
0000000C634A95FF00F85A2B7DCEAEC961DEC503670000000000000000000000
0000000000000000009BF365EAE2FEEC5178728070B83D6AD0FB1A7C0C702970
0000000000000000000000000000000000000631A54FD8F44FAF49706281B380
000000000000000000000000000000000000004DF9B2F5717F7628BC3940385C
1EB5687D8D3E063814B80000000000000000000000000000000000000318D2A7
EC7A27D7A4B83140D9C00000000000000000000000000000000000000026FCD9
7AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C000000000000000000000000
000000000000018C6953F63D13EBD25C18A06CE0000000000000000000000000
00000000000000137E6CBD5C5FDD8A2F0E500FC376CF48C86997469A9E98852B
2B0E4DBCA478EF6C386DC3251D1374E72A226155C00503E7CB1B28A99DF25F8E
03CF963651533BE4BF1C079F2C6CA2A677C97E380F3E58D9454CEF92FC701E7C
B1B28A99DF25F8E03CF963651533BE4BF1C079F2C6CA2A677C97E380F3E58D94
54CEF92FC701E7CB1B28A99DF25F8E03CF963651533BE4BF1C079F2C6CA2A677
C97E380F3E58D9454CEF92FC701E7CB1B28A99DF25F8E03CF963651533BE4BF1
C079F2C6CA2A677C97E380F3E58D9454CEF92FC701E7CB1B28A99DF25F8E03CF
963651533BE4BF1C079F2C6CA2A677C97E380F3E58D9454CEF92FC701E7CB1B2
8A99DF25F8E03CF963651533BE4BF1C0C8B499B9EDAA959B46834EAB494EC687
5B9488F872F310A2B9AC6B62617AA31CAA8D4C3ED035EF3E58F9454CEF92FC70
3F9E7CB1B28A99DF25F8E03CF963651533BE4BF1C079F2C6CA2A677C97E380F3
E58D9454CEF92FC701E7CB1B28A99DF25F8E03CF963651533BE4BF1C079F2C6C
A2A677C97E380F3E58D9454CEF92FC701E7CB1B28A99DF25F8E03CF963651533
BE4BF1C079F2C6CA2A677C97E380F3E58D9454CEF92FC701E7CB1B28A99DF25F
8E03CF963651533BE4BF1C079F2C6CA2A677C97E380F3E58D9454CEF92FC701E
7CB1B28A99DF25F8E03CF963651533BE4BF1C079F2C6CA2A677C97E380F3E58D
9454CEF92FC701E7CB1B28A99DF25F8E03CF963651533BE4BF1C0C1B34D39293
9A57DF535271E1CCCB45918AB0A3C1736231C9CA4A2616B9AAA8A07CEBFA8147
B834BFA5522B32AC9DA6CCC93123CB44C3B976E24E33DB8702A2EC39A8A06CBA
BEE66B256531C5E380D5F733592B298E2F1C06AFB99AC9594C7178E0357DCCD6
4ACA638BC701ABEE66B256531C5E380D5F733592B298E2F1C06AFB99AC9594C7
178E0357DCCD64ACA638BC701ABEE66B256531C5E380D5F733592B298E2F1C06
AFB99AC9594C7178E0357DCCD64ACA638BC701ABEE66B256531C5E380D5F7335
92B298E2F1C06AFB99AC9594C7178E0357DCCD64ACA638BC701ABEE66B256531
C5E380D5F733592B298E2F1C06AFB99AC9594C7178E0357DCCD64ACA638BC701
ABEE66B256531C5E380D5F733592B298E2F1C0CBB484CD566F6D8B52953B41A2
40A7CD4C55E565634584AFC2E8311B115EC5DD39761772806A3ABEE66B256531
C5E380D5F733592B298E2F1C06AFB99AC9594C7178E0357DCCD64ACA638BC701
ABEE66B256531C5E380D5F733592B298E2F1C06AFB99AC9594C7178E0357DCCD
64ACA638BC701ABEE66B256531C5E380D5F733592B298E2F1C06AFB99AC9594C
7178E0357DCCD64ACA638BC701ABEE66B256531C5E380D5F733592B298E2F1C0
6AFB99AC9594C7178E0357DCCD64ACA638BC701ABEE66B256531C5E380D5F733
592B298E2F1C06AFB99AC9594C7178E0357DCCD64ACA638BC701ABEE66B25653
1C5E380D5F733592B298E2F1C06AFB99AC9594C7178E0649998A2D2E89A525ED
4AA54BB6529F29211592F2CCC3B963794955C0985557DAA076B83D6AD0FB1A7C
0C7029700000000000000000000000000000000000000631A54FD8F44FAF4970
6281B380000000000000000000000000000000000000004DF9B2F5717F7628BC
3940385C1EB5687D8D3E063814B8000000000000000000000000000000000000
0318D2A7EC7A27D7A4B83140D9C0000000000000000000000000000000000000
0026FCD97AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C0000000000000000
00000000000000000000018C6953F63D13EBD25C18A06CE00000000000000000
0000000000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818E
052E00000000000000000000000000000000000000C634A9FB1E89F5E92E0C50
36700000000000000000000000000000000000000009BF365EAE2FEEC5178728
070B83D6AD0FB1A7C0C702970000000000000000000000000000000000000063
1A54FD8F44FAF49706281B3800000000000000055444C2BB089ED503C2D673E7
9A3A3CDBA527EE9926CC43556C48705CE98DCB93DAD72C06C44454FC140F416C
DED68DD101F1ADEABCAD5190FF00CD4968AD7BD987D9BB661DD37FB500FB4000
000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818E052E000
0000000000004E37B67A748CA55DD57A6D0EC4E9F47949A8B064277FA4D4E372
B058E5463F948515B0DF853DED4C007C4FF9FBA537FF005CFF00ECB57E780FC6
DD2933DD2372D2E8D715B12148893F1A037929B919F968CB062C5486AF63634C
26C7B5117060C28056A00000000000000000C634A9FB1E89F5E92E0C50367000
000000000000270D31B38B5AA251E956AD2A3BE552B4D8D1AA51E1AAB5EE8109
5AD6C14727F2C473955F83FBA89EC5503EEE6EB458CD8C8DAF22FB869DFD66B5
330191672622C68CC86C7C46A39D0E13213D8D46B70E0472E172FB7F20322CF6
D86B991BD68375D8533164A567562F272CF88E89C9C480AC5890555CBBA89062
B1E9FA5D87D8B857D8058543A9B2AB45A7D521B770C9F968334C62ECAA246868
F44FECDD01FB40000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F6
34F818E052E00000000000000000FCF51A849D3A9F33509D8AD81272709F1E66
33F61AC870DAAE7B97F8350092334B213B9E5CFC546FAABC25750E8D11B31020
444C2D6EE155B212F83653F4A37947FE2A8BFDE02BF00000000000000000631A
54FD8F44FAF49706281B3800000000000000187694599DAB5F54291ABD01891A
B54348BBA945546ACC4B4444739AC73B63770DCCC2D45C18515DEFC00783CD16
96D294BA5CA5B97ECAC66AC8B1B2B06B32ECDDBB710D372D49A82AA8FDD35130
2B998557DEDC38540E77BC69DD22B38B4DA55AF0E2B2C7B715CD9DAE4463A1B5
CB1D5AB19EC6BD11774E64246C262A61F6B97022AE00AB24E525E4E5204A4BB3
93979786D850589EC6B18D46B53FB1100EA000000000000000009BF365EAE2FE
EC5178728070B83D6AD0FB1A7C0C70297000000000000000004E5A60671DF234
393B0A95115D52ADAB6354590B0ABD255AEC10E1606ECE18D153D9F83553DE06
9F98FCDBC3B0337D234888D4FEAB31FF008BABC44C1B333151374CC3EF484D44
627F0C3EF03DF00000000000000000318D2A7EC7A27D7A4B83140D9C00000000
000000098F4B9CE1D75B51A566E28719D03FAAC3647A9B98EDCAC548F1561409
75726CB5BBA62B9E9EFF00D3EEC384353A568F99AD96B324ED89EA1CB4F325D9
863CFBD9B89A891DCDC112372ECDCC56AB97DC8EC089813DC804E79D8CDCD733
117452EEAB2AAB1DB4D9D88F870522AA2BE1BD981EB2F1F0606C684F6FB30A7B
B676511542BAB22E685745A147B86143E45B54948532E83EDDC3DED457B30FBF
72EC29840FB6000000000000000009BF365EAE2FEEC5178728070B83D6AD0FB1
A7C0C702970000000000000003F0D76B54EA1D1A7AB1528BC8C853E044999989
F8321B55CB813DEAB830227BD4093332148A8676B3DF53CE1D6E12AD32951926
E1427ECB1237ED91974C3B0BC8B19BB5C1EF6A61FDC058200000000000000000
018C6953F63D13EBD25C18A06CE00000000000000049DA635A55892B9A897F53
E1B96561C287293319A8AE483312F15D160BDFF824447E04F7616FE2BB21B658
39F8CDD5D941979F75664E993FC9B567A9D391E1C08906260FD689CAAB376CC3
EC737600C2749CCE352F38755A158B643BFAE4C429958B163CA7F890E24C3DBC
9C38705E9B0F46B55CE7B93F4FE7B0B8029CB02D9F2BD9344B795FCA44A649C1
978D11170A3A2B589CA393F257E1C007DF000000000000000004DF9B2F5717F7
628BC3940385C1EB5687D8D3E063814B80000000000000018D69316FE73EE9B6
256D8B2E92B3B27391396ACCCA4C4B40FD105516140448F1612B91CFFD6EC09F
CA9F981EBB3359BC836166FE9D4256B7FA82B7A4D5623702EEE6E3222C4D94F6
A33618D5FC1A807B70000000000000000000C634A9FB1E89F5E92E0C50367000
000000000000384FD3E46A3251A467E5E1CDC94C3561C7968CD4890DED5F6B5C
D722A2A019055B448CCE4FCD3A620CA4E5391EAAE74194997243C2BF824648CA
89F922E003D958599CCDDD8AF746B7A94C833B1115AF9F8CE7479856AFB5A912
22BB708BEF46604503DA00000000000000000004DF9B2F5717F7628BC3940385
C1EB5687D8D3E063814B80000000000000000000000000000000000000318D2A
7EC7A27D7A4B83140D9C00000000000000000000000000000000000000026FCD
97AB8BFBB145E1CA01C2E0F5AB43EC69F031C0A5C00000000000000000000000
0000000000000018C6953F63D13EBD25C18A06CE000000000000000000000000
000000000000000137E6CBD5C5FDD8A2F0E500E1707AD5A1F634F818E052E000
00000000000000000000000000000000000C634A9FB1E89F5E92E0C503670000
0000000000000000000000000000000000009BF365EAE2FEEC5178728070B83D
6AD0FB1A7C0C7029700000000000000000000000000000000000000631A54FD8
F44FAF49706281B380000000000000000000000000000000000000004DF9B2F5
717F7628BC39403F35C6F6334D3A1B9EE46B524D30B957027FC0C7FC40A4BA7C
8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB603A
7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB60
3A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB
603A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FD
BB603A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216
FDBB603A7C8F5885BF6ED80E9F23D6216FDBB60635A534D4B44B268890E331EA
95D935546B917637317F050365E9D25D6216FDBB603A7C8F5885BF6ED80E9F23
D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED80E9F
23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED80E
9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6ED8
0E9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF6E
D80E9F23D6216FDBB603A7C8F5885BF6ED80E9F23D6216FDBB603A7C8F5885BF
6ED80E9F23D6216FDBB604EB9AF735DA5B5FAE6AA39AB251702A2E14FF003250
0F659CCD1AAD5CE05D312E3A95567E526A241870160CB723C9E0848A88BFAD8E
5C2B87F103CAEA4F61F8F55B1CBF3403527B0FC7AAD8E5F9A01A93D87E3D56C7
2FCD00D49EC3F1EAB6397E6806A4F61F8F55B1CBF3403527B0FC7AAD8E5F9A01
A93D87E3D56C72FCD00D49EC3F1EAB6397E6806A4F61F8F55B1CBF3403527B0F
C7AAD8E5F9A01A93D87E3D56C72FCD00D49EC3F1EAB6397E6806A4F61F8F55B1
CBF3403527B0FC7AAD8E5F9A01A93D87E3D56C72FCD00D49EC3F1EAB6397E680
6A4F61F8F55B1CBF3403527B0FC7AAD8E5F9A01A93D87E3D56C72FCD00D49EC3
F1EAB6397E6806A4F61F8F55B1CBF3403527B0FC7AAD8E5F9A03F9A93587E3D5
5C72FCD01FDD49EC3F1EAB6397E6806A4F61F8F55B1CBF3403527B0FC7AAD8E5
F9A01A93D87E3D56C72FCD00D49EC3F1EAB6397E6806A4F61F8F55B1CBF34035
27B0FC7AAD8E5F9A01A93D87E3D56C72FCD00D49EC3F1EAB6397E6806A4F61F8
F55B1CBF3403527B0FC7AAD8E5F9A01A93D87E3D56C72FCD00D49EC3F1EAB639
7E6806A4F61F8F55B1CBF3403527B0FC7AAD8E5F9A01A93D87E3D56C72FCD00D
49EC3F1EAB6397E6806A4F61F8F55B1CBF3403527B0FC7AAD8E5F9A01A93D87E
3D56C72FCD00D49EC3F1EAB6397E6806A4F61F8F55B1CBF3403527B0FC7AAD8E
5F9A03D9E6A7477B6736F70CC57297539D9C989895749BA1CD725B8463E23222
B9370C62E1C30D00FFD9}
Proportional = True
Stretch = True
end
object Label4: TLabel
Left = 25
Top = 179
Width = 72
Height = 13
Caption = 'Etiqueta inicial:'
end
object eReferencia: TEdit
Left = 134
Top = 73
Width = 121
Height = 21
TabOrder = 0
Text = 'eReferencia'
end
object enumEtiquetas: TcxSpinEdit
Left = 135
Top = 129
Properties.MaxValue = 100.000000000000000000
Properties.MinValue = 1.000000000000000000
TabOrder = 1
Value = 1
Width = 50
end
object eAgencia: TEdit
Left = 134
Top = 21
Width = 121
Height = 21
TabOrder = 2
Text = 'eReferencia'
end
object eEtiquetaIni: TcxSpinEdit
Left = 134
Top = 176
Properties.LargeIncrement = 1.000000000000000000
Properties.MaxValue = 8.000000000000000000
Properties.MinValue = 1.000000000000000000
TabOrder = 3
Value = 1
Width = 51
end
end
inherited ActionListDialog: TActionList
Top = 48
inherited actAceptar: TAction
OnExecute = actAceptarExecute
end
inherited actCancelar: TAction
OnExecute = actCancelarExecute
end
end
end

65
Source/Modulos/Contratos de cliente/Views/uDialogOpcionesImpresionEtiquetasContratosCliente.pas Normal file
View File

@ -0,0 +1,65 @@
unit uDialogOpcionesImpresionEtiquetasContratosCliente;
interface
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls, cxControls, cxContainer,
cxEdit, cxTextEdit, cxMaskEdit, cxSpinEdit, jpeg;
type
TfDialogOpcionesImpresionEtiquetasContratosCliente = class(TfDialogBase)
eReferencia: TEdit;
enumEtiquetas: TcxSpinEdit;
eAgencia: TEdit;
eEtiquetaIni: TcxSpinEdit;
Label1: TLabel;
Label2: TLabel;
Label3: TLabel;
Image1: TImage;
Label4: TLabel;
procedure actAceptarExecute(Sender: TObject);
procedure actCancelarExecute(Sender: TObject);
end;
function ElegirOpcionesImpresionEtiquetasContratoCliente(var AAgencia: String; var AReferencia : String; var ANumEtiquetas : Integer; var AEtiquetaIni : Integer): Boolean;
implementation
{$R *.dfm}
function ElegirOpcionesImpresionEtiquetasContratoCliente(var AAgencia: String; var AReferencia : String; var ANumEtiquetas : Integer; var AEtiquetaIni : Integer): Boolean;
var
AEditor : TfDialogOpcionesImpresionEtiquetasContratosCliente;
begin
AEditor := TfDialogOpcionesImpresionEtiquetasContratosCliente.Create(NIL);
try
AEditor.eReferencia.Text := AReferencia;
AEditor.eAgencia.Text := AAgencia;
Result := (AEditor.ShowModal = mrOk);
if Result then
begin
AAgencia := AEditor.eAgencia.Text;
AReferencia := AEditor.eReferencia.Text;
ANumEtiquetas := AEditor.enumEtiquetas.Value;
AEtiquetaIni := AEditor.eEtiquetaIni.Value;
end;
finally
AEditor.Release;
end;
end;
procedure TfDialogOpcionesImpresionEtiquetasContratosCliente.actAceptarExecute(Sender: TObject);
begin
inherited;
ModalResult := mrOk
end;
procedure TfDialogOpcionesImpresionEtiquetasContratosCliente.actCancelarExecute(Sender: TObject);
begin
inherited;
ModalResult := mrCancel;
end;
end.

11
Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm
View File

@ -218,6 +218,10 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
Action = actListadoBeneficios
DisplayMode = nbdmImageAndText
end
object TBXItem44: TTBXItem
Action = actGenerarEtiquetas
DisplayMode = nbdmImageAndText
end
end
end
inherited StatusBar: TJvStatusBar
@ -269,6 +273,13 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
ImageIndex = 26
OnExecute = actListadoBeneficiosExecute
end
object actGenerarEtiquetas: TAction
Category = 'Acciones'
Caption = 'Generar Etiquetas'
ImageIndex = 11
OnExecute = actGenerarEtiquetasExecute
OnUpdate = actGenerarEtiquetasUpdate
end
end
inherited SmallImages: TPngImageList
PngImages = <

31
Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas
View File

@ -45,6 +45,8 @@ type
TBXSubmenuItem3: TTBXSubmenuItem;
TBXItem43: TTBXItem;
JsNuevoContratoDialog: TJSDialog;
actGenerarEtiquetas: TAction;
TBXItem44: TTBXItem;
procedure FormShow(Sender: TObject);
procedure actGenerarAlbaranCliExecute(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject);
@ -66,6 +68,8 @@ type
procedure bBanoClick(Sender: TObject);
procedure bElectrodomesticoClick(Sender: TObject);
procedure bVariosClick(Sender: TObject);
procedure actGenerarEtiquetasExecute(Sender: TObject);
procedure actGenerarEtiquetasUpdate(Sender: TObject);
protected
FContratos: IBizContratoCliente;
@ -104,7 +108,7 @@ uses
uEditorBase, uEditorDBBase, uDialogUtils, Dialogs,
uDBSelectionListUtils, uGridUtils, uGenerarFacturasCliUtils,
uGenerarAlbaranesCliUtils, uGenerarContratosCliUtils,
uDialogOpcionesImpresionContratosCliente,
uDialogOpcionesImpresionContratosCliente, uDialogOpcionesImpresionEtiquetasContratosCliente,
@ -250,6 +254,31 @@ begin
GenerarAlbaranCli(FContratos.ID);
end;
procedure TfEditorContratosCliente.actGenerarEtiquetasExecute(Sender: TObject);
var
FReferencia: String;
FAgencia: String;
FNumEtiquetas: Integer;
FEtiquetaIni: Integer;
begin
inherited;
FAgencia := 'PROPIO';
FReferencia := FContratos.REFERENCIA;
if ElegirOpcionesImpresionEtiquetasContratoCliente(FAgencia, FReferencia, FNumEtiquetas, FEtiquetaIni) then
FController.EtiquetasPreview(FContratos, FAgencia, FReferencia, FNumEtiquetas, FEtiquetaIni);
end;
procedure TfEditorContratosCliente.actGenerarEtiquetasUpdate(Sender: TObject);
begin
inherited;
(Sender as TAction).Enabled := HayDatos
and not (ViewGrid.NumSeleccionados > 1)
and ViewGrid.esSeleccionCeldaDatos;
end;
procedure TfEditorContratosCliente.actGenerarExecute(Sender: TObject);
//var
// Respuesta : Integer;

13
Source/Modulos/Historico de movimientos/Data/uDataModuleHistoricoMovimientos.dfm
View File

@ -14,12 +14,12 @@ inherited DataModuleHistoricoMovimientos: TDataModuleHistoricoMovimientos
Top = 84
end
object rda_Historico_Movimientos: TDARemoteDataAdapter
DataStreamer = Bin2DataStreamer
GetSchemaCall.RemoteService = RORemoteService
GetDataCall.RemoteService = RORemoteService
UpdateDataCall.RemoteService = RORemoteService
GetScriptsCall.RemoteService = RORemoteService
RemoteService = RORemoteService
DataStreamer = Bin2DataStreamer
Left = 51
Top = 143
end
@ -31,13 +31,11 @@ inherited DataModuleHistoricoMovimientos: TDataModuleHistoricoMovimientos
DataType = datDateTime
DisplayLabel = 'Fecha'
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_FECHA'
InPrimaryKey = True
end
item
Name = 'ID_ALMACEN'
DataType = datInteger
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_ID_ALMACEN'
InPrimaryKey = True
end
item
Name = 'ID_EMPRESA'
@ -48,14 +46,13 @@ inherited DataModuleHistoricoMovimientos: TDataModuleHistoricoMovimientos
Name = 'NOMBRE_ALMACEN'
DataType = datString
Size = 255
DisplayLabel = 'Almac'#195#169'n'
DisplayLabel = 'Almac'#233'n'
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_NOMBRE_ALMACEN'
end
item
Name = 'ID_ARTICULO'
DataType = datInteger
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_ID_ARTICULO'
InPrimaryKey = True
end
item
Name = 'FAMILIA'
@ -82,7 +79,7 @@ inherited DataModuleHistoricoMovimientos: TDataModuleHistoricoMovimientos
Name = 'DESCRIPCION'
DataType = datString
Size = 255
DisplayLabel = 'Descripci'#195#179'n'
DisplayLabel = 'Descripci'#243'n'
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_DESCRIPCION'
end
item
@ -101,15 +98,13 @@ inherited DataModuleHistoricoMovimientos: TDataModuleHistoricoMovimientos
item
Name = 'CAUSA'
DataType = datString
Size = 2021
Size = 2000
DisplayLabel = 'Causa'
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_CAUSA'
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_Historico_Movimientos
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'HistoricoMovimientos'
IndexDefs = <>
Left = 232

6
Source/Modulos/Historico de movimientos/Model/schHistoricoMovimientosClient_Intf.pas
View File

@ -3,13 +3,13 @@ unit schHistoricoMovimientosClient_Intf;
interface
uses
Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_HistoricoMovimientos = '{78F8AAD8-7791-4695-84E0-778DD741063E}';
RID_HistoricoMovimientos = '{C74B6A50-2329-4A16-8889-1F01C8661034}';
{ Data table names }
nme_HistoricoMovimientos = 'HistoricoMovimientos';
@ -45,7 +45,7 @@ const
type
{ IHistoricoMovimientos }
IHistoricoMovimientos = interface(IDAStronglyTypedDataTable)
['{13452610-3745-4EF7-9F6D-224ACA695E83}']
['{70187DD9-A79A-4203-A81B-FAEC7368D544}']
{ Property getters and setters }
function GetFECHAValue: DateTime;
procedure SetFECHAValue(const aValue: DateTime);

4
Source/Modulos/Historico de movimientos/Model/schHistoricoMovimientosServer_Intf.pas
View File

@ -9,12 +9,12 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_HistoricoMovimientosDelta = '{3CD3F6E4-FEEA-4235-AA03-835172F2594A}';
RID_HistoricoMovimientosDelta = '{442A70E5-C2AD-4160-B902-4915DA1652EB}';
type
{ IHistoricoMovimientosDelta }
IHistoricoMovimientosDelta = interface(IHistoricoMovimientos)
['{3CD3F6E4-FEEA-4235-AA03-835172F2594A}']
['{442A70E5-C2AD-4160-B902-4915DA1652EB}']
{ Property getters and setters }
function GetOldFECHAValue : DateTime;
function GetOldID_ALMACENValue : Integer;

39
Source/Modulos/Historico de movimientos/Servidor/srvHistoricoMovimientos_Impl.dfm
View File

@ -28,6 +28,14 @@ object srvHistoricoMovimientos: TsrvHistoricoMovimientos
DatasetField = 'ID_ALMACEN'
TableField = 'ID_ALMACEN'
end
item
DatasetField = 'ID_EMPRESA'
TableField = 'ID_EMPRESA'
end
item
DatasetField = 'NOMBRE_ALMACEN'
TableField = 'NOMBRE_ALMACEN'
end
item
DatasetField = 'ID_ARTICULO'
TableField = 'ID_ARTICULO'
@ -36,6 +44,14 @@ object srvHistoricoMovimientos: TsrvHistoricoMovimientos
DatasetField = 'FAMILIA'
TableField = 'FAMILIA'
end
item
DatasetField = 'REFERENCIA'
TableField = 'REFERENCIA'
end
item
DatasetField = 'REFERENCIA_PROV'
TableField = 'REFERENCIA_PROV'
end
item
DatasetField = 'DESCRIPCION'
TableField = 'DESCRIPCION'
@ -51,22 +67,6 @@ object srvHistoricoMovimientos: TsrvHistoricoMovimientos
item
DatasetField = 'CAUSA'
TableField = 'CAUSA'
end
item
DatasetField = 'NOMBRE_ALMACEN'
TableField = 'NOMBRE_ALMACEN'
end
item
DatasetField = 'ID_EMPRESA'
TableField = 'ID_EMPRESA'
end
item
DatasetField = 'REFERENCIA'
TableField = 'REFERENCIA'
end
item
DatasetField = 'REFERENCIA_PROV'
TableField = 'REFERENCIA_PROV'
end>
end>
Name = 'HistoricoMovimientos'
@ -75,13 +75,11 @@ object srvHistoricoMovimientos: TsrvHistoricoMovimientos
Name = 'FECHA'
DataType = datDateTime
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_FECHA'
InPrimaryKey = True
end
item
Name = 'ID_ALMACEN'
DataType = datInteger
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_ID_ALMACEN'
InPrimaryKey = True
end
item
Name = 'ID_EMPRESA'
@ -98,7 +96,6 @@ object srvHistoricoMovimientos: TsrvHistoricoMovimientos
Name = 'ID_ARTICULO'
DataType = datInteger
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_ID_ARTICULO'
InPrimaryKey = True
end
item
Name = 'FAMILIA'
@ -138,7 +135,7 @@ object srvHistoricoMovimientos: TsrvHistoricoMovimientos
item
Name = 'CAUSA'
DataType = datString
Size = 2021
Size = 2000
DictionaryEntry = 'HISTORICO_MOVIMIENTOS_CAUSA'
end>
end>
@ -205,7 +202,7 @@ object srvHistoricoMovimientos: TsrvHistoricoMovimientos
item
Name = 'HISTORICO_MOVIMIENTOS_CAUSA'
DataType = datString
Size = 2021
Size = 2000
DisplayLabel = 'Causa'
end
item

2
Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm
View File

@ -24,6 +24,7 @@ inherited frViewHistoricoMovimientos: TfrViewHistoricoMovimientos
Kind = skCount
Column = cxGridViewFECHA
end>
OptionsCustomize.ColumnGrouping = False
OptionsCustomize.ColumnHidingOnGrouping = False
OptionsCustomize.GroupBySorting = True
object cxGridViewID_ALMACEN: TcxGridDBColumn
@ -59,6 +60,7 @@ inherited frViewHistoricoMovimientos: TfrViewHistoricoMovimientos
DataBinding.FieldName = 'REFERENCIA_PROV'
end
object cxGridViewDESCRIPCION: TcxGridDBColumn
Caption = 'Descripci'#243'n'
DataBinding.FieldName = 'DESCRIPCION'
end
object cxGridViewCANTIDAD: TcxGridDBColumn

BIN
Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas
View File

Binary file not shown.

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

@ -184,11 +184,15 @@ inherited DataModuleInventario: TDataModuleInventario
item
Name = 'STOCK_MIN'
DataType = datInteger
DisplayLabel = 'Inventario_STOCK_MIN'
DictionaryEntry = 'Inventario_STOCK_MIN'
end
item
Name = 'UNIDAD_MEDIDA'
DataType = datString
Size = 255
DisplayLabel = 'Inventario_UNIDAD_MEDIDA'
DictionaryEntry = 'Inventario_UNIDAD_MEDIDA'
end
item
Name = 'PRECIO_NETO'
@ -252,7 +256,7 @@ inherited DataModuleInventario: TDataModuleInventario
item
Name = 'CAUSA'
DataType = datString
Size = 1
Size = 2000
DisplayLabel = 'INVENTARIO_CAUSA'
DictionaryEntry = 'Inventario_CAUSA'
end

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

@ -8,6 +8,7 @@
<Projects Include="..\..\Cliente\FactuGES.dproj" />
<Projects Include="..\..\GUIBase\GUIBase.dproj" />
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
<Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" />
<Projects Include="..\Articulos\Views\Articulos_view.dproj" />
<Projects Include="..\Contactos\Views\Contactos_view.dproj" />
<Projects Include="Controller\Inventario_controller.dproj" />
@ -121,14 +122,23 @@
<Target Name="FactuGES_Server:Make">
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
</Target>
<Target Name="AlbaranesCliente_view">
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="" />
</Target>
<Target Name="AlbaranesCliente_view:Clean">
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Clean" />
</Target>
<Target Name="AlbaranesCliente_view:Make">
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="Base;GUIBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server" />
<CallTarget Targets="Base;GUIBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server;AlbaranesCliente_view" />
</Target>
<Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase: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;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;AlbaranesCliente_view:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase: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;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;AlbaranesCliente_view:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

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

@ -9,8 +9,8 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_Inventario = '{E456F810-6E16-459C-9CD5-78192FFD5B0A}';
RID_DetalleReservas = '{5FEA97AF-9C0D-4348-AF2A-CDC5355DEF5E}';
RID_Inventario = '{B4F5BFCB-5E60-44E2-9F51-D46E01753450}';
RID_DetalleReservas = '{1C1C05DA-433F-47B6-A266-2D336C83B210}';
{ Data table names }
nme_Inventario = 'Inventario';
@ -97,7 +97,7 @@ const
type
{ IInventario }
IInventario = interface(IDAStronglyTypedDataTable)
['{15A44FFC-5A8D-4522-A759-371BFF1899D4}']
['{BC476EE1-F111-443D-8677-EFF52FE1308B}']
{ Property getters and setters }
function GetID_ALMACENValue: Integer;
procedure SetID_ALMACENValue(const aValue: Integer);
@ -360,7 +360,7 @@ type
{ IDetalleReservas }
IDetalleReservas = interface(IDAStronglyTypedDataTable)
['{4B163921-39CF-421D-9653-5ECF7B4421D4}']
['{F164D65B-913A-43DF-9DC9-81E5E320EFF0}']
{ Property getters and setters }
function GetID_ALBValue: Integer;
procedure SetID_ALBValue(const aValue: Integer);

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

@ -9,13 +9,13 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_InventarioDelta = '{D1D962BD-E668-4F7A-B6D1-731816F3870F}';
RID_DetalleReservasDelta = '{39426E44-A9C3-4C18-9CEE-8F7149AD4060}';
RID_InventarioDelta = '{DBC2AE97-14F3-44D8-B34F-8298297B839F}';
RID_DetalleReservasDelta = '{7324C967-840D-4CDB-A68A-9D3066574877}';
type
{ IInventarioDelta }
IInventarioDelta = interface(IInventario)
['{D1D962BD-E668-4F7A-B6D1-731816F3870F}']
['{DBC2AE97-14F3-44D8-B34F-8298297B839F}']
{ Property getters and setters }
function GetOldID_ALMACENValue : Integer;
function GetOldID_ARTICULOValue : Integer;
@ -277,7 +277,7 @@ type
{ IDetalleReservasDelta }
IDetalleReservasDelta = interface(IDetalleReservas)
['{39426E44-A9C3-4C18-9CEE-8F7149AD4060}']
['{7324C967-840D-4CDB-A68A-9D3066574877}']
{ Property getters and setters }
function GetOldID_ALBValue : Integer;
function GetOldID_EMPRESAValue : Integer;

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

@ -153,11 +153,13 @@ object srvInventario: TsrvInventario
item
Name = 'STOCK_MIN'
DataType = datInteger
DictionaryEntry = 'Inventario_STOCK_MIN'
end
item
Name = 'UNIDAD_MEDIDA'
DataType = datString
Size = 255
DictionaryEntry = 'Inventario_UNIDAD_MEDIDA'
end
item
Name = 'PRECIO_NETO'
@ -209,7 +211,7 @@ object srvInventario: TsrvInventario
item
Name = 'CAUSA'
DataType = datString
Size = 1
Size = 2000
DictionaryEntry = 'Inventario_CAUSA'
end
item
@ -707,7 +709,7 @@ object srvInventario: TsrvInventario
item
Name = 'Inventario_CAUSA'
DataType = datString
Size = 1
Size = 2000
DisplayLabel = 'INVENTARIO_CAUSA'
end
item
@ -715,6 +717,15 @@ object srvInventario: TsrvInventario
DataType = datString
Size = 1
DisplayLabel = 'INVENTARIO_TIPO'
end
item
Name = 'Inventario_STOCK_MIN'
DataType = datInteger
end
item
Name = 'Inventario_UNIDAD_MEDIDA'
DataType = datString
Size = 255
end>
Left = 126
Top = 14

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

@ -47,7 +47,6 @@ inherited frViewInventario: TfrViewInventario
Column = cxGridViewPENDIENTE_RECEPCION
end>
OptionsCustomize.ColumnHidingOnGrouping = False
OptionsCustomize.GroupBySorting = True
object cxGridViewID_ALMACEN: TcxGridDBColumn
DataBinding.FieldName = 'ID_ALMACEN'
Visible = False

2
Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
View File

@ -580,7 +580,7 @@ begin
ShowHourglassCursor;
ATituloEnvio := 'Pedido ref.' + APedido.REFERENCIA;
ATituloEnvio := 'Pedido ref-' + APedido.REFERENCIA;
AFicheroTMP := DarFicheroPDFTemporal(EscapeIllegalChars(ATituloEnvio));
AReportController := TPedidosProveedorReportController.Create;

2
Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/uGenerarFacturasCliAlbCliUtils.pas
View File

@ -193,7 +193,7 @@ begin
Inicializar;
if not Assigned(AAlbaran) then
raise Exception.Create('Albarán de proveedor no asignado (GenerarFacturaCli)');
raise Exception.Create('Albarán de cliente no asignado (GenerarFacturaCli)');
if not AAlbaran.DataTable.Active then
AAlbaran.DataTable.Active := True;

10
Source/Modulos/Relaciones/Albaranes de proveedor - Facturas de proveedor/uGenerarFacturasProvAlbProvUtils.dfm
View File

@ -3,6 +3,7 @@ object dmGenerarFacturasProv: TdmGenerarFacturasProv
Height = 176
Width = 254
object JsListaFacturasGeneradas: TJSDialog
DialogOptions = [doCommandLinks, doModal]
Glyph.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00
00001C0806000000720DDF940000000970485973000017120000171201679FD2
@ -65,11 +66,12 @@ object dmGenerarFacturasProv: TdmGenerarFacturasProv
Instruction.Icon = tdiCustom
CustomButtons = <
item
Caption = 'Continuar'
Value = 200
Cancel = True
Caption = 'Ver la factura'
Value = 100
Info.Strings = (
'Mostrar la factura que se ha creado')
end>
ButtonBar.Buttons = []
ButtonBar.Buttons = [cbOK]
ButtonBar.Cancel = cbOK
ButtonBar.UseCancel = False
MainIcon = tdiCustom

37
Source/Modulos/Relaciones/Albaranes de proveedor - Facturas de proveedor/uGenerarFacturasProvAlbProvUtils.pas
View File

@ -181,8 +181,13 @@ function GenerarFacturaProv(AAlbaran : IBizAlbaranProveedor) : Boolean; overload
var
AFacturasNuevas : IBizFacturaProveedor;
i: Integer;
Cadena1, Cadena2: String;
ARespuesta : Integer;
begin
Result := False;
Cadena1:= '';
Cadena2:= '';
if not Assigned(AAlbaranesProveedorController) then
Inicializar;
@ -200,10 +205,36 @@ begin
begin
if AFacturasNuevas.DataTable.RecordCount = 1 then
begin
if AFacturasNuevas.TIPO = CTE_TIPO_FACTURA then
ShowInfoMessage('La factura se ha dado de alta con el código ' + AFacturasNuevas.REFERENCIA)
begin
Cadena1 := 'Se ha generado la factura';
Cadena2 := Format('Se ha generado correctamente la factura %s a partir del albarán de proveedor' + #10#13, [AFacturasNuevas.REFERENCIA])
end
else
ShowInfoMessage('El abono se ha dado de alta con el código ' + AFacturasNuevas.REFERENCIA);
begin
Cadena1 := 'Se ha generado la abono';
Cadena2 := Format('Se ha generado correctamente el abono %s a partir del albarán de proveedor' + #10#13, [AFacturasNuevas.REFERENCIA])
end;
with dmGenerarFacturasProv.JsListaFacturasGeneradas do
begin
Instruction.Text := Cadena1;
Content.Clear;
Content.Add(Cadena2);
Execute;
ARespuesta := CustomButtonResult;
case ARespuesta of
100 : begin
// Ver el factura
AFacturasProveedorController.Ver(AFacturasNuevas);
end;
200 : // Continuar;
end;
end;
end
else begin
with dmGenerarFacturasProv.JsListaFacturasGeneradas.Content do
@ -217,6 +248,8 @@ begin
AFacturasNuevas.DataTable.Prior;
end;
end;
//Quitamos ver la factura generada ya que no tiene sentido cuando son muchas las generadas
dmGenerarFacturasProv.JsListaFacturasGeneradas.CustomButtons.Delete(0);
dmGenerarFacturasProv.JsListaFacturasGeneradas.Execute;
end;
end;

BIN
Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu
View File

Binary file not shown.

16
Source/Servicios/FactuGES.RODL
View File

@ -997,6 +997,22 @@
</Parameter>
</Parameters>
</Operation>
<Operation Name="GenerarInformeEtiquetas" UID="{B2603DB2-C77C-4FDA-BEFD-001C97F7E986}">
<Parameters>
<Parameter Name="Result" DataType="Binary" Flag="Result">
</Parameter>
<Parameter Name="ID" DataType="Integer" Flag="In" >
</Parameter>
<Parameter Name="AAgencia" DataType="Variant" Flag="In" >
</Parameter>
<Parameter Name="ARefPedido" DataType="Variant" Flag="In" >
</Parameter>
<Parameter Name="ANumEtiquetas" DataType="Integer" Flag="In" >
</Parameter>
<Parameter Name="AEtiquetaIni" DataType="Integer" Flag="In" >
</Parameter>
</Parameters>
</Operation>
</Operations>
</Interface>
</Interfaces>

26
Source/Servicios/FactuGES_Intf.pas
View File

@ -879,6 +879,8 @@ type
const VerTotales: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean; const VerPrecios: Boolean;
const VerTotales: Boolean): Binary;
function GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary;
end;
{ CosrvContratosCliente }
@ -895,6 +897,8 @@ type
const VerTotales: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean; const VerPrecios: Boolean;
const VerTotales: Boolean): Binary;
function GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary;
end;
{ IsrvSubfamilias }
@ -2917,6 +2921,28 @@ begin
end
end;
function TsrvContratosCliente_Proxy.GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary;
begin
try
result := nil;
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEtiquetas');
__Message.Write('ID', TypeInfo(Integer), ID, []);
__Message.Write('AAgencia', TypeInfo(Variant), AAgencia, []);
__Message.Write('ARefPedido', TypeInfo(Variant), ARefPedido, []);
__Message.Write('ANumEtiquetas', TypeInfo(Integer), ANumEtiquetas, []);
__Message.Write('AEtiquetaIni', TypeInfo(Integer), AEtiquetaIni, []);
__Message.Finalize;
__TransportChannel.Dispatch(__Message);
__Message.Read('Result', TypeInfo(Binary), result, []);
finally
__Message.UnsetAttributes(__TransportChannel);
__Message.FreeStream;
end
end;
{ CosrvSubfamilias }
class function CosrvSubfamilias.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvSubfamilias;

38
Source/Servicios/FactuGES_Invk.pas
View File

@ -328,6 +328,7 @@ type
published
procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
procedure Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
procedure Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
end;
TsrvSubfamilias_Invoker = class(TDataAbstractService_Invoker)
@ -2450,6 +2451,43 @@ begin
end;
end;
procedure TsrvContratosCliente_Invoker.Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
{ function GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary; }
var
ID: Integer;
AAgencia: Variant;
ARefPedido: Variant;
ANumEtiquetas: Integer;
AEtiquetaIni: Integer;
lResult: Binary;
__lObjectDisposer: TROObjectDisposer;
begin
lResult := nil;
try
__Message.Read('ID', TypeInfo(Integer), ID, []);
__Message.Read('AAgencia', TypeInfo(Variant), AAgencia, []);
__Message.Read('ARefPedido', TypeInfo(Variant), ARefPedido, []);
__Message.Read('ANumEtiquetas', TypeInfo(Integer), ANumEtiquetas, []);
__Message.Read('AEtiquetaIni', TypeInfo(Integer), AEtiquetaIni, []);
lResult := (__Instance as IsrvContratosCliente).GenerarInformeEtiquetas(ID, AAgencia, ARefPedido, ANumEtiquetas, AEtiquetaIni);
__Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeEtiquetasResponse');
__Message.Write('Result', TypeInfo(Binary), lResult, []);
__Message.Finalize;
__Message.UnsetAttributes(__Transport);
finally
__lObjectDisposer := TROObjectDisposer.Create(__Instance);
try
__lObjectDisposer.Add(lResult);
finally
__lObjectDisposer.Free();
end;
end;
end;
{ TsrvSubfamilias_Invoker }
constructor TsrvSubfamilias_Invoker.Create;

BIN
Source/Servicios/RODLFile.res
View File

Binary file not shown.

12
Source/Servidor/FactuGES_Server.dpr
View File

@ -61,8 +61,6 @@ uses
srvInventario_Impl in '..\Modulos\Inventario\Servidor\srvInventario_Impl.pas' {srvInventario: TDataAbstractService},
srvHistoricoMovimientos_Impl in '..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas' {srvHistoricoMovimientos: TDataAbstractService},
srvReferencias_Impl in '..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas' {srvReferencias: TDataAbstractService},
schHistoricoMovimientosClient_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas',
schHistoricoMovimientosServer_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas',
srvEjercicios_Impl in '..\ApplicationBase\Ejercicios\Servidor\srvEjercicios_Impl.pas' {srvEjercicios: TDataAbstractService},
uBizEjerciciosServer in '..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas',
srvContabilidad_Impl in '..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas' {srvContabilidad: TDataAbstractService},
@ -135,8 +133,6 @@ uses
schTarifasServer_Intf in '..\Modulos\Tarifas\Model\schTarifasServer_Intf.pas',
schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
@ -145,10 +141,14 @@ uses
schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
uRptAlbaranesProveedor_Server in '..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas' {RptAlbaranesProveedor: TDataModule},
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas';
schHistoricoMovimientosClient_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas',
schHistoricoMovimientosServer_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}

61
Source/Servidor/FactuGES_Server.dproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -28,7 +28,8 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType />
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">3.0.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 24 de febrero de 2021 19:15</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">5</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">3.0.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 13 de abril de 2021 17:44</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
@ -324,23 +325,23 @@
[Exception Log]
EurekaLog Version=6006
Activate=0
Activate Handle=1
Activate Handle=0
Save Log File=1
Foreground Tab=0
Freeze Activate=0
Freeze Timeout=1
SMTP From=eurekalog@email.com
SMTP Host=
SMTP Port=25
SMTP UserID=
SMTP Password=
Freeze Activate=1
Freeze Timeout=10
SMTP From=info@uecko.com
SMTP Host=mail.uecko.com
SMTP Port=587
SMTP UserID=info@uecko.com
SMTP Password=SECret13
Append to Log=0
TerminateBtn Operation=1
Errors Number=32
Errors Terminate=3
Email Address=
Email Object=
Email Send Options=0
Email Address=soporte@rodax%2Dsoftware.com
Email Object=Uecko FactuGES Server
Email Send Options=2
Output Path=
Encrypt Password=
AutoCloseDialogSecs=0
@ -362,7 +363,7 @@ HTMLLine11=" %3C/tr%3E"
HTMLLine12=" %3C/table%3E"
HTMLLine13=" %3C/body%3E"
HTMLLine14="%3C/html%3E"
AutoCrashOperation=1
AutoCrashOperation=2
AutoCrashNumber=10
AutoCrashMinutes=1
WebURL=
@ -384,15 +385,15 @@ ZipPassword=
PreBuildEvent=
PostSuccessfulBuildEvent=
PostFailureBuildEvent=
ExceptionDialogType=2
ExceptionDialogType=0
Count=0
EMail Message Line Count=0
loNoDuplicateErrors=0
loAppendReproduceText=0
loDeleteLogAtVersionChange=0
loNoDuplicateErrors=1
loAppendReproduceText=1
loDeleteLogAtVersionChange=1
loAddComputerNameInLogFileName=0
loSaveModulesAndProcessesSections=1
loSaveAssemblerAndCPUSections=1
loSaveModulesAndProcessesSections=0
loSaveAssemblerAndCPUSections=0
soAppStartDate=1
soAppName=1
soAppVersionNumber=1
@ -441,16 +442,16 @@ soNetDNS1=1
soNetDNS2=1
soNetDHCP=1
soCustomData=1
sndShowSendDialog=1
sndShowSendDialog=0
sndShowSuccessFailureMsg=0
sndSendEntireLog=0
sndSendXMLLogCopy=0
sndSendScreenshot=0
sndUseOnlyActiveWindow=0
sndSendLastHTMLPage=1
sndSendInSeparatedThread=0
sndAddDateInFileName=0
sndAddComputerNameInFileName=0
sndSendScreenshot=1
sndUseOnlyActiveWindow=1
sndSendLastHTMLPage=0
sndSendInSeparatedThread=1
sndAddDateInFileName=1
sndAddComputerNameInFileName=1
edoSendErrorReportChecked=1
edoAttachScreenshotChecked=1
edoShowCopyToClipOption=1
@ -458,13 +459,13 @@ edoShowDetailsButton=1
edoShowInDetailedMode=0
edoShowInTopMostMode=0
edoUseEurekaLogLookAndFeel=1
edoShowSendErrorReportOption=1
edoShowSendErrorReportOption=0
edoShowAttachScreenshotOption=1
edoShowCustomButton=0
csoShowDLLs=1
csoShowDLLs=0
csoShowBPLs=1
csoShowBorlandThreads=1
csoShowWindowsThreads=1
csoShowWindowsThreads=0
csoDoNotStoreProcNames=0
boPauseBorlandThreads=0
boDoNotPauseMainThread=0

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.