Arreglos varios para que funcione la generación automática entre documentos, y poner vendedor en presupuesto de cliente

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

Source/ApplicationBase/ApplicationBase.dproj

@@ -52,6 +52,20 @@
       
       
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
       <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>
@@ -67,6 +81,53 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Base.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\ccpackD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cfpack_d11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxIntlPrintSys3D11.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\designide.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\GUIBase.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\GUISDK_D11.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\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvJansD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvMMD11R.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\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PluginSDK_D10R.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\vclshlctrls.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\xmlrtl.dcp" />
     <DCCReference Include="Ejercicios\Controller\uEjerciciosController.pas" />
     <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicio.pas" />
     <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicios.pas" />
@@ -110,46 +171,6 @@
     <DCCReference Include="Empresas\Model\uBizEmpresas.pas" />
     <DCCReference Include="Empresas\Model\uBizEmpresasDatosBancarios.pas" />
     <DCCReference Include="Empresas\Model\uBizEmpresasTiendas.pas" />
-    <DCCReference Include="Empresas\Views\adortl.dcp" />
-    <DCCReference Include="Empresas\Views\Base.dcp" />
-    <DCCReference Include="Empresas\Views\ccpackD11.dcp" />
-    <DCCReference Include="Empresas\Views\cfpack_d11.dcp" />
-    <DCCReference Include="Empresas\Views\cxDataD11.dcp" />
-    <DCCReference Include="Empresas\Views\cxEditorsD11.dcp" />
-    <DCCReference Include="Empresas\Views\cxExportD11.dcp" />
-    <DCCReference Include="Empresas\Views\cxExtEditorsD11.dcp" />
-    <DCCReference Include="Empresas\Views\cxGridD11.dcp" />
-    <DCCReference Include="Empresas\Views\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="Empresas\Views\cxLibraryD11.dcp" />
-    <DCCReference Include="Empresas\Views\cxPageControlD11.dcp" />
-    <DCCReference Include="Empresas\Views\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="Empresas\Views\dbrtl.dcp" />
-    <DCCReference Include="Empresas\Views\designide.dcp" />
-    <DCCReference Include="Empresas\Views\dsnap.dcp" />
-    <DCCReference Include="Empresas\Views\dxGDIPlusD11.dcp" />
-    <DCCReference Include="Empresas\Views\dxThemeD11.dcp" />
-    <DCCReference Include="Empresas\Views\GUIBase.dcp" />
-    <DCCReference Include="Empresas\Views\GUISDK_D11.dcp" />
-    <DCCReference Include="Empresas\Views\Jcl.dcp" />
-    <DCCReference Include="Empresas\Views\JclVcl.dcp" />
-    <DCCReference Include="Empresas\Views\JSDialog100.dcp" />
-    <DCCReference Include="Empresas\Views\JvAppFrmD11R.dcp" />
-    <DCCReference Include="Empresas\Views\JvCoreD11R.dcp" />
-    <DCCReference Include="Empresas\Views\JvCtrlsD11R.dcp" />
-    <DCCReference Include="Empresas\Views\JvJansD11R.dcp" />
-    <DCCReference Include="Empresas\Views\JvMMD11R.dcp" />
-    <DCCReference Include="Empresas\Views\JvPageCompsD11R.dcp" />
-    <DCCReference Include="Empresas\Views\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="Empresas\Views\JvSystemD11R.dcp" />
-    <DCCReference Include="Empresas\Views\pckUCDataConnector.dcp" />
-    <DCCReference Include="Empresas\Views\pckUserControl_RT.dcp" />
-    <DCCReference Include="Empresas\Views\PluginSDK_D10R.dcp" />
-    <DCCReference Include="Empresas\Views\PngComponentsD10.dcp" />
-    <DCCReference Include="Empresas\Views\PNG_D10.dcp" />
-    <DCCReference Include="Empresas\Views\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="Empresas\Views\rtl.dcp" />
-    <DCCReference Include="Empresas\Views\tb2k_d10.dcp" />
-    <DCCReference Include="Empresas\Views\tbx_d10.dcp" />
     <DCCReference Include="Empresas\Views\uEditorDatosBancariosEmpresa.pas">
       <Form>fEditorDatosBancariosEmpresa</Form>
       <DesignClass>TCustomEditor</DesignClass>
@@ -179,13 +200,6 @@
       <Form>frViewTiendas</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
-    <DCCReference Include="Empresas\Views\vcl.dcp" />
-    <DCCReference Include="Empresas\Views\vclactnband.dcp" />
-    <DCCReference Include="Empresas\Views\vcldb.dcp" />
-    <DCCReference Include="Empresas\Views\vcljpg.dcp" />
-    <DCCReference Include="Empresas\Views\vclshlctrls.dcp" />
-    <DCCReference Include="Empresas\Views\vclx.dcp" />
-    <DCCReference Include="Empresas\Views\xmlrtl.dcp" />
     <DCCReference Include="uFactuGES_App.pas" />
     <DCCReference Include="Usuarios\Controller\uUsuariosController.pas" />
     <DCCReference Include="Usuarios\Controller\View\uIEditorLogin.pas" />

Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm

@@ -32,7 +32,6 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
         GeneratorName = 'GEN_EMPRESAS_ID'
         LogChanges = False
         Required = True
-        ReadOnly = True
         ServerAutoRefresh = True
         DictionaryEntry = 'Empresas_ID'
         InPrimaryKey = True
@@ -211,7 +210,6 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
         GeneratorName = 'GEN_EMPRESAS_DATOS_BANCO_ID'
         LogChanges = False
         Required = True
-        ReadOnly = True
         ServerAutoRefresh = True
         DictionaryEntry = 'EmpresasDatosBanco_ID'
         InPrimaryKey = True

Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas

@@ -9,9 +9,9 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_EmpresasTiendas = '{8D3E024C-5C96-4AF7-A33B-7CC4047916D1}';
+  RID_EmpresasTiendas = '{BD78E5F1-4636-43A0-9362-F3F4CDC322CF}';
-  RID_Empresas = '{50B239EA-4065-446C-BFD0-3DD435D688DB}';
+  RID_Empresas = '{B8C14C6F-BCE5-4346-ABEC-0DADBCA0B194}';
-  RID_EmpresasDatosBanco = '{81489D87-3186-41E9-957C-EE42B0DF9818}';
+  RID_EmpresasDatosBanco = '{002C9069-240E-40BA-8F11-221B263BAB3C}';
 
   { Data table names }
   nme_EmpresasTiendas = 'EmpresasTiendas';
@@ -127,7 +127,7 @@ const
 type
   { IEmpresasTiendas }
   IEmpresasTiendas = interface(IDAStronglyTypedDataTable)
