Version Firma digital, plantillas, agrupacion por vendedor, arreglo duplicar presupupuesto fecha vencimiento recalculada, informe de pedido cambiar referencia segun indicaciones joseluis

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@691 f4e31baf-9722-1c47-927c-6f952f962d4b

Database/udfs/funciones.pas

@@ -8,24 +8,30 @@ implementation
 
 uses
   Forms, Classes, SysUtils, StdCtrls, ComCtrls,
-  Menus, Windows;
+  Menus, Windows;                              
 
 function RtfToText(Cadena: PChar): PChar;
 var
   AStream : TStringStream;
   ARichEdit: TRichEdit;
 begin
-  AStream := TStringStream.Create(Cadena);
+  ARichEdit := TRichEdit.CreateParented(HWND_MESSAGE);
-  ARichEdit := TRichEdit.CreateParented(HWND(-3));  
   try
-    ARichEdit.SelectAll;
+    AStream := TStringStream.Create(Cadena);
-    ARichEdit.SelText := StrPas(Cadena);
+    try
-    Result := PChar(ARichEdit.Text);
+      ARichEdit.SelectAll;
+      ARichEdit.SelText := StrPas(Cadena);
+      Result := PChar(ARichEdit.Text);
+    finally
+       FreeAndNIL(AStream);
+    end;
   finally
-    FreeAndNIL(AStream);
+    FreeAndNIL(ARichEdit);
   end;
 end;
 
 
 
 end.
+
+

Database/udfs/udf_RtfToText.dproj

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

Source/ApplicationBase/ApplicationBase.dproj

@@ -56,10 +56,40 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="ccpackD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
-    <DCCReference Include="cfpack_d11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cfpack_d11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxNavBarD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvJansD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Configuracion\Controller\uConfiguracionController.pas" />
     <DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" />
     <DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas">
@@ -73,18 +103,6 @@
       <Form>frViewConfiguracionGeneral</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="cxExtEditorsD11.dcp" />
-    <DCCReference Include="cxLibraryD11.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="dxNavBarD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
     <DCCReference Include="Ejercicios\Controller\uEjerciciosController.pas" />
     <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicio.pas" />
     <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicios.pas" />
@@ -162,20 +180,8 @@
       <Form>frViewTiendas</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="GUISDK_D11R.dcp" />
-    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="JvCoreD11R.dcp" />
-    <DCCReference Include="JvCtrlsD11R.dcp" />
-    <DCCReference Include="JvJansD11R.dcp" />
-    <DCCReference Include="JvMMD11R.dcp" />
-    <DCCReference Include="JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="JvSystemD11R.dcp" />
     <DCCReference Include="ProvinciasPoblaciones\Controller\uProvinciasPoblacionesController.pas" />
     <DCCReference Include="ProvinciasPoblaciones\Data\uDataModuleProvinciasPoblaciones.pas" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="uFactuGES_App.pas" />
     <DCCReference Include="uPlugins_Intf.pas" />
     <DCCReference Include="Usuarios\Controller\uUsuariosController.pas" />
@@ -233,12 +239,6 @@
       <Form>frUsuarios</Form>
       <DesignClass>TCustomView</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/ApplicationBase/Empresas/Controller/uEmpresasController.pas

@@ -34,6 +34,7 @@ type
     function DarListaFormasPago: TStringList;
     function DarListaTiposIVA: TStringList;
     Procedure AsignarIDFormaPago(AEmpresa: IBizEmpresa; const IDFormaPago: Variant);
+    Procedure AsignarIDFormaPagoProveedores(AEmpresa: IBizEmpresa; const IDFormaPago: Variant);
     Procedure AsignarIDTipoIVA(AEmpresa: IBizEmpresa; const IDTipoIVA: Variant);    
   end;
 
@@ -67,6 +68,7 @@ type
     function DarListaFormasPago: TStringList;
     function DarListaTiposIVA: TStringList;
     Procedure AsignarIDFormaPago(AEmpresa: IBizEmpresa; const IDFormaPago: Variant);
+    Procedure AsignarIDFormaPagoProveedores(AEmpresa: IBizEmpresa; const IDFormaPago: Variant);
     Procedure AsignarIDTipoIVA(AEmpresa: IBizEmpresa; const IDTipoIVA: Variant);
 
     property TiendasController : ITiendasEmpresaController read GetTiendasController;
@@ -101,6 +103,22 @@ begin
   end;
 end;
 
+procedure TEmpresasController.AsignarIDFormaPagoProveedores(AEmpresa: IBizEmpresa; const IDFormaPago: Variant);
+begin
+  if Assigned(AEmpresa) then
+  begin
+    if not AEmpresa.DataTable.Editing then
+       AEmpresa.DataTable.Edit;
+
+    if EsCadenaVacia(IDFormaPago) then
+       AEmpresa.ID_FORMA_PAGO_PROVEEDORESIsNull := true
+    else
+       AEmpresa.ID_FORMA_PAGO_PROVEEDORES := IDFormaPago;
+
+    AEmpresa.DataTable.Post;
+  end;
+end;
+
 procedure TEmpresasController.AsignarIDTipoIVA(AEmpresa: IBizEmpresa;
   const IDTipoIVA: Variant);
 begin
@@ -184,7 +202,8 @@ begin
   try
     with Result do
     begin
-      Add(Format('%s=%d', [CTE_TODAS, CTE_ID_TODAS]));
+// Un documento debe pertenecer a una tienda y solo a una
+//      Add(Format('%s=%d', [CTE_TODAS, CTE_ID_TODAS]));
 
       ATiendas.DataTable.First;
       while not ATiendas.DataTable.EOF do

Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm

@@ -188,6 +188,10 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
         Name = 'ID_FORMA_PAGO'
         DataType = datSmallInt
       end
+      item
+        Name = 'ID_FORMA_PAGO_PROVEEDORES'
+        DataType = datSmallInt
+      end
       item
         Name = 'VALIDEZ_PRESUPUESTOS'
         DataType = datSmallInt

Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas

@@ -9,9 +9,9 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_EmpresasTiendas = '{3533FE9D-1F57-4EAD-ADCF-41E9BAE8E0A8}';
+  RID_EmpresasTiendas = '{75ED554E-84FB-44E5-ACC7-53A876D86E64}';
-  RID_Empresas = '{AB7C71EF-D2F3-43E3-928E-83E62A65AD60}';
+  RID_Empresas = '{10ABDF2A-085A-421B-ADDE-8819A0E88D80}';
-  RID_EmpresasDatosBanco = '{6B72546D-7B98-462F-849E-EC7C95FE01B8}';
+  RID_EmpresasDatosBanco = '{7E305A2F-73A0-43EE-9A45-21CDFA6A3725}';
 
   { Data table names }
   nme_EmpresasTiendas = 'EmpresasTiendas';
@@ -79,6 +79,7 @@ const
   fld_EmpresasREGISTRO_MERCANTIL = 'REGISTRO_MERCANTIL';
   fld_EmpresasID_TIPO_IVA = 'ID_TIPO_IVA';
   fld_EmpresasID_FORMA_PAGO = 'ID_FORMA_PAGO';
+  fld_EmpresasID_FORMA_PAGO_PROVEEDORES = 'ID_FORMA_PAGO_PROVEEDORES';
   fld_EmpresasVALIDEZ_PRESUPUESTOS = 'VALIDEZ_PRESUPUESTOS';
   fld_EmpresasNUM_ORDEN = 'NUM_ORDEN';
   fld_EmpresasID_PERFIL = 'ID_PERFIL';
@@ -108,9 +109,10 @@ const
   idx_EmpresasREGISTRO_MERCANTIL = 21;
   idx_EmpresasID_TIPO_IVA = 22;
   idx_EmpresasID_FORMA_PAGO = 23;
-  idx_EmpresasVALIDEZ_PRESUPUESTOS = 24;
+  idx_EmpresasID_FORMA_PAGO_PROVEEDORES = 24;
-  idx_EmpresasNUM_ORDEN = 25;
+  idx_EmpresasVALIDEZ_PRESUPUESTOS = 25;
-  idx_EmpresasID_PERFIL = 26;
+  idx_EmpresasNUM_ORDEN = 26;
+  idx_EmpresasID_PERFIL = 27;
 
   { EmpresasDatosBanco fields }
   fld_EmpresasDatosBancoID = 'ID';
@@ -137,7 +139,7 @@ const
 type
   { IEmpresasTiendas }
   IEmpresasTiendas = interface(IDAStronglyTypedDataTable)
-  ['{DE6BE283-469C-4253-9A99-60E55A11E17C}']
+  ['{A5E943E3-6466-46DD-B3C1-D4C8BE5FC18A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -352,7 +354,7 @@ type
 
   { IEmpresas }
   IEmpresas = interface(IDAStronglyTypedDataTable)
-  ['{D210073A-3C0F-46FD-97FD-3928459451E7}']
+  ['{9D935CED-1A5C-4ADD-B00B-73C3B31F2D8A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -448,6 +450,10 @@ type
     procedure SetID_FORMA_PAGOValue(const aValue: SmallInt);
     function GetID_FORMA_PAGOIsNull: Boolean;
     procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean);
+    function GetID_FORMA_PAGO_PROVEEDORESValue: SmallInt;
+    procedure SetID_FORMA_PAGO_PROVEEDORESValue(const aValue: SmallInt);
+    function GetID_FORMA_PAGO_PROVEEDORESIsNull: Boolean;
+    procedure SetID_FORMA_PAGO_PROVEEDORESIsNull(const aValue: Boolean);
     function GetVALIDEZ_PRESUPUESTOSValue: SmallInt;
     procedure SetVALIDEZ_PRESUPUESTOSValue(const aValue: SmallInt);
     function GetVALIDEZ_PRESUPUESTOSIsNull: Boolean;
@@ -511,6 +517,8 @@ type
     property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull;
     property ID_FORMA_PAGO: SmallInt read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue;
     property ID_FORMA_PAGOIsNull: Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull;
+    property ID_FORMA_PAGO_PROVEEDORES: SmallInt read GetID_FORMA_PAGO_PROVEEDORESValue write SetID_FORMA_PAGO_PROVEEDORESValue;
+    property ID_FORMA_PAGO_PROVEEDORESIsNull: Boolean read GetID_FORMA_PAGO_PROVEEDORESIsNull write SetID_FORMA_PAGO_PROVEEDORESIsNull;
     property VALIDEZ_PRESUPUESTOS: SmallInt read GetVALIDEZ_PRESUPUESTOSValue write SetVALIDEZ_PRESUPUESTOSValue;
     property VALIDEZ_PRESUPUESTOSIsNull: Boolean read GetVALIDEZ_PRESUPUESTOSIsNull write SetVALIDEZ_PRESUPUESTOSIsNull;
     property NUM_ORDEN: SmallInt read GetNUM_ORDENValue write SetNUM_ORDENValue;
@@ -622,6 +630,10 @@ type
     procedure SetID_FORMA_PAGOValue(const aValue: SmallInt); virtual;
     function GetID_FORMA_PAGOIsNull: Boolean; virtual;
     procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); virtual;
+    function GetID_FORMA_PAGO_PROVEEDORESValue: SmallInt; virtual;
+    procedure SetID_FORMA_PAGO_PROVEEDORESValue(const aValue: SmallInt); virtual;
+    function GetID_FORMA_PAGO_PROVEEDORESIsNull: Boolean; virtual;
+    procedure SetID_FORMA_PAGO_PROVEEDORESIsNull(const aValue: Boolean); virtual;
     function GetVALIDEZ_PRESUPUESTOSValue: SmallInt; virtual;
     procedure SetVALIDEZ_PRESUPUESTOSValue(const aValue: SmallInt); virtual;
     function GetVALIDEZ_PRESUPUESTOSIsNull: Boolean; virtual;
@@ -684,6 +696,8 @@ type
     property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull;
     property ID_FORMA_PAGO: SmallInt read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue;
     property ID_FORMA_PAGOIsNull: Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull;
+    property ID_FORMA_PAGO_PROVEEDORES: SmallInt read GetID_FORMA_PAGO_PROVEEDORESValue write SetID_FORMA_PAGO_PROVEEDORESValue;
+    property ID_FORMA_PAGO_PROVEEDORESIsNull: Boolean read GetID_FORMA_PAGO_PROVEEDORESIsNull write SetID_FORMA_PAGO_PROVEEDORESIsNull;
     property VALIDEZ_PRESUPUESTOS: SmallInt read GetVALIDEZ_PRESUPUESTOSValue write SetVALIDEZ_PRESUPUESTOSValue;
     property VALIDEZ_PRESUPUESTOSIsNull: Boolean read GetVALIDEZ_PRESUPUESTOSIsNull write SetVALIDEZ_PRESUPUESTOSIsNull;
     property NUM_ORDEN: SmallInt read GetNUM_ORDENValue write SetNUM_ORDENValue;
@@ -699,7 +713,7 @@ type
 
   { IEmpresasDatosBanco }
   IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable)
-  ['{DF6BEEB5-1CC8-4419-A432-D1FC275D5852}']
+  ['{7662EC5C-CE6D-4FEF-9F39-A29307FEC214}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1719,6 +1733,27 @@ begin
     DataTable.Fields[idx_EmpresasID_FORMA_PAGO].AsVariant := Null;
 end;
 
+function TEmpresasDataTableRules.GetID_FORMA_PAGO_PROVEEDORESValue: SmallInt;
+begin
+  result := DataTable.Fields[idx_EmpresasID_FORMA_PAGO_PROVEEDORES].AsSmallInt;
+end;
+
+procedure TEmpresasDataTableRules.SetID_FORMA_PAGO_PROVEEDORESValue(const aValue: SmallInt);
+begin
+  DataTable.Fields[idx_EmpresasID_FORMA_PAGO_PROVEEDORES].AsSmallInt := aValue;
+end;
+
+function TEmpresasDataTableRules.GetID_FORMA_PAGO_PROVEEDORESIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_EmpresasID_FORMA_PAGO_PROVEEDORES].IsNull;
+end;
+
+procedure TEmpresasDataTableRules.SetID_FORMA_PAGO_PROVEEDORESIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpresasID_FORMA_PAGO_PROVEEDORES].AsVariant := Null;
+end;
+
 function TEmpresasDataTableRules.GetVALIDEZ_PRESUPUESTOSValue: SmallInt;
 begin
   result := DataTable.Fields[idx_EmpresasVALIDEZ_PRESUPUESTOS].AsSmallInt;

Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas

@@ -9,14 +9,14 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_EmpresasTiendasDelta = '{13E84D72-2300-4184-9F8C-B1F4F117CD4A}';
+  RID_EmpresasTiendasDelta = '{4B58C4F4-2B40-45F7-97CF-A69DE7400EC5}';
-  RID_EmpresasDelta = '{C652CB8F-D35A-4C25-80C6-C18C214FF9F8}';
+  RID_EmpresasDelta = '{1C685D7D-AC4D-43AC-A3B9-95C2B9FA13FB}';
-  RID_EmpresasDatosBancoDelta = '{D8E33A1D-2CF4-408D-A7EE-68711A3EE24F}';
+  RID_EmpresasDatosBancoDelta = '{7077625B-BD29-46F8-AC4F-927850B2B9A2}';
 
 type
   { IEmpresasTiendasDelta }
   IEmpresasTiendasDelta = interface(IEmpresasTiendas)
-  ['{13E84D72-2300-4184-9F8C-B1F4F117CD4A}']
+  ['{4B58C4F4-2B40-45F7-97CF-A69DE7400EC5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -231,7 +231,7 @@ type
 
   { IEmpresasDelta }
   IEmpresasDelta = interface(IEmpresas)
-  ['{C652CB8F-D35A-4C25-80C6-C18C214FF9F8}']
+  ['{1C685D7D-AC4D-43AC-A3B9-95C2B9FA13FB}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -257,6 +257,7 @@ type
     function GetOldREGISTRO_MERCANTILValue : String;
     function GetOldID_TIPO_IVAValue : SmallInt;
     function GetOldID_FORMA_PAGOValue : SmallInt;
+    function GetOldID_FORMA_PAGO_PROVEEDORESValue : SmallInt;
     function GetOldVALIDEZ_PRESUPUESTOSValue : SmallInt;
     function GetOldNUM_ORDENValue : SmallInt;
     function GetOldID_PERFILValue : Integer;
@@ -286,6 +287,7 @@ type
     property OldREGISTRO_MERCANTIL : String read GetOldREGISTRO_MERCANTILValue;
     property OldID_TIPO_IVA : SmallInt read GetOldID_TIPO_IVAValue;
     property OldID_FORMA_PAGO : SmallInt read GetOldID_FORMA_PAGOValue;
+    property OldID_FORMA_PAGO_PROVEEDORES : SmallInt read GetOldID_FORMA_PAGO_PROVEEDORESValue;
     property OldVALIDEZ_PRESUPUESTOS : SmallInt read GetOldVALIDEZ_PRESUPUESTOSValue;
     property OldNUM_ORDEN : SmallInt read GetOldNUM_ORDENValue;
     property OldID_PERFIL : Integer read GetOldID_PERFILValue;
@@ -442,6 +444,12 @@ type
     function GetOldID_FORMA_PAGOIsNull: Boolean; virtual;
     procedure SetID_FORMA_PAGOValue(const aValue: SmallInt); virtual;
     procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); virtual;
+    function GetID_FORMA_PAGO_PROVEEDORESValue: SmallInt; virtual;
+    function GetID_FORMA_PAGO_PROVEEDORESIsNull: Boolean; virtual;
+    function GetOldID_FORMA_PAGO_PROVEEDORESValue: SmallInt; virtual;
+    function GetOldID_FORMA_PAGO_PROVEEDORESIsNull: Boolean; virtual;
+    procedure SetID_FORMA_PAGO_PROVEEDORESValue(const aValue: SmallInt); virtual;
+    procedure SetID_FORMA_PAGO_PROVEEDORESIsNull(const aValue: Boolean); virtual;
     function GetVALIDEZ_PRESUPUESTOSValue: SmallInt; virtual;
     function GetVALIDEZ_PRESUPUESTOSIsNull: Boolean; virtual;
     function GetOldVALIDEZ_PRESUPUESTOSValue: SmallInt; virtual;
@@ -558,6 +566,10 @@ type
     property ID_FORMA_PAGOIsNull : Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull;
     property OldID_FORMA_PAGO : SmallInt read GetOldID_FORMA_PAGOValue;
     property OldID_FORMA_PAGOIsNull : Boolean read GetOldID_FORMA_PAGOIsNull;
+    property ID_FORMA_PAGO_PROVEEDORES : SmallInt read GetID_FORMA_PAGO_PROVEEDORESValue write SetID_FORMA_PAGO_PROVEEDORESValue;
+    property ID_FORMA_PAGO_PROVEEDORESIsNull : Boolean read GetID_FORMA_PAGO_PROVEEDORESIsNull write SetID_FORMA_PAGO_PROVEEDORESIsNull;
+    property OldID_FORMA_PAGO_PROVEEDORES : SmallInt read GetOldID_FORMA_PAGO_PROVEEDORESValue;
+    property OldID_FORMA_PAGO_PROVEEDORESIsNull : Boolean read GetOldID_FORMA_PAGO_PROVEEDORESIsNull;
     property VALIDEZ_PRESUPUESTOS : SmallInt read GetVALIDEZ_PRESUPUESTOSValue write SetVALIDEZ_PRESUPUESTOSValue;
     property VALIDEZ_PRESUPUESTOSIsNull : Boolean read GetVALIDEZ_PRESUPUESTOSIsNull write SetVALIDEZ_PRESUPUESTOSIsNull;
     property OldVALIDEZ_PRESUPUESTOS : SmallInt read GetOldVALIDEZ_PRESUPUESTOSValue;
@@ -579,7 +591,7 @@ type
 
   { IEmpresasDatosBancoDelta }
   IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco)
-  ['{D8E33A1D-2CF4-408D-A7EE-68711A3EE24F}']
+  ['{7077625B-BD29-46F8-AC4F-927850B2B9A2}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -2002,6 +2014,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO] := Null;
 end;
 
+function TEmpresasBusinessProcessorRules.GetID_FORMA_PAGO_PROVEEDORESValue: SmallInt;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO_PROVEEDORES];
+end;
+
+function TEmpresasBusinessProcessorRules.GetID_FORMA_PAGO_PROVEEDORESIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO_PROVEEDORES]);
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldID_FORMA_PAGO_PROVEEDORESValue: SmallInt;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_FORMA_PAGO_PROVEEDORES];
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldID_FORMA_PAGO_PROVEEDORESIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasID_FORMA_PAGO_PROVEEDORES]);
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetID_FORMA_PAGO_PROVEEDORESValue(const aValue: SmallInt);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO_PROVEEDORES] := aValue;
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetID_FORMA_PAGO_PROVEEDORESIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_FORMA_PAGO_PROVEEDORES] := Null;
+end;
+
 function TEmpresasBusinessProcessorRules.GetVALIDEZ_PRESUPUESTOSValue: SmallInt;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasVALIDEZ_PRESUPUESTOS];

Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm

@@ -303,6 +303,10 @@ object srvEmpresas: TsrvEmpresas
               item
                 DatasetField = 'ID_PERFIL'
                 TableField = 'ID_PERFIL'
+              end
+              item
+                DatasetField = 'ID_FORMA_PAGO_PROVEEDORES'
+                TableField = 'ID_FORMA_PAGO_PROVEEDORES'
               end>
           end>
         Name = 'Empresas'
@@ -446,6 +450,10 @@ object srvEmpresas: TsrvEmpresas
             Name = 'ID_FORMA_PAGO'
             DataType = datSmallInt
           end
+          item
+            Name = 'ID_FORMA_PAGO_PROVEEDORES'
+            DataType = datSmallInt
+          end
           item
             Name = 'VALIDEZ_PRESUPUESTOS'
             DataType = datSmallInt
@@ -577,98 +585,144 @@ object srvEmpresas: TsrvEmpresas
           end
           item
             Name = 'NIF_CIF'
+            DataType = datString
+            Size = 15
             Value = ''
           end
           item
             Name = 'NOMBRE'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'RAZON_SOCIAL'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'CALLE'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'POBLACION'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'PROVINCIA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'CODIGO_POSTAL'
+            DataType = datString
+            Size = 10
             Value = ''
           end
           item
             Name = 'TELEFONO_1'
+            DataType = datString
+            Size = 25
             Value = ''
           end
           item
             Name = 'TELEFONO_2'
+            DataType = datString
+            Size = 25
             Value = ''
           end
           item
             Name = 'MOVIL_1'
+            DataType = datString
+            Size = 25
             Value = ''
           end
           item
             Name = 'MOVIL_2'
+            DataType = datString
+            Size = 25
             Value = ''
           end
           item
             Name = 'FAX'
+            DataType = datString
+            Size = 25
             Value = ''
           end
           item
             Name = 'EMAIL_1'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'EMAIL_2'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'PAGINA_WEB'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'NOTAS'
+            DataType = datMemo
             Value = ''
           end
           item
             Name = 'FECHA_ALTA'
+            DataType = datDateTime
             Value = ''
           end
           item
             Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
             Value = ''
           end
           item
             Name = 'USUARIO'
+            DataType = datString
+            Size = 30
             Value = ''
           end
           item
             Name = 'LOGOTIPO'
+            DataType = datBlob
             Value = ''
           end
           item
             Name = 'REGISTRO_MERCANTIL'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'ID_TIPO_IVA'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'ID_FORMA_PAGO'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'VALIDEZ_PRESUPUESTOS'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'ID_FORMA_PAGO_PROVEEDORES'
+            DataType = datSmallInt
             Value = ''
           end>
         Statements = <
@@ -682,12 +736,13 @@ object srvEmpresas: TsrvEmpresas
               'FONO_2, MOVIL_1, MOVIL_2, '#10'     FAX, EMAIL_1, EMAIL_2, PAGINA_WE' +
               'B, NOTAS, FECHA_ALTA, '#10'     FECHA_MODIFICACION, USUARIO, LOGOTIP' +
               'O, REGISTRO_MERCANTIL, '#10'     ID_TIPO_IVA, ID_FORMA_PAGO, VALIDEZ' +
-              '_PRESUPUESTOS)'#10'  VALUES'#10'    (:ID,:NIF_CIF, :NOMBRE, :RAZON_SOCIA' +
+              '_PRESUPUESTOS, ID_FORMA_PAGO_PROVEEDORES)'#10'  VALUES'#10'    (:ID,:NIF' +
-              'L, :CALLE, :POBLACION,'#10'     :PROVINCIA, :CODIGO_POSTAL, :TELEFON' +
+              '_CIF, :NOMBRE, :RAZON_SOCIAL, :CALLE, :POBLACION,'#10'     :PROVINCI' +
-              'O_1, :TELEFONO_2, '#10'     :MOVIL_1, :MOVIL_2, :FAX, :EMAIL_1, :EMA' +
+              'A, :CODIGO_POSTAL, :TELEFONO_1, :TELEFONO_2, '#10'     :MOVIL_1, :MO' +
-              'IL_2, :PAGINA_WEB, '#10'     :NOTAS, :FECHA_ALTA, :FECHA_MODIFICACIO' +
+              'VIL_2, :FAX, :EMAIL_1, :EMAIL_2, :PAGINA_WEB, '#10'     :NOTAS, :FEC' +
-              'N, :USUARIO, '#10'     :LOGOTIPO, :REGISTRO_MERCANTIL, :ID_TIPO_IVA,' +
+              'HA_ALTA, :FECHA_MODIFICACION, :USUARIO, '#10'     :LOGOTIPO, :REGIST' +
-              ' :ID_FORMA_PAGO, '#10'     :VALIDEZ_PRESUPUESTOS)'#10
+              'RO_MERCANTIL, :ID_TIPO_IVA, :ID_FORMA_PAGO, '#10'     :VALIDEZ_PRESU' +
+              'PUESTOS, :ID_FORMA_PAGO_PROVEEDORES)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -849,6 +904,11 @@ object srvEmpresas: TsrvEmpresas
             DataType = datSmallInt
             Value = ''
           end
+          item
+            Name = 'ID_FORMA_PAGO_PROVEEDORES'
+            DataType = datSmallInt
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -870,8 +930,9 @@ object srvEmpresas: TsrvEmpresas
               'CHA_MODIFICACION, '#10'    USUARIO = :USUARIO, '#10'    LOGOTIPO = :LOGO' +
               'TIPO, '#10'    REGISTRO_MERCANTIL = :REGISTRO_MERCANTIL, '#10'    ID_TIP' +
               'O_IVA = :ID_TIPO_IVA, '#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO, '#10'    ' +
-              'VALIDEZ_PRESUPUESTOS = :VALIDEZ_PRESUPUESTOS'#10'  WHERE'#10'    (ID = :' +
+              'VALIDEZ_PRESUPUESTOS = :VALIDEZ_PRESUPUESTOS,'#10'    ID_FORMA_PAGO_' +
-              'OLD_ID)'#10
+              'PROVEEDORES = :ID_FORMA_PAGO_PROVEEDORES'#10'  WHERE'#10'    (ID = :OLD_' +
+              'ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm

@@ -35,7 +35,7 @@ inherited frViewEmpresa: TfrViewEmpresa
     end
     object eCalle: TcxDBTextEdit
       Left = 195
-      Top = 247
+      Top = 274
       DataBinding.DataField = 'CALLE'
       DataBinding.DataSource = DADataSource
       Style.BorderColor = clWindowFrame
