Adaptación a FastReport4

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@145 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Build/Build.fbp5

@@ -15767,7 +15767,7 @@ Comments=
         <Property name="VariableType" type="TFBVariableType">vtProject</Property>
         </Object>
       <Object Class="TFBVariable" XMLID="{E1F16954-518E-44DB-8598-32BD70D0B552}"><Property MultiValue="0" name="Comment" type="string"></Property>
-        <Property MultiValue="0" name="DefaultValue" type="string">%DELPHI2007DIR%\Lib\Indy10;%project_path%\Lib;%project_path%\Lib\RemObjects\RemObjects_SDK;%project_path%\Lib\RemObjects\Data_Abstract;%project_path%\Lib\CCPack;%project_path%\Lib\CFPack;%project_path%\Lib\GUISDK;%project_path%\Lib\PluginSDK;%project_path%\Lib\DevExpressVCL;%project_path%\Lib\FastReport3;%project_path%\Lib\JCL;%project_path%\Lib\JVCL;%project_path%\Lib\PngComponents;%project_path%\Lib\cxIntl5;%project_path%\Lib\cxIntlPrintSys3;%project_path%\Lib\TB2k+TBX;%project_path%\Lib\Mustangpeak\MPCommonLib;%project_path%\Lib\Mustangpeak\EasyListview;%project_path%\Lib\JSDialog;%project_path%\Lib\UserControl;</Property>
+        <Property MultiValue="0" name="DefaultValue" type="string">%DELPHI2007DIR%\Lib\Indy10;%project_path%\Lib;%project_path%\Lib\RemObjects\RemObjects_SDK;%project_path%\Lib\RemObjects\Data_Abstract;%project_path%\Lib\CCPack;%project_path%\Lib\CFPack;%project_path%\Lib\GUISDK;%project_path%\Lib\PluginSDK;%project_path%\Lib\DevExpressVCL;%project_path%\Lib\FastReport4;%project_path%\Lib\JCL;%project_path%\Lib\JVCL;%project_path%\Lib\PngComponents;%project_path%\Lib\cxIntl5;%project_path%\Lib\cxIntlPrintSys3;%project_path%\Lib\TB2k+TBX;%project_path%\Lib\Mustangpeak\MPCommonLib;%project_path%\Lib\Mustangpeak\EasyListview;%project_path%\Lib\JSDialog;%project_path%\Lib\UserControl;</Property>
         <Property name="IsMacro" type="Boolean">True</Property>
         <Property name="IsPersistent" type="Boolean">False</Property>
         <Property name="MakeEnv" type="Boolean">False</Property>

Source/GUIBase/GUIBase.bdsproj

@@ -179,487 +179,3 @@
     <buildevents/>
   </Delphi.Personality>
 </BorlandProject>
