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

- Mejorado el alta/modificación de contratos y presupuestos al desactivar los documentos relacionados hasta que se accede a la pestaña

Browse Source 
- Revisión para tratar de localizar porqué se queda esperando en el ordenador de Víctor.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@651 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
David Arranz 2016-09-09 16:53:08 +00:00
parent 20fa54cf60
commit 3877d4b360
17 changed files with 316 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Cliente/FactuGES.dpr
View File

@ -1,6 +1,7 @@
program FactuGES; program FactuGES;
uses uses
ExceptionLog,
Forms, Forms,
Windows, Windows,
SysUtils, SysUtils,

39
Source/Cliente/FactuGES.dproj
View File

@ -43,7 +43,7 @@
<DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath> <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
<DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath> <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
<DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath> <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
<DCC_Define>DEBUG;</DCC_Define> <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
<DCC_DebugVN>True</DCC_DebugVN> <DCC_DebugVN>True</DCC_DebugVN>
<DCC_MapFile>3</DCC_MapFile> <DCC_MapFile>3</DCC_MapFile>
@ -52,7 +52,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.7.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.7.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.7.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.7.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages 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> </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
@ -81,24 +81,24 @@
<!-- EurekaLog First Line <!-- EurekaLog First Line
[Exception Log] [Exception Log]
EurekaLog Version=6006 EurekaLog Version=6006
Activate=0 Activate=1
Activate Handle=1 Activate Handle=1
Save Log File=1 Save Log File=1
Foreground Tab=0 Foreground Tab=0
Freeze Activate=0 Freeze Activate=0
Freeze Timeout=60 Freeze Timeout=60
SMTP From=eurekalog@email.com SMTP From=info@acanainteriorismo.com
SMTP Host= SMTP Host=europe%2Dpriva45.privatednsorg.com
SMTP Port=25 SMTP Port=25
SMTP UserID= SMTP UserID=info@acanainteriorismo.com
SMTP Password= SMTP Password=*Acana2014
Append to Log=0 Append to Log=0
TerminateBtn Operation=2 TerminateBtn Operation=2
Errors Number=32 Errors Number=32
Errors Terminate=3 Errors Terminate=3
Email Address= Email Address=soporte@rodax%2Dsoftware.com
Email Object= Email Object=EurekaLog
Email Send Options=0 Email Send Options=2
Output Path= Output Path=
Encrypt Password= Encrypt Password=
AutoCloseDialogSecs=0 AutoCloseDialogSecs=0
@ -142,15 +142,15 @@ ZipPassword=
PreBuildEvent= PreBuildEvent=
PostSuccessfulBuildEvent= PostSuccessfulBuildEvent=
PostFailureBuildEvent= PostFailureBuildEvent=
ExceptionDialogType=2 ExceptionDialogType=3
Count=0 Count=0
EMail Message Line Count=0 EMail Message Line Count=1
loNoDuplicateErrors=0 loNoDuplicateErrors=0
loAppendReproduceText=0 loAppendReproduceText=0
loDeleteLogAtVersionChange=0 loDeleteLogAtVersionChange=1
loAddComputerNameInLogFileName=0 loAddComputerNameInLogFileName=0
loSaveModulesAndProcessesSections=1 loSaveModulesAndProcessesSections=1
loSaveAssemblerAndCPUSections=1 loSaveAssemblerAndCPUSections=0
soAppStartDate=1 soAppStartDate=1
soAppName=1 soAppName=1
soAppVersionNumber=1 soAppVersionNumber=1
@ -201,14 +201,14 @@ soNetDHCP=1
soCustomData=1 soCustomData=1
sndShowSendDialog=1 sndShowSendDialog=1
sndShowSuccessFailureMsg=0 sndShowSuccessFailureMsg=0
sndSendEntireLog=0 sndSendEntireLog=1
sndSendXMLLogCopy=0 sndSendXMLLogCopy=0
sndSendScreenshot=1 sndSendScreenshot=1
sndUseOnlyActiveWindow=0 sndUseOnlyActiveWindow=1
sndSendLastHTMLPage=1 sndSendLastHTMLPage=1
sndSendInSeparatedThread=0 sndSendInSeparatedThread=0
sndAddDateInFileName=0 sndAddDateInFileName=1
sndAddComputerNameInFileName=0 sndAddComputerNameInFileName=1
edoSendErrorReportChecked=1 edoSendErrorReportChecked=1
edoAttachScreenshotChecked=1 edoAttachScreenshotChecked=1
edoShowCopyToClipOption=1 edoShowCopyToClipOption=1
@ -233,7 +233,7 @@ boSaveCompressedCopyInCaseOfError=0
boHandleSafeCallExceptions=1 boHandleSafeCallExceptions=1
boCallRTLExceptionEvent=0 boCallRTLExceptionEvent=0
boCatchHandledExceptions=0 boCatchHandledExceptions=0
loCatchLeaks=0 loCatchLeaks=1
loGroupsSonLeaks=1 loGroupsSonLeaks=1
loHideBorlandLeaks=1 loHideBorlandLeaks=1
loFreeAllLeaks=1 loFreeAllLeaks=1
@ -560,4 +560,5 @@ mtException_AntiFreeze0="The application seems to be frozen."
Count mtInvalidEmailMsg=1 Count mtInvalidEmailMsg=1
mtInvalidEmailMsg0="Invalid email." mtInvalidEmailMsg0="Invalid email."
TextsCollection= TextsCollection=
Line0="Error FactuGES en %%ComputerName%% con usuario %%UserName%%"
EurekaLog Last Line --> EurekaLog Last Line -->

