diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 2d80e47..459ac4d 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Database/udfs/LEEME.txt b/Database/udfs/LEEME.txt new file mode 100644 index 0000000..a53bbb0 --- /dev/null +++ b/Database/udfs/LEEME.txt @@ -0,0 +1,4 @@ +La UDF de conversión RTF->Texto se basa en el componente TRichView +que no está incluido en las librerías del proyecto. +Descargar del repositorio e instalar en Delphi cuando se quiera +cambiar o recompilar la UDF. \ No newline at end of file diff --git a/Database/udfs/funciones.pas b/Database/udfs/funciones.pas index 33d66d0..557fd62 100644 --- a/Database/udfs/funciones.pas +++ b/Database/udfs/funciones.pas @@ -7,7 +7,69 @@ function RtfToText(Cadena: PChar): PChar; cdecl; export; implementation uses - Forms, Classes, SysUtils, StdCtrls, ComCtrls; + Forms, Classes, SysUtils, StdCtrls, ComCtrls, + RVRTF, RVRTFErr, Menus, RVTypes; + +type + TConversor = class(TObject) + private + FirstLine: Boolean; + procedure DoReaderText(Sender: TRVRTFReader; const Text: TRVAnsiString; + Position: TRVRTFPosition); + public + RTFText: TRVAnsiString; + function ExtractTextFromRTF(const AStream: TStream): Boolean; + end; + +{ TConversor } + +procedure TConversor.DoReaderText(Sender: TRVRTFReader; + const Text: TRVAnsiString; Position: TRVRTFPosition); +begin + if (Position <> rtf_ts_ContinuePara) and not FirstLine then + RTFText := RTFText+#13#10; + FirstLine := False; + RTFText := RTFText+Text; +end; + +function TConversor.ExtractTextFromRTF(const AStream: TStream): Boolean; +var + Parser: TRVRTFReader; +begin + {FirstLine := True;} + parser := TRVRTFReader.Create(nil); + try + Parser.OnNewText := DoReaderText; + Result := (Parser.ReadFromStream(AStream) = rtf_ec_OK); + finally + Parser.Free; + end; +end; + +function RtfToText(Cadena: PChar): PChar; +var + AStream : TStringStream; + AConversor : TConversor; +begin + AStream := TStringStream.Create(Cadena); + AConversor := TConversor.Create; + try + AConversor.ExtractTextFromRTF(AStream); + Result := PChar(AConversor.RTFText); + finally + FreeAndNil(AConversor); + FreeAndNIL(AStream); + end; +end; + + + + + + + + +// NO USAR LAS FUNCIONES QUE VIENEN A CONTINUACIÓN // Esta función falla cuando hay caracteres especiales en el texto (ñ, por ejemplo). @@ -47,10 +109,12 @@ end; http://www.delphipraxis.net/topic45179.html } +// Esta función falla porque se come letras del final de cada línea (¿?) + // HAY QUE LIMPIAR LA CADENA DE ENTRADA DE SALTOS DE LÍNEA (#$D#$A) POR QUE // SI NO, NO ES UNA CADENA CON TEXTO RTF VÁLIDO -function RtfToText(Cadena: PChar): PChar; +function RtfToText3(Cadena: PChar): PChar; const SaltoLinea = #13#10; //--> #$D#$A var @@ -215,12 +279,12 @@ var begin // Hay que quitar el salto de línea al final de la aSource RTF - aSource := StringReplace(Cadena, SaltoLinea, '', [rfreplaceall]); + aSource := Copy(Cadena, 1, length(Cadena)-2); + + // Cambiar los saltos de línea que no son de RTF por un caracter para + // que se limpien. +// aSource := StringReplace(aSource, SaltoLinea, '^', [rfreplaceall]); - // o bien: - // - //aSource := Copy( cLinea, 1, length(cLinea)-2) ); - if InitSource then begin NChar:=1; @@ -231,7 +295,3 @@ begin end; end. - - - - diff --git a/Database/udfs/udf_RtfToText.dll b/Database/udfs/udf_RtfToText.dll index 46b4c45..5f0c6b0 100644 Binary files a/Database/udfs/udf_RtfToText.dll and b/Database/udfs/udf_RtfToText.dll differ diff --git a/Database/udfs/udf_RtfToText.dproj b/Database/udfs/udf_RtfToText.dproj index 5ba99a5..dd470e1 100644 --- a/Database/udfs/udf_RtfToText.dproj +++ b/Database/udfs/udf_RtfToText.dproj @@ -18,576 +18,63 @@ 7.0 3 - DEBUG + EUREKALOG;EUREKALOG_VER5;DEBUG Delphi.Personality -FalseTrueFalse - - - FalseFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + False + True + False + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 3082 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + Muststang Peak EasyListview Runtime Package RemObjects Pascal Script - RemObjects SDK 3.0 Integration - udf_RtfToText.dpr + + + udf_RtfToText.dpr + + - + MainSource - - + + \ No newline at end of file diff --git a/Database/udfs/udf_RtfToText.drc b/Database/udfs/udf_RtfToText.drc index 433507d..95b9fbb 100644 --- a/Database/udfs/udf_RtfToText.drc +++ b/Database/udfs/udf_RtfToText.drc @@ -8,222 +8,241 @@ resources were bound to the produced executable. */ -#define Consts_SDockZoneHasNoCtl 65312 -#define Consts_SDockZoneVersionConflict 65313 -#define Consts_SANSIEncoding 65314 -#define Consts_SASCIIEncoding 65315 -#define Consts_SUnicodeEncoding 65316 -#define Consts_SBigEndianEncoding 65317 -#define Consts_SUTF8Encoding 65318 -#define Consts_SUTF7Encoding 65319 -#define Consts_SmkcEnd 65328 -#define Consts_SmkcHome 65329 -#define Consts_SmkcLeft 65330 -#define Consts_SmkcUp 65331 -#define Consts_SmkcRight 65332 -#define Consts_SmkcDown 65333 -#define Consts_SmkcIns 65334 -#define Consts_SmkcDel 65335 -#define Consts_SmkcShift 65336 -#define Consts_SmkcCtrl 65337 -#define Consts_SmkcAlt 65338 -#define Consts_SIconToClipboard 65339 -#define Consts_SDuplicateMenus 65340 -#define Consts_SDockedCtlNeedsName 65341 -#define Consts_SDockTreeRemoveError 65342 -#define Consts_SDockZoneNotFound 65343 -#define Consts_SMsgDlgOK 65344 -#define Consts_SMsgDlgCancel 65345 -#define Consts_SMsgDlgHelp 65346 -#define Consts_SMsgDlgAbort 65347 -#define Consts_SMsgDlgRetry 65348 -#define Consts_SMsgDlgIgnore 65349 -#define Consts_SMsgDlgAll 65350 -#define Consts_SMsgDlgNoToAll 65351 -#define Consts_SMsgDlgYesToAll 65352 -#define Consts_SmkcBkSp 65353 -#define Consts_SmkcTab 65354 -#define Consts_SmkcEsc 65355 -#define Consts_SmkcEnter 65356 -#define Consts_SmkcSpace 65357 -#define Consts_SmkcPgUp 65358 -#define Consts_SmkcPgDn 65359 -#define Consts_SCancelButton 65360 -#define Consts_SYesButton 65361 -#define Consts_SNoButton 65362 -#define Consts_SHelpButton 65363 -#define Consts_SCloseButton 65364 -#define Consts_SIgnoreButton 65365 -#define Consts_SRetryButton 65366 -#define Consts_SAbortButton 65367 -#define Consts_SAllButton 65368 -#define Consts_SCannotDragForm 65369 -#define Consts_SMsgDlgWarning 65370 -#define Consts_SMsgDlgError 65371 -#define Consts_SMsgDlgInformation 65372 -#define Consts_SMsgDlgConfirm 65373 -#define Consts_SMsgDlgYes 65374 -#define Consts_SMsgDlgNo 65375 -#define Consts_SImageWriteFail 65376 -#define Consts_SWindowDCError 65377 -#define Consts_SWindowClass 65378 -#define Consts_SCannotFocus 65379 -#define Consts_SParentRequired 65380 -#define Consts_SMDIChildNotVisible 65381 -#define Consts_SVisibleChanged 65382 -#define Consts_SCannotShowModal 65383 -#define Consts_SMenuIndexError 65384 -#define Consts_SMenuReinserted 65385 -#define Consts_SMenuNotFound 65386 -#define Consts_SNoTimers 65387 -#define Consts_SGroupIndexTooLow 65388 -#define Consts_SNoMDIForm 65389 -#define Consts_SControlParentSetToSelf 65390 -#define Consts_SOKButton 65391 -#define RTLConsts_SWriteError 65392 -#define HelpIntfs_hNoTableOfContents 65393 -#define HelpIntfs_hNothingFound 65394 -#define HelpIntfs_hNoContext 65395 -#define HelpIntfs_hNoContextFound 65396 -#define HelpIntfs_hNoTopics 65397 -#define Consts_SInvalidBitmap 65398 -#define Consts_SInvalidIcon 65399 -#define Consts_SChangeIconSize 65400 -#define Consts_SUnknownClipboardFormat 65401 -#define Consts_SOutOfResources 65402 -#define Consts_SNoCanvasHandle 65403 -#define Consts_SInvalidImageSize 65404 -#define Consts_SInvalidImageList 65405 -#define Consts_SImageIndexError 65406 -#define Consts_SImageReadFail 65407 -#define RTLConsts_SInvalidPropertyPath 65408 -#define RTLConsts_SInvalidPropertyValue 65409 -#define RTLConsts_SInvalidRegType 65410 -#define RTLConsts_SListCapacityError 65411 -#define RTLConsts_SListCountError 65412 -#define RTLConsts_SListIndexError 65413 -#define RTLConsts_SMemoryStreamError 65414 -#define RTLConsts_SPropertyException 65415 -#define RTLConsts_SReadError 65416 -#define RTLConsts_SReadOnlyProperty 65417 -#define RTLConsts_SRegGetDataFailed 65418 -#define RTLConsts_SResNotFound 65419 -#define RTLConsts_SSeekNotImplemented 65420 -#define RTLConsts_SSortedListError 65421 -#define RTLConsts_SUnknownGroup 65422 -#define RTLConsts_SUnknownProperty 65423 -#define ComConst_SNoCloseActiveServer1 65424 -#define ComConst_SNoCloseActiveServer2 65425 -#define RTLConsts_SAncestorNotFound 65426 -#define RTLConsts_SAssignError 65427 -#define RTLConsts_SBitsIndexError 65428 -#define RTLConsts_SCantWriteResourceStreamError 65429 -#define RTLConsts_SCheckSynchronizeError 65430 -#define RTLConsts_SClassNotFound 65431 -#define RTLConsts_SDuplicateClass 65432 -#define RTLConsts_SDuplicateItem 65433 -#define RTLConsts_SDuplicateName 65434 -#define RTLConsts_SDuplicateString 65435 -#define RTLConsts_SFCreateErrorEx 65436 -#define RTLConsts_SFOpenErrorEx 65437 -#define RTLConsts_SInvalidImage 65438 -#define RTLConsts_SInvalidName 65439 -#define SysConst_SShortDayNameWed 65440 -#define SysConst_SShortDayNameThu 65441 -#define SysConst_SShortDayNameFri 65442 -#define SysConst_SShortDayNameSat 65443 -#define SysConst_SLongDayNameSun 65444 -#define SysConst_SLongDayNameMon 65445 -#define SysConst_SLongDayNameTue 65446 -#define SysConst_SLongDayNameWed 65447 -#define SysConst_SLongDayNameThu 65448 -#define SysConst_SLongDayNameFri 65449 -#define SysConst_SLongDayNameSat 65450 -#define ComConst_SOleError 65451 -#define ComConst_SNoMethod 65452 -#define ComConst_SVarNotObject 65453 -#define ComConst_STooManyParams 65454 -#define ComConst_SAutomationWarning 65455 -#define SysConst_SShortMonthNameDec 65456 -#define SysConst_SLongMonthNameJan 65457 -#define SysConst_SLongMonthNameFeb 65458 -#define SysConst_SLongMonthNameMar 65459 -#define SysConst_SLongMonthNameApr 65460 -#define SysConst_SLongMonthNameMay 65461 -#define SysConst_SLongMonthNameJun 65462 -#define SysConst_SLongMonthNameJul 65463 -#define SysConst_SLongMonthNameAug 65464 -#define SysConst_SLongMonthNameSep 65465 -#define SysConst_SLongMonthNameOct 65466 -#define SysConst_SLongMonthNameNov 65467 -#define SysConst_SLongMonthNameDec 65468 -#define SysConst_SShortDayNameSun 65469 -#define SysConst_SShortDayNameMon 65470 -#define SysConst_SShortDayNameTue 65471 -#define SysConst_SAssertError 65472 -#define SysConst_SAbstractError 65473 -#define SysConst_SModuleAccessViolation 65474 -#define SysConst_SOSError 65475 -#define SysConst_SUnkOSError 65476 -#define SysConst_SShortMonthNameJan 65477 -#define SysConst_SShortMonthNameFeb 65478 -#define SysConst_SShortMonthNameMar 65479 -#define SysConst_SShortMonthNameApr 65480 -#define SysConst_SShortMonthNameMay 65481 -#define SysConst_SShortMonthNameJun 65482 -#define SysConst_SShortMonthNameJul 65483 -#define SysConst_SShortMonthNameAug 65484 -#define SysConst_SShortMonthNameSep 65485 -#define SysConst_SShortMonthNameOct 65486 -#define SysConst_SShortMonthNameNov 65487 -#define SysConst_SVarArrayBounds 65488 -#define SysConst_SVarArrayLocked 65489 -#define SysConst_SInvalidVarCast 65490 -#define SysConst_SInvalidVarOp 65491 -#define SysConst_SInvalidVarOpWithHResultWithPrefix 65492 -#define SysConst_SVarTypeCouldNotConvert 65493 -#define SysConst_SVarTypeConvertOverflow 65494 -#define SysConst_SVarOverflow 65495 -#define SysConst_SVarInvalid 65496 -#define SysConst_SVarBadType 65497 -#define SysConst_SVarNotImplemented 65498 -#define SysConst_SVarUnexpected 65499 -#define SysConst_SExternalException 65500 -#define SysConst_SAssertionFailed 65501 -#define SysConst_SIntfCastError 65502 -#define SysConst_SSafecallException 65503 -#define SysConst_SUnderflow 65504 -#define SysConst_SInvalidPointer 65505 -#define SysConst_SInvalidCast 65506 -#define SysConst_SAccessViolationArg3 65507 -#define SysConst_SAccessViolationNoArg 65508 -#define SysConst_SStackOverflow 65509 -#define SysConst_SControlC 65510 -#define SysConst_SPrivilege 65511 -#define SysConst_SException 65512 -#define SysConst_SExceptTitle 65513 -#define SysConst_SInvalidFormat 65514 -#define SysConst_SArgumentMissing 65515 -#define SysConst_SDispatchError 65516 -#define SysConst_SReadAccess 65517 -#define SysConst_SWriteAccess 65518 -#define SysConst_SVarArrayCreate 65519 +#define Consts_SDockZoneHasNoCtl 65296 +#define Consts_SDockZoneVersionConflict 65297 +#define Consts_SANSIEncoding 65298 +#define Consts_SASCIIEncoding 65299 +#define Consts_SUnicodeEncoding 65300 +#define Consts_SBigEndianEncoding 65301 +#define Consts_SUTF8Encoding 65302 +#define Consts_SUTF7Encoding 65303 +#define JConsts_sChangeJPGSize 65304 +#define JConsts_sJPEGError 65305 +#define JConsts_sJPEGImageFile 65306 +#define Consts_SmkcLeft 65312 +#define Consts_SmkcUp 65313 +#define Consts_SmkcRight 65314 +#define Consts_SmkcDown 65315 +#define Consts_SmkcIns 65316 +#define Consts_SmkcDel 65317 +#define Consts_SmkcShift 65318 +#define Consts_SmkcCtrl 65319 +#define Consts_SmkcAlt 65320 +#define Consts_SInvalidClipFmt 65321 +#define Consts_SIconToClipboard 65322 +#define Consts_SCannotOpenClipboard 65323 +#define Consts_SDuplicateMenus 65324 +#define Consts_SDockedCtlNeedsName 65325 +#define Consts_SDockTreeRemoveError 65326 +#define Consts_SDockZoneNotFound 65327 +#define Consts_SMsgDlgHelp 65328 +#define Consts_SMsgDlgAbort 65329 +#define Consts_SMsgDlgRetry 65330 +#define Consts_SMsgDlgIgnore 65331 +#define Consts_SMsgDlgAll 65332 +#define Consts_SMsgDlgNoToAll 65333 +#define Consts_SMsgDlgYesToAll 65334 +#define Consts_SmkcBkSp 65335 +#define Consts_SmkcTab 65336 +#define Consts_SmkcEsc 65337 +#define Consts_SmkcEnter 65338 +#define Consts_SmkcSpace 65339 +#define Consts_SmkcPgUp 65340 +#define Consts_SmkcPgDn 65341 +#define Consts_SmkcEnd 65342 +#define Consts_SmkcHome 65343 +#define Consts_SRetryButton 65344 +#define Consts_SAbortButton 65345 +#define Consts_SAllButton 65346 +#define Consts_SCannotDragForm 65347 +#define Consts_SVMetafiles 65348 +#define Consts_SVEnhMetafiles 65349 +#define Consts_SVIcons 65350 +#define Consts_SVBitmaps 65351 +#define Consts_SMsgDlgWarning 65352 +#define Consts_SMsgDlgError 65353 +#define Consts_SMsgDlgInformation 65354 +#define Consts_SMsgDlgConfirm 65355 +#define Consts_SMsgDlgYes 65356 +#define Consts_SMsgDlgNo 65357 +#define Consts_SMsgDlgOK 65358 +#define Consts_SMsgDlgCancel 65359 +#define Consts_SVisibleChanged 65360 +#define Consts_SCannotShowModal 65361 +#define Consts_SMenuIndexError 65362 +#define Consts_SMenuReinserted 65363 +#define Consts_SMenuNotFound 65364 +#define Consts_SNoTimers 65365 +#define Consts_SGroupIndexTooLow 65366 +#define Consts_SNoMDIForm 65367 +#define Consts_SControlParentSetToSelf 65368 +#define Consts_SOKButton 65369 +#define Consts_SCancelButton 65370 +#define Consts_SYesButton 65371 +#define Consts_SNoButton 65372 +#define Consts_SHelpButton 65373 +#define Consts_SCloseButton 65374 +#define Consts_SIgnoreButton 65375 +#define Consts_SScanLine 65376 +#define Consts_SChangeIconSize 65377 +#define Consts_SUnknownExtension 65378 +#define Consts_SUnknownClipboardFormat 65379 +#define Consts_SOutOfResources 65380 +#define Consts_SNoCanvasHandle 65381 +#define Consts_SInvalidImageSize 65382 +#define Consts_SInvalidImageList 65383 +#define Consts_SImageIndexError 65384 +#define Consts_SImageReadFail 65385 +#define Consts_SImageWriteFail 65386 +#define Consts_SWindowDCError 65387 +#define Consts_SWindowClass 65388 +#define Consts_SCannotFocus 65389 +#define Consts_SParentRequired 65390 +#define Consts_SMDIChildNotVisible 65391 +#define RTLConsts_SSeekNotImplemented 65392 +#define RTLConsts_SSortedListError 65393 +#define RTLConsts_SUnknownGroup 65394 +#define RTLConsts_SUnknownProperty 65395 +#define RTLConsts_SWriteError 65396 +#define RTLConsts_SThreadCreateError 65397 +#define RTLConsts_SThreadError 65398 +#define HelpIntfs_hNoTableOfContents 65399 +#define HelpIntfs_hNothingFound 65400 +#define HelpIntfs_hNoContext 65401 +#define HelpIntfs_hNoContextFound 65402 +#define HelpIntfs_hNoTopics 65403 +#define Consts_SInvalidBitmap 65404 +#define Consts_SInvalidIcon 65405 +#define Consts_SInvalidMetafile 65406 +#define Consts_SInvalidPixelFormat 65407 +#define RTLConsts_SFOpenErrorEx 65408 +#define RTLConsts_SInvalidImage 65409 +#define RTLConsts_SInvalidName 65410 +#define RTLConsts_SInvalidProperty 65411 +#define RTLConsts_SInvalidPropertyPath 65412 +#define RTLConsts_SInvalidPropertyValue 65413 +#define RTLConsts_SInvalidRegType 65414 +#define RTLConsts_SListCapacityError 65415 +#define RTLConsts_SListCountError 65416 +#define RTLConsts_SListIndexError 65417 +#define RTLConsts_SMemoryStreamError 65418 +#define RTLConsts_SPropertyException 65419 +#define RTLConsts_SReadError 65420 +#define RTLConsts_SReadOnlyProperty 65421 +#define RTLConsts_SRegGetDataFailed 65422 +#define RTLConsts_SResNotFound 65423 +#define ComConst_SVarNotObject 65424 +#define ComConst_STooManyParams 65425 +#define ComConst_SAutomationWarning 65426 +#define ComConst_SNoCloseActiveServer1 65427 +#define ComConst_SNoCloseActiveServer2 65428 +#define RTLConsts_SAncestorNotFound 65429 +#define RTLConsts_SAssignError 65430 +#define RTLConsts_SBitsIndexError 65431 +#define RTLConsts_SCantWriteResourceStreamError 65432 +#define RTLConsts_SCheckSynchronizeError 65433 +#define RTLConsts_SClassNotFound 65434 +#define RTLConsts_SDuplicateClass 65435 +#define RTLConsts_SDuplicateItem 65436 +#define RTLConsts_SDuplicateName 65437 +#define RTLConsts_SDuplicateString 65438 +#define RTLConsts_SFCreateErrorEx 65439 +#define SysConst_SShortDayNameSun 65440 +#define SysConst_SShortDayNameMon 65441 +#define SysConst_SShortDayNameTue 65442 +#define SysConst_SShortDayNameWed 65443 +#define SysConst_SShortDayNameThu 65444 +#define SysConst_SShortDayNameFri 65445 +#define SysConst_SShortDayNameSat 65446 +#define SysConst_SLongDayNameSun 65447 +#define SysConst_SLongDayNameMon 65448 +#define SysConst_SLongDayNameTue 65449 +#define SysConst_SLongDayNameWed 65450 +#define SysConst_SLongDayNameThu 65451 +#define SysConst_SLongDayNameFri 65452 +#define SysConst_SLongDayNameSat 65453 +#define ComConst_SOleError 65454 +#define ComConst_SNoMethod 65455 +#define SysConst_SShortMonthNameSep 65456 +#define SysConst_SShortMonthNameOct 65457 +#define SysConst_SShortMonthNameNov 65458 +#define SysConst_SShortMonthNameDec 65459 +#define SysConst_SLongMonthNameJan 65460 +#define SysConst_SLongMonthNameFeb 65461 +#define SysConst_SLongMonthNameMar 65462 +#define SysConst_SLongMonthNameApr 65463 +#define SysConst_SLongMonthNameMay 65464 +#define SysConst_SLongMonthNameJun 65465 +#define SysConst_SLongMonthNameJul 65466 +#define SysConst_SLongMonthNameAug 65467 +#define SysConst_SLongMonthNameSep 65468 +#define SysConst_SLongMonthNameOct 65469 +#define SysConst_SLongMonthNameNov 65470 +#define SysConst_SLongMonthNameDec 65471 +#define SysConst_SAssertionFailed 65472 +#define SysConst_SIntfCastError 65473 +#define SysConst_SSafecallException 65474 +#define SysConst_SAssertError 65475 +#define SysConst_SAbstractError 65476 +#define SysConst_SModuleAccessViolation 65477 +#define SysConst_SOSError 65478 +#define SysConst_SUnkOSError 65479 +#define SysConst_SShortMonthNameJan 65480 +#define SysConst_SShortMonthNameFeb 65481 +#define SysConst_SShortMonthNameMar 65482 +#define SysConst_SShortMonthNameApr 65483 +#define SysConst_SShortMonthNameMay 65484 +#define SysConst_SShortMonthNameJun 65485 +#define SysConst_SShortMonthNameJul 65486 +#define SysConst_SShortMonthNameAug 65487 +#define SysConst_SWriteAccess 65488 +#define SysConst_SVarArrayCreate 65489 +#define SysConst_SVarArrayBounds 65490 +#define SysConst_SVarArrayLocked 65491 +#define SysConst_SInvalidVarCast 65492 +#define SysConst_SInvalidVarOp 65493 +#define SysConst_SInvalidVarNullOp 65494 +#define SysConst_SInvalidVarOpWithHResultWithPrefix 65495 +#define SysConst_SVarTypeCouldNotConvert 65496 +#define SysConst_SVarTypeConvertOverflow 65497 +#define SysConst_SVarOverflow 65498 +#define SysConst_SVarInvalid 65499 +#define SysConst_SVarBadType 65500 +#define SysConst_SVarNotImplemented 65501 +#define SysConst_SVarUnexpected 65502 +#define SysConst_SExternalException 65503 +#define SysConst_SOverflow 65504 +#define SysConst_SUnderflow 65505 +#define SysConst_SInvalidPointer 65506 +#define SysConst_SInvalidCast 65507 +#define SysConst_SAccessViolationArg3 65508 +#define SysConst_SAccessViolationNoArg 65509 +#define SysConst_SStackOverflow 65510 +#define SysConst_SControlC 65511 +#define SysConst_SPrivilege 65512 +#define SysConst_SOperationAborted 65513 +#define SysConst_SException 65514 +#define SysConst_SExceptTitle 65515 +#define SysConst_SInvalidFormat 65516 +#define SysConst_SArgumentMissing 65517 +#define SysConst_SDispatchError 65518 +#define SysConst_SReadAccess 65519 #define SysConst_SInvalidInteger 65520 -#define SysConst_SOutOfMemory 65521 -#define SysConst_SInOutError 65522 -#define SysConst_SFileNotFound 65523 -#define SysConst_SInvalidFilename 65524 -#define SysConst_STooManyOpenFiles 65525 -#define SysConst_SAccessDenied 65526 -#define SysConst_SEndOfFile 65527 -#define SysConst_SDiskFull 65528 -#define SysConst_SInvalidInput 65529 -#define SysConst_SDivByZero 65530 -#define SysConst_SRangeError 65531 -#define SysConst_SIntOverflow 65532 -#define SysConst_SInvalidOp 65533 -#define SysConst_SZeroDivide 65534 -#define SysConst_SOverflow 65535 +#define SysConst_SInvalidFloat 65521 +#define SysConst_SOutOfMemory 65522 +#define SysConst_SInOutError 65523 +#define SysConst_SFileNotFound 65524 +#define SysConst_SInvalidFilename 65525 +#define SysConst_STooManyOpenFiles 65526 +#define SysConst_SAccessDenied 65527 +#define SysConst_SEndOfFile 65528 +#define SysConst_SDiskFull 65529 +#define SysConst_SInvalidInput 65530 +#define SysConst_SDivByZero 65531 +#define SysConst_SRangeError 65532 +#define SysConst_SIntOverflow 65533 +#define SysConst_SInvalidOp 65534 +#define SysConst_SZeroDivide 65535 STRINGTABLE BEGIN Consts_SDockZoneHasNoCtl, " - Dock zone has no control" @@ -234,8 +253,9 @@ BEGIN Consts_SBigEndianEncoding, "Big Endian Unicode" Consts_SUTF8Encoding, "UTF-8" Consts_SUTF7Encoding, "UTF-7" - Consts_SmkcEnd, "End" - Consts_SmkcHome, "Home" + JConsts_sChangeJPGSize, "Cannot change the size of a JPEG image" + JConsts_sJPEGError, "JPEG error #%d" + JConsts_sJPEGImageFile, "JPEG Image File" Consts_SmkcLeft, "Left" Consts_SmkcUp, "Up" Consts_SmkcRight, "Right" @@ -245,13 +265,13 @@ BEGIN Consts_SmkcShift, "Shift+" Consts_SmkcCtrl, "Ctrl+" Consts_SmkcAlt, "Alt+" + Consts_SInvalidClipFmt, "Invalid clipboard format" Consts_SIconToClipboard, "Clipboard does not support Icons" + Consts_SCannotOpenClipboard, "Cannot open clipboard" Consts_SDuplicateMenus, "Menu '%s' is already being used by another form" Consts_SDockedCtlNeedsName, "Docked control must have a name" Consts_SDockTreeRemoveError, "Error removing control from dock tree" Consts_SDockZoneNotFound, " - Dock zone not found" - Consts_SMsgDlgOK, "OK" - Consts_SMsgDlgCancel, "Cancel" Consts_SMsgDlgHelp, "&Help" Consts_SMsgDlgAbort, "&Abort" Consts_SMsgDlgRetry, "&Retry" @@ -266,28 +286,24 @@ BEGIN Consts_SmkcSpace, "Space" Consts_SmkcPgUp, "PgUp" Consts_SmkcPgDn, "PgDn" - Consts_SCancelButton, "Cancel" - Consts_SYesButton, "&Yes" - Consts_SNoButton, "&No" - Consts_SHelpButton, "&Help" - Consts_SCloseButton, "&Close" - Consts_SIgnoreButton, "&Ignore" + Consts_SmkcEnd, "End" + Consts_SmkcHome, "Home" Consts_SRetryButton, "&Retry" Consts_SAbortButton, "Abort" Consts_SAllButton, "&All" Consts_SCannotDragForm, "Cannot drag a form" + Consts_SVMetafiles, "Metafiles" + Consts_SVEnhMetafiles, "Enhanced Metafiles" + Consts_SVIcons, "Icons" + Consts_SVBitmaps, "Bitmaps" Consts_SMsgDlgWarning, "Warning" Consts_SMsgDlgError, "Error" Consts_SMsgDlgInformation, "Information" Consts_SMsgDlgConfirm, "Confirm" Consts_SMsgDlgYes, "&Yes" Consts_SMsgDlgNo, "&No" - Consts_SImageWriteFail, "Failed to write ImageList data to stream" - Consts_SWindowDCError, "Error creating window device context" - Consts_SWindowClass, "Error creating window class" - Consts_SCannotFocus, "Cannot focus a disabled or invisible window" - Consts_SParentRequired, "Control '%s' has no parent window" - Consts_SMDIChildNotVisible, "Cannot hide an MDI Child Form" + Consts_SMsgDlgOK, "OK" + Consts_SMsgDlgCancel, "Cancel" Consts_SVisibleChanged, "Cannot change Visible in OnShow or OnHide" Consts_SCannotShowModal, "Cannot make a visible window modal" Consts_SMenuIndexError, "Menu index out of range" @@ -298,15 +314,15 @@ BEGIN Consts_SNoMDIForm, "Cannot create form. No MDI forms are currently active" Consts_SControlParentSetToSelf, "A control cannot have itself as its parent" Consts_SOKButton, "OK" - RTLConsts_SWriteError, "Stream write error" - HelpIntfs_hNoTableOfContents, "Unable to find a Table of Contents" - HelpIntfs_hNothingFound, "No help found for %s" - HelpIntfs_hNoContext, "No context-sensitive help installed" - HelpIntfs_hNoContextFound, "No help found for context" - HelpIntfs_hNoTopics, "No topic-based help system installed" - Consts_SInvalidBitmap, "Bitmap image is not valid" - Consts_SInvalidIcon, "Icon image is not valid" + Consts_SCancelButton, "Cancel" + Consts_SYesButton, "&Yes" + Consts_SNoButton, "&No" + Consts_SHelpButton, "&Help" + Consts_SCloseButton, "&Close" + Consts_SIgnoreButton, "&Ignore" + Consts_SScanLine, "Scan line index out of range" Consts_SChangeIconSize, "Cannot change the size of an icon" + Consts_SUnknownExtension, "Unknown picture file extension (.%s)" Consts_SUnknownClipboardFormat, "Unsupported clipboard format" Consts_SOutOfResources, "Out of system resources" Consts_SNoCanvasHandle, "Canvas does not allow drawing" @@ -314,6 +330,32 @@ BEGIN Consts_SInvalidImageList, "Invalid ImageList" Consts_SImageIndexError, "Invalid ImageList Index" Consts_SImageReadFail, "Failed to read ImageList data from stream" + Consts_SImageWriteFail, "Failed to write ImageList data to stream" + Consts_SWindowDCError, "Error creating window device context" + Consts_SWindowClass, "Error creating window class" + Consts_SCannotFocus, "Cannot focus a disabled or invisible window" + Consts_SParentRequired, "Control '%s' has no parent window" + Consts_SMDIChildNotVisible, "Cannot hide an MDI Child Form" + RTLConsts_SSeekNotImplemented, "%s.Seek not implemented" + RTLConsts_SSortedListError, "Operation not allowed on sorted list" + RTLConsts_SUnknownGroup, "%s not in a class registration group" + RTLConsts_SUnknownProperty, "Property %s does not exist" + RTLConsts_SWriteError, "Stream write error" + RTLConsts_SThreadCreateError, "Thread creation error: %s" + RTLConsts_SThreadError, "Thread Error: %s (%d)" + HelpIntfs_hNoTableOfContents, "Unable to find a Table of Contents" + HelpIntfs_hNothingFound, "No help found for %s" + HelpIntfs_hNoContext, "No context-sensitive help installed" + HelpIntfs_hNoContextFound, "No help found for context" + HelpIntfs_hNoTopics, "No topic-based help system installed" + Consts_SInvalidBitmap, "Bitmap image is not valid" + Consts_SInvalidIcon, "Icon image is not valid" + Consts_SInvalidMetafile, "Metafile is not valid" + Consts_SInvalidPixelFormat, "Invalid pixel format" + RTLConsts_SFOpenErrorEx, "Cannot open file \"%s\". %s" + RTLConsts_SInvalidImage, "Invalid stream format" + RTLConsts_SInvalidName, "''%s'' is not a valid component name" + RTLConsts_SInvalidProperty, "Invalid property value" RTLConsts_SInvalidPropertyPath, "Invalid property path" RTLConsts_SInvalidPropertyValue, "Invalid property value" RTLConsts_SInvalidRegType, "Invalid data type for '%s'" @@ -326,10 +368,9 @@ BEGIN RTLConsts_SReadOnlyProperty, "Property is read-only" RTLConsts_SRegGetDataFailed, "Failed to get data for '%s'" RTLConsts_SResNotFound, "Resource %s not found" - RTLConsts_SSeekNotImplemented, "%s.Seek not implemented" - RTLConsts_SSortedListError, "Operation not allowed on sorted list" - RTLConsts_SUnknownGroup, "%s not in a class registration group" - RTLConsts_SUnknownProperty, "Property %s does not exist" + ComConst_SVarNotObject, "Variant does not reference an automation object" + ComConst_STooManyParams, "Dispatch methods do not support more than 64 parameters" + ComConst_SAutomationWarning, "COM Server Warning" ComConst_SNoCloseActiveServer1, "There are still active COM objects in this application. One or more clients may have references to these objects, so manually closing " ComConst_SNoCloseActiveServer2, "this application may cause those client application(s) to fail.\r\n\r\nAre you sure you want to close this application?" RTLConsts_SAncestorNotFound, "Ancestor for '%s' not found" @@ -343,9 +384,9 @@ BEGIN RTLConsts_SDuplicateName, "A component named %s already exists" RTLConsts_SDuplicateString, "String list does not allow duplicates" RTLConsts_SFCreateErrorEx, "Cannot create file \"%s\". %s" - RTLConsts_SFOpenErrorEx, "Cannot open file \"%s\". %s" - RTLConsts_SInvalidImage, "Invalid stream format" - RTLConsts_SInvalidName, "''%s'' is not a valid component name" + SysConst_SShortDayNameSun, "Sun" + SysConst_SShortDayNameMon, "Mon" + SysConst_SShortDayNameTue, "Tue" SysConst_SShortDayNameWed, "Wed" SysConst_SShortDayNameThu, "Thu" SysConst_SShortDayNameFri, "Fri" @@ -359,9 +400,9 @@ BEGIN SysConst_SLongDayNameSat, "Saturday" ComConst_SOleError, "OLE error %.8x" ComConst_SNoMethod, "Method '%s' not supported by automation object" - ComConst_SVarNotObject, "Variant does not reference an automation object" - ComConst_STooManyParams, "Dispatch methods do not support more than 64 parameters" - ComConst_SAutomationWarning, "COM Server Warning" + SysConst_SShortMonthNameSep, "Sep" + SysConst_SShortMonthNameOct, "Oct" + SysConst_SShortMonthNameNov, "Nov" SysConst_SShortMonthNameDec, "Dec" SysConst_SLongMonthNameJan, "January" SysConst_SLongMonthNameFeb, "February" @@ -375,9 +416,9 @@ BEGIN SysConst_SLongMonthNameOct, "October" SysConst_SLongMonthNameNov, "November" SysConst_SLongMonthNameDec, "December" - SysConst_SShortDayNameSun, "Sun" - SysConst_SShortDayNameMon, "Mon" - SysConst_SShortDayNameTue, "Tue" + SysConst_SAssertionFailed, "Assertion failed" + SysConst_SIntfCastError, "Interface not supported" + SysConst_SSafecallException, "Exception in safecall method" SysConst_SAssertError, "%s (%s, line %d)" SysConst_SAbstractError, "Abstract Error" SysConst_SModuleAccessViolation, "Access violation at address %p in module '%s'. %s of address %p" @@ -391,13 +432,13 @@ BEGIN SysConst_SShortMonthNameJun, "Jun" SysConst_SShortMonthNameJul, "Jul" SysConst_SShortMonthNameAug, "Aug" - SysConst_SShortMonthNameSep, "Sep" - SysConst_SShortMonthNameOct, "Oct" - SysConst_SShortMonthNameNov, "Nov" + SysConst_SWriteAccess, "Write" + SysConst_SVarArrayCreate, "Error creating variant or safe array" SysConst_SVarArrayBounds, "Variant or safe array index out of bounds" SysConst_SVarArrayLocked, "Variant or safe array is locked" SysConst_SInvalidVarCast, "Invalid variant type conversion" SysConst_SInvalidVarOp, "Invalid variant operation" + SysConst_SInvalidVarNullOp, "Invalid NULL variant operation" SysConst_SInvalidVarOpWithHResultWithPrefix, "Invalid variant operation (%s%.8x)\n%s" SysConst_SVarTypeCouldNotConvert, "Could not convert variant of type (%s) into type (%s)" SysConst_SVarTypeConvertOverflow, "Overflow while converting variant of type (%s) into type (%s)" @@ -407,9 +448,7 @@ BEGIN SysConst_SVarNotImplemented, "Operation not supported" SysConst_SVarUnexpected, "Unexpected variant error" SysConst_SExternalException, "External exception %x" - SysConst_SAssertionFailed, "Assertion failed" - SysConst_SIntfCastError, "Interface not supported" - SysConst_SSafecallException, "Exception in safecall method" + SysConst_SOverflow, "Floating point overflow" SysConst_SUnderflow, "Floating point underflow" SysConst_SInvalidPointer, "Invalid pointer operation" SysConst_SInvalidCast, "Invalid class typecast" @@ -418,15 +457,15 @@ BEGIN SysConst_SStackOverflow, "Stack overflow" SysConst_SControlC, "Control-C hit" SysConst_SPrivilege, "Privileged instruction" + SysConst_SOperationAborted, "Operation aborted" SysConst_SException, "Exception %s in module %s at %p.\r\n%s%s\r\n" SysConst_SExceptTitle, "Application Error" SysConst_SInvalidFormat, "Format '%s' invalid or incompatible with argument" SysConst_SArgumentMissing, "No argument for format '%s'" SysConst_SDispatchError, "Variant method calls not supported" SysConst_SReadAccess, "Read" - SysConst_SWriteAccess, "Write" - SysConst_SVarArrayCreate, "Error creating variant or safe array" SysConst_SInvalidInteger, "'%s' is not a valid integer value" + SysConst_SInvalidFloat, "'%s' is not a valid floating point value" SysConst_SOutOfMemory, "Out of memory" SysConst_SInOutError, "I/O error %d" SysConst_SFileNotFound, "File not found" @@ -441,11 +480,12 @@ BEGIN SysConst_SIntOverflow, "Integer overflow" SysConst_SInvalidOp, "Invalid floating point operation" SysConst_SZeroDivide, "Floating point division by zero" - SysConst_SOverflow, "Floating point overflow" END -/* c:\archivos de programa\codegear\rad studio\5.0\lib\Controls.res */ -/* c:\archivos de programa\codegear\rad studio\5.0\lib\Buttons.res */ -/* c:\archivos de programa\codegear\rad studio\5.0\lib\ExtDlgs.res */ -/* C:\Codigo Tecsitel\Database\udfs\udf_RtfToText.RES */ -/* C:\Codigo Tecsitel\Database\udfs\udf_RtfToText.drf */ +/* c:\archivos de programa\codegear\rad studio\5.0\Lib\Controls.res */ +/* c:\archivos de programa\codegear\rad studio\5.0\Lib\Buttons.res */ +/* c:\archivos de programa\codegear\rad studio\5.0\Lib\ExtDlgs.res */ +/* C:\TRichView\Units\D2007\RVTable.res */ +/* C:\TRichView\Units\D2007\RVStyle.RES */ +/* C:\Codigo Acana\Database\udfs\udf_RtfToText.RES */ +/* C:\Codigo Acana\Database\udfs\udf_RtfToText.drf */ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 616e1c8..b34842b 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,57 +54,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f3..1641339 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Informes/InfEtiquetasAlbaranCliente.fr3 b/Source/Informes/InfEtiquetasAlbaranCliente.fr3 index 07fd716..cf84d78 100644 --- a/Source/Informes/InfEtiquetasAlbaranCliente.fr3 +++ b/Source/Informes/InfEtiquetasAlbaranCliente.fr3 @@ -1,9 +1,14 @@ - + - - + + + + + + + diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dpk b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dpk index b1f2cc6..69b4dcb 100644 Binary files a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dpk and b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dpk differ diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj index 06a7230..815c87e 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj +++ b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj @@ -1,4 +1,5 @@ - + + {7ed85635-c723-4c0b-bf1d-f719e0ea33ad} AlbaranesCliente_controller.dpk @@ -48,19 +49,20 @@ MainSource - - - - + + + + + diff --git a/Source/Modulos/Albaranes de cliente/Controller/View/uIEditorDetalleEtiqueta.pas b/Source/Modulos/Albaranes de cliente/Controller/View/uIEditorDetalleEtiqueta.pas new file mode 100644 index 0000000..06c3684 --- /dev/null +++ b/Source/Modulos/Albaranes de cliente/Controller/View/uIEditorDetalleEtiqueta.pas @@ -0,0 +1,22 @@ +unit uIEditorDetalleEtiqueta; + +interface + +uses + uEditorBasico; + +type + IEditorDetalleEtiqueta = interface(IEditorBasico) + ['{FE668BD0-A722-402A-9E3C-190968014D19}'] + function GetMercancia: String; + procedure SetMercancia(const Value: String); + property Mercancia: String Read GetMercancia write SetMercancia; + + function GetBultos: Integer; + procedure SetBultos(const Value: Integer); + property Bultos: Integer Read GetBultos write SetBultos; + end; + +implementation + +end. diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas index 190d1fe..dddb300 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas @@ -39,9 +39,9 @@ type implementation uses - uROTypes, uEditorRegistryUtils, uIEditorAlbaranesClientePreview, - uEditorPreview, uDataModuleAlbaranesCliente, uEditorBase, cxControls, - uStringsUtils, uSistemaFunc, uFactuGES_App; + uROTypes, Controls, uEditorRegistryUtils, uIEditorAlbaranesClientePreview, + uIEditorDetalleEtiqueta, uEditorPreview, uDataModuleAlbaranesCliente, + uEditorBase, cxControls, uStringsUtils, uSistemaFunc, uFactuGES_App; { TAlbaranesClienteReportController } @@ -67,28 +67,47 @@ end; procedure TAlbaranesClienteReportController.EtiquetasPreview(const AListaID: TIntegerList); var AStream: Binary; + AEditorDetalle : IEditorDetalleEtiqueta; AEditor : IEditorAlbaranesClientePreview; + Mercancia: String; + Bultos: Integer; + bAceptar: Boolean; begin - AEditor := NIL; + AEditorDetalle := Nil; + AEditor := Nil; - ShowHourglassCursor; - try - AStream := FDataModule.GetEtiquetas(AListaID); + CreateEditor('EditorDetalleEtiqueta', IEditorDetalleEtiqueta, AEditorDetalle); + if Assigned(AEditorDetalle) then try - CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - end; + bAceptar := (AEditorDetalle.ShowModal = mrOk); + Mercancia := AEditorDetalle.Mercancia; + Bultos := AEditorDetalle.Bultos; finally - FreeAndNil(AStream); - AEditor := Nil; + AEditorDetalle.Release; + AEditorDetalle := NIL; + end; + + if bAceptar then + begin + ShowHourglassCursor; + try + AStream := FDataModule.GetEtiquetas(AListaID, Mercancia, Bultos); + try + CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; + finally + HideHourglassCursor; end; - finally - HideHourglassCursor; end; end; @@ -96,27 +115,47 @@ procedure TAlbaranesClienteReportController.EtiquetasPrint(const AListaID: TInte var AStream: Binary; AEditor : IEditorAlbaranesClientePreview; + AEditorDetalle : IEditorDetalleEtiqueta; + Mercancia: String; + Bultos: Integer; + bAceptar: Boolean; + begin + AEditorDetalle := Nil; AEditor := NIL; - ShowHourglassCursor; - try - AStream := FDataModule.GetEtiquetas(AListaID); + CreateEditor('EditorDetalleEtiqueta', IEditorDetalleEtiqueta, AEditorDetalle); + if Assigned(AEditorDetalle) then try - CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Print; - finally - AEditor.Release; - end; + bAceptar := (AEditorDetalle.ShowModal = mrOk); + Mercancia := AEditorDetalle.Mercancia; + Bultos := AEditorDetalle.Bultos; finally - FreeAndNil(AStream); - AEditor := Nil; + AEditorDetalle.Release; + AEditorDetalle := NIL; + end; + + if bAceptar then + begin + ShowHourglassCursor; + try + AStream := FDataModule.GetEtiquetas(AListaID, Mercancia, Bultos); + try + CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Print; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; + finally + HideHourglassCursor; end; - finally - HideHourglassCursor; end; end; diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas index 313ebf8..9cdefcc 100644 --- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas @@ -41,7 +41,7 @@ type // Report function GetRptAlbaranes(const ListaID: TIntegerList): Binary; function GetRptWordAlbaran(const AID: Integer): Binary; - function GetEtiquetas(const ListaID: TIntegerList): Binary; + function GetEtiquetas(const ListaID: TIntegerList; const Mercancia: String; const Bultos: Integer): Binary; function GetRptPDFAlbaran(const AID: Integer): Binary; function GetAnosItems : TStringList; @@ -90,7 +90,7 @@ begin AParam.Add(AID); Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam); finally - FreeAndNil(AParam); +// FreeAndNil(AParam); end; end; @@ -165,13 +165,13 @@ begin end; end; -function TDataModuleAlbaranesCliente.GetEtiquetas(const ListaID: TIntegerList): Binary; +function TDataModuleAlbaranesCliente.GetEtiquetas(const ListaID: TIntegerList; const Mercancia: String; const Bultos: Integer): Binary; var AParam : TIntegerArray; begin AParam := ListaID.ToIntegerArray; try - Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInformeEtiquetas(AParam) + Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInformeEtiquetas(AParam, Mercancia, Bultos) finally // FreeAndNil(AParam); end; diff --git a/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas b/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas index 64178cf..8d6e2f2 100644 --- a/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas +++ b/Source/Modulos/Albaranes de cliente/Model/Data/uIDataModuleAlbaranesClienteReport.pas @@ -11,7 +11,7 @@ type function GetRptAlbaranes(const AListaID: TIntegerList): Binary; function GetRptWordAlbaran(const AID: Integer): Binary; function GetRptPDFAlbaran(const AID: Integer): Binary; - function GetEtiquetas(const ListaID: TIntegerList): Binary; + function GetEtiquetas(const ListaID: TIntegerList; const Mercancia: String; const Bultos: Integer): Binary; end; implementation diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas index 2c43439..d420744 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas @@ -69,7 +69,7 @@ type procedure _GenerarAlbaran(const AID: Integer); public function GenerarAlbaran(const AListaID : TIntegerArray): Binary; - function GenerarEtiquetas(const AListaID : TIntegerArray): Binary; + function GenerarEtiquetas(const AListaID : TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; function GenerarAlbaranEnPDF(const ListaID : TIntegerArray): Binary; end; @@ -170,11 +170,11 @@ begin end; end; -function TRptAlbaranesCliente.GenerarEtiquetas(const AListaID : TIntegerArray): Binary; +function TRptAlbaranesCliente.GenerarEtiquetas(const AListaID : TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; var i: Integer; AInforme: Variant; - + begin Result := Binary.Create; try @@ -192,6 +192,9 @@ begin raise Exception.Create (('Error Servidor: GenerarEtiquetas, no encuentra informe ' + rptInfEtiquetas)); frxReport.LoadFromFile(AInforme, True); + + frxReport.Variables.Variables['Mercancia'] := VarToStr(AMercancia); + frxReport.Variables.Variables['Bultos'] := ABultos; frxReport.PrepareReport(False); finally FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO" diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas index a34bd3f..c2c8d2c 100644 --- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas +++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas @@ -34,7 +34,7 @@ type protected { IsrvAlbaranesCliente methods } function GenerarInforme(const ListaID: TIntegerArray): Binary; - function GenerarInformeEtiquetas(const ListaID : TIntegerArray): Binary; + function GenerarInformeEtiquetas(const ListaID: TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; function GenerarInformeEnWord(const ID: Integer): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; end; @@ -92,13 +92,13 @@ begin end; end; -function TsrvAlbaranesCliente.GenerarInformeEtiquetas(const ListaID : TIntegerArray): Binary; +function TsrvAlbaranesCliente.GenerarInformeEtiquetas(const ListaID : TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; var AReportGenerator : TRptAlbaranesCliente; begin AReportGenerator := TRptAlbaranesCliente.Create(nil); try - Result := AReportGenerator.GenerarEtiquetas(ListaID); + Result := AReportGenerator.GenerarEtiquetas(ListaID, AMercancia, ABultos); finally FreeAndNIL(AReportGenerator); end; diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk index 6a8b9b9..b53dc04 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk @@ -69,6 +69,7 @@ contains uEditorAlbaranDevCliente in 'uEditorAlbaranDevCliente.pas' {fEditorAlbaranDevCliente: TCustomEditor}, uViewAlbaranDevCliente in 'uViewAlbaranDevCliente.pas' {frViewAlbaranDevCliente: TCustomView}, uViewDatosYSeleccionClienteAlbaran in 'uViewDatosYSeleccionClienteAlbaran.pas' {frViewDatosYSeleccionClienteAlbaran: TCustomView}, - uViewTotalesAlbaran in 'uViewTotalesAlbaran.pas' {frViewTotalesAlbaran: TCustomView}; + uViewTotalesAlbaran in 'uViewTotalesAlbaran.pas' {frViewTotalesAlbaran: TCustomView}, + uEditorDetalleEtiqueta in 'uEditorDetalleEtiqueta.pas' {fEditorDetalleEtiqueta: TCustomEditor}; end. diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj index bcf5cb8..c00d509 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj @@ -97,6 +97,10 @@
fEditorAlbaranesDevCliente
TCustomEditor + +
fEditorAlbaranDevCliente
+ TCustomEditor +
fEditorElegirAlbaranesCliente
TfEditorElegirAlbaranesCliente diff --git a/Source/Modulos/Albaranes de cliente/Views/uAlbaranesClienteViewRegister.pas b/Source/Modulos/Albaranes de cliente/Views/uAlbaranesClienteViewRegister.pas index 15b329b..7d7fa73 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uAlbaranesClienteViewRegister.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uAlbaranesClienteViewRegister.pas @@ -8,12 +8,13 @@ procedure UnregisterViews; implementation uses - uEditorRegistryUtils, uEditorAlbaranesCliente, uEditorAlbaranCliente, + uEditorRegistryUtils, uEditorAlbaranesCliente, uEditorAlbaranCliente, uEditorDetalleEtiqueta, uEditorElegirArticulosAlbaranCliente, uEditorAlbaranesClienteReport, uEditorElegirAlbaranesCliente, uEditorAlbaranesDevCliente, uEditorAlbaranDevCliente; procedure RegisterViews; begin + EditorRegistry.RegisterClass(TfEditorDetalleEtiqueta, 'EditorDetalleEtiqueta'); EditorRegistry.RegisterClass(TfEditorAlbaranesCliente, 'EditorAlbaranesCliente'); EditorRegistry.RegisterClass(TfEditorAlbaranCliente, 'EditorAlbaranCliente'); EditorRegistry.RegisterClass(TfEditorAlbaranesDevCliente, 'EditorAlbaranesDevCliente'); @@ -25,6 +26,7 @@ end; procedure UnregisterViews; begin + EditorRegistry.UnRegisterClass(TfEditorDetalleEtiqueta); EditorRegistry.UnRegisterClass(TfEditorAlbaranesCliente); EditorRegistry.UnRegisterClass(TfEditorAlbaranCliente); EditorRegistry.UnRegisterClass(TfEditorAlbaranesDevCliente); diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorDetalleEtiqueta.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorDetalleEtiqueta.dfm new file mode 100644 index 0000000..198c08c --- /dev/null +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorDetalleEtiqueta.dfm @@ -0,0 +1,79 @@ +object fEditorDetalleEtiqueta: TfEditorDetalleEtiqueta + Left = 0 + Top = 0 + BorderStyle = bsDialog + Caption = 'Detalle etiqueta' + ClientHeight = 184 + ClientWidth = 291 + Color = clWindow + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + OldCreateOrder = False + Position = poScreenCenter + OnShow = FormShow + PixelsPerInch = 96 + TextHeight = 13 + object Label1: TLabel + Left = 21 + Top = 16 + Width = 118 + Height = 13 + Caption = 'Introduzca la mercanc'#237'a:' + end + object Label2: TLabel + Left = 21 + Top = 72 + Width = 153 + Height = 13 + Caption = 'Introduzca el n'#250'mero de bultos:' + end + object Panel1: TPanel + Left = 0 + Top = 143 + Width = 291 + Height = 41 + Align = alBottom + TabOrder = 0 + DesignSize = ( + 291 + 41) + object bAceptar: TButton + Left = 127 + Top = 8 + Width = 75 + Height = 25 + Anchors = [akTop, akRight] + Caption = 'Aceptar' + ModalResult = 1 + TabOrder = 0 + end + object bCancelar: TButton + Left = 208 + Top = 8 + Width = 75 + Height = 25 + Anchors = [akTop, akRight] + Caption = 'Cancelar' + ModalResult = 2 + TabOrder = 1 + end + end + object eMercancia: TcxTextEdit + Left = 21 + Top = 37 + Properties.OnEditValueChanged = eMercanciaPropertiesEditValueChanged + TabOrder = 1 + Width = 262 + end + object eBultos: TcxSpinEdit + Left = 21 + Top = 91 + Properties.OnEditValueChanged = eBultosPropertiesEditValueChanged + TabOrder = 2 + Value = 1 + Width = 121 + end +end diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorDetalleEtiqueta.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorDetalleEtiqueta.pas new file mode 100644 index 0000000..5e7b31d --- /dev/null +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorDetalleEtiqueta.pas @@ -0,0 +1,77 @@ +unit uEditorDetalleEtiqueta; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, StdCtrls, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, + cxDropDownEdit, cxCalendar, ExtCtrls, uEditorBasico, uIEditorDetalleEtiqueta, + cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, cxSpinEdit; + +type + TfEditorDetalleEtiqueta = class(TfEditorBasico, IEditorDetalleEtiqueta) + Label1: TLabel; + bAceptar: TButton; + bCancelar: TButton; + Panel1: TPanel; + eMercancia: TcxTextEdit; + Label2: TLabel; + eBultos: TcxSpinEdit; + procedure eMercanciaPropertiesEditValueChanged(Sender: TObject); + procedure eBultosPropertiesEditValueChanged(Sender: TObject); + procedure FormShow(Sender: TObject); + private + FMercancia : String; + FBultos : Integer; + function GetMercancia: String; + procedure SetMercancia(const Value: String); + + function GetBultos: Integer; + procedure SetBultos(const Value: Integer); + + public + property Mercancia: String Read GetMercancia write SetMercancia; + property Bultos: Integer Read GetBultos write SetBultos; + end; + +implementation + +{$R *.dfm} + +procedure TfEditorDetalleEtiqueta.eBultosPropertiesEditValueChanged(Sender: TObject); +begin + Bultos := eBultos.EditValue; +end; + +procedure TfEditorDetalleEtiqueta.eMercanciaPropertiesEditValueChanged(Sender: TObject); +begin + Mercancia := eMercancia.EditValue; +end; + +procedure TfEditorDetalleEtiqueta.FormShow(Sender: TObject); +begin + FBultos := 1; + FMercancia := ''; +end; + +function TfEditorDetalleEtiqueta.GetBultos: Integer; +begin + Result := FBultos; +end; + +function TfEditorDetalleEtiqueta.GetMercancia: String; +begin + Result := FMercancia; +end; + +procedure TfEditorDetalleEtiqueta.SetBultos(const Value: Integer); +begin + FBultos := Value; +end; + +procedure TfEditorDetalleEtiqueta.SetMercancia(const Value: String); +begin + FMercancia := Value; +end; + +end. diff --git a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm index d3dd7cd..cb67103 100644 --- a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm @@ -14,12 +14,12 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor Top = 92 end object rda_AlbaranesProveedor: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 51 Top = 151 end @@ -300,8 +300,6 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_AlbaranesProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'AlbaranesProveedor' IndexDefs = <> Left = 168 @@ -426,8 +424,6 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor MasterSource = ds_AlbaranesProveedor MasterFields = 'ID' DetailFields = 'ID_ALBARAN' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'AlbaranesProveedor_Detalles' IndexDefs = <> Left = 328 @@ -450,8 +446,6 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_AlbaranesProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosAlbaranes' IndexDefs = <> Left = 168 diff --git a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.pas index bf7cd7a..d997e15 100644 --- a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.pas @@ -73,7 +73,7 @@ begin try Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInforme(AParam); finally - FreeANDNil(AParam); + //FreeANDNil(AParam); end; end; @@ -87,7 +87,7 @@ begin AParam.Add(AID); Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInformeEnPDF(AParam); finally - FreeANDNil(AParam); + //FreeANDNil(AParam); end; end; diff --git a/Source/Modulos/Contactos/Data/uDataModuleContactos.pas b/Source/Modulos/Contactos/Data/uDataModuleContactos.pas index f559c5b..4ce7b1d 100644 --- a/Source/Modulos/Contactos/Data/uDataModuleContactos.pas +++ b/Source/Modulos/Contactos/Data/uDataModuleContactos.pas @@ -69,7 +69,7 @@ begin try Result := (RORemoteService as IsrvContactos).GenerarInformeEtiquetas(AParam); finally - FreeANDNIL(AParam); +// FreeANDNIL(AParam); end; end; diff --git a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.pas b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.pas index 24befbc..b630709 100644 --- a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.pas +++ b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.pas @@ -113,7 +113,7 @@ begin try Result := (RORemoteService as IsrvContactos).GenerarInformeFichaEmpleado(AParam) finally - FreeANDNil(AParam); +// FreeANDNil(AParam); end; end; diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas index 43eed2b..8a9e760 100644 --- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas @@ -60,7 +60,7 @@ begin try Result := (RORemoteService as IsrvFacturasCliente).GenerarInforme(AParam, Marca); finally - FreeANDNIL(AParam); +// FreeANDNIL(AParam); end; end; diff --git a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm index 19ed028..776d07c 100644 --- a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm @@ -14,12 +14,12 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor Top = 84 end object rda_PedidosProveedor: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 43 Top = 151 end @@ -306,8 +306,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PedidosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PedidosProveedor' IndexDefs = <> Left = 160 @@ -367,8 +365,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor end> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PedidosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PedidosProveedor_Articulos_Pendientes' IndexDefs = <> Left = 480 @@ -495,8 +491,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor MasterSource = ds_PedidosProveedor MasterFields = 'ID' DetailFields = 'ID_PEDIDO' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PedidosProveedor_Detalles' IndexDefs = <> Left = 296 @@ -519,8 +513,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PedidosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosPedidos' IndexDefs = <> Left = 168 diff --git a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas index 4aae065..e2b6022 100644 --- a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas @@ -87,7 +87,7 @@ begin Result := (RORemoteService as IsrvPedidosProveedor).GenerarInforme(AParam, ImprimirPrecio, ImprimirRefProveedor); finally - FreeANDNil(AParam); +// FreeANDNil(AParam); end; end; @@ -103,7 +103,7 @@ begin Result := (RORemoteService as IsrvPedidosProveedor).GenerarInformeEnPDF(AParam, ImprimirPrecio, ImprimirRefProveedor); finally - FreeANDNil(AParam); +// FreeANDNil(AParam); end; end; diff --git a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm index 408ee2f..549b421 100644 --- a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm @@ -14,12 +14,12 @@ inherited DataModulePresupuestosCliente: TDataModulePresupuestosCliente Top = 84 end object rda_PresupuestosCliente: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 59 Top = 151 end @@ -246,8 +246,6 @@ inherited DataModulePresupuestosCliente: TDataModulePresupuestosCliente Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PresupuestosCliente - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PresupuestosCliente' IndexDefs = <> Left = 248 @@ -368,8 +366,6 @@ inherited DataModulePresupuestosCliente: TDataModulePresupuestosCliente MasterSource = ds_PresupuestosCliente MasterFields = 'ID' DetailFields = 'ID_PRESUPUESTO' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PresupuestosCliente_Detalles' IndexDefs = <> Left = 464 @@ -399,8 +395,6 @@ inherited DataModulePresupuestosCliente: TDataModulePresupuestosCliente Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PresupuestosCliente - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosPresupuestos' IndexDefs = <> Left = 248 diff --git a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.pas index 46de208..8f017c3 100644 --- a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.pas @@ -80,7 +80,7 @@ begin AParam.Add(AID); Result := (RORemoteService as IsrvPresupuestosCliente).GenerarInformeEnPDF(AParam) finally - FreeANDNIL(AParam) +// FreeANDNIL(AParam) end; end; @@ -92,7 +92,7 @@ begin try Result := (RORemoteService as IsrvPresupuestosCliente).GenerarInforme(AParam) finally - FreeANDNIL(AParam) +// FreeANDNIL(AParam) end; end; diff --git a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas index 9d626e8..2608318 100644 --- a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas @@ -81,7 +81,7 @@ begin try Result := (RORemoteService as IsrvRecibosCliente).GenerarInforme(AParam); finally - FreeANDNIL(AParam); +// FreeANDNIL(AParam); end; end; diff --git a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas index 0790b48..8f36749 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas @@ -11,7 +11,8 @@ uses cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, uBizPagosCliente, ActnList, TB2Item, SpTBXItem, TB2Dock, TB2Toolbar, cxImageComboBox, dxLayoutLookAndFeels, ImgList, - PngImageList, ComCtrls, ToolWin, uDAInterfaces; + PngImageList, ComCtrls, ToolWin, uDAInterfaces, cxLookAndFeels, + cxLookAndFeelPainters; type IViewPagosCliente = interface(IViewBase) diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm index 94ff798..ca434a2 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm @@ -12,8 +12,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente ParentBackground = True TabOrder = 0 TabStop = False - AutoContentSizes = [acsWidth, acsHeight] - LookAndFeel = dxLayoutOfficeLookAndFeel1 + LayoutLookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 795 ExplicitHeight = 333 DesignSize = ( @@ -25,7 +24,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -55,7 +53,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'SITUACION' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -133,7 +130,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_FACTURA' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -163,7 +159,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FORMA_PAGO_FACTURA' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -193,7 +188,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente AutoSize = False DataBinding.DataField = 'IMPORTE_FACTURA' DataBinding.DataSource = DADataSource - Enabled = False ParentFont = False Properties.Alignment.Horz = taRightJustify Properties.ReadOnly = True @@ -229,7 +223,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'NOMBRE_CLIENTE' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -259,7 +252,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'NIF_CIF_CLIENTE' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -289,7 +281,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA_REMESA' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -319,7 +310,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_EMISION' DataBinding.DataSource = DADataSource - Enabled = False Properties.ImmediatePost = True Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -407,7 +397,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'DATOS_BANCARIOS' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Properties.ValidateOnEnter = True Style.BorderColor = clWindowFrame @@ -432,117 +421,119 @@ inherited frViewReciboCliente: TfrViewReciboCliente Width = 228 end object dxLayoutControl1Group_Root: TdxLayoutGroup - ShowCaption = False + AlignHorz = ahParentManaged + AlignVert = avParentManaged + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControl1Group9: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Group3: TdxLayoutGroup - AutoAligns = [aaVertical] AlignHorz = ahClient - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControl1Group1: TdxLayoutGroup - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Datos del recibo' + CaptionOptions.Text = 'Datos del recibo' + ButtonOptions.Buttons = <> object dxLayoutControl1Item1: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Referencia:' + CaptionOptions.Text = 'Referencia:' Control = eReferencia ControlOptions.ShowBorder = False end object dxLayoutControl1Item19: TdxLayoutItem - Caption = 'Fecha emisi'#243'n:' + CaptionOptions.Text = 'Fecha emisi'#243'n:' Control = edtFechaEmision ControlOptions.ShowBorder = False end object dxLayoutControl1Item3: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Fecha vencimiento:' + CaptionOptions.Text = 'Fecha vencimiento:' Control = edtFechaVencimiento ControlOptions.ShowBorder = False end object dxLayoutControl1Item2: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Situaci'#243'n:' + CaptionOptions.Text = 'Situaci'#243'n:' Control = eSituacion ControlOptions.ShowBorder = False end object dxLayoutControl1Item16: TdxLayoutItem - Caption = 'Ref. remesa:' + CaptionOptions.Text = 'Ref. remesa:' Control = eRemesa ControlOptions.ShowBorder = False end object dxLayoutControl1Item6: TdxLayoutItem - Caption = 'Concepto:' + CaptionOptions.Text = 'Concepto:' Control = eConcepto ControlOptions.ShowBorder = False end end object dxLayoutControl1Group2: TdxLayoutGroup - Caption = 'Compensado en recibo' + CaptionOptions.Text = 'Compensado en recibo' Enabled = False Visible = False + ButtonOptions.Buttons = <> object dxLayoutControl1Item4: TdxLayoutItem - Caption = 'Ref. recibo:' + CaptionOptions.Text = 'Ref. recibo:' + Enabled = False Control = rRefReciboCompensado ControlOptions.ShowBorder = False end end end object dxLayoutControl1Group8: TdxLayoutGroup - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'New Group' - ShowCaption = False + CaptionOptions.Text = 'New Group' + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> ShowBorder = False object dxLayoutControl1Group5: TdxLayoutGroup - Caption = 'Datos de la factura' + CaptionOptions.Text = 'Datos de la factura' + ButtonOptions.Buttons = <> object dxLayoutControl1Item7: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Fecha emisi'#243'n:' + CaptionOptions.Text = 'Fecha emisi'#243'n:' Control = eFechaEmision ControlOptions.ShowBorder = False end object dxLayoutControl1Item8: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Forma pago:' + CaptionOptions.Text = 'Forma pago:' Control = eFormaPago ControlOptions.ShowBorder = False end object dxLayoutControl1Item15: TdxLayoutItem - Caption = 'Cuenta bancaria:' + CaptionOptions.Text = 'Cuenta bancaria:' Control = eCuenta ControlOptions.ShowBorder = False end object dxLayoutControl1Item9: TdxLayoutItem - Caption = 'Total factura:' + CaptionOptions.Text = 'Total factura:' Control = eImporteTotal ControlOptions.ShowBorder = False end end object dxLayoutControl1Group6: TdxLayoutGroup - AutoAligns = [aaHorizontal] AlignVert = avClient - Caption = 'Datos del cliente' + CaptionOptions.Text = 'Datos del cliente' Offsets.Top = 5 + ButtonOptions.Buttons = <> object dxLayoutControl1Item11: TdxLayoutItem - Caption = 'NIF/CIF:' + CaptionOptions.Text = 'NIF/CIF:' Control = eNifCif ControlOptions.ShowBorder = False end object dxLayoutControl1Item10: TdxLayoutItem - Caption = 'Nombre:' + CaptionOptions.Text = 'Nombre:' Control = eNombreCliente ControlOptions.ShowBorder = False end @@ -550,14 +541,13 @@ inherited frViewReciboCliente: TfrViewReciboCliente end end object dxLayoutControl1Group7: TdxLayoutGroup - AutoAligns = [aaHorizontal] AlignVert = avClient - Caption = 'Observaciones' + CaptionOptions.Text = 'Observaciones' + ButtonOptions.Buttons = <> object dxLayoutControl1Item5: TdxLayoutItem - AutoAligns = [aaHorizontal] AlignVert = avClient - Caption = 'Observaciones:' - ShowCaption = False + CaptionOptions.Text = 'Observaciones:' + CaptionOptions.Visible = False Control = memObservaciones ControlOptions.ShowBorder = False end diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas index e346391..1e3baa2 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas @@ -7,7 +7,8 @@ uses Dialogs, uViewBase, uBizRecibosCliente, DB, uDADataTable, dxLayoutControl, cxControls, cxCurrencyEdit, cxDBEdit, cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxContainer, cxEdit, cxTextEdit, dxLayoutLookAndFeels, ExtCtrls, - uDAInterfaces; + uDAInterfaces, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, + dxLayoutcxEditAdapters; type IViewReciboCliente = interface(IViewBase) diff --git a/Source/Modulos/Remesas de cliente/Data/uDataModuleRemesasCliente.pas b/Source/Modulos/Remesas de cliente/Data/uDataModuleRemesasCliente.pas index ba48774..fbf3f75 100644 --- a/Source/Modulos/Remesas de cliente/Data/uDataModuleRemesasCliente.pas +++ b/Source/Modulos/Remesas de cliente/Data/uDataModuleRemesasCliente.pas @@ -65,7 +65,7 @@ begin try Result := (RORemoteService as IsrvRemesasCliente).GenerarInforme(AParam); finally - FreeANDNIL(AParam); +// FreeANDNIL(AParam); end; end; diff --git a/Source/Servicios/FactuGES.RODL b/Source/Servicios/FactuGES.RODL index 40e0237..f46fabc 100644 --- a/Source/Servicios/FactuGES.RODL +++ b/Source/Servicios/FactuGES.RODL @@ -372,6 +372,10 @@ + + + + diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas index 2660747..c2e446b 100644 --- a/Source/Servicios/FactuGES_Intf.pas +++ b/Source/Servicios/FactuGES_Intf.pas @@ -587,7 +587,7 @@ type IsrvAlbaranesCliente = interface(IDataAbstractService) ['{6E910718-9AB0-47BB-9875-B0DE66A68D7A}'] function GenerarInforme(const ListaID: TIntegerArray): Binary; - function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary; + function GenerarInformeEtiquetas(const ListaID: TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; function GenerarInformeEnWord(const ID: Integer): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; end; @@ -603,7 +603,7 @@ type function __GetInterfaceName:string; override; function GenerarInforme(const ListaID: TIntegerArray): Binary; - function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary; + function GenerarInformeEtiquetas(const ListaID: TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; function GenerarInformeEnWord(const ID: Integer): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; end; @@ -1898,12 +1898,14 @@ begin end end; -function TsrvAlbaranesCliente_Proxy.GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary; +function TsrvAlbaranesCliente_Proxy.GenerarInformeEtiquetas(const ListaID: TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; begin try result := nil; __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEtiquetas'); __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); + __Message.Write('AMercancia', TypeInfo(Variant), AMercancia, []); + __Message.Write('ABultos', TypeInfo(Integer), ABultos, []); __Message.Finalize; __TransportChannel.Dispatch(__Message); diff --git a/Source/Servicios/FactuGES_Invk.pas b/Source/Servicios/FactuGES_Invk.pas index dd6ab10..e32dbee 100644 --- a/Source/Servicios/FactuGES_Invk.pas +++ b/Source/Servicios/FactuGES_Invk.pas @@ -1101,9 +1101,11 @@ begin end; procedure TsrvAlbaranesCliente_Invoker.Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); -{ function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary; } +{ function GenerarInformeEtiquetas(const ListaID: TIntegerArray; const AMercancia: Variant; const ABultos: Integer): Binary; } var ListaID: FactuGES_Intf.TIntegerArray; + AMercancia: Variant; + ABultos: Integer; lResult: Binary; __lObjectDisposer: TROObjectDisposer; begin @@ -1111,8 +1113,10 @@ begin lResult := nil; try __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); + __Message.Read('AMercancia', TypeInfo(Variant), AMercancia, []); + __Message.Read('ABultos', TypeInfo(Integer), ABultos, []); - lResult := (__Instance as IsrvAlbaranesCliente).GenerarInformeEtiquetas(ListaID); + lResult := (__Instance as IsrvAlbaranesCliente).GenerarInformeEtiquetas(ListaID, AMercancia, ABultos); __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvAlbaranesCliente', 'GenerarInformeEtiquetasResponse'); __Message.Write('Result', TypeInfo(Binary), lResult, []); diff --git a/Source/Servicios/RODLFILE.res b/Source/Servicios/RODLFILE.res index 9127952..1c4fcb8 100644 Binary files a/Source/Servicios/RODLFILE.res and b/Source/Servicios/RODLFILE.res differ diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index bad20bc..1011ab2 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 03e6bf4..df35544 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,337 +1,337 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d11;SpTBXLib_d11;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxExportD10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - $(BDS)\lib\Debug - $(BDS)\lib\Debug - $(BDS)\lib\Debug - $(BDS)\lib\Debug - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0miércoles, 20 de enero de 2010 19:52FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones_Impl
- TDataModule - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
RptAlbaranesProveedor
- TDataModule - - -
RptWordAlbaranProveedor
- TDataModule - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - -
srvArticulos
- TDARemoteService - - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
RptFacturasProveedor
- TDataModule - - -
srvFacturasProveedor
- TDataAbstractService - - - - -
srvFamilias
- TDataAbstractService - - - - -
srvFormasPago
- TDataAbstractService - - -
srvGestorDocumentos
- TDataAbstractService - - -
srvGestorInformes
- TDataAbstractService - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvObras
- TDataAbstractService - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- TDataModule - - -
RptWordCertificadoTrabajo
- TDataModule - - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
RptRecibosProveedor
- TDataModule - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
RptRemesasCliente
- TDataModule - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - -
srvTiposIVA
- TDataAbstractService - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d11;SpTBXLib_d11;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxExportD10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + $(BDS)\lib\Debug + $(BDS)\lib\Debug + $(BDS)\lib\Debug + $(BDS)\lib\Debug + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0miércoles, 20 de enero de 2010 19:52FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones_Impl
+ TDataModule + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
RptAlbaranesProveedor
+ TDataModule + + +
RptWordAlbaranProveedor
+ TDataModule + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + +
srvArticulos
+ TDARemoteService + + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
RptFacturasProveedor
+ TDataModule + + +
srvFacturasProveedor
+ TDataAbstractService + + + + +
srvFamilias
+ TDataAbstractService + + + + +
srvFormasPago
+ TDataAbstractService + + +
srvGestorDocumentos
+ TDataAbstractService + + +
srvGestorInformes
+ TDataAbstractService + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvObras
+ TDataAbstractService + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ TDataModule + + +
RptWordCertificadoTrabajo
+ TDataModule + + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
RptRecibosProveedor
+ TDataModule + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
RptRemesasCliente
+ TDataModule + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + +
srvTiposIVA
+ TDataAbstractService + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + + +