Se tetocan cosas de modulo de pedidos de proveedor y grupos, procedencias de cliente

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

Source/Base/Base.dproj

@@ -44,62 +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>
@@ -114,6 +58,54 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\designide.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
@@ -138,52 +130,11 @@
       <Form>dmBase</Form>
       <DesignClass>TDataModule</DesignClass>
     </DCCReference>
-    <DCCReference Include="Utiles\adortl.dcp" />
     <DCCReference Include="Utiles\ClassRegistry\uClassRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uEditorRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uInformeRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewConfiguracionRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewRegistryUtils.pas" />
-    <DCCReference Include="Utiles\cxDataD11.dcp" />
-    <DCCReference Include="Utiles\cxEditorsD11.dcp" />
-    <DCCReference Include="Utiles\cxExtEditorsD11.dcp" />
-    <DCCReference Include="Utiles\cxGridD11.dcp" />
-    <DCCReference Include="Utiles\cxLibraryD11.dcp" />
-    <DCCReference Include="Utiles\cxPageControlD11.dcp" />
-    <DCCReference Include="Utiles\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="Utiles\dbrtl.dcp" />
-    <DCCReference Include="Utiles\dclIndyCore.dcp" />
-    <DCCReference Include="Utiles\designide.dcp" />
-    <DCCReference Include="Utiles\dsnap.dcp" />
-    <DCCReference Include="Utiles\dxGDIPlusD11.dcp" />
-    <DCCReference Include="Utiles\dxPSCoreD11.dcp" />
-    <DCCReference Include="Utiles\dxThemeD11.dcp" />
-    <DCCReference Include="Utiles\GUISDK_D11R.dcp" />
-    <DCCReference Include="Utiles\IndyCore.dcp" />
-    <DCCReference Include="Utiles\IndyProtocols.dcp" />
-    <DCCReference Include="Utiles\IndySystem.dcp" />
-    <DCCReference Include="Utiles\Jcl.dcp" />
-    <DCCReference Include="Utiles\JclVcl.dcp" />
-    <DCCReference Include="Utiles\JSDialog100.dcp" />
-    <DCCReference Include="Utiles\JvCmpD11R.dcp" />
-    <DCCReference Include="Utiles\JvCoreD11R.dcp" />
-    <DCCReference Include="Utiles\JvCtrlsD11R.dcp" />
-    <DCCReference Include="Utiles\JvDlgsD11R.dcp" />
-    <DCCReference Include="Utiles\JvMMD11R.dcp" />
-    <DCCReference Include="Utiles\JvNetD11R.dcp" />
-    <DCCReference Include="Utiles\JvPageCompsD11R.dcp" />
-    <DCCReference Include="Utiles\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="Utiles\JvSystemD11R.dcp" />
-    <DCCReference Include="Utiles\pckMD5.dcp" />
-    <DCCReference Include="Utiles\pckUCDataConnector.dcp" />
-    <DCCReference Include="Utiles\pckUserControl_RT.dcp" />
-    <DCCReference Include="Utiles\PluginSDK_D11R.dcp" />
-    <DCCReference Include="Utiles\PngComponentsD10.dcp" />
-    <DCCReference Include="Utiles\PNG_D10.dcp" />
-    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="Utiles\rtl.dcp" />
-    <DCCReference Include="Utiles\TB2k_D10.dcp" />
-    <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
@@ -200,13 +151,6 @@
     <DCCReference Include="Utiles\uPasswordUtils.pas" />
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
     <DCCReference Include="Utiles\uStringsUtils.pas" />
-    <DCCReference Include="Utiles\vcl.dcp" />
-    <DCCReference Include="Utiles\vclactnband.dcp" />
-    <DCCReference Include="Utiles\vcldb.dcp" />
-    <DCCReference Include="Utiles\vcljpg.dcp" />
-    <DCCReference Include="Utiles\VclSmp.dcp" />
-    <DCCReference Include="Utiles\vclx.dcp" />
-    <DCCReference Include="Utiles\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Cliente/FactuGES.dproj

@@ -52,25 +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">6</VersionInfo><VersionInfo Name="Release">6</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.6.6.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.6.6.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">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">7</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.6.7.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.6.7.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>

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,6,0
+FILEVERSION 2,6,7,0
-PRODUCTVERSION 2,6,6,0
+PRODUCTVERSION 2,6,7,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.6.6.0\0"
+              VALUE "FileVersion", "2.6.7.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.6.6.0\0"
+              VALUE "ProductVersion", "2.6.7.0\0"
          END
     END
     BLOCK "VarFileInfo"

Source/GUIBase/GUIBase.dproj

@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="..\Servidor\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
+    <DCCReference Include="..\Servidor\ccpackD11.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\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Servidor\dxLayoutControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxCommonD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
+    <DCCReference Include="..\Servidor\frx11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
+    <DCCReference Include="..\Servidor\frxe11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
+    <DCCReference Include="..\Servidor\fs11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvGlobusD11R.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\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\vclx.dcp" />
+    <DCCReference Include="..\Servidor\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/GUIBase/uEditorBasico.pas

@@ -13,7 +13,21 @@ type
   end;
 
   TfEditorBasico = class(TCustomEditor, IEditorBasico)
+  protected
+    FWindowCaption : String;
+    FHeaderText : String;
+
+    function GetHeaderText: String;
+    function GetWindowCaption: String;
+    procedure SetHeaderText(const Value: String);
+    procedure SetWindowCaption(const Value: String);
+
+  published
     procedure CustomEditorShow(Sender: TObject);
+  published
+    property WindowCaption : String read GetWindowCaption write SetWindowCaption;
+    property HeaderText : String read GetHeaderText write SetHeaderText;
+
   end;
 
 implementation
@@ -27,6 +41,26 @@ begin
   ScaleFormFont(Self);
 end;
 
+function TfEditorBasico.GetHeaderText: String;
+begin
+  Result := FHeaderText;
+end;
+
+function TfEditorBasico.GetWindowCaption: String;
+begin
+  Result := FWindowCaption;
+end;
+
+procedure TfEditorBasico.SetHeaderText(const Value: String);
+begin
+  FHeaderText := Value;
+end;
+
+procedure TfEditorBasico.SetWindowCaption(const Value: String);
+begin
+  FWindowCaption := Value;
+end;
+
 initialization
   RegisterClass(TfEditorBasico);
 

Source/GUIBase/uEditorDBItem.dfm

@@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem
     Width = 650
     ExplicitWidth = 650
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 650
+      ExplicitWidth = 605
       inherited TBXItem26: TTBXItem
         Visible = False
       end
@@ -77,12 +77,14 @@ inherited fEditorDBItem: TfEditorDBItem
   object pgPaginas: TPageControl [3]
     AlignWithMargins = True
     Left = 3
-    Top = 118
+    Top = 109
     Width = 644
-    Height = 319
+    Height = 328
     ActivePage = pagGeneral
     Align = alClient
     TabOrder = 2
+    ExplicitTop = 118
+    ExplicitHeight = 319
     object pagGeneral: TTabSheet
       Caption = 'General'
       ExplicitLeft = 0
@@ -93,7 +95,7 @@ inherited fEditorDBItem: TfEditorDBItem
   end
   object PnlComentario: TPanel [4]
     Left = 0
-    Top = 85
+    Top = 76
     Width = 650
     Height = 30
     Align = alTop
