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

version 4.1.6

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@170 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2022-10-21 09:41:20 +00:00
parent 080f8bff63
commit 7cbf513d15
67 changed files with 1588 additions and 664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

103
Source/Base/Base.dproj
View File

@ -44,13 +44,6 @@
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@ -65,54 +58,54 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Contratos de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Modulos\Contactos\adortl.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Contactos\designide.dcp" />
<DCCReference Include="..\Modulos\Contactos\dsnap.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Contactos\Jcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Contactos\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contactos\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
<DCCReference Include="..\Modulos\Contactos\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
<DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>

4
Source/Cliente/FactuGES.dproj
View File

@ -52,9 +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">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.4.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">4.1.4.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">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.6.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">4.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

68
Source/Informes/2/2/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

66
Source/Informes/2/2/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

56
Source/Informes/2/4/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

44
Source/Informes/2/4/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

66
Source/Informes/2/4/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

95
Source/Informes/2/5/InfContratoCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

69
Source/Informes/2/5/InfFacturaCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

92
Source/Informes/2/5/InfPresupuestoCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

69
Source/Informes/2/5/InfReciboCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

66
Source/Informes/2/InfFacturaCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

87
Source/Informes/2/InfPresupuestoCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

69
Source/Informes/2/InfReciboCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

81
Source/Informes/InformeIVAClientes.fr3
View File

File diff suppressed because one or more lines are too long

79
Source/Informes/InformeIVAClientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Modulos/Contactos/Model/uBizContactosServer.pas
View File

@ -242,7 +242,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.DarNuevaReferencia(ATipo, -1, ID_TIENDA)
Result := AReferenciasService.DarNuevaReferencia(ATipo, ID_EMPRESA, -1)
end;
function TBizContactosServer._IncrementarReferenciaInterna(
@ -256,7 +256,7 @@ begin
GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf);
AReferenciasService := Intf as IsrvReferencias;
Result := AReferenciasService.IncrementarValorReferencia(ATipo, Self.REFERENCIA, -1, ID_TIENDA)
Result := AReferenciasService.IncrementarValorReferencia(ATipo, Self.REFERENCIA, ID_EMPRESA, -1)
end;
initialization

72
Source/Modulos/Contactos/Views/Contactos_view.dproj
View File

@ -47,36 +47,42 @@
<DelphiCompile Include="Contactos_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="adortl.dcp" />
<DCCReference Include="ApplicationBase.dcp" />
<DCCReference Include="Base.dcp" />
<DCCReference Include="bdertl.dcp" />
<DCCReference Include="Contactos_controller.dcp" />
<DCCReference Include="Contactos_model.dcp" />
<DCCReference Include="cxDataD11.dcp" />
<DCCReference Include="cxEditorsD11.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="dxThemeD11.dcp" />
<DCCReference Include="FormasPago_controller.dcp" />
<DCCReference Include="FormasPago_model.dcp" />
<DCCReference Include="GestorInformes_controller.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="GUISDK_D11R.dcp" />
<DCCReference Include="Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" />
<DCCReference Include="JvGlobusD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="TiposIVA_controller.dcp" />
<DCCReference Include="TiposIVA_model.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\bdertl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.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\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\dxThemeD11.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\GestorInformes_controller.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\JvGlobusD11R.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\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\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="uContactosViewRegister.pas" />
<DCCReference Include="uEditorAsignarPrecioPunto.pas">
<Form>fEditorAsignarPrecioPunto</Form>
@ -228,12 +234,6 @@
<Form>frViewVendedores</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

154
Source/Modulos/Contactos/Views/uEditorCliente.dfm
View File

@ -5,7 +5,7 @@ inherited fEditorCliente: TfEditorCliente
ClientHeight = 658
ClientWidth = 937
ExplicitWidth = 945
ExplicitHeight = 692
ExplicitHeight = 696
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@ -69,19 +69,17 @@ inherited fEditorCliente: TfEditorCliente
end
inherited pgPaginas: TPageControl
Width = 931
Height = 527
ActivePage = pagGeneral
ExplicitTop = 109
Height = 524
ExplicitWidth = 931
ExplicitHeight = 527
ExplicitHeight = 524
inherited pagGeneral: TTabSheet
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inline frViewCliente1: TfrViewCliente
Left = 0
Top = 0
Width = 923
Height = 499
Height = 496
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -92,29 +90,29 @@ inherited fEditorCliente: TfEditorCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited dxLayoutControlContacto: TdxLayoutControl
Width = 923
Height = 499
Height = 496
LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited PngSpeedButton1: TPngSpeedButton
Left = 861
Left = 859
Top = 218
ExplicitLeft = 861
ExplicitLeft = 859
ExplicitTop = 218
end
inherited PngSpeedButton2: TPngSpeedButton
Left = 861
Left = 859
Top = 190
ExplicitLeft = 861
ExplicitLeft = 859
ExplicitTop = 190
end
inherited PngSpeedButton3: TPngSpeedButton
Left = 861
Left = 859
Top = 162
ExplicitLeft = 861
ExplicitLeft = 859
ExplicitTop = 162
end
inherited eCalle: TcxDBTextEdit
@ -148,23 +146,23 @@ inherited fEditorCliente: TfEditorCliente
Width = 428
end
inherited eCodigoPostal: TcxDBTextEdit
Left = 520
Left = 518
Top = 243
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 520
ExplicitLeft = 518
ExplicitTop = 243
end
inherited eTlfParticular: TcxDBTextEdit
Left = 699
Left = 697
Top = 57
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 699
ExplicitLeft = 697
ExplicitTop = 57
ExplicitWidth = 177
Width = 177
@ -230,37 +228,37 @@ inherited fEditorCliente: TfEditorCliente
Width = 428
end
inherited eTlfTrabajo: TcxDBTextEdit
Left = 699
Left = 697
Top = 30
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 699
ExplicitLeft = 697
ExplicitTop = 30
ExplicitWidth = 177
Width = 177
end
inherited eTlfMovil: TcxDBTextEdit
Left = 699
Left = 697
Top = 84
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 699
ExplicitLeft = 697
ExplicitTop = 84
ExplicitWidth = 177
Width = 177
end
inherited eFax: TcxDBTextEdit
Left = 699
Left = 697
Top = 111
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 699
ExplicitLeft = 697
ExplicitTop = 111
ExplicitWidth = 177
Width = 177
@ -288,39 +286,39 @@ inherited fEditorCliente: TfEditorCliente
Width = 271
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
Left = 699
Left = 697
Top = 162
Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 699
ExplicitLeft = 697
ExplicitTop = 162
ExplicitWidth = 148
Width = 148
end
inherited eMailParticular: TcxDBHyperLinkEdit
Left = 699
Left = 697
Top = 190
Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 699
ExplicitLeft = 697
ExplicitTop = 190
ExplicitWidth = 148
Width = 148
end
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 699
Left = 697
Top = 217
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 699
ExplicitLeft = 697
ExplicitTop = 217
ExplicitWidth = 148
Width = 148
@ -346,9 +344,9 @@ inherited fEditorCliente: TfEditorCliente
Width = 428
end
inherited frViewTienda1: TfrViewTienda
Left = 604
Left = 602
Top = 270
ExplicitLeft = 604
ExplicitLeft = 602
ExplicitTop = 270
inherited dxLayoutControl1: TdxLayoutControl
inherited cbTienda: TcxComboBox
@ -356,8 +354,8 @@ inherited fEditorCliente: TfEditorCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 229
Width = 229
ExplicitWidth = 376
Width = 376
end
end
end
@ -368,10 +366,20 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 521
inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewCliente1.dsContacto
ExplicitWidth = 862
ExplicitWidth = 521
Width = 521
end
end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
inherited dxLayoutControlContactoGroup100: TdxLayoutGroup
Enabled = True
Visible = True
end
end
end
end
end
inherited dsContacto: TDADataSource
Left = 24
@ -386,7 +394,7 @@ inherited fEditorCliente: TfEditorCliente
Left = 0
Top = 0
Width = 923
Height = 499
Height = 496
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -397,12 +405,12 @@ inherited fEditorCliente: TfEditorCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited cxGrid: TcxGrid
Width = 923
Height = 474
ExplicitWidth = 882
ExplicitHeight = 461
Height = 471
ExplicitWidth = 923
ExplicitHeight = 471
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewID: TcxGridDBColumn
SortIndex = 0
@ -412,33 +420,21 @@ inherited fEditorCliente: TfEditorCliente
end
inherited ToolBar1: TToolBar
Width = 923
ExplicitWidth = 882
inherited ToolButton1: TToolButton
ExplicitWidth = 113
end
inherited ToolButton4: TToolButton
ExplicitWidth = 113
end
inherited ToolButton2: TToolButton
ExplicitWidth = 113
end
inherited ToolButton7: TToolButton
ExplicitWidth = 113
end
ExplicitWidth = 923
end
end
end
inherited pagPersonal: TTabSheet [2]
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited frViewPersonalContacto1: TfrViewPersonalContacto
Width = 923
Height = 499
Height = 496
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited cxGrid: TcxGrid
Width = 923
Height = 474
Height = 471
ExplicitWidth = 882
ExplicitHeight = 461
end
@ -601,6 +597,12 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 508
Width = 508
end
inherited ePrecioPunto: TcxDBCurrencyEdit
Top = 240
ExplicitTop = 240
ExplicitWidth = 239
Width = 239
end
inherited dxLayoutGroup1: TdxLayoutGroup
inherited dxLayoutControl1Group4: TdxLayoutGroup
inherited dxLayoutControl1Group5: TdxLayoutGroup
@ -615,12 +617,12 @@ inherited fEditorCliente: TfEditorCliente
end
inherited pagDatosBancarios: TTabSheet [4]
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
Width = 923
Height = 499
Height = 496
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited dxLayoutControl1: TdxLayoutControl
Width = 923
LookAndFeel = dxLayoutOfficeLookAndFeel
@ -634,12 +636,12 @@ inherited fEditorCliente: TfEditorCliente
Width = 345
end
inherited eSucursal: TcxDBTextEdit
Left = 564
Left = 565
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 564
ExplicitLeft = 565
ExplicitWidth = 318
Width = 318
end
@ -665,6 +667,14 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 743
Width = 743
end
inherited eIBAN: TcxDBTextEdit
ExplicitWidth = 782
Width = 782
end
inherited eSWIFT: TcxDBTextEdit
ExplicitWidth = 782
Width = 782
end
end
end
end
@ -676,7 +686,7 @@ inherited fEditorCliente: TfEditorCliente
Left = 0
Top = 0
Width = 923
Height = 499
Height = 496
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -687,10 +697,10 @@ inherited fEditorCliente: TfEditorCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited cxGrid: TcxGrid
Width = 923
Height = 474
Height = 471
ExplicitWidth = 882
ExplicitHeight = 461
end
@ -720,7 +730,7 @@ inherited fEditorCliente: TfEditorCliente
Left = 0
Top = 0
Width = 923
Height = 499
Height = 496
Align = alClient
AutoSize = True
Font.Charset = DEFAULT_CHARSET
@ -732,15 +742,15 @@ inherited fEditorCliente: TfEditorCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
inherited layoutApunte: TdxLayoutControl
Width = 923
Height = 499
Height = 496
ExplicitWidth = 923
ExplicitHeight = 499
ExplicitHeight = 496
DesignSize = (
923
499)
496)
inherited eRefSubCuenta: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''