-
-<!-- EurekaLog First Line
-[Exception Log]
-EurekaLog Version=6006
-Activate=0
-Activate Handle=1
-Save Log File=1
-Foreground Tab=0
-Freeze Activate=0
-Freeze Timeout=0
-SMTP From=eurekalog@email.com
-SMTP Host=
-SMTP Port=25
-SMTP UserID=
-SMTP Password=
-Append to Log=0
-TerminateBtn Operation=2
-Errors Number=32
-Errors Terminate=3
-Email Address=
-Email Object=
-Email Send Options=0
-Output Path=
-Encrypt Password=
-AutoCloseDialogSecs=0
-WebSendMode=0
-SupportULR=
-HTMLLayout Count=15
-HTMLLine0="%3Chtml%3E"
-HTMLLine1="  %3Chead%3E"
-HTMLLine2="  %3C/head%3E"
-HTMLLine3="  %3Cbody TopMargin=10 LeftMargin=10%3E"
-HTMLLine4="    %3Ctable width="100%%" border="0"%3E"
-HTMLLine5="      %3Ctr%3E"
-HTMLLine6="        %3Ctd nowrap%3E"
-HTMLLine7="          %3Cfont face="Lucida Console, Courier" size="2"%3E"
-HTMLLine8="            %3C%%HTML_TAG%%%3E"
-HTMLLine9="          %3C/font%3E"
-HTMLLine10="        %3C/td%3E"
-HTMLLine11="      %3C/tr%3E"
-HTMLLine12="    %3C/table%3E"
-HTMLLine13="  %3C/body%3E"
-HTMLLine14="%3C/html%3E"
-AutoCrashOperation=2
-AutoCrashNumber=10
-AutoCrashMinutes=1
-WebURL=
-WebUserID=
-WebPassword=
-WebPort=0
-AttachedFiles=
-ProxyURL=
-ProxyUser=
-ProxyPassword=
-ProxyPort=8080
-TrakerUser=
-TrakerPassword=
-TrakerAssignTo=
-TrakerProject=
-TrakerCategory=
-TrakerTrialID=
-ZipPassword=
-PreBuildEvent=
-PostSuccessfulBuildEvent=
-PostFailureBuildEvent=
-ExceptionDialogType=2
-Count=0
-EMail Message Line Count=0
-loNoDuplicateErrors=0
-loAppendReproduceText=0
-loDeleteLogAtVersionChange=0
-loAddComputerNameInLogFileName=0
-loSaveModulesAndProcessesSections=1
-loSaveAssemblerAndCPUSections=1
-soAppStartDate=1
-soAppName=1
-soAppVersionNumber=1
-soAppParameters=1
-soAppCompilationDate=1
-soAppUpTime=1
-soExcDate=1
-soExcAddress=1
-soExcModuleName=1
-soExcModuleVersion=1
-soExcType=1
-soExcMessage=1
-soExcID=1
-soExcCount=1
-soExcStatus=1
-soExcNote=1
-soUserID=1
-soUserName=1
-soUserEmail=1
-soUserPrivileges=1
-soUserCompany=1
-soActCtlsFormClass=1
-soActCtlsFormText=1
-soActCtlsControlClass=1
-soActCtlsControlText=1
-soCmpName=1
-soCmpTotalMemory=1
-soCmpFreeMemory=1
-soCmpTotalDisk=1
-soCmpFreeDisk=1
-soCmpSysUpTime=1
-soCmpProcessor=1
-soCmpDisplayMode=1
-soCmpDisplayDPI=1
-soCmpVideoCard=1
-soCmpPrinter=1
-soOSType=1
-soOSBuildN=1
-soOSUpdate=1
-soOSLanguage=1
-soOSCharset=1
-soNetIP=1
-soNetSubmask=1
-soNetGateway=1
-soNetDNS1=1
-soNetDNS2=1
-soNetDHCP=1
-soCustomData=1
-sndShowSendDialog=1
-sndShowSuccessFailureMsg=0
-sndSendEntireLog=0
-sndSendXMLLogCopy=0
-sndSendScreenshot=1
-sndUseOnlyActiveWindow=0
-sndSendLastHTMLPage=1
-sndSendInSeparatedThread=0
-sndAddDateInFileName=0
-sndAddComputerNameInFileName=0
-edoSendErrorReportChecked=1
-edoAttachScreenshotChecked=1
-edoShowCopyToClipOption=1
-edoShowDetailsButton=1
-edoShowInDetailedMode=0
-edoShowInTopMostMode=0
-edoUseEurekaLogLookAndFeel=0
-edoShowSendErrorReportOption=1
-edoShowAttachScreenshotOption=1
-edoShowCustomButton=0
-csoShowDLLs=1
-csoShowBPLs=1
-csoShowBorlandThreads=1
-csoShowWindowsThreads=1
-csoDoNotStoreProcNames=0
-boPauseBorlandThreads=0
-boDoNotPauseMainThread=0
-boPauseWindowsThreads=0
-boUseMainModuleOptions=1
-boCopyLogInCaseOfError=1
-boSaveCompressedCopyInCaseOfError=0
-boHandleSafeCallExceptions=1
-boCallRTLExceptionEvent=0
-boCatchHandledExceptions=0
-loCatchLeaks=0
-loGroupsSonLeaks=1
-loHideBorlandLeaks=1
-loFreeAllLeaks=1
-loCatchLeaksExceptions=1
-cfoReduceFileSize=1
-cfoCheckFileCorruption=0
-Count mtInformationMsgCaption=1
-mtInformationMsgCaption0="Information."
-Count mtQuestionMsgCaption=1
-mtQuestionMsgCaption0="Question."
-Count mtErrorMsgCaption=1
-mtErrorMsgCaption0="Error."
-Count mtDialog_Caption=1
-mtDialog_Caption0="Error occurred"
-Count mtDialog_ErrorMsgCaption=2
-mtDialog_ErrorMsgCaption0="An error has occurred during program execution."
-mtDialog_ErrorMsgCaption1="Please read the following information for further details."
-Count mtDialog_GeneralCaption=1
-mtDialog_GeneralCaption0="General"
-Count mtDialog_GeneralHeader=1
-mtDialog_GeneralHeader0="General Information"
-Count mtDialog_CallStackCaption=1
-mtDialog_CallStackCaption0="Call Stack"
-Count mtDialog_CallStackHeader=1
-mtDialog_CallStackHeader0="Call Stack Information"
-Count mtDialog_ModulesCaption=1
-mtDialog_ModulesCaption0="Modules"
-Count mtDialog_ModulesHeader=1
-mtDialog_ModulesHeader0="Modules Information"
-Count mtDialog_ProcessesCaption=1
-mtDialog_ProcessesCaption0="Processes"
-Count mtDialog_ProcessesHeader=1
-mtDialog_ProcessesHeader0="Processes Information"
-Count mtDialog_AsmCaption=1
-mtDialog_AsmCaption0="Assembler"
-Count mtDialog_AsmHeader=1
-mtDialog_AsmHeader0="Assembler Information"
-Count mtDialog_CPUCaption=1
-mtDialog_CPUCaption0="CPU"
-Count mtDialog_CPUHeader=1
-mtDialog_CPUHeader0="CPU Information"
-Count mtDialog_OKButtonCaption=1
-mtDialog_OKButtonCaption0="%26OK"
-Count mtDialog_TerminateButtonCaption=1
-mtDialog_TerminateButtonCaption0="%26Terminate"
-Count mtDialog_RestartButtonCaption=1
-mtDialog_RestartButtonCaption0="%26Restart"
-Count mtDialog_DetailsButtonCaption=1
-mtDialog_DetailsButtonCaption0="%26Details"
-Count mtDialog_CustomButtonCaption=1
-mtDialog_CustomButtonCaption0="%26Help"
-Count mtDialog_SendMessage=1
-mtDialog_SendMessage0="%26Send this error via Internet"
-Count mtDialog_ScreenshotMessage=1
-mtDialog_ScreenshotMessage0="%26Attach a Screenshot image"
-Count mtDialog_CopyMessage=1
-mtDialog_CopyMessage0="%26Copy to Clipboard"
-Count mtDialog_SupportMessage=1
-mtDialog_SupportMessage0="Go to the Support Page"
-Count mtMSDialog_ErrorMsgCaption=1
-mtMSDialog_ErrorMsgCaption0="The application has encountered a problem. We are sorry for the inconvenience."
-Count mtMSDialog_RestartCaption=1
-mtMSDialog_RestartCaption0="Restart application."
-Count mtMSDialog_TerminateCaption=1
-mtMSDialog_TerminateCaption0="Terminate application."
-Count mtMSDialog_PleaseCaption=1
-mtMSDialog_PleaseCaption0="Please tell us about this problem."
-Count mtMSDialog_DescriptionCaption=1
-mtMSDialog_DescriptionCaption0="We have created an error report that you can send to us. We will treat this report as confidential and anonymous."
-Count mtMSDialog_SeeDetailsCaption=1
-mtMSDialog_SeeDetailsCaption0="To see what data the error report contains,"
-Count mtMSDialog_SeeClickCaption=1
-mtMSDialog_SeeClickCaption0="click here."
-Count mtMSDialog_HowToReproduceCaption=1
-mtMSDialog_HowToReproduceCaption0="What were you doing when the problem happended (optional)?"
-Count mtMSDialog_EmailCaption=1
-mtMSDialog_EmailCaption0="Email address (optional):"
-Count mtMSDialog_SendButtonCaption=1
-mtMSDialog_SendButtonCaption0="%26Send Error Report"
-Count mtMSDialog_NoSendButtonCaption=1
-mtMSDialog_NoSendButtonCaption0="%26Don't Send"
-Count mtLog_AppHeader=1
-mtLog_AppHeader0="Application"
-Count mtLog_AppStartDate=1
-mtLog_AppStartDate0="Start Date"
-Count mtLog_AppName=1
-mtLog_AppName0="Name/Description"
-Count mtLog_AppVersionNumber=1
-mtLog_AppVersionNumber0="Version Number"
-Count mtLog_AppParameters=1
-mtLog_AppParameters0="Parameters"
-Count mtLog_AppCompilationDate=1
-mtLog_AppCompilationDate0="Compilation Date"
-Count mtLog_AppUpTime=1
-mtLog_AppUpTime0="Up Time"
-Count mtLog_ExcHeader=1
-mtLog_ExcHeader0="Exception"
-Count mtLog_ExcDate=1
-mtLog_ExcDate0="Date"
-Count mtLog_ExcAddress=1
-mtLog_ExcAddress0="Address"
-Count mtLog_ExcModuleName=1
-mtLog_ExcModuleName0="Module Name"
-Count mtLog_ExcModuleVersion=1
-mtLog_ExcModuleVersion0="Module Version"
-Count mtLog_ExcType=1
-mtLog_ExcType0="Type"
-Count mtLog_ExcMessage=1
-mtLog_ExcMessage0="Message"
-Count mtLog_ExcID=1
-mtLog_ExcID0="ID"
-Count mtLog_ExcCount=1
-mtLog_ExcCount0="Count"
-Count mtLog_ExcStatus=1
-mtLog_ExcStatus0="Status"
-Count mtLog_ExcNote=1
-mtLog_ExcNote0="Note"
-Count mtLog_UserHeader=1
-mtLog_UserHeader0="User"
-Count mtLog_UserID=1
-mtLog_UserID0="ID"
-Count mtLog_UserName=1
-mtLog_UserName0="Name"
-Count mtLog_UserEmail=1
-mtLog_UserEmail0="Email"
-Count mtLog_UserCompany=1
-mtLog_UserCompany0="Company"
-Count mtLog_UserPrivileges=1
-mtLog_UserPrivileges0="Privileges"
-Count mtLog_ActCtrlsHeader=1
-mtLog_ActCtrlsHeader0="Active Controls"
-Count mtLog_ActCtrlsFormClass=1
-mtLog_ActCtrlsFormClass0="Form Class"
-Count mtLog_ActCtrlsFormText=1
-mtLog_ActCtrlsFormText0="Form Text"
-Count mtLog_ActCtrlsControlClass=1
-mtLog_ActCtrlsControlClass0="Control Class"
-Count mtLog_ActCtrlsControlText=1
-mtLog_ActCtrlsControlText0="Control Text"
-Count mtLog_CmpHeader=1
-mtLog_CmpHeader0="Computer"
-Count mtLog_CmpName=1
-mtLog_CmpName0="Name"
-Count mtLog_CmpTotalMemory=1
-mtLog_CmpTotalMemory0="Total Memory"
-Count mtLog_CmpFreeMemory=1
-mtLog_CmpFreeMemory0="Free Memory"
-Count mtLog_CmpTotalDisk=1
-mtLog_CmpTotalDisk0="Total Disk"
-Count mtLog_CmpFreeDisk=1
-mtLog_CmpFreeDisk0="Free Disk"
-Count mtLog_CmpSystemUpTime=1
-mtLog_CmpSystemUpTime0="System Up Time"
-Count mtLog_CmpProcessor=1
-mtLog_CmpProcessor0="Processor"
-Count mtLog_CmpDisplayMode=1
-mtLog_CmpDisplayMode0="Display Mode"
-Count mtLog_CmpDisplayDPI=1
-mtLog_CmpDisplayDPI0="Display DPI"
-Count mtLog_CmpVideoCard=1
-mtLog_CmpVideoCard0="Video Card"
-Count mtLog_CmpPrinter=1
-mtLog_CmpPrinter0="Printer"
-Count mtLog_OSHeader=1
-mtLog_OSHeader0="Operating System"
-Count mtLog_OSType=1
-mtLog_OSType0="Type"
-Count mtLog_OSBuildN=1
-mtLog_OSBuildN0="Build #"
-Count mtLog_OSUpdate=1
-mtLog_OSUpdate0="Update"
-Count mtLog_OSLanguage=1
-mtLog_OSLanguage0="Language"
-Count mtLog_OSCharset=1
-mtLog_OSCharset0="Charset"
-Count mtLog_NetHeader=1
-mtLog_NetHeader0="Network"
-Count mtLog_NetIP=1
-mtLog_NetIP0="IP Address"
-Count mtLog_NetSubmask=1
-mtLog_NetSubmask0="Submask"
-Count mtLog_NetGateway=1
-mtLog_NetGateway0="Gateway"
-Count mtLog_NetDNS1=1
-mtLog_NetDNS10="DNS 1"
-Count mtLog_NetDNS2=1
-mtLog_NetDNS20="DNS 2"
-Count mtLog_NetDHCP=1
-mtLog_NetDHCP0="DHCP"
-Count mtLog_CustInfoHeader=1
-mtLog_CustInfoHeader0="Custom Information"
-Count mtCallStack_Address=1
-mtCallStack_Address0="Address"
-Count mtCallStack_Name=1
-mtCallStack_Name0="Module"
-Count mtCallStack_Unit=1
-mtCallStack_Unit0="Unit"
-Count mtCallStack_Class=1
-mtCallStack_Class0="Class"
-Count mtCallStack_Procedure=1
-mtCallStack_Procedure0="Procedure/Method"
-Count mtCallStack_Line=1
-mtCallStack_Line0="Line"
-Count mtCallStack_MainThread=1
-mtCallStack_MainThread0="Main"
-Count mtCallStack_ExceptionThread=1
-mtCallStack_ExceptionThread0="Exception Thread"
-Count mtCallStack_RunningThread=1
-mtCallStack_RunningThread0="Running Thread"
-Count mtCallStack_CallingThread=1
-mtCallStack_CallingThread0="Calling Thread"
-Count mtCallStack_ThreadID=1
-mtCallStack_ThreadID0="ID"
-Count mtCallStack_ThreadPriority=1
-mtCallStack_ThreadPriority0="Priority"
-Count mtCallStack_ThreadClass=1
-mtCallStack_ThreadClass0="Class"
-Count mtCallStack_LeakCaption=1
-mtCallStack_LeakCaption0="Memory Leak"
-Count mtCallStack_LeakData=1
-mtCallStack_LeakData0="Data"
-Count mtCallStack_LeakType=1
-mtCallStack_LeakType0="Type"
-Count mtCallStack_LeakSize=1
-mtCallStack_LeakSize0="Total size"
-Count mtCallStack_LeakCount=1
-mtCallStack_LeakCount0="Count"
-Count mtSendDialog_Caption=1
-mtSendDialog_Caption0="Send."
-Count mtSendDialog_Message=1
-mtSendDialog_Message0="Message"
-Count mtSendDialog_Resolving=1
-mtSendDialog_Resolving0="Resolving DNS..."
-Count mtSendDialog_Login=1
-mtSendDialog_Login0="Login..."
-Count mtSendDialog_Connecting=1
-mtSendDialog_Connecting0="Connecting with server..."
-Count mtSendDialog_Connected=1
-mtSendDialog_Connected0="Connected with server."
-Count mtSendDialog_Sending=1
-mtSendDialog_Sending0="Sending message..."
-Count mtSendDialog_Sent=1
-mtSendDialog_Sent0="Message sent."
-Count mtSendDialog_SelectProject=1
-mtSendDialog_SelectProject0="Select project..."
-Count mtSendDialog_Searching=1
-mtSendDialog_Searching0="Searching..."
-Count mtSendDialog_Modifying=1
-mtSendDialog_Modifying0="Modifying..."
-Count mtSendDialog_Disconnecting=1
-mtSendDialog_Disconnecting0="Disconnecting..."
-Count mtSendDialog_Disconnected=1
-mtSendDialog_Disconnected0="Disconnected."
-Count mtReproduceDialog_Caption=1
-mtReproduceDialog_Caption0="Request"
-Count mtReproduceDialog_Request=1
-mtReproduceDialog_Request0="Please describe the steps to reproduce the error:"
-Count mtReproduceDialog_OKButtonCaption=1
-mtReproduceDialog_OKButtonCaption0="%26OK"
-Count mtModules_Handle=1
-mtModules_Handle0="Handle"
-Count mtModules_Name=1
-mtModules_Name0="Name"
-Count mtModules_Description=1
-mtModules_Description0="Description"
-Count mtModules_Version=1
-mtModules_Version0="Version"
-Count mtModules_Size=1
-mtModules_Size0="Size"
-Count mtModules_LastModified=1
-mtModules_LastModified0="Modified"
-Count mtModules_Path=1
-mtModules_Path0="Path"
-Count mtProcesses_ID=1
-mtProcesses_ID0="ID"
-Count mtProcesses_Name=1
-mtProcesses_Name0="Name"
-Count mtProcesses_Description=1
-mtProcesses_Description0="Description"
-Count mtProcesses_Version=1
-mtProcesses_Version0="Version"
-Count mtProcesses_Memory=1
-mtProcesses_Memory0="Memory"
-Count mtProcesses_Priority=1
-mtProcesses_Priority0="Priority"
-Count mtProcesses_Threads=1
-mtProcesses_Threads0="Threads"
-Count mtProcesses_Path=1
-mtProcesses_Path0="Path"
-Count mtCPU_Registers=1
-mtCPU_Registers0="Registers"
-Count mtCPU_Stack=1
-mtCPU_Stack0="Stack"
-Count mtCPU_MemoryDump=1
-mtCPU_MemoryDump0="Memory Dump"
-Count mtSend_SuccessMsg=1
-mtSend_SuccessMsg0="The message was sent successfully."
-Count mtSend_FailureMsg=1
-mtSend_FailureMsg0="Sorry, sending the message didn't work."
-Count mtSend_BugClosedMsg=2
-mtSend_BugClosedMsg0="These BUG is just closed."
-mtSend_BugClosedMsg1="Contact the program support to obtain an update."
-Count mtSend_UnknownErrorMsg=1
-mtSend_UnknownErrorMsg0="Unknown error."
-Count mtSend_InvalidLoginMsg=1
-mtSend_InvalidLoginMsg0="Invalid login request."
-Count mtSend_InvalidSearchMsg=1
-mtSend_InvalidSearchMsg0="Invalid search request."
-Count mtSend_InvalidSelectionMsg=1
-mtSend_InvalidSelectionMsg0="Invalid selection request."
-Count mtSend_InvalidInsertMsg=1
-mtSend_InvalidInsertMsg0="Invalid insert request."
-Count mtSend_InvalidModifyMsg=1
-mtSend_InvalidModifyMsg0="Invalid modify request."
-Count mtFileCrackedMsg=2
-mtFileCrackedMsg0="This file is cracked."
-mtFileCrackedMsg1="The application will be closed."
-Count mtException_LeakMultiFree=1
-mtException_LeakMultiFree0="Multi Free memory leak."
-Count mtException_LeakMemoryOverrun=1
-mtException_LeakMemoryOverrun0="Memory Overrun leak."
-Count mtException_AntiFreeze=1
-mtException_AntiFreeze0="The application seems to be frozen."
-Count mtInvalidEmailMsg=1
-mtInvalidEmailMsg0="Invalid email."
-TextsCollection=English
-EurekaLog Last Line -->

