Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 3.6.7 . Se incluye tienda en facturas de proveedor, albaranes de proveedor y en los informes se saca tienda para que el contable sepa diferenciar

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@689 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2023-10-19 16:45:23 +00:00
parent fc05d57e7d
commit da99600dbc
158 changed files with 4602 additions and 1442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Source/ApplicationBase/ApplicationBase.dproj
View File

@ -56,10 +56,40 @@
<DelphiCompile Include="ApplicationBase.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="adortl.dcp" />
<DCCReference Include="Base.dcp" />
<DCCReference Include="ccpackD11.dcp" />
<DCCReference Include="cfpack_d11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cfpack_d11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxNavBarD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvJansD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
<DCCReference Include="Configuracion\Controller\uConfiguracionController.pas" />
<DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" />
<DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas">
@ -73,18 +103,6 @@
<Form>frViewConfiguracionGeneral</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="cxDataD11.dcp" />
<DCCReference Include="cxEditorsD11.dcp" />
<DCCReference Include="cxExtEditorsD11.dcp" />
<DCCReference Include="cxLibraryD11.dcp" />
<DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="dbrtl.dcp" />
<DCCReference Include="designide.dcp" />
<DCCReference Include="dsnap.dcp" />
<DCCReference Include="dxCoreD11.dcp" />
<DCCReference Include="dxGDIPlusD11.dcp" />
<DCCReference Include="dxNavBarD11.dcp" />
<DCCReference Include="dxThemeD11.dcp" />
<DCCReference Include="Ejercicios\Controller\uEjerciciosController.pas" />
<DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicio.pas" />
<DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicios.pas" />
@ -162,20 +180,8 @@
<Form>frViewTiendas</Form>
<DesignClass>TCustomView</DesignClass>
</DCCReference>
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="GUISDK_D11R.dcp" />
<DCCReference Include="Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" />
<DCCReference Include="JvCtrlsD11R.dcp" />
<DCCReference Include="JvJansD11R.dcp" />
<DCCReference Include="JvMMD11R.dcp" />
<DCCReference Include="JvStdCtrlsD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" />
<DCCReference Include="ProvinciasPoblaciones\Controller\uProvinciasPoblacionesController.pas" />
<DCCReference Include="ProvinciasPoblaciones\Data\uDataModuleProvinciasPoblaciones.pas" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="uFactuGES_App.pas" />
<DCCReference Include="uPlugins_Intf.pas" />
<DCCReference Include="Usuarios\Controller\uUsuariosController.pas" />
@ -233,12 +239,6 @@
<Form>frUsuarios</Form>
<DesignClass>TCustomView</DesignClass>
</DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclx.dcp" />
<DCCReference Include="xmlrtl.dcp" />
</ItemGroup>
</Project>
<!-- EurekaLog First Line

3
Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
View File

@ -202,7 +202,8 @@ begin
try
with Result do
begin
Add(Format('%s=%d', [CTE_TODAS, CTE_ID_TODAS]));
// Un documento debe pertenecer a una tienda y solo a una
// Add(Format('%s=%d', [CTE_TODAS, CTE_ID_TODAS]));
ATiendas.DataTable.First;
while not ATiendas.DataTable.EOF do

12
Source/ApplicationBase/uFactuGES_App.pas
View File

@ -9,9 +9,17 @@ uses
const
CTE_PERFIL_ADMINISTRADOR = 2;
CTE_PREFIL_GERENCIA = 3;
CTE_PERFIL_VENDEDOR = 4;
CTE_PREFIL_GERENCIA_COMUN = 3;
CTE_PERFIL_VENDEDOR_COMUN = 4;
CTE_PREFIL_LOGISTICA = 5;
CTE_PREFIL_GERENCIA_ACANA = 6;
CTE_PREFIL_GERENCIA_CRISTINA = 7;
CTE_PERFIL_VENDEDOR_ACANA = 8;
CTE_PERFIL_VENDEDOR_CRISTINA = 9;
CTE_EMPRESA_ALISO = 5;
CTE_EMPRESA_CRISTINA = 6;
type
TAppFactuGES_Event = procedure;

BIN
Source/Base/Base.res
View File

Binary file not shown.

6
Source/Cliente/FactuGES.dproj
View File

@ -52,11 +52,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">6</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.6.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.6.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">6</VersionInfo><VersionInfo Name="Release">7</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.6.7.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.6.7.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>

8
Source/Cliente/FactuGES.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
FILEVERSION 3,6,2,0
PRODUCTVERSION 3,6,2,0
FILEVERSION 3,6,7,0
PRODUCTVERSION 3,6,7,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "3.6.2.0\0"
VALUE "FileVersion", "3.6.7.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "3.6.2.0\0"
VALUE "ProductVersion", "3.6.7.0\0"
END
END
BLOCK "VarFileInfo"

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

22
Source/Cliente/uPantallaPrincipal.pas
View File

@ -195,8 +195,21 @@ end;
procedure TfPantallaPrincipal.FormShow(Sender: TObject);
begin
//El usuario vendedor y logistica será restringido
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
//El usuario administrador y gerencia verán todo
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_COMUN)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_ACANA)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_CRISTINA)
) then
begin
Informes1.Enabled := True;
Informes1.Visible := True;
Contabilidad1.Enabled := True;
Contabilidad1.Visible := True;
Informacindeempresa1.Visible := True;
end
else
//todos los demás serán restringidos
begin
Informes1.Enabled := False;
Informes1.Visible := False;
@ -211,7 +224,10 @@ begin
if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PERFIL_ADMINISTRADOR) then
begin
Administracin1.Visible := False;
if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA) then
if ((AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA_COMUN)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA_ACANA)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA_CRISTINA)
) then
ConfigurarFactuGES1.Visible := False;
end;
end;

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Inventario\Base.dcp" />
<DCCReference Include="..\Modulos\Inventario\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\frx11.dcp" />
<DCCReference Include="..\Modulos\Inventario\frxe11.dcp" />
<DCCReference Include="..\Modulos\Inventario\fs11.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Inventario\PNG_D10.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\vclx.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\Base.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\frx11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\frxe11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\fs11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
<DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form>
</DCCReference>

57
Source/Informes/5/1/InfAlbaranCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

84
Source/Informes/5/1/InfContratoCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

57
Source/Informes/5/1/InfFacturaCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

36
Source/Informes/5/1/InfPedidoProveedor.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

82
Source/Informes/5/1/InfPresupuestoCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

0
Source/Informes/5/InfAlbaranCliente.fr3 → Source/Informes/5/3/InfAlbaranCliente.fr3
View File

12
Source/Informes/5/InfContratoCliente.fr3 → Source/Informes/5/3/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

0
Source/Informes/5/InfFacturaCliente.fr3 → Source/Informes/5/3/InfFacturaCliente.fr3
View File

0
Source/Informes/5/InfPedidoProveedor.fr3 → Source/Informes/5/3/InfPedidoProveedor.fr3
View File

0
Source/Informes/5/InfPresupuestoCliente.fr3 → Source/Informes/5/3/InfPresupuestoCliente.fr3
View File

74
Source/Informes/5/InformeIVAClientes.fr3
View File

File diff suppressed because one or more lines are too long

56
Source/Informes/5/InformeIVAClientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

58
Source/Informes/5/InformeIVAProveedores.fr3
View File

File diff suppressed because one or more lines are too long