41
Source/Modulos/Contactos/Views/uEditorContacto.dfm
View File

@ -7,12 +7,13 @@ inherited fEditorContacto: TfEditorContacto
ClientWidth = 632
Scaled = False
ExplicitWidth = 640
ExplicitHeight = 240
ExplicitHeight = 497
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 632
Caption = 'Contacto'
ExplicitTop = 52
ExplicitWidth = 632
inherited Image1: TImage
Left = 605
@ -23,7 +24,7 @@ inherited fEditorContacto: TfEditorContacto
Width = 632
ExplicitWidth = 632
inherited tbxMain: TTBXToolbar
ExplicitWidth = 330
ExplicitWidth = 370
inherited TBXItem2: TTBXItem
Visible = False
end
@ -83,15 +84,14 @@ inherited fEditorContacto: TfEditorContacto
end
inherited pgPaginas: TPageControl
Width = 626
ActivePage = pagPersonal
ExplicitTop = 79
ExplicitTop = 112
ExplicitWidth = 626
ExplicitHeight = 358
ExplicitHeight = 325
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 618
ExplicitHeight = 330
ExplicitHeight = 297
end
object pagDatosBancarios: TTabSheet
Caption = 'Datos bancarios'
@ -100,7 +100,7 @@ inherited fEditorContacto: TfEditorContacto
Left = 0
Top = 0
Width = 618
Height = 300
Height = 297
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -111,7 +111,7 @@ inherited fEditorContacto: TfEditorContacto
TabOrder = 0
ReadOnly = False
ExplicitWidth = 618
ExplicitHeight = 300
ExplicitHeight = 297
inherited dxLayoutControl1: TdxLayoutControl
Width = 618
LookAndFeel = dxLayoutOfficeLookAndFeel
@ -127,13 +127,13 @@ inherited fEditorContacto: TfEditorContacto
Width = 114
end
inherited eSucursal: TcxDBTextEdit
Left = 403
Left = 405
Top = 57
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 403
ExplicitLeft = 405
ExplicitTop = 57
ExplicitWidth = 112
Width = 112
@ -166,6 +166,18 @@ inherited fEditorContacto: TfEditorContacto
ExplicitWidth = 194
Width = 194
end
inherited eIBAN: TcxDBTextEdit
Top = 111
ExplicitTop = 111
ExplicitWidth = 782
Width = 782
end
inherited eSWIFT: TcxDBTextEdit
Top = 138
ExplicitTop = 138
ExplicitWidth = 782
Width = 782
end
end
end
end
@ -176,7 +188,7 @@ inherited fEditorContacto: TfEditorContacto
Left = 0
Top = 0
Width = 618
Height = 300
Height = 297
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -187,12 +199,12 @@ inherited fEditorContacto: TfEditorContacto
TabOrder = 0
ReadOnly = False
ExplicitWidth = 618
ExplicitHeight = 300
ExplicitHeight = 297
inherited cxGrid: TcxGrid
Width = 618
Height = 275
Height = 272
ExplicitWidth = 618
ExplicitHeight = 305
ExplicitHeight = 272
end
inherited ToolBar1: TToolBar
Width = 618
@ -215,6 +227,7 @@ inherited fEditorContacto: TfEditorContacto
end
inherited PnlComentario: TPanel
Width = 632
ExplicitTop = 79
ExplicitWidth = 632
end
inherited dsDataTable: TDADataSource [5]

12
Source/Modulos/Contactos/Views/uViewCliente.dfm
View File

@ -3,6 +3,7 @@ inherited frViewCliente: TfrViewCliente
Height = 563
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
OnShow = CustomViewShow
ExplicitWidth = 646
ExplicitHeight = 563
inherited dxLayoutControlContacto: TdxLayoutControl
@ -32,8 +33,6 @@ inherited frViewCliente: TfrViewCliente
TabOrder = 7
ExplicitLeft = 132
ExplicitTop = 220
ExplicitWidth = 181
Width = 181
end
inherited cbProvincia: TcxDBComboBox
Left = 132
@ -335,8 +334,6 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 132
ExplicitWidth = 38
Width = 38
end
inherited ePersonaContacto: TcxDBTextEdit
Left = 132
@ -348,14 +345,11 @@ inherited frViewCliente: TfrViewCliente
TabOrder = 11
ExplicitLeft = 132
ExplicitTop = 301
ExplicitWidth = 256
Width = 256
end
inherited frViewTienda1: TfrViewTienda
Left = 344
Width = 270
AutoSize = True
Enabled = False
TabOrder = 21
ExplicitLeft = 344
ExplicitWidth = 270
@ -367,8 +361,6 @@ inherited frViewCliente: TfrViewCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 376
Width = 376
end
end
end
@ -444,8 +436,6 @@ inherited frViewCliente: TfrViewCliente
inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
inherited dxLayoutControlContactoGroup100: TdxLayoutGroup
Caption = 'El cliente pertenece a la tienda'
Enabled = False
Visible = False
end
end
end

19
Source/Modulos/Contactos/Views/uViewCliente.pas
View File

@ -43,6 +43,7 @@ type
procedure cbProcedenciaClientePropertiesInitPopup(Sender: TObject);
procedure cbProcedenciaClientePropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure CustomViewShow(Sender: TObject);
protected
FGrupoController: IGruposClienteController;
FProcedenciaController: IProcedenciasClienteController;
@ -54,7 +55,7 @@ implementation
{$R *.dfm}
uses
uBizGruposCliente, uBizProcedenciasCliente;
uBizGruposCliente, uBizProcedenciasCliente, uFactuGES_App;
{ TfrViewCliente }
@ -161,6 +162,22 @@ begin
inherited;
end;
procedure TfrViewCliente.CustomViewShow(Sender: TObject);
begin
inherited;
//Solo se ve campo tienda en Graden
if (AppFactuGES.EmpresaActiva.ID = 1) then
begin
dxLayoutControlContactoGroup100.Enabled := False;
dxLayoutControlContactoGroup100.Visible := False;
end
else
begin
dxLayoutControlContactoGroup100.Enabled := True;
dxLayoutControlContactoGroup100.Visible := True;
end;
end;
procedure TfrViewCliente.SetContacto(const Value: IBizContacto);
begin
inherited;

4
Source/Modulos/Contactos/Views/uViewClientes.dfm
View File

@ -39,10 +39,6 @@ inherited frViewClientes: TfrViewClientes
VisibleForCustomization = False
Width = 22
end
inherited cxGridViewTIENDA: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [6]
DataBinding.FieldName = 'NOMBRE_COMERCIAL'
Width = 164

6
Source/Modulos/Contactos/Views/uViewContacto.dfm
View File

@ -473,6 +473,7 @@ inherited frViewContacto: TfrViewContacto
ExplicitLeft = 312
ExplicitTop = 280
inherited dxLayoutControl1: TdxLayoutControl
ExplicitWidth = 290
inherited cbTienda: TcxComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
@ -502,7 +503,8 @@ inherited frViewContacto: TfrViewContacto
inherited memObservaciones: TcxDBMemo
DataBinding.DataField = 'NOTAS'
DataBinding.DataSource = dsContacto
ExplicitHeight = 228
ExplicitWidth = 580
ExplicitHeight = 163
Height = 228
end
end
@ -700,6 +702,8 @@ inherited frViewContacto: TfrViewContacto
object dxLayoutControlContactoGroup100: TdxLayoutGroup
AutoAligns = [aaHorizontal]
Caption = 'El contacto pertenece a la tienda'
Enabled = False
Visible = False
object dxLayoutControlContactoItem16: TdxLayoutItem
Caption = 'New Item'
ShowCaption = False

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

@ -75,6 +75,7 @@ type
function MandarFabrica(AContrato: IBizContratoCliente): Boolean;
function AceptarContrato(AContrato: IBizContratoCliente): Boolean;
function AnadirIncidenciaContrato(AIdContrato: Integer): Boolean;
end;
TContratosClienteController = class(TControllerBase, IContratosClienteController)
@ -160,6 +161,7 @@ type
function MandarFabrica(AContrato: IBizContratoCliente): Boolean;
function AceptarContrato(AContrato: IBizContratoCliente): Boolean;
function AnadirIncidenciaContrato(AIdContrato: Integer): Boolean;
end;
implementation
@ -213,7 +215,7 @@ begin
ADestino.PROPIEDAD := AOrigen.PROPIEDAD;
ADestino.CONCEPTO := AOrigen.CONCEPTO;
// Se copia como variant para que no convierta a double y meta ceros.
ADestino.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCANTIDAD).AsVariant := AOrigen.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCANTIDAD).AsVariant;
ADestino.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCANTIDAD).AsFloat := AOrigen.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCANTIDAD).AsFloat;
// ADestino.CANTIDAD := AOrigen.CANTIDAD;
ADestino.DataTable.FieldByName(fld_PresupuestosCliente_DetallesIMPORTE_UNIDAD).AsVariant := AOrigen.DataTable.FieldByName(fld_PresupuestosCliente_DetallesIMPORTE_UNIDAD).AsVariant;
// ADestino.IMPORTE_UNIDAD := AOrigen.IMPORTE_UNIDAD;
@ -425,6 +427,13 @@ begin
if bEnEdicion then
AContratos.Edit;
//En el caso de ser 1 contrato a partir de 1 presupuesto copiamos las referencias de cliente y la tienda del presupuesto origen
if (AListaPresupuestos.DataTable.RecordCount = 1) then
begin
AContratos.REFERENCIA_CLIENTE := AListaPresupuestos.REFERENCIA_CLIENTE;
AContratos.ID_TIENDA := AListaPresupuestos.ID_TIENDA;
end;
AContratoActual := AContratos;
end;
@ -522,6 +531,12 @@ begin
end;
end;
function TContratosClienteController.AnadirIncidenciaContrato(
AIdContrato: Integer): Boolean;
begin
Result := FDataModule.AnadirIncidenciaContrato(AIdContrato);
end;
procedure TContratosClienteController.AsignarDataModule;
begin
FDataModule := TDataModuleContratosCliente.Create(Nil);
@ -591,9 +606,12 @@ begin
AContrato.DataTable.Edit;
AContrato.SITUACION := Situacion;
AContrato.DataTable.Post;
if (not AContrato.ID_CONTRATO_ASOCIADOIsNull)
and (AContrato.SITUACION = SITUACION_CONTRATO_CANCELADO) then
Self.AnadirIncidenciaContrato(AContrato.ID_CONTRATO_ASOCIADO);
end;
//En el caso de querer eliminar todos los items del objeto AContrato
//En el caso de querer cambiar todos los items del objeto AContrato
if AllItems then
begin
with AContrato.DataTable do
@ -606,6 +624,8 @@ begin
AContrato.DataTable.Edit;
AContrato.SITUACION := Situacion;
AContrato.DataTable.Post;
if not AContrato.ID_CONTRATO_ASOCIADOIsNull then
Self.AnadirIncidenciaContrato(AContrato.ID_CONTRATO_ASOCIADO);
end;
Next;
end;
@ -703,6 +723,8 @@ begin
FECHA_CONTRATO := DateOf(Now);
INCIDENCIAS_ACTIVAS := 0;
INCIDENCIASIsNull := True;
ENVIADA_REVISADA := 0;
ID_CONTRATO_ASOCIADOIsNull := True;
// ID_FACTURAIsNull := True;
REFERENCIA := '';
SITUACION := SITUACION_CONTRATO_PENDIENTE;

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

