Primera subida de módulo nuevo de facturas proforma

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@198 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2

Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.bdsproj

@@ -0,0 +1,495 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+	<PersonalityInfo>
+		<Option>
+			<Option Name="Personality">Delphi.Personality</Option>
+			<Option Name="ProjectType"></Option>
+			<Option Name="Version">1.0</Option>
+			<Option Name="GUID">{E7D762A1-3A15-46B2-BD5B-3821D13B8347}</Option>
+		</Option>
+	</PersonalityInfo>
+	<Delphi.Personality>
+		<Source>
+			<Source Name="MainSource">FacturasCliente_plugin.dpk</Source>
+		</Source>
+		<FileVersion>
+			<FileVersion Name="Version">7.0</FileVersion>
+		</FileVersion>
+		<Compiler>
+			<Compiler Name="A">8</Compiler>
+			<Compiler Name="B">0</Compiler>
+			<Compiler Name="C">1</Compiler>
+			<Compiler Name="D">1</Compiler>
+			<Compiler Name="E">0</Compiler>
+			<Compiler Name="F">0</Compiler>
+			<Compiler Name="G">1</Compiler>
+			<Compiler Name="H">1</Compiler>
+			<Compiler Name="I">1</Compiler>
+			<Compiler Name="J">0</Compiler>
+			<Compiler Name="K">0</Compiler>
+			<Compiler Name="L">1</Compiler>
+			<Compiler Name="M">0</Compiler>
+			<Compiler Name="N">1</Compiler>
+			<Compiler Name="O">1</Compiler>
+			<Compiler Name="P">1</Compiler>
+			<Compiler Name="Q">0</Compiler>
+			<Compiler Name="R">0</Compiler>
+			<Compiler Name="S">0</Compiler>
+			<Compiler Name="T">0</Compiler>
+			<Compiler Name="U">0</Compiler>
+			<Compiler Name="V">1</Compiler>
+			<Compiler Name="W">0</Compiler>
+			<Compiler Name="X">1</Compiler>
+			<Compiler Name="Y">1</Compiler>
+			<Compiler Name="Z">1</Compiler>
+			<Compiler Name="ShowHints">True</Compiler>
+			<Compiler Name="ShowWarnings">True</Compiler>
+			<Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+			<Compiler Name="NamespacePrefix"></Compiler>
+			<Compiler Name="GenerateDocumentation">False</Compiler>
+			<Compiler Name="DefaultNamespace"></Compiler>
+			<Compiler Name="SymbolDeprecated">True</Compiler>
+			<Compiler Name="SymbolLibrary">True</Compiler>
+			<Compiler Name="SymbolPlatform">True</Compiler>
+			<Compiler Name="SymbolExperimental">True</Compiler>
+			<Compiler Name="UnitLibrary">True</Compiler>
+			<Compiler Name="UnitPlatform">True</Compiler>
+			<Compiler Name="UnitDeprecated">True</Compiler>
+			<Compiler Name="UnitExperimental">True</Compiler>
+			<Compiler Name="HResultCompat">True</Compiler>
+			<Compiler Name="HidingMember">True</Compiler>
+			<Compiler Name="HiddenVirtual">True</Compiler>
+			<Compiler Name="Garbage">True</Compiler>
+			<Compiler Name="BoundsError">True</Compiler>
+			<Compiler Name="ZeroNilCompat">True</Compiler>
+			<Compiler Name="StringConstTruncated">True</Compiler>
+			<Compiler Name="ForLoopVarVarPar">True</Compiler>
+			<Compiler Name="TypedConstVarPar">True</Compiler>
+			<Compiler Name="AsgToTypedConst">True</Compiler>
+			<Compiler Name="CaseLabelRange">True</Compiler>
+			<Compiler Name="ForVariable">True</Compiler>
+			<Compiler Name="ConstructingAbstract">True</Compiler>
+			<Compiler Name="ComparisonFalse">True</Compiler>
+			<Compiler Name="ComparisonTrue">True</Compiler>
+			<Compiler Name="ComparingSignedUnsigned">True</Compiler>
+			<Compiler Name="CombiningSignedUnsigned">True</Compiler>
+			<Compiler Name="UnsupportedConstruct">True</Compiler>
+			<Compiler Name="FileOpen">True</Compiler>
+			<Compiler Name="FileOpenUnitSrc">True</Compiler>
+			<Compiler Name="BadGlobalSymbol">True</Compiler>
+			<Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+			<Compiler Name="InvalidDirective">True</Compiler>
+			<Compiler Name="PackageNoLink">True</Compiler>
+			<Compiler Name="PackageThreadVar">True</Compiler>
+			<Compiler Name="ImplicitImport">True</Compiler>
+			<Compiler Name="HPPEMITIgnored">True</Compiler>
+			<Compiler Name="NoRetVal">True</Compiler>
+			<Compiler Name="UseBeforeDef">True</Compiler>
+			<Compiler Name="ForLoopVarUndef">True</Compiler>
+			<Compiler Name="UnitNameMismatch">True</Compiler>
+			<Compiler Name="NoCFGFileFound">True</Compiler>
+			<Compiler Name="ImplicitVariants">True</Compiler>
+			<Compiler Name="UnicodeToLocale">True</Compiler>
+			<Compiler Name="LocaleToUnicode">True</Compiler>
+			<Compiler Name="ImagebaseMultiple">True</Compiler>
+			<Compiler Name="SuspiciousTypecast">True</Compiler>
+			<Compiler Name="PrivatePropAccessor">True</Compiler>
+			<Compiler Name="UnsafeType">False</Compiler>
+			<Compiler Name="UnsafeCode">False</Compiler>
+			<Compiler Name="UnsafeCast">False</Compiler>
+			<Compiler Name="OptionTruncated">True</Compiler>
+			<Compiler Name="WideCharReduced">True</Compiler>
+			<Compiler Name="DuplicatesIgnored">True</Compiler>
+			<Compiler Name="UnitInitSeq">True</Compiler>
+			<Compiler Name="LocalPInvoke">True</Compiler>
+			<Compiler Name="MessageDirective">True</Compiler>
+			<Compiler Name="CodePage"></Compiler>
+		</Compiler>
+		<Linker>
+			<Linker Name="MapFile">3</Linker>
+			<Linker Name="OutputObjs">0</Linker>
+			<Linker Name="GenerateHpps">False</Linker>
+			<Linker Name="ConsoleApp">1</Linker>
+			<Linker Name="DebugInfo">False</Linker>
+			<Linker Name="RemoteSymbols">False</Linker>
+			<Linker Name="GenerateDRC">False</Linker>
+			<Linker Name="MinStackSize">16384</Linker>
+			<Linker Name="MaxStackSize">1048576</Linker>
+			<Linker Name="ImageBase">4194304</Linker>
+			<Linker Name="ExeDescription"></Linker>
+		</Linker>
+		<Directories>
+			<Directories Name="OutputDir"></Directories>
+			<Directories Name="UnitOutputDir">.\</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\..\..\Output\Debug\Cliente</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\Lib</Directories>
+			<Directories Name="SearchPath">..\..\..\Lib;..\..\Lib</Directories>
+			<Directories Name="Packages"></Directories>
+			<Directories Name="Conditionals"></Directories>
+			<Directories Name="DebugSourceDirs"></Directories>
+			<Directories Name="UsePackages">False</Directories>
+		</Directories>
+		<Parameters>
+			<Parameters Name="RunParams"></Parameters>
+			<Parameters Name="HostApplication"></Parameters>
+			<Parameters Name="Launcher"></Parameters>
+			<Parameters Name="UseLauncher">False</Parameters>
+			<Parameters Name="DebugCWD"></Parameters>
+			<Parameters Name="Debug Symbols Search Path"></Parameters>
+			<Parameters Name="LoadAllSymbols">True</Parameters>
+			<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+		</Parameters>
+		<Language>
+			<Language Name="ActiveLang"></Language>
+			<Language Name="ProjectLang">$00000000</Language>
+			<Language Name="RootDir"></Language>
+		</Language>
+		<VersionInfo>
+			<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+			<VersionInfo Name="AutoIncBuild">False</VersionInfo>
+			<VersionInfo Name="MajorVer">1</VersionInfo>
+			<VersionInfo Name="MinorVer">0</VersionInfo>
+			<VersionInfo Name="Release">0</VersionInfo>
+			<VersionInfo Name="Build">0</VersionInfo>
+			<VersionInfo Name="Debug">False</VersionInfo>
+			<VersionInfo Name="PreRelease">False</VersionInfo>
+			<VersionInfo Name="Special">False</VersionInfo>
+			<VersionInfo Name="Private">False</VersionInfo>
+			<VersionInfo Name="DLL">False</VersionInfo>
+			<VersionInfo Name="Locale">3082</VersionInfo>
+			<VersionInfo Name="CodePage">1252</VersionInfo>
+		</VersionInfo>
+		<VersionInfoKeys>
+			<VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+			<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+			<VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+			<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+			<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+			<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+			<VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+			<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
+		</VersionInfoKeys>  <Excluded_Packages>
+      <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
+      <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
+    </Excluded_Packages>
+  </Delphi.Personality>
+<!-- EurekaLog First Line
+[Exception Log]
+EurekaLog Version=519
+Activate=1
+Activate Handle=1
+Save Log File=1
+Foreground Tab=0
+Freeze Activate=0
+Freeze Timeout=0
+Freeze Message=The application seems to be frozen.
+SMTP From=eurekalog@email.com
+SMTP Host=
+SMTP Port=25
+SMTP UserID=
+SMTP Password=
+Append to Log=0
+Show TerminateBtn=1
+TerminateBtn Operation=1
+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=1
+AutoCrashNumber=10
+AutoCrashMinutes=1
+WebURL=
+WebUserID=
+WebPassword=
+WebPort=0
+AttachedFiles=
+Count=0
+EMail Message Line Count=0
+loNoDuplicateErrors=0
+loAppendReproduceText=0
+loDeleteLogAtVersionChange=0
+loAddComputerNameInLogFileName=0
+loSaveModulesSection=1
+loSaveCPUSection=1
+soAppStartDate=1
+soAppName=1
+soAppVersionNumber=1
+soAppParameters=1
+soAppCompilationDate=1
+soExcDate=1
+soExcAddress=1
+soExcModule=1
+soExcType=1
+soExcMessage=1
+soActCtlsFormClass=1
+soActCtlsFormText=1
+soActCtlsControlClass=1
+soActCtlsControlText=1
+soCmpName=1
+soCmpUser=1
+soCmpTotalMemory=1
+soCmpFreeMemory=1
+soCmpTotalDisk=1
+soCmpFreeDisk=1
+soCmpSysUpTime=1
+soCmpProcessor=1
+soCmpDisplayMode=1
+soOSType=1
+soOSBuildN=1
+soOSUpdate=1
+soOSLanguage=1
+soNetIP=1
+soNetSubmask=1
+soNetGateway=1
+soNetDNS1=1
+soNetDNS2=1
+soNetDHCP=1
+sndShowSendDialog=1
+sndShowSuccessFailureMsg=0
+sndSendEntireLog=0
+sndSendXMLLogCopy=0
+sndSendScreenshot=0
+sndUseOnlyActiveWindow=0
+sndSendLastHTMLPage=1
+sndSendInSeparatedThread=0
+sndAddDateInFileName=0
+sndCompressAllFiles=0
+edoShowExceptionDialog=1
+edoSendEmailChecked=1
+edoAttachScreenshotChecked=1
+edoShowCopyToClipOption=1
+edoShowDetailsButton=1
+edoShowInDetailedMode=0
+edoShowInTopMostMode=0
+edoUseEurekaLogLookAndFeel=1
+csoShowDLLs=1
+csoShowBPLs=1
+csoShowBorlandThreads=1
+csoShowWindowsThreads=1
+csoShowProcedureOffset=0
+boActivateCrashDetection=0
+boPauseBorlandThreads=0
+boDoNotPauseMainThread=0
+boPauseWindowsThreads=0
+boUseMainModuleOptions=1
+boCopyLogInCaseOfError=1
+boSaveCompressedCopyInCaseOfError=0
+Count mtInformationMsgCaption=1
+mtInformationMsgCaption0="Information."
+Count mtQuestionMsgCaption=1
+mtQuestionMsgCaption0="Question."
+Count mtDialog_Caption=1
+mtDialog_Caption0="Error."
+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_CPUCaption=1
+mtDialog_CPUCaption0="CPU"
+Count mtDialog_CPUHeader=1
+mtDialog_CPUHeader0="CPU Information"
+Count mtDialog_CustomDataCaption=1
+mtDialog_CustomDataCaption0="Other"
+Count mtDialog_CustomDataHeader=1
+mtDialog_CustomDataHeader0="Other 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_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 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_ExcHeader=1
+mtLog_ExcHeader0="Exception"
+Count mtLog_ExcDate=1
+mtLog_ExcDate0="Date"
+Count mtLog_ExcAddress=1
+mtLog_ExcAddress0="Address"
+Count mtLog_ExcModule=1
+mtLog_ExcModule0="Module"
+Count mtLog_ExcType=1
+mtLog_ExcType0="Type"
+Count mtLog_ExcMessage=1
+mtLog_ExcMessage0="Message"
+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_CmpUser=1
+mtLog_CmpUser0="User"
+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_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_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 mtSendDialog_Caption=1
+mtSendDialog_Caption0="Send."
+Count mtSendDialog_Message=1
+mtSendDialog_Message0="Message"
+Count mtSendDialog_Resolving=1
+mtSendDialog_Resolving0="Resolving DNS..."
+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 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 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."
+EurekaLog Last Line -->
+</BorlandProject>

Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.dproj

@@ -0,0 +1,556 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{e7d762a1-3a15-46b2-bd5b-3821d13b8347}</ProjectGuid>
+    <MainSource>FacturasCliente_plugin.dpk</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>..\..\..\..\Output\Debug\Cliente\FacturasCliente_plugin.bpl</DCC_DependencyCheckOutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_BplOutput>..\..\..\..\Output\Debug\Cliente</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\Lib</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\..\..\Lib;..\..\Lib</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
+    <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
+    <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
+    <DCC_Define>RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_BplOutput>..\..\..\..\Output\Debug\Cliente</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\Lib</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\..\..\Lib;..\..\Lib</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
+    <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
+    <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType>Package</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
+      <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
+    </Excluded_Packages><Source><Source Name="MainSource">FacturasCliente_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup>
+    <DelphiCompile Include="FacturasCliente_plugin.dpk">
+      <MainSource>MainSource</MainSource>
+    </DelphiCompile>
+    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_view.dcp" />
+    <DCCReference Include="uPluginFacturasCliente.pas">
+      <Form>PluginFacturasCliente</Form>
+    </DCCReference>
+  </ItemGroup>
+</Project>
+<!-- EurekaLog First Line
+[Exception Log]
+EurekaLog Version=6006
+Activate=1
+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=1
+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=1
+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=0
+sndUseOnlyActiveWindow=0
+sndSendLastHTMLPage=1
+sndSendInSeparatedThread=0
+sndAddDateInFileName=0
+sndAddComputerNameInFileName=0
+edoSendErrorReportChecked=1
+edoAttachScreenshotChecked=1
+edoShowCopyToClipOption=1
+edoShowDetailsButton=1
+edoShowInDetailedMode=0
+edoShowInTopMostMode=0
+edoUseEurekaLogLookAndFeel=1
+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."
+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/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.rc