@@ -52,12 +52,12 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 6
+      TabOrder = 7
       Width = 84
     end
     object cbProvincia: TcxDBComboBox
       Left = 195
-      Top = 274
+      Top = 301
       DataBinding.DataField = 'PROVINCIA'
       DataBinding.DataSource = DADataSource
       Properties.OnInitPopup = eProvinciaPropertiesInitPopup
@@ -77,12 +77,12 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 8
       Width = 106
     end
     object cbPoblacion: TcxDBComboBox
       Left = 195
-      Top = 301
+      Top = 328
       DataBinding.DataField = 'POBLACION'
       DataBinding.DataSource = DADataSource
       Properties.OnInitPopup = ePoblacionPropertiesInitPopup
@@ -102,12 +102,12 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 10
       Width = 100
     end
     object eCodigoPostal: TcxDBTextEdit
       Left = 369
-      Top = 274
+      Top = 301
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = DADataSource
       Style.BorderColor = clWindowFrame
@@ -124,7 +124,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 8
+      TabOrder = 9
       Width = 65
     end
     object ePaginaWeb: TcxDBTextEdit
@@ -146,7 +146,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 17
+      TabOrder = 18
       Width = 165
     end
     object eMailParticular: TcxDBTextEdit
@@ -168,7 +168,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
+      TabOrder = 17
       Width = 165
     end
     object eMailTrabajo: TcxDBTextEdit
@@ -190,7 +190,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 15
+      TabOrder = 16
       Width = 129
     end
     object eTlfParticular: TcxDBTextEdit
@@ -212,7 +212,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
+      TabOrder = 13
       Width = 91
     end
     object eTlfTrabajo: TcxDBTextEdit
@@ -234,7 +234,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
+      TabOrder = 12
       Width = 127
     end
     object eTlfMovil: TcxDBTextEdit
@@ -256,7 +256,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
+      TabOrder = 14
       Width = 155
     end
     object eFax: TcxDBTextEdit
@@ -278,7 +278,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 14
+      TabOrder = 15
       Width = 391
     end
     object eNombre: TcxDBTextEdit
@@ -367,7 +367,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 18
+      TabOrder = 19
       Height = 100
       Width = 140
     end
@@ -427,7 +427,7 @@ inherited frViewEmpresa: TfrViewEmpresa
     end
     inline frViewObservaciones1: TfrViewObservaciones
       Left = 22
-      Top = 358
+      Top = 385
       Width = 521
       Height = 150
       Font.Charset = DEFAULT_CHARSET
@@ -436,10 +436,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 10
+      TabOrder = 11
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 358
+      ExplicitTop = 385
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'NOTAS'
         DataBinding.DataSource = DADataSource
@@ -447,7 +447,7 @@ inherited frViewEmpresa: TfrViewEmpresa
     end
     object eValidez: TcxDBSpinEdit
       Left = 195
-      Top = 190
+      Top = 217
       DataBinding.DataField = 'VALIDEZ_PRESUPUESTOS'
       DataBinding.DataSource = DADataSource
       Properties.Alignment.Horz = taRightJustify
@@ -464,9 +464,36 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 5
+      TabOrder = 6
       Width = 121
     end
+    object cbFormaPagoProveedores: TcxComboBox
+      Left = 195
+      Top = 190
+      Anchors = [akLeft, akTop, akRight]
+      Properties.DropDownListStyle = lsEditFixedList
+      Properties.DropDownRows = 25
+      Properties.ImmediatePost = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 5
+      Width = 239
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -504,10 +531,15 @@ inherited frViewEmpresa: TfrViewEmpresa
             ControlOptions.ShowBorder = False
           end
           object dxLayoutControl1Item18: TdxLayoutItem
-            Caption = 'Forma de pago por defecto:'
+            Caption = 'Forma de pago para clientes:'
             Control = cbFormaPago
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item22: TdxLayoutItem
+            Caption = 'Forma pago para proveedores'
+            Control = cbFormaPagoProveedores
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControl1Item21: TdxLayoutItem
             Caption = 'Meses de validez en presupuestos:'
             Control = eValidez

Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas

@@ -86,6 +86,8 @@ type
     dxLayoutControl1Item8: TdxLayoutItem;
     eValidez: TcxDBSpinEdit;
     dxLayoutControl1Item21: TdxLayoutItem;
+    dxLayoutControl1Item22: TdxLayoutItem;
+    cbFormaPagoProveedores: TcxComboBox;
     procedure actAnadirExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
@@ -93,6 +95,7 @@ type
     procedure eProvinciaPropertiesInitPopup(Sender: TObject);
     procedure ePoblacionPropertiesInitPopup(Sender: TObject);
     procedure FormaPagoEditValueChanged(Sender: TObject);
+    procedure FormaPagoProveedoresEditValueChanged(Sender: TObject);
     procedure TipoIVAEditValueChanged(Sender: TObject);
     procedure CustomViewShow(Sender: TObject);
 
@@ -247,13 +250,20 @@ var
 begin
   inherited;
 
-  //Activamos la forma de pago que tenga la empresa
+  //Activamos la forma de pago para clientes que tenga la empresa
   cbFormaPago.ItemIndex := 0;
   for i := 0 to FFormasPago.Count - 1 do
       if IntToStr(FEmpresa.ID_FORMA_PAGO) = FFormasPago.Values[FFormasPago.Names[i]] then
          cbFormaPago.ItemIndex := i;
 
+  //Activamos la forma de pago para proveedores que tenga la empresa
+  cbFormaPagoProveedores.ItemIndex := 0;
+  for i := 0 to FFormasPago.Count - 1 do
+      if IntToStr(FEmpresa.ID_FORMA_PAGO_PROVEEDORES) = FFormasPago.Values[FFormasPago.Names[i]] then
+         cbFormaPagoProveedores.ItemIndex := i;
+
   cbFormaPago.Properties.OnEditValueChanged := FormaPagoEditValueChanged;
+  cbFormaPagoProveedores.Properties.OnEditValueChanged := FormaPagoProveedoresEditValueChanged;
 
   //Activamos el tipo iva que tenga la empresa
   cbTipoIVA.ItemIndex := 0;
@@ -319,6 +329,17 @@ begin
   Controller.AsignarIDFormaPago(FEmpresa, IDFormaPago);
 end;
 
+procedure TfrViewEmpresa.FormaPagoProveedoresEditValueChanged(Sender: TObject);
+var
+ IDFormaPago: String;
+begin
+  IDFormaPago := '';
+  if Assigned(FFormasPago) then
+     IDFormaPago := FFormasPago.Values[cbFormaPagoProveedores.EditValue];
+
+  Controller.AsignarIDFormaPagoProveedores(FEmpresa, IDFormaPago);
+end;
+
 function TfrViewEmpresa.GetController: IEmpresasController;
 begin
   Result := FController;
@@ -351,6 +372,19 @@ begin
         end;
       end;
 
+    if Assigned(FFormasPago) then
+      with cbFormaPagoProveedores.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FFormasPago.Count - 1 do
+              Add(FFormasPago.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+
     FTiposIVA := FController.DarListaTiposIVA;
     if Assigned(FTiposIVA) then
       with cbTipoIVA.Properties.Items do

Source/ApplicationBase/uFactuGES_App.pas

@@ -9,9 +9,17 @@ uses
 
 const
   CTE_PERFIL_ADMINISTRADOR = 2;
-  CTE_PREFIL_GERENCIA = 3;
+  CTE_PREFIL_GERENCIA_COMUN = 3;
-  CTE_PERFIL_VENDEDOR = 4;
+  CTE_PERFIL_VENDEDOR_COMUN = 4;
   CTE_PREFIL_LOGISTICA = 5;
+  CTE_PREFIL_GERENCIA_ACANA = 6;
+  CTE_PREFIL_GERENCIA_CRISTINA = 7;
+  CTE_PERFIL_VENDEDOR_ACANA = 8;
+  CTE_PERFIL_VENDEDOR_CRISTINA = 9;
+
+  CTE_EMPRESA_ALISO = 5;
+  CTE_EMPRESA_CRISTINA = 6;
+
 
 type
   TAppFactuGES_Event = procedure;

Source/Base/Base.dproj

@@ -44,13 +44,6 @@
     <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="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</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><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -65,56 +58,56 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\designide.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\dxCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\PluginSDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Base/Controladores/uControllerDetallesBase.pas

@@ -755,6 +755,8 @@ begin
           FieldByName(CAMPO_CANTIDAD).AsVariant := Null;
           FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
           FieldByName(CAMPO_IMPORTE_TOTAL).AsVariant := Null;
+          FieldByName(CAMPO_INCREMENTO).AsVariant := Null;
+          FieldByName(CAMPO_DECREMENTO).AsVariant := Null;
           FieldByName(CAMPO_DESCUENTO).AsVariant := Null;
           FieldByName(CAMPO_IMPORTE_PORTE).AsVariant := Null;
 

Source/Base/Utiles/uCalculosUtils.pas

@@ -14,6 +14,8 @@ const
   CAMPO_CANTIDAD = 'CANTIDAD';
   CAMPO_IMPORTE_UNIDAD = 'IMPORTE_UNIDAD';
   CAMPO_IMPORTE_TOTAL = 'IMPORTE_TOTAL';
+  CAMPO_INCREMENTO = 'INCREMENTO';
+  CAMPO_DECREMENTO = 'DECREMENTO';    
   CAMPO_DESCUENTO = 'DESCUENTO';
   CAMPO_IMPORTE_PORTE = 'IMPORTE_PORTE';
   CAMPO_VISIBLE = 'VISIBLE'; //Se usará para saber si un concepto se debe sumar o no
@@ -25,27 +27,61 @@ const
   procedure DesglosarPorte(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
   function DarTotalPorte(ADetalles: IDAStronglyTypedDataTable): Double;
 
+  function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0): Double;
 
 implementation
 
 uses
-  SysUtils, DB, Variants, cxControls;
+  SysUtils, DB, Variants, cxControls, uNumUtils;
+
+function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0): Double;
+var
+  PorcentajeIncrementar: Double;
+  ValorADecrementar: Double;
+
+begin
+//Regla de 3 escalar el precio complementario pedido por José Luís
+//1000x40% = 1000 - 400 = 600: 1000 = 0,6 -> precio coste: 0,6
+  PorcentajeIncrementar := ((100 - Incremento)/100);
+//Desactivamos a petición José Luís
+//  ValorADecrementar := ImporteUnidad * (Decremento/100);
+  Result := RoundCurrency(ImporteUnidad/PorcentajeIncrementar);
+end;
 
 function CalcularLineaConcepto (const ADataTable : TDADataTable): Double;
 var
-  ImporteTotal : Double;
+  AField: TDAField;
+  ImporteTotal, ImporteNeto, Incremento, Decremento, Descuento, ImportePorte : Double;
 begin
   with ADataTable do
   begin
-    if (VarIsNull(FieldByName(CAMPO_DESCUENTO).AsVariant)) then
+    Incremento := 0;
-      ImporteTotal := FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat
+    Decremento := 0;
-    else
+    Descuento := 0;
-      ImporteTotal := FieldByName(CAMPO_CANTIDAD).asFloat * (FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat - (FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat * (FieldByName(CAMPO_DESCUENTO).AsFloat/100)));
+    ImportePorte := 0;
+    ImporteNeto := FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat;
 
-    if (VarIsNull(FieldByName(CAMPO_IMPORTE_PORTE).AsVariant)) then
+    //Validamos la existencia del campo incremento, por si no está activo en otros módulos que no sean (presupuestos y contratos)
-      ImporteTotal := ImporteTotal
+    AField := FindField(CAMPO_INCREMENTO);
-    else
+    if Assigned(AField) then
-      ImporteTotal := ImporteTotal + (FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_PORTE).AsFloat);
+    if (not VarIsNull(AField.AsVariant)) then
+      Incremento := AField.AsFloat;
+
+    //Validamos la existencia del campo decremento, por si no está activo en otros módulos que no sean (presupuestos y contratos)
+    AField := FindField(CAMPO_DECREMENTO);
+    if Assigned(AField) then
+    if (not VarIsNull(AField.AsVariant)) then
+      Decremento := AField.AsFloat;
+
+    ImporteNeto := CalcularImporteNeto(ImporteNeto, Incremento, Decremento);
+
+    if (not VarIsNull(FieldByName(CAMPO_DESCUENTO).AsVariant)) then
+      Descuento :=  ImporteNeto * (FieldByName(CAMPO_DESCUENTO).AsFloat/100);
+
+    if (not VarIsNull(FieldByName(CAMPO_IMPORTE_PORTE).AsVariant)) then
+      ImportePorte := FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_PORTE).AsFloat;
+
+    ImporteTotal := (RoundCurrency(ImporteNeto - Descuento) * FieldByName(CAMPO_CANTIDAD).asFloat) + ImportePorte;
   end;
 
   Result := ImporteTotal;

Source/Base/Utiles/uSistemaFunc.pas

@@ -48,8 +48,10 @@ function GetSpecialFolderPath(folder : integer) : string;
 function PreguntarRuta(const ATitulo: String; const AComentario: String; var ARuta: String): Boolean;
 function PreguntarFicheroWordExportar (var Fichero : String) : Boolean;
 function PreguntarFicheroExcelExportar (var Fichero : String) : Boolean;
+function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean;
 function EscapeIllegalChars(AFileName: string): string;
 function FindFile(const filespec: TFileName; attributes: integer = faReadOnly Or faHidden Or faSysFile Or faArchive): TStringList;
+function ExecAndWait(sCommandLine: string): Boolean;
 
 function DarRutaFichero(const ARutaIni: String; const AFichero: String; const ADirectorio1: String = ''; const ADirectorio2: String = ''): Variant;
 
@@ -66,6 +68,34 @@ uses
   StdCtrls, SHFolder, cxShellBrowserDialog,
   cxLookAndFeels, uStringsUtils;
 
+function ExecAndWait(sCommandLine: string): Boolean;
+var
+  dwExitCode: DWORD;
+  tpiProcess: TProcessInformation;
+  tsiStartup: TStartupInfo;
+begin
+  Result := False;
+  FillChar(tsiStartup, SizeOf(TStartupInfo), 0);
+  tsiStartup.cb := SizeOf(TStartupInfo);
+  if CreateProcess(nil, PChar(sCommandLine), nil, nil, False, 0,
+    nil, nil, tsiStartup, tpiProcess) then
+  begin
+    if WAIT_OBJECT_0 = WaitForSingleObject(tpiProcess.hProcess, INFINITE) then
+    begin
+      if GetExitCodeProcess(tpiProcess.hProcess, dwExitCode) then
+      begin
+        if dwExitCode = 0 then
+          Result := True
+        else
+          SetLastError(dwExitCode + $2000);
+      end;
+    end;
+    dwExitCode := GetLastError;
+    CloseHandle(tpiProcess.hProcess);
+    CloseHandle(tpiProcess.hThread);
+    SetLastError(dwExitCode);
+  end;
+end;
 
 function GetSpecialFolderPath(folder : integer) : string;
 const
@@ -465,6 +495,27 @@ begin
   end
 end;
 
+function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean;
+var
+  DialogoSalvar : TSaveDialog;
+begin
+  DialogoSalvar := TSaveDialog.Create(NIL);
+  try
+    with DialogoSalvar do
+    begin
+      DefaultExt := 'pdf';
+      Filter := 'Documento pdf (*.pdf)|*.pdf';
+      FileName := Fichero;
+      FilterIndex := 0;
+      Options := [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing];
+    end;
+    Result := DialogoSalvar.Execute;
+    if Result then
+      Fichero := DialogoSalvar.FileName;
+  finally
+    DialogoSalvar.Free;
+  end;
+end;
 
 
 procedure SetDefaultFonts(const AFont: TFont);

Source/Cliente/FactuGES.dproj

@@ -52,7 +52,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.9.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.9.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
@@ -88,8 +88,8 @@ Foreground Tab=0
 Freeze Activate=0
 Freeze Timeout=60
 SMTP From=info@acanainteriorismo.com
-SMTP Host=europe%2Dpriva45.privatednsorg.com
+SMTP Host=mail.acanainteriorismo.com
-SMTP Port=25
+SMTP Port=587
 SMTP UserID=info@acanainteriorismo.com
 SMTP Password=*Acana2014
 Append to Log=0

Source/Cliente/FactuGES.rc

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

Source/Cliente/uPantallaPrincipal.pas

@@ -195,8 +195,21 @@ end;
 
 procedure TfPantallaPrincipal.FormShow(Sender: TObject);
 begin
-  //El usuario vendedor y logistica será restringido
+  //El usuario administrador y gerencia verán todo
-  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR)
+  OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_COMUN)
+  OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_ACANA)
+  OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA_CRISTINA)
+  ) then
+  begin
+    Informes1.Enabled := True;
+    Informes1.Visible := True;
+    Contabilidad1.Enabled := True;
+    Contabilidad1.Visible := True;
+    Informacindeempresa1.Visible := True;
+  end
+  else
+  //todos los demás serán restringidos
   begin
     Informes1.Enabled := False;
     Informes1.Visible := False;
@@ -211,7 +224,10 @@ begin
   if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PERFIL_ADMINISTRADOR) then
   begin
     Administracin1.Visible := False;
-    if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA) then
+    if ((AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA_COMUN)
+    OR (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA_ACANA)
+    OR (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA_CRISTINA)
+    ) then
        ConfigurarFactuGES1.Visible := False;
   end;
 end;
@@ -351,7 +367,7 @@ begin
     ScaleFormFont(Self);
     
     CargarIdioma;
-    
+
     for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
       MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
 

Source/GUIBase/GUIBase.dproj

@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\ccpackD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\cxExportD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\dxLayoutControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\dxPScxCommonD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\frx11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\frxe11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\fs11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\JvAppFrmD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\JvGlobusD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\tb2k_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Model\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/GUIBase/uEditorBase.dfm

@@ -19,7 +19,7 @@ object fEditorBase: TfEditorBase
   TextHeight = 13
   object JvNavPanelHeader: TJvNavPanelHeader
     Left = 0
-    Top = 58
+    Top = 49
     Width = 946
     Align = alTop
     Caption = 'Editor'
@@ -34,6 +34,7 @@ object fEditorBase: TfEditorBase
     ImageIndex = 0
     StyleManager = dmBase.StyleManager
     ParentStyleManager = False
+    ExplicitTop = 58
     object Image1: TImage
       Left = 919
       Top = 0
@@ -68,10 +69,10 @@ object fEditorBase: TfEditorBase
     Left = 0
     Top = 0
     Width = 946
-    Height = 58
+    Height = 49
     object tbxMain: TTBXToolbar
       Left = 0
-      Top = 29
+      Top = 23
       Caption = 'tbxMain'
       ChevronHint = 'M'#225's botones|'
       DockMode = dmCannotFloatOrChangeDocks

Source/GUIBase/uEditorBase.pas

@@ -477,7 +477,7 @@ begin
     AWindowText := ATitulo;
   end;
 
-  if ReadOnly then
+  if Self.ReadOnly then
   begin
     AHeaderText := AHeaderText + '   (NO MODIFICABLE)';
     AWindowText := AWindowText + '   (NO MODIFICABLE)';
@@ -507,13 +507,14 @@ var
   i: integer;
 begin
   inherited;
-
+  if (csLoading in Self.ComponentState) then
-  if ReadOnly then
+    Exit;
-     for i:=0 to Self.ComponentCount-1 do
+  
-     begin
+  for i:=0 to Self.ComponentCount-1 do
-         If Self.Components[i] Is TfrViewBase then
+  begin
-           (Self.Components[i] as TfrViewBase).ReadOnly := ReadOnly
+    if Self.Components[i] is TfrViewBase then
-     end;
+      (Self.Components[i] as TfrViewBase).ReadOnly := Self.ReadOnly
+  end
 end;
 
 procedure TfEditorBase.SetWindowCaption(const Value: String);

Source/GUIBase/uEditorDBBase.dfm

@@ -5,7 +5,7 @@ inherited fEditorDBBase: TfEditorDBBase
   ClientHeight = 454
   ClientWidth = 646
   ExplicitWidth = 654
-  ExplicitHeight = 488
+  ExplicitHeight = 492
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/GUIBase/uEditorDBItem.dfm

@@ -10,12 +10,45 @@ inherited fEditorDBItem: TfEditorDBItem
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 650
+    ExplicitTop = 49
     ExplicitWidth = 650
     inherited Image1: TImage
       Left = 623
       ExplicitLeft = 627
       ExplicitHeight = 19
     end
+    object lblDesbloquear: TcxLabel
+      AlignWithMargins = True
+      Left = 525
+      Top = 0
+      Margins.Left = 8
+      Margins.Top = 0
+      Margins.Right = 8
+      Margins.Bottom = 0
+      Align = alRight
+      AutoSize = False
+      Caption = 'Desbloquear'
+      Enabled = False
+      ParentFont = False
+      Style.HotTrack = True
+      Style.LookAndFeel.NativeStyle = False
+      Style.TextColor = clWindow
+      StyleDisabled.LookAndFeel.NativeStyle = False
+      StyleFocused.BorderStyle = ebsNone
+      StyleFocused.LookAndFeel.NativeStyle = False
+      StyleHot.BorderStyle = ebsNone
+      StyleHot.LookAndFeel.NativeStyle = False
+      StyleHot.TextStyle = [fsUnderline]
+      Properties.Alignment.Horz = taCenter
+      Properties.Alignment.Vert = taVCenter
+      Transparent = True
+      Visible = False
+      OnClick = lblDesbloquearClick
+      Height = 27
+      Width = 90
+      AnchorX = 570
+      AnchorY = 14
+    end
   end
   inherited TBXDock: TTBXDock
     Width = 650
@@ -83,8 +116,6 @@ inherited fEditorDBItem: TfEditorDBItem
     ActivePage = pagGeneral
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 118
-    ExplicitHeight = 319
     object pagGeneral: TTabSheet
       Caption = 'General'
       ExplicitLeft = 0
@@ -105,7 +136,6 @@ inherited fEditorDBItem: TfEditorDBItem
     ParentBackground = False
     TabOrder = 4
     VerticalAlignment = taAlignTop
-    ExplicitTop = 85
     object lbComentario: TLabel
       AlignWithMargins = True
       Left = 6

Source/GUIBase/uEditorDBItem.pas

@@ -9,7 +9,8 @@ uses
   JvNavigationPane, DB, uDADataTable, uEditorDBBase, JvFormAutoSize,
   StdCtrls, uDAScriptingProvider, uDACDSDataTable, AppEvnts, uCustomView,
   uViewBase, JvAppStorage, JvAppRegistryStorage, ExtCtrls, uDAInterfaces,
-  JvComponentBase, JvFormPlacement, JvExComCtrls, JvStatusBar, pngimage;
+  JvComponentBase, JvFormPlacement, JvExComCtrls, JvStatusBar, pngimage,
+  cxControls, cxContainer, cxEdit, cxLabel;
 
 type
   IEditorDBItem = interface(IEditorDBBase)
@@ -25,6 +26,8 @@ type
     imgStatus: TImage;
     PnlComentario: TPanel;
     lbComentario: TLabel;
+    lblDesbloquear: TcxLabel;
+    procedure lblDesbloquearClick(Sender: TObject);
 
   protected
     FComentario: Variant;
@@ -42,7 +45,7 @@ type
 implementation
 
 uses
-  uEditorBase, uDialogUtils;
+  uEditorBase, uDialogUtils, uDataTableUtils;
 
 {$R *.dfm}
 
@@ -51,6 +54,9 @@ begin
   inherited;
   if HayDatos then
   begin
+    if lblDesbloquear.Enabled then
+      lblDesbloquear.Visible := ReadOnly;
+
     if (Self.Modified) and (dsDataTable.DataTable.State <> dsInsert) then
     begin
       StatusBar.Panels[0].Text := '       Se han producido cambios';
@@ -80,6 +86,21 @@ begin
   Result := FComentario;
 end;
 
+procedure TfEditorDBItem.lblDesbloquearClick(Sender: TObject);
+begin
+  inherited;
+
+  if (ShowConfirmMessage('¿Desbloquear los datos para permitir cambios?', 'Actualmente, los datos de esta pantalla no se pueden modificar.' + #13#10 +
+      'Temporalmente puede desbloquear la ficha para realizar cambios puntuales. ¿Desea continuar?') = IDYES) then
+  begin
+    lblDesbloquear.Visible := False;
+    lblDesbloquear.Enabled := False;
+    SetDataTableReadOnly(dsDataTable.DataTable, False);
+    Self.ReadOnly := False;
+    ActualizarEstadoEditor;
+  end;
+end;
+
 procedure TfEditorDBItem.SetComentario(const Value: Variant);
 begin
   FComentario := Value;

Source/GUIBase/uEditorGridBase.dfm

@@ -104,7 +104,7 @@ inherited fEditorGridBase: TfEditorGridBase
         Caption = 'Filtrar:'
       end
       object tbxEditFiltro: TTBXEditItem
-        EditWidth = 200
+        EditWidth = 125
         ImageIndex = 10
         EditorFontSettings.Italic = tsTrue
         ExtendedAccept = True
@@ -112,6 +112,17 @@ inherited fEditorGridBase: TfEditorGridBase
         ShowImage = True
         OnChange = tbxEditFiltroChange
       end
+      object tbxEditFiltro2: TTBXEditItem
+        EditWidth = 125
+        Enabled = False
+        ImageIndex = 10
+        Visible = False
+        EditorFontSettings.Italic = tsTrue
+        ExtendedAccept = True
+        Images = SmallImages
+        ShowImage = True
+        OnChange = tbxEditFiltro2Change
+      end
       object TBXItem34: TTBXItem
         Action = actQuitarFiltro
       end
@@ -168,7 +179,7 @@ inherited fEditorGridBase: TfEditorGridBase
       end
     end
     object TBXTMain2: TTBXToolbar
-      Left = 337
+      Left = 334
       Top = 49
       Caption = 'tbxMain'
       ChevronHint = 'M'#225's botones|'

Source/GUIBase/uEditorGridBase.pas

@@ -67,7 +67,9 @@ type
     lblAno: TTBXLabelItem;
     cbxListaAnos: TTBXComboBoxItem;
     sepAno: TTBXSeparatorItem;
+    tbxEditFiltro2: TTBXEditItem;
     procedure tbxEditFiltroChange(Sender: TObject; const Text: String);
+    procedure tbxEditFiltro2Change(Sender: TObject; const Text: string);
     procedure FormShow(Sender: TObject);
     procedure actQuitarFiltroExecute(Sender: TObject);
     procedure actDuplicarUpdate(Sender: TObject);
@@ -81,6 +83,7 @@ type
     procedure CustomEditorDestroy(Sender: TObject);
     procedure actExportarExcelExecute(Sender: TObject);
     procedure actExportarExcelUpdate(Sender: TObject);
+
   protected
     FListaAnos: TStringList;
     FViewGrid : IViewGridBase;
@@ -224,6 +227,18 @@ begin
   end;
 end;
 
+procedure TfEditorGridBase.tbxEditFiltro2Change(Sender: TObject;
+  const Text: string);
+begin
+  if Assigned(ViewGrid) then
+  begin
+    if Length(Text) > 0 then
+      ViewGrid.Filter2 := Text
+    else
+      actQuitarFiltro.Execute;
+  end;
+end;
+
 procedure TfEditorGridBase.tbxEditFiltroChange(Sender: TObject; const Text: String);
 begin
   if Assigned(ViewGrid) then
@@ -244,7 +259,7 @@ begin
     ViewGrid.RestoreFromIniFile;
   end;
 
-  cbxListaAnos.ItemIndex := 0;
+  cbxListaAnos.ItemIndex := 0;  
 end;
 
 procedure TfEditorGridBase.actEliminarUpdate(Sender: TObject);
@@ -281,6 +296,7 @@ begin
      if ViewGrid.ViewFiltros.VerFiltros then
      begin
        tbxEditFiltro.Visible := False;
+       tbxEditFiltro2.Visible := False;
        TBXItem7.Visible := False;
      end
      else
@@ -288,6 +304,12 @@ begin
        tbxEditFiltro.Text := '';
        tbxEditFiltro.Visible := True;
        TBXItem7.Visible := True;
+
+       if (tbxEditFiltro2.Enabled) then
+       begin
+         tbxEditFiltro2.Text := '';
+         tbxEditFiltro2.Visible := True;
+       end;
      end;
 end;
 
@@ -326,6 +348,8 @@ begin
   begin
     tbxEditFiltro.Text := '';
     ViewGrid.Filter := '';
+    tbxEditFiltro2.Text := '';
+    ViewGrid.Filter2 := '';
   end;
 end;
 

Source/GUIBase/uViewBase.pas

@@ -41,16 +41,18 @@ var
 begin
   inherited;
 
-  if ReadOnly then
+  if (csLoading in Self.ComponentState) then
-     for i:=0 to Self.ComponentCount-1 do
+    Exit;
-     begin
-         If (Self.Components[i] Is TfrViewBase) then
-           (Self.Components[i] as TfrViewBase).ReadOnly := ReadOnly;
 
-         If (Self.Components[i] Is TcxControl)
+  for i:=0 to Self.ComponentCount-1 do
-         and (not (Self.Components[i] Is TdxLayoutControl)) then
+  begin
-            (Self.Components[i] as TcxControl).Enabled := not ReadOnly;
+     if (Self.Components[i] is TfrViewBase) then
-     end;
+       (Self.Components[i] as TfrViewBase).ReadOnly := Self.ReadOnly;
+
+     if (Self.Components[i] is TcxControl)
+        and (not (Self.Components[i] Is TdxLayoutControl)) then
+        (Self.Components[i] as TcxControl).Enabled := not Self.ReadOnly;
+  end;
 end;
 
 end.

Source/GUIBase/uViewDetallesBase.dfm

@@ -64,7 +64,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       DroppedDownWidth = 145
       MaxMRUCount = 0
       FontName = 'Tahoma'
-      ItemIndex = 40
+      ItemIndex = 35
       Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
       Sorted = True
       TabOrder = 2
@@ -147,15 +147,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 75
+    Top = 72
     Width = 451
-    Height = 229
+    Height = 232
     Align = alClient
     TabOrder = 1
     LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
-    ExplicitTop = 72
-    ExplicitHeight = 232
     object cxGridView: TcxGridDBTableView
       OnKeyDown = cxGridViewKeyDown
       NavigatorButtons.ConfirmDelete = False
@@ -387,7 +385,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     Left = 0
     Top = 46
     Width = 451
-    Height = 29
+    Height = 26
     BackgroundOnToolbars = False
     UseParentBackground = True
     object TBXToolbar1: TTBXToolbar

Source/GUIBase/uViewDetallesBase.pas

@@ -11,7 +11,7 @@ uses
   PngImageList, cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox,
   uGridUtils, uControllerDetallesBase, cxCurrencyEdit, ExtCtrls, Grids, DBGrids, StdCtrls,
   ExtActns, StdActns, cxRichEdit, JvExStdCtrls, JvCombobox, JvColorCombo,
-  TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces;
+  TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces, cxMemo;
 
 type
   IViewDetallesBase = interface(IViewBase)
@@ -241,6 +241,9 @@ var
   AuxTop, AuxRow:Integer;
 
 begin
+  if (Application.MessageBox('¿Está seguro que desea borrar este artículo?', 'Atención', MB_YESNO) = IDNO) then
+     Exit;
+
   cxGridView.BeginUpdate;
   try
     if Assigned(Controller)

Source/GUIBase/uViewDetallesDTO.dfm

@@ -24,15 +24,31 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
   end
   inherited cxGrid: TcxGrid
     inherited cxGridView: TcxGridDBTableView
-      object cxGridViewDESCUENTO: TcxGridDBColumn [6]
+      object cxGridViewINCREMENTO: TcxGridDBColumn [6]
-        Caption = 'Dto'
+        Caption = 'Incremento'
-        DataBinding.FieldName = 'DESCUENTO'
         PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        Properties.Alignment.Vert = taBottomJustify
         Properties.DisplayFormat = ',0.00 %;-,0.00 %'
         Properties.EditFormat = ',0.00;-,0.00'
         Properties.MaxValue = 100.000000000000000000
+        Visible = False
+        HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
       end
-      object cxGridViewIMPORTENETO: TcxGridDBColumn [7]
+      object cxGridViewDECREMENTO: TcxGridDBColumn [7]
+        Caption = 'Decremento'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        Properties.Alignment.Vert = taBottomJustify
+        Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+        Properties.EditFormat = ',0.00;-,0.00'
+        Properties.MaxValue = 100.000000000000000000
+        Visible = False
+        HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
+      end
+      object cxGridViewIMPORTENETO: TcxGridDBColumn [8]
         Caption = 'Importe neto'
         DataBinding.ValueType = 'Currency'
         PropertiesClassName = 'TcxCurrencyEditProperties'
@@ -41,17 +57,44 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
         Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
         Properties.ReadOnly = True
         Properties.OnValidate = cxGridViewIMPORTENETOPropertiesValidate
+        Visible = False
         OnGetDisplayText = cxGridViewIMPORTENETOGetDisplayText
         HeaderAlignmentHorz = taRightJustify
         Options.Editing = False
+        VisibleForCustomization = False
       end
-      object cxGridViewIMPORTEPORTE: TcxGridDBColumn [8]
+      object cxGridViewDESCUENTO: TcxGridDBColumn [9]
+        Caption = 'Dto'
+        DataBinding.FieldName = 'DESCUENTO'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+        Properties.EditFormat = ',0.00;-,0.00'
+        Properties.MaxValue = 100.000000000000000000
+        VisibleForCustomization = False
+      end
+      object cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn [10]
+        Caption = 'Importe u. con dto'
+        DataBinding.ValueType = 'Currency'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        Properties.ReadOnly = True
+        OnGetDisplayText = cxGridViewIMP_UNIDAD_DTOGetDisplayText
+        HeaderAlignmentHorz = taRightJustify
+        Options.Editing = False
+        VisibleForCustomization = False
+      end
+      object cxGridViewIMPORTEPORTE: TcxGridDBColumn [11]
         Caption = 'Importe porte'
         DataBinding.FieldName = 'IMPORTE_PORTE'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
         Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
+        Visible = False
         HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
+      end
+      inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
+        VisibleForCustomization = False
       end
     end
   end

Source/GUIBase/uViewDetallesDTO.pas

@@ -10,7 +10,7 @@ uses
   StdActns, ExtActns, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, cxGridLevel,
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, ComCtrls, StdCtrls, JvExStdCtrls,
-  JvCombobox, JvColorCombo, ToolWin, uDAInterfaces;
+  JvCombobox, JvColorCombo, ToolWin, uDAInterfaces, cxTextEdit, cxMemo;
 
 type
   IViewDetallesDTO = interface(IViewDetallesBase)
@@ -21,10 +21,15 @@ type
     cxGridViewDESCUENTO: TcxGridDBColumn;
     cxGridViewIMPORTEPORTE: TcxGridDBColumn;
     cxGridViewIMPORTENETO: TcxGridDBColumn;
+    cxGridViewDECREMENTO: TcxGridDBColumn;
+    cxGridViewINCREMENTO: TcxGridDBColumn;
+    cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn;
     procedure cxGridViewIMPORTENETOGetDisplayText(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
       var AText: string);
     procedure cxGridViewIMPORTENETOPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+    procedure cxGridViewIMP_UNIDAD_DTOGetDisplayText(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+      var AText: string);
   protected
     function HayQueRecalcular(AItem: TcxCustomGridTableItem): Boolean; override;
   end;
@@ -32,21 +37,34 @@ type
 implementation
 {$R *.dfm}
 
+uses
+  uNumUtils, uCalculosUtils;
+
 { TfrViewDetallesDTO }
 
 procedure TfrViewDetallesDTO.cxGridViewIMPORTENETOGetDisplayText(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   var AText: string);
 var
-  ImporteNeto : Double;
+  ImporteNeto, Incremento, Decremento : Double;
+
 begin
   //Se encarga de mostrar el campo calculado de importe neto
   ImporteNeto := -1;
+  Incremento := 0;
+  Decremento := 0;
 
   if not VarIsNull(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index]) then
-     if not VarIsNull(ARecord.Values[cxGridViewDESCUENTO.Index]) then
+  begin
-        ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index] - ((ARecord.Values[cxGridViewIMPORTEUNIDAD.Index] * ARecord.Values[cxGridViewDESCUENTO.Index])/100)
+     ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index];
-     else
+
-        ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index];
+     if not VarIsNull(ARecord.Values[cxGridViewINCREMENTO.Index]) then
+        Incremento := ARecord.Values[cxGridViewINCREMENTO.Index];
+
+     if not VarIsNull(ARecord.Values[cxGridViewDECREMENTO.Index]) then
+        Decremento := ARecord.Values[cxGridViewDECREMENTO.Index];
+
+     ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento);
+  end;
 
   if (ImporteNeto <> -1) then
   begin
@@ -58,10 +76,47 @@ procedure TfrViewDetallesDTO.cxGridViewIMPORTENETOPropertiesValidate(Sender: TOb
   var Error: Boolean);
 begin
   inherited;
-  if not VarIsNull(DisplayValue) then
+//  if not VarIsNull(DisplayValue) then
+//  begin
+//    cxGridViewDESCUENTO.DataBinding.Field.Value := ((cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value - DisplayValue) * 100) / cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value;
+//    Controller.ActualizarTotales(Detalles);
+//  end;
+end;
+
+procedure TfrViewDetallesDTO.cxGridViewIMP_UNIDAD_DTOGetDisplayText(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+  var AText: string);
+var
+  ImporteUnidadDTO, ImporteNeto, Incremento, Decremento, Descuento : Double;
+
+begin
+  //Se encarga de mostrar el campo calculado de importe neto
+  ImporteNeto := -1;
+  Incremento := 0;
+  Decremento := 0;
+  Descuento := 0;
+
+  if not VarIsNull(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index]) then
   begin
-    cxGridViewDESCUENTO.DataBinding.Field.Value := ((cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value - DisplayValue) * 100) / cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value;
+     ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index];
-    Controller.ActualizarTotales(Detalles);
+
+     if not VarIsNull(ARecord.Values[cxGridViewINCREMENTO.Index]) then
+        Incremento := ARecord.Values[cxGridViewINCREMENTO.Index];
+
+     if not VarIsNull(ARecord.Values[cxGridViewDECREMENTO.Index]) then
+        Decremento := ARecord.Values[cxGridViewDECREMENTO.Index];
+
+     ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento);
+
+     if not VarIsNull(ARecord.Values[cxGridViewDESCUENTO.Index]) then
+        Descuento := ImporteNeto * (ARecord.Values[cxGridViewDESCUENTO.Index]/100);
+
+     ImporteUnidadDTO := RoundCurrency(ImporteNeto - Descuento);
+  end;
+
+
+  if (Descuento <> 0) then
+  begin
+    AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteUnidadDTO))
   end;
 end;
 
@@ -69,7 +124,7 @@ function TfrViewDetallesDTO.HayQueRecalcular(AItem: TcxCustomGridTableItem): Boo
 begin
   Result := inherited HayQueRecalcular(AItem);
   if not Result then
-    Result := (AItem = cxGridViewDESCUENTO) or (AItem = cxGridViewIMPORTEPORTE);
+    Result := (AItem = cxGridViewINCREMENTO) or (AItem = cxGridViewDECREMENTO) or (AItem = cxGridViewDESCUENTO) or (AItem = cxGridViewIMPORTEPORTE);
 end;
 
 end.

Source/GUIBase/uViewFiltroBase.dfm

@@ -1,9 +1,9 @@
 inherited frViewFiltroBase: TfrViewFiltroBase
-  Width = 565
+  Width = 671
-  Height = 102
+  Height = 105
   Visible = False
-  ExplicitWidth = 565
+  ExplicitWidth = 671
-  ExplicitHeight = 102
+  ExplicitHeight = 105
   object TBXDockablePanel1: TTBXDockablePanel
     Left = 0
     Top = 0
@@ -22,8 +22,8 @@ inherited frViewFiltroBase: TfrViewFiltroBase
     object dxLayoutControl1: TdxLayoutControl
       Left = 0
       Top = 0
-      Width = 565
+      Width = 671
-      Height = 68
+      Height = 70
       Align = alTop
       ParentBackground = True
       TabOrder = 0
@@ -49,7 +49,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
         StyleHot.LookAndFeel.NativeStyle = True
         StyleHot.LookAndFeel.SkinName = ''
         TabOrder = 0
-        Width = 273
+        Width = 250
       end
       object edtFechaIniFiltro: TcxDateEdit
         Left = 87
@@ -72,11 +72,11 @@ inherited frViewFiltroBase: TfrViewFiltroBase
         StyleHot.LookAndFeel.Kind = lfStandard
         StyleHot.LookAndFeel.NativeStyle = True
         StyleHot.LookAndFeel.SkinName = ''
-        TabOrder = 1
+        TabOrder = 2
-        Width = 121
+        Width = 250
       end
       object edtFechaFinFiltro: TcxDateEdit