@ -56,6 +56,7 @@ type
function GetAnosItems : TStringList;
function GetContratosClienteBeneficios : IBizContratosClienteBeneficios;
function AnadirIncidenciaContrato(const id_contrato: Integer): Boolean;
end;
implementation
@ -68,6 +69,12 @@ uses
{ TdmContratosCliente }
function TDataModuleContratosCliente.AnadirIncidenciaContrato(
const id_contrato: Integer): Boolean;
begin
Result := (RORemoteService as IsrvContratosCliente).AnadirIncidenciaContrato(id_contrato);
end;
procedure TDataModuleContratosCliente.AsignarClaseNegocio(AContrato: TDADataTable);
begin
AContrato.BusinessRulesID := BIZ_CLIENT_CONTRATO_CLIENTE;

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

@ -15,6 +15,7 @@ type
function GetItem(const ID : Integer) : IBizContratoCliente;
function NewItem : IBizContratoCliente;
function GetContratosClienteBeneficios : IBizContratosClienteBeneficios;
function AnadirIncidenciaContrato(const id_contrato: Integer): Boolean;
end;
implementation

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

@ -9,13 +9,13 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_Valores = '{D5E5E35F-2DA7-48D2-A379-56EB76852FBC}';
RID_Propiedades = '{57E36EAD-2E69-4822-8D20-27E700CDA02A}';
RID_ListaAnosContratos = '{332766CB-3910-4BF6-8FE4-A4FC2C9401AD}';
RID_ContratosClienteBeneficios = '{7661D161-1EC2-47AE-B690-531646C455D7}';
RID_ContratosCliente = '{7BF6D9BC-9390-4F1D-BF55-65ABF0C0E538}';
RID_TiposCapitulos = '{30C7D945-8123-4220-80A8-053F36943EF7}';
RID_ContratosCliente_Detalles = '{12571A19-998F-484D-BB5E-EDF3F13F424C}';
RID_Valores = '{8ACAF219-8101-4DAD-BF41-5ED9197B7AEA}';
RID_Propiedades = '{D7E9DBD6-13C0-4C9D-A088-C2289FF4E94C}';
RID_ListaAnosContratos = '{AA2B5D48-D253-469C-AF7A-F69F3A4855BE}';
RID_ContratosClienteBeneficios = '{BF9F1FA6-4537-49DD-BAD6-ED5089323CF1}';
RID_ContratosCliente = '{1B1ED532-8A4F-42AF-8DDB-0B357CDEC752}';
RID_TiposCapitulos = '{1B246FE2-B5BC-482A-BA80-09BEE78E6B47}';
RID_ContratosCliente_Detalles = '{6C4DA840-1DEC-4A3A-B313-22662176E271}';
{ Data table names }
nme_Valores = 'Valores';
@ -271,7 +271,7 @@ const
type
{ IValores }
IValores = interface(IDAStronglyTypedDataTable)
['{DC31F047-82DF-4D1E-9D34-58E8185C7777}']
['{705F78EB-86CF-4A91-B549-3E33D21ED403}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -330,7 +330,7 @@ type
{ IPropiedades }
IPropiedades = interface(IDAStronglyTypedDataTable)
['{AF55E67B-6949-47CD-941C-28EA29930113}']
['{BC20A9B4-71D3-4A1E-98F7-D02E4C048CE7}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -389,7 +389,7 @@ type
{ IListaAnosContratos }
IListaAnosContratos = interface(IDAStronglyTypedDataTable)
['{A5F01DD2-681C-46B7-B1A5-F537E7A9C576}']
['{668486B3-25A1-4453-A0C1-638ECF020E58}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@ -424,7 +424,7 @@ type
{ IContratosClienteBeneficios }
IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
['{039CC4EF-AF47-47D9-BCD9-FD711CC078BD}']
['{4D7889FC-42CB-4859-86A4-CE9211D0D593}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -627,7 +627,7 @@ type
{ IContratosCliente }
IContratosCliente = interface(IDAStronglyTypedDataTable)
['{F3FEC1BB-9BE8-4AAD-8E45-7F8FBDF849C7}']
['{F63FB999-3889-45F4-9BC7-6E06A9D18E71}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1373,7 +1373,7 @@ type
}
{ ITiposCapitulos }
ITiposCapitulos = interface(IDAStronglyTypedDataTable)
['{55353FAD-BDD3-4139-8528-B14F80FA3250}']
['{D55205DF-DD63-42BD-B89C-7B46709D972E}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1468,7 +1468,7 @@ type
{ IContratosCliente_Detalles }
IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{58973079-33E4-4FD7-9D90-5022EB5FE0E1}']
['{C9DC930F-F554-469D-9644-0FFB9551249F}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);

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

@ -9,18 +9,18 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_ValoresDelta = '{AB534F6D-5CB4-42AE-99A6-DB32A159786A}';
RID_PropiedadesDelta = '{0A5AD994-2440-429C-ABFF-1A05AF5DC3BD}';
RID_ListaAnosContratosDelta = '{C4285284-A679-4D2C-951A-917136D03E11}';
RID_ContratosClienteBeneficiosDelta = '{22C5CA7A-0598-4FF2-83F9-20D7A73F174B}';
RID_ContratosClienteDelta = '{540F2A27-DE58-4367-92D9-9033464DF39E}';
RID_TiposCapitulosDelta = '{46EF310E-1A4F-4C79-B660-A75D73C0ECF8}';
RID_ContratosCliente_DetallesDelta = '{83816E0E-FC42-447E-BEFB-CC135039BF11}';
RID_ValoresDelta = '{B1DDE678-7C06-4F0F-A1A0-7C88498BFBCF}';
RID_PropiedadesDelta = '{98B8D0C8-5C71-437A-9D8E-F1C5529264D0}';
RID_ListaAnosContratosDelta = '{251E5873-5A2B-4DD9-A437-A4AA686545E7}';
RID_ContratosClienteBeneficiosDelta = '{14FFEEE8-E584-4327-9AE0-CBA2F8F7B787}';
RID_ContratosClienteDelta = '{4D93A3D6-EC00-4933-A6CA-F7B9FE480CA2}';
RID_TiposCapitulosDelta = '{31536ABE-8759-41FD-8890-F292958DCBA0}';
RID_ContratosCliente_DetallesDelta = '{8DC57EB7-7682-4AA2-B800-37BA98492A26}';
type
{ IValoresDelta }
IValoresDelta = interface(IValores)
['{AB534F6D-5CB4-42AE-99A6-DB32A159786A}']
['{B1DDE678-7C06-4F0F-A1A0-7C88498BFBCF}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_PROPIEDADValue : Integer;
@ -78,7 +78,7 @@ type
{ IPropiedadesDelta }
IPropiedadesDelta = interface(IPropiedades)
['{0A5AD994-2440-429C-ABFF-1A05AF5DC3BD}']
['{98B8D0C8-5C71-437A-9D8E-F1C5529264D0}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -136,7 +136,7 @@ type
{ IListaAnosContratosDelta }
IListaAnosContratosDelta = interface(IListaAnosContratos)
['{C4285284-A679-4D2C-951A-917136D03E11}']
['{251E5873-5A2B-4DD9-A437-A4AA686545E7}']
{ Property getters and setters }
function GetOldANOValue : String;
@ -170,7 +170,7 @@ type
{ IContratosClienteBeneficiosDelta }
IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
['{22C5CA7A-0598-4FF2-83F9-20D7A73F174B}']
['{14FFEEE8-E584-4327-9AE0-CBA2F8F7B787}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldREFERENCIAValue : String;
@ -372,7 +372,7 @@ type
{ IContratosClienteDelta }
IContratosClienteDelta = interface(IContratosCliente)
['{540F2A27-DE58-4367-92D9-9033464DF39E}']
['{4D93A3D6-EC00-4933-A6CA-F7B9FE480CA2}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -1118,7 +1118,7 @@ type
{ ITiposCapitulosDelta }
ITiposCapitulosDelta = interface(ITiposCapitulos)
['{46EF310E-1A4F-4C79-B660-A75D73C0ECF8}']
['{31536ABE-8759-41FD-8890-F292958DCBA0}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldPOSICIONValue : Integer;
@ -1212,7 +1212,7 @@ type
{ IContratosCliente_DetallesDelta }
IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
['{83816E0E-FC42-447E-BEFB-CC135039BF11}']
['{8DC57EB7-7682-4AA2-B800-37BA98492A26}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTRATOValue : Integer;

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

@ -20,6 +20,7 @@ const
CTE_CLIENTE_PARA_FABRICA = 2000000005;
SITUACION_CONTRATO_PENDIENTE = 'PENDIENTE';
SITUACION_CONTRATO_TERMINADO = 'TERMINADO';
SITUACION_CONTRATO_CANCELADO = 'CANCELADO';
type
@ -213,6 +214,7 @@ begin
begin
Add(SITUACION_CONTRATO_PENDIENTE);
Add(SITUACION_CONTRATO_TERMINADO);
Add(SITUACION_CONTRATO_CANCELADO);
end;
end;

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

@ -1422,6 +1422,24 @@ object srvContratosCliente: TsrvContratosCliente
end>
Name = 'Insert_ContratosCliente'
end
item
Params = <
item
Name = 'id_contrato'
DataType = datInteger
Value = ''
end>
Statements = <
item
ConnectionType = 'Interbase'
Default = True
Name = 'IBX'
SQL = 'execute procedure PROC_SET_INC_CONTRATO_ENVIADO :id_contrato'#10
StatementType = stSQL
ColumnMappings = <>
end>
Name = 'AnadirIncidenciaContrato'
end
item
Params = <
item

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

@ -37,6 +37,7 @@ type
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const NombreEmpresa: AnsiString; const VerLogotipo: Boolean; const VerPrecios: Boolean; const VerTotales: Boolean): Binary;
function GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary;
function AnadirIncidenciaContrato(const id_contrato: Integer): Boolean;
end;
implementation
@ -55,6 +56,22 @@ end;
{ srvContratosCliente }
function TsrvContratosCliente.AnadirIncidenciaContrato(
const id_contrato: Integer): Boolean;
begin
Result := False;
Connection.BeginTransaction;
try
schContratosCLiente.NewCommand(Connection, 'AnadirIncidenciaContrato', ['ID_CONTRATO'], [ID_CONTRATO]);
Connection.CommitTransaction;
Result := True;
except
Connection.RollbackTransaction;
RaiseError('Error al añadir incidencia a contrato asociado');
end;
end;
procedure TsrvContratosCliente.DARemoteServiceBeforeGetDatasetData(
const Dataset: IDADataset; const IncludeSchema: Boolean;
const MaxRecords: Integer);

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

@ -243,6 +243,10 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
Action = actTerminar
DisplayMode = nbdmImageAndText
end
object TBXItem51: TTBXItem
Action = actCancelar
DisplayMode = nbdmImageAndText
end
end
end
inherited StatusBar: TJvStatusBar
@ -320,6 +324,12 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
OnExecute = actAceptadoExecute
OnUpdate = actAceptadoUpdate
end
object actCancelar: TAction
Caption = 'Cancelar'
ImageIndex = 26
OnExecute = actCancelarExecute
OnUpdate = actCancelarUpdate
end
end
inherited SmallImages: TPngImageList
PngImages = <

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

@ -56,6 +56,8 @@ type
TBXSeparatorItem21: TTBXSeparatorItem;
actAceptado: TAction;
TBXItem50: TTBXItem;
actCancelar: TAction;
TBXItem51: TTBXItem;
procedure FormShow(Sender: TObject);
procedure actGenerarAlbaranCliExecute(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject);
@ -85,6 +87,8 @@ type
procedure actTerminarUpdate(Sender: TObject);
procedure actAceptadoExecute(Sender: TObject);
procedure actAceptadoUpdate(Sender: TObject);
procedure actCancelarExecute(Sender: TObject);
procedure actCancelarUpdate(Sender: TObject);
protected
FContratos: IBizContratoCliente;
@ -176,6 +180,7 @@ begin
and ViewGrid.esSeleccionCeldaDatos
and not (ViewGrid.NumSeleccionados > 1)
and (FContratos.SITUACION <> SITUACION_CONTRATO_TERMINADO)
and (FContratos.SITUACION <> SITUACION_CONTRATO_CANCELADO)
and (FContratos.ENVIADA_REVISADA = CONST_CONTRATO_RECIBIDO_UECKO)
end;
@ -281,6 +286,45 @@ begin
}
end;
procedure TfEditorContratosCliente.actCancelarExecute(Sender: TObject);
var
AContratos: IBizContratoCliente;
AllItems: Boolean;
begin
inherited;
AContratos := Nil;
AllItems := False;
if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1);
if AllItems then
begin
SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Contratos as ISeleccionable).SelectedRecords);
AContratos := (Controller as IContratosClienteController).ExtraerSeleccionados(Contratos) as IBizContratoCliente;
end
else begin
AContratos := Contratos;
end;
ViewGrid._Grid.BeginUpdate;
if Assigned(AContratos) then
begin
FController.CambiarSituacion(AContratos, SITUACION_CONTRATO_CANCELADO, now, AllItems);
actRefrescar.Execute;
end;
ViewGrid._Grid.EndUpdate;
end;
procedure TfEditorContratosCliente.actCancelarUpdate(Sender: TObject);
begin
inherited;
(Sender as TAction).Enabled := HayDatos
and ViewGrid.esSeleccionCeldaDatos
and (FContratos.SITUACION <> SITUACION_CONTRATO_CANCELADO)
and (FContratos.SITUACION <> SITUACION_CONTRATO_TERMINADO);
end;
procedure TfEditorContratosCliente.actEliminarUpdate(Sender: TObject);
begin
inherited;
@ -478,6 +522,7 @@ begin
inherited;
(Sender as TAction).Enabled := HayDatos
and ViewGrid.esSeleccionCeldaDatos
and (FContratos.SITUACION <> SITUACION_CONTRATO_CANCELADO)
and (FContratos.SITUACION <> SITUACION_CONTRATO_TERMINADO);
end;

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

@ -144,6 +144,10 @@ inherited frViewContratoCliente: TfrViewContratoCliente
item
Description = 'TERMINADO'
Value = 'TERMINADO'
end
item
Description = 'CANCELADO'
Value = 'CANCELADO'
end>
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D

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

@ -196,6 +196,9 @@ inherited frViewContratosCliente: TfrViewContratosCliente
object cxGridLevelTerminados: TcxGridLevel
Caption = 'Terminados'
end
object cxGridLevelCancelados: TcxGridLevel
Caption = 'Cancelados'
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 903

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

@ -57,6 +57,7 @@ type
cxGridLevelPendientesRevisar: TcxGridLevel;
cxStylePENDIENTESREVISION: TcxStyle;
cxGridViewENVIADA_REVISADA: TcxGridDBColumn;
cxGridLevelCancelados: TcxGridLevel;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel);
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
@ -174,6 +175,7 @@ begin
1 : FFiltro.AddItem(cxGridViewENVIADA_REVISADA, foEqual, '2', '2');
2 : FFiltro.AddItem(cxGridViewSITUACION, foEqual, SITUACION_CONTRATO_PENDIENTE, SITUACION_CONTRATO_PENDIENTE);
3 : FFiltro.AddItem(cxGridViewSITUACION, foEqual, SITUACION_CONTRATO_TERMINADO, SITUACION_CONTRATO_TERMINADO);
4 : FFiltro.AddItem(cxGridViewSITUACION, foEqual, SITUACION_CONTRATO_CANCELADO, SITUACION_CONTRATO_CANCELADO);
end;
end;
@ -302,7 +304,8 @@ begin
else
AStyle.TextColor := cxStylePENDIENTES.TextColor;
end
else if ASituacion = SITUACION_CONTRATO_TERMINADO then
else if (ASituacion = SITUACION_CONTRATO_TERMINADO)
or (ASituacion = SITUACION_CONTRATO_CANCELADO) then
AStyle.TextColor := cxStyleTERMINADO.TextColor
end;
end;

105
Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm
View File

@ -1,91 +1,5 @@
inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
Width = 1095
inherited ToolBar1: TToolBar
Width = 1095
Height = 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
ExplicitLeft = 513
ExplicitTop = 0
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 1095
Height = 254
ExplicitTop = 78
ExplicitWidth = 451
ExplicitHeight = 232
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewID_ARTICULO: TcxGridDBColumn
Width = 57
@ -153,10 +67,7 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
end
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 1095
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 831
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText
@ -209,6 +120,12 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
object TBXItem23: TTBXItem
Action = actCapituloClaSemSuspendido
end
object TBXItem27: TTBXItem
Action = actCapituloServSuministro
end
object TBXItem28: TTBXItem
Action = actCapituloServInstalacion
end
end
object TBXSeparatorItem6: TTBXSeparatorItem [1]
end
@ -396,6 +313,16 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
Caption = 'Cap'#237'tulo cl'#225'sico/semisuspendido/suspendido'
OnExecute = actCapituloClaSemSuspendidoExecute
end
object actCapituloServInstalacion: TAction
Category = 'Operaciones'
Caption = 'Servicio de intalaci'#243'n'
OnExecute = actCapituloServInstalacionExecute
end
object actCapituloServSuministro: TAction
Category = 'Operaciones'
Caption = 'Servicio de suministro'
OnExecute = actCapituloServSuministroExecute
end
end
inherited cxStyleRepository: TcxStyleRepository
inherited cxStyle_IMPORTETOTAL: TcxStyle

20
Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas
View File

@ -70,6 +70,10 @@ type
edtPrecioPunto: TcxDBCurrencyEdit;
bRecalcularPrecioPunto: TButton;
TBXLabelItem1: TTBXLabelItem;
actCapituloServInstalacion: TAction;
actCapituloServSuministro: TAction;
TBXItem27: TTBXItem;
TBXItem28: TTBXItem;
procedure actAsignarDescuentoExecute(Sender: TObject);
procedure actAsignarDescuentoUpdate(Sender: TObject);
procedure CustomViewShow(Sender: TObject);
@ -93,6 +97,8 @@ type
procedure actCapituloFreArmAbatibleExecute(Sender: TObject);
procedure actCapituloIntArmForradoExecute(Sender: TObject);
procedure actCapituloClaSemSuspendidoExecute(Sender: TObject);
procedure actCapituloServSuministroExecute(Sender: TObject);
procedure actCapituloServInstalacionExecute(Sender: TObject);
private
procedure AnadirCapitulo(const Tipo: String;const Descripcion: String; const Descuento:Boolean = false; const ConstanteConfiguracion: String = '');
@ -247,6 +253,20 @@ begin
AnadirCapitulo(TIPO_CAPITULO_V, 'SEPARACIÓN DE AMBIENTES', true, 'CAP_SEP_AMBIENTES');
end;
procedure TfrViewDetallesContratoCliente.actCapituloServInstalacionExecute(
Sender: TObject);
begin
inherited;
AnadirCapitulo(TIPO_CAPITULO_V, 'SERVICIO DE INSTALACIÓN - PRECIO NETO', true, 'CAP_INSTALACION');
end;
procedure TfrViewDetallesContratoCliente.actCapituloServSuministroExecute(
Sender: TObject);
begin
inherited;
AnadirCapitulo(TIPO_CAPITULO_V, 'SERVICIO DE SUMINISTRO - PRECIO NETO', true, 'CAP_SUMINISTRO');
end;
procedure TfrViewDetallesContratoCliente.actCapituloVariosExecute(Sender: TObject);
begin
AnadirCapitulo(TIPO_CAPITULO_V, 'VARIOS ', true);

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

@ -138,7 +138,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;
@ -157,7 +157,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);

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

@ -517,12 +517,12 @@ 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, ID_CLIENTE, NOMBRE, TIP' +
'O_OPERACION, SITUACION, NIF_CIF, REFERENCIA_CLIENTE, FECHA_FACTU' +
'RA,'#10'FECHA_VENCIMIENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA, RE, IMP' +
'ORTE_RE, RETENCION, IMPORTE_RETENCION, IMPORTE_TOTAL'#10#10'from V_fac' +
'turas_cliente'#10'where {where}'#10'order by ANO, MES, FECHA_FACTURA, RE' +
'FERENCIA, NOMBRE'#10#10
'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, ID_CLIENTE, NOMBRE, TIE' +
'NDA, TIPO_OPERACION, SITUACION, NIF_CIF, REFERENCIA_CLIENTE, FEC' +
'HA_FACTURA,'#10'FECHA_VENCIMIENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA,' +
' RE, IMPORTE_RE, RETENCION, IMPORTE_RETENCION, IMPORTE_TOTAL'#10#10'fr' +
'om V_facturas_cliente'#10'where {where}'#10'order by ANO, MES, FECHA_FAC' +
'TURA, REFERENCIA, NOMBRE'#10#10
StatementType = stSQL
ColumnMappings = <
item
@ -608,6 +608,10 @@ object RptFacturasCliente: TRptFacturasCliente
item
DatasetField = 'TIPO_OPERACION'
TableField = 'TIPO_OPERACION'
end
item
DatasetField = 'TIENDA'
TableField = 'TIENDA'
end>
end>
Name = 'ListadoFacturas'
@ -643,6 +647,11 @@ object RptFacturasCliente: TRptFacturasCliente
DataType = datString
Size = 255
end
item
Name = 'TIENDA'
DataType = datString
Size = 255
end
item
Name = 'TIPO_OPERACION'
DataType = datString
@ -1840,6 +1849,11 @@ object RptFacturasCliente: TRptFacturasCliente
DataType = datString
Size = 255
end
item
Name = 'TIENDA'
DataType = datString
Size = 255
end
item
Name = 'TIPO_OPERACION'
DataType = datString

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

@ -39,10 +39,10 @@ type
frxDBInformeListadoRecibos: TfrxDBDataset;
DADSInformeListadoRecibos: TDADataSource;
tbl_InformeListadoRecibos: TDAMemDataTable;
schReport: TDASchema;
frxDBInformeListadoFacturasTipoResumen: TfrxDBDataset;
DADSInformeListadoFacturasTipoResumen: TDADataSource;
tbl_InformeListadoFacturasTipoResumen: TDAMemDataTable;
schReport: TDASchema;
procedure DataModuleCreate(Sender: TObject);
procedure DataModuleDestroy(Sender: TObject);
private

4
Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedorServer.pas
View File

@ -106,7 +106,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;
procedure TBizFacturasProveedorServer.Delete_Asiento_Factura(aChange: TDADeltaChange);
@ -160,7 +160,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 TBizFacturasProveedorServer.Insert_Asiento_Factura(aChange: TDADeltaChange);

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

@ -151,6 +151,10 @@ inherited DataModuleInventario: TDataModuleInventario
DataType = datInteger
DictionaryEntry = 'Inventario_ID_ARTICULO'
end
item
Name = 'IMPORTE_COMPRA_2ANOS'
DataType = datFloat
end
item
Name = 'ALMACEN'
DataType = datString
@ -207,6 +211,10 @@ inherited DataModuleInventario: TDataModuleInventario
DisplayLabel = 'Stock disponible'
DictionaryEntry = 'Inventario_STOCK'
end
item
Name = 'COSTE_MEDIO_TOTAL'
DataType = datFloat
end
item
Name = 'UNIDADES_ALMACEN'
DataType = datFloat

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

@ -9,8 +9,8 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_Inventario = '{B4F5BFCB-5E60-44E2-9F51-D46E01753450}';
RID_DetalleReservas = '{1C1C05DA-433F-47B6-A266-2D336C83B210}';
RID_Inventario = '{1B4F1D93-3B21-4F7F-B2E3-BEEE56C078D5}';
RID_DetalleReservas = '{2752B8C5-D7AA-4D68-B8F8-7515748B36F6}';
{ Data table names }
nme_Inventario = 'Inventario';
@ -19,6 +19,7 @@ const
{ Inventario fields }
fld_InventarioID_ALMACEN = 'ID_ALMACEN';
fld_InventarioID_ARTICULO = 'ID_ARTICULO';
fld_InventarioIMPORTE_COMPRA_2ANOS = 'IMPORTE_COMPRA_2ANOS';
fld_InventarioALMACEN = 'ALMACEN';
fld_InventarioID_EMPRESA = 'ID_EMPRESA';
fld_InventarioREFERENCIA = 'REFERENCIA';
@ -28,6 +29,7 @@ const
fld_InventarioUNIDAD_MEDIDA = 'UNIDAD_MEDIDA';
fld_InventarioPRECIO_NETO = 'PRECIO_NETO';
fld_InventarioSTOCK = 'STOCK';
fld_InventarioCOSTE_MEDIO_TOTAL = 'COSTE_MEDIO_TOTAL';
fld_InventarioUNIDADES_ALMACEN = 'UNIDADES_ALMACEN';
fld_InventarioCOSTE_UNIDADES = 'COSTE_UNIDADES';
fld_InventarioRESERVA = 'RESERVA';
@ -41,24 +43,26 @@ const
{ Inventario field indexes }
idx_InventarioID_ALMACEN = 0;
idx_InventarioID_ARTICULO = 1;
idx_InventarioALMACEN = 2;
idx_InventarioID_EMPRESA = 3;
idx_InventarioREFERENCIA = 4;
idx_InventarioFAMILIA = 5;
idx_InventarioDESCRIPCION = 6;
idx_InventarioSTOCK_MIN = 7;
idx_InventarioUNIDAD_MEDIDA = 8;
idx_InventarioPRECIO_NETO = 9;
idx_InventarioSTOCK = 10;
idx_InventarioUNIDADES_ALMACEN = 11;
idx_InventarioCOSTE_UNIDADES = 12;
idx_InventarioRESERVA = 13;
idx_InventarioPENDIENTE_RECEPCION = 14;
idx_InventarioID = 15;
idx_InventarioCANTIDAD = 16;
idx_InventarioFECHA_MOVIMIENTO = 17;
idx_InventarioCAUSA = 18;
idx_InventarioTIPO = 19;
idx_InventarioIMPORTE_COMPRA_2ANOS = 2;
idx_InventarioALMACEN = 3;
idx_InventarioID_EMPRESA = 4;
idx_InventarioREFERENCIA = 5;
idx_InventarioFAMILIA = 6;
idx_InventarioDESCRIPCION = 7;
idx_InventarioSTOCK_MIN = 8;
idx_InventarioUNIDAD_MEDIDA = 9;
idx_InventarioPRECIO_NETO = 10;
idx_InventarioSTOCK = 11;
idx_InventarioCOSTE_MEDIO_TOTAL = 12;
idx_InventarioUNIDADES_ALMACEN = 13;
idx_InventarioCOSTE_UNIDADES = 14;
idx_InventarioRESERVA = 15;
idx_InventarioPENDIENTE_RECEPCION = 16;
idx_InventarioID = 17;
idx_InventarioCANTIDAD = 18;
idx_InventarioFECHA_MOVIMIENTO = 19;
idx_InventarioCAUSA = 20;
idx_InventarioTIPO = 21;
{ DetalleReservas fields }
fld_DetalleReservasID_ALB = 'ID_ALB';
@ -97,7 +101,7 @@ const
type
{ IInventario }
IInventario = interface(IDAStronglyTypedDataTable)
['{BC476EE1-F111-443D-8677-EFF52FE1308B}']
['{AE23D1E9-7763-4A76-8CCA-FE0C27B55050}']
{ Property getters and setters }
function GetID_ALMACENValue: Integer;
procedure SetID_ALMACENValue(const aValue: Integer);
@ -107,6 +111,10 @@ type
procedure SetID_ARTICULOValue(const aValue: Integer);
function GetID_ARTICULOIsNull: Boolean;
procedure SetID_ARTICULOIsNull(const aValue: Boolean);
function GetIMPORTE_COMPRA_2ANOSValue: Float;
procedure SetIMPORTE_COMPRA_2ANOSValue(const aValue: Float);
function GetIMPORTE_COMPRA_2ANOSIsNull: Boolean;
procedure SetIMPORTE_COMPRA_2ANOSIsNull(const aValue: Boolean);
function GetALMACENValue: String;
procedure SetALMACENValue(const aValue: String);
function GetALMACENIsNull: Boolean;
@ -143,6 +151,10 @@ type
procedure SetSTOCKValue(const aValue: Float);
function GetSTOCKIsNull: Boolean;
procedure SetSTOCKIsNull(const aValue: Boolean);
function GetCOSTE_MEDIO_TOTALValue: Float;
procedure SetCOSTE_MEDIO_TOTALValue(const aValue: Float);
function GetCOSTE_MEDIO_TOTALIsNull: Boolean;
procedure SetCOSTE_MEDIO_TOTALIsNull(const aValue: Boolean);
function GetUNIDADES_ALMACENValue: Float;
procedure SetUNIDADES_ALMACENValue(const aValue: Float);
function GetUNIDADES_ALMACENIsNull: Boolean;
@ -186,6 +198,8 @@ type
property ID_ALMACENIsNull: Boolean read GetID_ALMACENIsNull write SetID_ALMACENIsNull;
property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue;
property ID_ARTICULOIsNull: Boolean read GetID_ARTICULOIsNull write SetID_ARTICULOIsNull;
property IMPORTE_COMPRA_2ANOS: Float read GetIMPORTE_COMPRA_2ANOSValue write SetIMPORTE_COMPRA_2ANOSValue;
property IMPORTE_COMPRA_2ANOSIsNull: Boolean read GetIMPORTE_COMPRA_2ANOSIsNull write SetIMPORTE_COMPRA_2ANOSIsNull;
property ALMACEN: String read GetALMACENValue write SetALMACENValue;
property ALMACENIsNull: Boolean read GetALMACENIsNull write SetALMACENIsNull;
property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue;
@ -204,6 +218,8 @@ type
property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
property STOCK: Float read GetSTOCKValue write SetSTOCKValue;
property STOCKIsNull: Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
property COSTE_MEDIO_TOTAL: Float read GetCOSTE_MEDIO_TOTALValue write SetCOSTE_MEDIO_TOTALValue;
property COSTE_MEDIO_TOTALIsNull: Boolean read GetCOSTE_MEDIO_TOTALIsNull write SetCOSTE_MEDIO_TOTALIsNull;
property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull: Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property COSTE_UNIDADES: Currency read GetCOSTE_UNIDADESValue write SetCOSTE_UNIDADESValue;
@ -237,6 +253,10 @@ type
procedure SetID_ARTICULOValue(const aValue: Integer); virtual;
function GetID_ARTICULOIsNull: Boolean; virtual;
procedure SetID_ARTICULOIsNull(const aValue: Boolean); virtual;
function GetIMPORTE_COMPRA_2ANOSValue: Float; virtual;
procedure SetIMPORTE_COMPRA_2ANOSValue(const aValue: Float); virtual;
function GetIMPORTE_COMPRA_2ANOSIsNull: Boolean; virtual;
procedure SetIMPORTE_COMPRA_2ANOSIsNull(const aValue: Boolean); virtual;
function GetALMACENValue: String; virtual;
procedure SetALMACENValue(const aValue: String); virtual;
function GetALMACENIsNull: Boolean; virtual;
@ -273,6 +293,10 @@ type
procedure SetSTOCKValue(const aValue: Float); virtual;
function GetSTOCKIsNull: Boolean; virtual;
procedure SetSTOCKIsNull(const aValue: Boolean); virtual;
function GetCOSTE_MEDIO_TOTALValue: Float; virtual;
procedure SetCOSTE_MEDIO_TOTALValue(const aValue: Float); virtual;
function GetCOSTE_MEDIO_TOTALIsNull: Boolean; virtual;
procedure SetCOSTE_MEDIO_TOTALIsNull(const aValue: Boolean); virtual;
function GetUNIDADES_ALMACENValue: Float; virtual;
procedure SetUNIDADES_ALMACENValue(const aValue: Float); virtual;
function GetUNIDADES_ALMACENIsNull: Boolean; virtual;
@ -315,6 +339,8 @@ type
property ID_ALMACENIsNull: Boolean read GetID_ALMACENIsNull write SetID_ALMACENIsNull;
property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue;
property ID_ARTICULOIsNull: Boolean read GetID_ARTICULOIsNull write SetID_ARTICULOIsNull;
property IMPORTE_COMPRA_2ANOS: Float read GetIMPORTE_COMPRA_2ANOSValue write SetIMPORTE_COMPRA_2ANOSValue;
property IMPORTE_COMPRA_2ANOSIsNull: Boolean read GetIMPORTE_COMPRA_2ANOSIsNull write SetIMPORTE_COMPRA_2ANOSIsNull;
property ALMACEN: String read GetALMACENValue write SetALMACENValue;
property ALMACENIsNull: Boolean read GetALMACENIsNull write SetALMACENIsNull;
property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue;
@ -333,6 +359,8 @@ type
property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
property STOCK: Float read GetSTOCKValue write SetSTOCKValue;
property STOCKIsNull: Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
property COSTE_MEDIO_TOTAL: Float read GetCOSTE_MEDIO_TOTALValue write SetCOSTE_MEDIO_TOTALValue;
property COSTE_MEDIO_TOTALIsNull: Boolean read GetCOSTE_MEDIO_TOTALIsNull write SetCOSTE_MEDIO_TOTALIsNull;
property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull: Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property COSTE_UNIDADES: Currency read GetCOSTE_UNIDADESValue write SetCOSTE_UNIDADESValue;
@ -360,7 +388,7 @@ type
{ IDetalleReservas }
IDetalleReservas = interface(IDAStronglyTypedDataTable)
['{F164D65B-913A-43DF-9DC9-81E5E320EFF0}']
['{065A8DF8-D8C9-4A62-A9F4-68DF5D3ECCCE}']
{ Property getters and setters }
function GetID_ALBValue: Integer;
procedure SetID_ALBValue(const aValue: Integer);
@ -618,6 +646,27 @@ begin
DataTable.Fields[idx_InventarioID_ARTICULO].AsVariant := Null;
end;
function TInventarioDataTableRules.GetIMPORTE_COMPRA_2ANOSValue: Float;
begin
result := DataTable.Fields[idx_InventarioIMPORTE_COMPRA_2ANOS].AsFloat;
end;
procedure TInventarioDataTableRules.SetIMPORTE_COMPRA_2ANOSValue(const aValue: Float);
begin
DataTable.Fields[idx_InventarioIMPORTE_COMPRA_2ANOS].AsFloat := aValue;
end;
function TInventarioDataTableRules.GetIMPORTE_COMPRA_2ANOSIsNull: boolean;
begin
result := DataTable.Fields[idx_InventarioIMPORTE_COMPRA_2ANOS].IsNull;
end;
procedure TInventarioDataTableRules.SetIMPORTE_COMPRA_2ANOSIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_InventarioIMPORTE_COMPRA_2ANOS].AsVariant := Null;
end;
function TInventarioDataTableRules.GetALMACENValue: String;
begin
result := DataTable.Fields[idx_InventarioALMACEN].AsString;
@ -807,6 +856,27 @@ begin
DataTable.Fields[idx_InventarioSTOCK].AsVariant := Null;
end;
function TInventarioDataTableRules.GetCOSTE_MEDIO_TOTALValue: Float;
begin
result := DataTable.Fields[idx_InventarioCOSTE_MEDIO_TOTAL].AsFloat;
end;
procedure TInventarioDataTableRules.SetCOSTE_MEDIO_TOTALValue(const aValue: Float);
begin
DataTable.Fields[idx_InventarioCOSTE_MEDIO_TOTAL].AsFloat := aValue;
end;
function TInventarioDataTableRules.GetCOSTE_MEDIO_TOTALIsNull: boolean;
begin
result := DataTable.Fields[idx_InventarioCOSTE_MEDIO_TOTAL].IsNull;
end;
procedure TInventarioDataTableRules.SetCOSTE_MEDIO_TOTALIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_InventarioCOSTE_MEDIO_TOTAL].AsVariant := Null;
end;
function TInventarioDataTableRules.GetUNIDADES_ALMACENValue: Float;
begin
result := DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].AsFloat;

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

@ -9,16 +9,17 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_InventarioDelta = '{DBC2AE97-14F3-44D8-B34F-8298297B839F}';
RID_DetalleReservasDelta = '{7324C967-840D-4CDB-A68A-9D3066574877}';
RID_InventarioDelta = '{09F50187-2734-4616-80B4-DFF2242C0445}';
RID_DetalleReservasDelta = '{E72DD036-121B-4BB6-BDB2-4E6EEF9B05FA}';
type
{ IInventarioDelta }
IInventarioDelta = interface(IInventario)
['{DBC2AE97-14F3-44D8-B34F-8298297B839F}']
['{09F50187-2734-4616-80B4-DFF2242C0445}']
{ Property getters and setters }
function GetOldID_ALMACENValue : Integer;
function GetOldID_ARTICULOValue : Integer;
function GetOldIMPORTE_COMPRA_2ANOSValue : Float;
function GetOldALMACENValue : String;
function GetOldID_EMPRESAValue : Integer;
function GetOldREFERENCIAValue : String;
@ -28,6 +29,7 @@ type
function GetOldUNIDAD_MEDIDAValue : String;
function GetOldPRECIO_NETOValue : Currency;
function GetOldSTOCKValue : Float;
function GetOldCOSTE_MEDIO_TOTALValue : Float;
function GetOldUNIDADES_ALMACENValue : Float;
function GetOldCOSTE_UNIDADESValue : Currency;
function GetOldRESERVAValue : Float;
@ -41,6 +43,7 @@ type
{ Properties }
property OldID_ALMACEN : Integer read GetOldID_ALMACENValue;
property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue;
property OldIMPORTE_COMPRA_2ANOS : Float read GetOldIMPORTE_COMPRA_2ANOSValue;
property OldALMACEN : String read GetOldALMACENValue;
property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
property OldREFERENCIA : String read GetOldREFERENCIAValue;
@ -50,6 +53,7 @@ type
property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
property OldPRECIO_NETO : Currency read GetOldPRECIO_NETOValue;
property OldSTOCK : Float read GetOldSTOCKValue;
property OldCOSTE_MEDIO_TOTAL : Float read GetOldCOSTE_MEDIO_TOTALValue;
property OldUNIDADES_ALMACEN : Float read GetOldUNIDADES_ALMACENValue;
property OldCOSTE_UNIDADES : Currency read GetOldCOSTE_UNIDADESValue;
property OldRESERVA : Float read GetOldRESERVAValue;
@ -78,6 +82,12 @@ type
function GetOldID_ARTICULOIsNull: Boolean; virtual;
procedure SetID_ARTICULOValue(const aValue: Integer); virtual;
procedure SetID_ARTICULOIsNull(const aValue: Boolean); virtual;
function GetIMPORTE_COMPRA_2ANOSValue: Float; virtual;
function GetIMPORTE_COMPRA_2ANOSIsNull: Boolean; virtual;
function GetOldIMPORTE_COMPRA_2ANOSValue: Float; virtual;
function GetOldIMPORTE_COMPRA_2ANOSIsNull: Boolean; virtual;
procedure SetIMPORTE_COMPRA_2ANOSValue(const aValue: Float); virtual;
procedure SetIMPORTE_COMPRA_2ANOSIsNull(const aValue: Boolean); virtual;
function GetALMACENValue: String; virtual;
function GetALMACENIsNull: Boolean; virtual;
function GetOldALMACENValue: String; virtual;
@ -132,6 +142,12 @@ type
function GetOldSTOCKIsNull: Boolean; virtual;
procedure SetSTOCKValue(const aValue: Float); virtual;
procedure SetSTOCKIsNull(const aValue: Boolean); virtual;
function GetCOSTE_MEDIO_TOTALValue: Float; virtual;
function GetCOSTE_MEDIO_TOTALIsNull: Boolean; virtual;
function GetOldCOSTE_MEDIO_TOTALValue: Float; virtual;
function GetOldCOSTE_MEDIO_TOTALIsNull: Boolean; virtual;
procedure SetCOSTE_MEDIO_TOTALValue(const aValue: Float); virtual;
procedure SetCOSTE_MEDIO_TOTALIsNull(const aValue: Boolean); virtual;
function GetUNIDADES_ALMACENValue: Float; virtual;
function GetUNIDADES_ALMACENIsNull: Boolean; virtual;
function GetOldUNIDADES_ALMACENValue: Float; virtual;
@ -196,6 +212,10 @@ type
property ID_ARTICULOIsNull : Boolean read GetID_ARTICULOIsNull write SetID_ARTICULOIsNull;
property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue;
property OldID_ARTICULOIsNull : Boolean read GetOldID_ARTICULOIsNull;
property IMPORTE_COMPRA_2ANOS : Float read GetIMPORTE_COMPRA_2ANOSValue write SetIMPORTE_COMPRA_2ANOSValue;
property IMPORTE_COMPRA_2ANOSIsNull : Boolean read GetIMPORTE_COMPRA_2ANOSIsNull write SetIMPORTE_COMPRA_2ANOSIsNull;
property OldIMPORTE_COMPRA_2ANOS : Float read GetOldIMPORTE_COMPRA_2ANOSValue;
property OldIMPORTE_COMPRA_2ANOSIsNull : Boolean read GetOldIMPORTE_COMPRA_2ANOSIsNull;
property ALMACEN : String read GetALMACENValue write SetALMACENValue;
property ALMACENIsNull : Boolean read GetALMACENIsNull write SetALMACENIsNull;
property OldALMACEN : String read GetOldALMACENValue;
@ -232,6 +252,10 @@ type
property STOCKIsNull : Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
property OldSTOCK : Float read GetOldSTOCKValue;
property OldSTOCKIsNull : Boolean read GetOldSTOCKIsNull;
property COSTE_MEDIO_TOTAL : Float read GetCOSTE_MEDIO_TOTALValue write SetCOSTE_MEDIO_TOTALValue;
property COSTE_MEDIO_TOTALIsNull : Boolean read GetCOSTE_MEDIO_TOTALIsNull write SetCOSTE_MEDIO_TOTALIsNull;
property OldCOSTE_MEDIO_TOTAL : Float read GetOldCOSTE_MEDIO_TOTALValue;
property OldCOSTE_MEDIO_TOTALIsNull : Boolean read GetOldCOSTE_MEDIO_TOTALIsNull;
property UNIDADES_ALMACEN : Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull : Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property OldUNIDADES_ALMACEN : Float read GetOldUNIDADES_ALMACENValue;
@ -277,7 +301,7 @@ type
{ IDetalleReservasDelta }
IDetalleReservasDelta = interface(IDetalleReservas)
['{7324C967-840D-4CDB-A68A-9D3066574877}']
['{E72DD036-121B-4BB6-BDB2-4E6EEF9B05FA}']
{ Property getters and setters }
function GetOldID_ALBValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -555,6 +579,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID_ARTICULO] := Null;
end;
function TInventarioBusinessProcessorRules.GetIMPORTE_COMPRA_2ANOSValue: Float;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioIMPORTE_COMPRA_2ANOS];
end;
function TInventarioBusinessProcessorRules.GetIMPORTE_COMPRA_2ANOSIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioIMPORTE_COMPRA_2ANOS]);
end;
function TInventarioBusinessProcessorRules.GetOldIMPORTE_COMPRA_2ANOSValue: Float;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioIMPORTE_COMPRA_2ANOS];
end;
function TInventarioBusinessProcessorRules.GetOldIMPORTE_COMPRA_2ANOSIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioIMPORTE_COMPRA_2ANOS]);
end;
procedure TInventarioBusinessProcessorRules.SetIMPORTE_COMPRA_2ANOSValue(const aValue: Float);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioIMPORTE_COMPRA_2ANOS] := aValue;
end;
procedure TInventarioBusinessProcessorRules.SetIMPORTE_COMPRA_2ANOSIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioIMPORTE_COMPRA_2ANOS] := Null;
end;
function TInventarioBusinessProcessorRules.GetALMACENValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioALMACEN];
@ -834,6 +889,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioSTOCK] := Null;
end;
function TInventarioBusinessProcessorRules.GetCOSTE_MEDIO_TOTALValue: Float;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_MEDIO_TOTAL];
end;
function TInventarioBusinessProcessorRules.GetCOSTE_MEDIO_TOTALIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_MEDIO_TOTAL]);
end;
function TInventarioBusinessProcessorRules.GetOldCOSTE_MEDIO_TOTALValue: Float;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCOSTE_MEDIO_TOTAL];
end;
function TInventarioBusinessProcessorRules.GetOldCOSTE_MEDIO_TOTALIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCOSTE_MEDIO_TOTAL]);
end;
procedure TInventarioBusinessProcessorRules.SetCOSTE_MEDIO_TOTALValue(const aValue: Float);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_MEDIO_TOTAL] := aValue;
end;
procedure TInventarioBusinessProcessorRules.SetCOSTE_MEDIO_TOTALIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_MEDIO_TOTAL] := Null;
end;
function TInventarioBusinessProcessorRules.GetUNIDADES_ALMACENValue: Float;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN];

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