8
Source/Cliente/FactuGES.rc
View File

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

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

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

@ -2,11 +2,11 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 332 Left = 332
Top = 147 Top = 147
Caption = 'Nuevo contrato de cliente' Caption = 'Nuevo contrato de cliente'
ClientHeight = 633 ClientHeight = 798
ClientWidth = 872 ClientWidth = 872
OnClose = CustomEditorClose OnClose = CustomEditorClose
ExplicitWidth = 880 ExplicitWidth = 880
ExplicitHeight = 667 ExplicitHeight = 832
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -129,7 +129,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 872 Width = 872
ExplicitWidth = 872 ExplicitWidth = 872
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 488 ExplicitWidth = 634
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
@ -162,7 +162,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
Top = 614 Top = 779
Width = 872 Width = 872
Panels = < Panels = <
item item
@ -173,26 +173,27 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 866 Width = 866
Height = 308 Height = 464
ActivePage = pagDocumentos ActivePage = pagDocumentos
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 866 ExplicitWidth = 866
ExplicitHeight = 308 ExplicitHeight = 299
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 280 ExplicitHeight = 271
end end
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitHeight = 271
inline frViewDetallesContratoCliente1: TfrViewDetallesContratoCliente inline frViewDetallesContratoCliente1: TfrViewDetallesContratoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 858 Width = 858
Height = 280 Height = 436
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -205,12 +206,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 280 ExplicitHeight = 271
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 858 Width = 858
Height = 24
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 24
inherited ToolButton4: TToolButton inherited ToolButton4: TToolButton
Wrap = False Wrap = False
end end
@ -221,89 +220,64 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ExplicitTop = 0 ExplicitTop = 0
end end
inherited FontName: TJvFontComboBox inherited FontName: TJvFontComboBox
Left = 368 Left = 0
Top = 0 ExplicitLeft = 0
ExplicitLeft = 368
ExplicitTop = 0
end end
inherited FontSize: TEdit inherited ToolButton13: TToolButton [6]
Left = 513 Left = 145
Top = 0 ExplicitLeft = 145
Width = 90
ExplicitLeft = 513
ExplicitTop = 0
ExplicitWidth = 90
end end
inherited UpDown1: TUpDown inherited ToolButton6: TToolButton [7]
Left = 603 Left = 153
Top = 0 ExplicitLeft = 153
ExplicitLeft = 603
ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton7: TToolButton [8]
Left = 620 Left = 187
Top = 0 ExplicitLeft = 187
ExplicitLeft = 620
ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton8: TToolButton [9]
Left = 628 Left = 221
Top = 0 ExplicitLeft = 221
ExplicitLeft = 628
ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton12: TToolButton [10]
Left = 662 Left = 255
Top = 0 ExplicitLeft = 255
ExplicitLeft = 662
ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton9: TToolButton [11]
Left = 696 Left = 263
Top = 0 ExplicitLeft = 263
ExplicitLeft = 696
ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton10: TToolButton [12]
Left = 730 Left = 297
Top = 0 ExplicitLeft = 297
ExplicitLeft = 730
ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton11: TToolButton [13]
Left = 738 Left = 331
Top = 0 ExplicitLeft = 331
ExplicitLeft = 738
ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited FontSize: TEdit [14]
Left = 772 Left = 365
Top = 0 Width = 110
ExplicitLeft = 772 ExplicitLeft = 365
ExplicitTop = 0 ExplicitWidth = 110
end end
inherited ToolButton11: TToolButton inherited UpDown1: TUpDown [15]
Left = 806 Left = 475
Top = 0 ExplicitLeft = 475
ExplicitLeft = 806
ExplicitTop = 0
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 50
Width = 858 Width = 858
Height = 230 Height = 361
ExplicitTop = 50 ExplicitTop = 53
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 230 ExplicitHeight = 218
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 24
Width = 858 Width = 858
ExplicitTop = 24
ExplicitWidth = 858 ExplicitWidth = 858
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 665 ExplicitWidth = 858
end end
end end
inherited cxLookupComboBox1: TcxLookupComboBox inherited cxLookupComboBox1: TcxLookupComboBox
@ -320,15 +294,17 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
object pagCalidades: TTabSheet object pagCalidades: TTabSheet
Caption = 'Calidades' Caption = 'Calidades'
ImageIndex = 5 ImageIndex = 5
ExplicitHeight = 271
object dxLayoutControl2: TdxLayoutControl object dxLayoutControl2: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 858 Width = 858
Height = 280 Height = 436
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitHeight = 271
object memCalidades: TcxDBMemo object memCalidades: TcxDBMemo
Left = 10 Left = 10
Top = 10 Top = 10
@ -356,6 +332,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Hidden = True Hidden = True
ShowBorder = False ShowBorder = False
object dxLayoutItem1: TdxLayoutItem object dxLayoutItem1: TdxLayoutItem
AutoAligns = [aaHorizontal]
AlignVert = avClient
Control = memCalidades Control = memCalidades
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
@ -365,15 +343,17 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
object pagCondiciones: TTabSheet object pagCondiciones: TTabSheet
Caption = 'Condiciones' Caption = 'Condiciones'
ImageIndex = 4 ImageIndex = 4
ExplicitHeight = 271
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 858 Width = 858
Height = 280 Height = 436
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitHeight = 271
object memCondiciones: TcxDBMemo object memCondiciones: TcxDBMemo
Left = 10 Left = 10
Top = 10 Top = 10
@ -401,6 +381,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Hidden = True Hidden = True
ShowBorder = False ShowBorder = False
object dxLayoutControl1Item1: TdxLayoutItem object dxLayoutControl1Item1: TdxLayoutItem
AutoAligns = [aaHorizontal]
AlignVert = avClient
Control = memCondiciones Control = memCondiciones
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
@ -410,11 +392,12 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitHeight = 271
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0
Width = 858 Width = 858
Height = 280 Height = 436
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -425,7 +408,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 280 ExplicitHeight = 271
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 858 Width = 858
ExplicitWidth = 858 ExplicitWidth = 858
@ -435,13 +418,14 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 858 Width = 858
Height = 252 Height = 408
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 252 ExplicitHeight = 243
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitTop = 18
ExplicitWidth = 854 ExplicitWidth = 854
ExplicitHeight = 235 ExplicitHeight = 391
Height = 235 Height = 391
Width = 854 Width = 854
end end
end end
@ -450,11 +434,13 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
object pagDocumentos: TTabSheet object pagDocumentos: TTabSheet
Caption = 'Documentos' Caption = 'Documentos'
ImageIndex = 5 ImageIndex = 5
OnShow = pagDocumentosShow
ExplicitHeight = 271
inline frViewDocumentosContratoCliente1: TfrViewDocumentosContratoCliente inline frViewDocumentosContratoCliente1: TfrViewDocumentosContratoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 858 Width = 858
Height = 280 Height = 436
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -465,16 +451,16 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 280 ExplicitHeight = 271
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 858 Width = 858
ExplicitWidth = 858 ExplicitWidth = 858
end end
inherited ListView1: TListView inherited ListView1: TListView
Width = 858 Width = 858
Height = 257 Height = 407
ExplicitWidth = 858 ExplicitWidth = 858
ExplicitHeight = 257 ExplicitHeight = 242
end end
inherited EditorActionList: TActionList inherited EditorActionList: TActionList
Left = 8 Left = 8
@ -493,7 +479,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end end
inline frViewTotales1: TfrViewTotales [5] inline frViewTotales1: TfrViewTotales [5]
Left = 0 Left = 0
Top = 420 Top = 585
Width = 872 Width = 872
Height = 194 Height = 194
Align = alBottom Align = alBottom
@ -513,26 +499,32 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ExplicitWidth = 872 ExplicitWidth = 872
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 429 Left = 429
Height = 152
ExplicitLeft = 429 ExplicitLeft = 429
ExplicitHeight = 152
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 541 Left = 541
Width = 210
ExplicitLeft = 541 ExplicitLeft = 541
ExplicitWidth = 210
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitWidth = 93
Width = 93
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 612 Left = 612
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 612 ExplicitLeft = 612
ExplicitWidth = 137
Width = 137
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 542 Left = 542
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 542 ExplicitLeft = 542
ExplicitWidth = 137
Width = 137
end end
inherited edtDescuento: TcxDBSpinEdit inherited edtDescuento: TcxDBSpinEdit
Style.IsFontAssigned = True Style.IsFontAssigned = True
@ -546,6 +538,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 541 Left = 541
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 541 ExplicitLeft = 541
ExplicitWidth = 92
Width = 92
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 541 Left = 541
@ -556,22 +550,34 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Left = 612 Left = 612
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 612 ExplicitLeft = 612
ExplicitWidth = 56
Width = 56
end end
inherited eImporteNeto: TcxDBCurrencyEdit inherited eImporteNeto: TcxDBCurrencyEdit
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitWidth = 147
Width = 147
end end
inherited ePorte: TcxDBCurrencyEdit inherited ePorte: TcxDBCurrencyEdit
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitWidth = 147
Width = 147
end end
inherited eIVA: TcxDBLookupComboBox inherited eIVA: TcxDBLookupComboBox
Properties.OnValidate = frViewTotales1eIVAPropertiesValidate Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
Style.Color = clInfoBk Style.Color = clInfoBk
ExplicitWidth = 81
Width = 81
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 281 Left = 281
OnClick = frViewTotales1bTiposIVAClick OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 281 ExplicitLeft = 281
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox
ExplicitWidth = 219
Width = 219
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup

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

