Tarea #1151 -> En la edición de presupuestos y contratos, no aparece 'obras' en el combo de tipos de contrato

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

Source/Base/Base.dproj

@@ -58,55 +58,55 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\designide.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Controller\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\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/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm

@@ -292,7 +292,8 @@ inherited frViewContratoCliente: TfrViewContratoCliente
         'Ba'#241'o'
         'Armarios'
         'Electrodom'#233'sticos'
-        'Varios')
+        'Varios'
+        'Obra')
       Properties.PostPopupValueOnTab = True
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D

Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas

@@ -93,7 +93,7 @@ implementation
 { TfrViewContratoCliente }
 
 uses
-  uClientesController, uBizDireccionesContacto, uContratosClienteController;
+  uClientesController, uBizDireccionesContacto, uContratosClienteController, uPresupuestosClienteController;
 
 
 procedure TfrViewContratoCliente.bFormasPagoClick(Sender: TObject);
@@ -111,6 +111,14 @@ begin
   FFormasPagoController := TFormasPagoController.Create;
   FVendedoresController := TVendedoresController.Create;
   FViewClienteContrato := frViewDatosYSeleccionClienteContrato1;
+
+  cbTipoContrato.Properties.Items.Clear;
+  cbTipoContrato.Properties.Items.Add(CTE_COCINA);
+  cbTipoContrato.Properties.Items.Add(CTE_ARMARIO);
+  cbTipoContrato.Properties.Items.Add(CTE_BANO);
+  cbTipoContrato.Properties.Items.Add(CTE_ELECTRODOMESTICO);
+  cbTipoContrato.Properties.Items.Add(CTE_OBRA);
+  cbTipoContrato.Properties.Items.Add(CTE_VARIOS);
 end;
 
 procedure TfrViewContratoCliente.CustomViewDestroy(Sender: TObject);

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

@@ -228,6 +228,10 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
         Height = 224
         ExplicitWidth = 320
         ExplicitHeight = 224
+        inherited edtlNombre: TcxDBTextEdit
+          ExplicitWidth = 224
+          Width = 224
+        end
         inherited edtNIFCIF: TcxDBTextEdit
           Left = 328
           ExplicitLeft = 328
@@ -236,6 +240,10 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
           Left = 239
           ExplicitLeft = 239
         end
+        inherited edtPersonaContacto: TcxDBTextEdit
+          ExplicitWidth = 283
+          Width = 283
+        end
         inherited edtDireccion: TcxMemo
           ExplicitWidth = 121
           Width = 121
@@ -248,6 +256,10 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
           Left = 408
           ExplicitLeft = 408
         end
+        inherited edtTelefonos: TcxTextEdit
+          ExplicitWidth = 363
+          Width = 363
+        end
       end
     end
     object memFormaPago: TcxDBMemo

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

@@ -121,6 +121,7 @@ begin
   cbTipoPresupuesto.Properties.Items.Add(CTE_ARMARIO);
   cbTipoPresupuesto.Properties.Items.Add(CTE_BANO);
   cbTipoPresupuesto.Properties.Items.Add(CTE_ELECTRODOMESTICO);
+  cbTipoPresupuesto.Properties.Items.Add(CTE_OBRA);
   cbTipoPresupuesto.Properties.Items.Add(CTE_VARIOS);
 end;
 

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>
@@ -29,6 +29,7 @@
     <Borland.ProjectType />
     <BorlandProject>
 <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">5</VersionInfo><VersionInfo Name="Release">1</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.5.1.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.5.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 05 de septiembre de 2012 20:56</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_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.5.1.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
               VALUE "ProductVersion", "2.5.1.0\0"
-              VALUE "CompileDate", "viernes, 14 de septiembre de 2012 18:42\0"
+              VALUE "CompileDate", "martes, 29 de enero de 2013 12:21\0"
          END
     END
     BLOCK "VarFileInfo"