@ -19,17 +19,18 @@ object srvInventario: TsrvInventario
Connection = 'IBX'
TargetTable = 'V_INVENTARIO'
SQL =
'SELECT'#10' ID_ALMACEN, ID_ARTICULO, NOMBRE as ALMACEN, ID_EMPRES' +
'A, REFERENCIA, FAMILIA,'#10' DESCRIPCION, STOCK_MIN, UNIDAD_MEDID' +
'A, PRECIO_NETO, STOCK,'#10' UNIDADES_ALMACEN, COSTE_UNIDADES, RES' +
'ERVA, PENDIENTE_RECEPCION,'#10' '#10' /*'#10' NO BORRAR YA QUE SIRV' +
'E PARA LAS ENTRADAS Y SALIDAS DE ALMACEN(TABLA MOVIMIENTOS)'#10' ' +
'DEBERIA GENERAR UNA TABLA DE MOVIMIENTOS INDEPENDIENTE DEL INVEN' +
'TARIO PERO POR FALTA'#10' DE TIEMPO Y FIABILIDAD YA QUE AHORA FUN' +
'CIONA TODO, CREAMOS ESTOS CAMPOS FICTICIOS'#10' */'#10#10' 0 as ID, ' +
'0 as CANTIDAD, current_date as FECHA_MOVIMIENTO, NULL as CAUSA, ' +
'NULL as TIPO'#10#10#10'FROM V_INVENTARIO'#10'where {where}'#10'ORDER BY ID_ARTIC' +
'ULO'#10
'SELECT'#10' ID_ALMACEN, ID_ARTICULO, IMPORTE_COMPRA_2ANOS, NOMBRE' +
' as ALMACEN, ID_EMPRESA, REFERENCIA, FAMILIA,'#10' DESCRIPCION, S' +
'TOCK_MIN, UNIDAD_MEDIDA, PRECIO_NETO, STOCK, (IMPORTE_COMPRA_2AN' +
'OS * STOCK) as COSTE_MEDIO_TOTAL,'#10' UNIDADES_ALMACEN, COSTE_UN' +
'IDADES, RESERVA, PENDIENTE_RECEPCION,'#10' '#10' /*'#10' NO BORRAR ' +
'YA QUE SIRVE PARA LAS ENTRADAS Y SALIDAS DE ALMACEN(TABLA MOVIMI' +
'ENTOS)'#10' DEBERIA GENERAR UNA TABLA DE MOVIMIENTOS INDEPENDIENT' +
'E DEL INVENTARIO PERO POR FALTA'#10' DE TIEMPO Y FIABILIDAD YA QU' +
'E AHORA FUNCIONA TODO, CREAMOS ESTOS CAMPOS FICTICIOS'#10' */'#10#10' ' +
' 0 as ID, 0 as CANTIDAD, current_date as FECHA_MOVIMIENTO, NULL' +
' as CAUSA, NULL as TIPO'#10#10#10'FROM V_INVENTARIO'#10'where {where}'#10'ORDER ' +
'BY ID_ARTICULO'#10#10#10
StatementType = stSQL
ColumnMappings = <
item
@ -107,6 +108,15 @@ object srvInventario: TsrvInventario
item
DatasetField = 'UNIDAD_MEDIDA'
TableField = 'UNIDAD_MEDIDA'
end
item
DatasetField = 'IMPORTE_COMPRA_2ANOS'
TableField = 'IMPORTE_COMPRA_2ANOS'
end
item
DatasetField = 'COSTE_MEDIO_TOTAL'
TableField = '<unknown>'
SQLOrigin = 'COSTE_MEDIO_TOTAL'
end>
end>
Name = 'Inventario'
@ -121,6 +131,10 @@ object srvInventario: TsrvInventario
DataType = datInteger
DictionaryEntry = 'Inventario_ID_ARTICULO'
end
item
Name = 'IMPORTE_COMPRA_2ANOS'
DataType = datFloat
end
item
Name = 'ALMACEN'
DataType = datString
@ -171,6 +185,10 @@ object srvInventario: TsrvInventario
DataType = datFloat
DictionaryEntry = 'Inventario_STOCK'
end
item
Name = 'COSTE_MEDIO_TOTAL'
DataType = datFloat
end
item
Name = 'UNIDADES_ALMACEN'
DataType = datFloat

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