46
Source/Informes/5/InformeIVAProveedoresDesglosado.fr3
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="42143,6524281134" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10; begin&#13;&#10; if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10; begin &#13;&#10; mContinua.Visible := False;&#13;&#10; end &#13;&#10; else&#13;&#10; begin &#13;&#10; mContinua.Visible := True;&#13;&#10; end &#13;&#10; end; &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="45217,9515811227" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10; begin&#13;&#10; if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10; begin &#13;&#10; mContinua.Visible := False;&#13;&#10; end &#13;&#10; else&#13;&#10; begin &#13;&#10; mContinua.Visible := True;&#13;&#10; end &#13;&#10; end; &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
<TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
<TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="14,9992291666667" RightMargin="14,9992291666667" TopMargin="14,9992291666667" BottomMargin="19,9998541666667" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
<TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,14033677542" OnBeforePrint="Band1OnBeforePrint">
@ -9,27 +9,29 @@
<TfrxMemoView Name="Memo22" Left="12" Top="71" Width="265" Height="63" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaBottom" Text="Aliso Design S.L. B86913910&#13;&#10;C/ La Fundición, 27. Pol. Santa Ana&#13;&#10;Rivas Vaciamadrid 28522 Madrid&#13;&#10;tel. 91 301 65 57 / fax. 91 301 65 58&#13;&#10;info@acanainteriorismo.com - www.acanainteriorismo.com"/>
<TfrxPictureView Name="Picture1" Left="12" Top="0" Width="264" Height="67" ShowHint="False" HightQuality="False"/>
</TfrxPageHeader>
<TfrxPageFooter Name="" Height="23,77953" Left="0" Top="668" Width="1009,14033677542" PrintOnLastPage="False">
<TfrxPageFooter Name="" Height="23,77953" Left="0" Top="673" Width="1009,14033677542" PrintOnLastPage="False">
<TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
</TfrxPageFooter>
<TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="256" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;NOMBRE&#34;" ReprintOnNewPage="True">
<TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="255" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;NOMBRE&#34;" ReprintOnNewPage="True">
<TfrxMemoView Name="Memo1" Left="7,55906" Top="3,77953" Width="485,37013" Height="18,89764024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo27" Left="0" Top="25" Width="115,23624" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
<TfrxMemoView Name="Memo28" Left="113,45671" Top="25" Width="417" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
<TfrxMemoView Name="Memo49" Left="530,67716535" Top="25" Width="101,33859" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
<TfrxMemoView Name="Memo50" Left="724" Top="25" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
<TfrxMemoView Name="Memo51" Left="818,57483" Top="25" Width="95,24409449" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
<TfrxMemoView Name="Memo52" Left="913,88976378" Top="25" Width="94,48818898" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
<TfrxMemoView Name="Memo8" Left="632" Top="25" Width="92,67718" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
<TfrxMemoView Name="Memo27" Left="0" Top="25" Width="90" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
<TfrxMemoView Name="Memo28" Align="baLeft" Left="180" Top="25" Width="350" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
<TfrxMemoView Name="Memo49" Align="baLeft" Left="530" Top="25" Width="101,33859" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
<TfrxMemoView Name="Memo50" Align="baLeft" Left="724,01577" Top="25" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
<TfrxMemoView Name="Memo51" Align="baLeft" Left="819,01577" Top="25" Width="95,24409449" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
<TfrxMemoView Name="Memo52" Align="baLeft" Left="914,25986449" Top="25" Width="94,48818898" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
<TfrxMemoView Name="Memo8" Align="baLeft" Left="631,33859" Top="25" Width="92,67718" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
<TfrxMemoView Name="Memo5" Align="baLeft" Left="90" Top="25" Width="90" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Tienda"/>
</TfrxGroupHeader>
<TfrxMasterData Name="DatosMaestros1" Height="17,007874015748" Left="0" Top="316" Width="1009,14033677542" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
<TfrxMemoView Name="Memo18" Left="0" Top="0" Width="113,41369" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA_PROVEEDOR&#34;]"/>
<TfrxMemoView Name="Memo4" Left="113,46" Top="0" Width="417" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo20" Left="530,68" Top="0" Width="101,25984252" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NIF_CIF&#34;]"/>
<TfrxMemoView Name="Memo21" Left="631,93700787" Top="0" Width="92,5984252" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
<TfrxMemoView Name="Memo29" Left="724,53543307" Top="0" Width="94,48818898" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;]"/>
<TfrxMemoView Name="Memo30" Left="818,64566929" Top="0" Width="95,24409449" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;]"/>
<TfrxMemoView Name="Memo31" Left="913,86501" Top="0" Width="94,64276" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
<TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="315" Width="1009,14033677542" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
<TfrxMemoView Name="Memo18" Left="0" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA_PROVEEDOR&#34;]"/>
<TfrxMemoView Name="Memo4" Align="baLeft" Left="180" Top="0" Width="350" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo20" Align="baLeft" Left="530" Top="0" Width="101,25984252" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NIF_CIF&#34;]"/>
<TfrxMemoView Name="Memo21" Align="baLeft" Left="631,25984252" Top="0" Width="92,5984252" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
<TfrxMemoView Name="Memo29" Align="baLeft" Left="723,85826772" Top="0" Width="94,48818898" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;]"/>
<TfrxMemoView Name="Memo30" Align="baLeft" Left="818,3464567" Top="0" Width="95,24409449" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;]"/>
<TfrxMemoView Name="Memo31" Align="baLeft" Left="913,59055119" Top="0" Width="94,64276" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
<TfrxMemoView Name="Memo9" Align="baLeft" Left="90" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;TIENDA&#34;]"/>
</TfrxMasterData>
<TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,14033677542">
<TfrxMemoView Name="Memo6" Left="914,11812" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
@ -41,11 +43,11 @@
<TfrxGroupHeader Name="GroupHeader1" Height="22,67718" Left="0" Top="212" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;MES&#34;">
<TfrxMemoView Name="Memo7" Left="1,77953" Top="2,77953" Width="485,37013" Height="15,1181102362205" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;TITULO&#34;]"/>
</TfrxGroupHeader>
<TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="392" Width="1009,14033677542"/>
<TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="393" Width="1009,14033677542"/>
<TfrxHeader Name="Header1" Height="50" Left="0" Top="436" Width="1009,14033677542">
<TfrxMemoView Name="Memo23" Left="0" Top="31" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="Resumen por proveedor"/>
</TfrxHeader>
<TfrxMasterData Name="DAtosMaestros2" Height="17" Left="0" Top="548" Width="1009,14033677542" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0">
<TfrxMasterData Name="DAtosMaestros2" Height="17" Left="0" Top="551" Width="1009,14033677542" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0">
<TfrxMemoView Name="Memo24" Left="190" Top="0" Width="250" Height="17,00787402" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo37" Left="0" Top="0" Width="100" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;REFERENCIA&#34;]"/>
<TfrxMemoView Name="Memo38" Left="100" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NIF_CIF&#34;]"/>
@ -54,7 +56,7 @@
<TfrxMemoView Name="Memo32" Left="830" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;]"/>
<TfrxMemoView Name="Memo39" Left="440" Top="0" Width="200" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;POBLACION&#34;]"/>
</TfrxMasterData>
<TfrxGroupHeader Name="GroupHeader2" Height="25" Left="0" Top="504" Width="1009,14033677542" Condition="frxDBInformeListadoFacturasResumen.&#34;ID_EMPRESA&#34;" ReprintOnNewPage="True">
<TfrxGroupHeader Name="GroupHeader2" Height="25" Left="0" Top="506" Width="1009,14033677542" Condition="frxDBInformeListadoFacturasResumen.&#34;ID_EMPRESA&#34;" ReprintOnNewPage="True">
<TfrxMemoView Name="Memo13" Left="190" Top="10" Width="250" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
<TfrxMemoView Name="Memo16" Left="640" Top="10" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
<TfrxMemoView Name="Memo17" Left="735" Top="10" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
@ -63,7 +65,7 @@
<TfrxMemoView Name="Memo35" Left="100" Top="10" Width="90" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="CIF"/>
<TfrxMemoView Name="Memo36" Left="440" Top="10" Width="200" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Población"/>
</TfrxGroupHeader>
<TfrxGroupFooter Name="GroupFooter2" Height="25" Left="0" Top="584" Width="1009,14033677542">
<TfrxGroupFooter Name="GroupFooter2" Height="25" Left="0" Top="588" Width="1009,14033677542">
<TfrxMemoView Name="Memo10" Align="baLeft" Left="0" Top="0" Width="639,63" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES:"/>
<TfrxMemoView Name="Memo11" Left="829,63" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo12" Left="734,63" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros2)]"/>

54
Source/Informes/5/InformeListadoFacturasCliente.fr3
View File

File diff suppressed because one or more lines are too long

34
Source/Informes/5/InformeListadoFacturasClienteDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

30
Source/Informes/5/InformeListadoFacturasClientePendientes.fr3
View File

File diff suppressed because one or more lines are too long

30
Source/Informes/5/InformeListadoFacturasClientePendientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

50
Source/Informes/5/InformeListadoFacturasProveedor.fr3
View File

File diff suppressed because one or more lines are too long

58
Source/Informes/5/InformeListadoFacturasProveedorDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

46
Source/Informes/5/InformeListadoRecibosProvPendientes.fr3
View File

File diff suppressed because one or more lines are too long

44
Source/Informes/5/InformeListadoRecibosProvPendientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

46
Source/Informes/5/InformeListadoRecibosProveedor.fr3
View File

File diff suppressed because one or more lines are too long

46
Source/Informes/5/InformeListadoRecibosProveedorDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

57
Source/Informes/6/InfAlbaranCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

56
Source/Informes/6/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

57
Source/Informes/6/InfFacturaCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

12
Source/Informes/6/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

87
Source/Informes/6/InformeIVAClientes.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

83
Source/Informes/6/InformeIVAClientesDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

69
Source/Informes/6/InformeIVAProveedores.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

73
Source/Informes/6/InformeIVAProveedoresDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

69
Source/Informes/6/InformeListadoFacturasCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

77
Source/Informes/6/InformeListadoFacturasClienteDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

64
Source/Informes/6/InformeListadoFacturasClientePendientes.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

68
Source/Informes/6/InformeListadoFacturasClientePendientesDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

71
Source/Informes/6/InformeListadoFacturasProveedor.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

75
Source/Informes/6/InformeListadoFacturasProveedorDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

66
Source/Informes/6/InformeListadoFacturasProveedorPendientes.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

70
Source/Informes/6/InformeListadoFacturasProveedorPendientesDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

40
Source/Informes/6/InformeListadoRecibosCliPendientes.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

44
Source/Informes/6/InformeListadoRecibosCliPendientesDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

40
Source/Informes/6/InformeListadoRecibosCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

44
Source/Informes/6/InformeListadoRecibosClienteDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

40
Source/Informes/6/InformeListadoRecibosProvPendientes.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

44
Source/Informes/6/InformeListadoRecibosProvPendientesDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

40
Source/Informes/6/InformeListadoRecibosProveedor.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

44
Source/Informes/6/InformeListadoRecibosProveedorDesglosado.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

4
Source/Modulos/Albaranes de cliente/Model/uBizAlbaranClienteServer.pas
View File