@@ -103,6 +105,7 @@ inherited fEditorDBItem: TfEditorDBItem
     ParentBackground = False
     TabOrder = 4
     VerticalAlignment = taAlignTop
+    ExplicitTop = 85
     object lbComentario: TLabel
       AlignWithMargins = True
       Left = 6

Source/Modulos/Contactos/Contactos_Group.groupproj

@@ -97,15 +97,6 @@
   <Target Name="Contabilidad_controller:Make">
     <MSBuild Projects="..\Contabilidad\Controller\Contabilidad_controller.dproj" Targets="Make" />
   </Target>
-  <Target Name="Contactos_controller">
-    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="" />
-  </Target>
-  <Target Name="Contactos_controller:Clean">
-    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="Contactos_controller:Make">
-    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Make" />
-  </Target>
   <Target Name="Contactos_view">
     <MSBuild Projects="Views\Contactos_view.dproj" Targets="" />
   </Target>
@@ -115,6 +106,15 @@
   <Target Name="Contactos_view:Make">
     <MSBuild Projects="Views\Contactos_view.dproj" Targets="Make" />
   </Target>
+  <Target Name="Contactos_controller">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_controller:Clean">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_controller:Make">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Make" />
+  </Target>
   <Target Name="Contactos_plugin">
     <MSBuild Projects="Plugin\Contactos_plugin.dproj" Targets="" />
   </Target>
@@ -152,13 +152,13 @@
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_controller;Contactos_view;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_view;Contactos_controller;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_view:Clean;Contactos_controller:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_view:Make;Contactos_controller:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Contactos/Views/uEditorGruposCliente.pas

@@ -28,11 +28,12 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList,
-  uIEditorGruposCliente, uEditorBase, uGUIBase, ExtCtrls,
+  uIEditorGruposCliente, uEditorBasico, uGUIBase, ExtCtrls,
-  ComCtrls, uBizGruposCliente, uGruposClienteController, uDAInterfaces;
+  ComCtrls, uBizGruposCliente, uGruposClienteController, uDAInterfaces,
+  uEditorBase;
 
 type
-  TfEditorGruposCliente = class(TfEditorBase, IEditorGruposCliente)
+  TfEditorGruposCliente = class(TfEditorBasico, IEditorGruposCliente)
     ActionList1: TActionList;
     DADataSource: TDADataSource;
     ListaGruposCliente: TDBLookupListBox;

Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm

@@ -17,8 +17,6 @@ object fEditorGruposProveedor: TfEditorGruposProveedor
   Position = poScreenCenter
   OnClose = CustomEditorClose
   OnShow = FormShow
-  InstanceID = 0
-  ReadOnly = False
   PixelsPerInch = 96
   TextHeight = 13
   object bAceptar: TButton
@@ -48,10 +46,6 @@ object fEditorGruposProveedor: TfEditorGruposProveedor
     TabOrder = 0
     object TabSheet1: TTabSheet
       Caption = 'Grupos de proveedor'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Label1: TLabel
         Left = 10
         Top = 12

Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas

@@ -28,11 +28,12 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList,
-  uIEditorGruposProveedor, uEditorBase, uGUIBase, ExtCtrls,
+  uIEditorGruposProveedor, uEditorBasico, uGUIBase, ExtCtrls,
-  ComCtrls, uBizGruposProveedor, uGruposProveedorController, uDAInterfaces;
+  ComCtrls, uBizGruposProveedor, uGruposProveedorController, uDAInterfaces,
+  uEditorBase;
 
 type
-  TfEditorGruposProveedor = class(TfEditorBase, IEditorGruposProveedor)
+  TfEditorGruposProveedor = class(TfEditorBasico, IEditorGruposProveedor)
     ActionList1: TActionList;
     DADataSource: TDADataSource;
     ListaGruposProveedor: TDBLookupListBox;
@@ -54,7 +55,7 @@ type
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
 
     procedure actAnadirExecute(Sender: TObject);
-    procedure actEliminarExecute(Sender: TObject);
+    procedure actEliminarExecute(Sender: TObject); 
     procedure actAceptarExecute(Sender: TObject);
     procedure actCancelarExecute(Sender: TObject);
     procedure actCerrarExecute(Sender: TObject);

Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.dfm

@@ -17,8 +17,6 @@ object fEditorProcedenciasCliente: TfEditorProcedenciasCliente
   Position = poScreenCenter
   OnClose = CustomEditorClose
   OnShow = FormShow
-  InstanceID = 0
-  ReadOnly = False
   PixelsPerInch = 96
   TextHeight = 13
   object bAceptar: TButton

Source/Modulos/Contactos/Views/uEditorProcedenciasCliente.pas

@@ -28,11 +28,12 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList,
-  uIEditorProcedenciasCliente, uEditorBase, uGUIBase, ExtCtrls,
+  uIEditorProcedenciasCliente, uEditorBasico, uGUIBase, ExtCtrls,
-  ComCtrls, uBizProcedenciasCliente, uProcedenciasClienteController, uDAInterfaces;
+  ComCtrls, uBizProcedenciasCliente, uProcedenciasClienteController, uDAInterfaces,
+  uEditorBase;
 
 type
-  TfEditorProcedenciasCliente = class(TfEditorBase, IEditorProcedenciasCliente)
+  TfEditorProcedenciasCliente = class(TfEditorBasico, IEditorProcedenciasCliente)
     ActionList1: TActionList;
     DADataSource: TDADataSource;
     ListaProcedenciasCliente: TDBLookupListBox;

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

@@ -125,12 +125,12 @@ end;
 
 procedure TfrViewContratoCliente.CustomViewDestroy(Sender: TObject);
 begin
-  inherited;
   FFormasPago := Nil;
   FFormasPagoController := NIL;
   FVendedor := Nil;
   FVendedoresController := NIL;
   FViewClienteContrato := NIL;
+  inherited;  
 end;
 
 procedure TfrViewContratoCliente.frViewClienteContratoButton1Click(Sender: TObject);
@@ -185,7 +185,7 @@ begin
   else begin
     DADataSource.DataTable := NIL;
     dsFormaPago.DataTable := NIL;
-    dsVendedor.DataTable := NIL;    
+    dsVendedor.DataTable := NIL;
     FViewClienteContrato.Contrato := Nil;
   end;
 end;

Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm

@@ -204,6 +204,15 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'ID_VENDEDOR'
+        DataType = datInteger
+      end
+      item
+        Name = 'VENDEDOR'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'DESCRIPCION_GENERAL'
         DataType = datString

Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.dproj

@@ -41,58 +41,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</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><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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      <Parameters Name="UseLauncher">False</Parameters>
-      <Parameters Name="LoadAllSymbols">True</Parameters>
-      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-    </Parameters>
-    <Package_Options>
-      <Package_Options Name="ImplicitBuild">True</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-    </Package_Options>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</VersionInfo>
-      <VersionInfo Name="MinorVer">0</VersionInfo>
-      <VersionInfo Name="Release">0</VersionInfo>
-      <VersionInfo Name="Build">0</VersionInfo>
-      <VersionInfo Name="Debug">False</VersionInfo>
-      <VersionInfo Name="PreRelease">False</VersionInfo>
-      <VersionInfo Name="Special">False</VersionInfo>
-      <VersionInfo Name="Private">False</VersionInfo>
-      <VersionInfo Name="DLL">False</VersionInfo>
-      <VersionInfo Name="Locale">3082</VersionInfo>
-      <VersionInfo Name="CodePage">1252</VersionInfo>
-    </VersionInfo>
-    <VersionInfoKeys>
-      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
-      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
-    </VersionInfoKeys>
-    <Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       
       
       
@@ -103,11 +52,7 @@
       
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
       <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
-    </Excluded_Packages>
+    </Excluded_Packages><Source><Source Name="MainSource">PedidosProveedor_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-    <Source>
-      <Source Name="MainSource">PedidosProveedor_model.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
@@ -115,6 +60,7 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\..\Lib\Base.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
     <DCCReference Include="..\..\Lib\Contactos_model.dcp" />
     <DCCReference Include="Data\uIDataModulePedidosProveedor.pas" />
     <DCCReference Include="Data\uIDataModulePedidosProveedorReport.pas" />
@@ -125,7 +71,6 @@
     <None Include="ModelSupport_PedidosProveedor_model\default.txaPackage" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas

@@ -9,8 +9,8 @@ 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_PedidosProveedor = '{758A0298-445B-4696-96E5-CF9C3A9F3165}';
+  RID_PedidosProveedor = '{4E661347-2977-484B-A6B0-80499514DECB}';
-  RID_PedidosProveedor_Detalles = '{1460F7DE-C887-4ADA-99A2-F61D1EC6C15C}';
+  RID_PedidosProveedor_Detalles = '{4C0745E8-E202-4453-B100-9488446601CE}';
 
   { Data table names }
   nme_PedidosProveedor = 'PedidosProveedor';
@@ -55,6 +55,8 @@ const
   fld_PedidosProveedorID_FORMA_PAGO = 'ID_FORMA_PAGO';
   fld_PedidosProveedorID_TIENDA = 'ID_TIENDA';
   fld_PedidosProveedorTIENDA = 'TIENDA';
+  fld_PedidosProveedorID_VENDEDOR = 'ID_VENDEDOR';
+  fld_PedidosProveedorVENDEDOR = 'VENDEDOR';
   fld_PedidosProveedorDESCRIPCION_GENERAL = 'DESCRIPCION_GENERAL';
 
   { PedidosProveedor field indexes }
@@ -96,7 +98,9 @@ const
   idx_PedidosProveedorID_FORMA_PAGO = 35;
   idx_PedidosProveedorID_TIENDA = 36;
   idx_PedidosProveedorTIENDA = 37;
-  idx_PedidosProveedorDESCRIPCION_GENERAL = 38;
+  idx_PedidosProveedorID_VENDEDOR = 38;
+  idx_PedidosProveedorVENDEDOR = 39;
+  idx_PedidosProveedorDESCRIPCION_GENERAL = 40;
 
   { PedidosProveedor_Detalles fields }
   fld_PedidosProveedor_DetallesID = 'ID';
@@ -129,7 +133,7 @@ const
 type
   { IPedidosProveedor }
   IPedidosProveedor = interface(IDAStronglyTypedDataTable)
-  ['{4ACDD73C-0542-4FAB-BE31-1C7AF24DA3B9}']
+  ['{F47C3279-7242-45E8-9365-036E76E6F64B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -281,6 +285,14 @@ type
     procedure SetTIENDAValue(const aValue: String);
     function GetTIENDAIsNull: Boolean;
     procedure SetTIENDAIsNull(const aValue: Boolean);
+    function GetID_VENDEDORValue: Integer;
+    procedure SetID_VENDEDORValue(const aValue: Integer);
+    function GetID_VENDEDORIsNull: Boolean;
+    procedure SetID_VENDEDORIsNull(const aValue: Boolean);
+    function GetVENDEDORValue: String;
+    procedure SetVENDEDORValue(const aValue: String);
+    function GetVENDEDORIsNull: Boolean;
+    procedure SetVENDEDORIsNull(const aValue: Boolean);
     function GetDESCRIPCION_GENERALValue: String;
     procedure SetDESCRIPCION_GENERALValue(const aValue: String);
     function GetDESCRIPCION_GENERALIsNull: Boolean;
@@ -364,6 +376,10 @@ type
     property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
     property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
     property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
+    property ID_VENDEDOR: Integer read GetID_VENDEDORValue write SetID_VENDEDORValue;
+    property ID_VENDEDORIsNull: Boolean read GetID_VENDEDORIsNull write SetID_VENDEDORIsNull;
+    property VENDEDOR: String read GetVENDEDORValue write SetVENDEDORValue;
+    property VENDEDORIsNull: Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull;
     property DESCRIPCION_GENERAL: String read GetDESCRIPCION_GENERALValue write SetDESCRIPCION_GENERALValue;
     property DESCRIPCION_GENERALIsNull: Boolean read GetDESCRIPCION_GENERALIsNull write SetDESCRIPCION_GENERALIsNull;
   end;
@@ -527,6 +543,14 @@ type
     procedure SetTIENDAValue(const aValue: String); virtual;
     function GetTIENDAIsNull: Boolean; virtual;
     procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
+    function GetID_VENDEDORValue: Integer; virtual;
+    procedure SetID_VENDEDORValue(const aValue: Integer); virtual;
+    function GetID_VENDEDORIsNull: Boolean; virtual;
+    procedure SetID_VENDEDORIsNull(const aValue: Boolean); virtual;
+    function GetVENDEDORValue: String; virtual;
+    procedure SetVENDEDORValue(const aValue: String); virtual;
+    function GetVENDEDORIsNull: Boolean; virtual;
+    procedure SetVENDEDORIsNull(const aValue: Boolean); virtual;
     function GetDESCRIPCION_GENERALValue: String; virtual;
     procedure SetDESCRIPCION_GENERALValue(const aValue: String); virtual;
     function GetDESCRIPCION_GENERALIsNull: Boolean; virtual;
@@ -609,6 +633,10 @@ type
     property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
     property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
     property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
+    property ID_VENDEDOR: Integer read GetID_VENDEDORValue write SetID_VENDEDORValue;
+    property ID_VENDEDORIsNull: Boolean read GetID_VENDEDORIsNull write SetID_VENDEDORIsNull;
+    property VENDEDOR: String read GetVENDEDORValue write SetVENDEDORValue;
+    property VENDEDORIsNull: Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull;
     property DESCRIPCION_GENERAL: String read GetDESCRIPCION_GENERALValue write SetDESCRIPCION_GENERALValue;
     property DESCRIPCION_GENERALIsNull: Boolean read GetDESCRIPCION_GENERALIsNull write SetDESCRIPCION_GENERALIsNull;
 
@@ -620,7 +648,7 @@ type
 
   { IPedidosProveedor_Detalles }
   IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{F6271FC3-D2C6-451A-AF44-DD2BFAA0CE01}']
+  ['{B77F2CC6-6AAD-48DE-BF15-411FD2067FA1}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1610,6 +1638,48 @@ begin
     DataTable.Fields[idx_PedidosProveedorTIENDA].AsVariant := Null;
 end;
 
+function TPedidosProveedorDataTableRules.GetID_VENDEDORValue: Integer;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].AsInteger;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetID_VENDEDORValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].AsInteger := aValue;
+end;
+
+function TPedidosProveedorDataTableRules.GetID_VENDEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].IsNull;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetID_VENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PedidosProveedorID_VENDEDOR].AsVariant := Null;
+end;
+
+function TPedidosProveedorDataTableRules.GetVENDEDORValue: String;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorVENDEDOR].AsString;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetVENDEDORValue(const aValue: String);
+begin
+  DataTable.Fields[idx_PedidosProveedorVENDEDOR].AsString := aValue;
+end;
+
+function TPedidosProveedorDataTableRules.GetVENDEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorVENDEDOR].IsNull;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetVENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PedidosProveedorVENDEDOR].AsVariant := Null;
+end;
+
 function TPedidosProveedorDataTableRules.GetDESCRIPCION_GENERALValue: String;
 begin
   result := DataTable.Fields[idx_PedidosProveedorDESCRIPCION_GENERAL].AsString;

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas

@@ -9,13 +9,13 @@ 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_PedidosProveedorDelta = '{681EB6A0-478C-4A8D-8D6B-02511E481E8B}';
+  RID_PedidosProveedorDelta = '{2B5BA176-7B75-49EB-80AB-ADC962C1A41D}';
-  RID_PedidosProveedor_DetallesDelta = '{1BBF311F-9016-4DB3-A1F1-AF8DEDF05C62}';
+  RID_PedidosProveedor_DetallesDelta = '{F832D085-05C3-43CF-9354-9CC5A1A1CEF0}';
 
 type
   { IPedidosProveedorDelta }
   IPedidosProveedorDelta = interface(IPedidosProveedor)
-  ['{681EB6A0-478C-4A8D-8D6B-02511E481E8B}']
+  ['{2B5BA176-7B75-49EB-80AB-ADC962C1A41D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -55,6 +55,8 @@ type
     function GetOldID_FORMA_PAGOValue : Integer;
     function GetOldID_TIENDAValue : Integer;
     function GetOldTIENDAValue : String;
+    function GetOldID_VENDEDORValue : Integer;
+    function GetOldVENDEDORValue : String;
     function GetOldDESCRIPCION_GENERALValue : String;
 
     { Properties }
@@ -96,6 +98,8 @@ type
     property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue;
     property OldID_TIENDA : Integer read GetOldID_TIENDAValue;
     property OldTIENDA : String read GetOldTIENDAValue;
+    property OldID_VENDEDOR : Integer read GetOldID_VENDEDORValue;
+    property OldVENDEDOR : String read GetOldVENDEDORValue;
     property OldDESCRIPCION_GENERAL : String read GetOldDESCRIPCION_GENERALValue;
   end;
 
@@ -334,6 +338,18 @@ type
     function GetOldTIENDAIsNull: Boolean; virtual;
     procedure SetTIENDAValue(const aValue: String); virtual;
     procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
+    function GetID_VENDEDORValue: Integer; virtual;
+    function GetID_VENDEDORIsNull: Boolean; virtual;
+    function GetOldID_VENDEDORValue: Integer; virtual;
+    function GetOldID_VENDEDORIsNull: Boolean; virtual;
+    procedure SetID_VENDEDORValue(const aValue: Integer); virtual;
+    procedure SetID_VENDEDORIsNull(const aValue: Boolean); virtual;
+    function GetVENDEDORValue: String; virtual;
+    function GetVENDEDORIsNull: Boolean; virtual;
+    function GetOldVENDEDORValue: String; virtual;
+    function GetOldVENDEDORIsNull: Boolean; virtual;
+    procedure SetVENDEDORValue(const aValue: String); virtual;
+    procedure SetVENDEDORIsNull(const aValue: Boolean); virtual;
     function GetDESCRIPCION_GENERALValue: String; virtual;
     function GetDESCRIPCION_GENERALIsNull: Boolean; virtual;
     function GetOldDESCRIPCION_GENERALValue: String; virtual;
@@ -494,6 +510,14 @@ type
     property TIENDAIsNull : Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
     property OldTIENDA : String read GetOldTIENDAValue;
     property OldTIENDAIsNull : Boolean read GetOldTIENDAIsNull;
+    property ID_VENDEDOR : Integer read GetID_VENDEDORValue write SetID_VENDEDORValue;
+    property ID_VENDEDORIsNull : Boolean read GetID_VENDEDORIsNull write SetID_VENDEDORIsNull;
+    property OldID_VENDEDOR : Integer read GetOldID_VENDEDORValue;
+    property OldID_VENDEDORIsNull : Boolean read GetOldID_VENDEDORIsNull;
+    property VENDEDOR : String read GetVENDEDORValue write SetVENDEDORValue;
+    property VENDEDORIsNull : Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull;
+    property OldVENDEDOR : String read GetOldVENDEDORValue;
+    property OldVENDEDORIsNull : Boolean read GetOldVENDEDORIsNull;
     property DESCRIPCION_GENERAL : String read GetDESCRIPCION_GENERALValue write SetDESCRIPCION_GENERALValue;
     property DESCRIPCION_GENERALIsNull : Boolean read GetDESCRIPCION_GENERALIsNull write SetDESCRIPCION_GENERALIsNull;
     property OldDESCRIPCION_GENERAL : String read GetOldDESCRIPCION_GENERALValue;
@@ -507,7 +531,7 @@ type
 
   { IPedidosProveedor_DetallesDelta }
   IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
-  ['{1BBF311F-9016-4DB3-A1F1-AF8DEDF05C62}']
+  ['{F832D085-05C3-43CF-9354-9CC5A1A1CEF0}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -1879,6 +1903,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorTIENDA] := Null;
 end;
 
+function TPedidosProveedorBusinessProcessorRules.GetID_VENDEDORValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetID_VENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR]);
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldID_VENDEDORValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorID_VENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldID_VENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorID_VENDEDOR]);
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetID_VENDEDORValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR] := aValue;
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetID_VENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_VENDEDOR] := Null;
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetVENDEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetVENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR]);
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldVENDEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorVENDEDOR];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldVENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorVENDEDOR]);
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetVENDEDORValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR] := aValue;
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetVENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorVENDEDOR] := Null;
+end;
+
 function TPedidosProveedorBusinessProcessorRules.GetDESCRIPCION_GENERALValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorDESCRIPCION_GENERAL];

Source/Modulos/Pedidos a proveedor/Model/uBizPedidosProveedor.pas

@@ -40,6 +40,8 @@ type
   private
     procedure CalcularBaseImponible;
     procedure CalcularIVA;
+    procedure AsignarVendedor;
+
   protected
     FSeleccionableInterface : ISeleccionable;
     FProveedor : IBizProveedor;
@@ -92,10 +94,23 @@ implementation
 
 uses
   SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios,
-  uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uBizEmpresasTiendas;
+  uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uBizEmpresasTiendas,
+  uVendedoresController;
 
 { TBizPedidoProveedor }
 
+procedure TBizPedidoProveedor.AsignarVendedor;
+var
+  AVendedoresController: IVendedoresController;
+begin
+  AVendedoresController := TVendedoresController.Create;
+  try
+    ID_VENDEDOR := AVendedoresController.DarIDVendedorDeUsuario(AppFactuGES.UsuarioActivo.ID);
+  finally
+    AVendedoresController := nil;
+  end;
+end;
+
 procedure TBizPedidoProveedor.CalcularBaseImponible;
 begin
   if not Self.DataTable.Editing then
@@ -202,12 +217,14 @@ begin
   INCIDENCIAS_ACTIVAS := 0;
 //  ID_PEDIDO_CLIENTE := 0;
   REF_CON_CLIENTE := '';