@ -162,14 +162,6 @@ inherited fEditorInventario: TfEditorInventario
Kind = skSum
Column = frViewInventario1.cxGridViewPENDIENTE_RECEPCION
end>
inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewCOSTE_UNIDADES: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase

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

@ -106,17 +106,6 @@ inherited frViewInventario: TfrViewInventario
MinWidth = 30
Width = 50
end
object cxGridViewPRECIO_NETO: TcxGridDBColumn
DataBinding.FieldName = 'PRECIO_NETO'
PropertiesClassName = 'TcxCurrencyEditProperties'
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewCOSTE_UNIDADES: TcxGridDBColumn
DataBinding.FieldName = 'COSTE_UNIDADES'
PropertiesClassName = 'TcxCurrencyEditProperties'
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewRESERVA: TcxGridDBColumn
DataBinding.FieldName = 'RESERVA'
PropertiesClassName = 'TcxSpinEditProperties'
@ -141,6 +130,19 @@ inherited frViewInventario: TfrViewInventario
MinWidth = 30
Width = 50
end
object cxGridViewPRECIO_NETO: TcxGridDBColumn
Caption = 'Coste medio unidad'
DataBinding.FieldName = 'IMPORTE_COMPRA_2ANOS'
PropertiesClassName = 'TcxCurrencyEditProperties'
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewCOSTE_UNIDADES: TcxGridDBColumn
Caption = 'Coste medio total'
DataBinding.FieldName = 'COSTE_MEDIO_TOTAL'
PropertiesClassName = 'TcxCurrencyEditProperties'
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
end
object cxGridDBTableView1: TcxGridDBTableView [1]
NavigatorButtons.ConfirmDelete = False
@ -173,13 +175,23 @@ inherited frViewInventario: TfrViewInventario
Width = 121
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 344
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 344
ExplicitWidth = 121
Width = 121
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 343
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 343
end
end
end
end