-  ['{F40A766E-1197-4AE4-A918-C93A5AFE174E}']
+  ['{B2D64357-38DD-4359-9187-E02D72E066E8}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -330,7 +330,7 @@ type
 
   { IEmpresas }
   IEmpresas = interface(IDAStronglyTypedDataTable)
-  ['{52463D68-269D-4495-ADC0-FEC7A805FA00}']
+  ['{FBFC4B93-8590-476D-A138-576E2114B398}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -629,7 +629,7 @@ type
 
   { IEmpresasDatosBanco }
   IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable)
-  ['{7D7F3648-2B22-4803-BF32-2B1A639EFBAD}']
+  ['{4C8B86F3-910E-49AF-A8B5-C4DA14DDE605}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);

Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas

@@ -9,14 +9,14 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_EmpresasTiendasDelta = '{EB9F203C-168E-44C1-BA0B-E4516034F67B}';
+  RID_EmpresasTiendasDelta = '{C646565C-D76B-4982-B86D-D3557DDE1E0C}';
-  RID_EmpresasDelta = '{78E591E0-1DDD-44B8-94C5-195FB5F4CA1D}';
+  RID_EmpresasDelta = '{8A74346F-1F18-4ABC-9BAA-602FDF120909}';
-  RID_EmpresasDatosBancoDelta = '{DAFAC177-CB3E-4600-930E-AE27099FD1C7}';
+  RID_EmpresasDatosBancoDelta = '{8F716BEB-5AC5-43F9-BA1B-6B2066216331}';
 
 type
   { IEmpresasTiendasDelta }
   IEmpresasTiendasDelta = interface(IEmpresasTiendas)
-  ['{EB9F203C-168E-44C1-BA0B-E4516034F67B}']
+  ['{C646565C-D76B-4982-B86D-D3557DDE1E0C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -219,7 +219,7 @@ type
 
   { IEmpresasDelta }
   IEmpresasDelta = interface(IEmpresas)
-  ['{78E591E0-1DDD-44B8-94C5-195FB5F4CA1D}']
+  ['{8A74346F-1F18-4ABC-9BAA-602FDF120909}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -519,7 +519,7 @@ type
 
   { IEmpresasDatosBancoDelta }
   IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco)
-  ['{DAFAC177-CB3E-4600-930E-AE27099FD1C7}']
+  ['{8F716BEB-5AC5-43F9-BA1B-6B2066216331}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;

Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm

@@ -786,16 +786,6 @@ object srvEmpresas: TsrvEmpresas
         Size = 3
         DisplayLabel = 'Sufijo 58'
       end
-      item
-        Name = 'Empresas_ID'
-        DataType = datAutoInc
-        GeneratorName = 'GEN_EMPRESAS_ID'
-        LogChanges = False
-        Required = True
-        DisplayLabel = 'ID'
-        ReadOnly = True
-        ServerAutoRefresh = True
-      end
       item
         Name = 'EmpresasDatosBanco_ID'
         DataType = datAutoInc
@@ -803,7 +793,15 @@ object srvEmpresas: TsrvEmpresas
         LogChanges = False
         Required = True
         DisplayLabel = 'ID'
-        ReadOnly = True
+        ServerAutoRefresh = True
+      end
+      item
+        Name = 'Empresas_ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_EMPRESAS_ID'
+        LogChanges = False
+        Required = True
+        DisplayLabel = 'ID'
         ServerAutoRefresh = True
       end
       item
@@ -889,9 +887,9 @@ object srvEmpresas: TsrvEmpresas
     Top = 90
     DiagramData = 
       '<Diagrams>'#13#10'  <Diagram Name="New Diagram" Left="200" Top="200" W' +
-      'idth="400" Height="300">'#13#10'    <Entity Name="Empresas" Left="0,00' +
+      'idth="400" Height="300">'#13#10'    <Entity Name="EmpresasDatosBanco" ' +
-      '" Top="0,00" />'#13#10'    <Entity Name="EmpresasDatosBanco" Left="310' +
+      'Left="309,00" Top="0,00" />'#13#10'    <Entity Name="Empresas" Left="0' +
-      ',00" Top="1,00" />'#13#10'  </Diagram>'#13#10'</Diagrams>'#13#10
+      ',00" Top="0,00" />'#13#10'  </Diagram>'#13#10'</Diagrams>'#13#10
   end
   object DABin2DataStreamer: TDABin2DataStreamer
     Left = 48

Source/ApplicationBase/Empresas/Views/uViewTienda.dfm

@@ -1,16 +1,16 @@
 inherited frViewTienda: TfrViewTienda
   Width = 451
-  Height = 46
+  Height = 72
   Align = alBottom
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
   ExplicitWidth = 451
-  ExplicitHeight = 46
+  ExplicitHeight = 72
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
     Width = 451
-    Height = 46
+    Height = 72
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -20,9 +20,9 @@ inherited frViewTienda: TfrViewTienda
     AutoContentSizes = [acsWidth, acsHeight]
     DesignSize = (
       451
-      46)
+      72)
     object cbTienda: TcxDBComboBox
-      Left = 51
+      Left = 65
       Top = 10
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'TIENDA'
@@ -42,7 +42,37 @@ inherited frViewTienda: TfrViewTienda
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 0
-      Width = 412
+      Width = 376
+    end
+    object cbVendedor: TcxDBLookupComboBox
+      Left = 65
+      Top = 37
+      DataBinding.DataField = 'ID_VENDEDOR'
+      Properties.DropDownListStyle = lsFixedList
+      Properties.KeyFieldNames = 'ID'
+      Properties.ListColumns = <
+        item
+          FieldName = 'NOMBRE'
+        end>
+      Properties.ListOptions.GridLines = glNone
+      Properties.ListOptions.ShowHeader = False
+      Properties.ListOptions.SyncMode = True
+      Properties.ListSource = dsVendedores
+      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 = 1
+      Width = 376
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
@@ -53,6 +83,15 @@ inherited frViewTienda: TfrViewTienda
         Control = cbTienda
         ControlOptions.ShowBorder = False
       end
+      object dxLayoutControl1Item2: TdxLayoutItem
+        Caption = 'Vendedor:'
+        Control = cbVendedor
+        ControlOptions.ShowBorder = False
+      end
     end
   end
+  object dsVendedores: TDADataSource
+    Left = 400
+    Top = 40
+  end
 end

Source/ApplicationBase/Empresas/Views/uViewTienda.pas

@@ -17,6 +17,9 @@ type
     dxLayoutControl1Group_Root: TdxLayoutGroup;
     dxLayoutControl1: TdxLayoutControl;
     dxLayoutControl1Item1: TdxLayoutItem;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    cbVendedor: TcxDBLookupComboBox;
+    dsVendedores: TDADataSource;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
 

Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk

@@ -28,7 +28,8 @@ requires
   AlbaranesCliente_model,
   AlbaranesCliente_controller,
   Articulos_view,
-  Almacenes_controller;
+  Almacenes_controller,
+  AlbCli_FacCli_relation;
 
 contains
   uAlbaranesClienteViewRegister in 'uAlbaranesClienteViewRegister.pas',

Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj

@@ -41,60 +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">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>
-      <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>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       
       
       
@@ -107,11 +54,7 @@
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found</Excluded_Packages>
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found</Excluded_Packages>
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclie100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclie100.bpl not found</Excluded_Packages>
-    </Excluded_Packages>
+    </Excluded_Packages><Source><Source Name="MainSource">AlbaranesCliente_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-    <Source>
-      <Source Name="MainSource">AlbaranesCliente_view.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
@@ -120,54 +63,68 @@
     </DelphiCompile>
     <DCCReference Include="..\..\Lib\AlbaranesCliente_controller.dcp" />
     <DCCReference Include="..\..\Lib\AlbaranesCliente_model.dcp" />
+    <DCCReference Include="..\..\Lib\AlbCli_FacCli_relation.dcp" />
     <DCCReference Include="..\..\Lib\Almacenes_controller.dcp" />
     <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
     <DCCReference Include="uAlbaranesClienteViewRegister.pas" />
     <DCCReference Include="uEditorAlbaranCliente.pas">
       <Form>fEditorAlbaranCliente</Form>
+      <DesignClass>TfEditorAlbaranCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorAlbaranDevCliente.pas">
       <Form>fEditorAlbaranDevCliente</Form>
+      <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorAlbaranesCliente.pas">
       <Form>fEditorAlbaranesCliente</Form>
+      <DesignClass>TfEditorPedidosCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorAlbaranesClienteReport.pas">
       <Form>fEditorAlbaranesClienteReport</Form>
+      <DesignClass>TfEditorAlbaranesClienteReport</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorAlbaranesDevCliente.pas">
       <Form>fEditorAlbaranesDevCliente</Form>
+      <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorElegirAlbaranesCliente.pas">
       <Form>fEditorElegirAlbaranesCliente</Form>
+      <DesignClass>TfEditorElegirAlbaranesCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorElegirArticulosAlbaranCliente.pas">
       <Form>fEditorElegirArticulosAlbaranCliente</Form>
+      <DesignClass>TfEditorElegirArticulosAlbaranCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewAlbaranCliente.pas">
       <Form>frViewAlbaranCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewAlbaranDevCliente.pas">
       <Form>frViewAlbaranDevCliente</Form>
+      <DesignClass>TCustomView</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewAlbaranesCliente.pas">
       <Form>frViewAlbaranesCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewAlbaranesDevCliente.pas">
       <Form>frViewAlbaranesDevCliente</Form>
+      <DesignClass>TCustomView</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewDetallesAlbaranCliente.pas">
       <Form>frViewDetallesAlbaranCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewDireccionEntregaAlbaranCliente.pas">
       <Form>frViewDireccionEntregaAlbaranCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewElegirArticulosAlbaranesCliente.pas">
       <Form>frViewElegirArticulosAlbaranesCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006

Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.rc

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

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas

@@ -79,14 +79,15 @@ type
   end;
 
 implementation
+{$INCLUDE ..\FactuGES.inc}
 
 uses
   uDataModuleAlbaranesCliente, uDataModuleUsuarios, uFactuGES_App,
 //En tecsitel no estaran habilitados los pedidos  
 //  uPedidosClienteController, uBizPedidosCliente,
-  uDialogUtils, schAlbaranesClienteClient_Intf,
+  uDialogUtils, schAlbaranesClienteClient_Intf, uGenerarFacturasCliAlbCliUtils,
-//  uFacturasClienteController, uBizFacturasCliente, uGenerarFacturasCliAlbCliUtils,
+//  uFacturasClienteController, uBizFacturasCliente, uGenerarAlbaranesCliUtils,
-//  uInventarioController, uGenerarAlbaranesCliUtils,
+//  uInventarioController,
   uEditorBase,
   cxCustomData, uGridUtils, uDBSelectionListUtils;
 
@@ -184,9 +185,8 @@ end;
 
 procedure TfEditorAlbaranesCliente.actGenerarFacturaExecute(Sender: TObject);
 begin
-AppFactuGES.ShowCapado;
+  GenerarFacturaCli(Albaranes.ID);
-//  GenerarFacturaCli(Albaranes.ID);
+  actRefrescar.Execute;
-//  actRefrescar.Execute;
 end;
 
 procedure TfEditorAlbaranesCliente.actGenerarFacturaUpdate(Sender: TObject);
@@ -238,6 +238,7 @@ AppFactuGES.ShowCapado;
         AAlbaran.DataTable.Active := True;
 
         AFacturasController := TFacturasClienteController.Create;
+//OJO NUEVO Y LUEGO UN AÑADIR EL DATASET AÑADE DOS REGISTROS
         AFactura := AFacturasController.Nuevo;
         try
           if AFacturasController.Anadir(AFactura, AAlbaran) then
@@ -363,6 +364,22 @@ begin
   if not Assigned(Albaranes) then
     raise Exception.Create('No hay ningún albarán asignado');
 
+  {$IFDEF ALMACEN}
+    actEnviar.Visible := True;
+    actEnviar.Enabled := True;
+    actCancelarEnvio.Visible := True;
+    actCancelarEnvio.Enabled := True;
+    actConfirmarRecepcion.Visible := True;
+    actConfirmarRecepcion.Enabled := True;
+  {$ELSE}
+    actEnviar.Visible := False;
+    actEnviar.Enabled := False;
+    actCancelarEnvio.Visible := False;
+    actCancelarEnvio.Enabled := False;
+    actConfirmarRecepcion.Visible := False;
+    actConfirmarRecepcion.Enabled := False;
+  {$ENDIF}
+
   Albaranes.DataTable.Active := True;
   ViewGrid.GotoFirst;
 end;

Source/Modulos/Contactos/Controller/uEmpleadosController.pas

@@ -7,6 +7,9 @@ uses
   uContactosController, uBizContactos,
   uIEditorEmpleados, uIEditorEmpleado, uIDataModuleContactos, uIDataModuleEmpleados;
 
+const
+  CTE_VENDEDOR = 'Vendedor';
+
 type
   IEmpleadosController = interface(IContactosController)
   ['{A3841871-7EF6-4847-9758-EA2B1C521D4A}']
@@ -14,6 +17,7 @@ type
     function Eliminar(AEmpleado: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     procedure Preview(AEmpleado : IBizEmpleado; AllItems: Boolean = false);
     procedure Print(AEmpleado : IBizEmpleado; AllItems: Boolean = false);
+    function BuscarVendedores: IBizContacto;
   end;
 
   TEmpleadosController = class(TContactosController, IEmpleadosController)
@@ -24,6 +28,7 @@ type
 
     function Buscar(const ID: Integer): IBizContacto; override;
     function BuscarTodos: IBizContacto; override;
+    function BuscarVendedores: IBizContacto;
     function Nuevo : IBizContacto; override;
     procedure Ver(AContacto : IBizContacto); override;
     procedure VerTodos(AContactos: IBizContacto); override;
@@ -40,7 +45,7 @@ implementation
 uses
   Classes, Windows, SysUtils, cxControls, Dialogs, uDataModuleEmpleados, uEditorRegistryUtils,
   uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uFichasEmpleadoReportController,
-  uEditorGridBase;
+  uEditorGridBase, uDAInterfaces;
 
 { TEmpleadoController }
 
@@ -56,6 +61,29 @@ begin
   FiltrarEmpresa(Result);
 end;
 
+function TEmpleadosController.BuscarVendedores: IBizContacto;
+var
+  Condicion: TDAWhereExpression;
+begin
+  ShowHourglassCursor;
+  try
+    Result := BuscarTodos;
+    // Filtrar los empleados que sean vendedores
+    with Result.DataTable.DynamicWhere do
+    begin
+      // (CATEGORIA <> 'VENDEDOR')
+      Condicion := NewBinaryExpression(NewField('', fld_EmpleadosCATEGORIA), NewConstant(CTE_VENDEDOR, datString), dboEqual);
+
+      if IsEmpty then
+         Expression := Condicion
+      else
+         Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
+    end;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 constructor TEmpleadosController.Create;
 begin
   inherited;

Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas

@@ -24,7 +24,7 @@ type
     function BuscarTodasPendientesComision(IdAgente: Integer; IdComision: Integer; IdFacturasAsociadas: String): IBizFacturaCliente;
     procedure Ver(AFactura : IBizFacturaCliente);
     procedure VerTodos(AFacturas: IBizFacturaCliente);
-    function Nuevo : IBizFacturaCliente;
+    function Nuevo (WithInsert: Boolean = True) : IBizFacturaCliente;
     function Anadir(AFactura : IBizFacturaCliente) : Boolean; overload;
     function AnadirAbono(AFactura : IBizFacturaCliente) : Boolean;
     function Anadir(AFacturas : IBizFacturaCliente; AListaAlbaranes : IBizAlbaranCliente): Boolean; overload;
@@ -92,7 +92,7 @@ type
     function Buscar(const ID: Integer): IBizFacturaCliente;
     function BuscarTodos: IBizFacturaCliente;
     function BuscarTodasPendientesComision(IdAgente: Integer; IdComision: Integer; IdFacturasAsociadas: String): IBizFacturaCliente;
-    function Nuevo : IBizFacturaCliente;
+    function Nuevo (WithInsert: Boolean = True) : IBizFacturaCliente;
     procedure Ver(AFactura : IBizFacturaCliente);
     procedure VerTodos(AFacturas: IBizFacturaCliente);
     function Duplicar(AFactura: IBizFacturaCliente): IBizFacturaCliente;
@@ -948,14 +948,15 @@ begin
   end;
 end;
 
-function TFacturasClienteController.Nuevo: IBizFacturaCliente;
+function TFacturasClienteController.Nuevo (WithInsert: Boolean = True): IBizFacturaCliente;
 var
   AFactura : IBizFacturaCliente;
 begin
   AFactura := FDataModule.NewItem;
   FiltrarEmpresa(AFactura);
   AFactura.DataTable.Active := True;
-  AFactura.Insert;
+  if WithInsert then
+     AFactura.Insert;
   Result := AFactura;
 end;
 

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.rc

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

Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas

@@ -23,7 +23,7 @@ type
     function BuscarTodos: IBizFacturaProveedor;
     procedure Ver(AFactura : IBizFacturaProveedor);
     procedure VerTodos(AFacturas: IBizFacturaProveedor);
-    function Nuevo : IBizFacturaProveedor;
+    function Nuevo (WithInsert: Boolean = True): IBizFacturaProveedor;
     function Anadir(AFactura : IBizFacturaProveedor) : Boolean; overload;
     function AnadirAbono(AFactura : IBizFacturaProveedor) : Boolean;
     function Anadir(AFacturas : IBizFacturaProveedor; AListaAlbaranes : IBizAlbaranProveedor): Boolean; overload;
@@ -91,7 +91,7 @@ type
     function Buscar(const ID: Integer): IBizFacturaProveedor;
     function BuscarTodos: IBizFacturaProveedor;
 //    function BuscarTodasPendientesComision(IdAgente: Integer; IdComision: Integer; IdFacturasAsociadas: String): IBizFacturaProveedor;
-    function Nuevo : IBizFacturaProveedor;
+    function Nuevo (WithInsert: Boolean = True) : IBizFacturaProveedor;
     procedure Ver(AFactura : IBizFacturaProveedor);
     procedure VerTodos(AFacturas: IBizFacturaProveedor);
     function Duplicar(AFactura: IBizFacturaProveedor): IBizFacturaProveedor;
@@ -929,14 +929,15 @@ begin
   end;
 end;
 
-function TFacturasProveedorController.Nuevo: IBizFacturaProveedor;
+function TFacturasProveedorController.Nuevo (WithInsert: Boolean = True): IBizFacturaProveedor;
 var
   AFactura : IBizFacturaProveedor;
 begin
   AFactura := FDataModule.NewItem;
   FiltrarEmpresa(AFactura);
   AFactura.DataTable.Active := True;
-  AFactura.Insert;
+  if WithInsert then
+     AFactura.Insert;
   Result := AFactura;
 end;
 

Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm

@@ -208,11 +208,28 @@ inherited DataModulePresupuestosCliente: TDataModulePresupuestosCliente
       item
         Name = 'ID_TIENDA'
         DataType = datInteger
+        DisplayLabel = 'PresupuestosCliente_ID_TIENDA'
+        DictionaryEntry = 'PresupuestosCliente_ID_TIENDA'
       end
       item
         Name = 'TIENDA'
         DataType = datString
         Size = 255
+        DisplayLabel = 'PresupuestosCliente_TIENDA'
+        DictionaryEntry = 'PresupuestosCliente_TIENDA'
+      end
+      item
+        Name = 'ID_VENDEDOR'
+        DataType = datInteger
+        DisplayLabel = 'PresupuestosCliente_ID_VENDEDOR'
+        DictionaryEntry = 'PresupuestosCliente_ID_VENDEDOR'
+      end
+      item
+        Name = 'VENDEDOR'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'PresupuestosCliente_VENDEDOR'
+        DictionaryEntry = 'PresupuestosCliente_VENDEDOR'
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_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_PresupuestosCliente = '{D65E3997-192F-46AE-A5A6-74972BB35B5C}';
+  RID_PresupuestosCliente = '{5E6BE2D5-2CC1-4C81-AF1C-67642F4B91E3}';
-  RID_PresupuestosCliente_Detalles = '{8A63C3E0-2797-4DA2-B3D2-6E2421031D6C}';
+  RID_PresupuestosCliente_Detalles = '{A6AC5D2F-0ECE-48BB-948B-EE8BA4978216}';
 
   { Data table names }
   nme_PresupuestosCliente = 'PresupuestosCliente';
@@ -47,6 +47,8 @@ const
   fld_PresupuestosClienteID_FORMA_PAGO = 'ID_FORMA_PAGO';
   fld_PresupuestosClienteID_TIENDA = 'ID_TIENDA';
   fld_PresupuestosClienteTIENDA = 'TIENDA';
+  fld_PresupuestosClienteID_VENDEDOR = 'ID_VENDEDOR';
+  fld_PresupuestosClienteVENDEDOR = 'VENDEDOR';
 
   { PresupuestosCliente field indexes }
   idx_PresupuestosClienteID = 0;
@@ -79,6 +81,8 @@ const
   idx_PresupuestosClienteID_FORMA_PAGO = 27;
   idx_PresupuestosClienteID_TIENDA = 28;
   idx_PresupuestosClienteTIENDA = 29;
+  idx_PresupuestosClienteID_VENDEDOR = 30;
+  idx_PresupuestosClienteVENDEDOR = 31;
 
   { PresupuestosCliente_Detalles fields }
   fld_PresupuestosCliente_DetallesID = 'ID';
@@ -115,7 +119,7 @@ const
 type
   { IPresupuestosCliente }
   IPresupuestosCliente = interface(IDAStronglyTypedDataTable)
-  ['{C8CE1CF3-FA22-4EDC-AA04-77E7DEFEF0CB}']
+  ['{A0CB5649-1F66-44F0-9873-3A27381A6679}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -233,6 +237,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);
 
 
     { Properties }
@@ -296,6 +308,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;
   end;
 
   { TPresupuestosClienteDataTableRules }
@@ -427,6 +443,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;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -489,6 +513,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;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -498,7 +526,7 @@ type
 
   { IPresupuestosCliente_Detalles }
   IPresupuestosCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{A51D059A-757B-4B22-BFBE-59784FE58AF1}']
+  ['{AB9E3800-3496-46AF-B3F8-740B313D8442}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1354,6 +1382,48 @@ begin
     DataTable.Fields[idx_PresupuestosClienteTIENDA].AsVariant := Null;
 end;
 
+function TPresupuestosClienteDataTableRules.GetID_VENDEDORValue: Integer;
+begin
+  result := DataTable.Fields[idx_PresupuestosClienteID_VENDEDOR].AsInteger;
+end;
+
+procedure TPresupuestosClienteDataTableRules.SetID_VENDEDORValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PresupuestosClienteID_VENDEDOR].AsInteger := aValue;
+end;
+
+function TPresupuestosClienteDataTableRules.GetID_VENDEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PresupuestosClienteID_VENDEDOR].IsNull;
+end;
+
+procedure TPresupuestosClienteDataTableRules.SetID_VENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PresupuestosClienteID_VENDEDOR].AsVariant := Null;
+end;
+
+function TPresupuestosClienteDataTableRules.GetVENDEDORValue: String;
+begin
+  result := DataTable.Fields[idx_PresupuestosClienteVENDEDOR].AsString;
+end;
+
+procedure TPresupuestosClienteDataTableRules.SetVENDEDORValue(const aValue: String);
+begin
+  DataTable.Fields[idx_PresupuestosClienteVENDEDOR].AsString := aValue;
+end;
+
+function TPresupuestosClienteDataTableRules.GetVENDEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PresupuestosClienteVENDEDOR].IsNull;
+end;
+
+procedure TPresupuestosClienteDataTableRules.SetVENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PresupuestosClienteVENDEDOR].AsVariant := Null;
+end;
+
 
 { TPresupuestosCliente_DetallesDataTableRules }
 constructor TPresupuestosCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_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_PresupuestosClienteDelta = '{CC11ACF3-93C5-43DB-915F-61693D6CC42B}';
+  RID_PresupuestosClienteDelta = '{69E2C449-3723-4636-AE0D-0312CFB3E6B8}';
-  RID_PresupuestosCliente_DetallesDelta = '{2600F24B-5EA6-4B31-AF94-2D62E9E3EF62}';
+  RID_PresupuestosCliente_DetallesDelta = '{D8A7CFD1-F8FD-4F89-8D5E-46BDA7608874}';
 
 type
   { IPresupuestosClienteDelta }
   IPresupuestosClienteDelta = interface(IPresupuestosCliente)
-  ['{CC11ACF3-93C5-43DB-915F-61693D6CC42B}']
+  ['{69E2C449-3723-4636-AE0D-0312CFB3E6B8}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -47,6 +47,8 @@ type
     function GetOldID_FORMA_PAGOValue : Integer;
     function GetOldID_TIENDAValue : Integer;
     function GetOldTIENDAValue : String;
+    function GetOldID_VENDEDORValue : Integer;
+    function GetOldVENDEDORValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -79,6 +81,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;
   end;
 
   { TPresupuestosClienteBusinessProcessorRules }
@@ -270,6 +274,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;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -392,6 +408,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;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -401,7 +425,7 @@ type
 
   { IPresupuestosCliente_DetallesDelta }
   IPresupuestosCliente_DetallesDelta = interface(IPresupuestosCliente_Detalles)
-  ['{2600F24B-5EA6-4B31-AF94-2D62E9E3EF62}']
+  ['{D8A7CFD1-F8FD-4F89-8D5E-46BDA7608874}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PRESUPUESTOValue : Integer;
@@ -1561,6 +1585,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteTIENDA] := Null;
 end;
 
+function TPresupuestosClienteBusinessProcessorRules.GetID_VENDEDORValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteID_VENDEDOR];
+end;
+
+function TPresupuestosClienteBusinessProcessorRules.GetID_VENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteID_VENDEDOR]);
+end;
+
+function TPresupuestosClienteBusinessProcessorRules.GetOldID_VENDEDORValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PresupuestosClienteID_VENDEDOR];
+end;
+
+function TPresupuestosClienteBusinessProcessorRules.GetOldID_VENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PresupuestosClienteID_VENDEDOR]);
+end;
+
+procedure TPresupuestosClienteBusinessProcessorRules.SetID_VENDEDORValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteID_VENDEDOR] := aValue;
+end;
+
+procedure TPresupuestosClienteBusinessProcessorRules.SetID_VENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteID_VENDEDOR] := Null;
+end;
+
+function TPresupuestosClienteBusinessProcessorRules.GetVENDEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteVENDEDOR];
+end;
+
+function TPresupuestosClienteBusinessProcessorRules.GetVENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteVENDEDOR]);
+end;
+
+function TPresupuestosClienteBusinessProcessorRules.GetOldVENDEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PresupuestosClienteVENDEDOR];
+end;
+
+function TPresupuestosClienteBusinessProcessorRules.GetOldVENDEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PresupuestosClienteVENDEDOR]);
+end;
+
+procedure TPresupuestosClienteBusinessProcessorRules.SetVENDEDORValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteVENDEDOR] := aValue;
+end;
+
+procedure TPresupuestosClienteBusinessProcessorRules.SetVENDEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteVENDEDOR] := Null;
+end;
+
 
 { TPresupuestosCliente_DetallesBusinessProcessorRules }
 constructor TPresupuestosCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm

@@ -141,6 +141,14 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
               item
                 DatasetField = 'TIENDA'
                 TableField = 'TIENDA'
+              end
+              item
+                DatasetField = 'ID_VENDEDOR'
+                TableField = 'ID_VENDEDOR'
+              end
+              item
+                DatasetField = 'VENDEDOR'
+                TableField = 'VENDEDOR'
               end>
           end>
         Name = 'PresupuestosCliente'
@@ -298,11 +306,24 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
           item
             Name = 'ID_TIENDA'
             DataType = datInteger
+            DictionaryEntry = 'PresupuestosCliente_ID_TIENDA'
           end
           item
             Name = 'TIENDA'
             DataType = datString
             Size = 255
+            DictionaryEntry = 'PresupuestosCliente_TIENDA'
+          end
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+            DictionaryEntry = 'PresupuestosCliente_ID_VENDEDOR'
+          end
+          item
+            Name = 'VENDEDOR'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'PresupuestosCliente_VENDEDOR'
           end>
       end
       item
@@ -578,6 +599,10 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
           item
             Name = 'ID_TIENDA'
             Value = ''
+          end
+          item
+            Name = 'ID_VENDEDOR'
+            Value = ''
           end>
         Statements = <
           item
@@ -591,14 +616,15 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
               'ERVACIONES, INCIDENCIAS, '#10'     INCIDENCIAS_ACTIVAS, FECHA_ALTA, ' +
               'FECHA_MODIFICACION, '#10'     USUARIO, IMPORTE_NETO, IMPORTE_PORTE, ' +
               'DESCUENTO, IMPORTE_DESCUENTO, '#10'     BASE_IMPONIBLE, IVA, IMPORTE' +