@@ -0,0 +1,22 @@
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILEFLAGSMASK 0x3FL
+FILEFLAGS 0x00L
+FILEOS 0x40004L
+FILETYPE 0x1L
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+         BLOCK "0C0A04E4"
+         BEGIN
+              VALUE "FileVersion", "1.0.0.0\0"
+              VALUE "ProductVersion", "1.0.0.0\0"
+         END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+         VALUE "Translation", 0x0C0A, 1252
+    END
+END

Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.dfm

@@ -0,0 +1,131 @@
+object PluginFacturasCliente: TPluginFacturasCliente
+  OldCreateOrder = True
+  DefaultAction = actFacturasCliente
+  Description = 'Ventas'
+  ModuleMenu = MainMenu
+  ModuleName = 'Facturas de cliente'
+  SmallImages = SmallImages
+  LargeImages = LargeImages
+  Author = 'Rodax Software'
+  Version = '1.0.0'
+  Height = 252
+  Width = 401
+  object LargeImages: TPngImageList
+    Height = 24
+    Width = 24
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
+          F80000000970485973000017120000171201679FD252000001BE4944415478DA
+          63FCFFFF3F032D0123B2054BB79CA49A6DD13EE68C582D004A906CD8DFBFFF80
+          F83F980601EBC07C86733BA6E1B6C0B6683F8A0187FB1C711A8EAC765BB315C3
+          C275FB19E62DDD84DF02525CEE507A9081455D89E1C08C1D0CEF0FC6312CD978
+          90B005D87C802E06027B3BEC189C2B0E311CD97F0BCC7FB32F8661F996C394F9
+          E0FF3F605803F11FA0EB41EC3FFFFE41E3E01F98BD7ADB51D27D400C00F9E2F1
+          8E70860DBB4E106701CCDBA480075B431936EF3D459C05F8520E3600D2B3A850
+          8F61EB81D3C45B802BA86096C3E4616AE7E7EB32EC387486763E989DA3CDB0E7
+          E839DAF96046A626C3FE131768E783A969EA0C874E5FC26F4184A729387792E3
+          838929AA0CC7CE5EC16F41A89B09387792E3839E042586D317AFE3B720C8D988
+          C1ADFA08591674C62A309CBB7213BF057E8E060C5EB5C7F01A06B27CC1913F70
+          7E820D0BD882B62839868BD76FE3B7C0DB4E0F5EAEC0CA1850D9032BF393275F
+          C1881F18BF394296E1CACD3BF82DF0B0D6C16938884E9B760D6BF0116D818BA5
+          164EC3411667CDB88133E888B2C0DE541D6CD8BFBF88621966E1BFFFFFB1061F
+          322068818D912AB844A404E0B5A077CA428A0C8701980500619929EF09CFCE42
+          0000000049454E44AE426082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end>
+    Left = 232
+    Top = 16
+    Bitmap = {}
+  end
+  object ModuleActionList: TActionList
+    Images = LargeImages
+    Left = 40
+    Top = 72
+    object actFacturasCliente: TAction
+      Category = 'Ventas'
+      Caption = 'Facturas de cliente'
+      ImageIndex = 0
+      OnExecute = actFacturasClienteExecute
+    end
+  end
+  object MainMenu: TMainMenu
+    Images = LargeImages
+    Left = 40
+    Top = 16
+    object Ventas1: TMenuItem
+      Tag = 400
+      Caption = '&Ventas'
+      GroupIndex = 1
+      ImageIndex = 0
+      object Facturasdecliente1: TMenuItem
+        Tag = 301
+        Action = actFacturasCliente
+      end
+    end
+  end
+  object SmallImages: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD252000001684944415478DA
+          63FCFFFF3FC394C53BFE33900172623D1819610600394469FAF3F71FC3EF3F7F
+          19ACFDF319CEED98866A806DD17E14C587FB1CC134B2F8AE761B86B9ABF632CC
+          5BBA09D3007CE0D7EFBF609B4178C98683D80D40770136B0AED69461E59623B8
+          0D80391B04FE01E5FEFCF907B7D9B7FE04C3AA4A6386B53B8EE13700E692BD9D
+          760CCEE587E03607359F66585A6AC0B069CF49FC06A0DB0CC2207E58FB598685
+          85BA0CDB0E9CC16DC0C15E0706FBE203605B37375A809D0D02209BA3BB2F30CC
+          C9D566D87DE41C6E0340CE46B7F9E7AF3F6076D2C42B0C53D2D4180E9FBE8C69
+          4046941B8363E94194105F5E6EC810D9791ECC9E99A5C9903EED3A437F920AC3
+          89F357310D480E7386DB08A2435ACF302C2ED687B8049A067266DD62E88A5364
+          387BF906A60171410E280107B3191DB446C9315CBA7E1BD380283F3B147F23DB
+          FC1BC9E07FFFFE335CB97907D380502F6B86D5DB8E129D13310C0009900A4006
+          00004B6D80F047EC10D30000000049454E44AE426082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end>
+    PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
+    Left = 308
+    Top = 16
+    Bitmap = {}
+  end
+  object ExtraImages: TPngImageList
+    Height = 28
+    Width = 28
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
+          940000000970485973000017120000171201679FD252000002834944415478DA
+          BDD6ED4F52511800F087ECDFA8B5D6CB2A8550FC525862BC28B56966F9B2D658
+          5B7373D69ABDACF5A12FADD6875EB6968DD922299C1481888680C0E555485494
+          20B2FADCFAD6565FE53EDD7B0B86099C6BD7F970D9E53CDC7B7EE73907388810
+          11363344C5A023F0916BB0B9FC73559B7970C7DFD7DCFBDC8150B5A5AA24705A
+          23159505C7A90CB62A0EFCF7E869A62F9A46C8E568C8D134C8DB2EC382EB6979
+          D0EE4F635B5335340C506B3A0B3F549485FEBDDE7DF730182C7E308C38F881EB
+          0D1654CBF680FFD70A04F42EF819D181D14691C131DF073C79ACA66C85A5F2C1
+          078D70F44A0022D4E742EE47E81C98EC413268F3A6B05D29E65D19BB4EB91C72
+          E7E2B56373E6C93019B47A97F0945252B212BEC156FADDDB031667940738CD80
+          AA3F60F114AD37BE79BAC1EA9A21836F3D8BD8A13EC881953E959582BD77F4BA
+          14ECD3713268712791F9A20A064D572530E19B25836FDC0B7846535B002BAD65
+          7E40C5D7E4EF310E88C14925C8E06BD73C7636D709AEF0F9A56AF084E7798053
+          0CD8221C1CEADF0FBE68920C9AA7E6B0AB4526784AF57DFB808A2D92C1516702
+          BBB5F5822B1CECDD0BA1D9140FF05D023BB532EEA74A08F8F8C26E88CEA5C9E0
+          C8E47B660DEB41712D28684A1F9DDF05F164861FD8A1AE03E58DB0A00AEFEB76
+          4262294B064D13716C57D582E666541078EFEC0E486696C9E02B470C5B9BA470
+          FC568C57E7ECA086232B85B64EBE9503EFF46C8754F60B3FF044A3A4F49643AF
+          FEFBD03B985DB3CEF9F6EDAE6D905EFE4A065F8ECFA0F6888488B103EAD37F2A
+          39EDEB028DF62836378889187BBE38547EFBE20D0E8F4550231713B172B9E2E0
+          05BEB0855175A886DBCB362288A0C11AC227CFCC1B82E5A322B819F11BFB7D9A
+          E74CD9D0710000000049454E44AE426082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end>
+    Left = 232
+    Top = 80
+    Bitmap = {}
+  end
+end

Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.pas

@@ -0,0 +1,97 @@
+unit uPluginFacturasCliente;
+
+interface
+
+uses
+  uModuleController, uInterfaces, uHostManager, Menus, Classes, ActnList,
+  ImgList, Controls, PngImageList, uPlugins_Intf;
+
+type
+  TPluginFacturasCliente = class(TModuleController, IMCFacturasCliente)
+    actFacturasCliente: TAction;
+    ExtraImages: TPngImageList;
+    LargeImages: TPngImageList;
+    MainMenu: TMainMenu;
+    ModuleActionList: TActionList;
+    SmallImages: TPngImageList;
+    Ventas1: TMenuItem;
+    Facturasdecliente1: TMenuItem;
+    procedure actFacturasClienteExecute(Sender: TObject);
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure VerFacturas(const ID_Cliente: Integer;
+      const ANombreCliente : String = '');    
+  end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  Forms, Dialogs, SysUtils, cxControls,
+  uFacturasClienteController, uBizFacturasCliente, uFacturasClienteViewRegister;
+
+function GetModule : TModuleController;
+begin
+  Result := TPluginFacturasCliente.Create(NIL);
+end;
+
+exports
+  GetModule name GET_MODULE_FUNC;
+
+procedure TPluginFacturasCliente.actFacturasClienteExecute(Sender: TObject);
+var
+  AFacturasClienteController : IFacturasClienteController;
+  AFacturasCliente : IBizFacturaCliente;
+
+begin
+  AFacturasClienteController := TFacturasClienteController.Create;
+  AFacturasCliente := (AFacturasClienteController.BuscarTodos as IBizFacturaCliente);
+  AFacturasClienteController.VerTodos(AFacturasCliente);
+end;
+
+constructor TPluginFacturasCliente.Create(AOwner: TComponent);
+begin
+  inherited;
+  ModuleName := MODULENAME_FACTURAS_CLIENTE;
+  uFacturasClienteViewRegister.RegisterViews;
+end;
+
+destructor TPluginFacturasCliente.Destroy;
+begin
+  uFacturasClienteViewRegister.UnregisterViews;
+  inherited;
+end;
+
+procedure TPluginFacturasCliente.VerFacturas(const ID_Cliente: Integer;
+  const ANombreCliente: String);
+var
+  AFacturasClienteController : IFacturasClienteController;
+  AFacturasCliente : IBizFacturaCliente;
+  AText : String;
+begin
+  AText := Format('Lista de facturas del cliente %s', [ANombreCliente]);
+  AFacturasClienteController := TFacturasClienteController.Create;
+  try
+    ShowHourglassCursor;
+    try
+      AFacturasCliente := AFacturasClienteController.BuscarTodos(ID_Cliente);      
+    finally
+      HideHourglassCursor;
+    end;
+    AFacturasClienteController.VerTodos(AFacturasCliente, True, AText);
+  finally
+    AFacturasCliente := NIL;
+    AFacturasClienteController := NIL;
+  end;
+end;
+
+
+initialization
+  RegisterModuleClass(TPluginFacturasCliente);
+
+finalization
+  UnRegisterModuleClass(TPluginFacturasCliente);
+
+end.

Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dpk

@@ -38,7 +38,35 @@ requires
   dxCoreD11,
   vclx,
   FacturasProforma_model,
-  FacturasProforma_controller;
+  FacturasProforma_controller,
+  dbrtl,
+  PNG_D10,
+  PngComponentsD10,
+  vclactnband,
+  tb2k_d10,
+  tbx_d10,
+  JSDialog100,
+  xmlrtl,
+  designide,
+  cxGridD11,
+  cxPageControlD11,
+  cxExtEditorsD11,
+  cxDataD11,
+  cxEditorsD11,
+  vcljpg,
+  vcldb,
+  cxExportD11,
+  DataAbstract_Core_D11,
+  dsnap,
+  adortl,
+  RemObjects_Core_D11,
+  GUISDK_D11R,
+  JvStdCtrlsD11R,
+  JclVcl,
+  Jcl,
+  JvCoreD11R,
+  JvSystemD11R,
+  JvPageCompsD11R;
 
 contains
   uFacturasProformaViewRegister in 'uFacturasProformaViewRegister.pas',
@@ -50,9 +78,9 @@ contains
   uEditorFacturasProformaReport in 'uEditorFacturasProformaReport.pas' {fEditorFacturasProformaPreview},
   uEditorElegirArticulosFacturaProforma in 'uEditorElegirArticulosFacturaProforma.pas' {fEditorElegirArticulosFacturaProforma: TForm},
   uViewElegirArticulosFacturasProforma in 'uViewElegirArticulosFacturasProforma.pas' {frViewElegirArticulosFacturasProforma: TFrame},
-  uEditorElegirFacturasCliente in 'uEditorElegirFacturasCliente.pas' {fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente},
   uViewDatosYSeleccionClienteFacturaProforma in 'uViewDatosYSeleccionClienteFacturaProforma.pas' {frViewDatosYSeleccionClienteFacturaProforma: TFrame},
   uDialogOpcionesImpresionFacturasProforma in 'uDialogOpcionesImpresionFacturasProforma.pas' {fDialogOpcionesImpresionFacturasProforma: TfEditorElegirFacturasCliente},
-  uDialogListaFacturasProformaEnvioEMail in 'uDialogListaFacturasProformaEnvioEMail.pas' {fDialogListaFacturasProformaEnvioEMail: TForm};
+  uDialogListaFacturasProformaEnvioEMail in 'uDialogListaFacturasProformaEnvioEMail.pas' {fDialogListaFacturasProformaEnvioEMail: TForm},
+  uEditorElegirFacturasProforma in 'uEditorElegirFacturasProforma.pas' {fEditorElegirFacturasProforma: TForm};
 
 end.

Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dproj

@@ -49,18 +49,42 @@
     <DelphiCompile Include="FacturasProforma_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="adortl.dcp" />
     <DCCReference Include="ApplicationBase.dcp" />
     <DCCReference Include="Articulos_view.dcp" />
     <DCCReference Include="Base.dcp" />
     <DCCReference Include="Contactos_view.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="cxExportD11.dcp" />
+    <DCCReference Include="cxExtEditorsD11.dcp" />
+    <DCCReference Include="cxGridD11.dcp" />
     <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="cxPageControlD11.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="dsnap.dcp" />
     <DCCReference Include="dxCoreD11.dcp" />
     <DCCReference Include="dxGDIPlusD11.dcp" />
     <DCCReference Include="dxThemeD11.dcp" />
     <DCCReference Include="FacturasProforma_controller.dcp" />
     <DCCReference Include="FacturasProforma_model.dcp" />
     <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="GUISDK_D11R.dcp" />
+    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="JSDialog100.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
+    <DCCReference Include="JvPageCompsD11R.dcp" />
+    <DCCReference Include="JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="JvSystemD11R.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="uDialogListaFacturasProformaEnvioEMail.pas">
       <Form>fDialogListaFacturasProformaEnvioEMail</Form>
       <DesignClass>TForm</DesignClass>
@@ -73,9 +97,9 @@
       <Form>fEditorElegirArticulosFacturaProforma</Form>
       <DesignClass>TForm</DesignClass>
     </DCCReference>
-    <DCCReference Include="uEditorElegirFacturasCliente.pas">
+    <DCCReference Include="uEditorElegirFacturasProforma.pas">
-      <Form>fEditorElegirFacturasCliente</Form>
+      <Form>fEditorElegirFacturasProformal</Form>
-      <DesignClass>TfEditorElegirFacturasCliente</DesignClass>
+      <DesignClass>TForm</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorFacturaProforma.pas">
       <Form>fEditorFacturaProforma</Form>
@@ -110,7 +134,11 @@
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
     <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Facturas proforma/Views/uDialogListaFacturasProformaEnvioEMail.dfm

@@ -36,13 +36,13 @@ inherited fDialogListaFacturasProformaEnvioEMail: TfDialogListaFacturasProformaE
     Width = 665
     ExplicitWidth = 665
     inherited lblInstruccion: TLabel
-      Width = 615
+      Width = 213
       Caption = 'Enviar facturas por correo electr'#243'nico'
       ExplicitWidth = 213
     end
     inherited Label2: TLabel
-      Width = 590
+      Width = 562
-      Height = 27
+      Height = 26
       Caption = 
         'Se generar'#225'n correos electr'#243'nicos autom'#225'ticos adjuntando las fac' +
         'turas elegidas en formato PDF. S'#243'lo se tendr'#225'n en cuenta los cli' +

Source/Modulos/Facturas proforma/Views/uDialogListaFacturasProformaEnvioEMail.pas

@@ -5,32 +5,32 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls, ComCtrls,
-  uDialogListaEnvioEMail, uIDialogListaFacturasEnvioEMail, uFacturasClienteController,
+  uDialogListaEnvioEMail, uIDialogListaFacturasProformaEnvioEMail, uFacturasProformaController,
-  uBizFacturasCliente;
+  uBizFacturasProforma;
 
 type
-  TfDialogListaFacturasProformaEnvioEMail = class(TfDialogListaEnvioEMail, IDialogListaFacturasEnvioEMail)
+  TfDialogListaFacturasProformaEnvioEMail = class(TfDialogListaEnvioEMail, IDialogListaFacturasProformaEnvioEMail)
     procedure actCancelarExecute(Sender: TObject);
     procedure actAceptarUpdate(Sender: TObject);
     procedure actAceptarExecute(Sender: TObject);
   private
-    FFacturas : IBizFacturaCliente;
+    FFacturas : IBizFacturaProforma;
-    FController : IFacturasClienteController;
+    FController : IFacturasProformaController;
   protected
-    function GetFacturas: IBizFacturaCliente;
+    function GetFacturas: IBizFacturaProforma;
-    procedure SetFacturas(const Value: IBizFacturaCliente);
+    procedure SetFacturas(const Value: IBizFacturaProforma);
 
     procedure RellenarLista;
     procedure BorrarLista;
   public
     constructor Create(AOwner: TComponent); override;
-    property Facturas: IBizFacturaCliente read GetFacturas write SetFacturas;
+    property Facturas: IBizFacturaProforma read GetFacturas write SetFacturas;
   end;
 
 implementation
 
 uses
-  schFacturasClienteClient_Intf, uStringsUtils, cxControls;
+  schFacturasProformaClient_Intf, uStringsUtils, cxControls;
 
 {$R *.dfm}
 
@@ -99,10 +99,10 @@ constructor TfDialogListaFacturasProformaEnvioEMail.Create(AOwner: TComponent);
 begin
   inherited;
   ModalResult := mrCancel;
-  FController := TFacturasClienteController.Create;
+  FController := TFacturasProformaController.Create;
 end;
 
-function TfDialogListaFacturasProformaEnvioEMail.GetFacturas: IBizFacturaCliente;
+function TfDialogListaFacturasProformaEnvioEMail.GetFacturas: IBizFacturaProforma;
 begin
   Result := FFacturas;
 end;
@@ -142,7 +142,7 @@ begin
 end;
 
 procedure TfDialogListaFacturasProformaEnvioEMail.SetFacturas(
-  const Value: IBizFacturaCliente);
+  const Value: IBizFacturaProforma);
 begin
   FFacturas := Value;
 

Source/Modulos/Facturas proforma/Views/uDialogOpcionesImpresionFacturasProforma.dfm

@@ -34,15 +34,13 @@ inherited fDialogOpcionesImpresionFacturasProforma: TfDialogOpcionesImpresionFac
     Width = 418
     ExplicitWidth = 418
     inherited lblInstruccion: TLabel
-      Width = 368
+      Width = 317
       Margins.Bottom = 10
       Caption = 'Indique las siguiente opciones para la factura de cliente:'
       ExplicitWidth = 317
     end
     inherited Label2: TLabel
       Top = 31
-      Width = 343
-      Height = 25
       Visible = False
       ExplicitTop = 31
     end

Source/Modulos/Facturas proforma/Views/uDialogOpcionesImpresionFacturasProforma.pas

@@ -18,17 +18,17 @@ type
     { Public declarations }
   end;
 
-  function ElegirOpcionesImpresionFacturaCliente(var AVerSello : Boolean; var AVerCopia : Boolean): Boolean;
+  function ElegirOpcionesImpresionFacturaProforma(var AVerSello : Boolean; var AVerCopia : Boolean): Boolean;
 
 implementation
 
 {$R *.dfm}
 
-function ElegirOpcionesImpresionFacturaCliente(var AVerSello : Boolean; var AVerCopia : Boolean): Boolean;
+function ElegirOpcionesImpresionFacturaProforma(var AVerSello : Boolean; var AVerCopia : Boolean): Boolean;
 var
-  AEditor : TfDialogOpcionesImpresionFacturasCliente;
+  AEditor : TfDialogOpcionesImpresionFacturasProforma;
 begin
-  AEditor := TfDialogOpcionesImpresionFacturasCliente.Create(NIL);
+  AEditor := TfDialogOpcionesImpresionFacturasProforma.Create(NIL);
   try
     AEditor.cbVerSello.Checked := AVerSello;
     AEditor.cbVerCopia.Checked := AVerCopia;

Source/Modulos/Facturas proforma/Views/uEditorElegirArticulosFacturaCliente.dfm

@@ -1,15 +0,0 @@
-inherited fEditorElegirArticulosFacturaCliente: TfEditorElegirArticulosFacturaCliente
-  Caption = 'fEditorElegirArticulosFacturaCliente'
-  ExplicitHeight = 538
-  PixelsPerInch = 96
-  TextHeight = 13
-  inherited pnlHeader: TPanel
-    inherited lblTitle: TLabel
-      Width = 606
-    end
-    inherited lblComments: TLabel
-      Width = 581
-      Height = 24
-    end
-  end
-end

Source/Modulos/Facturas proforma/Views/uEditorElegirArticulosFacturaCliente.pas

@@ -1,35 +0,0 @@
-unit uEditorElegirArticulosFacturaCliente;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, uEditorElegirArticulos, Menus, DB, uDADataTable, JvAppStorage,
-  JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList,
-  StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
-  JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
-  TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  uIEditorElegirArticulosFacturasCliente, uDAInterfaces,
-  uViewGridBase, uViewGrid, uViewArticulos, StdCtrls;
-
-type
-  TfEditorElegirArticulosFacturaCliente = class(TfEditorElegirArticulos, IEditorElegirArticulosFacturasCliente)
-  public
-    constructor Create(AOwner: TComponent); override;
-  end;
-
-
-implementation
-{$R *.dfm}
-
-uses uViewElegirArticulosFacturasCliente;
-
-{ TfEditorElegirArticulosFacturaCliente }
-
-constructor TfEditorElegirArticulosFacturaCliente.Create(AOwner: TComponent);
-begin
-  inherited;
-  ViewGrid := CreateView(TfrViewElegirArticulosFacturasCliente) as IViewElegirArticulosFacturasCliente;
-end;
-
-end.

Source/Modulos/Facturas proforma/Views/uEditorElegirArticulosFacturaProforma.dfm

@@ -1,15 +1,7 @@
 inherited fEditorElegirArticulosFacturaProforma: TfEditorElegirArticulosFacturaProforma
   Caption = 'fEditorElegirArticulosFacturaProforma'
+  ExplicitWidth = 320
   ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
-  inherited pnlHeader: TPanel
-    inherited lblTitle: TLabel
-      Width = 606
-    end
-    inherited lblComments: TLabel
-      Width = 581
-      Height = 24
-    end
-  end
 end

Source/Modulos/Facturas proforma/Views/uEditorElegirArticulosFacturaProforma.pas

@@ -9,11 +9,11 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  uIEditorElegirArticulosFacturasCliente, uDAInterfaces,
+  uIEditorElegirArticulosFacturasProforma, uDAInterfaces,
   uViewGridBase, uViewGrid, uViewArticulos, StdCtrls;
 
 type
-  TfEditorElegirArticulosFacturaProforma = class(TfEditorElegirArticulos, IEditorElegirArticulosFacturasCliente)
+  TfEditorElegirArticulosFacturaProforma = class(TfEditorElegirArticulos, IEditorElegirArticulosFacturasProforma)
   public
     constructor Create(AOwner: TComponent); override;
   end;
@@ -22,14 +22,14 @@ type
 implementation
 {$R *.dfm}
 
-uses uViewElegirArticulosFacturasCliente;
+uses uViewElegirArticulosFacturasProforma;
 
-{ TfEditorElegirArticulosFacturaCliente }
+{ TfEditorElegirArticulosFacturaProforma }
 
 constructor TfEditorElegirArticulosFacturaProforma.Create(AOwner: TComponent);
 begin
   inherited;
-  ViewGrid := CreateView(TfrViewElegirArticulosFacturasCliente) as IViewElegirArticulosFacturasCliente;
+  ViewGrid := CreateView(TfrViewElegirArticulosFacturasProforma) as IViewElegirArticulosFacturasProforma;
 end;
 
 end.

Source/Modulos/Facturas proforma/Views/uEditorElegirFacturasProforma.dfm

@@ -1,4 +1,4 @@
-inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
+inherited fEditorElegirFacturasProforma: TfEditorElegirFacturasProforma
   Caption = 'Seleccionar facturas de cliente'
   ClientWidth = 654
   ExplicitWidth = 662
@@ -9,8 +9,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
     Width = 654
     Caption = 'Lista de facturas de cliente para liquidar su comisi'#243'n'
     Visible = False
-    ExplicitLeft = -8
+    ExplicitTop = 113
-    ExplicitTop = 169
     ExplicitWidth = 654
     inherited Image1: TImage
       Left = 627
@@ -174,38 +173,40 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
       ExplicitHeight = 13
     end
   end
-  inherited frViewFacturasCliente1: TfrViewFacturasCliente [5]
+  inherited frViewFacturasProforma1: TfrViewFacturasProforma [5]
     Top = 140
     Width = 654
     Height = 471
-    ExplicitTop = 163
+    ExplicitTop = 140
     ExplicitWidth = 654
-    ExplicitHeight = 448
+    ExplicitHeight = 471
     inherited cxGrid: TcxGrid
       Width = 654
       Height = 343
       RootLevelOptions.DetailTabsPosition = dtpNone
       ExplicitWidth = 654
-      ExplicitHeight = 320
+      ExplicitHeight = 343
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
             Format = ',0.00 '#8364';-,0.00 '#8364
             Kind = skSum
             Position = spFooter
-            Column = frViewFacturasCliente1.cxGridViewIMPORTE_IVA
+            Column = frViewFacturasProforma1.cxGridViewIMPORTE_IVA
           end>
         DataController.Summary.FooterSummaryItems = <
           item
             Format = ',0.00 '#8364';-,0.00 '#8364
             Kind = skSum
-            Column = frViewFacturasCliente1.cxGridViewIMPORTE_IVA
+            Column = frViewFacturasProforma1.cxGridViewIMPORTE_IVA
           end
           item
             Format = '0 facturas'
             Kind = skCount
-            Column = frViewFacturasCliente1.cxGridViewTIPO
           end>
+        inherited cxGridViewNUM_COPIAS: TcxGridDBColumn
+          IsCaptionAssigned = True
+        end
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -266,7 +267,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
       Top = 445
-      ExplicitTop = 422
+      ExplicitTop = 445
       ExplicitWidth = 654
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 654
@@ -285,7 +286,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
     inherited cxViewGridPopupMenu: TcxGridPopupMenu
       PopupMenus = <
         item
-          GridView = frViewFacturasCliente1.cxGridView
+          GridView = frViewFacturasProforma1.cxGridView
           HitTypes = [gvhtCell]
           Index = 0
         end>

Source/Modulos/Facturas proforma/Views/uEditorElegirFacturasProforma.pas

@@ -21,7 +21,7 @@
 ===============================================================================
 }
 
-unit uEditorElegirFacturasCliente;
+unit uEditorElegirFacturasProforma;
 
 interface
 
@@ -35,13 +35,13 @@ uses
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
   JvNavigationPane, uViewBarraSeleccion, StdCtrls,
 
-  uViewFacturasCliente, uEditorFacturasCliente, uBizFacturasCliente, uIEditorElegirFacturasCliente,
+  uViewFacturasProforma, uEditorFacturasProforma, uBizFacturasProforma, uIEditorElegirFacturasProforma,
   Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls,
   cxContainer, cxEdit, cxTextEdit, TBXDkPanels, JSDialog, uDAInterfaces;
 
 
 type
-  TfEditorElegirFacturasCliente = class(TfEditorFacturasCliente, IEditorElegirFacturasCliente)
+  TfEditorElegirFacturasProforma = class(TfEditorFacturasProforma, IEditorElegirFacturasProforma)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
     lblTitle: TLabel;
     lblComments: TLabel;
@@ -58,13 +58,13 @@ type
   protected
     procedure SetMultiSelect (AValue : Boolean);
     function GetMultiSelect : Boolean;
-    function GetFacturasClienteSeleccionados: IBizFacturaCliente;
+    function GetFacturasProformaSeleccionados: IBizFacturaProforma;
     procedure SetViewGrid(const Value: IViewGridBase); override;
     procedure SetMensaje (const AValue: String);
     function GetMensaje: String;
   public
     property Mensaje : String read GetMensaje write SetMensaje;
-    property FacturasClienteSeleccionados: IBizFacturaCliente read GetFacturasClienteSeleccionados;
+    property FacturasProformaSeleccionados: IBizFacturaProforma read GetFacturasProformaSeleccionados;
     property MultiSelect : Boolean read GetMultiSelect write SetMultiSelect;
   end;
 
@@ -72,76 +72,76 @@ implementation
 
 uses
   uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils,
-  uGridStatusUtils, uDialogUtils, uEditorBase, uFacturasClienteController, uDateUtils;
+  uGridStatusUtils, uDialogUtils, uEditorBase, uFacturasProformaController, uDateUtils;
 
 {$R *.dfm}
 
-{ TfEditorElegirFacturasCliente }
+{ TfEditorElegirFacturasProforma }
 
-procedure TfEditorElegirFacturasCliente.actAnchoAuto2Execute(Sender: TObject);
+procedure TfEditorElegirFacturasProforma.actAnchoAuto2Execute(Sender: TObject);
 begin
   inherited;
   actAnchoAuto.Execute;
 end;
 
-procedure TfEditorElegirFacturasCliente.FormShow(Sender: TObject);
+procedure TfEditorElegirFacturasProforma.FormShow(Sender: TObject);
 begin
   inherited;
   EditorActionList.State := asSuspended;
 
-  frViewFacturasCliente1.frViewFiltroBase1.edtFechaIniFiltro.EditValue := darFechaPrimerDia(now);
+  frViewFacturasProforma1.frViewFiltroBase1.edtFechaIniFiltro.EditValue := darFechaPrimerDia(now);
-  frViewFacturasCliente1.frViewFiltroBase1.edtFechaFinFiltro.EditValue := darFechaUltimoDia(now);
+  frViewFacturasProforma1.frViewFiltroBase1.edtFechaFinFiltro.EditValue := darFechaUltimoDia(now);
 end;
 