39
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
View File

@ -210,67 +210,48 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 989
ExplicitHeight = 286
inherited edtFechaPresupuesto: TcxDBDateEdit
Top = 23
ExplicitTop = 23
ExplicitWidth = 187
Width = 187
end
inherited memObservaciones: TcxDBMemo
Left = 478
Top = 229
ExplicitLeft = 478
ExplicitTop = 229
ExplicitWidth = 793
Width = 793
end
inherited eReferencia: TcxDBTextEdit
Top = -31
ExplicitTop = -31
ExplicitWidth = 122
Width = 122
end
inherited cbFormaPago: TcxDBLookupComboBox
Top = 161
ExplicitTop = 161
ExplicitWidth = 122
Width = 122
end
inherited bFormasPago: TButton
Left = 316
Top = 161
ExplicitLeft = 316
ExplicitTop = 161
end
inherited edtFechaDecision: TcxDBDateEdit
Left = 327
Top = 50
ExplicitLeft = 327
ExplicitTop = 50
ExplicitWidth = 260
Width = 260
end
inherited edtFechaVigencia: TcxDBDateEdit
Top = 50
ExplicitTop = 50
ExplicitWidth = 260
Width = 260
end
inherited cbSituacion: TcxDBImageComboBox
Top = 77
ExplicitTop = 77
ExplicitWidth = 260
Width = 260
end
inherited frViewDatosYSeleccionClientePresupuesto1: TfrViewDatosYSeleccionClientePresupuesto
Left = 478
Top = -31
Width = 320
ExplicitLeft = 478
ExplicitTop = -31
ExplicitWidth = 320
inherited dxLayoutControl1: TdxLayoutControl
Width = 320
ExplicitWidth = 320
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 202
Width = 202
@ -306,41 +287,41 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end
end
inherited memFormaPago: TcxDBMemo
Top = 188
ExplicitTop = 188
ExplicitWidth = 475
ExplicitHeight = 44
Height = 44
Width = 475
end
inherited memPlazoEntrega: TcxDBMemo
Top = 244
ExplicitTop = 244
Top = 344
ExplicitTop = 344
ExplicitWidth = 396
ExplicitHeight = 100
Height = 100
Width = 396
end
inherited cbVendedor: TcxDBLookupComboBox
Top = 104
ExplicitTop = 104
ExplicitWidth = 27
Width = 27
end
inherited cbTipoPresupuesto: TcxDBComboBox
Left = 324
Top = 23
ExplicitLeft = 324
ExplicitTop = 23
ExplicitWidth = 186
Width = 186
end
inherited edtlReferenciaCliente: TcxDBTextEdit
Top = -4
ExplicitTop = -4
ExplicitWidth = 204
Width = 204
end
inherited frViewTienda1: TfrViewTienda
inherited dxLayoutControl1: TdxLayoutControl
inherited cbTienda: TcxComboBox
ExplicitWidth = 390
Width = 390
end
end
end
end
end
end