@ -60,7 +60,8 @@ type
procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject; procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor. var Error: Boolean);
procedure pagDocumentosShow(Sender: TObject); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
private private
//procedure RecalcularPortePorUnidad; //procedure RecalcularPortePorUnidad;
@ -112,7 +113,8 @@ implementation
uses uses
uViewDatosYSeleccionCliente, uDataModuleUsuarios, uClientesController, uViewDatosYSeleccionCliente, uDataModuleUsuarios, uClientesController,
uBizDireccionesContacto, uDialogUtils, uFactuGES_App, uDataTableUtils; uBizDireccionesContacto, uDialogUtils, uFactuGES_App, uDataTableUtils,
Dialogs;
{$R *.dfm} {$R *.dfm}
@ -322,6 +324,13 @@ begin
Contrato.RECARGO_EQUIVALENCIA := 0; Contrato.RECARGO_EQUIVALENCIA := 0;
end; end;
procedure TfEditorContratoCliente.pagDocumentosShow(Sender: TObject);
begin
inherited;
//GESTION_DOCUMENTOS
frViewDocumentosContratoCliente1.Contrato := FContrato;
end;
procedure TfEditorContratoCliente.pgPaginasChanging(Sender: TObject; procedure TfEditorContratoCliente.pgPaginasChanging(Sender: TObject;
var AllowChange: Boolean); var AllowChange: Boolean);
var var
@ -419,9 +428,6 @@ begin
frViewDetallesContratoCliente1.Detalles := FContrato.Detalles; frViewDetallesContratoCliente1.Detalles := FContrato.Detalles;
frViewDetallesContratoCliente1.Contrato := FContrato; //Para poder sacar los descuento del articulos segun el cliente seleccionado frViewDetallesContratoCliente1.Contrato := FContrato; //Para poder sacar los descuento del articulos segun el cliente seleccionado
//GESTION_DOCUMENTOS
frViewDocumentosContratoCliente1.Contrato := FContrato;
finally finally
ViewContrato.ViewClienteContrato.OnClienteChanged := OnClienteChanged; ViewContrato.ViewClienteContrato.OnClienteChanged := OnClienteChanged;
end; end;