-  ID_TIENDA := AppFactuGES.TiendaActiva.ID;
-  TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
 
   // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
   // ALMACÉN PUESTO A CAPÓN Y PROVISIONAL
   ID_ALMACEN := 1;
+
+  ID_TIENDA := AppFactuGES.TiendaActiva.ID;
+  TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
+  AsignarVendedor;
 end;
 
 procedure TBizPedidoProveedor.IVAOnChange(Sender: TDACustomField);

Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm

@@ -91,22 +91,23 @@ object RptPedidosProveedor: TRptPedidosProveedor
               'SELECT'#10'  V_PEDIDOS_PROVEEDOR.ID,'#10'  V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
               'A,'#10'  V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10'  V_PEDIDOS_PROVEEDOR.FECHA' +
               '_PEDIDO,'#10'  V_PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10'  V_PEDIDOS_PROVEE' +
-              'DOR.FECHA_ENVIO,'#10'  V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10'  V_PROVEE' +
+              'DOR.FECHA_ENVIO,'#10'  V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10'  V_PEDIDO' +
-              'DORES.NOMBRE,'#10'  V_PROVEEDORES.FAX,'#10#10'  V_CONTRATOS_CLIENTE.NOMBRE' +
+              'S_PROVEEDOR.VENDEDOR,'#10'  V_PROVEEDORES.NOMBRE,'#10'  V_PROVEEDORES.FA' +
-              ' AS NOMBRE_CLIENTE,'#10'  V_CONTRATOS_CLIENTE.CALLE,'#10'  V_CONTRATOS_C' +
+              'X,'#10#10#10'  V_CONTRATOS_CLIENTE.NOMBRE AS NOMBRE_CLIENTE,'#10'  V_CONTRAT' +
-              'LIENTE.POBLACION,'#10'  V_CONTRATOS_CLIENTE.PROVINCIA,'#10'  V_CONTRATOS' +
+              'OS_CLIENTE.CALLE,'#10'  V_CONTRATOS_CLIENTE.POBLACION,'#10'  V_CONTRATOS' +
-              '_CLIENTE.CODIGO_POSTAL,'#10'  V_CONTRATOS_CLIENTE.PERSONA_CONTACTO,'#10 +
+              '_CLIENTE.PROVINCIA,'#10'  V_CONTRATOS_CLIENTE.CODIGO_POSTAL,'#10'  V_CON' +
-              '  V_CONTRATOS_CLIENTE.TELEFONO,'#10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_E' +
+              'TRATOS_CLIENTE.PERSONA_CONTACTO,'#10'  V_CONTRATOS_CLIENTE.TELEFONO,' +
-              'MPRESA,'#10'  EMPRESAS.NOMBRE AS NOMBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SO' +
+              #10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_EMPRESA,'#10'  EMPRESAS.NOMBRE AS NO' +
-              'CIAL AS RAZON_SOCIAL_EMPRESA,'#10'  EMPRESAS.TELEFONO_1 AS TELEFONO_' +
+              'MBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SOCIAL AS RAZON_SOCIAL_EMPRESA,'#10' ' +
-              '1_EMPRESA,'#10'  EMPRESAS.FAX AS FAX_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS ' +
+              ' EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10'  EMPRESAS.FAX AS FA' +
-              'MOVIL_1_EMPRESA,'#10'  EMPRESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRES' +
+              'X_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS MOVIL_1_EMPRESA,'#10'  EMPRESAS.EMA' +
-              'AS.PAGINA_WEB AS PAGINA_WEB_EMPRESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10' ' +
+              'IL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRESAS.PAGINA_WEB AS PAGINA_WEB_EMP' +
-              ' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS_' +
+              'RESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10'  LEFT OUTER JOIN V_PROVEEDORES ' +
-              'PROVEEDOR.ID_PROVEEDOR)'#10'  LEFT OUTER JOIN V_CONTRATOS_CLIENTE ON' +
+              'ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'  LEFT ' +
-              ' (V_CONTRATOS_CLIENTE.ID = V_PEDIDOS_PROVEEDOR.ID_CONTRATO_CLIEN' +
+              'OUTER JOIN V_CONTRATOS_CLIENTE ON (V_CONTRATOS_CLIENTE.ID = V_PE' +
-              'TE)'#10'  LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_PEDIDOS_PROVE' +
+              'DIDOS_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10'  LEFT OUTER JOIN EMPRESAS ' +
-              'EDOR.ID_EMPRESA)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10
+              'ON (EMPRESAS.ID = V_PEDIDOS_PROVEEDOR.ID_EMPRESA)'#10'WHERE V_PEDIDO' +
+              'S_PROVEEDOR.ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -205,6 +206,11 @@ object RptPedidosProveedor: TRptPedidosProveedor
               item
                 DatasetField = 'FECHA_ENVIO'
                 TableField = 'FECHA_ENVIO'
+              end
+              item
+                DatasetField = 'VENDEDOR'
+                TableField = '<unknown>'
+                SQLOrigin = 'VENDEDOR'
               end>
           end>
         Name = 'Informe_Cabecera'
@@ -238,6 +244,11 @@ object RptPedidosProveedor: TRptPedidosProveedor
             Name = 'OBSERVACIONES'
             DataType = datMemo
           end
+          item
+            Name = 'VENDEDOR'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'NOMBRE'
             DataType = datString
@@ -480,7 +491,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
     PrintOptions.Printer = 'Por defecto'
     PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 39065.872423495400000000
-    ReportOptions.LastChange = 42258.790290613430000000
+    ReportOptions.LastChange = 42291.759212881950000000
     ScriptLanguage = 'PascalScript'
     ShowProgress = False
     StoreInDFM = False

Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm

@@ -175,6 +175,14 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               item
                 DatasetField = 'NOMBRE_CLIENTE'
                 TableField = 'NOMBRE_CLIENTE'
+              end
+              item
+                DatasetField = 'ID_VENDEDOR'
+                TableField = 'ID_VENDEDOR'
+              end
+              item
+                DatasetField = 'VENDEDOR'
+                TableField = 'VENDEDOR'
               end>
           end>
         Name = 'PedidosProveedor'
@@ -354,6 +362,15 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+          end
+          item
+            Name = 'VENDEDOR'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'DESCRIPCION_GENERAL'
             DataType = datString
@@ -845,6 +862,11 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datInteger
             Value = ''
           end
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+            Value = ''
+          end
           item
             Name = 'DESCRIPCION_GENERAL'
             DataType = datString
@@ -863,16 +885,16 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               'LLE, '#10'     POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO' +
               ', '#10'     TELEFONO, ID_CONTRATO_CLIENTE, IMPORTE_NETO, IMPORTE_POR' +
               'TE,'#10'     DESCUENTO, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, '#10'   ' +
