Solicitan portada para presupuestos de musaeda

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

Source/Base/Base.dproj

@@ -55,57 +55,57 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="..\Servidor\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
+    <DCCReference Include="..\Servidor\cxExportD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
+    <DCCReference Include="..\Servidor\cxGridD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Servidor\cxIntl6D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Servidor\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Servidor\cxPageControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
+    <DCCReference Include="..\Servidor\dclIndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="..\Servidor\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="..\Servidor\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPSCoreD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
+    <DCCReference Include="..\Servidor\IndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
+    <DCCReference Include="..\Servidor\IndyProtocols.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
+    <DCCReference Include="..\Servidor\IndySystem.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="..\Servidor\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="..\Servidor\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
+    <DCCReference Include="..\Servidor\JSDialog100.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCmpD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvDlgsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvMMD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvNetD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
+    <DCCReference Include="..\Servidor\pckMD5.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="..\Servidor\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="..\Servidor\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
+    <DCCReference Include="..\Servidor\TB2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="..\Servidor\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="..\Servidor\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="..\Servidor\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="..\Servidor\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="..\Servidor\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
+    <DCCReference Include="..\Servidor\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="..\Servidor\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
+    <DCCReference Include="..\Servidor\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

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

@@ -399,6 +399,15 @@ begin
       if (FieldByName('TIPO_DETALLE').AsString = 'Titulo') or
          (FieldByName('TIPO_DETALLE').AsString = 'Titulo opcional') then
       begin
+
+        //Solo para la empresa musaeda meter intro entre capitulos para poder luego meter saltos en el word
+        if (tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger = 4) then
+        begin
+          Estilo := 'Normal';
+          FWordApp.Application.Selection.Set_Style(Estilo);
+          FWordApp.InsertText(#13);
+        end;
+
         NombreCapitulo := '';
         Estilo := 'TituloCapitulo';
         FWordApp.Application.Selection.Set_Style(Estilo);
@@ -508,7 +517,10 @@ begin
         SysUtils.DeleteFile(NombreFichero);
       end
       else
+      begin
         ReplaceBookmark('TextoPortada', RtfToText(Texto));
+        ReplaceBookmark('TextoPortadaCab', RtfToText(Texto));
+      end;
     end;
 
     if BookmarkExists('NombreEmpresaPortada') then
@@ -548,6 +560,16 @@ begin
   shiftCells := False;
   iContador := 2; // Empezar en la 2ª fila de celdas. La primera es la
                   // cabecera de la tabla.
+
+  //Solo para la empresa musaeda meter intro entre capitulos para poder luego meter saltos en el word
+  if (tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger = 4) then
+  begin
+    Estilo := 'Normal';
+    FWordApp.Application.Selection.Set_Style(Estilo);
+    FWordApp.InsertText(#13);
+  end;
+
+
   Estilo := 'TituloCapitulo';
   FWordApp.Application.Selection.Set_Style(Estilo);
 

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -36,6 +36,12 @@
     <Borland.ProjectType />
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">5</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.1.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 06 de abril de 2016 18:08</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>