@ -88,7 +88,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.DarNuevaReferencia(ACodigoReferencia, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.DarNuevaReferencia(ACodigoReferencia, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
@ -108,7 +108,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.IncrementarValorReferencia(ACodigoReferencia, Self.REFERENCIA, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.IncrementarValorReferencia(ACodigoReferencia, Self.REFERENCIA, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
initialization

6
Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas
View File

@ -242,6 +242,12 @@ begin
if FCliente.ID_FORMA_PAGO > 0 then
ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO;
if FCliente.ID_TIENDA > 0 then
begin
ID_TIENDA := FCliente.ID_TIENDA;
TIENDA := FCliente.TIENDA;
end;
DataTable.Post; //Muy importante ya que es necesario hacer un post de la cabecera antes de añadir detalles
//si se quita el id de la cabecera y los detalles se desincroniza
if bEnEdicion then

147
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
View File

@ -158,7 +158,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited pgPaginas: TPageControl
Width = 759
Height = 376
ActivePage = Trabajos
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 759
@ -168,6 +167,152 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitTop = 24
ExplicitWidth = 751
ExplicitHeight = 348
inline frViewAlbaranCliente1: TfrViewAlbaranCliente
Left = 0
Top = 0
Width = 751
Height = 348
Align = alClient
TabOrder = 0
ReadOnly = False
ExplicitLeft = -196
ExplicitTop = -296
inherited dxLayoutControl1: TdxLayoutControl
Width = 751
Height = 348
inherited Label1: TLabel
Width = 299
ExplicitWidth = 299
end
inherited edtFechaAlbaran: TcxDBDateEdit
ExplicitWidth = 284
Width = 284
end
inherited eReferencia: TcxDBTextEdit
ExplicitWidth = 284
Width = 284
end
inherited frViewClienteAlbaran: TfrViewDatosYSeleccionClienteAlbaran
Width = 442
ExplicitWidth = 442
inherited dxLayoutControl1: TdxLayoutControl
Width = 442
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
ExplicitWidth = 103
Width = 103
end
inherited bVerFichaCliente: TBitBtn
Left = 82
ExplicitLeft = 82
end
inherited edtDireccion: TcxMemo
ExplicitWidth = 437
Width = 437
end
inherited bElegirDireccion: TButton
Left = 251
ExplicitLeft = 251
end
inherited edtTelefonos: TcxTextEdit
ExplicitWidth = 193
Width = 193
end
inherited edtReferencia: TcxDBTextEdit
Left = 204
ExplicitLeft = 204
ExplicitWidth = 103
Width = 103
end
end
end
inherited eCalle: TcxDBTextEdit
ExplicitWidth = 284
Width = 284
end
inherited ePoblacion: TcxDBTextEdit
ExplicitWidth = 61
Width = 61
end
inherited eCodigoPostal: TcxDBTextEdit
Left = 696
ExplicitLeft = 696
end
inherited eProvincia: TcxDBTextEdit
ExplicitWidth = 406
Width = 406
end
inherited ePersonaContacto: TcxDBTextEdit
ExplicitWidth = 284
Width = 284
end
inherited eTlfTrabajo: TcxDBTextEdit
ExplicitWidth = 284
Width = 284
end
inherited bElegirDireccion: TBitBtn
Left = 589
ExplicitLeft = 589
end
inherited eReferenciaPedidoCli: TcxTextEdit
ExplicitWidth = 146
Width = 146
end
inherited cbFormaPago: TcxDBLookupComboBox
ExplicitWidth = 146
Width = 146
end
inherited eFechaRecepcion: TcxDBDateEdit
ExplicitWidth = 239
Width = 239
end
inherited cbAlmacen: TcxDBLookupComboBox
ExplicitWidth = 586
Width = 586
end
inherited eRefFacturaCli: TcxDBTextEdit
ExplicitWidth = 284
Width = 284
end
inherited eFechaPrevista: TcxDBDateEdit
ExplicitWidth = 202
Width = 202
end
inherited eRefCliente: TcxDBTextEdit
ExplicitWidth = 284
Width = 284
end
inherited eFechaEnvio: TcxDBDateEdit
ExplicitWidth = 239
Width = 239
end
inherited frViewTienda1: TfrViewTienda
Width = 373
ExplicitWidth = 373
inherited dxLayoutControl1: TdxLayoutControl
Width = 373
inherited cbTienda: TcxComboBox
ExplicitWidth = 312
Width = 312
end
end
end
inherited frViewObservaciones1: TfrViewObservaciones
Width = 521
Height = 228
ExplicitWidth = 521
ExplicitHeight = 228
inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewAlbaranCliente1.DADataSource
Height = 228
Width = 521
end
end
end
end
end
object pagContenido: TTabSheet
Caption = 'Contenido'

13
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas
View File

@ -26,6 +26,7 @@ type
frViewTotales1: TfrViewTotales;
Trabajos: TTabSheet;
eTrabajos: TcxDBMemo;
frViewAlbaranCliente1: TfrViewAlbaranCliente;
procedure FormShow(Sender: TObject);
procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
@ -65,8 +66,8 @@ type
//Si queremos crear otra vista para el editor heredado solo tendriamos que
//sobreescribir este metodo
procedure AsignarVista; virtual;
function PuedoImprimir: Boolean; override;
function PuedoImprimir: Boolean; override;
public
procedure PonerTitulos(const ATitulo: string = ''); override;
@ -95,14 +96,15 @@ var
AViewAlbaranCliente: TfrViewAlbaranCliente;
begin
AViewAlbaranCliente := TfrViewAlbaranCliente.create(Self);
{ AViewAlbaranCliente := TfrViewAlbaranCliente.create(Self);
with AViewAlbaranCliente do
begin
Parent := pagGeneral;
Align := alClient;
dxLayoutControl1.LookAndFeel := dxLayoutOfficeLookAndFeel1;
end;
ViewAlbaran := AViewAlbaranCliente;
end;}
ViewAlbaran := frViewAlbaranCliente1;
end;
constructor TfEditorAlbaranCliente.Create(AOwner: TComponent);
@ -247,6 +249,7 @@ begin
if Assigned(FAlbaran) then
begin
FAlbaran.Cliente := ViewAlbaran.ViewClienteAlbaran.Cliente;
frViewAlbaranCliente1.frViewTienda1.ElegirTienda(FAlbaran.ID_TIENDA);
// Avisar si no hay datos bancarios
{if not AClientesController.TieneDatosBancarios(FAlbaran.Cliente) then

1
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
View File

@ -691,7 +691,6 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
end
object dxLayoutControl1Group17: TdxLayoutGroup
Caption = 'El albar'#225'n pertenece a la tienda'
Visible = False
object dxLayoutControl1Item17: TdxLayoutItem
Caption = 'New Item'
ShowCaption = False

10
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
View File

@ -63,8 +63,6 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
Visible = False
VisibleForCustomization = False
end
object cxGridViewREFERENCIA: TcxGridDBColumn
DataBinding.FieldName = 'REFERENCIA'
@ -234,6 +232,14 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
ExplicitWidth = 335
Width = 335
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 781
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 781
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 1121

19
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas
View File

@ -88,13 +88,14 @@ type
procedure SetAlbaranes(const Value: IBizAlbaranCliente);
public
procedure AnadirOtrosFiltros; override;
procedure ConfigView; override;
property Albaranes: IBizAlbaranCliente read GetAlbaranes write SetAlbaranes;
end;
implementation
uses SysUtils, DateUtils, variants, windows, uDataModuleAlbaranesCliente, schAlbaranesClienteClient_Intf,
uViewGridBase;
uViewGridBase, uFactuGES_App;
{$R *.dfm}
@ -197,6 +198,22 @@ begin
cxGrid.ActiveLevel.GridView := cxGridView;
end;
procedure TfrViewAlbaranesCliente.ConfigView;
begin
inherited;
//Solo para aliso
if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then
begin
cxGridViewTIENDA.Visible := True;
cxGridViewTIENDA.VisibleForCustomization := True;
end
else
begin
cxGridViewTIENDA.Visible := False;
cxGridViewTIENDA.VisibleForCustomization := False;
end;
end;
procedure TfrViewAlbaranesCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
begin
inherited;

1
Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
View File

@ -2,6 +2,7 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewDESCRIPCION: TcxGridDBColumn
Properties.MemoMode = True
Width = 752
end
inherited cxGridViewCANTIDAD: TcxGridDBColumn

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

@ -493,6 +493,7 @@ begin
Anadir(AAlbaranes);
APedidosController.RecuperarProveedor(AListaPedidos);
AAlbaranes.Proveedor := AListaPedidos.Proveedor;
AAlbaranes.ID_TIENDA:= AListaPedidos.ID_TIENDA;
//Siempre asignaremos por defecto el ID_PEDIDO del primer pedido de la lista, si hay más pedidos en el albarán luego los pondremos a null,
//con ID_ALMACEN pasará lo mismo

4
Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranProveedorServer.PAS
View File

@ -85,7 +85,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.DarNuevaReferencia(ACodigoReferencia, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.DarNuevaReferencia(ACodigoReferencia, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
function TBizAlbaranProveedorServer.IncrementarReferencia: Boolean;
@ -104,7 +104,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.IncrementarValorReferencia(ACodigoReferencia, Self.REFERENCIA, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.IncrementarValorReferencia(ACodigoReferencia, Self.REFERENCIA, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
initialization

3
Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm
View File

@ -322,7 +322,6 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
Top = 249
Width = 366
Height = 32
Enabled = False
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
@ -449,8 +448,6 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
end
object dxLayoutControl1Group9: TdxLayoutGroup
Caption = 'El albar'#225'n pertenece a la tienda'
Enabled = False
Visible = False
object dxLayoutControl1Item13: TdxLayoutItem
Control = frViewTienda1
ControlOptions.AutoColor = True

12
Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm
View File

@ -61,8 +61,6 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
Visible = False
VisibleForCustomization = False
end
object cxGridViewREFERENCIA: TcxGridDBColumn
DataBinding.FieldName = 'REFERENCIA'
@ -176,6 +174,16 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
ExplicitWidth = 217
Width = 217
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 354
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 354
ExplicitWidth = 250
Width = 250
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 596

10
Source/Modulos/Articulos/Views/uEditorArticulos.dfm
View File

@ -26,18 +26,22 @@ inherited fEditorArticulos: TfEditorArticulos
end
inherited TBXDock: TTBXDock
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 269
ExplicitWidth = 319
inherited tbxEditFiltro: TTBXEditItem
EditOptions = [tboUseEditWhenVertical]
end
inherited tbxEditFiltro2: TTBXEditItem
Enabled = True
Visible = True
end
inherited TBXItem37: TTBXItem
Visible = False
end
end
inherited TBXTMain2: TTBXToolbar
Left = 275
Left = 319
DockPos = 275
ExplicitLeft = 275
ExplicitLeft = 319
end
end
inherited EditorActionList: TActionList

11
Source/Modulos/Comisiones/Plugin/uPluginComisiones.pas
View File

@ -63,8 +63,15 @@ begin
inherited;
uComisionesViewRegister.RegisterViews;
//El usuario vendedor y logistica será restringido
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
//El usuario administrador y gerencia verán todo
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_COMUN)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_ACANA)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_CRISTINA)
) then
actComisiones.Visible := True
//todos los demás serán restringidos
else
actComisiones.Visible := False;
end;

16
Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.pas
View File

@ -184,11 +184,21 @@ begin
inherited;
uContabilidadViewRegister.RegisterViews;
//El usuario vendedor y logistica será restringido
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
//El usuario administrador y gerencia verán todo
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_COMUN)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_ACANA)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_CRISTINA)
) then
begin
actCuentasEspeciales.Visible := True;
actBalances.Visible := True;
end
//todos los demás serán restringidos
else
begin
actCuentasEspeciales.Visible := False;
actBalances.Visible := False;
actBalances.Visible := False;
end;
end;

30
Source/Modulos/Contactos/Model/Contactos_model.dproj
View File

@ -50,26 +50,28 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Utiles\uRegimenIVAUtils.pas" />
<DCCReference Include="adortl.dcp" />
<DCCReference Include="ApplicationBase.dcp" />
<DCCReference Include="Base.dcp" />
<DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="Data\uIDataModuleClientes.pas" />
<DCCReference Include="Data\uIDataModuleContactos.pas" />
<DCCReference Include="Data\uIDataModuleListadosContactosReport.pas" />
<DCCReference Include="Data\uIDataModuleProveedores.pas" />
<DCCReference Include="Data\uIDataModuleVendedores.pas" />
<DCCReference Include="dbrtl.dcp" />
<DCCReference Include="dsnap.dcp" />
<DCCReference Include="FormasPago_controller.dcp" />
<DCCReference Include="FormasPago_model.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="schContactosClient_Intf.pas" />
<DCCReference Include="schContactosServer_Intf.pas" />
<DCCReference Include="TiposIVA_controller.dcp" />
<DCCReference Include="TiposIVA_model.dcp" />
<DCCReference Include="uBizClientesDescuentos.pas" />
<DCCReference Include="uBizContactos.pas" />
<DCCReference Include="uBizContactosDatosBancarios.pas" />
@ -80,8 +82,6 @@
<DCCReference Include="uBizGruposProveedor.pas" />
<DCCReference Include="uBizProcedenciasCliente.pas" />
<DCCReference Include="uBizSubCuentasContacto.pas" />
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vcldb.dcp" />
</ItemGroup>
</Project>
<!-- EurekaLog First Line

11
Source/Modulos/Contactos/Plugin/uPluginContactos.pas
View File

@ -144,8 +144,15 @@ begin
inherited;
uContactosViewRegister.RegisterViews;
//El usuario vendedor y logistica será restringido
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
//El usuario administrador y gerencia verán todo
if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_COMUN)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_ACANA)
OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_CRISTINA)
) then
actVendedores.Visible := True
//todos los demás serán restringidos
else
actVendedores.Visible := False;
end;

5
Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm
View File

@ -557,6 +557,11 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente
DataType = datString
Size = 255
end
item
Name = 'TIPO_CONTRATO'
DataType = datString
Size = 255
end
item
Name = 'FECHA_CONTRATO'
DataType = datDateTime

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

