diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 3dcc8be0..d69f3f3d 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -58,58 +58,58 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Cliente\DataAbstract_Core_D10.dcp" />
-    <DCCReference Include="..\Cliente\RemObjects_Core_D10.dcp" />
+    <DCCReference Include="DataAbstract_Core_D10.dcp" />
+    <DCCReference Include="RemObjects_Core_D10.dcp" />
+    <DCCReference Include="Contactos\adortl.dcp" />
+    <DCCReference Include="cxDataD10.dcp" />
+    <DCCReference Include="cxEditorsD10.dcp" />
+    <DCCReference Include="cxExportD10.dcp" />
+    <DCCReference Include="cxExtEditorsD10.dcp" />
+    <DCCReference Include="cxGridD10.dcp" />
+    <DCCReference Include="cxIntl5D10.dcp" />
+    <DCCReference Include="cxIntlPrintSys3D10.dcp" />
+    <DCCReference Include="cxLibraryD10.dcp" />
+    <DCCReference Include="cxPageControlD10.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dclIndyCore.dcp" />
+    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="dxPSCoreD10.dcp" />
+    <DCCReference Include="dxThemeD10.dcp" />
+    <DCCReference Include="GUISDK_D11.dcp" />
+    <DCCReference Include="IndyCore.dcp" />
+    <DCCReference Include="IndyProtocols.dcp" />
+    <DCCReference Include="IndySystem.dcp" />
+    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="JSDialog100.dcp" />
+    <DCCReference Include="JvCmpD11R.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
+    <DCCReference Include="JvCtrlsD11R.dcp" />
+    <DCCReference Include="JvDlgsD11R.dcp" />
+    <DCCReference Include="JvMMD11R.dcp" />
+    <DCCReference Include="JvNetD11R.dcp" />
+    <DCCReference Include="JvPageCompsD11R.dcp" />
+    <DCCReference Include="JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="JvSystemD11R.dcp" />
+    <DCCReference Include="pckMD5.dcp" />
+    <DCCReference Include="pckUCDataConnector.dcp" />
+    <DCCReference Include="pckUserControl_RT.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="TB2k_D10.dcp" />
+    <DCCReference Include="tbx_d10.dcp" />
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="VclSmp.dcp" />
+    <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntl5D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>
@@ -151,486 +151,4 @@
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
   </ItemGroup>
 </Project>
-<!-- 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 -->
+
diff --git a/Source/Base/Controladores/uControllerDetallesBase.pas b/Source/Base/Controladores/uControllerDetallesBase.pas
index 8198311e..1c415a07 100644
--- a/Source/Base/Controladores/uControllerDetallesBase.pas
+++ b/Source/Base/Controladores/uControllerDetallesBase.pas
@@ -9,6 +9,7 @@ const
   TIPO_DETALLE_TITULO = 'Titulo';
   TIPO_DETALLE_SUBTOTAL = 'Subtotal';
   TIPO_DETALLE_SALTO = 'Salto';
+  TIPO_DETALLE_DESCUENTO = 'Descuento';  
 
   CTE_DESC_SALTO = 'SALTO DE PAGINA >>';
 
@@ -59,6 +60,9 @@ type
     procedure CalculoDetalleTitulo(DataTable: TDADataTable; var ImporteAcumulado : Double; var ImporteTotal : Double); virtual;
     procedure TratamientoDetalleSubtotal(DataTable: TDADataTable); virtual;
     procedure CalculoDetalleSubtotal(DataTable: TDADataTable; var ImporteAcumulado : Double; var ImporteTotal : Double); virtual;
+    procedure TratamientoDetalleDescuento(DataTable: TDADataTable); virtual;
+    procedure CalculoDetalleDescuento(DataTable: TDADataTable; var ImporteAcumulado : Double; var ImporteTotal : Double); virtual;
+
     //Si sobreescribimos este metodo es para continuar el CalcularTotales segun los tipos de concepto de los hijos
     function CalcularTotalesHijos(Modificar: boolean; DataTable: TDADataTable; var ImporteAcumulado : Double; var ImporteTotal : Double): Double; virtual;
 
@@ -172,13 +176,20 @@ begin
             TratamientoDetalleTitulo(DataTable); //Se podrá sobreescribir para que se tengan en cuenta nuevos campos en hijos
          CalculoDetalleTitulo(DataTable, AuxImporteAcumulado, AuxImporteTotal); //Se podrá sobreescribir para posibles nuevos calculos de los hijos
       end