23
Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
View File

@ -1,10 +1,5 @@
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
Width = 1149
inherited ToolBar1: TToolBar
Width = 1149
end
inherited cxGrid: TcxGrid
Width = 1149
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewID: TcxGridDBColumn
VisibleForCustomization = False
@ -83,10 +78,8 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end
end
inherited TBXDock1: TTBXDock
Width = 1149
inherited TBXToolbar1: TTBXToolbar
DockPos = 0
ExplicitWidth = 839
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText
@ -139,6 +132,12 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
object TBXItem26: TTBXItem
Action = actCapituloClaSemSuspendido
end
object TBXItem27: TTBXItem
Action = actCapituloServSuministro
end
object TBXItem28: TTBXItem
Action = actCapituloServInstalacion
end
end
object TBXSeparatorItem6: TTBXSeparatorItem [3]
end
@ -326,6 +325,16 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
Caption = 'Cap'#237'tulo cl'#225'sico/semisuspendido/suspendido'
OnExecute = actCapituloClaSemSuspendidoExecute
end
object actCapituloServInstalacion: TAction
Category = 'Operaciones'
Caption = 'Servicio de instalaci'#243'n'
OnExecute = actCapituloServInstalacionExecute
end
object actCapituloServSuministro: TAction
Category = 'Operaciones'
Caption = 'Servicio de suministro'
OnExecute = actCapituloServSuministroExecute
end
end
inherited cxStyleRepository: TcxStyleRepository
inherited cxStyle_IMPORTETOTAL: TcxStyle