23
Source/Modulos/Contratos de cliente/Views/uViewDocumentosContratoCliente.pas
View File

@ -72,11 +72,16 @@ end;
procedure TfrViewDocumentosContratoCliente.SetContrato(const Value: IBizContratoCliente); procedure TfrViewDocumentosContratoCliente.SetContrato(const Value: IBizContratoCliente);
begin begin
FContrato := Value; FContrato := Value;
//Inicializamos la lista de documentos local con los ficheros del servidor try
if Assigned(FContrato) and Assigned(FController) then ShowHourglassCursor;
ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Contrato.ID); //Inicializamos la lista de documentos local con los ficheros del servidor
if Assigned(FContrato) and Assigned(FController) then
ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Contrato.ID);
RefrescarVisualizador; RefrescarVisualizador;
finally
HideHourglassCursor;
end;
end; end;
procedure TfrViewDocumentosContratoCliente.Sincronizar; procedure TfrViewDocumentosContratoCliente.Sincronizar;
@ -94,7 +99,15 @@ begin
ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.'); ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.');
end; end;
} }
Controller.GestorDocumentosController.SincronizarDocumentos(Contrato.ID, ListaFicheros, Directorio); if Assigned(Contrato) then
begin
try
ShowHourglassCursor;
Controller.GestorDocumentosController.SincronizarDocumentos(Contrato.ID, ListaFicheros, Directorio);
finally
HideHourglassCursor;
end;
end;
end; end;
end. end.

4
Source/Modulos/Gestion de documentos/Controller/uGestorDocumentosController.pas
View File

@ -107,9 +107,9 @@ begin
for i:= 0 to ListaDocumentosServidor.Count - 1 do for i:= 0 to ListaDocumentosServidor.Count - 1 do
if not FListaDocumentos.Find(ListaDocumentosServidor.Strings[i], j) then if not FListaDocumentos.Find(ListaDocumentosServidor.Strings[i], j) then
if not FDataModule.EliminarFichero(ID, Almacen, ListaDocumentosServidor.Strings[i]) then if not FDataModule.EliminarFichero(ID, Almacen, ListaDocumentosServidor.Strings[i]) then
showmessage('Error al borrar fichero' + ListaDocumentosServidor.Strings[i]); ShowMessage('Error al borrar fichero' + ListaDocumentosServidor.Strings[i]);
//Subimos todos los ficheros que halla al servidor (de momento no se miran fechas) //Subimos todos los ficheros que existan al servidor (de momento no se miran fechas)
for i := 0 to FListaDocumentos.Count - 1 do for i := 0 to FListaDocumentos.Count - 1 do
begin begin
ANombreFichero := Directorio + FListaDocumentos.Strings[i]; ANombreFichero := Directorio + FListaDocumentos.Strings[i];

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