-        Left = 350
+        Left = 386
         Top = 37
         Properties.OnChange = OnCamposFiltroChange
         Style.BorderColor = clWindowFrame
@@ -96,17 +96,54 @@ inherited frViewFiltroBase: TfrViewFiltroBase
         StyleHot.LookAndFeel.Kind = lfStandard
         StyleHot.LookAndFeel.NativeStyle = True
         StyleHot.LookAndFeel.SkinName = ''
-        TabOrder = 2
+        TabOrder = 3
-        Width = 121
+        Width = 250
+      end
+      object txtFiltroTodo2: TcxTextEdit
+        Left = 386
+        Top = 10
+        Properties.OnChange = OnCamposFiltroChange
+        Style.BorderColor = clWindowFrame
+        Style.BorderStyle = ebs3D
+        Style.HotTrack = False
+        Style.LookAndFeel.Kind = lfStandard
+        Style.LookAndFeel.NativeStyle = True
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.Kind = lfStandard
+        StyleDisabled.LookAndFeel.NativeStyle = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.Kind = lfStandard
+        StyleFocused.LookAndFeel.NativeStyle = True
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.Kind = lfStandard
+        StyleHot.LookAndFeel.NativeStyle = True
+        StyleHot.LookAndFeel.SkinName = ''
+        TabOrder = 1
+        Width = 250
       end
       object dxLayoutControl1Group_Root: TdxLayoutGroup
         ShowCaption = False
         Hidden = True
         ShowBorder = False
-        object dxLayoutControl1Item1: TdxLayoutItem
+        object dxLayoutControl1Group2: TdxLayoutGroup
-          Caption = 'Que contenga:'
+          ShowCaption = False
-          Control = txtFiltroTodo
+          Hidden = True
-          ControlOptions.ShowBorder = False
+          LayoutDirection = ldHorizontal
+          ShowBorder = False
+          object dxLayoutControl1Item1: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = 'Que contenga:'
+            Control = txtFiltroTodo
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item4: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = 'y'
+            Control = txtFiltroTodo2
+            ControlOptions.ShowBorder = False
+          end
         end
         object dxLayoutControl1Group1: TdxLayoutGroup
           ShowCaption = False
@@ -132,8 +169,8 @@ inherited frViewFiltroBase: TfrViewFiltroBase
     end
     object TBXAlignmentPanel1: TTBXAlignmentPanel
       Left = 0
-      Top = 68
+      Top = 70
-      Width = 565
+      Width = 671
       Height = 30
       Margins.Left = 10
       Align = alTop
@@ -141,7 +178,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
       object tbxBotones: TTBXToolbar
         Left = 10
         Top = 0
-        Width = 555
+        Width = 661
         Height = 30
         Align = alTop
         AutoResize = False

Source/GUIBase/uViewFiltroBase.pas

@@ -24,6 +24,10 @@ type
     function GetTexto: String;
     procedure SetTexto(const Value: String);
     property Texto: String read GetTexto write SetTexto;
+
+    function GetTexto2: String;
+    procedure SetTexto2(const Value: String);
+    property Texto2: String read GetTexto2 write SetTexto2;
   end;
 
   TfrViewFiltroBase = class(TfrViewBase, IViewFiltroBase)
@@ -44,6 +48,9 @@ type
     tbxBotones: TTBXToolbar;
     TBXItem2: TTBXItem;
     TBXAlignmentPanel1: TTBXAlignmentPanel;
+    dxLayoutControl1Item4: TdxLayoutItem;
+    txtFiltroTodo2: TcxTextEdit;
+    dxLayoutControl1Group2: TdxLayoutGroup;
     procedure OnCamposFiltroChange(Sender: TObject);
     procedure actQuitarFiltroExecute(Sender: TObject);
 
@@ -56,6 +63,8 @@ type
     procedure SetVerFiltros(const Value: Boolean);
     function GetTexto: String;
     procedure SetTexto(const Value: String);
+    function GetTexto2: String;
+    procedure SetTexto2(const Value: String);
 
   protected
     procedure LimpiarCampos; virtual;
@@ -67,6 +76,7 @@ type
     property OnFiltrosChange: TNotifyEvent read GetFiltrosChange write SetFiltrosChange;
     property VerFiltros: Boolean read GetVerFiltros write SetVerFiltros;
     property Texto: String read GetTexto write SetTexto;
+    property Texto2: String read GetTexto2 write SetTexto2;
   end;
 
 implementation
@@ -106,6 +116,7 @@ end;
 procedure TfrViewFiltroBase.LimpiarCampos;
 begin
   txtFiltroTodo.Clear;
+  txtFiltroTodo2.Clear;
   edtFechaIniFiltro.Clear;
   edtFechaFinFiltro.Clear;
 end;
@@ -144,9 +155,19 @@ begin
   Result := txtFiltroTodo.Text;
 end;
 
+function TfrViewFiltroBase.GetTexto2: String;
+begin
+  Result := txtFiltroTodo2.Text;
+end;
+
 procedure TfrViewFiltroBase.SetTexto(const Value: String);
 begin
   txtFiltroTodo.Text := Value;
 end;
 
+procedure TfrViewFiltroBase.SetTexto2(const Value: String);
+begin
+  txtFiltroTodo2.Text := Value;
+end;
+
 end.

Source/GUIBase/uViewGrid.dfm

@@ -9,6 +9,12 @@ inherited frViewGrid: TfrViewGrid
     Width = 554
     Height = 466
     Align = alClient
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -11
+    Font.Name = 'Tahoma'
+    Font.Style = []
+    ParentFont = False
     TabOrder = 0
     LookAndFeel.Kind = lfOffice11
     LookAndFeel.NativeStyle = True
@@ -35,6 +41,7 @@ inherited frViewGrid: TfrViewGrid
       OptionsView.NoDataToDisplayInfoText = '<No hay datos a visualizar>'
       OptionsView.CellAutoHeight = True
       OptionsView.ColumnAutoWidth = True
+      OptionsView.DataRowHeight = 22
       OptionsView.Footer = True
       OptionsView.GridLineColor = cl3DLight
       OptionsView.GridLines = glHorizontal
@@ -45,10 +52,11 @@ inherited frViewGrid: TfrViewGrid
       object cxGridViewICONO: TcxGridDBColumn
         Caption = 'Icono'
         OnCustomDrawCell = cxGridViewICONOCustomDrawCell
-        BestFitMaxWidth = 18
+        BestFitMaxWidth = 22
-        MinWidth = 18
+        MinWidth = 22
+        Options.HorzSizing = False
         Options.Sorting = False
-        Width = 18
+        Width = 22
         OnCustomDrawHeader = cxGridViewICONOCustomDrawHeader
       end
     end
@@ -72,6 +80,7 @@ inherited frViewGrid: TfrViewGrid
     Visible = False
     ReadOnly = False
     ExplicitWidth = 554
+    ExplicitHeight = 102
     inherited TBXDockablePanel1: TTBXDockablePanel
       ExplicitWidth = 554
       ExplicitHeight = 102
@@ -79,18 +88,47 @@ inherited frViewGrid: TfrViewGrid
         Width = 554
         ExplicitWidth = 554
         inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 457
+          Style.LookAndFeel.SkinName = ''
-          Width = 457
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 250
+          Width = 250
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          ExplicitWidth = 240
+          Style.LookAndFeel.SkinName = ''
-          Width = 240
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 250
+          Width = 250
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 344
+          Left = 321
-          ExplicitLeft = 344
+          Style.LookAndFeel.SkinName = ''
-          ExplicitWidth = 200
+          StyleDisabled.LookAndFeel.SkinName = ''
-          Width = 200
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 321
+          ExplicitWidth = 250
+          Width = 250
+        end
+        inherited txtFiltroTodo2: TcxTextEdit
+          Left = 321
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 321
+          ExplicitWidth = 250
+          Width = 250
+        end
+        inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+          inherited dxLayoutControl1Group2: TdxLayoutGroup
+            inherited dxLayoutControl1Item4: TdxLayoutItem
+              Visible = False
+            end
+          end
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -162,7 +200,7 @@ inherited frViewGrid: TfrViewGrid
       PrinterPage.ScaleMode = smFit
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 42772.762583020830000000
+      ReportDocument.CreationDate = 44649.770773101850000000
       StyleManager = dmBase.dxPrintStyleManager1
       OptionsCards.Shadow.Depth = 0
       OptionsExpanding.ExpandGroupRows = True

Source/GUIBase/uViewGridBase.pas

@@ -65,6 +65,10 @@ type
     function GetFilter: string;
     property Filter: string read GetFilter write SetFilter;
 
+    procedure SetFilter2(const Value: string);
+    function GetFilter2: string;
+    property Filter2: string read GetFilter2 write SetFilter2;
+
     function GetFiltered: Boolean;
     property Filtered : Boolean read GetFiltered;
 
@@ -87,9 +91,11 @@ type
   private
     FViewFiltros: IViewFiltroBase;
     FFilter: string;
+    FFilter2: string;
     FOnFilterChanged : TNotifyEvent;
     FGridStatus : TcxGridStatus;
     procedure BestFitAllColumns;
+
   protected
     FOnDblClick: TNotifyEvent;
     FPopupMenu: TPopupMenu;
@@ -105,13 +111,16 @@ type
     function getNumSeleccionados: Integer;
 
     procedure SetFilter(const Value: string); virtual;
+    procedure SetFilter2(const Value: string); virtual;
     procedure RefrescarFiltro;
     function GetFilter: string; virtual;
+    function GetFilter2: string; virtual;
     function GetFiltered: Boolean; virtual;
-    procedure FiltrarGrid(TextoFiltro : String); virtual;
     function GetViewFiltros: IViewFiltroBase;
     procedure SetViewFiltros(const Value: IViewFiltroBase); virtual;
     procedure FilterChanged(Sender : TObject); virtual;
+    procedure FiltrarGrid(TextoFiltro1, TextoFiltro2: String); overload; virtual;
+    procedure FiltrarGrid(TextoFiltro : String); overload; virtual;
 
   public
     constructor Create(AOwner: TComponent); override;
@@ -142,12 +151,14 @@ type
     procedure RestoreFromRegistry (const Path : String); virtual;
 
     procedure RestoreFromIniFile;
+    procedure ConfigView; virtual; 
     procedure StoreToIniFile;
 
     {function Locate(const AItemIndex: Integer; const AValue: String;
       const APartialCompare: Boolean = False) : Boolean;}
 
     property Filter: string read GetFilter write SetFilter;
+    property Filter2: string read GetFilter2 write SetFilter2;    
     property Filtered : Boolean read GetFiltered;
 
     procedure AnadirOtrosFiltros; virtual;
@@ -187,7 +198,6 @@ begin
   _FocusedView.BeginUpdate;
 
   try
-    AsignarAnchosPrefijadosAColumnas(_FocusedView);
     for i := 0 to _FocusedView.VisibleColumnCount-1 do
     begin
       _FocusedView.VisibleColumns[i].ApplyBestFit;
@@ -215,6 +225,11 @@ begin
 //
 end;
 
+procedure TfrViewGridBase.ConfigView;
+begin
+//
+end;
+
 procedure TfrViewGridBase.ContraerTodo;
 begin
   if Assigned(_FocusedView) then
@@ -225,6 +240,7 @@ constructor TfrViewGridBase.Create(AOwner: TComponent);
 begin
   inherited;
   FFilter := '';
+  FFilter2 := '';  
   FOnFilterChanged := FilterChanged;
   FPopupMenu := nil;
   FOnDblClick := nil;
@@ -261,6 +277,11 @@ begin
   Result := FFilter;
 end;
 
+function TfrViewGridBase.GetFilter2: string;
+begin
+  Result := FFilter2;
+end;
+
 function TfrViewGridBase.GetFiltered: Boolean;
 begin
 //Los niveles de los grid no se consideran filtros
@@ -333,7 +354,10 @@ procedure TfrViewGridBase.RefrescarFiltro;
 begin
   //De esta forma obligaremos a que se creen nuevamente todos los filtros, cuando llamemos a este metodo
   if Assigned(ViewFiltros) then
+  begin
      Filter := ViewFiltros.Texto;
+     Filter2 := ViewFiltros.Texto2;
+  end;
 end;
 
 procedure TfrViewGridBase.RestoreFromIniFile;
@@ -343,9 +367,8 @@ begin
   inherited;
   if Assigned(_FocusedView) then
   begin
-    // AjustarAncho; <- No activar porque pisa los anchos que ha puesto el usuario.
 
-    AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[Current Users]\Application Data
+    AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[All Users]\Application Data
     AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + GetAppName + PathDelim;
 
     if not DirectoryExists(AIniFile) then
@@ -353,14 +376,14 @@ begin
 
     _FocusedView.RestoreFromIniFile(AIniFile + 'grid.xml', True, False, []);
   end;
+  
+  ConfigView;
 end;
 
 procedure TfrViewGridBase.RestoreFromRegistry(const Path: String);
 begin
   if Assigned(_FocusedView) then
-  begin
     _FocusedView.RestoreFromRegistry(Path + '\\GridSettings\\' + Self.Name, False, False, [], Self.Name);
-  end;
 end;
 
 procedure TfrViewGridBase.RestoreGridStatus;
@@ -391,7 +414,24 @@ begin
   if Assigned(ViewFiltros) then
      ViewFiltros.Texto := FFilter;
 
-  FiltrarGrid(FFilter);
+  FiltrarGrid(FFilter, FFilter2);
+
+  //Obliga a generar todos los filtros de las vista hija
+  AnadirOtrosFiltros;
+
+  if Assigned(FOnFilterChanged) then
+    FOnFilterChanged(Self);
+end;
+
+procedure TfrViewGridBase.SetFilter2(const Value: string);
+begin
+  FFilter2 := Value;
+
+  //Así tendremos el mismo valor en el filtro simple que en el filtro en detalle
+  if Assigned(ViewFiltros) then
+     ViewFiltros.Texto2 := FFilter2;
+
+  FiltrarGrid(FFilter, FFilter2);
 
   //Obliga a generar todos los filtros de las vista hija
   AnadirOtrosFiltros;