19
Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas
View File

@ -70,6 +70,10 @@ type
TBXItem24: TTBXItem;
TBXItem25: TTBXItem;
TBXItem26: TTBXItem;
actCapituloServInstalacion: TAction;
actCapituloServSuministro: TAction;
TBXItem27: TTBXItem;
TBXItem28: TTBXItem;
procedure actAsignarDescuentoExecute(Sender: TObject);
procedure actAsignarDescuentoUpdate(Sender: TObject);
procedure CustomViewShow(Sender: TObject);
@ -92,6 +96,8 @@ type
procedure actCapituloFreArmAbatibleExecute(Sender: TObject);
procedure actCapituloIntArmForradoExecute(Sender: TObject);
procedure actCapituloClaSemSuspendidoExecute(Sender: TObject);
procedure actCapituloServInstalacionExecute(Sender: TObject);
procedure actCapituloServSuministroExecute(Sender: TObject);
private
procedure AnadirCapitulo(const Tipo: String;const Descripcion: String; const Descuento:Boolean = false; const ConstanteConfiguracion: String = '');
@ -246,6 +252,19 @@ begin
AnadirCapitulo(TIPO_CAPITULO_V, 'SEPARACIÓN DE AMBIENTES', true, 'CAP_SEP_AMBIENTES');
end;
procedure TfrViewDetallesPresupuestoCliente.actCapituloServInstalacionExecute(Sender: TObject);
begin
inherited;
AnadirCapitulo(TIPO_CAPITULO_V, 'SERVICIO DE INSTALACIÓN - PRECIO NETO', true, 'CAP_INSTALACION');
end;
procedure TfrViewDetallesPresupuestoCliente.actCapituloServSuministroExecute(
Sender: TObject);
begin
inherited;
AnadirCapitulo(TIPO_CAPITULO_V, 'SERVICIO DE SUMINISTRO - PRECIO NETO', true, 'CAP_SUMINISTRO');
end;
procedure TfrViewDetallesPresupuestoCliente.actCapituloVariosExecute(Sender: TObject);
begin
AnadirCapitulo(TIPO_CAPITULO_V, 'VARIOS ', true);

4
Source/Modulos/Recibos de cliente/Model/uBizRecibosClienteServer.pas
View File

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

4
Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedorServer.pas
View File

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

20
Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas
View File

@ -81,8 +81,16 @@ begin
dboEqual);
AWhere := NewBinaryExpression(AWhere, AWhereExpr2, dboAnd);
end
else
begin
AWhereExpr2 := NewBinaryExpression(NewField('', 'ID_EMPRESA'),
NewNull(),
dboEqual);
AWhere := NewBinaryExpression(AWhere, AWhereExpr2, dboAnd);
end;
//Si se asigna IDTienda se añade condicion
if (TiendaID <> -1) then
begin
@ -92,6 +100,13 @@ begin
AWhere := NewBinaryExpression(AWhere, AWhereExpr3, dboAnd);
end
else
begin
AWhereExpr3 := NewBinaryExpression(NewField('', 'ID_TIENDA'),
NewNull(),
dboEqual);
AWhere := NewBinaryExpression(AWhere, AWhereExpr3, dboAnd);
end;
finally
Free;
@ -147,7 +162,10 @@ begin
AWhere := AWhere + ' AND (ID_EMPRESA = ' + IntToStr(EmpresaID) + ')';
if (TiendaID <> -1) then
AWhere := AWhere + ' AND (ID_TIENDA = ' + IntToStr(TiendaID) + ')';
AWhere := AWhere + ' AND (ID_TIENDA = ' + IntToStr(TiendaID) + ')'
else
AWhere := AWhere + ' AND (ID_TIENDA IS NULL)';
ASchema := schReferencias;
AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName);

4
Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas
View File

@ -220,8 +220,8 @@ begin
}
AuxAlbaran := AAlbaranesClienteController.Nuevo;
AuxAlbaran.ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
AuxAlbaran.ID_TIENDA := AppFactuGES.TiendaActiva.ID;
AuxAlbaran.TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
AuxAlbaran.ID_TIENDA := AContrato.ID_TIENDA;
AuxAlbaran.TIENDA := AContrato.TIENDA;
CopiarContratoAAlbaran(AContrato, AuxAlbaran);
CopiarDetallesAAlbaran(AContrato, AuxAlbaran, AContrato.Detalles);

5
Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas
View File

@ -197,8 +197,9 @@ begin
try
AFactura := AFacturasClienteController.Nuevo;
AFactura.ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
AFactura.ID_TIENDA := AppFactuGES.TiendaActiva.ID;
AFactura.TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
AFactura.ID_TIENDA := AContrato.ID_TIENDA;
AFactura.TIENDA := AContrato.TIENDA;
//Solicitado por Angélica, al generar una factura a partir del contrato, que se copie el IVA asignado en el contrato
// AFactura.ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; //SIEMPRE SE ASIGNARÄ EL IVA DE LA EMPRESA ACTIVA
CopiarContratoAFactura(AContrato, AFactura);

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

Binary file not shown.

8
Source/Servicios/FactuGES.RODL
View File

@ -1023,6 +1023,14 @@
</Parameter>
</Parameters>
</Operation>
<Operation Name="AnadirIncidenciaContrato" UID="{F158BD00-C508-4566-9CC6-F5EC55100033}">
<Parameters>
<Parameter Name="Result" DataType="Boolean" Flag="Result">
</Parameter>
<Parameter Name="id_contrato" DataType="Integer" Flag="In" >
</Parameter>
</Parameters>
</Operation>
</Operations>
</Interface>
</Interfaces>

18
Source/Servicios/FactuGES_Intf.pas
View File

@ -887,6 +887,7 @@ type
const VerTotales: Boolean): Binary;
function GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary;
function AnadirIncidenciaContrato(const id_contrato: Integer): Boolean;
end;
{ CosrvContratosCliente }
@ -905,6 +906,7 @@ type
const VerTotales: Boolean): Binary;
function GenerarInformeEtiquetas(const ID: Integer; const AAgencia: Variant; const ARefPedido: Variant; const ANumEtiquetas: Integer;
const AEtiquetaIni: Integer): Binary;
function AnadirIncidenciaContrato(const id_contrato: Integer): Boolean;
end;
{ IsrvSubfamilias }
@ -3001,6 +3003,22 @@ begin
end
end;
function TsrvContratosCliente_Proxy.AnadirIncidenciaContrato(const id_contrato: Integer): Boolean;
begin
try
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'AnadirIncidenciaContrato');
__Message.Write('id_contrato', TypeInfo(Integer), id_contrato, []);
__Message.Finalize;
__TransportChannel.Dispatch(__Message);
__Message.Read('Result', TypeInfo(Boolean), result, []);
finally
__Message.UnsetAttributes(__TransportChannel);
__Message.FreeStream;
end
end;
{ CosrvSubfamilias }
class function CosrvSubfamilias.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvSubfamilias;

21
Source/Servicios/FactuGES_Invk.pas
View File

@ -330,6 +330,7 @@ type
procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
procedure Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
procedure Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
procedure Invoke_AnadirIncidenciaContrato(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
end;
TsrvSubfamilias_Invoker = class(TDataAbstractService_Invoker)
@ -2534,6 +2535,26 @@ begin
end;
end;
procedure TsrvContratosCliente_Invoker.Invoke_AnadirIncidenciaContrato(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
{ function AnadirIncidenciaContrato(const id_contrato: Integer): Boolean; }
var
id_contrato: Integer;
lResult: Boolean;
begin
try
__Message.Read('id_contrato', TypeInfo(Integer), id_contrato, []);
lResult := (__Instance as IsrvContratosCliente).AnadirIncidenciaContrato(id_contrato);
__Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'AnadirIncidenciaContratoResponse');
__Message.Write('Result', TypeInfo(Boolean), lResult, []);
__Message.Finalize;
__Message.UnsetAttributes(__Transport);
finally
end;
end;
{ TsrvSubfamilias_Invoker }
constructor TsrvSubfamilias_Invoker.Create;

BIN
Source/Servicios/RODLFile.res
View File

Binary file not shown.

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -129,8 +129,6 @@ uses
schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
uRptAlbaranesProveedor_Server in '..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas' {RptAlbaranesProveedor: TDataModule},
schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
schHistoricoMovimientosClient_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas',
schHistoricoMovimientosServer_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas',
uTypesConstConfiguration in '..\Base\Configuracion\uTypesConstConfiguration.pas',
@ -154,9 +152,11 @@ uses
schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
uRptInventario_Server in '..\Modulos\Inventario\Reports\uRptInventario_Server.pas' {RptInventario: TDataModule},
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
uRptInventario_Server in '..\Modulos\Inventario\Reports\uRptInventario_Server.pas' {RptInventario: TDataModule};
schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -28,7 +28,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 19 de julio de 2022 22:37</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 18 de octubre de 2022 10:32</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.