@ -49,27 +49,27 @@
<DelphiCompile Include="PedidosProveedor_view.dpk"> <DelphiCompile Include="PedidosProveedor_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_controller.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\Almacenes_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_model.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\Almacenes_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\Articulos_view.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\Contactos_view.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_controller.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\ContratosCliente_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_model.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\ContratosCliente_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\dxCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_controller.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\PedidosProveedor_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\PedidosProveedor_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\tb2k_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" /> <DCCReference Include="..\..\Presupuestos de cliente\vclx.dcp" />
<DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas"> <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
<Form>fEditorDireccionEntregaPedidoProveedor </Form> <Form>fEditorDireccionEntregaPedidoProveedor </Form>
<DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass> <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>

198
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
View File

@ -12,7 +12,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 922 Width = 922
Caption = 'Nuevo pedido a proveedor' Caption = 'Nuevo pedido a proveedor'
ExplicitTop = 49
ExplicitWidth = 922 ExplicitWidth = 922
inherited Image1: TImage inherited Image1: TImage
Left = 895 Left = 895
@ -47,7 +46,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Width = 922 Width = 922
ExplicitWidth = 922 ExplicitWidth = 922
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 488 ExplicitWidth = 634
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
@ -74,22 +73,22 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 916 Width = 916
Height = 491 Height = 482
ActivePage = pagDocumentos
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 109
ExplicitWidth = 916 ExplicitWidth = 916
ExplicitHeight = 491 ExplicitHeight = 482
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 463 ExplicitHeight = 454
inline frViewPedidoProveedor1: TfrViewPedidoProveedor inline frViewPedidoProveedor1: TfrViewPedidoProveedor
Left = 0 Left = 0
Top = 0 Top = 0
Width = 908 Width = 908
Height = 463 Height = 454
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -100,102 +99,63 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 463 ExplicitHeight = 454
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 908 Width = 908
Height = 463 Height = 454
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 463 ExplicitHeight = 454
inherited frViewProveedorPedido: TfrViewDatosYSeleccionProveedor inherited frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
Left = 551 Left = 548
Width = 357 Width = 357
ExplicitLeft = 551 ExplicitLeft = 548
ExplicitWidth = 357 ExplicitWidth = 357
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 357 Width = 357
ExplicitWidth = 317
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283 ExplicitWidth = 283
Width = 283 Width = 283
end end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283 ExplicitWidth = 283
Width = 283 Width = 283
end end
inherited edtCalle: TcxDBTextEdit inherited edtCalle: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283 ExplicitWidth = 283
Width = 283 Width = 283
end end
inherited edtPoblacion: TcxDBTextEdit inherited edtPoblacion: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 176 ExplicitWidth = 176
Width = 176 Width = 176
end end
inherited edtProvincia: TcxDBTextEdit inherited edtProvincia: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283 ExplicitWidth = 283
Width = 283 Width = 283
end end
inherited edtCodigoPostal: TcxDBTextEdit inherited edtCodigoPostal: TcxDBTextEdit
Left = 237 Left = 236
Style.LookAndFeel.SkinName = '' ExplicitLeft = 236
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 237
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 110 Left = 109
ExplicitLeft = 110 ExplicitLeft = 109
end end
end end
end end
inherited edtFechaPedido: TcxDBDateEdit inherited edtFechaPedido: TcxDBDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158 ExplicitWidth = 158
Width = 158 Width = 158
end end
inherited edtFechaConfirmacion: TcxDBDateEdit inherited edtFechaConfirmacion: TcxDBDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158 ExplicitWidth = 158
Width = 158 Width = 158
end end
inherited edtFechaEntrega: TcxDBDateEdit inherited edtFechaEntrega: TcxDBDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158 ExplicitWidth = 158
Width = 158 Width = 158
end end
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158 ExplicitWidth = 158
Width = 158 Width = 158
end end
@ -207,6 +167,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 273 Width = 273
Height = 166 Height = 166
ExplicitWidth = 496
ExplicitHeight = 20
inherited rdxDestino1: TRadioButton inherited rdxDestino1: TRadioButton
Width = 253 Width = 253
ExplicitWidth = 253 ExplicitWidth = 253
@ -216,16 +178,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 253 ExplicitWidth = 253
end end
inherited cbLista: TcxDBLookupComboBox inherited cbLista: TcxDBLookupComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 238 ExplicitWidth = 238
Width = 238 Width = 238
end end
inherited bModificar: TBitBtn inherited bModificar: TBitBtn
Left = 344 Left = 337
ExplicitLeft = 344 ExplicitLeft = 337
end end
inherited txtDireccion: TStaticText inherited txtDireccion: TStaticText
Width = 238 Width = 238
@ -233,52 +191,45 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 238 ExplicitWidth = 238
ExplicitHeight = 42 ExplicitHeight = 42
end end
inherited rdxDestinoCliente: TRadioButton
Width = 566
ExplicitWidth = 566
end
inherited cbListaDireccionesCliente: TcxDBLookupComboBox
ExplicitWidth = 551
Width = 551
end
end end
end end
inherited cbFormaPago: TcxDBLookupComboBox inherited cbFormaPago: TcxDBLookupComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 20 ExplicitWidth = 20
Width = 20 Width = 20
end end
inherited bFormasPago: TButton inherited bFormasPago: TButton
Left = 389 Left = 386
ExplicitLeft = 389 ExplicitLeft = 386
end end
inherited edtFechaEnvio: TcxDBDateEdit inherited edtFechaEnvio: TcxDBDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158 ExplicitWidth = 158
Width = 158 Width = 158
end end
inherited eReferenciaContratoCli: TcxTextEdit inherited eReferenciaContratoCli: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 20 ExplicitWidth = 20
Width = 20 Width = 20
end end
inherited Button1: TButton inherited Button1: TButton
Left = 389 Left = 386
ExplicitLeft = 389 ExplicitLeft = 386
end end
inherited frViewTienda1: TfrViewTienda inherited frViewTienda1: TfrViewTienda
Left = 551 Left = 548
Width = 357 Width = 357
ExplicitLeft = 551 ExplicitLeft = 548
ExplicitWidth = 357 ExplicitWidth = 357
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 357 Width = 357
ExplicitWidth = 317
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 390 ExplicitWidth = 390
Width = 390 Width = 390
end end
@ -289,22 +240,15 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 422 ExplicitWidth = 422
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewPedidoProveedor1.DADataSource DataBinding.DataSource = frViewPedidoProveedor1.DADataSource
ExplicitWidth = 360
Width = 422 Width = 422
end end
end end
inherited edtlDescripcion: TcxDBTextEdit inherited edtlDescripcion: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283 ExplicitWidth = 283
Width = 283 Width = 283
end end
inherited edtFechaEnvio2: TcxDBDateEdit inherited edtFechaEnvio2: TcxDBDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 257 ExplicitWidth = 257
Width = 257 Width = 257
end end
@ -322,7 +266,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Left = 0 Left = 0
Top = 0 Top = 0
Width = 908 Width = 908
Height = 463 Height = 454
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -335,7 +279,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 463 ExplicitHeight = 454
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 908 Width = 908
Height = 24 Height = 24
@ -363,64 +307,64 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitTop = 0 ExplicitTop = 0
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 571 Left = 555
Top = 0 Top = 0
ExplicitLeft = 571 ExplicitLeft = 555
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 588 Left = 572
Top = 0 Top = 0
ExplicitLeft = 588 ExplicitLeft = 572
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 596 Left = 580
Top = 0 Top = 0
ExplicitLeft = 596 ExplicitLeft = 580
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 630 Left = 614
Top = 0 Top = 0
ExplicitLeft = 630 ExplicitLeft = 614
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 664 Left = 648
Top = 0 Top = 0
ExplicitLeft = 664 ExplicitLeft = 648
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 698 Left = 682
Top = 0 Top = 0
ExplicitLeft = 698 ExplicitLeft = 682
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 706 Left = 690
Top = 0 Top = 0
ExplicitLeft = 706 ExplicitLeft = 690
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 740 Left = 724
Top = 0 Top = 0
ExplicitLeft = 740 ExplicitLeft = 724
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 774 Left = 758
Top = 0 Top = 0
ExplicitLeft = 774 ExplicitLeft = 758
ExplicitTop = 0 ExplicitTop = 0
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 50 Top = 53
Width = 908 Width = 908
Height = 413 Height = 401
ExplicitTop = 50 ExplicitTop = 50
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 413 ExplicitHeight = 413
@ -433,10 +377,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 24 Top = 24
Width = 908 Width = 908
ExplicitTop = 24
ExplicitWidth = 908 ExplicitWidth = 908
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 548 ExplicitWidth = 731
end end
end end
end end
@ -448,7 +391,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Left = 0 Left = 0
Top = 0 Top = 0
Width = 908 Width = 908
Height = 463 Height = 454
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -459,7 +402,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 463 ExplicitHeight = 454
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 908 Width = 908
ExplicitWidth = 908 ExplicitWidth = 908
@ -469,13 +412,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 908 Width = 908
Height = 435 Height = 426
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 435 ExplicitHeight = 426
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 904 ExplicitWidth = 904
ExplicitHeight = 418 ExplicitHeight = 409
Height = 418 Height = 409
Width = 904 Width = 904
end end
end end
@ -484,11 +427,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
object pagDocumentos: TTabSheet object pagDocumentos: TTabSheet
Caption = 'Documentos' Caption = 'Documentos'
ImageIndex = 3 ImageIndex = 3
OnShow = pagDocumentosShow
inline frViewDocumentosPedidoProveedor1: TfrViewDocumentosPedidoProveedor inline frViewDocumentosPedidoProveedor1: TfrViewDocumentosPedidoProveedor
Left = 0 Left = 0
Top = 0 Top = 0
Width = 908 Width = 908
Height = 463 Height = 454
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -499,16 +443,17 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 463 ExplicitHeight = 454
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 908 Width = 908
ExplicitWidth = 908 ExplicitWidth = 908
end end
inherited ListView1: TListView inherited ListView1: TListView
Width = 908 Width = 908
Height = 440 Height = 425
ExplicitTop = 29
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 440 ExplicitHeight = 425
end end
end end
end end
@ -709,7 +654,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end end
inherited PnlComentario: TPanel [5] inherited PnlComentario: TPanel [5]
Width = 922 Width = 922
ExplicitTop = 76
ExplicitWidth = 922 ExplicitWidth = 922
inherited lbComentario: TLabel inherited lbComentario: TLabel
Width = 912 Width = 912