Source/GUIBase/GUIBase.dpk

@@ -36,9 +36,9 @@ requires
   dxPScxGridLnkD10,
   dxPsPrVwAdvD10,
   dxLayoutControlD10,
-  frx10,
+  frx11,
-  frxe10,
+  frxe11,
-  fs10,
+  fs11,
   JvAppFrmD11R,
   JvCtrlsD11R,
   Base;

Source/GUIBase/GUIBase.dproj

@@ -57,22 +57,20 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxBarD10.dcp" />
+    <DCCReference Include="dxBarD10.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxBarExtItemsD10.dcp" />
+    <DCCReference Include="dxBarExtItemsD10.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxLayoutControlD10.dcp" />
+    <DCCReference Include="dxLayoutControlD10.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxCommonD10.dcp" />
+    <DCCReference Include="dxPScxCommonD10.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="dxPScxGridLnkD10.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPsPrVwAdvD10.dcp" />
+    <DCCReference Include="dxPsPrVwAdvD10.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\frx10.dcp" />
+    <DCCReference Include="frx11.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\frxe10.dcp" />
+    <DCCReference Include="frxe11.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\fs10.dcp" />
+    <DCCReference Include="fs11.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvAppFrmD11R.dcp" />
+    <DCCReference Include="JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
@@ -159,8 +157,11 @@
       <Form>frViewTotales</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vcldb.dcp" />
   </ItemGroup>
 </Project>