-              '_IVA, IMPORTE_TOTAL, ID_FORMA_PAGO,'#10'     ID_TIENDA)'#10'  VALUES'#10'   ' +
+              '_IVA, IMPORTE_TOTAL, ID_FORMA_PAGO,'#10'     ID_TIENDA, ID_VENDEDOR)' +
-              ' (:ID, :ID_EMPRESA, :FECHA_PRESUPUESTO, :FECHA_DECISION, :REFERE' +
+              #10'  VALUES'#10'    (:ID, :ID_EMPRESA, :FECHA_PRESUPUESTO, :FECHA_DECI' +
-              'NCIA,'#10'     :SITUACION, :ID_CLIENTE, :REFERENCIA_CLIENTE,'#10'     :C' +
+              'SION, :REFERENCIA,'#10'     :SITUACION, :ID_CLIENTE, :REFERENCIA_CLI' +
-              'LIENTE_FINAL, :PORTADA, :MEMORIA, :OBSERVACIONES, '#10'     :INCIDEN' +
+              'ENTE,'#10'     :CLIENTE_FINAL, :PORTADA, :MEMORIA, :OBSERVACIONES, '#10 +
-              'CIAS, :INCIDENCIAS_ACTIVAS, :FECHA_ALTA, :FECHA_MODIFICACION, '#10' ' +
+              '     :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, :FECHA_ALTA, :FECHA_MOD' +
-              '    :USUARIO, :IMPORTE_NETO, :IMPORTE_PORTE, :DESCUENTO, '#10'     :' +
+              'IFICACION, '#10'     :USUARIO, :IMPORTE_NETO, :IMPORTE_PORTE, :DESCU' +
-              'IMPORTE_DESCUENTO, :BASE_IMPONIBLE, :IVA, :IMPORTE_IVA, '#10'     :I' +
+              'ENTO, '#10'     :IMPORTE_DESCUENTO, :BASE_IMPONIBLE, :IVA, :IMPORTE_' +
-              'MPORTE_TOTAL, :ID_FORMA_PAGO, :ID_TIENDA)'#10
+              'IVA, '#10'     :IMPORTE_TOTAL, :ID_FORMA_PAGO, :ID_TIENDA, :ID_VENDE' +
+              'DOR)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -736,6 +762,10 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
             Name = 'ID_TIENDA'
             Value = ''
           end
+          item
+            Name = 'ID_VENDEDOR'
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -760,8 +790,8 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
               'ENTO, '#10'    IMPORTE_DESCUENTO = :IMPORTE_DESCUENTO, '#10'    BASE_IMP' +
               'ONIBLE = :BASE_IMPONIBLE, '#10'    IVA = :IVA, '#10'    IMPORTE_IVA = :I' +
               'MPORTE_IVA, '#10'    IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10'    ID_FORMA_P' +
-              'AGO = :ID_FORMA_PAGO,'#10'    ID_TIENDA = :ID_TIENDA'#10'  WHERE'#10'    (ID' +
+              'AGO = :ID_FORMA_PAGO,'#10'    ID_TIENDA = :ID_TIENDA,'#10'    ID_VENDEDO' +
-              ' = :OLD_ID)'#10
+              'R = :ID_VENDEDOR'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1221,6 +1251,24 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
         Name = 'PresupuestosCliente_Detalles_REFERENCIA_PROVEEDOR'
         DataType = datString
         Size = 255
+      end
+      item
+        Name = 'PresupuestosCliente_ID_TIENDA'
+        DataType = datInteger
+      end
+      item
+        Name = 'PresupuestosCliente_TIENDA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'PresupuestosCliente_ID_VENDEDOR'
+        DataType = datInteger
+      end
+      item
+        Name = 'PresupuestosCliente_VENDEDOR'
+        DataType = datString
+        Size = 255
       end>
     Left = 48
     Top = 152

Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dpk

@@ -29,7 +29,8 @@ requires
   GUIBase,
   PresupuestosCliente_model,
   PresupuestosCliente_controller,
-  Articulos_view;
+  Articulos_view,
+  Contactos_controller;
 
 contains
   uPresupuestosClienteViewRegister in 'uPresupuestosClienteViewRegister.pas',

Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj

@@ -43,6 +43,7 @@
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
+      
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
@@ -51,11 +52,12 @@
     <DelphiCompile Include="PresupuestosCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Articulos_view.dcp" />
+    <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
-    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\..\Lib\Base.dcp" />
-    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
-    <DCCReference Include="..\PresupuestosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
-    <DCCReference Include="..\PresupuestosCliente_model.dcp" />
+    <DCCReference Include="..\..\Lib\PresupuestosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Lib\PresupuestosCliente_model.dcp" />
     <DCCReference Include="uEditorElegirArticulosPresupuestoCliente.pas">
       <Form>fEditorElegirArticulosPresupuestoCliente</Form>
       <DesignClass>TfEditorElegirArticulosPedidoCliente</DesignClass>