-      //SUBTITULOS
+      //SUBTOTAL
       else if (DataTable.FieldByName(CAMPO_TIPO).AsString = TIPO_DETALLE_SUBTOTAL) then
       begin
          if Modificar then
             TratamientoDetalleSubtotal(DataTable); //Se podrá sobreescribir para que se tengan en cuenta nuevos campos
          CalculoDetalleSubtotal(DataTable, AuxImporteAcumulado, AuxImporteTotal); //Se podrá sobreescribir para posibles nuevos calculos de los hijos
       end
+      //DESCUENTO DE CAPITULO
+      else if (DataTable.FieldByName(CAMPO_TIPO).AsString = TIPO_DETALLE_DESCUENTO) then
+      begin
+         if Modificar then
+            TratamientoDetalleDescuento(DataTable); //Se podrá sobreescribir para que se tengan en cuenta nuevos campos
+         CalculoDetalleDescuento(DataTable, AuxImporteAcumulado, AuxImporteTotal); //Se podrá sobreescribir para posibles nuevos calculos de los hijos
+      end
       //CONCEPTOS
       else if (DataTable.FieldByName(CAMPO_TIPO).AsString = TIPO_DETALLE_CONCEPTO) then
       begin
@@ -217,6 +228,21 @@ begin
   end;
 end;
 
+procedure TControllerDetallesBase.CalculoDetalleDescuento(
+  DataTable: TDADataTable; var ImporteAcumulado, ImporteTotal: Double);
+var
+  ImporteDto : Double;
+begin
+  with DataTable do
+  begin
+    if not Editing then Edit;
+    ImporteDto := (-1)*((ImporteTotal * DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat) / 100);
+    ImporteTotal := ImporteTotal + ImporteDto;    
+    FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat := ImporteTotal;
+    Post;
+  end;
+end;
+
 procedure TControllerDetallesBase.CalculoDetalleSalto(DataTable: TDADataTable; var ImporteAcumulado, ImporteTotal: Double);
 begin
   with DataTable do
@@ -261,6 +287,7 @@ begin
   Result.Values[TIPO_DETALLE_CONCEPTO] := 'Concepto';
   Result.Values[TIPO_DETALLE_TITULO] := 'Título de capítulo';
   Result.Values[TIPO_DETALLE_SUBTOTAL] := 'Final de capítulo';
+  Result.Values[TIPO_DETALLE_DESCUENTO] := 'Descuento de capítulo';
   Result.Values[TIPO_DETALLE_SALTO] := 'Salto de página';
 end;
 
@@ -512,6 +539,21 @@ begin
   end;
 end;
 
+procedure TControllerDetallesBase.TratamientoDetalleDescuento(
+  DataTable: TDADataTable);
+begin
+  with DataTable do
+  begin
+    if not Editing then Edit;
+    if (FieldByName(CAMPO_CONCEPTO).AsString = CTE_DESC_SALTO) then
+       FieldByName(CAMPO_CONCEPTO).AsVariant := Null;
+    FieldByName(CAMPO_CANTIDAD).AsVariant := Null;
+    FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
+    FieldByName(CAMPO_IMPORTE_TOTAL).AsVariant := Null;
+    Post;
+  end;
+end;
+
 procedure TControllerDetallesBase.TratamientoDetalleSalto(DataTable: TDADataTable);
 begin
   with DataTable do
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index 261580f1..4e37775b 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -1,6 +1,6 @@
 inherited frViewDetallesBase: TfrViewDetallesBase
-  Width = 451
-  Height = 304
+  Width = 975
+  Height = 372
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 451
-    Height = 46
+    Width = 975
+    Height = 24
     AutoSize = True
     ButtonWidth = 63
     Caption = 'ToolBar1'
@@ -25,6 +25,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     TabOrder = 0
     Transparent = True
     Visible = False
+    ExplicitWidth = 451
+    ExplicitHeight = 46
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -54,17 +56,16 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Top = 0
       Action = FontEdit1
       AutoSize = True
-      Wrap = True
     end
     object FontName: TJvFontComboBox
-      Left = 0
-      Top = 22
+      Left = 274
+      Top = 0
       Width = 145
       Height = 22
       DroppedDownWidth = 145
       MaxMRUCount = 0
       FontName = 'Tahoma'
-      ItemIndex = 34
+      ItemIndex = 35
       Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
       Sorted = True
       TabOrder = 2
@@ -73,8 +74,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OnClick = FontNameChange
     end
     object FontSize: TEdit
-      Left = 145
-      Top = 22
+      Left = 419
+      Top = 0
       Width = 26
       Height = 22
       Hint = 'Font Size|Select font size'
@@ -84,8 +85,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OnChange = FontSizeChange
     end
     object UpDown1: TUpDown
-      Left = 171
-      Top = 22
+      Left = 445
+      Top = 0
       Width = 16
       Height = 22
       Associate = FontSize