-              '  IMPORTE_IVA, ID_FORMA_PAGO, ID_TIENDA, DESCRIPCION_GENERAL)'#10'  ' +
+              '  IMPORTE_IVA, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR, DESCRIPCIO' +
-              'VALUES'#10'    (:ID, :ID_EMPRESA, CURRENT_TIMESTAMP, :ID_PROVEEDOR,'#10 +
+              'N_GENERAL)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, CURRENT_TIMESTAMP, :I' +
-              '     :USUARIO, :OBSERVACIONES, :REFERENCIA, :FECHA_ENVIO,'#10'     :' +
+              'D_PROVEEDOR,'#10'     :USUARIO, :OBSERVACIONES, :REFERENCIA, :FECHA_' +
-              'FECHA_PEDIDO, :FECHA_CONFIRMACION, :FECHA_ENTREGA, :INCIDENCIAS,' +
+              'ENVIO,'#10'     :FECHA_PEDIDO, :FECHA_CONFIRMACION, :FECHA_ENTREGA, ' +
-              #10'     :IMPORTE_TOTAL, :INCIDENCIAS_ACTIVAS, :ID_ALMACEN, :CALLE,' +
+              ':INCIDENCIAS,'#10'     :IMPORTE_TOTAL, :INCIDENCIAS_ACTIVAS, :ID_ALM' +
-              #10'     :POBLACION, :PROVINCIA, :CODIGO_POSTAL, :PERSONA_CONTACTO,' +
+              'ACEN, :CALLE,'#10'     :POBLACION, :PROVINCIA, :CODIGO_POSTAL, :PERS' +
-              #10'     :TELEFONO, :ID_CONTRATO_CLIENTE, :IMPORTE_NETO, :IMPORTE_P' +
+              'ONA_CONTACTO,'#10'     :TELEFONO, :ID_CONTRATO_CLIENTE, :IMPORTE_NET' +
-              'ORTE,'#10'     :DESCUENTO, :IMPORTE_DESCUENTO, :BASE_IMPONIBLE, :IVA' +
+              'O, :IMPORTE_PORTE,'#10'     :DESCUENTO, :IMPORTE_DESCUENTO, :BASE_IM' +
-              ','#10'     :IMPORTE_IVA, :ID_FORMA_PAGO, :ID_TIENDA, :DESCRIPCION_GE' +
+              'PONIBLE, :IVA,'#10'     :IMPORTE_IVA, :ID_FORMA_PAGO, :ID_TIENDA, :I' +
-              'NERAL)'#10'     '#10'     '#10'     '#10'     '#10#10
+              'D_VENDEDOR, :DESCRIPCION_GENERAL)'#10'     '#10'     '#10'     '#10'     '#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1033,6 +1055,11 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datInteger
             Value = ''
           end
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+            Value = ''
+          end
           item
             Name = 'DESCRIPCION_GENERAL'
             DataType = datString
@@ -1064,8 +1091,9 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               'ORTE, '#10'    DESCUENTO = :DESCUENTO, '#10'    IMPORTE_DESCUENTO = :IMP' +
               'ORTE_DESCUENTO, '#10'    BASE_IMPONIBLE = :BASE_IMPONIBLE, '#10'    IVA ' +
               '= :IVA, '#10'    IMPORTE_IVA = :IMPORTE_IVA, '#10'    ID_FORMA_PAGO = :I' +
-              'D_FORMA_PAGO,'#10'    ID_TIENDA = :ID_TIENDA,'#10'    DESCRIPCION_GENERA' +
+              'D_FORMA_PAGO,'#10'    ID_TIENDA = :ID_TIENDA,'#10'    ID_VENDEDOR = :ID_' +
-              'L = :DESCRIPCION_GENERAL'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              'VENDEDOR,'#10'    DESCRIPCION_GENERAL = :DESCRIPCION_GENERAL'#10'  WHERE' +
+              #10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm

@@ -12,6 +12,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 922
     Caption = 'Nuevo pedido a proveedor'
+    ExplicitTop = 49
     ExplicitWidth = 922
     inherited Image1: TImage
       Left = 895
@@ -46,7 +47,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     Width = 922
     ExplicitWidth = 922
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 330
+      ExplicitWidth = 488
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -76,6 +77,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     Height = 491
     TabOrder = 1
     OnChanging = pgPaginasChanging
+    ExplicitTop = 109
     ExplicitWidth = 916
     ExplicitHeight = 491
     inherited pagGeneral: TTabSheet
@@ -105,50 +107,63 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
           ExplicitWidth = 908
           ExplicitHeight = 463
           inherited frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
-            Left = 413
+            Left = 551
-            ExplicitLeft = 413
+            Width = 357
+            ExplicitLeft = 551
+            ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
+              Width = 357
               inherited edtlNombre: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtNIFCIF: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtCalle: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtPoblacion: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 176
+                Width = 176
               end
               inherited edtProvincia: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 283
+                Width = 283
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 392
+                Left = 237
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 392
+                ExplicitLeft = 237
               end
               inherited Button3: TBitBtn
-                Left = 265
+                Left = 110
-                ExplicitLeft = 265
+                ExplicitLeft = 110
               end
             end
           end
@@ -157,29 +172,41 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited edtFechaConfirmacion: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited edtFechaEntrega: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited eReferencia: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
-            Top = 306
+            Width = 273
-            ExplicitTop = 306
+            Height = 166
+            ExplicitWidth = 273
+            ExplicitHeight = 166
             inherited dxLayoutControl1: TdxLayoutControl
+              Width = 273
+              Height = 166
               inherited rdxDestino1: TRadioButton
                 Width = 253
                 ExplicitWidth = 253
@@ -197,10 +224,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
                 Width = 238
               end
               inherited bModificar: TBitBtn
-                Left = 206
+                Left = 344
-                Top = 109
+                ExplicitLeft = 344
-                ExplicitLeft = 206
-                ExplicitTop = 109
               end
               inherited txtDireccion: TStaticText
                 Width = 238
@@ -215,44 +240,56 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 20
+            Width = 20
           end
           inherited bFormasPago: TButton
-            Left = 251
+            Left = 389
-            ExplicitLeft = 251
+            ExplicitLeft = 389
           end
           inherited edtFechaEnvio: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 158
+            Width = 158
           end
           inherited eReferenciaContratoCli: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 20
+            Width = 20
           end
           inherited Button1: TButton
-            Left = 251
+            Left = 389
-            ExplicitLeft = 251
+            ExplicitLeft = 389
           end
           inherited frViewTienda1: TfrViewTienda
-            Left = 413
+            Left = 551
-            ExplicitLeft = 413
+            Width = 357
+            ExplicitLeft = 551
+            ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
+              Width = 357
               inherited cbTienda: TcxComboBox
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 390
+                Width = 390
               end
             end
           end
           inherited frViewObservaciones1: TfrViewObservaciones
-            Left = 413
+            Width = 422
-            ExplicitLeft = 413
+            ExplicitWidth = 422
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewPedidoProveedor1.DADataSource
+              Width = 422
             end
           end
           inherited edtlDescripcion: TcxDBTextEdit
@@ -260,6 +297,20 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 283
+            Width = 283
+          end
+          inherited edtFechaEnvio2: TcxDBDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 257
+            Width = 257
+          end
+          inherited cbVendedor: TcxDBLookupComboBox
+            ExplicitWidth = 250
+            Width = 250
           end
         end
       end
@@ -312,57 +363,57 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitTop = 0
           end
           inherited UpDown1: TUpDown
-            Left = 555
+            Left = 571
             Top = 0
-            ExplicitLeft = 555
+            ExplicitLeft = 571
             ExplicitTop = 0
           end
           inherited ToolButton13: TToolButton
-            Left = 572
+            Left = 588
             Top = 0
-            ExplicitLeft = 572
+            ExplicitLeft = 588
             ExplicitTop = 0
           end
           inherited ToolButton6: TToolButton
-            Left = 580
+            Left = 596
             Top = 0