@@ -577,4 +579,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
 TextsCollection=English
-EurekaLog Last Line -->
+EurekaLog Last Line -->

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

@@ -1,22 +1,23 @@
 inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
-  Width = 694
+  Width = 985
-  Height = 513
+  Height = 473
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
-  ExplicitWidth = 694
+  ExplicitWidth = 985
-  ExplicitHeight = 513
+  ExplicitHeight = 473
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 694
+    Width = 985
-    Height = 513
+    Height = 473
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitHeight = 629
     DesignSize = (
-      694
+      985
-      513)
+      473)
     object edtFechaPresupuesto: TcxDBDateEdit
       Left = 123
       Top = 109
@@ -42,7 +43,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
     end
     object memObservaciones: TcxDBMemo
       Left = 22
-      Top = 329
+      Top = 351
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
@@ -55,8 +56,8 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 10
-      Height = 253
+      Height = 100
-      Width = 186
+      Width = 941
     end
     object eReferencia: TcxDBTextEdit
       Left = 123
@@ -85,7 +86,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
       Width = 143
     end
     inline frViewClientePresupuesto: TfrViewDatosYSeleccionCliente
-      Left = 481
+      Left = 679
       Top = 28
       Width = 350
       Height = 212
@@ -97,7 +98,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
       ParentFont = False
       TabOrder = 9
       ReadOnly = False
-      ExplicitLeft = 481
+      ExplicitLeft = 679
       ExplicitTop = 28
       inherited dxLayoutControl1: TdxLayoutControl
         inherited edtlNombre: TcxDBTextEdit
@@ -170,7 +171,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
       Width = 101
     end
     object bFormasPago: TButton
-      Left = 319
+      Left = 517
       Top = 190
       Width = 132
       Height = 21
@@ -294,15 +295,21 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
       ExplicitLeft = 22
       ExplicitTop = 247
       ExplicitWidth = 766
+      ExplicitHeight = 46
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 766
+        Height = 46
         ExplicitWidth = 766
+        ExplicitHeight = 46
         inherited cbTienda: TcxDBComboBox
           DataBinding.DataSource = DADataSource
           Properties.OnChange = frViewTienda1cbTiendaPropertiesChange
           ExplicitWidth = 412
           Width = 412
         end
+        inherited cbVendedor: TcxDBLookupComboBox
+          DataBinding.DataSource = DADataSource
+        end
       end
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
@@ -310,6 +317,8 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
       Hidden = True
       ShowBorder = False
       object dxLayoutControl1Group10: TdxLayoutGroup
+        AutoAligns = [aaHorizontal]
+        AlignVert = avClient
         ShowCaption = False
         Hidden = True
         LayoutDirection = ldHorizontal
@@ -377,8 +386,12 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
             end
           end
           object dxLayoutControl1Group3: TdxLayoutGroup
+            AutoAligns = [aaHorizontal]
+            AlignVert = avClient
             Caption = 'El presupuesto pertenece al al tienda'
             object dxLayoutControl1Item9: TdxLayoutItem
+              AutoAligns = [aaHorizontal]
+              AlignVert = avClient
               Control = frViewTienda1
               ControlOptions.AutoColor = True
               ControlOptions.ShowBorder = False
@@ -398,7 +411,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
       end
       object dxLayoutControl1Group7: TdxLayoutGroup
         AutoAligns = [aaHorizontal]
-        AlignVert = avClient
+        AlignVert = avBottom
         Caption = 'Observaciones'
         object dxLayoutControl1Item6: TdxLayoutItem
           AutoAligns = [aaHorizontal]

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

@@ -12,7 +12,7 @@ uses
   cxTextEdit, cxMaskEdit, cxCalendar, dxLayoutControl, cxControls, cxMemo,
   uViewDireccionEntregaPresupuestoCliente, Buttons, ActnList, cxLookupEdit,
   cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, uDAInterfaces,
-  uBizFormasPago, uViewTienda, uPresupuestosClienteController;
+  uBizFormasPago, uViewTienda, uPresupuestosClienteController, uEmpleadosController;
 
 type
   IViewPresupuestoCliente = interface(IViewBase)
@@ -79,6 +79,7 @@ type
     FController : IPresupuestosClienteController;
     FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
+    FEmpleadosController : IEmpleadosController;
     FViewClientePresupuesto : TfrViewDatosYSeleccionCliente;
 
     function GetPresupuesto: IBizPresupuestoCliente;
@@ -156,6 +157,10 @@ begin
   FFormasPagoController := TFormasPagoController.Create;
   FViewClientePresupuesto := frViewClientePresupuesto;
   FViewClientePresupuesto.MsgElegirCliente := 'Elija el cliente al que se le realizará el Presupuesto.';
+
+  FEmpleadosController := TEmpleadosController.Create;
+  frViewTienda1.dsVendedores.DataTable := FEmpleadosController.BuscarVendedores.DataTable;
+  frViewTienda1.dsVendedores.DataTable.Active := true;
 end;
 
 procedure TfrViewPresupuestoCliente.CustomViewDestroy(Sender: TObject);

Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas

@@ -147,7 +147,7 @@ uses
   Forms, uNumUtils, cxControls, DB, uEditorRegistryUtils, Dialogs,
   uDAInterfaces, uDataTableUtils, uDataModuleUsuarios, uFactuGES_App,
   uDateUtils, uROTypes, DateUtils, Controls, Windows, Variants,
-  uRecibosClienteReportController, uBizContactos,
+  uRecibosClienteReportController, uBizContactos, uDADelta,
   schRecibosClienteClient_Intf, uIEditorRecibosCliente, uIEditorReciboCliente,
   uIEditorElegirRecibosCliente, uDataModuleRecibosCliente, uIEditorFechaPago;
 
@@ -691,11 +691,10 @@ begin
 end;
 
 function TRecibosClienteController.ImporteTotalModificado(ARecibosCliente : IBizRecibosCliente; var ImporteRestante: Currency) : Boolean;
-//var
+var
-//  HayCambio: TDADeltaChange;
+  HayCambio: TDADeltaChange;
 begin
   Result := False;
-{
   ImporteRestante := 0;
   HayCambio := ARecibosCliente.DataTable.Delta.FindChange(ARecibosCliente.RecNo);
   if  (Assigned(HayCambio)) and
@@ -705,7 +704,6 @@ begin
     if ImporteRestante <> 0 then
       Result := True;
   end;
-}  
 end;
 
 function TRecibosClienteController.Guardar(ARecibosCliente: IBizRecibosCliente): Boolean;
@@ -723,18 +721,12 @@ begin
   begin
     ShowHourglassCursor;
     try
-//      if ARecibosCliente.EsNuevo then
-//        NuevoID := FDataModule.GetNextID(ARecibosCliente.DataTable.LogicalName)
-//      else
-//        NuevoID := ARecibosCliente.ID;
-
       //Si el importe ha cambiado se debe hacer un recibo nuevo con el importe restante
       if ImporteTotalModificado(ARecibosCliente, ImporteRestante) then
       begin
         ANuevoReciboCliente := Duplicar(ARecibosCliente);
         ANuevoReciboCliente.Edit;
         ANuevoReciboCliente.REFERENCIA := DarNuevaReferencia(ARecibosCliente.ID_FACTURA, ARecibosCliente.REFERENCIA);
-//        ANuevoReciboCliente.ID := FDataModule.GetNextID(ARecibosCliente.DataTable.LogicalName);
         ANuevoReciboCliente.IMPORTE := ImporteRestante;
         ANuevoReciboCliente.DESCRIPCION := 'RECIBO ' + ANuevoReciboCliente.REFERENCIA + ' - ' + CifraToLetras(ImporteRestante);
         ANuevoReciboCliente.Post;

Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorController.pas

@@ -142,7 +142,7 @@ uses
   Forms, uNumUtils, cxControls, DB, uEditorRegistryUtils, Dialogs,
   uDAInterfaces, uDataTableUtils, uDataModuleUsuarios, uFactuGES_App,
   uDateUtils, uROTypes, DateUtils, Controls, Windows, Variants,
-  uRecibosProveedorReportController, uBizContactos,
+  uRecibosProveedorReportController, uBizContactos, uDADelta,
   schRecibosProveedorClient_Intf, uIEditorRecibosProveedor, uIEditorReciboProveedor,
   uDataModuleRecibosProveedor, uIEditorFechaPagoProveedor, uIEditorElegirRecibosProveedor;
 
@@ -672,11 +672,9 @@ begin
 end;
 
 function TRecibosProveedorController.ImporteTotalModificado(ARecibosProveedor : IBizRecibosProveedor; var ImporteRestante: Currency) : Boolean;
-//REPASAR
+var
-//var
+  HayCambio: TDADeltaChange;
-//  HayCambio: TDADeltaChange;
 begin
-{
   Result := False;
   ImporteRestante := 0;
   HayCambio := ARecibosProveedor.DataTable.Delta.FindChange(ARecibosProveedor.RecNo);
@@ -687,7 +685,6 @@ begin
     if ImporteRestante <> 0 then
       Result := True;
   end;
-}
 end;
 
 function TRecibosProveedorController.Guardar(ARecibosProveedor: IBizRecibosProveedor): Boolean;

Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dproj