@@ -93,67 +94,69 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Visible = False
     end
     object ToolButton13: TToolButton
-      Left = 187
-      Top = 22
+      Left = 461
+      Top = 0
       Width = 8
       Caption = 'ToolButton13'
       ImageIndex = 10
       Style = tbsSeparator
     end
     object ToolButton6: TToolButton
-      Left = 195
-      Top = 22
+      Left = 469
+      Top = 0
       Action = RichEditBold1
       AutoSize = True
     end
     object ToolButton7: TToolButton
-      Left = 229
-      Top = 22
+      Left = 503
+      Top = 0
       Action = RichEditItalic1
       AutoSize = True
     end
     object ToolButton8: TToolButton
-      Left = 263
-      Top = 22
+      Left = 537
+      Top = 0
       Action = RichEditUnderline1
       AutoSize = True
     end
     object ToolButton12: TToolButton
-      Left = 297
-      Top = 22
+      Left = 571
+      Top = 0
       Width = 8
       Caption = 'ToolButton12'
       ImageIndex = 10
       Style = tbsSeparator
     end
     object ToolButton9: TToolButton
-      Left = 305
-      Top = 22
+      Left = 579
+      Top = 0
       Action = RichEditAlignLeft1
       AutoSize = True
     end
     object ToolButton10: TToolButton
-      Left = 339
-      Top = 22
+      Left = 613
+      Top = 0
       Action = RichEditAlignCenter1
       AutoSize = True
     end
     object ToolButton11: TToolButton
-      Left = 373
-      Top = 22
+      Left = 647
+      Top = 0
       Action = RichEditAlignRight1
       AutoSize = True
     end
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 72
-    Width = 451
-    Height = 232
+    Top = 50
+    Width = 975
+    Height = 322
     Align = alClient
     TabOrder = 1
-    LookAndFeel.Kind = lfOffice11
+    LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
+    ExplicitLeft = 24
+    ExplicitTop = 74
     object cxGridView: TcxGridDBTableView
       NavigatorButtons.ConfirmDelete = False
       FilterBox.Visible = fvNever
@@ -185,6 +188,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OptionsCustomize.DataRowSizing = True
       OptionsData.Appending = True
       OptionsData.CancelOnExit = False
+      OptionsSelection.InvertSelect = False
       OptionsSelection.MultiSelect = True
       OptionsSelection.UnselectFocusedRecordOnExit = False
       OptionsView.CellEndEllipsis = True
@@ -194,35 +198,36 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OptionsView.GroupByBox = False
       OptionsView.HeaderEndEllipsis = True
       OptionsView.Indicator = True
-      OptionsView.NewItemRowInfoText = 'Click here to add a new row'
       Styles.ContentEven = cxStyleEven
       Styles.ContentOdd = cxStyleOdd
-      Styles.Inactive = cxStyleSelection
       Styles.Selection = cxStyleSelection
       Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle
       object cxGridViewID: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
         Visible = False
+        Width = 25
       end
       object cxGridViewPOSICION: TcxGridDBColumn
         DataBinding.FieldName = 'POSICION'
         Visible = False
         SortIndex = 0
         SortOrder = soAscending
+        Width = 25
       end
       object cxGridViewTIPO: TcxGridDBColumn
         Caption = 'Tipo'
         DataBinding.FieldName = 'TIPO_DETALLE'
         PropertiesClassName = 'TcxImageComboBoxProperties'
+        Properties.ImmediatePost = True
         Properties.Items = <>
         BestFitMaxWidth = 64
-        Width = 56
+        Width = 35
       end
       object cxGridViewDESCRIPCION: TcxGridDBColumn
         Caption = 'Concepto'
         DataBinding.FieldName = 'CONCEPTO'
         PropertiesClassName = 'TcxRichEditProperties'
-        Width = 224
+        Width = 317
       end
       object cxGridViewCANTIDAD: TcxGridDBColumn
         Caption = 'Cantidad'
@@ -231,7 +236,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         Properties.Alignment.Horz = taRightJustify
         BestFitMaxWidth = 64
         HeaderAlignmentHorz = taRightJustify
-        Width = 130
+        Width = 30
       end
       object cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
         Caption = 'Importe unidad'
@@ -241,7 +246,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         BestFitMaxWidth = 120
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
-        Width = 130
+        Width = 60
       end
       object cxGridViewIMPORTETOTAL: TcxGridDBColumn
         Caption = 'Importe total'
@@ -251,7 +256,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         BestFitMaxWidth = 120
         HeaderAlignmentHorz = taRightJustify
         Options.Editing = False
-        Width = 130
+        Width = 60
       end
       object cxGridViewVISIBLE: TcxGridDBColumn
         Caption = #191'Visible?'