-            ExplicitLeft = 580
+            ExplicitLeft = 596
             ExplicitTop = 0
           end
           inherited ToolButton7: TToolButton
-            Left = 614
+            Left = 630
             Top = 0
-            ExplicitLeft = 614
+            ExplicitLeft = 630
             ExplicitTop = 0
           end
           inherited ToolButton8: TToolButton
-            Left = 648
+            Left = 664
             Top = 0
-            ExplicitLeft = 648
+            ExplicitLeft = 664
             ExplicitTop = 0
           end
           inherited ToolButton12: TToolButton
-            Left = 682
+            Left = 698
             Top = 0
-            ExplicitLeft = 682
+            ExplicitLeft = 698
             ExplicitTop = 0
           end
           inherited ToolButton9: TToolButton
-            Left = 690
+            Left = 706
             Top = 0
-            ExplicitLeft = 690
+            ExplicitLeft = 706
             ExplicitTop = 0
           end
           inherited ToolButton10: TToolButton
-            Left = 724
+            Left = 740
             Top = 0
-            ExplicitLeft = 724
+            ExplicitLeft = 740
             ExplicitTop = 0
           end
           inherited ToolButton11: TToolButton
-            Left = 758
+            Left = 774
             Top = 0
-            ExplicitLeft = 758
+            ExplicitLeft = 774
             ExplicitTop = 0
           end
         end
@@ -658,6 +709,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
   end
   inherited PnlComentario: TPanel [5]
     Width = 922
+    ExplicitTop = 76
     ExplicitWidth = 922
     inherited lbComentario: TLabel
       Width = 912
@@ -665,14 +717,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     end
   end
   inherited EditorActionList: TActionList [9]
-    inherited actPrevisualizar: TAction
-      Enabled = False
-      Visible = False
-    end
-    inherited actImprimir: TAction
-      Enabled = False
-      Visible = False
-    end
     inherited actDuplicar: TAction
       Enabled = False
       Visible = False

Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm

@@ -19,7 +19,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       934
       594)
     inline frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
-      Left = 435
+      Left = 577
       Top = 28
       Width = 357
       Height = 215
@@ -29,9 +29,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 12
+      TabOrder = 14
       ReadOnly = False
-      ExplicitLeft = 435
+      ExplicitLeft = 577
       ExplicitTop = 28
       ExplicitWidth = 357
       ExplicitHeight = 215
@@ -82,18 +82,18 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           Width = 283
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 396
+          Left = 254
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 396
+          ExplicitLeft = 254
           ExplicitWidth = 71
           Width = 71
         end
         inherited Button3: TBitBtn
-          Left = 269
+          Left = 127
-          ExplicitLeft = 269
+          ExplicitLeft = 127
         end
       end
     end
@@ -125,7 +125,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     end
     object edtFechaConfirmacion: TcxDBDateEdit
       Left = 158
-      Top = 276
+      Top = 399
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_CONFIRMACION'
       DataBinding.DataSource = DADataSource
@@ -146,12 +146,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 12
       Width = 158
     end
     object edtFechaEntrega: TcxDBDateEdit
       Left = 158
-      Top = 109
+      Top = 205
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENTREGA'
       DataBinding.DataSource = DADataSource
@@ -169,7 +169,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 3
+      TabOrder = 4
       Width = 158
     end
     object eReferencia: TcxDBTextEdit
@@ -200,7 +200,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     end
     inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
       Left = 22
-      Top = 354
+      Top = 456
       Width = 273
       Height = 166
       Font.Charset = DEFAULT_CHARSET
@@ -209,10 +209,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 11
+      TabOrder = 13
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 354
+      ExplicitTop = 456
       ExplicitWidth = 273
       ExplicitHeight = 166
       inherited dxLayoutControl1: TdxLayoutControl
@@ -233,10 +233,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           Width = 425
         end
         inherited bModificar: TBitBtn
-          Left = 245
+          Left = 370
-          Top = 183
+          Top = 109
-          ExplicitLeft = 245
+          ExplicitLeft = 370
-          ExplicitTop = 183
+          ExplicitTop = 109
         end
       end
       inherited ActionList1: TActionList
@@ -250,7 +250,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 158
-      Top = 163
+      Top = 259
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
       Enabled = False
@@ -280,22 +280,22 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 5
+      TabOrder = 6
       Width = 20
     end
     object bFormasPago: TButton
-      Left = 273
+      Left = 415
-      Top = 163
+      Top = 259
       Width = 132
       Height = 21
       Caption = 'Ver las formas de pago...'
       Enabled = False
-      TabOrder = 6
+      TabOrder = 7
       OnClick = bFormasPagoClick
     end
     object edtFechaEnvio: TcxDBDateEdit
       Left = 158
-      Top = 249
+      Top = 372
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENVIO'
       DataBinding.DataSource = DADataSource
@@ -316,12 +316,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 11
       Width = 158
     end
     object eReferenciaContratoCli: TcxTextEdit
       Left = 158
-      Top = 190
+      Top = 286
       Anchors = [akLeft, akTop, akRight]
       Properties.ReadOnly = False
       Properties.ValidateOnEnter = True
@@ -342,19 +342,19 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 8
       Width = 20
     end
     object Button1: TButton
-      Left = 273
+      Left = 415
-      Top = 190
+      Top = 286
       Width = 132
       Height = 23
       Action = actVerContratoCli
-      TabOrder = 8
+      TabOrder = 9
     end
     inline frViewTienda1: TfrViewTienda
-      Left = 435
+      Left = 577
       Top = 279
       Width = 357
       Height = 46
@@ -366,9 +366,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 13
+      TabOrder = 15
       ReadOnly = False
-      ExplicitLeft = 435
+      ExplicitLeft = 577
       ExplicitTop = 279
       ExplicitWidth = 357
       ExplicitHeight = 46
@@ -384,28 +384,36 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       end
     end
     inline frViewObservaciones1: TfrViewObservaciones
-      Left = 435
+      Left = 158
-      Top = 361
+      Top = 109
-      Width = 521
+      Width = 422
-      Height = 150
+      Height = 90
+      Align = alClient
+      AutoSize = True
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 14
+      TabOrder = 3
       ReadOnly = False
-      ExplicitLeft = 435
+      ExplicitLeft = 158
-      ExplicitTop = 361
+      ExplicitTop = 109
+      ExplicitWidth = 422
+      ExplicitHeight = 90
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'OBSERVACIONES'
         DataBinding.DataSource = DADataSource
+        ExplicitWidth = 422
+        ExplicitHeight = 90
+        Height = 90
+        Width = 422
       end
     end
     object edtlDescripcion: TcxDBTextEdit
       Left = 158
-      Top = 136
+      Top = 232
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
       DataBinding.DataField = 'DESCRIPCION_GENERAL'
@@ -425,7 +433,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 4
+      TabOrder = 5
       Height = 21
       Width = 283
     end
@@ -455,6 +463,36 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       TabOrder = 2
       Width = 257
     end