@@ -0,0 +1,725 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{69494a8c-0a35-41ea-b8ec-ea790bfc0662}</ProjectGuid>
+    <MainSource>AlbCli_FacCli_relation.dpk</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>..\..\..\..\Output\Debug\Cliente\AlbCli_FacCli_relation.bpl</DCC_DependencyCheckOutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_BplOutput>..\..\..\..\Output\Debug\Cliente</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\Lib</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\..\..\Lib;..\..\Lib</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
+    <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
+    <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
+    <DCC_Define>RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_BplOutput>..\..\..\..\Output\Debug\Cliente</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\Lib</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\..\..\Lib;..\..\Lib</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
+    <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
+    <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType>Package</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclsmp100.bpl">Borland Sample Components</Excluded_Packages>
+      <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dcl31w100.bpl">Delphi 1.0 Compatibility Components</Excluded_Packages>
+      <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclmid100.bpl">Borland MyBase DataAccess Components</Excluded_Packages>
+      <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dcltee100.bpl">TeeChart Components</Excluded_Packages>
+      <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dcldbxcds100.bpl">Borland SimpleDataset Component (DBX)</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\dcldxBarExtItemsD10.bpl">ExpressBars extended items by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="T:\BPL_D10\dcldxBarD10.bpl">ExpressBars by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\dclcxSchedulerD10.bpl">ExpressScheduler 2 by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\dclcxVerticalGridD10.bpl">ExpressVerticalGrid by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\dcldxBarDBNavD10.bpl">ExpressBars DBNavigator by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\dcldxBarExtDBItemsD10.bpl">ExpressBars extended DB items by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\dcldxsbD10.bpl">ExpressSideBar by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvBandsD10D.bpl">JVCL Band Objects</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvCmpD10D.bpl">JVCL Non-Visual Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvCryptD10D.bpl">JVCL Encryption and Compression Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvDlgsD10D.bpl">JVCL Dialog Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvDockingD10D.bpl">JVCL Docking Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvDotNetCtrlsD10D.bpl">JVCL DotNet Controls</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvEDID10D.bpl">JVCL EDI Components Designtime Package</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvHMID10D.bpl">JVCL HMI Controls design time unit</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvInterpreterD10D.bpl">JVCL Interpreter Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvJansD10D.bpl">JVCL Jans Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvManagedThreadsD10D.bpl">JVCL Managed Threads</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvMMD10D.bpl">JVCL Multimedia and Image Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvNetD10D.bpl">JVCL Network Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvPageCompsD10D.bpl">JVCL Page Style Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvPluginD10D.bpl">JVCL Plugin Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvPrintPreviewD10D.bpl">JVCL Print Preview Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvRuntimeDesignD10D.bpl">JVCL Runtime Design Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvTimeFrameworkD10D.bpl">JVCL Time Framework</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvUIBD10D.bpl">JVCL Unified Interbase Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\JvValidatorsD10D.bpl">JVCL Validators and Error Provider Components</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\SMImportD2006.bpl">SMImport suite: data importing into dataset. Scalabium/Mike Shkolnik, 2000-2005</Excluded_Packages>
+      <Excluded_Packages Name="T:\Bpl_D10\SMExportD2006.bpl">SMExport suite: data export from dataset. Written by Mike Shkolnik/Scalabium, 1998-2004.</Excluded_Packages>
+      <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
+      <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclie100.bpl">Internet Explorer Components</Excluded_Packages>
+    </Excluded_Packages><Source><Source Name="MainSource">AlbCli_FacCli_relation.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup>
+    <DelphiCompile Include="AlbCli_FacCli_relation.dpk">
+      <MainSource>MainSource</MainSource>
+    </DelphiCompile>
+    <DCCReference Include="AlbaranesCliente_controller.dcp" />
+    <DCCReference Include="AlbaranesCliente_model.dcp" />
+    <DCCReference Include="FacturasCliente_controller.dcp" />
+    <DCCReference Include="FacturasCliente_model.dcp" />
+    <DCCReference Include="uGenerarAlbaranesCliFacCliUtils.pas">
+      <Form>dmGenerarAlbaranesCli</Form>
+    </DCCReference>
+    <DCCReference Include="uGenerarFacturasCliAlbCliUtils.pas">
+      <Form>dmGenerarFacturasCli</Form>
+    </DCCReference>
+  </ItemGroup>
+</Project>
+<!-- EurekaLog First Line
+[Exception Log]
+EurekaLog Version=6006
+Activate=0
+Activate Handle=1
+Save Log File=1
+Foreground Tab=0
+Freeze Activate=0
+Freeze Timeout=60
+SMTP From=eurekalog@email.com
+SMTP Host=
+SMTP Port=25
+SMTP UserID=
+SMTP Password=
+Append to Log=0
+TerminateBtn Operation=2
+Errors Number=32
+Errors Terminate=3
+Email Address=
+Email Object=
+Email Send Options=0
+Output Path=
+Encrypt Password=
+AutoCloseDialogSecs=0
+WebSendMode=0
+SupportULR=
+HTMLLayout Count=15
+HTMLLine0="%3Chtml%3E"
+HTMLLine1="  %3Chead%3E"
+HTMLLine2="  %3C/head%3E"
+HTMLLine3="  %3Cbody TopMargin=10 LeftMargin=10%3E"
+HTMLLine4="    %3Ctable width="100%%" border="0"%3E"
+HTMLLine5="      %3Ctr%3E"
+HTMLLine6="        %3Ctd nowrap%3E"
+HTMLLine7="          %3Cfont face="Lucida Console, Courier" size="2"%3E"
+HTMLLine8="            %3C%%HTML_TAG%%%3E"
+HTMLLine9="          %3C/font%3E"
+HTMLLine10="        %3C/td%3E"
+HTMLLine11="      %3C/tr%3E"
+HTMLLine12="    %3C/table%3E"
+HTMLLine13="  %3C/body%3E"
+HTMLLine14="%3C/html%3E"
+AutoCrashOperation=2
+AutoCrashNumber=10
+AutoCrashMinutes=1
+WebURL=
+WebUserID=
+WebPassword=
+WebPort=0
+AttachedFiles=
+ProxyURL=
+ProxyUser=
+ProxyPassword=
+ProxyPort=8080
+TrakerUser=
+TrakerPassword=
+TrakerAssignTo=
+TrakerProject=
+TrakerCategory=
+TrakerTrialID=
+ZipPassword=
+PreBuildEvent=
+PostSuccessfulBuildEvent=
+PostFailureBuildEvent=
+ExceptionDialogType=2
+Count=0
+EMail Message Line Count=0
+loNoDuplicateErrors=0
+loAppendReproduceText=0
+loDeleteLogAtVersionChange=0
+loAddComputerNameInLogFileName=0
+loSaveModulesAndProcessesSections=1
+loSaveAssemblerAndCPUSections=1
+soAppStartDate=1
+soAppName=1
+soAppVersionNumber=1
+soAppParameters=1
+soAppCompilationDate=1
+soAppUpTime=1
+soExcDate=1
+soExcAddress=1
+soExcModuleName=1
+soExcModuleVersion=1
+soExcType=1
+soExcMessage=1
+soExcID=1
+soExcCount=1
+soExcStatus=1
+soExcNote=1
+soUserID=1
+soUserName=1
+soUserEmail=1
+soUserPrivileges=1
+soUserCompany=1
+soActCtlsFormClass=1
+soActCtlsFormText=1
+soActCtlsControlClass=1
+soActCtlsControlText=1
+soCmpName=1
+soCmpTotalMemory=1
+soCmpFreeMemory=1
+soCmpTotalDisk=1
+soCmpFreeDisk=1
+soCmpSysUpTime=1
+soCmpProcessor=1
+soCmpDisplayMode=1
+soCmpDisplayDPI=1
+soCmpVideoCard=1
+soCmpPrinter=1
+soOSType=1
+soOSBuildN=1
+soOSUpdate=1
+soOSLanguage=1
+soOSCharset=1
+soNetIP=1
+soNetSubmask=1
+soNetGateway=1
+soNetDNS1=1
+soNetDNS2=1
+soNetDHCP=1
+soCustomData=1
+sndShowSendDialog=1
+sndShowSuccessFailureMsg=0
+sndSendEntireLog=0
+sndSendXMLLogCopy=0
+sndSendScreenshot=1
+sndUseOnlyActiveWindow=0
+sndSendLastHTMLPage=1
+sndSendInSeparatedThread=0
+sndAddDateInFileName=0
+sndAddComputerNameInFileName=0
+edoSendErrorReportChecked=1
+edoAttachScreenshotChecked=1
+edoShowCopyToClipOption=1
+edoShowDetailsButton=1
+edoShowInDetailedMode=0
+edoShowInTopMostMode=0
+edoUseEurekaLogLookAndFeel=0
+edoShowSendErrorReportOption=1
+edoShowAttachScreenshotOption=1
+edoShowCustomButton=0
+csoShowDLLs=1
+csoShowBPLs=1
+csoShowBorlandThreads=1
+csoShowWindowsThreads=1
+csoDoNotStoreProcNames=0
+boPauseBorlandThreads=0
+boDoNotPauseMainThread=0
+boPauseWindowsThreads=0
+boUseMainModuleOptions=1
+boCopyLogInCaseOfError=1
+boSaveCompressedCopyInCaseOfError=0
+boHandleSafeCallExceptions=1
+boCallRTLExceptionEvent=0
+boCatchHandledExceptions=0
+loCatchLeaks=0
+loGroupsSonLeaks=1
+loHideBorlandLeaks=1
+loFreeAllLeaks=1
+loCatchLeaksExceptions=1
+cfoReduceFileSize=1
+cfoCheckFileCorruption=0
+Count mtInformationMsgCaption=1
+mtInformationMsgCaption0="Information."
+Count mtQuestionMsgCaption=1
+mtQuestionMsgCaption0="Question."
+Count mtErrorMsgCaption=1
+mtErrorMsgCaption0="Error."
+Count mtDialog_Caption=1
+mtDialog_Caption0="Error occurred"
+Count mtDialog_ErrorMsgCaption=2
+mtDialog_ErrorMsgCaption0="An error has occurred during program execution."
+mtDialog_ErrorMsgCaption1="Please read the following information for further details."
+Count mtDialog_GeneralCaption=1
+mtDialog_GeneralCaption0="General"
+Count mtDialog_GeneralHeader=1
+mtDialog_GeneralHeader0="General Information"
+Count mtDialog_CallStackCaption=1
+mtDialog_CallStackCaption0="Call Stack"
+Count mtDialog_CallStackHeader=1
+mtDialog_CallStackHeader0="Call Stack Information"
+Count mtDialog_ModulesCaption=1
+mtDialog_ModulesCaption0="Modules"
+Count mtDialog_ModulesHeader=1
+mtDialog_ModulesHeader0="Modules Information"
+Count mtDialog_ProcessesCaption=1
+mtDialog_ProcessesCaption0="Processes"
+Count mtDialog_ProcessesHeader=1
+mtDialog_ProcessesHeader0="Processes Information"
+Count mtDialog_AsmCaption=1
+mtDialog_AsmCaption0="Assembler"
+Count mtDialog_AsmHeader=1
+mtDialog_AsmHeader0="Assembler Information"
+Count mtDialog_CPUCaption=1
+mtDialog_CPUCaption0="CPU"
+Count mtDialog_CPUHeader=1
+mtDialog_CPUHeader0="CPU Information"
+Count mtDialog_OKButtonCaption=1
+mtDialog_OKButtonCaption0="%26OK"
+Count mtDialog_TerminateButtonCaption=1
+mtDialog_TerminateButtonCaption0="%26Terminate"
+Count mtDialog_RestartButtonCaption=1
+mtDialog_RestartButtonCaption0="%26Restart"
+Count mtDialog_DetailsButtonCaption=1
+mtDialog_DetailsButtonCaption0="%26Details"
+Count mtDialog_CustomButtonCaption=1
+mtDialog_CustomButtonCaption0="%26Help"
+Count mtDialog_SendMessage=1
+mtDialog_SendMessage0="%26Send this error via Internet"
+Count mtDialog_ScreenshotMessage=1
+mtDialog_ScreenshotMessage0="%26Attach a Screenshot image"
+Count mtDialog_CopyMessage=1
+mtDialog_CopyMessage0="%26Copy to Clipboard"
+Count mtDialog_SupportMessage=1
+mtDialog_SupportMessage0="Go to the Support Page"
+Count mtMSDialog_ErrorMsgCaption=1
+mtMSDialog_ErrorMsgCaption0="The application has encountered a problem. We are sorry for the inconvenience."
+Count mtMSDialog_RestartCaption=1
+mtMSDialog_RestartCaption0="Restart application."
+Count mtMSDialog_TerminateCaption=1
+mtMSDialog_TerminateCaption0="Terminate application."
+Count mtMSDialog_PleaseCaption=1
+mtMSDialog_PleaseCaption0="Please tell us about this problem."
+Count mtMSDialog_DescriptionCaption=1
+mtMSDialog_DescriptionCaption0="We have created an error report that you can send to us. We will treat this report as confidential and anonymous."
+Count mtMSDialog_SeeDetailsCaption=1
+mtMSDialog_SeeDetailsCaption0="To see what data the error report contains,"
+Count mtMSDialog_SeeClickCaption=1
+mtMSDialog_SeeClickCaption0="click here."
+Count mtMSDialog_HowToReproduceCaption=1
+mtMSDialog_HowToReproduceCaption0="What were you doing when the problem happended (optional)?"
+Count mtMSDialog_EmailCaption=1
+mtMSDialog_EmailCaption0="Email address (optional):"
+Count mtMSDialog_SendButtonCaption=1
+mtMSDialog_SendButtonCaption0="%26Send Error Report"
+Count mtMSDialog_NoSendButtonCaption=1
+mtMSDialog_NoSendButtonCaption0="%26Don't Send"
+Count mtLog_AppHeader=1
+mtLog_AppHeader0="Application"
+Count mtLog_AppStartDate=1
+mtLog_AppStartDate0="Start Date"
+Count mtLog_AppName=1
+mtLog_AppName0="Name/Description"
+Count mtLog_AppVersionNumber=1
+mtLog_AppVersionNumber0="Version Number"
+Count mtLog_AppParameters=1
+mtLog_AppParameters0="Parameters"
+Count mtLog_AppCompilationDate=1
+mtLog_AppCompilationDate0="Compilation Date"
+Count mtLog_AppUpTime=1
+mtLog_AppUpTime0="Up Time"
+Count mtLog_ExcHeader=1
+mtLog_ExcHeader0="Exception"
+Count mtLog_ExcDate=1
+mtLog_ExcDate0="Date"
+Count mtLog_ExcAddress=1
+mtLog_ExcAddress0="Address"
+Count mtLog_ExcModuleName=1
+mtLog_ExcModuleName0="Module Name"
+Count mtLog_ExcModuleVersion=1
+mtLog_ExcModuleVersion0="Module Version"
+Count mtLog_ExcType=1
+mtLog_ExcType0="Type"
+Count mtLog_ExcMessage=1
+mtLog_ExcMessage0="Message"
+Count mtLog_ExcID=1
+mtLog_ExcID0="ID"
+Count mtLog_ExcCount=1
+mtLog_ExcCount0="Count"
+Count mtLog_ExcStatus=1
+mtLog_ExcStatus0="Status"
+Count mtLog_ExcNote=1
+mtLog_ExcNote0="Note"
+Count mtLog_UserHeader=1
+mtLog_UserHeader0="User"
+Count mtLog_UserID=1
+mtLog_UserID0="ID"
+Count mtLog_UserName=1
+mtLog_UserName0="Name"
+Count mtLog_UserEmail=1
+mtLog_UserEmail0="Email"
+Count mtLog_UserCompany=1
+mtLog_UserCompany0="Company"
+Count mtLog_UserPrivileges=1
+mtLog_UserPrivileges0="Privileges"
+Count mtLog_ActCtrlsHeader=1
+mtLog_ActCtrlsHeader0="Active Controls"
+Count mtLog_ActCtrlsFormClass=1
+mtLog_ActCtrlsFormClass0="Form Class"
+Count mtLog_ActCtrlsFormText=1
+mtLog_ActCtrlsFormText0="Form Text"
+Count mtLog_ActCtrlsControlClass=1
+mtLog_ActCtrlsControlClass0="Control Class"
+Count mtLog_ActCtrlsControlText=1
+mtLog_ActCtrlsControlText0="Control Text"
+Count mtLog_CmpHeader=1
+mtLog_CmpHeader0="Computer"
+Count mtLog_CmpName=1
+mtLog_CmpName0="Name"
+Count mtLog_CmpTotalMemory=1
+mtLog_CmpTotalMemory0="Total Memory"
+Count mtLog_CmpFreeMemory=1
+mtLog_CmpFreeMemory0="Free Memory"
+Count mtLog_CmpTotalDisk=1
+mtLog_CmpTotalDisk0="Total Disk"
+Count mtLog_CmpFreeDisk=1
+mtLog_CmpFreeDisk0="Free Disk"
+Count mtLog_CmpSystemUpTime=1
+mtLog_CmpSystemUpTime0="System Up Time"
+Count mtLog_CmpProcessor=1
+mtLog_CmpProcessor0="Processor"
+Count mtLog_CmpDisplayMode=1
+mtLog_CmpDisplayMode0="Display Mode"
+Count mtLog_CmpDisplayDPI=1
+mtLog_CmpDisplayDPI0="Display DPI"
+Count mtLog_CmpVideoCard=1
+mtLog_CmpVideoCard0="Video Card"
+Count mtLog_CmpPrinter=1
+mtLog_CmpPrinter0="Printer"
+Count mtLog_OSHeader=1
+mtLog_OSHeader0="Operating System"
+Count mtLog_OSType=1
+mtLog_OSType0="Type"
+Count mtLog_OSBuildN=1
+mtLog_OSBuildN0="Build #"
+Count mtLog_OSUpdate=1
+mtLog_OSUpdate0="Update"
+Count mtLog_OSLanguage=1
+mtLog_OSLanguage0="Language"
+Count mtLog_OSCharset=1
+mtLog_OSCharset0="Charset"
+Count mtLog_NetHeader=1
+mtLog_NetHeader0="Network"
+Count mtLog_NetIP=1
+mtLog_NetIP0="IP Address"
+Count mtLog_NetSubmask=1
+mtLog_NetSubmask0="Submask"
+Count mtLog_NetGateway=1
+mtLog_NetGateway0="Gateway"
+Count mtLog_NetDNS1=1
+mtLog_NetDNS10="DNS 1"
+Count mtLog_NetDNS2=1
+mtLog_NetDNS20="DNS 2"
+Count mtLog_NetDHCP=1
+mtLog_NetDHCP0="DHCP"
+Count mtLog_CustInfoHeader=1
+mtLog_CustInfoHeader0="Custom Information"
+Count mtCallStack_Address=1
+mtCallStack_Address0="Address"
+Count mtCallStack_Name=1
+mtCallStack_Name0="Module"
+Count mtCallStack_Unit=1
+mtCallStack_Unit0="Unit"
+Count mtCallStack_Class=1
+mtCallStack_Class0="Class"
+Count mtCallStack_Procedure=1
+mtCallStack_Procedure0="Procedure/Method"
+Count mtCallStack_Line=1
+mtCallStack_Line0="Line"
+Count mtCallStack_MainThread=1
+mtCallStack_MainThread0="Main"
+Count mtCallStack_ExceptionThread=1
+mtCallStack_ExceptionThread0="Exception Thread"
+Count mtCallStack_RunningThread=1
+mtCallStack_RunningThread0="Running Thread"
+Count mtCallStack_CallingThread=1
+mtCallStack_CallingThread0="Calling Thread"
+Count mtCallStack_ThreadID=1
+mtCallStack_ThreadID0="ID"
+Count mtCallStack_ThreadPriority=1
+mtCallStack_ThreadPriority0="Priority"
+Count mtCallStack_ThreadClass=1
+mtCallStack_ThreadClass0="Class"
+Count mtCallStack_LeakCaption=1
+mtCallStack_LeakCaption0="Memory Leak"
+Count mtCallStack_LeakData=1
+mtCallStack_LeakData0="Data"
+Count mtCallStack_LeakType=1
+mtCallStack_LeakType0="Type"
+Count mtCallStack_LeakSize=1
+mtCallStack_LeakSize0="Total size"
+Count mtCallStack_LeakCount=1
+mtCallStack_LeakCount0="Count"
+Count mtSendDialog_Caption=1
+mtSendDialog_Caption0="Send."
+Count mtSendDialog_Message=1
+mtSendDialog_Message0="Message"
+Count mtSendDialog_Resolving=1
+mtSendDialog_Resolving0="Resolving DNS..."
+Count mtSendDialog_Login=1
+mtSendDialog_Login0="Login..."
+Count mtSendDialog_Connecting=1
+mtSendDialog_Connecting0="Connecting with server..."
+Count mtSendDialog_Connected=1
+mtSendDialog_Connected0="Connected with server."
+Count mtSendDialog_Sending=1
+mtSendDialog_Sending0="Sending message..."
+Count mtSendDialog_Sent=1
+mtSendDialog_Sent0="Message sent."
+Count mtSendDialog_SelectProject=1
+mtSendDialog_SelectProject0="Select project..."
+Count mtSendDialog_Searching=1
+mtSendDialog_Searching0="Searching..."
+Count mtSendDialog_Modifying=1
+mtSendDialog_Modifying0="Modifying..."
+Count mtSendDialog_Disconnecting=1
+mtSendDialog_Disconnecting0="Disconnecting..."
+Count mtSendDialog_Disconnected=1
+mtSendDialog_Disconnected0="Disconnected."
+Count mtReproduceDialog_Caption=1
+mtReproduceDialog_Caption0="Request"
+Count mtReproduceDialog_Request=1
+mtReproduceDialog_Request0="Please describe the steps to reproduce the error:"
+Count mtReproduceDialog_OKButtonCaption=1
+mtReproduceDialog_OKButtonCaption0="%26OK"
+Count mtModules_Handle=1
+mtModules_Handle0="Handle"
+Count mtModules_Name=1
+mtModules_Name0="Name"
+Count mtModules_Description=1
+mtModules_Description0="Description"
+Count mtModules_Version=1
+mtModules_Version0="Version"
+Count mtModules_Size=1
+mtModules_Size0="Size"
+Count mtModules_LastModified=1
+mtModules_LastModified0="Modified"
+Count mtModules_Path=1
+mtModules_Path0="Path"
+Count mtProcesses_ID=1
+mtProcesses_ID0="ID"
+Count mtProcesses_Name=1
+mtProcesses_Name0="Name"
+Count mtProcesses_Description=1
+mtProcesses_Description0="Description"
+Count mtProcesses_Version=1
+mtProcesses_Version0="Version"
+Count mtProcesses_Memory=1
+mtProcesses_Memory0="Memory"
+Count mtProcesses_Priority=1
+mtProcesses_Priority0="Priority"
+Count mtProcesses_Threads=1
+mtProcesses_Threads0="Threads"
+Count mtProcesses_Path=1
+mtProcesses_Path0="Path"
+Count mtCPU_Registers=1
+mtCPU_Registers0="Registers"
+Count mtCPU_Stack=1
+mtCPU_Stack0="Stack"
+Count mtCPU_MemoryDump=1
+mtCPU_MemoryDump0="Memory Dump"
+Count mtSend_SuccessMsg=1
+mtSend_SuccessMsg0="The message was sent successfully."
+Count mtSend_FailureMsg=1
+mtSend_FailureMsg0="Sorry, sending the message didn't work."
+Count mtSend_BugClosedMsg=2
+mtSend_BugClosedMsg0="These BUG is just closed."
+mtSend_BugClosedMsg1="Contact the program support to obtain an update."
+Count mtSend_UnknownErrorMsg=1
+mtSend_UnknownErrorMsg0="Unknown error."
+Count mtSend_InvalidLoginMsg=1
+mtSend_InvalidLoginMsg0="Invalid login request."
+Count mtSend_InvalidSearchMsg=1
+mtSend_InvalidSearchMsg0="Invalid search request."
+Count mtSend_InvalidSelectionMsg=1
+mtSend_InvalidSelectionMsg0="Invalid selection request."
+Count mtSend_InvalidInsertMsg=1
+mtSend_InvalidInsertMsg0="Invalid insert request."
+Count mtSend_InvalidModifyMsg=1
+mtSend_InvalidModifyMsg0="Invalid modify request."
+Count mtFileCrackedMsg=2
+mtFileCrackedMsg0="This file is cracked."
+mtFileCrackedMsg1="The application will be closed."
+Count mtException_LeakMultiFree=1
+mtException_LeakMultiFree0="Multi Free memory leak."
+Count mtException_LeakMemoryOverrun=1
+mtException_LeakMemoryOverrun0="Memory Overrun leak."
+Count mtException_AntiFreeze=1
+mtException_AntiFreeze0="The application seems to be frozen."
+Count mtInvalidEmailMsg=1
+mtInvalidEmailMsg0="Invalid email."
+TextsCollection=English
+EurekaLog Last Line -->

Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.groupproj