@@ -298,6 +303,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         Visible = False
         FooterAlignmentHorz = taCenter
         HeaderAlignmentHorz = taCenter
+        Width = 25
       end
     end
     object cxGridLevel: TcxGridLevel
@@ -306,11 +312,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object TBXDock1: TTBXDock
     Left = 0
-    Top = 46
-    Width = 451
+    Top = 24
+    Width = 975
     Height = 26
     BackgroundOnToolbars = False
     UseParentBackground = True
+    ExplicitTop = 46
+    ExplicitWidth = 451
     object TBXToolbar1: TTBXToolbar
       Left = 0
       Top = 0
@@ -709,8 +717,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Color = cl3DLight
     end
     object cxStyle_TITULO: TcxStyle
-      AssignedValues = [svColor]
-      Color = clMenuBar
+      AssignedValues = [svColor, svFont]
+      Color = 7977877
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -15
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
     end
   end
 end
diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm
index 618d7d45..7584ea4d 100644
--- a/Source/GUIBase/uViewDetallesDTO.dfm
+++ b/Source/GUIBase/uViewDetallesDTO.dfm
@@ -1,6 +1,10 @@
 inherited frViewDetallesDTO: TfrViewDetallesDTO
+  Width = 927
+  Height = 304
   inherited ToolBar1: TToolBar
+    Width = 927
     ButtonWidth = 110
+    ExplicitHeight = 73
     inherited ToolButton1: TToolButton
       ExplicitWidth = 109
     end
@@ -9,20 +13,67 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
       ExplicitLeft = 109
       ExplicitWidth = 114
     end
-    inherited ToolButton3: TToolButton
+    inherited ToolButton4: TToolButton [2]
       Left = 223
       ExplicitLeft = 223
     end
-    inherited ToolButton4: TToolButton
-      Left = 278
-      ExplicitLeft = 278
+    inherited FontName: TJvFontComboBox [3]
+      Left = 279
+      ExplicitLeft = 279
     end
-    inherited ToolButton14: TToolButton
-      Left = 334
-      ExplicitLeft = 334
+    inherited ToolButton3: TToolButton [4]
+      Left = 424
+      ExplicitLeft = 424
+    end
+    inherited ToolButton8: TToolButton [5]
+      Left = 479
+      ExplicitLeft = 479
+    end
+    inherited ToolButton13: TToolButton [6]
+      Left = 513
+      ExplicitLeft = 513
+    end
+    inherited ToolButton6: TToolButton [7]
+      Left = 521
+      ExplicitLeft = 521
+    end
+    inherited ToolButton7: TToolButton [8]
+      Left = 555
+      ExplicitLeft = 555
+    end
+    inherited ToolButton12: TToolButton [9]
+      Left = 589
+      ExplicitLeft = 589
+    end
+    inherited ToolButton9: TToolButton [10]
+      Left = 597
+      ExplicitLeft = 597
+    end
+    inherited ToolButton10: TToolButton [11]
+      Left = 631
+      ExplicitLeft = 631
+    end
+    inherited ToolButton11: TToolButton [12]
+      Left = 665
+      ExplicitLeft = 665
+    end
+    inherited ToolButton14: TToolButton [13]
+      Left = 699
+      Enabled = True
+      ExplicitLeft = 699
+    end
+    inherited FontSize: TEdit [14]
+      Left = 733
+      ExplicitLeft = 733
+    end
+    inherited UpDown1: TUpDown [15]
+      Left = 759
+      ExplicitLeft = 759
     end
   end
   inherited cxGrid: TcxGrid
+    Width = 927
+    Height = 254
     inherited cxGridView: TcxGridDBTableView
       object cxGridViewDESCUENTO: TcxGridDBColumn [6]
         Caption = 'Dto'
@@ -31,6 +82,7 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
         Properties.DisplayFormat = ',0.00 %;-,0.00 %'
         Properties.EditFormat = ',0.00;-,0.00'
         Properties.MaxValue = 100.000000000000000000
+        Width = 30
       end
       object cxGridViewIMPORTENETO: TcxGridDBColumn [7]
         Caption = 'Importe neto'
@@ -56,6 +108,7 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
     end
   end
   inherited TBXDock1: TTBXDock
+    Width = 927
     inherited TBXToolbar1: TTBXToolbar
       ExplicitWidth = 447
     end
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
index a3f7fd72..33bcd8c2 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
@@ -64,7 +64,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
   inherited cxGrid: TcxGrid
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewTIPO: TcxGridDBColumn
-        Visible = False
         Width = 26
       end
       object cxGridViewID_ARTICULO: TcxGridDBColumn [3]