@@ -445,13 +485,14 @@ begin
   if Assigned(_FocusedView) then
   begin
 
-    AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[Current Users]\Application Data
+    AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[All Users]\Application Data
     AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + GetAppName + PathDelim;
 
     if not DirectoryExists(AIniFile) then
       ForceDirectories(AIniFile);
 
       _FocusedView.StoreToIniFile(AIniFile + 'grid.xml', False, []);
+//      _FocusedView.StoreToRegistry(Path + '\\GridSettings\\' + Self.Name, False, [], Self.Name);
   end;
 end;
 
@@ -459,12 +500,57 @@ procedure TfrViewGridBase.StoreToRegistry(const Path: String);
 begin
   inherited;
   if Assigned(_FocusedView) then
-  begin
     _FocusedView.StoreToRegistry(Path + '\\GridSettings\\' + Self.Name, False, [], Self.Name);
+end;
+
+procedure TfrViewGridBase.FiltrarGrid(TextoFiltro1, TextoFiltro2 : String);
+var
+  Columna: TcxGridDBColumn;
+  i: Integer;
+  AItemList: TcxFilterCriteriaItemList;
+begin
+  with _FocusedView.DataController.Filter do
+  begin
+    BeginUpdate;
+    try
+      Options := [fcoCaseInsensitive, fcoSoftCompare];
+      Root.Clear;
+      if Length(TextoFiltro1) > 0 then
+      begin
+        AItemList := Root.AddItemList(fboAnd);
+        AItemList.BoolOperatorKind := fboOr;
+        for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do
+        begin
+          Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
+          if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
+             AItemList.AddItem(Columna, foLike, '%'+TextoFiltro1+'%', IntToStr(i));
+        end;
+      end;
+
+      if Length(TextoFiltro2) > 0 then
+      begin
+        AItemList := Root.AddItemList(fboAnd);
+        AItemList.BoolOperatorKind := fboOr;
+        for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do
+        begin
+          Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
+          if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
+             AItemList.AddItem(Columna, foLike, '%'+TextoFiltro2+'%', IntToStr(i));
+        end;
+      end;
+
+      if ((Length(TextoFiltro1) > 0) or (Length(TextoFiltro2) > 0)) then
+        Active := True
+      else
+        Active := False;
+    finally
+      EndUpdate;
+    end;
   end;
 end;
 
-procedure TfrViewGridBase.FiltrarGrid(TextoFiltro : String);
+
+procedure TfrViewGridBase.FiltrarGrid(TextoFiltro: String);
 var
   Columna: TcxGridDBColumn;
   i: Integer;
@@ -494,8 +580,8 @@ begin
       EndUpdate;
     end;
   end;
-end;
 
+end;
 
 procedure TfrViewGridBase.FilterChanged(Sender: TObject);
 begin

Source/Informes/5/1/firma_contrato.bat

@@ -0,0 +1,48 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\Rodax\Servidor\Informes\5\1\log_factura.txt
+
+set ARCHIVO=%1
+set city=MADRID
+set province=MADRID
+set postalcode=28010
+set PositionOnPageLowerLeftX=30
+set PositionOnPageLowerLeftY=90
+set PositionOnPageUpperRightX=200
+set PositionOnPageUpperRigthY=170
+set signaturePage=-1
+set signatureRubricImage="D:\Rodax\Servidor\Informes\5\1\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nsignatureRubricImage=%signatureRubricImage%"
+
+REM echo %CONFIG% > %LOGFILE%
+REM echo %ARCHIVO% > %LOGFILE%
+echo %TEMP% > %LOGFILE%
+echo %PASSCRIS% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\Rodax\Servidor\PDFS\cert-cris.pfx" -password %PASSCRIS% -filter subject.contains:59828 -config %CONFIG%
+

Source/Informes/5/1/firma_factura.bat

@@ -0,0 +1,48 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\Rodax\Servidor\Informes\5\1\log_factura.txt
+
+set ARCHIVO=%1
+set city=MADRID
+set province=MADRID
+set postalcode=28010
+set PositionOnPageLowerLeftX=200
+set PositionOnPageLowerLeftY=80
+set PositionOnPageUpperRightX=370
+set PositionOnPageUpperRigthY=200
+set signaturePage=-1
+set signatureRubricImage="D:\Rodax\Servidor\Informes\5\1\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nsignatureRubricImage=%signatureRubricImage%"
+
+REM echo %CONFIG% > %LOGFILE%
+REM echo %ARCHIVO% > %LOGFILE%
+echo %TEMP% > %LOGFILE%
+echo %PASSCRIS% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\Rodax\Servidor\PDFS\cert-cris.pfx" -password %PASSCRIS% -filter subject.contains:59828 -config %CONFIG%
+

Source/Informes/5/3/firma_contrato.bat

@@ -0,0 +1,47 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\Rodax\Servidor\Informes\5\3\log_contrato.txt
+
+set ARCHIVO=%1
+set city=RIVAS
+set province=MADRID
+set postalcode=28522
+set PositionOnPageLowerLeftX=80
+set PositionOnPageLowerLeftY=163
+set PositionOnPageUpperRightX=240
+set PositionOnPageUpperRigthY=253
+set signaturePage=-1
+set signatureRubricImage="D:\Rodax\Servidor\Informes\5\3\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nsignatureRubricImage=%signatureRubricImage%"
+
+REM echo %CONFIG% > %LOGFILE%
+REM echo %ARCHIVO% > %LOGFILE%
+echo %TEMP% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\Rodax\Servidor\PDFS\cert-alis.pfx" -password %PASSALIS% -filter subject.contains:13910 -config %CONFIG%
+

Source/Informes/5/3/firma_factura.bat

@@ -0,0 +1,47 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\Rodax\Servidor\Informes\5\3\log_factura.txt
+
+set ARCHIVO=%1
+set city=RIVAS
+set province=MADRID
+set postalcode=28522
+set PositionOnPageLowerLeftX=150
+set PositionOnPageLowerLeftY=100
+set PositionOnPageUpperRightX=310
+set PositionOnPageUpperRigthY=190
+set signaturePage=-1
+set signatureRubricImage="D:\Rodax\Servidor\Informes\5\3\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nsignatureRubricImage=%signatureRubricImage%"
+
+REM echo %CONFIG% > %LOGFILE%
+REM echo %ARCHIVO% > %LOGFILE%
+echo %TEMP% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\Rodax\Servidor\PDFS\cert-alis.pfx" -password %PASSALIS% -filter subject.contains:13910 -config %CONFIG%
+

Source/Informes/5/InformeIVAProveedoresDesglosado.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="42143,6524281134" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="45217,9515811227" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="14,9992291666667" RightMargin="14,9992291666667" TopMargin="14,9992291666667" BottomMargin="19,9998541666667" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,14033677542" OnBeforePrint="Band1OnBeforePrint">
@@ -9,27 +9,29 @@
       <TfrxMemoView Name="Memo22" Left="12" Top="71" Width="265" Height="63" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaBottom" Text="Aliso Design S.L. B86913910&#13;&#10;C/ La Fundición, 27. Pol. Santa Ana&#13;&#10;Rivas Vaciamadrid 28522 Madrid&#13;&#10;tel. 91 301 65 57 / fax. 91 301 65 58&#13;&#10;info@acanainteriorismo.com - www.acanainteriorismo.com"/>
       <TfrxPictureView Name="Picture1" Left="12" Top="0" Width="264" Height="67" ShowHint="False" HightQuality="False"/>
     </TfrxPageHeader>
-    <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="668" Width="1009,14033677542" PrintOnLastPage="False">
+    <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="673" Width="1009,14033677542" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
     </TfrxPageFooter>
-    <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="256" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;NOMBRE&#34;" ReprintOnNewPage="True">
+    <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="255" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;NOMBRE&#34;" ReprintOnNewPage="True">
       <TfrxMemoView Name="Memo1" Left="7,55906" Top="3,77953" Width="485,37013" Height="18,89764024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="115,23624" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
+      <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="90" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
-      <TfrxMemoView Name="Memo28" Left="113,45671" Top="25" Width="417" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
+      <TfrxMemoView Name="Memo28" Align="baLeft" Left="180" Top="25" Width="350" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
-      <TfrxMemoView Name="Memo49" Left="530,67716535" Top="25" Width="101,33859" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
+      <TfrxMemoView Name="Memo49" Align="baLeft" Left="530" Top="25" Width="101,33859" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
-      <TfrxMemoView Name="Memo50" Left="724" Top="25" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
+      <TfrxMemoView Name="Memo50" Align="baLeft" Left="724,01577" Top="25" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
-      <TfrxMemoView Name="Memo51" Left="818,57483" Top="25" Width="95,24409449" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
+      <TfrxMemoView Name="Memo51" Align="baLeft" Left="819,01577" Top="25" Width="95,24409449" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
-      <TfrxMemoView Name="Memo52" Left="913,88976378" Top="25" Width="94,48818898" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
+      <TfrxMemoView Name="Memo52" Align="baLeft" Left="914,25986449" Top="25" Width="94,48818898" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
-      <TfrxMemoView Name="Memo8" Left="632" Top="25" Width="92,67718" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
+      <TfrxMemoView Name="Memo8" Align="baLeft" Left="631,33859" Top="25" Width="92,67718" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
+      <TfrxMemoView Name="Memo5" Align="baLeft" Left="90" Top="25" Width="90" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Tienda"/>
     </TfrxGroupHeader>
-    <TfrxMasterData Name="DatosMaestros1" Height="17,007874015748" Left="0" Top="316" Width="1009,14033677542" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
+    <TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="315" Width="1009,14033677542" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
-      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="113,41369" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA_PROVEEDOR&#34;]"/>
+      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA_PROVEEDOR&#34;]"/>
-      <TfrxMemoView Name="Memo4" Left="113,46" Top="0" Width="417" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="  [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
+      <TfrxMemoView Name="Memo4" Align="baLeft" Left="180" Top="0" Width="350" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="  [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo20" Left="530,68" Top="0" Width="101,25984252" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NIF_CIF&#34;]"/>
+      <TfrxMemoView Name="Memo20" Align="baLeft" Left="530" Top="0" Width="101,25984252" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NIF_CIF&#34;]"/>
-      <TfrxMemoView Name="Memo21" Left="631,93700787" Top="0" Width="92,5984252" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
+      <TfrxMemoView Name="Memo21" Align="baLeft" Left="631,25984252" Top="0" Width="92,5984252" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
-      <TfrxMemoView Name="Memo29" Left="724,53543307" Top="0" Width="94,48818898" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;]"/>
+      <TfrxMemoView Name="Memo29" Align="baLeft" Left="723,85826772" Top="0" Width="94,48818898" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;]"/>
-      <TfrxMemoView Name="Memo30" Left="818,64566929" Top="0" Width="95,24409449" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;]"/>
+      <TfrxMemoView Name="Memo30" Align="baLeft" Left="818,3464567" Top="0" Width="95,24409449" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;]"/>
-      <TfrxMemoView Name="Memo31" Left="913,86501" Top="0" Width="94,64276" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="Memo31" Align="baLeft" Left="913,59055119" Top="0" Width="94,64276" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="Memo9" Align="baLeft" Left="90" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;TIENDA&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,14033677542">
       <TfrxMemoView Name="Memo6" Left="914,11812" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
@@ -41,11 +43,11 @@
     <TfrxGroupHeader Name="GroupHeader1" Height="22,67718" Left="0" Top="212" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;MES&#34;">
       <TfrxMemoView Name="Memo7" Left="1,77953" Top="2,77953" Width="485,37013" Height="15,1181102362205" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;TITULO&#34;]"/>
     </TfrxGroupHeader>
-    <TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="392" Width="1009,14033677542"/>
+    <TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="393" Width="1009,14033677542"/>
     <TfrxHeader Name="Header1" Height="50" Left="0" Top="436" Width="1009,14033677542">
       <TfrxMemoView Name="Memo23" Left="0" Top="31" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="Resumen por proveedor"/>
     </TfrxHeader>
-    <TfrxMasterData Name="DAtosMaestros2" Height="17" Left="0" Top="548" Width="1009,14033677542" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0">
+    <TfrxMasterData Name="DAtosMaestros2" Height="17" Left="0" Top="551" Width="1009,14033677542" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0">
       <TfrxMemoView Name="Memo24" Left="190" Top="0" Width="250" Height="17,00787402" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NOMBRE&#34;]"/>
       <TfrxMemoView Name="Memo37" Left="0" Top="0" Width="100" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;REFERENCIA&#34;]"/>
       <TfrxMemoView Name="Memo38" Left="100" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NIF_CIF&#34;]"/>
@@ -54,7 +56,7 @@
       <TfrxMemoView Name="Memo32" Left="830" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Memo39" Left="440" Top="0" Width="200" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;POBLACION&#34;]"/>
     </TfrxMasterData>
-    <TfrxGroupHeader Name="GroupHeader2" Height="25" Left="0" Top="504" Width="1009,14033677542" Condition="frxDBInformeListadoFacturasResumen.&#34;ID_EMPRESA&#34;" ReprintOnNewPage="True">
+    <TfrxGroupHeader Name="GroupHeader2" Height="25" Left="0" Top="506" Width="1009,14033677542" Condition="frxDBInformeListadoFacturasResumen.&#34;ID_EMPRESA&#34;" ReprintOnNewPage="True">
       <TfrxMemoView Name="Memo13" Left="190" Top="10" Width="250" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
       <TfrxMemoView Name="Memo16" Left="640" Top="10" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
       <TfrxMemoView Name="Memo17" Left="735" Top="10" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