@@ -0,0 +1,84 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{da39db63-310f-405e-918c-b25a1b64b363}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Projects Include="..\..\..\Cliente\FactuGES.dproj" />
+    <Projects Include="..\..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" />
+    <Projects Include="..\..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" />
+    <Projects Include="..\..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" />
+    <Projects Include="..\..\Facturas de cliente\Model\FacturasCliente_model.dproj" />
+    <Projects Include="AlbCli_FacCli_relation.dproj" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Default.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Target Name="AlbaranesCliente_model">
+    <MSBuild Projects="..\..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_model:Clean">
+    <MSBuild Projects="..\..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_model:Make">
+    <MSBuild Projects="..\..\Albaranes de cliente\Model\AlbaranesCliente_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FacturasCliente_model">
+    <MSBuild Projects="..\..\Facturas de cliente\Model\FacturasCliente_model.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasCliente_model:Clean">
+    <MSBuild Projects="..\..\Facturas de cliente\Model\FacturasCliente_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasCliente_model:Make">
+    <MSBuild Projects="..\..\Facturas de cliente\Model\FacturasCliente_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FacturasCliente_controller">
+    <MSBuild Projects="..\..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasCliente_controller:Clean">
+    <MSBuild Projects="..\..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasCliente_controller:Make">
+    <MSBuild Projects="..\..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller">
+    <MSBuild Projects="..\..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller:Clean">
+    <MSBuild Projects="..\..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_controller:Make">
+    <MSBuild Projects="..\..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbCli_FacCli_relation">
+    <MSBuild Projects="AlbCli_FacCli_relation.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbCli_FacCli_relation:Clean">
+    <MSBuild Projects="AlbCli_FacCli_relation.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbCli_FacCli_relation:Make">
+    <MSBuild Projects="AlbCli_FacCli_relation.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FactuGES">
+    <MSBuild Projects="..\..\..\Cliente\FactuGES.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES:Clean">
+    <MSBuild Projects="..\..\..\Cliente\FactuGES.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES:Make">
+    <MSBuild Projects="..\..\..\Cliente\FactuGES.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="AlbaranesCliente_model;FacturasCliente_model;FacturasCliente_controller;AlbaranesCliente_controller;AlbCli_FacCli_relation;FactuGES" />
+  </Target>
+  <Target Name="Clean">
+    <CallTarget Targets="AlbaranesCliente_model:Clean;FacturasCliente_model:Clean;FacturasCliente_controller:Clean;AlbaranesCliente_controller:Clean;AlbCli_FacCli_relation:Clean;FactuGES:Clean" />
+  </Target>
+  <Target Name="Make">
+    <CallTarget Targets="AlbaranesCliente_model:Make;FacturasCliente_model:Make;FacturasCliente_controller:Make;AlbaranesCliente_controller:Make;AlbCli_FacCli_relation:Make;FactuGES:Make" />
+  </Target>
+  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
+</Project>

Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/uGenerarFacturasCliAlbCliUtils.pas