@ -9,14 +9,14 @@ 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 = '{1F8FAC37-39BC-425B-869E-D00044F46C40}';
RID_Propiedades = '{C52F161B-7E4D-439F-A7B0-4355A49B19D8}';
RID_ListaAnosContratos = '{E0ABAABD-055B-4CC8-BEFE-3C1467805F3C}';
RID_ContratosClienteBeneficios = '{DBCDA21A-E1E9-42E0-882B-0577032A67F7}';
RID_ContratosCliente = '{6D1A8DFF-AAD7-4FFF-AB0F-2F7E3AD610C5}';
RID_TiposCapitulos = '{4C6A9D25-3499-4F39-9C50-0D4EF43F8F15}';
RID_ContratosCliente_Detalles = '{352D2AB3-AC8A-4038-A06F-A8CDD4C7E3BA}';
RID_ContratoClienteFacturasProv = '{714191D2-C0CC-4485-B390-537A6EDEFB88}';
RID_Valores = '{4A855BE2-1E27-410A-8350-ACF29C53F151}';
RID_Propiedades = '{41570D1D-ED23-49DE-9131-AE3093CC8765}';
RID_ListaAnosContratos = '{D5EA6576-1B2F-4111-A91D-BFFC1FDF10F8}';
RID_ContratosClienteBeneficios = '{F424B9B6-07F8-463E-B4A0-1BA7AA6ED4E0}';
RID_ContratosCliente = '{15CCCCE9-CCB4-446E-BAEF-19862E2DFB78}';
RID_TiposCapitulos = '{CBD0C09A-5DEA-4BCD-BFF4-D416AE6A10D4}';
RID_ContratosCliente_Detalles = '{7875CEEB-1D15-46A1-93CD-1FF70AE1624F}';
RID_ContratoClienteFacturasProv = '{F4C72497-51E7-4AA6-ADD6-A1B25CD1FA91}';
{ Data table names }
nme_Valores = 'Valores';
@ -58,6 +58,7 @@ const
fld_ContratosClienteBeneficiosID = 'ID';
fld_ContratosClienteBeneficiosREFERENCIA = 'REFERENCIA';
fld_ContratosClienteBeneficiosREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE';
fld_ContratosClienteBeneficiosTIPO_CONTRATO = 'TIPO_CONTRATO';
fld_ContratosClienteBeneficiosFECHA_CONTRATO = 'FECHA_CONTRATO';
fld_ContratosClienteBeneficiosNOMBRE = 'NOMBRE';
fld_ContratosClienteBeneficiosNIF_CIF = 'NIF_CIF';
@ -75,18 +76,19 @@ const
idx_ContratosClienteBeneficiosID = 0;
idx_ContratosClienteBeneficiosREFERENCIA = 1;
idx_ContratosClienteBeneficiosREFERENCIA_CLIENTE = 2;
idx_ContratosClienteBeneficiosFECHA_CONTRATO = 3;
idx_ContratosClienteBeneficiosNOMBRE = 4;
idx_ContratosClienteBeneficiosNIF_CIF = 5;
idx_ContratosClienteBeneficiosIMPORTE_NETO = 6;
idx_ContratosClienteBeneficiosIMPORTE_DESCUENTO = 7;
idx_ContratosClienteBeneficiosBASE_IMPONIBLE = 8;
idx_ContratosClienteBeneficiosIMPORTE_FACTURAS_PROVEEDOR = 9;
idx_ContratosClienteBeneficiosIMPORTE_BENEFICIO = 10;
idx_ContratosClienteBeneficiosPORCENTAJE_BENEFICIO = 11;
idx_ContratosClienteBeneficiosSITUACION = 12;
idx_ContratosClienteBeneficiosID_VENDEDOR = 13;
idx_ContratosClienteBeneficiosVENDEDOR = 14;
idx_ContratosClienteBeneficiosTIPO_CONTRATO = 3;
idx_ContratosClienteBeneficiosFECHA_CONTRATO = 4;
idx_ContratosClienteBeneficiosNOMBRE = 5;
idx_ContratosClienteBeneficiosNIF_CIF = 6;
idx_ContratosClienteBeneficiosIMPORTE_NETO = 7;
idx_ContratosClienteBeneficiosIMPORTE_DESCUENTO = 8;
idx_ContratosClienteBeneficiosBASE_IMPONIBLE = 9;
idx_ContratosClienteBeneficiosIMPORTE_FACTURAS_PROVEEDOR = 10;
idx_ContratosClienteBeneficiosIMPORTE_BENEFICIO = 11;
idx_ContratosClienteBeneficiosPORCENTAJE_BENEFICIO = 12;
idx_ContratosClienteBeneficiosSITUACION = 13;
idx_ContratosClienteBeneficiosID_VENDEDOR = 14;
idx_ContratosClienteBeneficiosVENDEDOR = 15;
{ ContratosCliente fields }
fld_ContratosClienteID = 'ID';
@ -265,7 +267,7 @@ const
type
{ IValores }
IValores = interface(IDAStronglyTypedDataTable)
['{40E44C4F-672F-42BE-8359-3F24F80102CB}']
['{13277775-D26C-4C37-8D1A-93F331210A30}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -324,7 +326,7 @@ type
{ IPropiedades }
IPropiedades = interface(IDAStronglyTypedDataTable)
['{8B985EC4-9869-4260-82D3-CCD79C46D0EB}']
['{EEFEAABF-251E-4913-AC03-72EC40D49314}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -383,7 +385,7 @@ type
{ IListaAnosContratos }
IListaAnosContratos = interface(IDAStronglyTypedDataTable)
['{889E2DA7-883A-4202-97B2-B2E70651B754}']
['{72262AA4-E2B8-4359-AB2E-ED2F1CE60AAF}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@ -418,7 +420,7 @@ type
{ IContratosClienteBeneficios }
IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
['{1C4B8747-A011-4701-B7CE-9EA7F71444D3}']
['{B769A1EC-6BF4-4753-BD9D-33065C8BA7E5}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -432,6 +434,10 @@ type
procedure SetREFERENCIA_CLIENTEValue(const aValue: String);
function GetREFERENCIA_CLIENTEIsNull: Boolean;
procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
function GetTIPO_CONTRATOValue: String;
procedure SetTIPO_CONTRATOValue(const aValue: String);
function GetTIPO_CONTRATOIsNull: Boolean;
procedure SetTIPO_CONTRATOIsNull(const aValue: Boolean);
function GetFECHA_CONTRATOValue: DateTime;
procedure SetFECHA_CONTRATOValue(const aValue: DateTime);
function GetFECHA_CONTRATOIsNull: Boolean;
@ -489,6 +495,8 @@ type
property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property TIPO_CONTRATO: String read GetTIPO_CONTRATOValue write SetTIPO_CONTRATOValue;
property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull;
property FECHA_CONTRATO: DateTime read GetFECHA_CONTRATOValue write SetFECHA_CONTRATOValue;
property FECHA_CONTRATOIsNull: Boolean read GetFECHA_CONTRATOIsNull write SetFECHA_CONTRATOIsNull;
property NOMBRE: String read GetNOMBREValue write SetNOMBREValue;
@ -532,6 +540,10 @@ type
procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
function GetREFERENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
function GetTIPO_CONTRATOValue: String; virtual;
procedure SetTIPO_CONTRATOValue(const aValue: String); virtual;
function GetTIPO_CONTRATOIsNull: Boolean; virtual;
procedure SetTIPO_CONTRATOIsNull(const aValue: Boolean); virtual;
function GetFECHA_CONTRATOValue: DateTime; virtual;
procedure SetFECHA_CONTRATOValue(const aValue: DateTime); virtual;
function GetFECHA_CONTRATOIsNull: Boolean; virtual;
@ -588,6 +600,8 @@ type
property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property TIPO_CONTRATO: String read GetTIPO_CONTRATOValue write SetTIPO_CONTRATOValue;
property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull;
property FECHA_CONTRATO: DateTime read GetFECHA_CONTRATOValue write SetFECHA_CONTRATOValue;
property FECHA_CONTRATOIsNull: Boolean read GetFECHA_CONTRATOIsNull write SetFECHA_CONTRATOIsNull;
property NOMBRE: String read GetNOMBREValue write SetNOMBREValue;
@ -621,7 +635,7 @@ type
{ IContratosCliente }
IContratosCliente = interface(IDAStronglyTypedDataTable)
['{31D42A4B-1B73-4329-8F5D-A365ADEDAFB5}']
['{1A06CC8E-8C33-4DF9-B6DB-55FBABAA3E21}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1235,7 +1249,7 @@ type
}
{ ITiposCapitulos }
ITiposCapitulos = interface(IDAStronglyTypedDataTable)
['{A95EA2CC-1059-4224-8A8D-7E980E0BBBAC}']
['{40EC6583-F105-4DC0-9181-38C309355EDF}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1330,7 +1344,7 @@ type
{ IContratosCliente_Detalles }
IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{8EA912A5-E21E-4C36-A065-CE3B28B0E7CD}']
['{9660A725-EBFD-413A-B413-5FC6C4BA26EF}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1581,7 +1595,7 @@ type
{ IContratoClienteFacturasProv }
IContratoClienteFacturasProv = interface(IDAStronglyTypedDataTable)
['{54EFE7FE-AF36-4B4D-8226-05C7D7CEA696}']
['{4BA8132B-EFEA-44CF-86F8-5BE79AD5A663}']
{ Property getters and setters }
function GetID_CONTRATOValue: Integer;
procedure SetID_CONTRATOValue(const aValue: Integer);
@ -1923,6 +1937,27 @@ begin
DataTable.Fields[idx_ContratosClienteBeneficiosREFERENCIA_CLIENTE].AsVariant := Null;
end;
function TContratosClienteBeneficiosDataTableRules.GetTIPO_CONTRATOValue: String;
begin
result := DataTable.Fields[idx_ContratosClienteBeneficiosTIPO_CONTRATO].AsString;
end;
procedure TContratosClienteBeneficiosDataTableRules.SetTIPO_CONTRATOValue(const aValue: String);
begin
DataTable.Fields[idx_ContratosClienteBeneficiosTIPO_CONTRATO].AsString := aValue;
end;
function TContratosClienteBeneficiosDataTableRules.GetTIPO_CONTRATOIsNull: boolean;
begin
result := DataTable.Fields[idx_ContratosClienteBeneficiosTIPO_CONTRATO].IsNull;
end;
procedure TContratosClienteBeneficiosDataTableRules.SetTIPO_CONTRATOIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_ContratosClienteBeneficiosTIPO_CONTRATO].AsVariant := Null;
end;
function TContratosClienteBeneficiosDataTableRules.GetFECHA_CONTRATOValue: DateTime;
begin
result := DataTable.Fields[idx_ContratosClienteBeneficiosFECHA_CONTRATO].AsDateTime;

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

@ -9,19 +9,19 @@ 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 = '{4F02FF52-8492-4BBC-A8FD-CF3CAF3FFE52}';
RID_PropiedadesDelta = '{78E311A7-EC36-4742-871D-49440271C0AF}';
RID_ListaAnosContratosDelta = '{E920FD8D-C58E-45FE-B3B0-E74EF349665F}';
RID_ContratosClienteBeneficiosDelta = '{61811E90-1CC8-4642-98BF-844FB5BB3956}';
RID_ContratosClienteDelta = '{D5E60485-80D2-4547-B609-3A7871C399CF}';
RID_TiposCapitulosDelta = '{5F380CE3-3575-46A0-93ED-9E39D9BBB5AC}';
RID_ContratosCliente_DetallesDelta = '{D49A7FC3-466A-43FE-8082-49AC97249F5A}';
RID_ContratoClienteFacturasProvDelta = '{09738785-AC58-4721-B74A-4BC97C0B55A0}';
RID_ValoresDelta = '{F5BA3630-406E-40FE-97E7-4BC91132C5C8}';
RID_PropiedadesDelta = '{A595FE24-F858-4D75-9446-36289739B617}';
RID_ListaAnosContratosDelta = '{E1E216DE-7155-4F81-867C-3884DAD7D803}';
RID_ContratosClienteBeneficiosDelta = '{A5795708-FD64-43F9-8BFB-9790F4704A05}';
RID_ContratosClienteDelta = '{DB9934DA-3136-4D8C-8207-684254C4E5ED}';
RID_TiposCapitulosDelta = '{BC8F6452-CA5B-4003-8BC5-6DC010737C59}';
RID_ContratosCliente_DetallesDelta = '{5E3953D6-994F-4C13-BD75-D73DB9D7B437}';
RID_ContratoClienteFacturasProvDelta = '{E4D089BC-21D9-4983-900F-8F82272F74AF}';
type
{ IValoresDelta }
IValoresDelta = interface(IValores)
['{4F02FF52-8492-4BBC-A8FD-CF3CAF3FFE52}']
['{F5BA3630-406E-40FE-97E7-4BC91132C5C8}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_PROPIEDADValue : Integer;
@ -79,7 +79,7 @@ type
{ IPropiedadesDelta }
IPropiedadesDelta = interface(IPropiedades)
['{78E311A7-EC36-4742-871D-49440271C0AF}']
['{A595FE24-F858-4D75-9446-36289739B617}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -137,7 +137,7 @@ type
{ IListaAnosContratosDelta }
IListaAnosContratosDelta = interface(IListaAnosContratos)
['{E920FD8D-C58E-45FE-B3B0-E74EF349665F}']
['{E1E216DE-7155-4F81-867C-3884DAD7D803}']
{ Property getters and setters }
function GetOldANOValue : String;
@ -171,11 +171,12 @@ type
{ IContratosClienteBeneficiosDelta }
IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
['{61811E90-1CC8-4642-98BF-844FB5BB3956}']
['{A5795708-FD64-43F9-8BFB-9790F4704A05}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldREFERENCIAValue : String;
function GetOldREFERENCIA_CLIENTEValue : String;
function GetOldTIPO_CONTRATOValue : String;
function GetOldFECHA_CONTRATOValue : DateTime;
function GetOldNOMBREValue : String;
function GetOldNIF_CIFValue : String;
@ -193,6 +194,7 @@ type
property OldID : Integer read GetOldIDValue;
property OldREFERENCIA : String read GetOldREFERENCIAValue;
property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
property OldTIPO_CONTRATO : String read GetOldTIPO_CONTRATOValue;
property OldFECHA_CONTRATO : DateTime read GetOldFECHA_CONTRATOValue;
property OldNOMBRE : String read GetOldNOMBREValue;
property OldNIF_CIF : String read GetOldNIF_CIFValue;
@ -230,6 +232,12 @@ type
function GetOldREFERENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
function GetTIPO_CONTRATOValue: String; virtual;
function GetTIPO_CONTRATOIsNull: Boolean; virtual;
function GetOldTIPO_CONTRATOValue: String; virtual;
function GetOldTIPO_CONTRATOIsNull: Boolean; virtual;
procedure SetTIPO_CONTRATOValue(const aValue: String); virtual;
procedure SetTIPO_CONTRATOIsNull(const aValue: Boolean); virtual;
function GetFECHA_CONTRATOValue: DateTime; virtual;
function GetFECHA_CONTRATOIsNull: Boolean; virtual;
function GetOldFECHA_CONTRATOValue: DateTime; virtual;
@ -316,6 +324,10 @@ type
property REFERENCIA_CLIENTEIsNull : Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
property OldREFERENCIA_CLIENTEIsNull : Boolean read GetOldREFERENCIA_CLIENTEIsNull;
property TIPO_CONTRATO : String read GetTIPO_CONTRATOValue write SetTIPO_CONTRATOValue;
property TIPO_CONTRATOIsNull : Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull;
property OldTIPO_CONTRATO : String read GetOldTIPO_CONTRATOValue;
property OldTIPO_CONTRATOIsNull : Boolean read GetOldTIPO_CONTRATOIsNull;
property FECHA_CONTRATO : DateTime read GetFECHA_CONTRATOValue write SetFECHA_CONTRATOValue;
property FECHA_CONTRATOIsNull : Boolean read GetFECHA_CONTRATOIsNull write SetFECHA_CONTRATOIsNull;
property OldFECHA_CONTRATO : DateTime read GetOldFECHA_CONTRATOValue;
@ -373,7 +385,7 @@ type
{ IContratosClienteDelta }
IContratosClienteDelta = interface(IContratosCliente)
['{D5E60485-80D2-4547-B609-3A7871C399CF}']
['{DB9934DA-3136-4D8C-8207-684254C4E5ED}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -989,7 +1001,7 @@ type
{ ITiposCapitulosDelta }
ITiposCapitulosDelta = interface(ITiposCapitulos)
['{5F380CE3-3575-46A0-93ED-9E39D9BBB5AC}']
['{BC8F6452-CA5B-4003-8BC5-6DC010737C59}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldPOSICIONValue : Integer;
@ -1083,7 +1095,7 @@ type
{ IContratosCliente_DetallesDelta }
IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
['{D49A7FC3-466A-43FE-8082-49AC97249F5A}']
['{5E3953D6-994F-4C13-BD75-D73DB9D7B437}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTRATOValue : Integer;
@ -1333,7 +1345,7 @@ type
{ IContratoClienteFacturasProvDelta }
IContratoClienteFacturasProvDelta = interface(IContratoClienteFacturasProv)
['{09738785-AC58-4721-B74A-4BC97C0B55A0}']
['{E4D089BC-21D9-4983-900F-8F82272F74AF}']
{ Property getters and setters }
function GetOldID_CONTRATOValue : Integer;
function GetOldREFERENCIAValue : String;
@ -1775,6 +1787,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosREFERENCIA_CLIENTE] := Null;
end;
function TContratosClienteBeneficiosBusinessProcessorRules.GetTIPO_CONTRATOValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosTIPO_CONTRATO];
end;
function TContratosClienteBeneficiosBusinessProcessorRules.GetTIPO_CONTRATOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosTIPO_CONTRATO]);
end;
function TContratosClienteBeneficiosBusinessProcessorRules.GetOldTIPO_CONTRATOValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteBeneficiosTIPO_CONTRATO];
end;
function TContratosClienteBeneficiosBusinessProcessorRules.GetOldTIPO_CONTRATOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteBeneficiosTIPO_CONTRATO]);
end;
procedure TContratosClienteBeneficiosBusinessProcessorRules.SetTIPO_CONTRATOValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosTIPO_CONTRATO] := aValue;
end;
procedure TContratosClienteBeneficiosBusinessProcessorRules.SetTIPO_CONTRATOIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosTIPO_CONTRATO] := Null;
end;
function TContratosClienteBeneficiosBusinessProcessorRules.GetFECHA_CONTRATOValue: DateTime;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteBeneficiosFECHA_CONTRATO];

7
Source/Modulos/Contratos de cliente/Model/uBizContratosCliente.pas
View File

@ -358,6 +358,13 @@ begin
ID_TIPO_IVA := FCliente.ID_TIPO_IVA;
RECARGO_EQUIVALENCIA := FCliente.RECARGO_EQUIVALENCIA;
if FCliente.ID_TIENDA > 0 then
begin
ID_TIENDA := FCliente.ID_TIENDA;
TIENDA := FCliente.TIENDA;
end;
// En acana la ficha de cliente no tiene descuento aplicado por defecto
// DESCUENTO := FCliente.DESCUENTO;

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

@ -84,7 +84,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.DarNuevaReferencia(ACodigoReferencia, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.DarNuevaReferencia(ACodigoReferencia, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
function TBizContratosClienteServer.IncrementarReferencia: Boolean;
@ -99,7 +99,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.IncrementarValorReferencia(ACodigoReferencia, Self.REFERENCIA, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.IncrementarValorReferencia(ACodigoReferencia, Self.REFERENCIA, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
initialization

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

@ -204,8 +204,9 @@ object RptContratosCliente: TRptContratosCliente
'IENTE.MOVIL,'#10' V_CONTRATOS_CLIENTE.IMPORTE_IVA, V_CONTRATOS_CL' +
'IENTE.IMPORTE_TOTAL,'#10' V_CONTRATOS_CLIENTE.PERSONA_CONTACTO,'#10' ' +
' V_CONTRATOS_CLIENTE.VENDEDOR,'#10' V_CONTRATOS_CLIENTE.TIPO_CO' +
'NTRATO,'#10' V_CONTRATOS_CLIENTE.CONDICIONES'#10'FROM'#10' V_CONTRATOS' +
'_CLIENTE'#10'WHERE'#10' V_CONTRATOS_CLIENTE.ID = :ID'#10
'NTRATO,'#10' V_CONTRATOS_CLIENTE.CONDICIONES,'#10' V_CONTRATOS_CLI' +
'ENTE.ID_TIENDA'#10'FROM'#10' V_CONTRATOS_CLIENTE'#10'WHERE'#10' V_CONTRATO' +
'S_CLIENTE.ID = :ID'#10
StatementType = stSQL
ColumnMappings = <
item
@ -335,14 +336,14 @@ object RptContratosCliente: TRptContratosCliente
item
DatasetField = 'CALIDADES'
TableField = 'CALIDADES'
end
item
DatasetField = 'ID_TIENDA'
TableField = 'ID_TIENDA'
end>
end>
Name = 'Informe_Cabecera'
Fields = <
item
Name = 'CALIDADES'
DataType = datMemo
end
item
Name = 'ID'
DataType = datInteger
@ -372,6 +373,10 @@ object RptContratosCliente: TRptContratosCliente
Name = 'OBSERVACIONES'
DataType = datMemo
end
item
Name = 'CALIDADES'
DataType = datMemo
end
item
Name = 'IMPORTE_NETO'
DataType = datCurrency
@ -479,6 +484,10 @@ object RptContratosCliente: TRptContratosCliente
item
Name = 'CONDICIONES'
DataType = datMemo
end
item
Name = 'ID_TIENDA'
DataType = datInteger
end>
ReadOnly = True
end
@ -1106,6 +1115,10 @@ object RptContratosCliente: TRptContratosCliente
Name = 'OBSERVACIONES'
DataType = datMemo
end
item
Name = 'CALIDADES'
DataType = datMemo
end
item
Name = 'IMPORTE_NETO'
DataType = datCurrency
@ -1213,6 +1226,10 @@ object RptContratosCliente: TRptContratosCliente
item
Name = 'CONDICIONES'
DataType = datMemo
end
item
Name = 'ID_TIENDA'
DataType = datInteger
end>
Params = <
item

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

@ -534,7 +534,7 @@ begin
tbl_DetallesArticulos.Active := True;
AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString);
AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString, tbl_Cabecera.FieldByName('ID_TIENDA').AsString);
if VarIsNull(AInforme) then
raise Exception.Create (('Error Servidor: _GenerarContrato, no encuentra informe ' + rptInforme));

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

@ -137,11 +137,11 @@ object srvContratosCliente: TsrvContratosCliente
TargetTable = 'V_CONTRATOS_BENEFICIOS'
Name = 'IBX'
SQL =
'SELECT '#10' ID, REFERENCIA, REFERENCIA_CLIENTE, FECHA_CONTRATO, ' +
'NOMBRE, NIF_CIF, IMPORTE_NETO,'#10' IMPORTE_DESCUENTO, BASE_IMPON' +
'IBLE, IMPORTE_FACTURAS_PROVEEDOR, '#10' IMPORTE_BENEFICIO, PORCEN' +
'TAJE_BENEFICIO, SITUACION, ID_VENDEDOR, VENDEDOR'#10' FROM'#10' V_CO' +
'NTRATOS_BENEFICIOS'#10' WHERE {Where}'#10
'SELECT '#10' ID, REFERENCIA, REFERENCIA_CLIENTE, TIPO_CONTRATO, F' +
'ECHA_CONTRATO, NOMBRE, NIF_CIF, IMPORTE_NETO,'#10' IMPORTE_DESCUE' +
'NTO, BASE_IMPONIBLE, IMPORTE_FACTURAS_PROVEEDOR, '#10' IMPORTE_BE' +
'NEFICIO, PORCENTAJE_BENEFICIO, SITUACION, ID_VENDEDOR, VENDEDOR'#10 +
' FROM'#10' V_CONTRATOS_BENEFICIOS'#10' WHERE {Where}'#10
StatementType = stSQL
ColumnMappings = <
item
@ -203,6 +203,10 @@ object srvContratosCliente: TsrvContratosCliente
item
DatasetField = 'VENDEDOR'
TableField = 'VENDEDOR'
end
item
DatasetField = 'TIPO_CONTRATO'
TableField = 'TIPO_CONTRATO'
end>
end>
Name = 'ContratosClienteBeneficios'
@ -221,6 +225,11 @@ object srvContratosCliente: TsrvContratosCliente
DataType = datString
Size = 255
end
item
Name = 'TIPO_CONTRATO'
DataType = datString
Size = 255
end
item
Name = 'FECHA_CONTRATO'
DataType = datDateTime

151
Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm
View File

@ -12,6 +12,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 872
Caption = 'Nuevo contrato de cliente'
ExplicitTop = 49
ExplicitWidth = 872
inherited Image1: TImage
Left = 845
@ -129,7 +130,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 872
ExplicitWidth = 872
inherited tbxMain: TTBXToolbar
ExplicitWidth = 634
ExplicitWidth = 488
inherited TBXItem2: TTBXItem
Visible = False
end
@ -173,32 +174,32 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end
inherited pgPaginas: TPageControl
Width = 866
Height = 464
Height = 473
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 866
ExplicitHeight = 464
ExplicitHeight = 473
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 858
ExplicitHeight = 436
ExplicitHeight = 445
inline frViewContratoCliente1: TfrViewContratoCliente
Left = 0
Top = 0
Width = 858
Height = 436
Height = 445
Align = alClient
TabOrder = 0
ReadOnly = False
ExplicitWidth = 858
ExplicitHeight = 436
ExplicitHeight = 445
inherited dxLayoutControl1: TdxLayoutControl
Width = 858
Height = 436
Height = 445
LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 858
ExplicitHeight = 436
ExplicitHeight = 445
inherited edtFechaContrato: TcxDBDateEdit
Top = 84
ExplicitTop = 84
@ -206,10 +207,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 129
end
inherited memObservaciones: TcxDBMemo
Left = 449
Top = 378
ExplicitLeft = 449
ExplicitTop = 378
Left = 465
Top = 330
ExplicitLeft = 465
ExplicitTop = 330
ExplicitWidth = 404
ExplicitHeight = 139
Height = 139
@ -228,9 +229,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 122
end
inherited bFormasPago: TButton
Left = 289
Left = 305
Top = 138
ExplicitLeft = 289
ExplicitLeft = 305
ExplicitTop = 138
end
inherited cbSituacion: TcxDBImageComboBox
@ -240,16 +241,16 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 260
end
inherited memFormaPago: TcxDBMemo
Top = 216
ExplicitTop = 216
Top = 287
ExplicitTop = 287
ExplicitWidth = 396
ExplicitHeight = 100
Height = 100
Width = 396
end
inherited memPlazoEntrega: TcxDBMemo
Top = 333
ExplicitTop = 333
Top = 373
ExplicitTop = 373
ExplicitWidth = 396
ExplicitHeight = 100
Height = 100
@ -262,9 +263,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 27
end
inherited cbTipoContrato: TcxDBComboBox
Left = 310
Left = 318
Top = 84
ExplicitLeft = 310
ExplicitLeft = 318
ExplicitTop = 84
ExplicitWidth = 113
Width = 113
@ -276,15 +277,16 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 335
end
inherited frViewClienteContrato1: TfrViewClienteContrato
Left = 449
Left = 465
Top = 30
Width = 357
ExplicitLeft = 449
ExplicitLeft = 465
ExplicitTop = 30
ExplicitWidth = 357
inherited dxLayoutControl1: TdxLayoutControl
Width = 357
LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 357
inherited Bevel1: TBevel
Left = 82
Top = 72
@ -341,10 +343,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 707
end
inherited edtCodigoPostal: TcxDBTextEdit
Left = 294
Left = 278
Top = 176
DataBinding.DataSource = dsDataTable
ExplicitLeft = 294
ExplicitLeft = 278
ExplicitTop = 176
end
inherited Button1: TBitBtn
@ -360,9 +362,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ExplicitTop = 11
end
inherited Button3: TBitBtn
Left = 184
Left = 168
Top = 230
ExplicitLeft = 184
ExplicitLeft = 168
ExplicitTop = 230
end
inherited cxDBTextEdit1: TcxDBTextEdit
@ -375,6 +377,19 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end
end
end
inherited frViewTienda1: TfrViewTienda
Top = 216
Width = 451
ExplicitTop = 216
ExplicitWidth = 451
inherited dxLayoutControl1: TdxLayoutControl
Width = 451
inherited cbTienda: TcxComboBox
ExplicitWidth = 390
Width = 390
end
end
end
end
end
end
@ -385,7 +400,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 0
Top = 0
Width = 858
Height = 436
Height = 445
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -398,7 +413,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 858
ExplicitHeight = 436
ExplicitHeight = 445
inherited ToolBar1: TToolBar
Width = 858
ExplicitWidth = 858
@ -412,66 +427,64 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontSize: TEdit [5]
inherited FontName: TJvFontComboBox
Left = 0
Width = 110
ExplicitLeft = 0
end
inherited FontSize: TEdit
Left = 145
Width = 110
ExplicitLeft = 145
ExplicitWidth = 110
end
inherited UpDown1: TUpDown [6]
Left = 110
ExplicitLeft = 110
end
inherited FontName: TJvFontComboBox [7]
Left = 127
ExplicitLeft = 127
inherited UpDown1: TUpDown
Left = 271
ExplicitLeft = 271
end
inherited ToolButton13: TToolButton
Left = 272
ExplicitLeft = 272
Left = 288
ExplicitLeft = 288
end
inherited ToolButton6: TToolButton
Left = 280
ExplicitLeft = 280
Left = 296
ExplicitLeft = 296
end
inherited ToolButton7: TToolButton
Left = 314
ExplicitLeft = 314
Left = 330
ExplicitLeft = 330
end
inherited ToolButton8: TToolButton
Left = 348
ExplicitLeft = 348
Left = 364
ExplicitLeft = 364
end
inherited ToolButton12: TToolButton
Left = 382
ExplicitLeft = 382
Left = 398
ExplicitLeft = 398
end
inherited ToolButton9: TToolButton
Left = 390
ExplicitLeft = 390
Left = 406
ExplicitLeft = 406
end
inherited ToolButton10: TToolButton
Left = 424
ExplicitLeft = 424
Left = 440
ExplicitLeft = 440
end
inherited ToolButton11: TToolButton
Left = 458
ExplicitLeft = 458
Left = 474
ExplicitLeft = 474
end
end
inherited cxGrid: TcxGrid
Width = 858
Height = 361
ExplicitTop = 75
Height = 373
ExplicitWidth = 858
ExplicitHeight = 361
ExplicitHeight = 373
end
inherited TBXDock1: TTBXDock
Width = 858
ExplicitTop = 46
ExplicitWidth = 858
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 858
ExplicitWidth = 665
end
end
inherited cxLookupComboBox1: TcxLookupComboBox
@ -492,7 +505,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 0
Top = 0
Width = 858
Height = 436
Height = 445
Align = alClient
TabOrder = 0
TabStop = False
@ -539,7 +552,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 0
Top = 0
Width = 858
Height = 436
Height = 445
Align = alClient
TabOrder = 0
TabStop = False
@ -586,7 +599,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 0
Top = 0
Width = 858
Height = 436
Height = 445
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -597,7 +610,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 858
ExplicitHeight = 436
ExplicitHeight = 445
inherited pnlSup: TPanel
Width = 858
ExplicitWidth = 858
@ -607,13 +620,13 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end
inherited GroupBox1: TGroupBox
Width = 858
Height = 408
Height = 417
ExplicitWidth = 858
ExplicitHeight = 408
ExplicitHeight = 417
inherited eIncidencias: TcxDBMemo
ExplicitWidth = 854
ExplicitHeight = 391
Height = 391
ExplicitHeight = 400
Height = 400
Width = 854
end
end
@ -627,7 +640,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 0
Top = 0
Width = 858
Height = 436
Height = 445
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -638,14 +651,14 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 858
ExplicitHeight = 436
ExplicitHeight = 445
inherited TBXDock: TTBXDock
Width = 858
ExplicitWidth = 858
end
inherited ListView1: TListView
Width = 858
Height = 407
Height = 422
ExplicitTop = 29
ExplicitWidth = 858
ExplicitHeight = 407

1
Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas
View File

@ -306,6 +306,7 @@ begin
if Assigned(FContrato) then
begin
FContrato.Cliente := frViewContratoCliente1.frViewClienteContrato1.Cliente;
frViewContratoCliente1.frViewTienda1.ElegirTienda(FContrato.ID_TIENDA);
if not (FContrato.DataTable.State in dsEditModes) then
FContrato.DataTable.Edit;

52
Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm
View File

@ -15,8 +15,6 @@ inherited frViewContratoCliente: TfrViewContratoCliente
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 810
ExplicitHeight = 449
DesignSize = (
817
491)
@ -44,7 +42,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 129
end
object memObservaciones: TcxDBMemo
Left = 429
Left = 444
Top = 334
Align = alClient
DataBinding.DataField = 'OBSERVACIONES'
@ -61,7 +59,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 11
TabOrder = 12
Height = 139
Width = 404
end
@ -121,7 +119,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 122
end
object bFormasPago: TButton
Left = 267
Left = 282
Top = 136
Width = 132
Height = 21
@ -161,7 +159,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
end
object memFormaPago: TcxDBMemo
Left = 22
Top = 220
Top = 297
Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'FORMA_PAGO'
DataBinding.DataSource = DADataSource
@ -177,13 +175,13 @@ inherited frViewContratoCliente: TfrViewContratoCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 8
TabOrder = 9
Height = 100
Width = 396
end
object memPlazoEntrega: TcxDBMemo
Left = 22
Top = 363
Top = 401
Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'PLAZO_ENTREGA'
DataBinding.DataSource = DADataSource
@ -199,7 +197,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 9
TabOrder = 10
Height = 100
Width = 396
end
@ -234,7 +232,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 27
end
object cbTipoContrato: TcxDBComboBox
Left = 298
Left = 306
Top = 82
DataBinding.DataField = 'TIPO_CONTRATO'
DataBinding.DataSource = DADataSource
@ -282,19 +280,21 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 335
end
inline frViewClienteContrato1: TfrViewClienteContrato
Left = 429
Left = 444
Top = 28
Width = 366
Height = 270
TabOrder = 10
TabOrder = 11
ReadOnly = False
ExplicitLeft = 429
ExplicitLeft = 444
ExplicitTop = 28
ExplicitWidth = 366
ExplicitHeight = 270
inherited dxLayoutControl1: TdxLayoutControl
Width = 366
Height = 270
ExplicitWidth = 366
ExplicitHeight = 270
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 707
Width = 707
@ -316,12 +316,12 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 707
end
inherited edtCodigoPostal: TcxDBTextEdit
Left = 274
ExplicitLeft = 274
Left = 259
ExplicitLeft = 259
end
inherited Button3: TBitBtn
Left = 164
ExplicitLeft = 164
Left = 149
ExplicitLeft = 149
end
inherited cxDBTextEdit1: TcxDBTextEdit
ExplicitWidth = 283
@ -329,6 +329,16 @@ inherited frViewContratoCliente: TfrViewContratoCliente
end
end
end
inline frViewTienda1: TfrViewTienda
Left = 22
Top = 220
Width = 451
Height = 41
TabOrder = 8
ReadOnly = False
ExplicitLeft = 22
ExplicitTop = 220
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
@ -415,6 +425,14 @@ inherited frViewContratoCliente: TfrViewContratoCliente
end
end
end
object dxLayoutControl1Group10: TdxLayoutGroup
Caption = 'La factura pertenece a la tienda'
object dxLayoutControl1Item13: TdxLayoutItem
Control = frViewTienda1
ControlOptions.AutoColor = True
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Group6: TdxLayoutGroup
AutoAligns = [aaHorizontal]
AlignVert = avClient

12
Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas
View File

@ -12,7 +12,7 @@ uses
uViewDireccionEntregaContratoCliente, Buttons, ActnList, cxLookupEdit,
cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, uDAInterfaces,
uBizFormasPago, cxButtonEdit, uBizContactos, uContratosClienteController,
uVendedoresController, uViewClienteContrato;
uVendedoresController, uViewClienteContrato, uViewTienda;
type
IViewContratoCliente = interface(IViewBase)
@ -67,6 +67,9 @@ type
dxLayoutControl1Item12: TdxLayoutItem;
edtlREF_CLIENTE: TcxDBTextEdit;
frViewClienteContrato1: TfrViewClienteContrato;
dxLayoutControl1Item13: TdxLayoutItem;
frViewTienda1: TfrViewTienda;
dxLayoutControl1Group10: TdxLayoutGroup;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure bFormasPagoClick(Sender: TObject);
@ -117,11 +120,15 @@ begin
cbTipoContrato.Properties.Items.Clear;
cbTipoContrato.Properties.Items.Add(CTE_COCINA);
cbTipoContrato.Properties.Items.Add(CTE_ARMARIO);
cbTipoContrato.Properties.Items.Add(CTE_BANO);
cbTipoContrato.Properties.Items.Add(CTE_ARMARIO);
cbTipoContrato.Properties.Items.Add(CTE_SALON);
cbTipoContrato.Properties.Items.Add(CTE_DORMITORIO);
cbTipoContrato.Properties.Items.Add(CTE_JARDIN);
cbTipoContrato.Properties.Items.Add(CTE_ELECTRODOMESTICO);
cbTipoContrato.Properties.Items.Add(CTE_OBRA);
cbTipoContrato.Properties.Items.Add(CTE_VARIOS);
end;
procedure TfrViewContratoCliente.CustomViewDestroy(Sender: TObject);
@ -172,6 +179,7 @@ begin
if Assigned(FContrato) then
begin
DADataSource.DataTable := FContrato.DataTable;
frViewTienda1.DataItem := FContrato.DataTable;
FFormasPago := FFormasPagoController.BuscarTodos;
dsFormaPago.DataTable := FFormasPago.DataTable;

22
Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm
View File

@ -182,6 +182,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente
Caption = 'Otros nombres'
DataBinding.FieldName = 'LISTA_NOMBRES'
end
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
end
end
inherited cxGridLevel: TcxGridLevel
Caption = 'Todos'
@ -206,16 +210,12 @@ inherited frViewContratosCliente: TfrViewContratosCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 515
@ -224,8 +224,6 @@ inherited frViewContratosCliente: TfrViewContratosCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 515
ExplicitWidth = 250
Width = 250
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 515
@ -234,8 +232,6 @@ inherited frViewContratosCliente: TfrViewContratosCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 515
ExplicitWidth = 250
Width = 250
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
@ -271,6 +267,11 @@ inherited frViewContratosCliente: TfrViewContratosCliente
object TBXItem3: TTBXItem
Action = actCliente
end
object TBXSeparatorItem1: TTBXSeparatorItem
end
object TBXItem2: TTBXItem
Action = actTienda
end
end
end
end
@ -296,6 +297,11 @@ inherited frViewContratosCliente: TfrViewContratosCliente
OnExecute = actClienteExecute
OnUpdate = actClienteUpdate
end
object actTienda: TAction
Caption = 'Tienda'
OnExecute = actTiendaExecute
OnUpdate = actTiendaUpdate
end
end
inherited GridPNGImageList: TPngImageList
PngImages = <

47
Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas
View File

@ -49,6 +49,10 @@ type
cxGridViewLISTA_NOMBRES: TcxGridDBColumn;
cxGridViewBASE_IMPONIBLE: TcxGridDBColumn;
cxGridViewIMPORTE_IVA: TcxGridDBColumn;
cxGridViewTIENDA: TcxGridDBColumn;
actTienda: TAction;
TBXItem2: TTBXItem;
TBXSeparatorItem1: TTBXSeparatorItem;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel);
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
@ -68,6 +72,8 @@ type
ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject);
procedure actTiendaExecute(Sender: TObject);
procedure actTiendaUpdate(Sender: TObject);
private
//Filtros relativos a la vista
@ -80,6 +86,7 @@ type
procedure SetContratos(const Value: IBizContratoCliente);
public
procedure AnadirOtrosFiltros; override;
procedure ConfigView; override;
property Contratos: IBizContratoCliente read GetContratos write SetContratos;
end;
@ -87,7 +94,7 @@ implementation
uses
SysUtils, variants, uDataModuleContratosCliente, schContratosClienteClient_Intf,
uViewGridBase,
uViewGridBase, uFactuGES_App,
//uReferenciasUtils,
cxVariants;
@ -113,6 +120,26 @@ begin
(Sender as TAction).Checked := not (cxGridViewNOMBRE.GroupIndex < 0);
end;
procedure TfrViewContratosCliente.actTiendaExecute(Sender: TObject);
begin
if (cxGridViewTIENDA.GroupIndex < 0) then
begin
cxGridViewTIENDA.GroupIndex := cxGridView.GroupedColumnCount;
cxGridViewTIENDA.Visible := False;
end
else
begin
cxGridViewTIENDA.GroupIndex := -1;
cxGridViewTIENDA.Visible := True;
end;
end;
procedure TfrViewContratosCliente.actTiendaUpdate(Sender: TObject);
begin
inherited;
(Sender as TAction).Checked := not (cxGridViewTIENDA.GroupIndex < 0);
end;
procedure TfrViewContratosCliente.AnadirFiltroFechas;
var
Columna: TcxGridDBColumn;
@ -160,6 +187,24 @@ begin
cxGrid.ActiveLevel.GridView := cxGridView;
end;
procedure TfrViewContratosCliente.ConfigView;
begin
inherited;
//FILTRO DE EMPRESAS
if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then
begin
cxGridViewTIENDA.Visible := True;
cxGridViewTIENDA.VisibleForCustomization := True;
actTienda.Visible := True;
end
else
begin
cxGridViewTIENDA.Visible := False;
cxGridViewTIENDA.VisibleForCustomization := False;
actTienda.Visible := False;
end;
end;
procedure TfrViewContratosCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
begin
inherited;

21
Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.dfm
View File

@ -31,6 +31,10 @@ inherited frViewContratosClienteBeneficios: TfrViewContratosClienteBeneficios
Caption = 'ref. contenido'
DataBinding.FieldName = 'REFERENCIA_CLIENTE'
end
object cxGridViewTIPO_CONTRATO: TcxGridDBColumn
Caption = 'Tipo'
DataBinding.FieldName = 'TIPO_CONTRATO'
end
object cxGridViewFECHA_CONTRATO: TcxGridDBColumn
Caption = 'Fecha'
DataBinding.FieldName = 'FECHA_CONTRATO'
@ -111,22 +115,39 @@ inherited frViewContratosClienteBeneficios: TfrViewContratosClienteBeneficios
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited edtFechaFinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited txtFiltroTodo2: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
end
end
end
inherited pnlAgrupaciones: TTBXDockablePanel
ExplicitWidth = 554
end
inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 40415.784062094910000000

1
Source/Modulos/Contratos de cliente/Views/uViewContratosClienteBeneficios.pas
View File

@ -32,6 +32,7 @@ type
cxGridViewSITUACION: TcxGridDBColumn;
cxGridViewVENDEDOR: TcxGridDBColumn;
cxGridViewREF_CONTENIDO: TcxGridDBColumn;
cxGridViewTIPO_CONTRATO: TcxGridDBColumn;
procedure CustomViewDestroy(Sender: TObject);
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid;
ALevel: TcxGridLevel);