10
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas
View File

@ -35,6 +35,7 @@ type
procedure pgPaginasChanging(Sender: TObject; var AllowChange: Boolean); procedure pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
procedure frViewTotales1ePortePropertiesValidate(Sender: TObject; procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure pagDocumentosShow(Sender: TObject);
private private
procedure RecalcularPortePorUnidad; procedure RecalcularPortePorUnidad;
@ -222,6 +223,13 @@ begin
// FController.DetallesController.ActualizarDetalles(FPedido.Detalles, FPedido.Proveedor); // FController.DetallesController.ActualizarDetalles(FPedido.Detalles, FPedido.Proveedor);
end; end;
procedure TfEditorPedidoProveedor.pagDocumentosShow(Sender: TObject);
begin
inherited;
//GESTION_DOCUMENTOS
frViewDocumentosPedidoProveedor1.Pedido := FPedido;
end;
procedure TfEditorPedidoProveedor.pgPaginasChanging(Sender: TObject; var AllowChange: Boolean); procedure TfEditorPedidoProveedor.pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
begin begin
inherited; inherited;
@ -300,8 +308,6 @@ begin
frViewDetallesPedidoProveedor1.Detalles := FPedido.Detalles; frViewDetallesPedidoProveedor1.Detalles := FPedido.Detalles;
frViewDetallesPedidoProveedor1.Pedido := FPedido; //Para poder sacar los articulos del proveedor seleccionado frViewDetallesPedidoProveedor1.Pedido := FPedido; //Para poder sacar los articulos del proveedor seleccionado
//GESTION_DOCUMENTOS
frViewDocumentosPedidoProveedor1.Pedido := FPedido;
end; end;
end; end;
end; end;

19
Source/Modulos/Pedidos a proveedor/Views/uViewDocumentosPedidoProveedor.pas
View File

@ -73,10 +73,14 @@ procedure TfrViewDocumentosPedidoProveedor.SetPedido(const Value: IBizPedidoProv
begin begin
FPedido := Value; FPedido := Value;
//Inicializamos la lista de documentos local con los ficheros del servidor //Inicializamos la lista de documentos local con los ficheros del servidor
if Assigned(FPedido) and Assigned(FController) then try
ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Pedido.ID); ShowHourglassCursor;
if Assigned(FPedido) and Assigned(FController) then
RefrescarVisualizador; ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Pedido.ID);
RefrescarVisualizador;
finally
HideHourglassCursor;
end;
end; end;
procedure TfrViewDocumentosPedidoProveedor.Sincronizar; procedure TfrViewDocumentosPedidoProveedor.Sincronizar;
@ -94,7 +98,12 @@ begin
ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.'); ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.');
end; end;
} }
Controller.GestorDocumentosController.SincronizarDocumentos(Pedido.ID, ListaFicheros, Directorio); try
ShowHourglassCursor;
Controller.GestorDocumentosController.SincronizarDocumentos(Pedido.ID, ListaFicheros, Directorio);
finally
HideHourglassCursor;
end;
end; end;
end. end.

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