-procedure TfEditorElegirFacturasCliente.frViewBarraSeleccion1actCancelarExecute(
+procedure TfEditorElegirFacturasProforma.frViewBarraSeleccion1actCancelarExecute(
   Sender: TObject);
 begin
   inherited;
   Close;
 end;
 
-procedure TfEditorElegirFacturasCliente.frViewBarraSeleccion1actSeleccionarExecute(
+procedure TfEditorElegirFacturasProforma.frViewBarraSeleccion1actSeleccionarExecute(
   Sender: TObject);
 begin
   inherited;
   ModalResult := mrOk;
 end;
 
-procedure TfEditorElegirFacturasCliente.frViewBarraSeleccion1actSeleccionarUpdate(
+procedure TfEditorElegirFacturasProforma.frViewBarraSeleccion1actSeleccionarUpdate(
   Sender: TObject);
 begin
   inherited;
   (Sender as TAction).Enabled := (ViewGrid._FocusedView.Controller.SelectedRowCount > 0)
 end;
 
-function TfEditorElegirFacturasCliente.GetFacturasClienteSeleccionados: IBizFacturaCliente;
+function TfEditorElegirFacturasProforma.GetFacturasProformaSeleccionados: IBizFacturaProforma;
 begin
   SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
   // En SelectedRecords tengo los ID de las filas seleccionadas del grid
-  Result := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
+  Result := (Controller as IFacturasProformaController).ExtraerSeleccionados(Facturas) as IBizFacturaProforma;
 end;
 
-function TfEditorElegirFacturasCliente.GetMensaje: String;
+function TfEditorElegirFacturasProforma.GetMensaje: String;
 begin
   Result := lblComments.Caption;
 end;
 
-function TfEditorElegirFacturasCliente.GetMultiSelect: Boolean;
+function TfEditorElegirFacturasProforma.GetMultiSelect: Boolean;
 begin
   Result := ViewGrid.MultiSelect;
 end;
 
-procedure TfEditorElegirFacturasCliente.SetMensaje(const AValue: String);
+procedure TfEditorElegirFacturasProforma.SetMensaje(const AValue: String);
 begin
   lblComments.Caption := AValue;
 end;
 
-procedure TfEditorElegirFacturasCliente.SetMultiSelect(AValue: Boolean);
+procedure TfEditorElegirFacturasProforma.SetMultiSelect(AValue: Boolean);
 begin
   ViewGrid.MultiSelect := AValue;
 end;
 
-procedure TfEditorElegirFacturasCliente.SetViewGrid(const Value: IViewGridBase);
+procedure TfEditorElegirFacturasProforma.SetViewGrid(const Value: IViewGridBase);
 begin
   inherited;
   ViewGrid.OnDblClick := frViewBarraSeleccion1.actSeleccionar.OnExecute;

Source/Modulos/Facturas proforma/Views/uEditorFacturaProforma.dfm

@@ -241,6 +241,10 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewDetallesFacturaProforma1: TfrViewDetallesFacturaProforma
         Left = 0
         Top = 0
@@ -261,106 +265,103 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
         ExplicitHeight = 290
         inherited ToolBar1: TToolBar
           Width = 809
-          Height = 51
+          Height = 46
           ExplicitWidth = 809
-          ExplicitHeight = 51
+          ExplicitHeight = 46
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
+            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
-            Left = 334
+            Left = 0
-            Top = 0
             Wrap = False
-            ExplicitLeft = 334
+            ExplicitLeft = 0
-            ExplicitTop = 0
           end
           inherited FontName: TJvFontComboBox
-            Left = 399
+            Left = 65
-            Top = 0
+            Top = 22
-            ExplicitLeft = 399
+            ExplicitLeft = 65
-            ExplicitTop = 0
+            ExplicitTop = 22
           end
           inherited FontSize: TEdit
-            Left = 544
+            Left = 210
-            Top = 0
+            Top = 22
             Width = 58
-            ExplicitLeft = 544
+            ExplicitLeft = 210
-            ExplicitTop = 0
+            ExplicitTop = 22
             ExplicitWidth = 58
           end
           inherited UpDown1: TUpDown
-            Left = 602
+            Left = 268
-            Top = 0
+            Top = 22
-            ExplicitLeft = 602
+            ExplicitLeft = 268
-            ExplicitTop = 0
+            ExplicitTop = 22
           end
           inherited ToolButton13: TToolButton
-            Left = 0
+            Left = 285
-            Top = 0
+            Top = 22
-            Wrap = True
+            ExplicitLeft = 285
-            ExplicitLeft = 0
+            ExplicitTop = 22
-            ExplicitTop = 0
-            ExplicitHeight = 27
           end
           inherited ToolButton6: TToolButton
-            Left = 0
+            Left = 293
-            Top = 27
+            Top = 22
-            ExplicitLeft = 0
+            ExplicitLeft = 293
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton7: TToolButton
-            Left = 66
+            Left = 359
-            Top = 27
+            Top = 22
-            ExplicitLeft = 66
+            ExplicitLeft = 359
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton8: TToolButton
-            Left = 133
+            Left = 426
-            Top = 27
+            Top = 22
-            ExplicitLeft = 133
+            ExplicitLeft = 426
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton12: TToolButton
-            Left = 216
+            Left = 509
-            Top = 27
+            Top = 22
-            ExplicitLeft = 216
+            ExplicitLeft = 509
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton9: TToolButton
-            Left = 224
+            Left = 517
-            Top = 27
+            Top = 22
-            ExplicitLeft = 224
+            ExplicitLeft = 517
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton10: TToolButton
-            Left = 369
+            Left = 662
-            Top = 27
+            Top = 22
-            ExplicitLeft = 369
+            ExplicitLeft = 662
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton11: TToolButton
-            Left = 494
+            Left = 787
-            Top = 27
+            Top = 22
-            ExplicitLeft = 494
+            ExplicitLeft = 787
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 77
+          Top = 72
           Width = 809
-          Height = 213
+          Height = 218
           ExplicitTop = 77
           ExplicitWidth = 809
           ExplicitHeight = 213
         end
         inherited TBXDock1: TTBXDock
-          Top = 51
+          Top = 46
           Width = 809
           ExplicitTop = 51
           ExplicitWidth = 809

Source/Modulos/Facturas proforma/Views/uEditorFacturaProforma.pas

@@ -8,21 +8,20 @@ uses
   JvAppRegistryStorage, JvComponent, JvFormPlacement, ImgList,
   PngImageList, StdActns, ActnList, ComCtrls, TBX, TB2Item, TB2Dock,
   TB2Toolbar, ExtCtrls, JvExControls, JvNavigationPane,
-  uViewFacturaCliente, uCustomView, uViewBase, uViewTotales,
+  uViewFacturaProforma, uCustomView, uViewBase, uViewTotales,
   StdCtrls, pngimage, AppEvnts, JvComponentBase,
-  uBizFacturasCliente, uBizTiposIVA,
+  uBizFacturasProforma, uBizTiposIVA,
 
 
-  uIEditorFacturaCliente, uFacturasClienteController, uViewDetallesBase,
+  uIEditorFacturaProforma, uFacturasProformaController, uViewDetallesBase,
-  uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar,
+  uViewDetallesFacturaProforma, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar,
   uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids,
-  uViewDetallesArticulosParaVenta, cxLabel, uViewFacturaProforma,
+  uViewDetallesArticulosParaVenta, cxLabel;
-  uViewDetallesFacturaProforma;
 
 
 type
-  TfEditorFacturaProforma = class(TfEditorDBItem, IEditorFacturaCliente)
+  TfEditorFacturaProforma = class(TfEditorDBItem, IEditorFacturaProforma)
     frViewTotales1: TfrViewTotales;
     actEnviarEMail: TAction;
     TBXSeparatorItem6: TTBXSeparatorItem;
@@ -50,20 +49,20 @@ type
     procedure RecalcularPortePorUnidad;
 
   protected
-    FController : IFacturasClienteController;
+    FController : IFacturasProformaController;
-    FFactura: IBizFacturaCliente;
+    FFactura: IBizFacturaProforma;
     FTiposIVAController : ITiposIVAController;
     FTiposIVA: IBizTipoIVA;
-    FViewFactura: IViewFacturaCliente;
+    FViewFactura: IViewFacturaProforma;
-    function GetController : IFacturasClienteController;
+    function GetController : IFacturasProformaController;
-    procedure SetController (const Value : IFacturasClienteController);
+    procedure SetController (const Value : IFacturasProformaController);
-    function GetFactura: IBizFacturaCliente;
+    function GetFactura: IBizFacturaProforma;
-    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure SetFactura(const Value: IBizFacturaProforma);
 
-    function GetViewFactura: IViewFacturaCliente;
+    function GetViewFactura: IViewFacturaProforma;
-    procedure SetViewFactura(const Value: IViewFacturaCliente);
+    procedure SetViewFactura(const Value: IViewFacturaProforma);
 
-    property ViewFacturaCliente: IViewFacturaCliente read GetViewFactura write SetViewFactura;
+    property ViewFacturaProforma: IViewFacturaProforma read GetViewFactura write SetViewFactura;
 
     procedure OnClienteChanged(Sender: TObject);
 
@@ -78,8 +77,8 @@ type
     
   public
     destructor Destroy; override;
-    property Controller : IFacturasClienteController read GetController write SetController;
+    property Controller : IFacturasProformaController read GetController write SetController;
-    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Factura: IBizFacturaProforma read GetFactura write SetFactura;
     constructor Create(AOwner: TComponent); override;
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); override; //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
   end;
@@ -89,15 +88,15 @@ implementation
 
 uses
   uBizContactos, uDataModuleUsuarios, uFactuGES_App,
-  uDetallesFacturaClienteController, uDialogUtils, uDataTableUtils,
+  uDetallesFacturaProformaController, uDialogUtils, uDataTableUtils,
-  uDialogOpcionesImpresionFacturasCliente;
+  uDialogOpcionesImpresionFacturasProforma;
 //  uGenerarAlbaranesCliFacCliUtils;
 
 
-{ TfEditorFacturaCliente }
+{ TfEditorFacturaProforma }
 
 {
-**************************** TfEditorFacturaCliente ****************************
+**************************** TfEditorFacturaProforma ****************************
 }
 
 procedure TfEditorFacturaProforma.actEnviarEMailExecute(Sender: TObject);
@@ -130,7 +129,7 @@ constructor TfEditorFacturaProforma.Create(AOwner: TComponent);
 begin
   inherited;
   pgPaginas.ActivePageIndex := 0;
-  ViewFacturaCliente := frViewFacturaCliente1;
+  ViewFacturaProforma := frViewFacturaProforma1;
   FTiposIVAController := TTiposIVAController.Create;
 end;
 
@@ -164,12 +163,7 @@ procedure TfEditorFacturaProforma.EliminarInterno;
 var
   ACadena : String;
 begin
-   if Factura.TIPO = CTE_TIPO_FACTURA then
+  if (Application.MessageBox('¿Desea borrar esta factura proforma?', 'Atención', MB_YESNO) = IDYES) then
-      ACadena := '¿Desea borrar esta factura de cliente?'
-   else
-      ACadena := '¿Desea borrar este abono a cliente?';
-
-  if (Application.MessageBox(PChar(ACadena), 'Atención', MB_YESNO) = IDYES) then
   begin
     //Es el caso de querer borrar una factura pendiente cuyos recibos tienen devoluciones
     if not FController.Eliminar(Factura) then
@@ -221,7 +215,7 @@ begin
 end;
 
 {
-procedure TfEditorFacturaCliente.frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
+procedure TfEditorFacturaProforma.frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
   Sender: TObject);
 begin
   inherited;
@@ -237,7 +231,7 @@ end;
 }
 
 {
-procedure TfEditorFacturaCliente.frViewTotales1edtDescuentoPropertiesValidate(
+procedure TfEditorFacturaProforma.frViewTotales1edtDescuentoPropertiesValidate(
   Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
   var Error: Boolean);
 begin
@@ -246,7 +240,7 @@ begin
 end;
 }
 {
-procedure TfEditorFacturaCliente.frViewTotales1eIVAPropertiesValidate(
+procedure TfEditorFacturaProforma.frViewTotales1eIVAPropertiesValidate(
   Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
   var Error: Boolean);
 begin
@@ -259,12 +253,10 @@ procedure TfEditorFacturaProforma.frViewTotales1ePorteEditing(Sender: TObject;
   var CanEdit: Boolean);
 begin
   inherited;
-  if FFactura.TIPO = CTE_TIPO_ABONO then
-     CanEdit := False;
 end;
 
 {
-procedure TfEditorFacturaCliente.frViewTotales1ePortePropertiesValidate(
+procedure TfEditorFacturaProforma.frViewTotales1ePortePropertiesValidate(
   Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
   var Error: Boolean);
 begin
@@ -279,17 +271,17 @@ begin
 end;
 }
 
-function TfEditorFacturaProforma.GetController: IFacturasClienteController;
+function TfEditorFacturaProforma.GetController: IFacturasProformaController;
 begin
   Result := FController;
 end;
 
-function TfEditorFacturaProforma.GetFactura: IBizFacturaCliente;
+function TfEditorFacturaProforma.GetFactura: IBizFacturaProforma;
 begin
   Result := FFactura;
 end;
 
-function TfEditorFacturaProforma.GetViewFactura: IViewFacturaCliente;
+function TfEditorFacturaProforma.GetViewFactura: IViewFacturaProforma;
 begin
   Result := FViewFactura;
 end;
@@ -299,30 +291,25 @@ var
   bEsNuevo : Boolean;
 begin
   inherited;
-  
+
   ShowHourglassCursor;
-  //frViewDetallesFacturaCliente1.SaveGridStatus; // Para guardar estado del grid
+  //frViewDetallesFacturaProforma1.SaveGridStatus; // Para guardar estado del grid
-  frViewDetallesFacturaCliente1.BeginUpdate;  // Para que no se mueva el foco
+  frViewDetallesFacturaProforma1.BeginUpdate;  // Para que no se mueva el foco
   try
     bEsNuevo := FFactura.EsNuevo;
     FController.Guardar(FFactura);
   finally
-    frViewDetallesFacturaCliente1.EndUpdate;
+    frViewDetallesFacturaProforma1.EndUpdate;
-    //frViewDetallesFacturaCliente1.RestoreGridStatus;
+    //frViewDetallesFacturaProforma1.RestoreGridStatus;
     HideHourglassCursor;
   end;
 
   if bEsNuevo then
   begin
-    if FFactura.TIPO = CTE_TIPO_FACTURA then
+    ShowInfoMessage('La factura se ha dado de alta con el código ' + FFactura.REFERENCIA);
-      ShowInfoMessage('La factura se ha dado de alta con el código ' + FFactura.REFERENCIA)
-    else
-    begin
-      ShowInfoMessage('El abono se ha dado de alta con el código ' + FFactura.REFERENCIA);
       //Preguntamos is desea hacer una orden de devolución asociada
 //      if (Application.MessageBox('¿Desea crear una orden de devolución para el abono?', 'Atención', MB_YESNO) = IDYES) then
 //         GenerarAlbaranCli(FFactura);
-    end;
   end;
 
   Modified := False;
@@ -341,13 +328,13 @@ begin
   AVerCopia := True;
 
   //Preguntamos si desea que en las facturas se vea el Sello
-  if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
+  if ElegirOpcionesImpresionFacturaProforma(AVerSello, AVerCopia) then
      FController.Print(FFactura, AllItems, AVerSello, AVerCopia);
 end;
 
 procedure TfEditorFacturaProforma.OnClienteChanged(Sender: TObject);
 begin
-  FFactura.Cliente := ViewFacturaCliente.ViewClienteFactura.Cliente;
+  FFactura.Cliente := ViewFacturaProforma.ViewClienteFactura.Cliente;
 
   if not (FFactura.DataTable.State in dsEditModes) then
      FFactura.DataTable.Edit;
@@ -368,18 +355,12 @@ end;
 
 procedure TfEditorFacturaProforma.pgPaginasChanging(Sender: TObject;
   var AllowChange: Boolean);
-var
-  ACadena : String;
 begin
   inherited;
 
   if (not Assigned(FFactura)) or (FFactura.ID_CLIENTE = ID_NULO) then
   begin
-    if FFactura.TIPO = CTE_TIPO_FACTURA then
+    ShowWarningMessage('Antes debe elegir un cliente para esta factura');
-      ACadena := 'Antes debe elegir un cliente para esta factura'
-    else
-      ACadena := 'Antes debe elegir un cliente para este abono';
-    ShowWarningMessage(ACadena);
     AllowChange := False;
   end;
 end;
@@ -402,15 +383,9 @@ begin
   if (FTitulo = '') and Assigned(Factura) then
   begin
     if Factura.EsNuevo then
-       if Factura.TIPO = CTE_TIPO_FACTURA then
+       FTitulo := 'Nueva factura proforma'
-          FTitulo := 'Nueva factura de cliente'
-       else
-          FTitulo := 'Nuevo abono a cliente'
     else
-       if Factura.TIPO = CTE_TIPO_FACTURA then
+       FTitulo := 'Factura proforma'  + ' - ' + FFactura.Cliente.Nombre
-          FTitulo := 'Factura de cliente'  + ' - ' + FFactura.Cliente.Nombre
-       else
-          FTitulo := 'Abono a cliente'  + ' - ' + FFactura.Cliente.Nombre       
   end;
 
   inherited PonerTitulos(FTitulo);
@@ -431,7 +406,7 @@ begin
   AVerCopia := True;
 
   //Preguntamos si desea que en las facturas se vea el Sello
-  if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
+  if ElegirOpcionesImpresionFacturaProforma(AVerSello, AVerCopia) then
      FController.Preview(FFactura, AllItems, AVerSello, AVerCopia);
 end;
 
@@ -444,18 +419,18 @@ begin
       Controller.DetallesController.DesglosarPorteDetalles(FFactura.IMPORTE_PORTE, FFactura.Detalles)
 end;
 
-procedure TfEditorFacturaProforma.SetController(const Value: IFacturasClienteController);
+procedure TfEditorFacturaProforma.SetController(const Value: IFacturasProformaController);
 begin
   FController := Value;
 
   if Assigned(FController) then
   begin
-    ViewFacturaCliente.Controller := FController;
+    ViewFacturaProforma.Controller := FController;
-    frViewDetallesFacturaCliente1.Controller := Controller.DetallesController;
+    frViewDetallesFacturaProforma1.Controller := Controller.DetallesController;
   end;
 end;
 
-procedure TfEditorFacturaProforma.SetFactura(const Value: IBizFacturaCliente);
+procedure TfEditorFacturaProforma.SetFactura(const Value: IBizFacturaProforma);
 begin
   FFactura := Value;
 
@@ -470,25 +445,25 @@ begin
 
     if Assigned(FViewFactura) then
     begin
-      ViewFacturaCliente.ViewClienteFactura.OnClienteChanged := NIL;
+      ViewFacturaProforma.ViewClienteFactura.OnClienteChanged := NIL;
       try
         FViewFactura.Factura := FFactura;
-        frViewDetallesFacturaCliente1.Detalles := FFactura.Detalles;
+        frViewDetallesFacturaProforma1.Detalles := FFactura.Detalles;
-        frViewDetallesFacturaCliente1.Factura := FFactura; //Para poder sacar los descuento del articulos segun el cliente seleccionado
+        frViewDetallesFacturaProforma1.Factura := FFactura; //Para poder sacar los descuento del articulos segun el cliente seleccionado
       finally
-        ViewFacturaCliente.ViewClienteFactura.OnClienteChanged := OnClienteChanged;
+        ViewFacturaProforma.ViewClienteFactura.OnClienteChanged := OnClienteChanged;
       end;
     end;
   end
   else begin
-    ViewFacturaCliente.ViewClienteFactura.OnClienteChanged := NIL;
+    ViewFacturaProforma.ViewClienteFactura.OnClienteChanged := NIL;
     dsDataTable.DataTable := NIL;
     frViewTotales1.DADataSource.DataTable := NIL;
     frViewTotales1.dsTiposIVA.DataTable := NIL;
   end
 end;
 
-procedure TfEditorFacturaProforma.SetViewFactura(const Value: IViewFacturaCliente);
+procedure TfEditorFacturaProforma.SetViewFactura(const Value: IViewFacturaProforma);
 begin
   FViewFactura := Value;
 

Source/Modulos/Facturas proforma/Views/uEditorFacturasProforma.dfm

@@ -1,5 +1,5 @@
 inherited fEditorFacturasProforma: TfEditorFacturasProforma
-  Caption = 'Lista de facturas de cliente'
+  Caption = 'Lista de facturas proforma'
   ClientHeight = 666
   ClientWidth = 842
   ExplicitWidth = 850
@@ -8,7 +8,7 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 842
-    Caption = 'Lista de facturas de cliente'
+    Caption = 'Lista de facturas proforma'
     ExplicitWidth = 842
     inherited Image1: TImage
       Left = 815
@@ -48,10 +48,6 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
           Action = actNuevaFactura
           Caption = 'Nueva factura...'
         end
-        object TBXItem38: TTBXItem
-          Action = actNuevoAbono
-          Caption = 'Nuevo abono...'
-        end
       end
       inherited TBXItem2: TTBXItem
         Visible = False
@@ -79,10 +75,6 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
     inherited TBXTMain2: TTBXToolbar
       Left = 427
       ExplicitLeft = 427
-      ExplicitWidth = 66
-      object TBXItem41: TTBXItem
-        Action = actInformes
-      end
     end
   end
   inherited StatusBar: TJvStatusBar
@@ -91,7 +83,104 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
     ExplicitTop = 647
     ExplicitWidth = 842
   end
-  inherited EditorActionList: TActionList
+  inline frViewFacturasProforma1: TfrViewFacturasProforma [3]
+    Left = 0
+    Top = 102
+    Width = 842
+    Height = 545
+    Align = alClient
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -11
+    Font.Name = 'Tahoma'
+    Font.Style = []
+    ParentFont = False
+    TabOrder = 3
+    ReadOnly = False
+    ExplicitLeft = 177
+    ExplicitTop = 248
+    inherited cxGrid: TcxGrid
+      Width = 842
+      Height = 417
+      inherited cxGridView: TcxGridDBTableView
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Format = '0 facturas'
+            Kind = skCount
+            Column = frViewFacturasProforma1.cxGridViewREFERENCIA
+          end>
+        inherited cxGridViewNUM_COPIAS: TcxGridDBColumn
+          IsCaptionAssigned = True
+        end
+      end
+    end
+    inherited frViewFiltroBase1: TfrViewFiltroBase
+      Width = 842
+      inherited TBXDockablePanel1: TTBXDockablePanel
+        inherited dxLayoutControl1: TdxLayoutControl
+          Width = 842
+          inherited txtFiltroTodo: TcxTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+          inherited edtFechaIniFiltro: TcxDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+          inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 310
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 310
+          end
+          inherited eLista: TcxComboBox
+            Left = 699
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 699
+          end
+        end
+        inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+          Width = 842
+          inherited tbxBotones: TTBXToolbar
+            Width = 832
+          end
+        end
+      end
+    end
+    inherited pnlAgrupaciones: TTBXDockablePanel
+      Top = 519
+      inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+        Width = 842
+        inherited TBXToolbar1: TTBXToolbar
+          Width = 832
+        end
+      end
+    end
+    inherited dxComponentPrinter: TdxComponentPrinter
+      inherited dxComponentPrinterLink: TdxGridReportLink
+        ReportDocument.CreationDate = 41612.488969675930000000
+        BuiltInReportLink = True
+      end
+    end
+    inherited cxViewGridPopupMenu: TcxGridPopupMenu
+      PopupMenus = <
+        item
+          GridView = frViewFacturasProforma1.cxGridView
+          HitTypes = [gvhtCell]
+          Index = 0
+        end>
+    end
+  end
+  inherited EditorActionList: TActionList [4]
     Left = 136
     Top = 176
     inherited actNuevo: TAction
@@ -116,25 +205,14 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
       ImageIndex = 23
       OnExecute = actNuevaFacturaExecute
     end
-    object actNuevoAbono: TAction
-      Category = 'Archivo'
-      Caption = 'Abono'
-      ImageIndex = 24
-      OnExecute = actNuevoAbonoExecute
-    end
     object actEnviarEMail: TAction
       Category = 'Acciones'
       Caption = 'Enviar por e-mail...'
       OnExecute = actEnviarEMailExecute
       OnUpdate = actEnviarEMailUpdate
     end
-    object actInformes: TAction
-      Category = 'Acciones'
-      Caption = 'Informes'
-      OnExecute = actInformesExecute
-    end
   end
-  inherited SmallImages: TPngImageList
+  inherited SmallImages: TPngImageList [5]
     PngImages = <
       item
         PngImage.Data = {
@@ -861,7 +939,7 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
     Left = 395
     Bitmap = {}
   end
-  inherited LargeImages: TPngImageList
+  inherited LargeImages: TPngImageList [6]
     PngImages = <
       item
         PngImage.Data = {
@@ -1673,11 +1751,11 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
       end>
     Bitmap = {}
   end
-  inherited JvAppRegistryStorage: TJvAppRegistryStorage [7]
+  inherited JvFormStorage: TJvFormStorage [7]
   end
-  inherited dsDataTable: TDADataSource [8]
+  inherited dsDataTable: TDADataSource [9]
   end
-  inherited GridPopupMenu: TPopupMenu [9]
+  inherited GridPopupMenu: TPopupMenu
     inherited N2: TMenuItem
       Visible = False
     end
@@ -1694,8 +1772,6 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
       Action = actEnviarEMail
     end
   end
-  inherited StatusBarImages: TPngImageList [10]
-  end
   object JsNuevaFacturaDialog: TJSDialog
     Content.Strings = (
       #191'C'#243'mo desea dar de alta la factura?')

Source/Modulos/Facturas proforma/Views/uEditorFacturasProforma.pas

@@ -10,9 +10,9 @@ uses
   TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls, JvExControls,
   JvNavigationPane, uViewGrid, pngimage, JvComponentBase,
   uEditorGridBase,
-  uBizFacturasCliente, uIEditorFacturasCliente, uFacturasClienteController,
+  uBizFacturasProforma, uIEditorFacturasProforma, uFacturasProformaController,
   uCustomView, uViewBase, uViewBarraSeleccion, uViewGridBase,
-  uViewFacturasCliente, JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces,
+  uViewFacturasProforma, JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces,
   cxStyles, cxCustomData,
   cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, cxGridLevel,
   cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView,
@@ -21,7 +21,7 @@ uses
 
 type
 
-  TfEditorFacturasProforma = class(TfEditorGridBase, IEditorFacturasCliente)
+  TfEditorFacturasProforma = class(TfEditorGridBase, IEditorFacturasProforma)
     Cambiarlasituacin1: TMenuItem;
     N4: TMenuItem;
     JsNuevaFacturaDialog: TJSDialog;
@@ -30,36 +30,31 @@ type
     JsImprimirDialog: TJSDialog;
     TBXSubmenuItem2: TTBXSubmenuItem;
     actNuevaFactura: TAction;
-    TBXItem38: TTBXItem;
     TBXItem39: TTBXItem;
-    actNuevoAbono: TAction;
     JsNuevoAbonoDialog: TJSDialog;
     JsListaFacturasNoEliminadas: TJSDialog;
     actEnviarEMail: TAction;
     TBXItem40: TTBXItem;
     Enviarporemail1: TMenuItem;
-    actInformes: TAction;
-    TBXItem41: TTBXItem;
     JSInformesDialog: TJSDialog;
+    frViewFacturasProforma1: TfrViewFacturasProforma;
     procedure FormShow(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
     procedure actNuevaFacturaExecute(Sender: TObject);
-    procedure actNuevoAbonoExecute(Sender: TObject);
     procedure actEnviarEMailUpdate(Sender: TObject);
     procedure actEnviarEMailExecute(Sender: TObject);
-    procedure actInformesExecute(Sender: TObject);
     procedure OnListaAnosChange(Sender: TObject; const Text: string);
 
   private
-    FFacturas: IBizFacturaCliente;
+    FFacturas: IBizFacturaProforma;
-    FController : IFacturasClienteController;
+    FController : IFacturasProformaController;
 
   protected
-    function GetFacturas: IBizFacturaCliente;
+    function GetFacturas: IBizFacturaProforma;
-    procedure SetFacturas(const Value: IBizFacturaCliente);
+    procedure SetFacturas(const Value: IBizFacturaProforma);
 
-    function GetController : IFacturasClienteController; virtual;
+    function GetController : IFacturasProformaController; virtual;
-    procedure SetController (const Value : IFacturasClienteController); virtual;
+    procedure SetController (const Value : IFacturasProformaController); virtual;
 
     procedure NuevoInterno; override;
     procedure EliminarInterno; override;
@@ -70,8 +65,8 @@ type
     procedure RefrescarInterno; override;
 
   public
-    property Facturas: IBizFacturaCliente read GetFacturas write SetFacturas;
+    property Facturas: IBizFacturaProforma read GetFacturas write SetFacturas;
-    property Controller : IFacturasClienteController read GetController write SetController;
+    property Controller : IFacturasProformaController read GetController write SetController;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure PonerTitulos(const ATitulo: string = ''); override;
@@ -81,15 +76,16 @@ type
 implementation
 
 uses
-  uDataModuleFacturasCliente, uDataModuleUsuarios, uAlbaranesClienteController, uFactuGES_App,
+  uDataModuleFacturasProforma, uDataModuleUsuarios, uFactuGES_App,
-  uGenerarFacturasCliAlbCliUtils, //uGenerarFacturasCliPreCliUtils,
+//  uAlbaranesClienteController,  uGenerarFacturasCliAlbCliUtils, //uGenerarFacturasCliPreCliUtils,
-  uBizAlbaranesCliente, uGestorInformesController, uDialogOpcionesImpresionFacturasCliente,
+//  uBizAlbaranesCliente, uGestorInformesController,
-  uEditorBase,  uGridStatusUtils, uDBSelectionListUtils, udialogUtils;
+  uDialogOpcionesImpresionFacturasProforma, uEditorBase,  uGridStatusUtils,
+  uDBSelectionListUtils, udialogUtils;
 
 {$R *.dfm}
 
 {
-*************************** TfEditorFacturasCliente ***************************
+*************************** TfEditorFacturasProforma ***************************
 }
 procedure TfEditorFacturasProforma.actEliminarUpdate(Sender: TObject);
 begin
@@ -100,7 +96,7 @@ end;
 
 procedure TfEditorFacturasProforma.actEnviarEMailExecute(Sender: TObject);
 var
-  AFacturas : IBizFacturaCliente;
+  AFacturas : IBizFacturaProforma;
 
 begin
   inherited;
@@ -111,7 +107,7 @@ begin
     ShowHourglassCursor;
     try
       SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
-      AFacturas := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
+      AFacturas := (Controller as IFacturasProformaController).ExtraerSeleccionados(Facturas) as IBizFacturaProforma;
 
       if Assigned(AFacturas) then
          if FController.EnviarEmailFacturas(AFacturas) then
@@ -133,81 +129,19 @@ begin
     (Sender as TAction).Enabled := False;
 end;
 
-procedure TfEditorFacturasProforma.actInformesExecute(Sender: TObject);
-var
-  Respuesta : Integer;
-  AGestorInformesController : IGestorInformesController;
-
-begin
-  AGestorInformesController := TGestorInformesController.Create;
-  try
-
-    Respuesta := JsInformesDialog.Execute;
-
-    if Respuesta <> IDCANCEL then
-    begin
-      case JsInformesDialog.CustomButtonResult of
-        100 : begin   // Listado de facturas pendientes
-                AGestorInformesController.VerInformeListadoFacturasCliPendientes;
-              end;
-        200 : begin   // Listado de IVA
-                AGestorInformesController.VerInformeIVAClientes;
-              end;
-        300 : begin   // Listado de facturas de cliente
-                AGestorInformesController.VerInformeListadoFacturasCli;
-              end;
-      end;
-    end;
-
-  finally
-    AGestorInformesController := NIL;
-  end;
-end;
-
 procedure TfEditorFacturasProforma.actNuevaFacturaExecute(Sender: TObject);
 begin
   actNuevo.Execute;
 end;
 
-procedure TfEditorFacturasProforma.actNuevoAbonoExecute(Sender: TObject);
-var
-  Respuesta : Integer;
-  Opcion : Integer;
-begin
-  inherited;
-  //ABONOS
-  if (Facturas.TIPO = CTE_TIPO_FACTURA) then
-  begin
-      Respuesta := JsNuevoAbonoDialog.Execute;
-      //Nos salimos sin hace nada
-      if Respuesta = IDCANCEL then
-         Exit;
-      Opcion := JsNuevoAbonoDialog.CustomButtonResult;
-  end
-  else
-      Opcion := 100;
-
-  case Opcion of
-    200   : begin   // Utilizar factura seleccionada
-                FController.Ver(FController.GenerarAbono(Facturas));
-                actRefrescar.Execute;
-                ViewGrid._FocusedView.DataController.GotoFirst;
-    end;
-    100    : begin   // Abono nuevo vacio
-                if FController.AnadirAbono(Facturas) then
-                   FController.Ver(Facturas);
-              end;
-  end;
-end;
-
 constructor TfEditorFacturasProforma.Create(AOwner: TComponent);
 begin
   inherited;
 
-  FHeaderText := 'Lista de facturas de cliente';
+  FHeaderText := 'Lista de facturas proforma';
   FWindowCaption := FHeaderText;
 
-  ViewGrid := frViewFacturasCliente1; //  CreateView(TfrViewFacturasCliente) as IViewFacturasCliente;
+  ViewGrid := frViewFacturasProforma1;
 end;
 
 destructor TfEditorFacturasProforma.Destroy;
@@ -218,7 +152,7 @@ end;
 
 procedure TfEditorFacturasProforma.DuplicarInterno;
 var
-  AFactura : IBizFacturaCliente;
+  AFactura : IBizFacturaProforma;
 begin
   inherited;
   AFactura := FController.Duplicar(FFacturas);
@@ -232,7 +166,7 @@ end;
 procedure TfEditorFacturasProforma.EliminarInterno;
 var
   ACadena : String;
-  AFacturas: IBizFacturaCliente;
+  AFacturas: IBizFacturaProforma;
   AllItems: Boolean;
 begin
   AFacturas := Nil;
@@ -243,19 +177,14 @@ begin
 
   if AllItems then
   begin
-    if (Application.MessageBox('¿Desea borrar las facturas/abonos de cliente seleccionados?', 'Atención', MB_YESNO) = IDYES) then
+    if (Application.MessageBox('¿Desea borrar las facturas proforma seleccionadas?', 'Atención', MB_YESNO) = IDYES) then
     begin
       SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
-      AFacturas := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
+      AFacturas := (Controller as IFacturasProformaController).ExtraerSeleccionados(Facturas) as IBizFacturaProforma;
     end
   end
   else begin
-     if Facturas.TIPO = CTE_TIPO_FACTURA then
+     if (Application.MessageBox('¿Desea borrar esta factura proforma?', 'Atención', MB_YESNO) = IDYES) then
-        ACadena := '¿Desea borrar esta factura de cliente?'
-     else
-        ACadena := '¿Desea borrar este abono a cliente?';
-
-     if (Application.MessageBox(PChar(ACadena), 'Atención', MB_YESNO) = IDYES) then
         AFacturas := Facturas;
   end;
 
@@ -266,7 +195,7 @@ begin
     begin
       JsListaFacturasNoEliminadas.Content.Clear;
       JsListaFacturasNoEliminadas.Content.Add('Ref. factura: ' + AFacturas.REFERENCIA + '  ' + AFacturas.NOMBRE);
-      JsListaFacturasNoEliminadas.Execute;      
+      JsListaFacturasNoEliminadas.Execute;
     end;
 
     if AllItems then
@@ -308,12 +237,12 @@ begin
   ViewGrid.GotoFirst;  
 end;
 
-function TfEditorFacturasProforma.GetController: IFacturasClienteController;
+function TfEditorFacturasProforma.GetController: IFacturasProformaController;
 begin
   Result := FController;
 end;
 
-function TfEditorFacturasProforma.GetFacturas: IBizFacturaCliente;
+function TfEditorFacturasProforma.GetFacturas: IBizFacturaProforma;
 begin
   Result := FFacturas;
 end;
@@ -321,7 +250,7 @@ end;
 procedure TfEditorFacturasProforma.ImprimirInterno;
 var
   Respuesta : Integer;
-  AFacturas: IBizFacturaCliente;
+  AFacturas: IBizFacturaProforma;
   AllItems: Boolean;
   AVerSello: Boolean;
   AVerCopia: Boolean;
@@ -350,13 +279,13 @@ begin
                   if AllItems then
                   begin
                     SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
-                    AFacturas := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
+                    AFacturas := (Controller as IFacturasProformaController).ExtraerSeleccionados(Facturas) as IBizFacturaProforma;
                   end
                   else
                     AFacturas := Facturas;
 
                   //Preguntamos si desea que en las facturas se vea el Sello
-                  if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
+//                  if ElegirOpcionesImpresionFacturaProforma(AVerSello, AVerCopia) then
                      if Assigned(AFacturas) then
                         if FController.Print(AFacturas, AllItems, AVerSello, AVerCopia) then
                            RefrescarInterno;
@@ -388,7 +317,7 @@ begin
                 actRefrescar.Execute;
               end;
       300   : begin   // Utilizar albaranes
-                  GenerarFacturaCliAlb;
+//                  GenerarFacturaCliAlb;
                   actRefrescar.Execute;
       end;
       100    : begin   // Albaran nuevo vacio
@@ -417,7 +346,7 @@ end;
 procedure TfEditorFacturasProforma.PrevisualizarInterno;
 var
   Respuesta : Integer;
-  AFacturas: IBizFacturaCliente;
+  AFacturas: IBizFacturaProforma;
   AllItems: Boolean;
   AVerSello: Boolean;
   AVerCopia: Boolean;
@@ -446,13 +375,13 @@ begin
                   if AllItems then
                   begin
                     SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
-                    AFacturas := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
+                    AFacturas := (Controller as IFacturasProformaController).ExtraerSeleccionados(Facturas) as IBizFacturaProforma;
                   end
                   else
                     AFacturas := Facturas;
 
                   //Preguntamos si desea que en las facturas se vea el Sello
-                  if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
+//                  if ElegirOpcionesImpresionFacturaProforma(AVerSello, AVerCopia) then
                      if Assigned(AFacturas) then
                         FController.Preview(AFacturas, AllItems, AVerSello, AVerCopia);
                 end;
@@ -470,7 +399,7 @@ begin
   inherited;
 end;
 
-procedure TfEditorFacturasProforma.SetController(const Value: IFacturasClienteController);
+procedure TfEditorFacturasProforma.SetController(const Value: IFacturasProformaController);
 begin
   FController := Value;
 
@@ -478,7 +407,7 @@ begin
      ListaAnos := FController.DarListaAnosFacturas;
 end;
 
-procedure TfEditorFacturasProforma.SetFacturas(const Value: IBizFacturaCliente);
+procedure TfEditorFacturasProforma.SetFacturas(const Value: IBizFacturaProforma);
 begin
   FFacturas := Value;
 
@@ -490,7 +419,7 @@ begin
 
     dsDataTable.DataTable := FFacturas.DataTable;
     if Assigned(ViewGrid) then
-      (ViewGrid as IViewFacturasCliente).Facturas := Facturas;
+      (ViewGrid as IViewFacturasProforma).Facturas := Facturas;
   end;
 end;
 

Source/Modulos/Facturas proforma/Views/uEditorFacturasProformaReport.dfm

@@ -2,6 +2,7 @@ inherited fEditorFacturasProformaPreview: TfEditorFacturasProformaPreview
   Caption = 'Previsualizar la factura'
   ClientWidth = 622
   ExplicitWidth = 630
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Facturas proforma/Views/uEditorFacturasProformaReport.pas

@@ -11,15 +11,14 @@ uses
   JvAppStorage, JvAppRegistryStorage, JvComponentBase,
   JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
   TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage,
-  ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorFacturasClientePreview,
+  ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorFacturasProformaPreview,
   JvExComCtrls, JvStatusBar, frxExportText, frxExportRTF, frxExportMail,
   frxExportXLS, frxExportImage, frxExportPDF, frxClass, frxDCtrl, frxGradient,
   frxChBox, frxCross, frxRich, frxOLE, frxBarcode;
 
 type
-  TfEditorFacturasProformaPreview = class(TfEditorPreview, IEditorFacturasClientePreview)
+  TfEditorFacturasProformaPreview = class(TfEditorPreview, IEditorFacturasProformaPreview)
     TBXItem58: TTBXItem;
-    procedure actExportarRTFExecute(Sender: TObject);
   private
     { Private declarations }
   public
@@ -32,19 +31,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uFacturasClienteReportController, uIntegerListUtils, uDialogUtils;
+  uFacturasProformaReportController, uIntegerListUtils, uDialogUtils;
 
-procedure TfEditorFacturasProformaPreview.actExportarRTFExecute(Sender: TObject);
-var
-  I: Integer;
-begin
-  // inherited; <- No llamar al padre
-  if not Assigned(Controller) then
-    raise Exception.Create('No se ha asignado el controlador necesario');
-
-  for I := 0 to ListaID.Count - 1 do
-    if (Controller as IFacturasClienteReportController).ExportToWord(ListaID[I]) then
-      ShowInfoMessage('La factura se ha exportado correctamente.');
-end;
 
 end.

Source/Modulos/Facturas proforma/Views/uEditorInfFacturasClienteReport.dfm

@@ -1,6 +0,0 @@
-inherited fEditorPreview1: TfEditorPreview1
-  Caption = 'fEditorPreview1'
-  ExplicitHeight = 492
-  PixelsPerInch = 96
-  TextHeight = 13
-end

Source/Modulos/Facturas proforma/Views/uEditorInfFacturasClienteReport.pas

@@ -1,30 +0,0 @@
-unit uEditorInfFacturasClienteReport;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, uEditorPreview, frxExportText, frxExportRTF, frxExportMail,
-  frxExportXLS, frxExportImage, frxExportPDF, frxClass, frxDCtrl, frxGradient,
-  frxChBox, frxCross, frxRich, frxOLE, frxBarcode, JvAppStorage,
-  JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList,
-  StdActns, ActnList, ComCtrls, JvExComCtrls, JvStatusBar, TB2ExtItems,
-  TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls,
-  JvExControls, JvNavigationPane;
-
-type
-  TfEditorPreview1 = class(TfEditorPreview)
-  private
-    { Private declarations }
-  public
-    { Public declarations }
-  end;
-
-var
-  fEditorPreview1: TfEditorPreview1;
-
-implementation
-
-{$R *.dfm}
-
-end.

Source/Modulos/Facturas proforma/Views/uFacturasProformaViewRegister.pas

@@ -8,31 +8,31 @@ procedure UnregisterViews;
 implementation
 
 uses
-  uEditorRegistryUtils, uEditorFacturasCliente, uEditorFacturaCliente,
+  uEditorRegistryUtils, uEditorFacturasProforma, uEditorFacturaProforma,
-  uEditorFacturasClienteReport, uEditorElegirArticulosFacturaCliente,
+  uEditorFacturasProformaReport, uEditorElegirArticulosFacturaProforma,
-  uEditorElegirFacturasCliente, uDialogOpcionesImpresionFacturasCliente,
+  uEditorElegirFacturasProforma, uDialogOpcionesImpresionFacturasProforma,
-  uDialogListaFacturasEnvioEMail;
+  uDialogListaFacturasProformaEnvioEMail;
 
 procedure RegisterViews;
 begin
-  EditorRegistry.RegisterClass(TfEditorFacturasCliente, 'EditorFacturasCliente');
+  EditorRegistry.RegisterClass(TfEditorFacturasProforma, 'EditorFacturasProforma');
-  EditorRegistry.RegisterClass(TfEditorFacturaCliente, 'EditorFacturaCliente');
+  EditorRegistry.RegisterClass(TfEditorFacturaProforma, 'EditorFacturaProforma');
-  EditorRegistry.RegisterClass(TfEditorElegirArticulosFacturaCliente, 'EditorElegirArticulosFacturaCliente');
+  EditorRegistry.RegisterClass(TfEditorElegirArticulosFacturaProforma, 'EditorElegirArticulosFacturaProforma');
-  EditorRegistry.RegisterClass(TfEditorElegirFacturasCliente, 'EditorElegirFacturasCliente');
+  EditorRegistry.RegisterClass(TfEditorElegirFacturasProforma, 'EditorElegirFacturasProforma');
-  EditorRegistry.RegisterClass(TfEditorFacturasClientePreview, 'EditorFacturasClientePreview');
+  EditorRegistry.RegisterClass(TfEditorFacturasProformaPreview, 'EditorFacturasProformaPreview');
-  EditorRegistry.RegisterClass(TfDialogOpcionesImpresionFacturasCliente, 'DialogOpcionesImpresionFacturasCliente');
+  EditorRegistry.RegisterClass(TfDialogOpcionesImpresionFacturasProforma, 'DialogOpcionesImpresionFacturasProforma');
-  EditorRegistry.RegisterClass(TfDialogListaFacturasEnvioEMail, 'DialogListaFacturasEnvioEMail');
+  EditorRegistry.RegisterClass(TfDialogListaFacturasProformaEnvioEMail, 'DialogListaFacturasEnvioEMail');
 end;
 
 procedure UnregisterViews;
 begin
-  EditorRegistry.UnRegisterClass(TfEditorFacturasCliente);
+  EditorRegistry.UnRegisterClass(TfEditorFacturasProforma);
-  EditorRegistry.UnRegisterClass(TfEditorFacturaCliente);
+  EditorRegistry.UnRegisterClass(TfEditorFacturaProforma);
-  EditorRegistry.UnRegisterClass(TfEditorElegirArticulosFacturaCliente);
+  EditorRegistry.UnRegisterClass(TfEditorElegirArticulosFacturaProforma);
-  EditorRegistry.UnRegisterClass(TfEditorElegirFacturasCliente);
+  EditorRegistry.UnRegisterClass(TfEditorElegirFacturasProforma);
-  EditorRegistry.UnRegisterClass(TfEditorFacturasClientePreview);
+  EditorRegistry.UnRegisterClass(TfEditorFacturasProformaPreview);
-  EditorRegistry.UnRegisterClass(TfDialogOpcionesImpresionFacturasCliente);
+  EditorRegistry.UnRegisterClass(TfDialogOpcionesImpresionFacturasProforma);
-  EditorRegistry.UnRegisterClass(TfDialogListaFacturasEnvioEMail);
+  EditorRegistry.UnRegisterClass(TfDialogListaFacturasProformaEnvioEMail);
 end;
 
 end.

Source/Modulos/Facturas proforma/Views/uViewDatosYSeleccionClienteFacturaProforma.pas

@@ -9,25 +9,21 @@ uses
   ComCtrls, ToolWin, ActnList, ImgList, PngImageList, cxTextEdit, cxDBEdit,
   pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
   DBCtrls, uClientesController, dxLayoutControl, Buttons, uDAInterfaces,
-  cxMaskEdit, cxButtonEdit, uBizFacturasCliente, uBizDireccionesContacto,
+  cxMaskEdit, cxButtonEdit, uBizFacturasProforma, uBizDireccionesContacto,
   uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons,
   cxMemo;
 
 type
-  IViewDatosYSeleccionClienteFacturaCliente = interface(IViewBase)
+  IViewDatosYSeleccionClienteFacturaProforma = interface(IViewBase)
-    ['{0336F03C-3349-4368-BF63-D03E6F741069}']
+  ['{B914EF6C-6E38-4850-A716-1214BDC128A4}']
-    function GetFactura: IBizFacturaCliente;
+    function GetFactura: IBizFacturaProforma;
-    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure SetFactura(const Value: IBizFacturaProforma);
-    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Factura: IBizFacturaProforma read GetFactura write SetFactura;
 
     function GetCliente: IBizCliente;
     procedure SetCliente(Value: IBizCliente);
     property Cliente: IBizCliente read GetCliente write SetCliente;
 
-{    function GetID_Cliente: integer;
-    procedure SetID_Cliente(const Value: integer);
-    property ID_Cliente: integer read GetID_Cliente write SetID_Cliente;}
-
     function GetOnClienteChanged : TNotifyEvent;
     procedure SetOnClienteChanged (const Value : TNotifyEvent);
     property OnClienteChanged : TNotifyEvent read GetOnClienteChanged
@@ -40,7 +36,7 @@ type
     procedure RefrescarDireccion;
   end;
 
-  TfrViewDatosYSeleccionClienteFacturaProforma = class(TfrViewBase, IViewDatosYSeleccionClienteFacturaCliente)
+  TfrViewDatosYSeleccionClienteFacturaProforma = class(TfrViewBase, IViewDatosYSeleccionClienteFacturaProforma)
     dsCliente: TDADataSource;
     ActionList1: TActionList;
     actElegirContacto: TAction;
@@ -85,7 +81,7 @@ type
   protected
     FClientesController : IClientesController;
     FDireccionesController : IDireccionesContactoController;
-    FFactura : IBizFacturaCliente;
+    FFactura : IBizFacturaProforma;
     FCliente : IBizCliente;
     FDireccion : IBizDireccionesContacto;
     function GetCliente: IBizCliente; virtual;
@@ -95,8 +91,8 @@ type
     procedure SetReadOnly(Value: Boolean); override;
     function GetID_Cliente: integer; virtual;
     procedure SetID_Cliente(const Value: integer); virtual;
-    function GetFactura: IBizFacturaCliente;
+    function GetFactura: IBizFacturaProforma;
-    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure SetFactura(const Value: IBizFacturaProforma);
     procedure EscribirTextoDireccion;
     procedure CopiarDireccionAFactura;
     procedure LimpiarDireccionDeFactura;
@@ -108,7 +104,7 @@ type
     procedure VerFichaCliente;
     procedure AnadirNuevoCliente;
     procedure RefrescarDireccion;
-    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Factura: IBizFacturaProforma read GetFactura write SetFactura;
     property Cliente: IBizCliente read GetCliente write SetCliente;
     property OnClienteChanged : TNotifyEvent read GetOnClienteChanged write SetOnClienteChanged;
     property ID_Cliente: integer read GetID_Cliente write SetID_Cliente;
@@ -316,7 +312,7 @@ begin
   FFactura.ClearField('IMPORTE_PORTE');
 end;
 
-function TfrViewDatosYSeleccionClienteFacturaProforma.GetFactura: IBizFacturaCliente;
+function TfrViewDatosYSeleccionClienteFacturaProforma.GetFactura: IBizFacturaProforma;
 begin
   Result := FFactura;
 end;
@@ -341,7 +337,7 @@ begin
 end;
 
 procedure TfrViewDatosYSeleccionClienteFacturaProforma.SetFactura(
-  const Value: IBizFacturaCliente);
+  const Value: IBizFacturaProforma);
 begin
   FFactura := Value;
   if Assigned(FFactura) then

Source/Modulos/Facturas proforma/Views/uViewDetallesFacturaProforma.dfm

@@ -1,51 +1,43 @@
 inherited frViewDetallesFacturaProforma: TfrViewDetallesFacturaProforma
   inherited ToolBar1: TToolBar
-    Height = 73
+    Height = 95
-    ExplicitHeight = 73
+    ExplicitHeight = 95
-    inherited ToolButton3: TToolButton
+    inherited FontName: TJvFontComboBox [4]
-      Wrap = False
+      Left = 56
-    end
-    inherited ToolButton4: TToolButton
-      Left = 278
-      Top = 0
-      ExplicitLeft = 278
-      ExplicitTop = 0
-    end
-    inherited ToolButton14: TToolButton
-      Left = 334
-      Top = 0
-      ExplicitLeft = 334
-      ExplicitTop = 0
-    end
-    inherited FontName: TJvFontComboBox
       Top = 22
+      ExplicitLeft = 56
       ExplicitTop = 22
     end
+    inherited ToolButton14: TToolButton [5]
+      Left = 201
+      Wrap = False
+      ExplicitLeft = 201
+    end
     inherited FontSize: TEdit
+      Left = 266
       Top = 22
+      ExplicitLeft = 266
       ExplicitTop = 22
     end
     inherited UpDown1: TUpDown
+      Left = 308
       Top = 22
+      ExplicitLeft = 308
       ExplicitTop = 22
     end
     inherited ToolButton13: TToolButton
+      Left = 325
       Top = 22
+      ExplicitLeft = 325
       ExplicitTop = 22
     end
-    inherited ToolButton6: TToolButton
+    inherited ToolButton11: TToolButton [9]
+      Left = 333
       Top = 22
+      ExplicitLeft = 333
       ExplicitTop = 22
     end
-    inherited ToolButton7: TToolButton
+    inherited ToolButton12: TToolButton [10]
-      Top = 22
-      ExplicitTop = 22
-    end
-    inherited ToolButton8: TToolButton
-      Top = 22
-      ExplicitTop = 22
-    end
-    inherited ToolButton12: TToolButton
       Left = 0
       Top = 22
       Wrap = True
@@ -53,28 +45,41 @@ inherited frViewDetallesFacturaProforma: TfrViewDetallesFacturaProforma
       ExplicitTop = 22
       ExplicitHeight = 27
     end
-    inherited ToolButton9: TToolButton
+    inherited ToolButton9: TToolButton [11]
       Left = 0
       Top = 49
       ExplicitLeft = 0
       ExplicitTop = 49
     end
-    inherited ToolButton10: TToolButton
+    inherited ToolButton10: TToolButton [12]
       Left = 145
       Top = 49
       ExplicitLeft = 145
       ExplicitTop = 49
     end
-    inherited ToolButton11: TToolButton
+    inherited ToolButton6: TToolButton [13]
       Left = 270
       Top = 49
       ExplicitLeft = 270
       ExplicitTop = 49
     end
+    inherited ToolButton7: TToolButton [14]
+      Left = 336
+      Top = 49
+      Wrap = True
+      ExplicitLeft = 336
+      ExplicitTop = 49
+    end
+    inherited ToolButton8: TToolButton [15]
+      Left = 0
+      Top = 71
+      ExplicitLeft = 0
+      ExplicitTop = 71
+    end
   end
   inherited cxGrid: TcxGrid
-    Top = 99
+    Top = 121
-    Height = 205
+    Height = 183
     ExplicitTop = 99
     ExplicitHeight = 205
     inherited cxGridView: TcxGridDBTableView
@@ -84,8 +89,8 @@ inherited frViewDetallesFacturaProforma: TfrViewDetallesFacturaProforma
     end
   end
   inherited TBXDock1: TTBXDock
-    Top = 73
+    Top = 95
-    ExplicitTop = 73
+    ExplicitTop = 68
     inherited TBXToolbar1: TTBXToolbar
       object TBXItem18: TTBXItem [0]
         Action = actAnadirArticulos

Source/Modulos/Facturas proforma/Views/uViewDetallesFacturaProforma.pas

@@ -11,70 +11,61 @@ uses
   cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit,
   Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns,
   JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
-  uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasCliente,
+  uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasProforma,
   uDAInterfaces, cxDropDownEdit, cxButtonEdit, Menus, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxEditRepositoryItems, uViewDetallesArticulosParaVenta;
 
 type
-  IViewDetallesFacturaCliente = interface(IViewDetallesArticulos)
+  IViewDetallesFacturaProforma = interface(IViewDetallesArticulos)
-  ['{0EEC7246-B2FD-4F93-AB15-AA12D6E67302}']
+  ['{AC75205E-0A9F-4C50-ACD6-62B71DFD99BD}']
-    function GetFactura: IBizFacturaCliente;
+    function GetFactura: IBizFacturaProforma;
-    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure SetFactura(const Value: IBizFacturaProforma);
-    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Factura: IBizFacturaProforma read GetFactura write SetFactura;
   end;
 
-  TfrViewDetallesFacturaProforma = class(TfrViewDetallesArticulosParaVenta, IViewDetallesFacturaCliente)
+  TfrViewDetallesFacturaProforma = class(TfrViewDetallesArticulosParaVenta, IViewDetallesFacturaProforma)
     TBXItem18: TTBXItem;
   protected
-    FFactura: IBizFacturaCliente;
+    FFactura: IBizFacturaProforma;
-    function GetFactura: IBizFacturaCliente;
+    function GetFactura: IBizFacturaProforma;
-    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure SetFactura(const Value: IBizFacturaProforma);
 
     procedure AnadirArticulosInterno; override;
     procedure RellenarArticulosInterno; override;
     function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; override;
 
   public
-    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Factura: IBizFacturaProforma read GetFactura write SetFactura;
   end;
 
 implementation
 {$R *.dfm}
 
-uses uDetallesFacturaClienteController;
+uses uDetallesFacturaProformaController;
 
-{ TfrViewDetallesFacturaCliente }
+{ TfrViewDetallesFacturaProforma }
 
 function TfrViewDetallesFacturaProforma.AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean;
 begin
-  if (Factura.TIPO = CTE_TIPO_ABONO) then
+  Result := (Controller as IDetallesFacturaProformaController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Factura.Cliente.ID);
-     Result := (Controller as IDetallesFacturaClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Factura.Cliente.ID, -1)
-  else
-     Result := (Controller as IDetallesFacturaClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Factura.Cliente.ID);
 end;
 
 procedure TfrViewDetallesFacturaProforma.AnadirArticulosInterno;
 begin
-  if (Factura.TIPO = CTE_TIPO_ABONO) then
+  (Controller as IDetallesFacturaProformaController).AnadirArticulos(Detalles, Factura.Cliente);
-    (Controller as IDetallesFacturaClienteController).AnadirArticulos(Detalles, Factura.Cliente, true, -1)
-  else
-    (Controller as IDetallesFacturaClienteController).AnadirArticulos(Detalles, Factura.Cliente);
 end;
 
-function TfrViewDetallesFacturaProforma.GetFactura: IBizFacturaCliente;
+function TfrViewDetallesFacturaProforma.GetFactura: IBizFacturaProforma;
 begin
   Result := FFactura;
 end;
 
 procedure TfrViewDetallesFacturaProforma.RellenarArticulosInterno;
 begin
-  if (Factura.TIPO = CTE_TIPO_ABONO) then
+  (Controller as IDetallesFacturaProformaController).AnadirArticulos(Detalles, Factura.Cliente, False);
-    (Controller as IDetallesFacturaClienteController).AnadirArticulos(Detalles, Factura.Cliente, False, -1)
-  else
-    (Controller as IDetallesFacturaClienteController).AnadirArticulos(Detalles, Factura.Cliente, False);
 end;
 
-procedure TfrViewDetallesFacturaProforma.SetFactura(const Value: IBizFacturaCliente);
+procedure TfrViewDetallesFacturaProforma.SetFactura(const Value: IBizFacturaProforma);
 begin
   FFactura := Value;
 end;

Source/Modulos/Facturas proforma/Views/uViewElegirArticulosFacturasProforma.pas

@@ -15,11 +15,11 @@ uses
   uDAInterfaces, uCustomView, uViewBase;
 
 type
-  IViewElegirArticulosFacturasCliente = interface(IViewArticulos)
+  IViewElegirArticulosFacturasProforma = interface(IViewArticulos)
-  ['{BEDD8521-7AD7-4715-BD9E-4911FD522604}']
+  ['{267EC624-6DD2-4C7E-B977-49252B123696}']
   end;
 
-  TfrViewElegirArticulosFacturasProforma = class(TfrViewArticulos, IViewElegirArticulosFacturasCliente)
+  TfrViewElegirArticulosFacturasProforma = class(TfrViewArticulos, IViewElegirArticulosFacturasProforma)
   end;
 
 implementation

Source/Modulos/Facturas proforma/Views/uViewFacturaProforma.dfm

@@ -1,6 +1,6 @@
 inherited frViewFacturaProforma: TfrViewFacturaProforma
-  Width = 990
+  Width = 451
-  Height = 496
+  Height = 304
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,21 +9,19 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 990
+    Width = 451
-    Height = 496
+    Height = 304
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     LookAndFeel = dxLayoutOfficeLookAndFeel1
-    ExplicitWidth = 451
-    ExplicitHeight = 304
     DesignSize = (
-      990
+      451
-      496)
+      304)
     object Label1: TLabel
-      Left = 554
+      Left = 354
       Top = 295
       Width = 311
       Height = 26
@@ -142,7 +140,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       Width = 269
     end
     object bFormasPago: TButton
-      Left = 372
+      Left = 172
       Top = 103
       Width = 132
       Height = 23
@@ -173,7 +171,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       Width = 165
     end
     object cbClienteFinal: TcxDBTextEdit
-      Left = 554
+      Left = 354
       Top = 329
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'CLIENTE_FINAL'
@@ -201,7 +199,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       Width = 339
     end
     object bElegirClienteFinal: TButton
-      Left = 934
+      Left = 410
       Top = 327
       Width = 23
       Height = 25
@@ -235,7 +233,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       Width = 275
     end
     inline frViewDatosYSeleccionClienteFacturaProforma1: TfrViewDatosYSeleccionClienteFacturaProforma
-      Left = 543
+      Left = 343
       Top = 36
       Width = 467
       Height = 234
@@ -247,7 +245,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       ParentFont = False
       TabOrder = 6
       ReadOnly = False
-      ExplicitLeft = 543
+      ExplicitLeft = 343
       ExplicitTop = 36
       inherited dxLayoutControl1: TdxLayoutControl
         inherited edtlNombre: TcxDBTextEdit
@@ -259,20 +257,22 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
           Width = 224
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          Left = 312
+          Left = 171
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 312
+          ExplicitLeft = 171
         end
         inherited Button3: TBitBtn
-          Left = 223
+          Left = 82
-          ExplicitLeft = 223
+          Top = 182
+          ExplicitLeft = 82
+          ExplicitTop = 182
         end
         inherited Button4: TButton
-          Left = 392
+          Left = 251
-          ExplicitLeft = 392
+          ExplicitLeft = 251
         end
         inherited edtDireccion: TcxMemo
           Style.LookAndFeel.SkinName = ''

Source/Modulos/Facturas proforma/Views/uViewFacturaProforma.pas

@@ -5,29 +5,28 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, uViewBase, DB, uDADataTable, uCustomView,
-  uBizFacturasCliente,
+  uBizFacturasProforma,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, dxLayoutControl,
   cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxSpinEdit, StdCtrls, Mask,
   DBCtrls, cxGraphics, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit,
   cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago,
-  ActnList, uViewDatosYSeleccionClienteFacturaCliente, uFacturasClienteController,
+  ActnList, uViewDatosYSeleccionClienteFacturaProforma, uFacturasProformaController;
-  uViewDatosYSeleccionClienteFacturaProforma;
 
 type
-  IViewFacturaCliente = interface(IViewBase)
+  IViewFacturaProforma = interface(IViewBase)
-  ['{3A95930C-20B3-41E9-93CB-21138ADB5B70}']
+  ['{78EE6F9A-C742-4F01-B8F9-8E1BE77E491B}']
-    function GetFactura: IBizFacturaCliente;
+    function GetFactura: IBizFacturaProforma;
-    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure SetFactura(const Value: IBizFacturaProforma);
-    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Factura: IBizFacturaProforma read GetFactura write SetFactura;
-    function GetController : IFacturasClienteController;
+    function GetController : IFacturasProformaController;
-    procedure SetController (const Value : IFacturasClienteController);
+    procedure SetController (const Value : IFacturasProformaController);
-    property Controller : IFacturasClienteController read GetController write SetController;
+    property Controller : IFacturasProformaController read GetController write SetController;
 
-    function GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente;
+    function GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaProforma;
-    property ViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente read GetViewClienteFactura;
+    property ViewClienteFactura: IViewDatosYSeleccionClienteFacturaProforma read GetViewClienteFactura;
   end;
 
-  TfrViewFacturaProforma = class(TfrViewBase, IViewFacturaCliente)
+  TfrViewFacturaProforma = class(TfrViewBase, IViewFacturaProforma)
     DADataSource: TDADataSource;
     dxLayoutControl1Group_Root: TdxLayoutGroup;
     dxLayoutControl1: TdxLayoutControl;
@@ -75,34 +74,34 @@ type
     procedure actElegirClienteFinalUpdate(Sender: TObject);
     procedure edtFechaVemcimientoPropertiesEditValueChanged(Sender: TObject);
   protected
-    FFactura : IBizFacturaCliente;
+    FFactura : IBizFacturaProforma;
-    FController : IFacturasClienteController;
+    FController : IFacturasProformaController;
     FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
-    FViewClienteFactura : IViewDatosYSeleccionClienteFacturaCliente;
+    FViewClienteFactura : IViewDatosYSeleccionClienteFacturaProforma;
-    function GetFactura: IBizFacturaCliente;
+    function GetFactura: IBizFacturaProforma;
-    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure SetFactura(const Value: IBizFacturaProforma);
-    function GetController : IFacturasClienteController;
+    function GetController : IFacturasProformaController;
-    procedure SetController (const Value : IFacturasClienteController);
+    procedure SetController (const Value : IFacturasProformaController);
     procedure RellenarCuentasBancarias;
-    function GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente;
+    function GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaProforma;
 
   public
-    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Factura: IBizFacturaProforma read GetFactura write SetFactura;
-    property Controller : IFacturasClienteController read GetController write SetController;
+    property Controller : IFacturasProformaController read GetController write SetController;
-    property ViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente read GetViewClienteFactura;
+    property ViewClienteFactura: IViewDatosYSeleccionClienteFacturaProforma read GetViewClienteFactura;
   end;
 
 
 implementation
 
 uses
-  uDataModuleContactos, schFacturasClienteClient_Intf, uFactuGES_App,
+  uDataModuleContactos, schFacturasProformaClient_Intf, uFactuGES_App,
   uEmpresasController, uClientesController, uBizContactos, uBizDireccionesContacto;
 
 {$R *.dfm}
 
-{ TfrViewFacturaCliente }
+{ TfrViewFacturaProforma }
 
 procedure TfrViewFacturaProforma.actElegirClienteFinalExecute(Sender: TObject);
 var
@@ -119,7 +118,7 @@ begin
       ShowHourglassCursor;
       try
         FFactura.Edit;
-        FFactura.CLIENTE_FINAL := ACliente.NOMBRE;
+//        FFactura.CLIENTE_FINAL := ACliente.NOMBRE;
       finally
         HideHourglassCursor;
       end;
@@ -148,7 +147,7 @@ begin
   inherited;
   FFormasPago := Nil;
   FFormasPagoController := TFormasPagoController.Create;
-  FViewClienteFactura := frViewDatosYSeleccionClienteFacturaCliente1;
+  FViewClienteFactura := frViewDatosYSeleccionClienteFacturaProforma1;
 end;
 
 procedure TfrViewFacturaProforma.CustomViewDestroy(Sender: TObject);
@@ -169,17 +168,17 @@ begin
         ledtFechaVencimiento.Enabled := False;
 end;
 
-function TfrViewFacturaProforma.GetController: IFacturasClienteController;
+function TfrViewFacturaProforma.GetController: IFacturasProformaController;
 begin
   Result := FController;
 end;
 
-function TfrViewFacturaProforma.GetFactura: IBizFacturaCliente;
+function TfrViewFacturaProforma.GetFactura: IBizFacturaProforma;
 begin
   Result := FFactura;
 end;
 
-function TfrViewFacturaProforma.GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente;
+function TfrViewFacturaProforma.GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaProforma;
 begin
   Result := FViewClienteFactura;
 end;
@@ -235,12 +234,12 @@ begin
   end;
 end;
 
-procedure TfrViewFacturaProforma.SetController(const Value: IFacturasClienteController);
+procedure TfrViewFacturaProforma.SetController(const Value: IFacturasProformaController);
 begin
   FController := Value;
 end;
 
-procedure TfrViewFacturaProforma.SetFactura(const Value: IBizFacturaCliente);
+procedure TfrViewFacturaProforma.SetFactura(const Value: IBizFacturaProforma);
 var
   ACadena : String;
 begin
@@ -258,21 +257,14 @@ begin
     dsFormaPago.DataTable.Active := True;
 
     //Posicionamos la tabla en la forma de pago que tiene la factura ya que no lo hace el componente por si solo
-    FFormasPago.DataTable.Locate(fld_FacturasClienteID, FFactura.ID_FORMA_PAGO, []);
+    FFormasPago.DataTable.Locate(fld_FacturasProformaID, FFactura.ID_FORMA_PAGO, []);
     if (FFormasPago.Plazos.RecordCount = 0) then
        ledtFechaVencimiento.Enabled := True
     else
        ledtFechaVencimiento.Enabled := False;
 
-    if FFactura.TIPO = CTE_TIPO_ABONO then
+    ACadena := 'Elija el cliente al que se le realizará la factura.';
-    begin
+    //ViewDatosYSeleccionClienteFacturaProforma1.MsgElegirCliente := ACadena;
-      dxLayoutControl1Group1.Caption := 'Datos del abono:';
-      dxLayoutControl1Item2.Caption := 'Fecha del abono:';
-      ACadena := 'Elija el cliente al que se le realizará el abono.';
-    end
-    else
-      ACadena := 'Elija el cliente al que se le realizará la factura.';
-    //ViewDatosYSeleccionClienteFacturaCliente1.MsgElegirCliente := ACadena;
   end
   else begin
     DADataSource.DataTable := NIL;

Source/Modulos/Facturas proforma/Views/uViewFacturasProforma.dfm

@@ -55,23 +55,6 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         Width = 25
         OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
       end
-      object cxGridViewTIPO: TcxGridDBColumn
-        DataBinding.FieldName = 'TIPO'
-        PropertiesClassName = 'TcxImageComboBoxProperties'
-        Properties.Images = PngImageList
-        Properties.Items = <
-          item
-            Description = 'Factura'
-            ImageIndex = 2
-            Value = 'F'
-          end
-          item
-            Description = 'Abono'
-            ImageIndex = 3
-            Value = 'A'
-          end>
-        Properties.LargeImages = PngImageList
-      end
       object cxGridViewREFERENCIA: TcxGridDBColumn
         DataBinding.FieldName = 'REFERENCIA'
         PropertiesClassName = 'TcxTextEditProperties'
@@ -170,21 +153,6 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         HeaderAlignmentHorz = taRightJustify
         Width = 128
       end
-      object cxGridViewIMPORTE_RETENCION: TcxGridDBColumn
-        Caption = 'Importe retenido'
-        DataBinding.FieldName = 'IMPORTE_RETENCION'
-        PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.Alignment.Horz = taRightJustify
-        Visible = False
-        FooterAlignmentHorz = taRightJustify
-        HeaderAlignmentHorz = taRightJustify
-        VisibleForCustomization = False
-      end
-      object cxGridViewREFERENCIA_COMISION: TcxGridDBColumn
-        Caption = 'Liquidaci'#243'n'
-        DataBinding.FieldName = 'REFERENCIA_COMISION'
-        Width = 54
-      end
     end
     inherited cxGridLevel: TcxGridLevel
       Caption = 'Todas'
@@ -192,9 +160,6 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
     object cxGridPendientes: TcxGridLevel
       Caption = 'Pendientes'
     end
-    object cxGridParcial: TcxGridLevel
-      Caption = 'Parcialmente pagadas'
-    end
     object cxGridPagadas: TcxGridLevel
       Caption = 'Pagadas'
     end

Source/Modulos/Facturas proforma/Views/uViewFacturasProforma.pas

@@ -11,20 +11,20 @@ uses
   PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, ActnList, uDADataTable,
   cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid,
-  cxImage, Grids, DBGrids, uBizFacturasCliente, cxGridCustomPopupMenu,
+  cxImage, Grids, DBGrids, uBizFacturasProforma, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX,
   TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView,
   uViewBase;
    
 type
-  IViewFacturasCliente = interface(IViewGrid)
+  IViewFacturasProforma = interface(IViewGrid)
-  ['{927A005F-5D71-4C37-B9E7-10292F9D467C}']
+  ['{EEB1FAD2-A0F8-4D45-9D38-3100CA0A4D2D}']
-    function GetFacturas: IBizFacturaCliente;
+    function GetFacturas: IBizFacturaProforma;
-    procedure SetFacturas(const Value: IBizFacturaCliente);
+    procedure SetFacturas(const Value: IBizFacturaProforma);
-    property Facturas: IBizFacturaCliente read GetFacturas write SetFacturas;
+    property Facturas: IBizFacturaProforma read GetFacturas write SetFacturas;
   end;
 
-  TfrViewFacturasProforma = class(TfrViewGrid, IViewFacturasCliente)
+  TfrViewFacturasProforma = class(TfrViewGrid, IViewFacturasProforma)
     PngImageList: TPngImageList;
     cxGridViewNOMBRE: TcxGridDBColumn;
     cxGridViewREFERENCIA: TcxGridDBColumn;
@@ -43,10 +43,8 @@ type
     cxGridViewPOBLACION: TcxGridDBColumn;
     cxStylePagada: TcxStyle;
     cxGridPendientes: TcxGridLevel;
-    cxGridParcial: TcxGridLevel;
     cxStyleAbono: TcxStyle;
     cxGridPagadas: TcxGridLevel;
-    cxGridViewREFERENCIA_COMISION: TcxGridDBColumn;
     cxStylePendientes: TcxStyle;
     cxStyleParciales: TcxStyle;
     actCliente: TAction;
@@ -55,9 +53,7 @@ type
     TBXSeparatorItem1: TTBXSeparatorItem;
     TBXItem3: TTBXItem;
     TBXSeparatorItem2: TTBXSeparatorItem;
-    cxGridViewTIPO: TcxGridDBColumn;
     cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn;
-    cxGridViewIMPORTE_RETENCION: TcxGridDBColumn;
     cxGridViewRE: TcxGridDBColumn;
     cxGridViewIMPORTE_RE: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
@@ -84,25 +80,25 @@ type
     procedure AnadirFiltroFechas;
 
   protected
-    FFacturas: IBizFacturaCliente;
+    FFacturas: IBizFacturaProforma;
-    function GetFacturas: IBizFacturaCliente;
+    function GetFacturas: IBizFacturaProforma;
-    procedure SetFacturas(const Value: IBizFacturaCliente);
+    procedure SetFacturas(const Value: IBizFacturaProforma);
 
   public
     procedure AnadirOtrosFiltros; override;
-    property Facturas: IBizFacturaCliente read GetFacturas write SetFacturas;
+    property Facturas: IBizFacturaProforma read GetFacturas write SetFacturas;
   end;
 
 
 implementation
 
 uses
-  uDataModuleFacturasCliente, DateUtils, uViewGridBase, uReferenciasUtils,
+  uDataModuleFacturasProforma, DateUtils, uViewGridBase, uReferenciasUtils,
   cxVariants;
 
 {$R *.dfm}
 
-{ TfrViewFacturasCliente }
+{ TfrViewFacturasProforma }
 
 procedure TfrViewFacturasProforma.actClienteExecute(Sender: TObject);
 begin
@@ -172,8 +168,7 @@ begin
 
   case cxGrid.ActiveLevel.Index of
     1   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, CTE_PENDIENTE, CTE_PENDIENTE);
-    2   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, CTE_PARCIAMENTE_PAGADA, CTE_PARCIAMENTE_PAGADA);
+    2   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, CTE_PAGADA, CTE_PAGADA);
-    3   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, CTE_PAGADA, CTE_PAGADA);
   end;
 end;
 
@@ -203,8 +198,7 @@ procedure TfrViewFacturasProforma.cxGridViewDataControllerCompare(
   AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 begin
   inherited;
-  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+  if (AItemIndex = cxGridViewREFERENCIA.Index) and
-      (AItemIndex = cxGridViewREFERENCIA_COMISION.Index)) and
      (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
     Compare := CompararReferencias(V1, V2)
   else
@@ -269,9 +263,7 @@ begin
     if (ASituacion = CTE_PAGADA) then
       AStyle.TextColor := cxStylePagada.TextColor
     else if (ASituacion = CTE_PENDIENTE) then
-      AStyle.TextColor := cxStylePendientes.TextColor
+      AStyle.TextColor := cxStylePendientes.TextColor;
-    else if (ASituacion = CTE_PARCIAMENTE_PAGADA) then
-      AStyle.TextColor := cxStyleParciales.TextColor;
 
     IndiceCol := cxGridViewIMPORTE_TOTAL.Index;
     if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then
@@ -279,12 +271,12 @@ begin
   end;
 end;
 
-function TfrViewFacturasProforma.GetFacturas: IBizFacturaCliente;
+function TfrViewFacturasProforma.GetFacturas: IBizFacturaProforma;
 begin
   Result := FFacturas;
 end;
 
-procedure TfrViewFacturasProforma.SetFacturas(const Value: IBizFacturaCliente);
+procedure TfrViewFacturasProforma.SetFacturas(const Value: IBizFacturaProforma);
 begin
   FFacturas := Value;
   if Assigned(FFacturas) then