+
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
@@ -169,7 +170,7 @@ Activate Handle=1
 Save Log File=1
 Foreground Tab=0
 Freeze Activate=0
-Freeze Timeout=0
+Freeze Timeout=60
 SMTP From=eurekalog@email.com
 SMTP Host=
 SMTP Port=25

Source/GUIBase/uEditorPreview.dfm

@@ -846,13 +846,14 @@ inherited fEditorPreview: TfEditorPreview
     Bitmap = {}
   end
   object frxReport1: TfrxReport
-    Version = '3.23.7'
+    Version = '4.3'
     DotMatrixReport = False
     EngineOptions.DoublePass = True
     IniFile = '\Software\Fast Reports'
     PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator]
     PreviewOptions.Zoom = 1.000000000000000000
     PrintOptions.Printer = 'Default'
+    PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 38658.858023541660000000
     ReportOptions.LastChange = 38658.858023541660000000
     ScriptLanguage = 'PascalScript'
@@ -863,9 +864,6 @@ inherited fEditorPreview: TfEditorPreview
     StoreInDFM = False
     Left = 16
     Top = 200
-    Datasets = <>
-    Variables = <>
-    Style = <>
   end
   object frxBarCodeObject1: TfrxBarCodeObject
     Left = 16

Source/GUIBase/uEditorPreview.pas

@@ -118,7 +118,7 @@ type
 implementation
 
 uses
-  frxRes, frxUtils, frxPrinter, frxFormUtils,
+  frxRes, frxUtils, frxPrinter, 
   uCustomEditor, uSistemaFunc;
 
 {$R *.dfm}

Source/Informes/InfPresupuestoCliente.fr3