@@ -63,7 +65,7 @@
       <TfrxMemoView Name="Memo35" Left="100" Top="10" Width="90" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="CIF"/>
       <TfrxMemoView Name="Memo36" Left="440" Top="10" Width="200" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Población"/>
     </TfrxGroupHeader>
-    <TfrxGroupFooter Name="GroupFooter2" Height="25" Left="0" Top="584" Width="1009,14033677542">
+    <TfrxGroupFooter Name="GroupFooter2" Height="25" Left="0" Top="588" Width="1009,14033677542">
       <TfrxMemoView Name="Memo10" Align="baLeft" Left="0" Top="0" Width="639,63" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES:"/>
       <TfrxMemoView Name="Memo11" Left="829,63" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros2)]"/>
       <TfrxMemoView Name="Memo12" Left="734,63" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros2)]"/>

Source/Informes/5/InformeListadoRecibosCliPendientesDesglosado.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="42143,654991412" ScriptLanguage="PascalScript" ScriptText.Text="procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    //A la vez que salta este salta la asignacion de pagina por lo que no coincide nunca si no suponemos +1                                                                                                                                                                                                                                        &#13;&#10;    if ((&#60;Pagina&#62; + 1) = &#60;TotalPaginas&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C2900000020446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C11000000204E616D653D2220506572696F646F732200010C31000000204E616D653D224665636861496E6963696F222056616C75653D22262336303B4665636861496E6963696F262336323B2200010C10000000204E616D653D22466563686146696E220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="45226,5031582755" ScriptLanguage="PascalScript" ScriptText.Text="procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    //A la vez que salta este salta la asignacion de pagina por lo que no coincide nunca si no suponemos +1                                                                                                                                                                                                                                        &#13;&#10;    if ((&#60;Pagina&#62; + 1) = &#60;TotalPaginas&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C4E00000020446174615365743D226672784442496E666F726D654C69737461646F52656369626F732220446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C11000000204E616D653D2220506572696F646F732200010C31000000204E616D653D224665636861496E6963696F222056616C75653D22262336303B4665636861496E6963696F262336323B2200010C10000000204E616D653D22466563686146696E220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="15" RightMargin="15" TopMargin="15" BottomMargin="20" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,13451" OnBeforePrint="Band1OnBeforePrint">
@@ -14,31 +14,31 @@
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="476" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
     </TfrxPageFooter>
-    <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="256" Width="1009,13451" Condition="frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;" ReprintOnNewPage="True">
+    <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="255" Width="1009,13451" Condition="frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;" ReprintOnNewPage="True">
-      <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="88,77953" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
+      <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="110" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
-      <TfrxMemoView Name="Memo28" Left="275" Top="25" Width="464,33859" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
+      <TfrxMemoView Name="Memo49" Align="baLeft" Left="510" Top="25" Width="250" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
-      <TfrxMemoView Name="Memo49" Left="739" Top="25" Width="134,25201" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
+      <TfrxMemoView Name="Memo50" Align="baLeft" Left="410" Top="25" Width="100" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha vto."/>
-      <TfrxMemoView Name="Memo50" Left="180" Top="25" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha vto."/>
+      <TfrxMemoView Name="Memo52" Align="baLeft" Left="760" Top="25" Width="136,06299213" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
-      <TfrxMemoView Name="Memo52" Left="871,77953" Top="25" Width="136,06299213" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
+      <TfrxMemoView Name="Memo8" Align="baLeft" Left="310" Top="25" Width="100" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha emisión"/>
-      <TfrxMemoView Name="Memo8" Left="88" Top="25" Width="92,67718" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha emisión"/>
       <TfrxMemoView Name="Memo7" Left="7,55906" Top="2,77953" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;]"/>
+      <TfrxMemoView Name="Memo5" Align="baLeft" Left="110" Top="25" Width="200" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Tienda"/>
     </TfrxGroupHeader>
-    <TfrxMasterData Name="DatosMaestros1" Height="17,007874015748" Left="0" Top="316" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSetName="frxDBInformeListadoRecibos" RowCount="0">
+    <TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="315" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoRecibos" DataSetName="frxDBInformeListadoRecibos" RowCount="0">
-      <TfrxMemoView Name="Memo29" Left="180,66141732" Top="0" Width="94,86614173" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_VENCIMIENTO&#34;]"/>
+      <TfrxMemoView Name="Memo29" Align="baLeft" Left="410" Top="0" Width="100" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_VENCIMIENTO&#34;]"/>
-      <TfrxMemoView Name="Memo1" Left="275,52755906" Top="0" Width="463,7480315" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;]"/>
+      <TfrxMemoView Name="Memo20" Align="baLeft" Left="510" Top="0" Width="250" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;SITUACION&#34;]"/>
-      <TfrxMemoView Name="Memo20" Left="738,81138" Top="0" Width="133,03937008" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;SITUACION&#34;]"/>
+      <TfrxMemoView Name="Memo21" Align="baLeft" Left="310" Top="0" Width="100" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_EMISION&#34;]"/>
-      <TfrxMemoView Name="Memo21" Left="88,44094488" Top="0" Width="92,5984252" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_EMISION&#34;]"/>
+      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="110" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;REFERENCIA&#34;]"/>
-      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="88,44094488" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="Memo31" Align="baLeft" Left="760" Top="0" Width="136,21759" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;]"/>
-      <TfrxMemoView Name="Memo31" Left="871,55905512" Top="0" Width="136,21759" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="Memo9" Align="baLeft" Left="110" Top="0" Width="200" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;TIENDA&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="871,55905512" Top="0,37774772" Width="136,57483" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo6" Align="baLeft" Left="760" Top="0,37774772" Width="136,57483" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="871,55905512" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoRecibos.&#34;TITULO&#34;]:"/>
+      <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="760" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoRecibos.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>
     <TfrxMemoView Name="Memo2" Align="baRight" Left="938,13451" Top="651" Width="71" Height="13" OnBeforePrint="Memo2OnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text=""/>
     <TfrxGroupHeader Name="GroupHeader1" Height="22,67718" Left="0" Top="212" Width="1009,13451" Condition="frxDBInformeListadoRecibos.&#34;MES&#34;">
       <TfrxMemoView Name="Memo4" Left="1" Top="2" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;TITULO&#34;]"/>
     </TfrxGroupHeader>
-    <TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="392" Width="1009,13451"/>
+    <TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="393" Width="1009,13451"/>
   </TfrxReportPage>
 </TfrxReport>

Source/Informes/5/InformeListadoRecibosClienteDesglosado.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="42143,6548203357" ScriptLanguage="PascalScript" ScriptText.Text="procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    //A la vez que salta este salta la asignacion de pagina por lo que no coincide nunca si no suponemos +1                                                                                                                                                                                                                                        &#13;&#10;    if ((&#60;Pagina&#62; + 1) = &#60;TotalPaginas&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C2900000020446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C11000000204E616D653D2220506572696F646F732200010C31000000204E616D653D224665636861496E6963696F222056616C75653D22262336303B4665636861496E6963696F262336323B2200010C10000000204E616D653D22466563686146696E220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="45226,516038588" ScriptLanguage="PascalScript" ScriptText.Text="procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    //A la vez que salta este salta la asignacion de pagina por lo que no coincide nunca si no suponemos +1                                                                                                                                                                                                                                        &#13;&#10;    if ((&#60;Pagina&#62; + 1) = &#60;TotalPaginas&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C4E00000020446174615365743D226672784442496E666F726D654C69737461646F52656369626F732220446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C11000000204E616D653D2220506572696F646F732200010C31000000204E616D653D224665636861496E6963696F222056616C75653D22262336303B4665636861496E6963696F262336323B2200010C10000000204E616D653D22466563686146696E220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="15" RightMargin="15" TopMargin="15" BottomMargin="20" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,13451" OnBeforePrint="Band1OnBeforePrint">
@@ -14,31 +14,31 @@
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="476" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
     </TfrxPageFooter>
-    <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="256" Width="1009,13451" Condition="frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;" ReprintOnNewPage="True">
+    <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="255" Width="1009,13451" Condition="frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;" ReprintOnNewPage="True">
-      <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="88,77953" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
+      <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="120" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
-      <TfrxMemoView Name="Memo28" Left="275" Top="25" Width="464,33859" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
+      <TfrxMemoView Name="Memo49" Align="baLeft" Left="540" Top="25" Width="200" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
-      <TfrxMemoView Name="Memo49" Left="739" Top="25" Width="134,25201" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
+      <TfrxMemoView Name="Memo50" Align="baLeft" Left="430" Top="25" Width="110" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha vto."/>
-      <TfrxMemoView Name="Memo50" Left="180" Top="25" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha vto."/>
+      <TfrxMemoView Name="Memo52" Align="baLeft" Left="740" Top="25" Width="136,06299213" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
-      <TfrxMemoView Name="Memo52" Left="871,77953" Top="25" Width="136,06299213" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
+      <TfrxMemoView Name="Memo8" Align="baLeft" Left="320" Top="25" Width="110" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha emisión"/>
-      <TfrxMemoView Name="Memo8" Left="88" Top="25" Width="92,67718" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha emisión"/>
       <TfrxMemoView Name="Memo7" Left="7,55906" Top="2,77953" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;]"/>
+      <TfrxMemoView Name="Memo1" Align="baLeft" Left="120" Top="25" Width="200" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Tienda"/>
     </TfrxGroupHeader>
-    <TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="316" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSetName="frxDBInformeListadoRecibos" RowCount="0">
+    <TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="315" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoRecibos" DataSetName="frxDBInformeListadoRecibos" RowCount="0">
-      <TfrxMemoView Name="Memo29" Left="180,66141732" Top="0" Width="94,48818898" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_VENCIMIENTO&#34;]"/>
+      <TfrxMemoView Name="Memo29" Align="baLeft" Left="430" Top="0" Width="110" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_VENCIMIENTO&#34;]"/>
-      <TfrxMemoView Name="Memo1" Left="275,52755906" Top="0" Width="463,748031496063" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;]"/>
+      <TfrxMemoView Name="Memo20" Align="baLeft" Left="540" Top="0" Width="200" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;SITUACION&#34;]"/>
-      <TfrxMemoView Name="Memo20" Left="738,81138" Top="0" Width="133,03937007874" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;SITUACION&#34;]"/>
+      <TfrxMemoView Name="Memo21" Align="baLeft" Left="320" Top="0" Width="110" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_EMISION&#34;]"/>
-      <TfrxMemoView Name="Memo21" Left="88,44094488" Top="0" Width="92,29901" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;FECHA_EMISION&#34;]"/>
+      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="120" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;REFERENCIA&#34;]"/>
-      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="88,4409448818898" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="Memo31" Align="baLeft" Left="740" Top="0" Width="136,21759" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;]"/>
-      <TfrxMemoView Name="Memo31" Left="871,55905511811" Top="0" Width="136,21759" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="Memo5" Align="baLeft" Left="120" Top="0" Width="200" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoRecibos.&#34;REFERENCIA&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="871,55905512" Top="0,37774772" Width="136,57483" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo6" Align="baLeft" Left="740" Top="0,37774772" Width="136,57483" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="871,55905512" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoRecibos.&#34;TITULO&#34;]:"/>
+      <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="740" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoRecibos.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>
     <TfrxMemoView Name="Memo2" Align="baRight" Left="938,13451" Top="651" Width="71" Height="13" OnBeforePrint="Memo2OnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text=""/>
     <TfrxGroupHeader Name="GroupHeader1" Height="22,67718" Left="0" Top="212" Width="1009,13451" Condition="frxDBInformeListadoRecibos.&#34;MES&#34;">
       <TfrxMemoView Name="Memo4" Left="1" Top="2,77953" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoRecibos.&#34;TITULO&#34;]"/>
     </TfrxGroupHeader>
-    <TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="392" Width="1009,13451"/>
+    <TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="393" Width="1009,13451"/>
   </TfrxReportPage>
 </TfrxReport>

Source/Informes/6/1/firma_contrato.bat

@@ -0,0 +1,48 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\Rodax\Servidor\Informes\6\1\log_contrato.txt
+
+set ARCHIVO=%1
+set city=MADRID
+set province=MADRID
+set postalcode=28010
+set PositionOnPageLowerLeftX=30
+set PositionOnPageLowerLeftY=90
+set PositionOnPageUpperRightX=200
+set PositionOnPageUpperRigthY=170
+set signaturePage=-1
+set signatureRubricImage="D:\Rodax\Servidor\Informes\6\1\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nsignatureRubricImage=%signatureRubricImage%"
+
+REM echo %CONFIG% > %LOGFILE%
+REM echo %ARCHIVO% > %LOGFILE%
+echo %TEMP% > %LOGFILE%
+echo %PASSCRIS% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\Rodax\Servidor\PDFS\cert-cris.pfx" -password %PASSCRIS% -filter subject.contains:59828 -config %CONFIG%
+

Source/Informes/6/1/firma_factura.bat

@@ -0,0 +1,48 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\Rodax\Servidor\Informes\6\1\log_factura.txt
+
+set ARCHIVO=%1
+set city=MADRID
+set province=MADRID
+set postalcode=28010
+set PositionOnPageLowerLeftX=200
+set PositionOnPageLowerLeftY=80
+set PositionOnPageUpperRightX=370
+set PositionOnPageUpperRigthY=200
+set signaturePage=-1
+set signatureRubricImage="D:\Rodax\Servidor\Informes\6\1\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nsignatureRubricImage=%signatureRubricImage%"
+
+REM echo %CONFIG% > %LOGFILE%
+REM echo %ARCHIVO% > %LOGFILE%
+echo %TEMP% > %LOGFILE%
+echo %PASSCRIS% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\Rodax\Servidor\PDFS\cert-cris.pfx" -password %PASSCRIS% -filter subject.contains:59828 -config %CONFIG%
+