@ -129,7 +129,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 848 Width = 848
ExplicitWidth = 848 ExplicitWidth = 848
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 488 ExplicitWidth = 634
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
@ -176,12 +176,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 842 Width = 842
Height = 442 Height = 433
ActivePage = pagContenido ActivePage = pagDocumentos
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 842 ExplicitWidth = 842
ExplicitHeight = 442 ExplicitHeight = 433
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
@ -195,7 +195,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 414 Height = 405
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -208,7 +208,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 414 ExplicitHeight = 405
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 834 Width = 834
Height = 24 Height = 24
@ -293,12 +293,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 50 Top = 53
Width = 834 Width = 834
Height = 364 Height = 352
ExplicitTop = 50 ExplicitTop = 53
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 364 ExplicitHeight = 352
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 24 Top = 24
@ -306,7 +306,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 834 ExplicitWidth = 834
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 665 ExplicitWidth = 834
end end
end end
inherited cxLookupComboBox1: TcxLookupComboBox inherited cxLookupComboBox1: TcxLookupComboBox
@ -327,7 +327,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 414 Height = 405
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
@ -374,7 +374,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 414 Height = 405
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -385,7 +385,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 414 ExplicitHeight = 405
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 834 Width = 834
ExplicitWidth = 834 ExplicitWidth = 834
@ -395,13 +395,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 834 Width = 834
Height = 386 Height = 377
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 386 ExplicitHeight = 377
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 830 ExplicitWidth = 830
ExplicitHeight = 369 ExplicitHeight = 360
Height = 369 Height = 360
Width = 830 Width = 830
end end
end end
@ -410,11 +410,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagDocumentos: TTabSheet object pagDocumentos: TTabSheet
Caption = 'Documentos' Caption = 'Documentos'
ImageIndex = 5 ImageIndex = 5
OnShow = pagDocumentosShow
inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 414 Height = 405
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -425,16 +426,17 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 414 ExplicitHeight = 405
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 834 Width = 834
ExplicitWidth = 834 ExplicitWidth = 834
end end
inherited ListView1: TListView inherited ListView1: TListView
Width = 834 Width = 834
Height = 391 Height = 376
ExplicitTop = 29
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 266 ExplicitHeight = 376
end end
inherited EditorActionList: TActionList inherited EditorActionList: TActionList
Left = 8 Left = 8