+    object cbVendedor: TcxDBLookupComboBox
+      Left = 158
+      Top = 315
+      DataBinding.DataField = 'ID_VENDEDOR'
+      DataBinding.DataSource = DADataSource
+      Properties.KeyFieldNames = 'ID'
+      Properties.ListColumns = <
+        item
+          FieldName = 'NOMBRE'
+        end>
+      Properties.ListOptions.GridLines = glNone
+      Properties.ListOptions.ShowHeader = False
+      Properties.ListOptions.SyncMode = True
+      Properties.ListSource = dsVendedor
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 10
+      Width = 250
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -485,6 +523,14 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             Control = edtFechaEnvio2
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item6: TdxLayoutItem
+            AutoAligns = []
+            AlignHorz = ahClient
+            Caption = 'Obervaciones:'
+            Control = frViewObservaciones1
+            ControlOptions.AutoColor = True
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControl1Item5: TdxLayoutItem
             Caption = 'Fecha de recepci'#243'n:'
             Control = edtFechaEntrega
@@ -524,20 +570,30 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             object dxLayoutControl1Group10: TdxLayoutGroup
               ShowCaption = False
               Hidden = True
-              LayoutDirection = ldHorizontal
               ShowBorder = False
-              object dxLayoutControl1Item11: TdxLayoutItem
+              object dxLayoutControl1Group7: TdxLayoutGroup
-                AutoAligns = [aaVertical]
-                AlignHorz = ahClient
-                Caption = 'Ref. contrato cliente:'
-                Control = eReferenciaContratoCli
-                ControlOptions.ShowBorder = False
-              end
-              object dxLayoutControl1Item12: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahRight
                 ShowCaption = False
-                Control = Button1
+                Hidden = True
+                LayoutDirection = ldHorizontal
+                ShowBorder = False
+                object dxLayoutControl1Item11: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahClient
+                  Caption = 'Ref. contrato cliente:'
+                  Control = eReferenciaContratoCli
+                  ControlOptions.ShowBorder = False
+                end
+                object dxLayoutControl1Item12: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahRight
+                  ShowCaption = False
+                  Control = Button1
+                  ControlOptions.ShowBorder = False
+                end
+              end
+              object dxLayoutControl1Item16: TdxLayoutItem
+                Caption = 'Vendedor:'
+                Control = cbVendedor
                 ControlOptions.ShowBorder = False
               end
             end
@@ -604,21 +660,6 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             ControlOptions.ShowBorder = False
           end
         end
-        object dxLayoutControl1Group7: TdxLayoutGroup
-          AutoAligns = [aaHorizontal]
-          AlignVert = avClient
-          Caption = 'Observaciones'
-          object dxLayoutControl1Item6: TdxLayoutItem
-            AutoAligns = []
-            AlignHorz = ahClient
-            AlignVert = avClient
-            Caption = 'New Item'
-            ShowCaption = False
-            Control = frViewObservaciones1
-            ControlOptions.AutoColor = True
-            ControlOptions.ShowBorder = False
-          end
-        end
       end
     end
   end
@@ -639,4 +680,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       OnUpdate = actVerContratoCliUpdate
     end
   end
+  object dsVendedor: TDADataSource
+    Left = 88
+    Top = 312
+  end
 end

Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas

@@ -13,7 +13,7 @@ uses
   uViewDireccionEntregaPedidoProv, cxLookupEdit, cxDBLookupEdit,
   uBizContratosCliente, uContratosClienteController,
   cxDBLookupComboBox, uFormasPagoController, ActnList, uDAInterfaces, uBizFormasPago,
-  uViewTienda, uPedidosProveedorController;
+  uViewTienda, uPedidosProveedorController, uBizContactos, uVendedoresController;
 
 type
   IViewPedidoProveedor = interface(IViewBase)
@@ -49,7 +49,6 @@ type
     eReferencia: TcxDBTextEdit;
     dxLayoutControl1Group5: TdxLayoutGroup;
     dxLayoutControl1Group6: TdxLayoutGroup;
-    dxLayoutControl1Group7: TdxLayoutGroup;
     dxLayoutControl1Group8: TdxLayoutGroup;
     dxLayoutControl1Group3: TdxLayoutGroup;
     dxLayoutControl1Item8: TdxLayoutItem;
@@ -79,6 +78,10 @@ type
     edtlDescripcion: TcxDBTextEdit;
     dxLayoutControl1Item15: TdxLayoutItem;
     edtFechaEnvio2: TcxDBDateEdit;
+    dxLayoutControl1Item16: TdxLayoutItem;
+    cbVendedor: TcxDBLookupComboBox;
+    dxLayoutControl1Group7: TdxLayoutGroup;
+    dsVendedor: TDADataSource;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure bFormasPagoClick(Sender: TObject);
@@ -91,7 +94,9 @@ type
     FController : IPedidosProveedorController;
     FViewProveedorPedido : TfrViewDatosYSeleccionProveedor;
     FFormasPago : IBizFormaPago;
+    FVendedor : IBizVendedor;
     FFormasPagoController : IFormasPagoController;
+    FVendedoresController : IVendedoresController;
     FContratoCliAsociado : IBizContratoCliente;
     FContratoCliController : IContratosClienteController;
 
@@ -140,7 +145,9 @@ procedure TfrViewPedidoProveedor.CustomViewCreate(Sender: TObject);
 begin
   inherited;
   FFormasPago := Nil;
+  FVendedor := Nil;
   FFormasPagoController := TFormasPagoController.Create;
+  FVendedoresController := TVendedoresController.Create;
   FViewProveedorPedido := frViewProveedorPedido;
   FViewProveedorPedido.MsgElegirProveedor := 'Elija el proveedor al que se le realizará el pedido.';
   eReferencia.Enabled := False;
@@ -154,6 +161,8 @@ begin
   FViewProveedorPedido := Nil;
   FFormasPago := Nil;
   FFormasPagoController := NIL;
+  FVendedor := Nil;
+  FVendedoresController := NIL;
   inherited;
 end;
 
@@ -214,6 +223,10 @@ begin
     dsFormaPago.DataTable := FFormasPago.DataTable;
     dsFormaPago.DataTable.Active := True;
 
+    FVendedor := (FVendedoresController.BuscarTodos as IBizVendedor);
+    dsVendedor.DataTable := FVendedor.DataTable;
+    dsVendedor.DataTable.Active := True;
+
     FContratoCliAsociado := NIL;
     if (FPedido.ID_CONTRATO_CLIENTE > 0) then
     begin
@@ -232,6 +245,7 @@ begin
   else begin
     DADataSource.DataTable := NIL;
     dsFormaPago.DataTable := NIL;
+    dsVendedor.DataTable := NIL;    
     FContratoCliAsociado := NIL;
   end;
 

Source/Servidor/FactuGES_Server.dpr

@@ -135,10 +135,10 @@ uses
   schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
   schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
   schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
-  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
-  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
   uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule},
-  uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule};
+  uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
+  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
+  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -28,7 +28,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<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">6</VersionInfo><VersionInfo Name="Release">6</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.6.6.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.6.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 09 de septiembre de 2015 11:08</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<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">6</VersionInfo><VersionInfo Name="Release">7</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.6.7.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.6.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de octubre de 2015 13:21</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

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,6,0
+FILEVERSION 2,6,7,0
-PRODUCTVERSION 2,6,6,0
+PRODUCTVERSION 2,6,7,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.6.6.0\0"
+              VALUE "FileVersion", "2.6.7.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.6.6.0\0"
+              VALUE "ProductVersion", "2.6.7.0\0"
-              VALUE "CompileDate", "jueves, 10 de septiembre de 2015 18:31\0"
+              VALUE "CompileDate", "miércoles, 14 de octubre de 2015 16:04\0"
          END
     END
     BLOCK "VarFileInfo"