6
Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
View File

@ -341,6 +341,12 @@ begin
ID_TIPO_IVA := FCliente.ID_TIPO_IVA;
RECARGO_EQUIVALENCIA := FCliente.RECARGO_EQUIVALENCIA;
if FCliente.ID_TIENDA > 0 then
begin
ID_TIENDA := FCliente.ID_TIENDA;
TIENDA := FCliente.TIENDA;
end;
//Si el cliente tiene la contabilidad desactivada la factura que realizamos la desactivamos también.
if (FCliente.IGNORAR_CONTABILIDAD = 1) then
IGNORAR_CONTABILIDAD := 1;

4
Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas
View File

@ -142,7 +142,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.DarNuevaReferencia(ATipo, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.DarNuevaReferencia(ATipo, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
function TBizFacturasClienteServer.IncrementarReferencia: Boolean;
@ -163,7 +163,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.IncrementarValorReferencia(ATipo, Self.REFERENCIA, ID_EMPRESA, ID_TIENDA)
Result := AReferenciasService.IncrementarValorReferencia(ATipo, Self.REFERENCIA, ID_EMPRESA, -1); //Referencia común a todas las tiendas de la empresa
end;
procedure TBizFacturasClienteServer.Insert_Asiento_Factura(aChange: TDADeltaChange);

38
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
View File

@ -505,13 +505,13 @@ object RptFacturasCliente: TRptFacturasCliente
#10'when extract (month from fecha_factura) = 11 then '#39'NOVIEMBRE - ' +
#39' || extract (year from fecha_factura)'#10'when extract (month from ' +
'fecha_factura) = 12 then '#39'DICIEMBRE - '#39' || extract (year from fe' +
'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, TIPO_FACTURA, ID_CLIENTE' +
','#10'v_facturas_cliente.NOMBRE || COALESCE(v_contactos_nombres.otro' +
's_nombres, '#39#39') as NOMBRE,'#10'SITUACION, REFERENCIA_CLIENTE, NIF_CIF' +
', FECHA_FACTURA, BASE_IMPONIBLE, IVA, IMPORTE_IVA, RE, IMPORTE_R' +
'E, IMPORTE_TOTAL'#10'from v_facturas_cliente'#10'LEFT OUTER JOIN v_conta' +
'ctos_nombres ON (v_contactos_nombres.id = v_facturas_cliente.id_' +
'cliente)'#10'where {where}'#10'order by ANO, MES, REFERENCIA'#10#10
'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, TIENDA, TIPO_FACTURA, ID' +
'_CLIENTE,'#10'v_facturas_cliente.NOMBRE || COALESCE(v_contactos_nomb' +
'res.otros_nombres, '#39#39') as NOMBRE,'#10'SITUACION, REFERENCIA_CLIENTE,' +
' NIF_CIF, FECHA_FACTURA, BASE_IMPONIBLE, IVA, IMPORTE_IVA, RE, I' +
'MPORTE_RE, IMPORTE_TOTAL'#10'from v_facturas_cliente'#10'LEFT OUTER JOIN' +
' v_contactos_nombres ON (v_contactos_nombres.id = v_facturas_cli' +
'ente.id_cliente)'#10'where {where}'#10'order by ANO, MES, REFERENCIA'#10#10
StatementType = stSQL
ColumnMappings = <
item
@ -585,6 +585,10 @@ object RptFacturasCliente: TRptFacturasCliente
item
DatasetField = 'TIPO_FACTURA'
TableField = 'TIPO_FACTURA'
end
item
DatasetField = 'TIENDA'
TableField = 'TIENDA'
end>
end>
Name = 'ListadoFacturas'
@ -611,6 +615,11 @@ object RptFacturasCliente: TRptFacturasCliente
DataType = datString
Size = 255
end
item
Name = 'TIENDA'
DataType = datString
Size = 255
end
item
Name = 'TIPO_FACTURA'
DataType = datString
@ -622,13 +631,12 @@ object RptFacturasCliente: TRptFacturasCliente
end
item
Name = 'NOMBRE'
DataType = datString
Size = 255
DataType = datMemo
end
item
Name = 'SITUACION'
DataType = datString
Size = 19
Size = 255
end
item
Name = 'REFERENCIA_CLIENTE'
@ -1690,6 +1698,11 @@ object RptFacturasCliente: TRptFacturasCliente
DataType = datString
Size = 255
end
item
Name = 'TIENDA'
DataType = datString
Size = 255
end
item
Name = 'TIPO_FACTURA'
DataType = datString
@ -1701,13 +1714,12 @@ object RptFacturasCliente: TRptFacturasCliente
end
item
Name = 'NOMBRE'
DataType = datString
Size = 255
DataType = datMemo
end
item
Name = 'SITUACION'
DataType = datString
Size = 19
Size = 255
end
item
Name = 'REFERENCIA_CLIENTE'

2
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
View File

@ -37,10 +37,10 @@ type
DADSInformeListadoFacturasResumen: TDADataSource;
frxDBInformeListadoFacturasResumen: TfrxDBDataset;
frxPDFExport1: TfrxPDFExport;
schReport: TDASchema;
frxDBInformeListadoRecibos: TfrxDBDataset;
DADSInformeListadoRecibos: TDADataSource;
tbl_InformeListadoRecibos: TDAMemDataTable;
schReport: TDASchema;
procedure DataModuleCreate(Sender: TObject);
procedure DataModuleDestroy(Sender: TObject);
private

92
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

@ -83,7 +83,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 854
Height = 368
OnChanging = pgPaginasChanging
ExplicitTop = 109
ExplicitWidth = 854
ExplicitHeight = 368
inherited pagGeneral: TTabSheet
@ -121,7 +120,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 78
end
inherited frViewTienda1: TfrViewTienda
Width = 351
ExplicitWidth = 351
inherited dxLayoutControl1: TdxLayoutControl
Width = 351
inherited cbTienda: TcxComboBox
ExplicitWidth = 399
Width = 399
@ -206,10 +208,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente
Left = 0
Top = 0
@ -230,56 +228,97 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitHeight = 340
inherited ToolBar1: TToolBar
Width = 846
Height = 24
ExplicitWidth = 846
ExplicitHeight = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 513
Top = 0
Width = 57
ExplicitLeft = 513
ExplicitTop = 0
ExplicitWidth = 57
end
inherited UpDown1: TUpDown
Left = 236
ExplicitLeft = 236
Left = 570
Top = 0
ExplicitLeft = 570
ExplicitTop = 0
end
inherited ToolButton13: TToolButton
Left = 253
ExplicitLeft = 253
Left = 587
Top = 0
ExplicitLeft = 587
ExplicitTop = 0
end
inherited ToolButton6: TToolButton
Left = 261
ExplicitLeft = 261
Left = 595
Top = 0
ExplicitLeft = 595
ExplicitTop = 0
end
inherited ToolButton7: TToolButton
Left = 295
ExplicitLeft = 295
Left = 629
Top = 0
ExplicitLeft = 629
ExplicitTop = 0
end
inherited ToolButton8: TToolButton
Left = 329
ExplicitLeft = 329
Left = 663
Top = 0
ExplicitLeft = 663
ExplicitTop = 0
end
inherited ToolButton12: TToolButton
Left = 363
ExplicitLeft = 363
Left = 697
Top = 0
ExplicitLeft = 697
ExplicitTop = 0
end
inherited ToolButton9: TToolButton
Left = 371
ExplicitLeft = 371
Left = 705
Top = 0
ExplicitLeft = 705
ExplicitTop = 0
end
inherited ToolButton10: TToolButton
Left = 405
ExplicitLeft = 405
Left = 739
Top = 0
ExplicitLeft = 739
ExplicitTop = 0
end
inherited ToolButton11: TToolButton
Left = 439
ExplicitLeft = 439
Left = 773
Top = 0
ExplicitLeft = 773
ExplicitTop = 0
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 846
Height = 268
Height = 290
ExplicitTop = 50
ExplicitWidth = 846
ExplicitHeight = 290
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 846
ExplicitTop = 24
ExplicitWidth = 846
@ -335,8 +374,11 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
inherited PnlComentario: TPanel
Width = 860
TabOrder = 5
ExplicitTop = 76
ExplicitWidth = 860
inherited lbComentario: TLabel
Width = 850
Height = 25
end
end
inline frViewTotales1: TfrViewTotales [5]
Left = 0

1
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
View File

@ -325,6 +325,7 @@ var
ADireccion : IBizDireccionesContacto;
begin
FFactura.Cliente := frViewFacturaCliente1.frViewClienteFactura1.Cliente;
frViewFacturaCliente1.frViewTienda1.ElegirTienda(FFactura.ID_TIENDA);
if not (FFactura.DataTable.State in dsEditModes) then
FFactura.DataTable.Edit;

16
Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
View File

@ -1,6 +1,6 @@
inherited frViewFacturaCliente: TfrViewFacturaCliente
Width = 451
Height = 304
Width = 705
Height = 497
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@ -9,17 +9,19 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 451
Height = 304
Width = 705
Height = 497
Align = alClient
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 451
ExplicitHeight = 304
DesignSize = (
451
304)
705
497)
object eReferencia: TcxDBTextEdit
Left = 135
Top = 30
@ -378,8 +380,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
end
object dxLayoutControl1Group4: TdxLayoutGroup
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'La factura pertenece a la tienda'
Visible = False
object dxLayoutControl1Item3: TdxLayoutItem
Caption = 'New Item'
ShowCaption = False

22
Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
View File

@ -41,8 +41,6 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
Visible = False
VisibleForCustomization = False
end
object cxGridViewREFERENCIA: TcxGridDBColumn
DataBinding.FieldName = 'REFERENCIA'
@ -221,6 +219,16 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
ExplicitWidth = 273
Width = 273
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 541
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 541
ExplicitWidth = 250
Width = 250
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 802
@ -263,6 +271,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
end
end
inherited ActionList1: TActionList
Left = 368
Top = 288
object actCliente: TAction
Caption = 'Cliente'
OnExecute = actClienteExecute
@ -273,6 +283,14 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
OnExecute = actProvinciaExecute
OnUpdate = actProvinciaUpdate
end
object actTienda: TAction
Caption = 'Tienda'
OnExecute = actTiendaExecute
OnUpdate = actTiendaUpdate
end
object actFormaPago: TAction
Caption = 'Forma pago'
end
end
inherited GridPNGImageList: TPngImageList
PngImages = <

46
Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas
View File

@ -66,6 +66,8 @@ type
cxGridViewVENDEDOR: TcxGridDBColumn;
cxGridViewLISTA_NOMBRES: TcxGridDBColumn;
cxStyleProforma: TcxStyle;
actTienda: TAction;
actFormaPago: TAction;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle);
@ -74,6 +76,8 @@ type
procedure actProvinciaExecute(Sender: TObject);
procedure actProvinciaUpdate(Sender: TObject);
procedure actClienteUpdate(Sender: TObject);
procedure actTiendaExecute(Sender: TObject);
procedure actTiendaUpdate(Sender: TObject);
private
//Filtros relativos a la vista
@ -87,6 +91,7 @@ type
public
procedure AnadirOtrosFiltros; override;
procedure ConfigView; override;
property Facturas: IBizFacturaCliente read GetFacturas write SetFacturas;
end;
@ -94,7 +99,8 @@ type
implementation
uses
uDataModuleFacturasCliente, DateUtils, uViewGridBase, schFacturasClienteClient_Intf;
uDataModuleFacturasCliente, DateUtils, uViewGridBase, schFacturasClienteClient_Intf,
uFactuGES_App;
{$R *.dfm}
@ -140,6 +146,26 @@ begin
(Sender as TAction).Checked := not (cxGridViewPROVINCIA.GroupIndex < 0);
end;
procedure TfrViewFacturasCliente.actTiendaExecute(Sender: TObject);
begin
if (cxGridViewTIENDA.GroupIndex < 0) then
begin
cxGridViewTIENDA.GroupIndex := cxGridView.GroupedColumnCount;
cxGridViewTIENDA.Visible := False;
end
else
begin
cxGridViewTIENDA.GroupIndex := -1;
cxGridViewTIENDA.Visible := True;
end;
end;
procedure TfrViewFacturasCliente.actTiendaUpdate(Sender: TObject);
begin
inherited;
(Sender as TAction).Checked := not (cxGridViewTIENDA.GroupIndex < 0);
end;
procedure TfrViewFacturasCliente.AnadirFiltroFechas;
var
Columna: TcxGridDBColumn;
@ -187,6 +213,24 @@ begin
cxGrid.ActiveLevel.GridView := cxGridView;
end;
procedure TfrViewFacturasCliente.ConfigView;
begin
inherited;
//Solo para aliso
if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then
begin
cxGridViewTIENDA.Visible := True;
cxGridViewTIENDA.VisibleForCustomization := True;
actTienda.Visible := True;
end
else
begin
cxGridViewTIENDA.Visible := False;
cxGridViewTIENDA.VisibleForCustomization := False;
actTienda.Visible := False;
end;
end;
procedure TfrViewFacturasCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid;
ALevel: TcxGridLevel);
begin

5
Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm
View File

@ -279,6 +279,11 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
item
Name = 'ASIENTO_PUNTEADO'
DataType = datSmallInt
end
item
Name = 'FORMA_PAGO'
DataType = datString
Size = 255
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]

Some files were not shown because too many files have changed in this diff Show More