13
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas
View File

@ -57,7 +57,8 @@ type
procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject; procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor. var Error: Boolean);
procedure pagDocumentosShow(Sender: TObject); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
private private
procedure RecalcularPortePorUnidad; procedure RecalcularPortePorUnidad;
@ -321,6 +322,13 @@ begin
Presupuesto.RECARGO_EQUIVALENCIA := 0; Presupuesto.RECARGO_EQUIVALENCIA := 0;
end; end;
procedure TfEditorPresupuestoCliente.pagDocumentosShow(Sender: TObject);
begin
inherited;
//GESTION_DOCUMENTOS
frViewDocumentosPresupuestoCliente1.Presupuesto := FPresupuesto;
end;
procedure TfEditorPresupuestoCliente.pgPaginasChanging(Sender: TObject; procedure TfEditorPresupuestoCliente.pgPaginasChanging(Sender: TObject;
var AllowChange: Boolean); var AllowChange: Boolean);
var var
@ -418,9 +426,6 @@ begin
frViewDetallesPresupuestoCliente1.Detalles := FPresupuesto.Detalles; frViewDetallesPresupuestoCliente1.Detalles := FPresupuesto.Detalles;
frViewDetallesPresupuestoCliente1.Presupuesto := FPresupuesto; //Para poder sacar los descuento del articulos segun el cliente seleccionado frViewDetallesPresupuestoCliente1.Presupuesto := FPresupuesto; //Para poder sacar los descuento del articulos segun el cliente seleccionado
//GESTION_DOCUMENTOS
frViewDocumentosPresupuestoCliente1.Presupuesto := FPresupuesto;
finally finally
ViewPresupuesto.ViewClientePresupuesto.OnClienteChanged := OnClienteChanged; ViewPresupuesto.ViewClientePresupuesto.OnClienteChanged := OnClienteChanged;
end; end;

21
Source/Modulos/Presupuestos de cliente/Views/uViewDocumentosPresupuestoCliente.pas
View File

@ -73,10 +73,15 @@ procedure TfrViewDocumentosPresupuestoCliente.SetPresupuesto(const Value: IBizPr
begin begin
FPresupuesto := Value; FPresupuesto := Value;
//Inicializamos la lista de documentos local con los ficheros del servidor //Inicializamos la lista de documentos local con los ficheros del servidor
if Assigned(FPresupuesto) and Assigned(FController) then try
ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Presupuesto.ID); ShowHourglassCursor;
if Assigned(FPresupuesto) and Assigned(FController) then
ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Presupuesto.ID);
RefrescarVisualizador; RefrescarVisualizador;
finally
HideHourglassCursor;
end;
end; end;
procedure TfrViewDocumentosPresupuestoCliente.Sincronizar; procedure TfrViewDocumentosPresupuestoCliente.Sincronizar;
@ -94,7 +99,15 @@ begin
ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.'); ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.');
end; end;
} }
Controller.GestorDocumentosController.SincronizarDocumentos(Presupuesto.ID, ListaFicheros, Directorio); if Assigned(Presupuesto) then
begin
try
ShowHourglassCursor;
Controller.GestorDocumentosController.SincronizarDocumentos(Presupuesto.ID, ListaFicheros, Directorio);
finally
HideHourglassCursor;
end;
end;
end; end;
end. end.

2
Source/Servidor/FactuGES_Server.rc
View File

@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.7.5.0\0" VALUE "FileVersion", "2.7.5.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.7.5.0\0" VALUE "ProductVersion", "2.7.5.0\0"
VALUE "CompileDate", "lunes, 01 de agosto de 2016 13:42\0" VALUE "CompileDate", "viernes, 09 de septiembre de 2016 18:07\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.