@@ -1,37 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="3.23.7" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="39399,7768037384" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;{  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;{  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + '  ' + &#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C650100">
+<TfrxReport Version="4.3" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="39404,9533913773" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;{  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;{  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + '  ' + &#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C650100">
+  <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
-    <TfrxMasterData Name="MasterData1" Height="24" Left="0" Top="283,46475" Width="718,1107" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
+    <TfrxRichView Name="Rich1" Left="196,53556" Top="366,61441" Width="302,3624" Height="143,62214" GapX="2" GapY="1" PropData="0852696368456469740A260100007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7B5C66315C666E696C5C666368617273657430205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C71635C625C66305C6673323820544543534954454C20532E4C2E5C7061720D0A5C623020435C5C204275656E645C66315C276564612C2032352E203238303533204D61647269645C7061720D0A546C663A2039312D3530372D35362D3932202F2036335C7061720D0A4661783A2039312D3738352D39362D33355C7061720D0A652D6D61696C3A20746563736974656C40746563736974656C2E636F6D5C66305C667331365C7061720D0A7D0D0A00"/>
-      <TfrxMemoView Name="Memo14" Left="1" Top="1,5" Width="75" Height="18" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;REFERENCIA_PROVEEDOR&#34;] "/>
+    <TfrxShapeView Name="Shape1" Left="113,3859" Top="566,9295" Width="487,55937" Height="377,953" Shape="skRoundRectangle"/>
-      <TfrxMemoView Name="MemoCampo2" Left="78" Top="1,5" Width="56,03148874" Height="18" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
+    <TfrxMemoView Name="Memo1" Left="138,9427219" Top="591,40645619" Width="162,15983476" Height="31,49608333" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-24" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="PRESUPUESTO"/>
-      <TfrxRichView Name="MemoCampo12" ShiftMode="smWhenOverlapped" Left="137,5" Top="1,5" Width="580,5436" Height="18" StretchMode="smMaxHeight" DataField="CONCEPTO" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" GapX="2" GapY="3" Wysiwyg="False" PropData="0852696368456469740A6C0000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C66305C667331365C7061720D0A7D0D0A00"/>
+    <TfrxLineView Name="Line1" Left="139,84261" Top="627,40198" Width="423,30736" Height="0" Frame.Typ="4" Frame.Width="2"/>
-    </TfrxMasterData>
+    <TfrxMemoView Name="frxDBCabeceraREFERENCIA" Left="302,3624" Top="665,19728" Width="419,52783" Height="18,89765" DataField="REFERENCIA" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-16" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBCabecera.&#34;REFERENCIA&#34;]"/>
-    <TfrxPageFooter Name="PageFooter1" Height="69,1" Left="0" Top="366,61441" Width="718,1107">
-      <TfrxLineView Name="Line4" Align="baCenter" Left="-0,944650000000024" Top="0" Width="720" Height="0" Frame.Typ="4"/>
-    </TfrxPageFooter>
-    <TfrxPageHeader Name="PageHeader1" Height="202,20472441" Left="0" Top="18,89765" Width="718,1107" OnBeforePrint="PageHeader1OnBeforePrint">
-      <TfrxMemoView Name="Memo23" Left="135,5" Top="172,92517" Width="583,2" Height="26,45669291" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="12" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Concepto"/>
-      <TfrxMemoView Name="Memo8" Left="76" Top="172,92517" Width="59,25726667" Height="26,45669291" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="12" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Cantidad"/>
-      <TfrxMemoView Name="Memo13" Left="0" Top="172,92517" Width="76,2" Height="26,45669291" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="12" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Referencia"/>
-      <TfrxShapeView Name="Shape2" Left="357,60637" Top="76" Width="360,69295" Height="96,5" Color="16777215" Frame.Color="8421504"/>
-      <TfrxMemoView Name="Memo2" Left="358,36209" Top="18,89765" Width="355,49629" Height="38,89765" Font.Charset="1" Font.Color="8421504" Font.Height="-29" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="PEDIDO DE CLIENTE"/>
-      <TfrxMemoView Name="NombreEmpresa" Left="0" Top="8" Width="414,07885" Height="26,89765" OnBeforePrint="NombreEmpresaOnBeforePrint" Font.Charset="1" Font.Color="8421504" Font.Height="-19" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text=""/>
-      <TfrxMemoView Name="Memo7" Left="366,39394" Top="79,81107" Width="80,03154" Height="18,89765" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Página nº:"/>
-      <TfrxMemoView Name="Memo12" Left="446,42548" Top="79,81107" Width="157,63791" Height="18,89765" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[&#60;Pagina&#62;] / [&#60;TotalPaginas&#62;]"/>
-      <TfrxShapeView Name="Shape1" Left="0" Top="76" Width="357,92122079" Height="96,50391016" Color="16777215" Frame.Color="8421504"/>
-      <TfrxMemoView Name="Memo10" Left="3,68491" Top="80" Width="349,29159" Height="15,60637" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="DIRECCIÓN DESTINO:"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="0" Top="40" Width="414,07885" Height="26,89765" OnBeforePrint="DatosEmpresaOnBeforePrint" Font.Charset="1" Font.Color="8421504" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text=""/>
-      <TfrxMemoView Name="Memo5" Left="366,39394" Top="101,35436" Width="68,69295" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Nº pedido:"/>
-      <TfrxMemoView Name="Memo4" Left="366,39394" Top="123,33859" Width="53,57483" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Cliente:"/>
-      <TfrxMemoView Name="Memo11" Left="423,7483" Top="123,33859" Width="290,45671" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo3" Left="446,42548" Top="101,57483" Width="207,30705" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;REFERENCIA&#34;]"/>
-      <TfrxMemoView Name="DireccionEnvio" Left="11,5" Top="100" Width="341,18522" Height="68,94812" OnBeforePrint="DireccionEnvioOnBeforePrint" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text=""/>
-      <TfrxLineView Name="Line1" Left="718,5" Top="174,73995" Width="0" Height="802,69" Frame.Typ="1"/>
-      <TfrxLineView Name="Line2" Left="0" Top="174,73995" Width="0" Height="802,69" Frame.Color="8421504" Frame.Typ="1"/>
-      <TfrxMemoView Name="Memo1" Left="366,61441" Top="147,40167" Width="83,81107" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Cliente final:"/>
-      <TfrxMemoView Name="Memo6" Left="454,20501" Top="147,40167" Width="260,22047" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;NOMBRE_COMERCIAL&#34;]"/>
-      <TfrxLineView Name="Line3" Left="76,2" Top="174,73995" Width="0" Height="802,69" Frame.Color="8421504" Frame.Typ="1"/>
-      <TfrxLineView Name="Line5" Left="135,5" Top="174,73995" Width="0" Height="802,69" Frame.Color="8421504" Frame.Typ="1"/>
-    </TfrxPageHeader>
   </TfrxReportPage>
+  <TfrxReportPage Name="Page2" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text=""/>
 </TfrxReport>

Source/Informes/InfPresupuestoCliente_anterior.fr3

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TfrxReport Version="3.23.7" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="39399,7768037384" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;{  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;{  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + '  ' + &#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C650100">
+  <TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
+    <TfrxMasterData Name="MasterData1" Height="24" Left="0" Top="283,46475" Width="718,1107" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
+      <TfrxMemoView Name="Memo14" Left="1" Top="1,5" Width="75" Height="18" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;REFERENCIA_PROVEEDOR&#34;] "/>
+      <TfrxMemoView Name="MemoCampo2" Left="78" Top="1,5" Width="56,03148874" Height="18" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
+      <TfrxRichView Name="MemoCampo12" ShiftMode="smWhenOverlapped" Left="137,5" Top="1,5" Width="580,5436" Height="18" StretchMode="smMaxHeight" DataField="CONCEPTO" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" GapX="2" GapY="3" Wysiwyg="False" PropData="0852696368456469740A6C0000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C66305C667331365C7061720D0A7D0D0A00"/>
+    </TfrxMasterData>
+    <TfrxPageFooter Name="PageFooter1" Height="69,1" Left="0" Top="366,61441" Width="718,1107">
+      <TfrxLineView Name="Line4" Align="baCenter" Left="-0,944650000000024" Top="0" Width="720" Height="0" Frame.Typ="4"/>
+    </TfrxPageFooter>
+    <TfrxPageHeader Name="PageHeader1" Height="202,20472441" Left="0" Top="18,89765" Width="718,1107" OnBeforePrint="PageHeader1OnBeforePrint">
+      <TfrxMemoView Name="Memo23" Left="135,5" Top="172,92517" Width="583,2" Height="26,45669291" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="12" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Concepto"/>
+      <TfrxMemoView Name="Memo8" Left="76" Top="172,92517" Width="59,25726667" Height="26,45669291" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="12" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Cantidad"/>
+      <TfrxMemoView Name="Memo13" Left="0" Top="172,92517" Width="76,2" Height="26,45669291" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="12" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Referencia"/>
+      <TfrxShapeView Name="Shape2" Left="357,60637" Top="76" Width="360,69295" Height="96,5" Color="16777215" Frame.Color="8421504"/>
+      <TfrxMemoView Name="Memo2" Left="358,36209" Top="18,89765" Width="355,49629" Height="38,89765" Font.Charset="1" Font.Color="8421504" Font.Height="-29" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="PEDIDO DE CLIENTE"/>
+      <TfrxMemoView Name="NombreEmpresa" Left="0" Top="8" Width="414,07885" Height="26,89765" OnBeforePrint="NombreEmpresaOnBeforePrint" Font.Charset="1" Font.Color="8421504" Font.Height="-19" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text=""/>
+      <TfrxMemoView Name="Memo7" Left="366,39394" Top="79,81107" Width="80,03154" Height="18,89765" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Página nº:"/>
+      <TfrxMemoView Name="Memo12" Left="446,42548" Top="79,81107" Width="157,63791" Height="18,89765" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[&#60;Pagina&#62;] / [&#60;TotalPaginas&#62;]"/>
+      <TfrxShapeView Name="Shape1" Left="0" Top="76" Width="357,92122079" Height="96,50391016" Color="16777215" Frame.Color="8421504"/>
+      <TfrxMemoView Name="Memo10" Left="3,68491" Top="80" Width="349,29159" Height="15,60637" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="DIRECCIÓN DESTINO:"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="0" Top="40" Width="414,07885" Height="26,89765" OnBeforePrint="DatosEmpresaOnBeforePrint" Font.Charset="1" Font.Color="8421504" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text=""/>
+      <TfrxMemoView Name="Memo5" Left="366,39394" Top="101,35436" Width="68,69295" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Nº pedido:"/>
+      <TfrxMemoView Name="Memo4" Left="366,39394" Top="123,33859" Width="53,57483" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Cliente:"/>
+      <TfrxMemoView Name="Memo11" Left="423,7483" Top="123,33859" Width="290,45671" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;NOMBRE&#34;]"/>
+      <TfrxMemoView Name="Memo3" Left="446,42548" Top="101,57483" Width="207,30705" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="DireccionEnvio" Left="11,5" Top="100" Width="341,18522" Height="68,94812" OnBeforePrint="DireccionEnvioOnBeforePrint" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text=""/>
+      <TfrxLineView Name="Line1" Left="718,5" Top="174,73995" Width="0" Height="802,69" Frame.Typ="1"/>
+      <TfrxLineView Name="Line2" Left="0" Top="174,73995" Width="0" Height="802,69" Frame.Color="8421504" Frame.Typ="1"/>
+      <TfrxMemoView Name="Memo1" Left="366,61441" Top="147,40167" Width="83,81107" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Cliente final:"/>
+      <TfrxMemoView Name="Memo6" Left="454,20501" Top="147,40167" Width="260,22047" Height="18,67718" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;NOMBRE_COMERCIAL&#34;]"/>
+      <TfrxLineView Name="Line3" Left="76,2" Top="174,73995" Width="0" Height="802,69" Frame.Color="8421504" Frame.Typ="1"/>
+      <TfrxLineView Name="Line5" Left="135,5" Top="174,73995" Width="0" Height="802,69" Frame.Color="8421504" Frame.Typ="1"/>
+    </TfrxPageHeader>
+  </TfrxReportPage>
+</TfrxReport>

Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm

@@ -1,7 +1,7 @@
 object RptPresupuestosCliente: TRptPresupuestosCliente
   OldCreateOrder = True
   OnCreate = DataModuleCreate
-  Height = 405
+  Height = 604
   Width = 447
   object DADataCabecera: TDADataSource
     DataSet = tbl_Cabecera.Dataset
@@ -16,24 +16,24 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Top = 72
   end
   object frxBarCodeObject1: TfrxBarCodeObject
-    Left = 144
+    Left = 280
-    Top = 296
+    Top = 496
   end
   object frxOLEObject1: TfrxOLEObject
-    Left = 48
+    Left = 184
-    Top = 344
+    Top = 432
   end
   object frxCrossObject1: TfrxCrossObject
-    Left = 144
+    Left = 384
-    Top = 344
+    Top = 496
   end
   object frxCheckBoxObject1: TfrxCheckBoxObject
-    Left = 256
+    Left = 280
-    Top = 296
+    Top = 440
   end
   object frxGradientObject1: TfrxGradientObject
-    Left = 360
+    Left = 384
-    Top = 296
+    Top = 440
   end
   object schReport: TDASchema
     ConnectionManager = dmServer.ConnectionManager
@@ -440,15 +440,16 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Top = 142
   end
   object frxReport: TfrxReport
-    Version = '3.23.7'
+    Version = '4.3'
     DotMatrixReport = False
     EngineOptions.DoublePass = True
     IniFile = '\Software\Fast Reports'
     PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick]
     PreviewOptions.Zoom = 1.000000000000000000
     PrintOptions.Printer = 'Por defecto'
+    PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 39065.872423495400000000
-    ReportOptions.LastChange = 39399.705345219900000000
+    ReportOptions.LastChange = 39404.953391377300000000
     ScriptLanguage = 'PascalScript'
     ScriptText.Strings = (
       ''
@@ -469,8 +470,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
       ''
       'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);'
       'begin'
-      '{'
+      '{  NombreEmpresa.Lines.Clear;'
-      '  NombreEmpresa.Lines.Clear;'
       '  NombreEmpresa.Lines.Add(<frxDBCabecera."NOMBRE_EMPRESA">);'
       '}'
       'end;'
@@ -479,8 +479,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
       'var'
       '  ACadena : String;'
       'begin'
-      '{'
+      '{  ACadena := '#39#39';'
-      '  ACadena := '#39#39';'
       '  DireccionEnvio.Lines.Clear;'
       '  if (<frxDBCabecera."REFERENCIA_CLIENTE"> <> '#39#39') then'
       '     ACadena := <frxDBCabecera."REFERENCIA_CLIENTE">;'
@@ -532,29 +531,6 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     OnStartReport = 'frxReportOnStartReport'
     Left = 169
     Top = 16
-    Datasets = <
-      item
-        DataSet = frxDBCabecera
-        DataSetName = 'frxDBCabecera'
-      end
-      item
-        DataSet = frxDBDetalles
-        DataSetName = 'frxDBDetalles'
-      end>
-    Variables = <
-      item
-        Name = ' Paginacion'
-        Value = Null
-      end
-      item
-        Name = 'Pagina'
-        Value = Null
-      end
-      item
-        Name = 'TotalPaginas'
-        Value = Null
-      end>
-    Style = <>
   end
   object frxDBCabecera: TfrxDBDataset
     UserName = 'frxDBCabecera'
@@ -576,30 +552,296 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
   end
   object tbl_Cabecera: TDAMemDataTable
     RemoteUpdatesOptions = []
-    Fields = <>
+    Fields = <
-    Params = <>
+      item
+        Name = 'ID'
+        DataType = datInteger
+        Required = True
+        InPrimaryKey = True
+      end
+      item
+        Name = 'ID_EMPRESA'
+        DataType = datInteger
+      end
+      item
+        Name = 'FECHA_PRESUPUESTO'
+        DataType = datDateTime
+      end
+      item
+        Name = 'FECHA_DECISION'
+        DataType = datDateTime
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'SITUACION'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'ID_CLIENTE'
+        DataType = datInteger
+      end
+      item
+        Name = 'NIF_CIF'
+        DataType = datString
+        Size = 15
+      end
+      item
+        Name = 'NOMBRE'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'REFERENCIA_CLIENTE'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'CLIENTE_FINAL'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'PORTADA'
+        DataType = datMemo
+      end
+      item
+        Name = 'MEMORIA'
+        DataType = datMemo
+      end
+      item
+        Name = 'OBSERVACIONES'
+        DataType = datMemo
+      end
+      item
+        Name = 'INCIDENCIAS'
+        DataType = datMemo
+      end
+      item
+        Name = 'INCIDENCIAS_ACTIVAS'
+        DataType = datSmallInt
+        Required = True
+      end
+      item
+        Name = 'FECHA_ALTA'
+        DataType = datDateTime
+      end
+      item
+        Name = 'FECHA_MODIFICACION'
+        DataType = datDateTime
+      end
+      item
+        Name = 'USUARIO'
+        DataType = datString
+        Size = 30
+      end
+      item
+        Name = 'IMPORTE_NETO'
+        DataType = datCurrency
+      end
+      item
+        Name = 'IMPORTE_PORTE'
+        DataType = datCurrency
+      end
+      item
+        Name = 'DESCUENTO'
+        DataType = datFloat
+      end
+      item
+        Name = 'IMPORTE_DESCUENTO'
+        DataType = datCurrency
+      end
+      item
+        Name = 'BASE_IMPONIBLE'
+        DataType = datCurrency
+      end
+      item
+        Name = 'IVA'
+        DataType = datFloat
+      end
+      item
+        Name = 'IMPORTE_IVA'
+        DataType = datCurrency
+      end
+      item
+        Name = 'IMPORTE_TOTAL'
+        DataType = datCurrency
+      end
+      item
+        Name = 'ID_FORMA_PAGO'
+        DataType = datInteger
+      end>
+    Params = <
+      item
+        Name = 'ID'
+        Value = ''
+        ParamType = daptInput
+      end>
     MasterMappingMode = mmDataRequest
     LogChanges = False
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteFetchEnabled = False
+    LocalSchema = schReport
+    LocalDataStreamer = Bin2DataStreamer
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    LogicalName = 'Informe_Cabecera'
     IndexDefs = <>
     Left = 264
     Top = 128
   end
   object tbl_Detalles: TDAMemDataTable
     RemoteUpdatesOptions = []
-    Fields = <>
+    Fields = <
-    Params = <>
+      item
-    MasterMappingMode = mmDataRequest
+        Name = 'ID'
+        DataType = datInteger
+        InPrimaryKey = True
+      end
+      item
+        Name = 'ID_PRESUPUESTO'
+        DataType = datInteger
+      end
+      item
+        Name = 'POSICION'
+        DataType = datInteger
+      end
+      item
+        Name = 'TIPO_DETALLE'
+        DataType = datString
+        Size = 10
+      end
+      item
+        Name = 'CONCEPTO'
+        DataType = datString
+        Size = 2000
+      end
+      item
+        Name = 'CANTIDAD'
+        DataType = datInteger
+      end
+      item
+        Name = 'IMPORTE_UNIDAD'
+        DataType = datCurrency
+      end
+      item
+        Name = 'IMPORTE_TOTAL'
+        DataType = datCurrency
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'FAMILIA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'REFERENCIA_PROVEEDOR'
+        DataType = datString
+        Size = 255
+      end>
+    Params = <
+      item
+        Name = 'ID'
+        Value = ''
+        ParamType = daptInput
+      end>
+    MasterParamsMappings.Strings = (
+      'ID=ID')
     LogChanges = False
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteFetchEnabled = False
+    LocalSchema = schReport
+    LocalDataStreamer = Bin2DataStreamer
+    MasterSource = DADataCabecera
+    MasterFields = 'ID'
+    DetailFields = 'ID_PRESUPUESTO'
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    LogicalName = 'Informe_Detalles'
     IndexDefs = <>
     Left = 344
     Top = 128
   end
+  object IBDatabase1: TIBDatabase
+    DatabaseName = 'C:\Codigo Tecsitel\Output\Debug\Database\FACTUGES.FDB'
+    Params.Strings = (
+      'user_name=sysdba'
+      'password=masterkey'
+      'lc_ctype=ISO8859_1')
+    LoginPrompt = False
+    DefaultTransaction = IBTransaction1
+    Left = 48
+    Top = 296
+  end
+  object IBTransaction1: TIBTransaction
+    Left = 48
+    Top = 352
+  end
+  object DataSource1: TDataSource
+    DataSet = cabecera
+    Left = 216
+    Top = 296
+  end
+  object DataSource2: TDataSource
+    DataSet = detalles
+    Left = 216
+    Top = 352
+  end
+  object cabecera: TIBQuery
+    Database = IBDatabase1
+    Transaction = IBTransaction1
+    SQL.Strings = (
+      'SELECT '
+      '    ID, ID_EMPRESA, FECHA_PRESUPUESTO, FECHA_DECISION, '
+      '    REFERENCIA, SITUACION, ID_CLIENTE, NIF_CIF, NOMBRE, '
+      '    REFERENCIA_CLIENTE, CLIENTE_FINAL, PORTADA, MEMORIA, '
+      
+        '    OBSERVACIONES, INCIDENCIAS, INCIDENCIAS_ACTIVAS, FECHA_ALTA,' +
+        ' '
+      '    FECHA_MODIFICACION, USUARIO, IMPORTE_NETO, IMPORTE_PORTE, '
+      '    DESCUENTO, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, '
+      '    IMPORTE_IVA, IMPORTE_TOTAL, ID_FORMA_PAGO'
+      '  FROM'
+      '    V_PRESUPUESTOS_CLIENTE'
+      '  WHERE V_PRESUPUESTOS_CLIENTE.ID = 31')
+    Left = 136
+    Top = 296
+  end
+  object detalles: TIBQuery
+    Database = IBDatabase1
+    Transaction = IBTransaction1
+    SQL.Strings = (
+      
+        'SELECT PRESUPUESTOS_CLIENTE_DETALLES.ID, PRESUPUESTOS_CLIENTE_DE' +
+        'TALLES.ID_PRESUPUESTO,'
+      
+        '       PRESUPUESTOS_CLIENTE_DETALLES.POSICION, PRESUPUESTOS_CLIE' +
+        'NTE_DETALLES.TIPO_DETALLE,'
+      
+        '       PRESUPUESTOS_CLIENTE_DETALLES.CONCEPTO, PRESUPUESTOS_CLIE' +
+        'NTE_DETALLES.CANTIDAD,'
+      
+        '       PRESUPUESTOS_CLIENTE_DETALLES.IMPORTE_UNIDAD, PRESUPUESTO' +
+        'S_CLIENTE_DETALLES.IMPORTE_TOTAL,'
+      
+        '       ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFERE' +
+        'NCIA_PROV as REFERENCIA_PROVEEDOR'
+      ''
+      'FROM PRESUPUESTOS_CLIENTE_DETALLES'
+      
+        'LEFT JOIN ARTICULOS ON (PRESUPUESTOS_CLIENTE_DETALLES.ID_ARTICUL' +
+        'O = ARTICULOS.ID)'
+      'WHERE PRESUPUESTOS_CLIENTE_DETALLES.ID_PRESUPUESTO = 31'
+      'ORDER BY POSICION')
+    Left = 136
+    Top = 352
+  end
 end

Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas

@@ -7,7 +7,8 @@ uses
   Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
   uDADataTable, uDACDSDataTable, DB, uDAClasses, uDABINAdapter, uROTypes,
   uDAInterfaces, uDAMemDataTable, uDADataStreamer, uDABin2DataStreamer,
-  frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich;
+  frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDAEngine,
+  IBSQL, IBDatabase, IBCustomDataSet, IBQuery;
 
 type
   TRptPresupuestosCliente = class(TDataModule)
@@ -23,9 +24,15 @@ type
     Bin2DataStreamer: TDABin2DataStreamer;
     tbl_Cabecera: TDAMemDataTable;
     tbl_Detalles: TDAMemDataTable;
+    frxReport: TfrxReport;
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
-    frxReport: TfrxReport;
+    IBDatabase1: TIBDatabase;
+    IBTransaction1: TIBTransaction;
+    DataSource1: TDataSource;
+    DataSource2: TDataSource;
+    cabecera: TIBQuery;
+    detalles: TIBQuery;
     procedure DataModuleCreate(Sender: TObject);
   private
     FConnection: IDAConnection;
@@ -89,10 +96,10 @@ var
   dsMaster: IDADataset;
   dsDetail: IDADataset;
 begin
-  AStream := TMemoryStream.Create;
+  //AStream := TMemoryStream.Create;
 
   try
-    dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [AID]);
+    {dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [AID]);
     dsDetail := schReport.NewDataset(FConnection, ds_InformeDetalles, ['ID'], [AID], False);
 
     AStream.Clear;
@@ -101,13 +108,18 @@ begin
 
     AStream.Clear;
     Bin2DataStreamer.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1);
-    Bin2DataStreamer.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);
+    Bin2DataStreamer.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);}
+
+    tbl_Cabecera.ParamByName('ID').AsInteger := AID;
+    tbl_Detalles.ParamByName('ID').AsInteger := AID;
+    tbl_Cabecera.Active := True;
+    tbl_Detalles.Active := True;
 
     frxReport.LoadFromFile(DarRutaInformes + rptInforme, True);
     frxReport.PrepareReport(False);
 
   finally
-    AStream.Free;
+    //AStream.Free;
     dsMaster := Nil;
     dsDetail := Nil;
   end;

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm

@@ -2,19 +2,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   Left = 332
   Top = 147
   Caption = 'Nuevo pedido de cliente'
-  ClientHeight = 608
+  ClientHeight = 631
-  ClientWidth = 632
+  ClientWidth = 674
   OnClose = CustomEditorClose
-  ExplicitWidth = 640
+  ExplicitWidth = 682
-  ExplicitHeight = 635
+  ExplicitHeight = 658
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 632
+    Width = 674
     Caption = 'Nuevo pedido de cliente'
     ExplicitWidth = 632
     inherited Image1: TImage
-      Left = 605
+      Left = 647
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -126,7 +126,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 632
+    Width = 674
     ExplicitWidth = 632
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 488
@@ -141,13 +141,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
       end
     end
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 632
+      ExplicitWidth = 674
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 632
+    Width = 674
-    Height = 442
+    Height = 465
-    ActivePage = pagMemoria
+    ActivePage = pagPortada
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitWidth = 632
@@ -161,11 +161,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitWidth = 624
+      ExplicitHeight = 414
       inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
         Left = 0
         Top = 0
-        Width = 624
+        Width = 666
-        Height = 414
+        Height = 437
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -180,17 +182,57 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitWidth = 624
         ExplicitHeight = 414
         inherited ToolBar1: TToolBar
-          Width = 624
+          Width = 666
           ExplicitWidth = 624
+          inherited FontSize: TEdit
+            Width = 57
+            ExplicitWidth = 57
+          end
+          inherited UpDown1: TUpDown
+            Left = 236
+            ExplicitLeft = 236
+          end
+          inherited ToolButton13: TToolButton
+            Left = 253
+            ExplicitLeft = 253
+          end
+          inherited ToolButton6: TToolButton
+            Left = 261
+            ExplicitLeft = 261
+          end
+          inherited ToolButton7: TToolButton
+            Left = 295
+            ExplicitLeft = 295
+          end
+          inherited ToolButton8: TToolButton
+            Left = 329
+            ExplicitLeft = 329
+          end
+          inherited ToolButton12: TToolButton
+            Left = 363
+            ExplicitLeft = 363
+          end
+          inherited ToolButton9: TToolButton
+            Left = 371
+            ExplicitLeft = 371
+          end
+          inherited ToolButton10: TToolButton
+            Left = 405
+            ExplicitLeft = 405
+          end
+          inherited ToolButton11: TToolButton
+            Left = 439
+            ExplicitLeft = 439
+          end
         end
         inherited cxGrid: TcxGrid
-          Width = 624
+          Width = 666
-          Height = 342
+          Height = 365
           ExplicitWidth = 624
           ExplicitHeight = 342
         end
         inherited TBXDock1: TTBXDock
-          Width = 624
+          Width = 666
           ExplicitWidth = 624
           inherited TBXToolbar1: TTBXToolbar
             ExplicitWidth = 548
@@ -201,15 +243,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
-      ExplicitLeft = 0
+      ExplicitWidth = 624
-      ExplicitTop = 0
+      ExplicitHeight = 414
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
-        Width = 624
+        Width = 666
-        Height = 414
+        Height = 437
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -222,22 +262,22 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitWidth = 624
         ExplicitHeight = 414
         inherited pnlSup: TPanel
-          Width = 624
+          Width = 666
           ExplicitWidth = 624
           inherited eIncidenciaActiva: TcxDBCheckBox
             ExplicitHeight = 21
           end
         end
         inherited GroupBox1: TGroupBox
-          Width = 624
+          Width = 666
-          Height = 386
+          Height = 409
           ExplicitWidth = 624
           ExplicitHeight = 386
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 601
             ExplicitHeight = 353
-            Height = 353
+            Height = 376
-            Width = 601
+            Width = 643
           end
         end
       end
@@ -245,28 +285,28 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagPortada: TTabSheet
       Caption = 'Portada'
       ImageIndex = 3
-      ExplicitLeft = 0
+      ExplicitWidth = 624
-      ExplicitTop = 0
+      ExplicitHeight = 414
-      ExplicitWidth = 0
+      object edtPortada: TcxDBRichEdit
-      ExplicitHeight = 0
-      object eIncidencias: TcxDBMemo
         Left = 0
         Top = 0
         Align = alClient
         DataBinding.DataField = 'PORTADA'
         DataBinding.DataSource = dsDataTable
         TabOrder = 0
-        Height = 414
+        ExplicitLeft = 304
-        Width = 624
+        ExplicitTop = 288
+        ExplicitWidth = 185
+        ExplicitHeight = 89
+        Height = 437
+        Width = 666
       end
     end
     object pagMemoria: TTabSheet
       Caption = 'Memoria'
       ImageIndex = 4
-      ExplicitLeft = 0
+      ExplicitWidth = 624
-      ExplicitTop = 0
+      ExplicitHeight = 414
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object cxDBMemo1: TcxDBMemo
         Left = 0
         Top = 0
@@ -274,14 +314,16 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         DataBinding.DataField = 'MEMORIA'
         DataBinding.DataSource = dsDataTable
         TabOrder = 0
-        Height = 414
+        ExplicitWidth = 624
-        Width = 624
+        ExplicitHeight = 414
+        Height = 437
+        Width = 666
       end
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 589
+    Top = 612
-    Width = 632
+    Width = 674
     Panels = <
       item
         Width = 200
@@ -291,8 +333,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   end
   inline frViewTotales1: TfrViewTotales [4]
     Left = 0
-    Top = 518
+    Top = 541
-    Width = 632
+    Width = 674
     Height = 71
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
@@ -307,7 +349,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     ExplicitWidth = 632
     ExplicitHeight = 71
     inherited dxLayoutControl1: TdxLayoutControl
-      Width = 632
+      Width = 674
       Height = 171
       LookAndFeel = dxLayoutOfficeLookAndFeel1
       ExplicitWidth = 632
@@ -321,20 +363,20 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 313
+        Left = 333
         Top = 11
         Width = 8
         Height = 54
-        ExplicitLeft = 313
+        ExplicitLeft = 333
         ExplicitTop = 11
         ExplicitWidth = 8
         ExplicitHeight = 54
       end
       inherited Bevel4: TBevel
-        Left = 430
+        Left = 450
         Top = 92
         Width = 21
-        ExplicitLeft = 430
+        ExplicitLeft = 450
         ExplicitTop = 92
         ExplicitWidth = 21
       end
@@ -348,19 +390,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Width = 93
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 501
+        Left = 521
         Top = 38
         Style.IsFontAssigned = True
-        ExplicitLeft = 501
+        ExplicitLeft = 521
         ExplicitTop = 38
         ExplicitWidth = 137
         Width = 137
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 431
+        Left = 451
         Top = 112
         Style.IsFontAssigned = True
-        ExplicitLeft = 431
+        ExplicitLeft = 451
         ExplicitTop = 112
         ExplicitWidth = 137
         Width = 137
@@ -373,37 +415,37 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitTop = 112
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 430
+        Left = 450
         Top = 38
         Style.IsFontAssigned = True
-        ExplicitLeft = 430
+        ExplicitLeft = 450
         ExplicitTop = 38
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 430
+        Left = 450
         Top = 11
         Style.IsFontAssigned = True
-        ExplicitLeft = 430
+        ExplicitLeft = 450
         ExplicitTop = 11
         ExplicitWidth = 92
         Width = 92
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 430
+        Left = 450
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
         Style.IsFontAssigned = True
-        ExplicitLeft = 430
+        ExplicitLeft = 450
         ExplicitTop = 65
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 501
+        Left = 521
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
         Style.IsFontAssigned = True
-        ExplicitLeft = 501
+        ExplicitLeft = 521
         ExplicitTop = 65
         ExplicitWidth = 56
         Width = 56
@@ -438,9 +480,9 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Width = 81
       end
       inherited bTiposIVA: TButton
-        Left = 165
+        Left = 185
         Top = 38
-        ExplicitLeft = 165
+        ExplicitLeft = 185
         ExplicitTop = 38
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas

@@ -16,7 +16,7 @@ uses
   dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uViewTotales,
   uIEditorPresupuestoCliente, uBizPresupuestosCliente, uViewPresupuestoCliente,
   uViewDetallesDTO, uViewDetallesArticulos, uViewDetallesPresupuestoCliente,
-  uDAInterfaces;
+  uDAInterfaces, cxRichEdit, cxDBRichEdit;
 
 type
   TfEditorPresupuestoCliente = class(TfEditorDBItem, IEditorPresupuestoCliente)
@@ -29,8 +29,8 @@ type
     frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente;
     pagPortada: TTabSheet;
     pagMemoria: TTabSheet;
-    eIncidencias: TcxDBMemo;
     cxDBMemo1: TcxDBMemo;
+    edtPortada: TcxDBRichEdit;
 
     procedure FormShow(Sender: TObject);
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "3.0.0.0\0"
               VALUE "ProductVersion", "3.0.0.0\0"
-              VALUE "CompileDate", "domingo, 18 de noviembre de 2007 21:05\0"
+              VALUE "CompileDate", "domingo, 18 de noviembre de 2007 21:49\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Servidor/uDataModuleServer.dfm

@@ -39,9 +39,9 @@ object dmServer: TdmServer
       item
         Name = 'IBX'
         ConnectionString = 
-          'IBX?Server=localhost;Database=C:\Codigo tecsitel\Database\FACTUG' +
+          'IBX?Server=localhost;Database=C:\Codigo Tecsitel\Output\Debug\Da' +
-          'ES.FDB;UserID=sysdba;Password=masterkey;Dialect=3;Charset=ISO885' +
+          'tabase\FACTUGES.FDB;UserID=sysdba;Password=masterkey;Dialect=3;C' +
-          '9_1;'
+          'harset=ISO8859_1;'
         ConnectionType = 'Interbase'
         Default = True
       end>