@@ -188,7 +188,7 @@ begin
      AAlbaran.DataTable.Active := True;
 
   try
-     AFacturasNuevas := AFacturasClienteController.Buscar(-100); //Nuevo; OJO pendiente de arreglar
+     AFacturasNuevas := AFacturasClienteController.Nuevo(False);
      if AFacturasClienteController.Anadir(AFacturasNuevas, AAlbaran) then
      begin
        if AFacturasNuevas.DataTable.RecordCount = 1 then

Source/Modulos/Relaciones/Albaranes de proveedor - Facturas de proveedor/uGenerarFacturasProvAlbProvUtils.pas

@@ -189,7 +189,7 @@ begin
 
   try
 
-     AFacturasNuevas := AFacturasProveedorController.Nuevo;
+     AFacturasNuevas := AFacturasProveedorController.Nuevo(False);
      if AFacturasProveedorController.Anadir(AFacturasNuevas, AAlbaran) then
      begin
        if AFacturasNuevas.DataTable.RecordCount = 1 then

Source/Modulos/Relaciones/Pedidos de proveedor - Facturas de proveedor/uGenerarFacturasProvPedProvUtils.pas

@@ -179,7 +179,7 @@ begin
      APedidos.DataTable.Active := True;
 
   try
-     AFacturasNuevas := AFacturasProveedorController.Nuevo;
+     AFacturasNuevas := AFacturasProveedorController.Nuevo(False);
      if AFacturasProveedorController.Anadir(AFacturasNuevas, APedidos.ID) then
      begin
        if AFacturasNuevas.DataTable.RecordCount = 1 then

Source/Modulos/Relaciones/Pedidos de proveedor - Facturas de proveedor/uGenerarFacturasProvUtils.pas

@@ -179,7 +179,7 @@ begin
      AAlbaranes.DataTable.Active := True;
 
   try
-     AFacturasNuevas := AFacturasProveedorController.Nuevo;
+     AFacturasNuevas := AFacturasProveedorController.Nuevo(False);
      if AFacturasProveedorController.Anadir(AFacturasNuevas, AAlbaranes) then
      begin
        if AFacturasNuevas.DataTable.RecordCount = 1 then

Source/Servidor/FactuGES_Server.dpr

@@ -99,8 +99,6 @@ uses
   uRptEtiquetasContacto_Server in '..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas' {RptEtiquetasContacto: TDataModule},
   uRptFacturasCliente_Server in '..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas' {RptFacturasCliente: TDataModule},
   uRptRecibosCliente_Server in '..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas' {RptRecibosCliente: TDataModule},
-  schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
-  schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
   schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
   schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
   schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
@@ -113,6 +111,8 @@ uses
   schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
   schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
   schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
+  schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
+  schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
   schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
   schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas';
 

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.0.0.0\0"
               VALUE "ProductVersion", "1.0.0.0\0"
-              VALUE "CompileDate", "jueves, 10 de enero de 2008 18:44\0"
+              VALUE "CompileDate", "lunes, 14 de enero de 2008 13:43\0"
          END
     END
     BLOCK "VarFileInfo"