From 972ebedea315aec1bae97d99cd66ce404f00733e Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Tue, 3 Jun 2008 12:18:52 +0000
Subject: [PATCH] =?UTF-8?q?Error=20en=20eliminar=20ordenes=20de=20devoluci?=
 =?UTF-8?q?on=20de=20cliente=20y=20quitar=20asignaci=C3=B3n=20de=20almacen?=
 =?UTF-8?q?=20en=20albaranes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@416 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 .../AlbaranesCliente_Group.groupproj          |  16 ++++--
 .../Model/uBizAlbaranesCliente.pas            |   5 +-
 .../Views/uEditorAlbaranCliente.dfm           |  48 ------------------
 .../Views/uEditorAlbaranesCliente.pas         |   7 +--
 .../Views/uEditorAlbaranesDevCliente.dfm      |   1 -
 .../Views/uEditorAlbaranesDevCliente.pas      |   8 +--
 .../Model/uBizAlbaranesProveedor.pas          |   2 +-
 Source/Servidor/FactuGES_Server.RES           | Bin 23200 -> 23200 bytes
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 9 files changed, 26 insertions(+), 63 deletions(-)

diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj
index 499b0286..0e125e53 100644
--- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj	
+++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj	
@@ -9,6 +9,7 @@
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
     <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" />
     <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
@@ -151,14 +152,23 @@
   <Target Name="AlbCli_FacCli_relation:Make">
     <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="Make" />
   </Target>
+  <Target Name="AlbaranesProveedor_view">
+    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesProveedor_view:Clean">
+    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesProveedor_view:Make">
+    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;AlbCli_FacCli_relation" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;AlbCli_FacCli_relation;AlbaranesProveedor_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbCli_FacCli_relation:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbCli_FacCli_relation:Clean;AlbaranesProveedor_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbCli_FacCli_relation:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbCli_FacCli_relation:Make;AlbaranesProveedor_view:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas
index f6e7e4c9..74a93251 100644
--- a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas	
@@ -190,8 +190,9 @@ begin
   SITUACION := SITUACION_ALBARAN_PENDIENTE;
   REFERENCIA := '';
   TIPO := CTE_TIPO_ALBARAN;
-  // ALMACÉN PUESTO A CAPÓN Y PROVISIONAL
-  ID_ALMACEN := 2;
+
+  // NO SE TIENEN EN CUENTA LOS ALBARANES DE CLIENTE PARA EL STOCK DE ALMACEN "DE MOMENTO"
+  ID_ALMACEN := ID_NULO;
 end;
 
 procedure TBizAlbaranCliente.IVAOnChange(Sender: TDACustomField);
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
index 1472c6d9..74f6b1e8 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm	
@@ -408,11 +408,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited ImporteDto: TcxDBCurrencyEdit
         Left = 164
         Top = 112
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 164
         ExplicitTop = 112
         ExplicitWidth = 188
@@ -422,11 +418,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 555
         Top = 38
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 555
         ExplicitTop = 38
         ExplicitWidth = 182
@@ -435,11 +427,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited ImporteTotal: TcxDBCurrencyEdit
         Left = 485
         Top = 112
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 485
         ExplicitTop = 112
         ExplicitWidth = 252
@@ -448,11 +436,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited edtDescuento: TcxDBSpinEdit
         Left = 93
         Top = 112
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 112
       end
@@ -460,22 +444,14 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 484
         Top = 38
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 484
         ExplicitTop = 38
       end
       inherited ImporteBase: TcxDBCurrencyEdit
         Left = 484
         Top = 11
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 484
         ExplicitTop = 11
         ExplicitWidth = 253
@@ -485,11 +461,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 484
         Top = 65
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 484
         ExplicitTop = 65
       end
@@ -497,11 +469,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 555
         Top = 65
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 555
         ExplicitTop = 65
         ExplicitWidth = 182
@@ -510,11 +478,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited eImporteNeto: TcxDBCurrencyEdit
         Left = 93
         Top = 11
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 11
         ExplicitWidth = 259
@@ -524,11 +488,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 93
         Top = 139
         Properties.OnValidate = frViewTotales1ePortePropertiesValidate
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 139
         ExplicitWidth = 259
@@ -538,10 +498,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 93
         Top = 38
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 38
         ExplicitWidth = 121
@@ -558,10 +514,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 65
         ExplicitWidth = 259
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas
index c0a4a913..84285e12 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas	
@@ -152,9 +152,10 @@ end;
 procedure TfEditorAlbaranesCliente.actEliminarUpdate(Sender: TObject);
 begin
   inherited;
-  if (Sender as TAction).Enabled then
-     (Sender as TAction).Enabled := (FAlbaranes.SITUACION = SITUACION_ALBARAN_PENDIENTE)
-                                    and not (FAlbaranes.ID_FACTURA > 0)
+  if (Sender as TAction).Enabled
+  and (FAlbaranes.TIPO = CTE_TIPO_ALBARAN) then
+     (Sender as TAction).Enabled := not (FAlbaranes.ID_FACTURA > 0)
+                                    and (FAlbaranes.SITUACION = SITUACION_ALBARAN_PENDIENTE)
 end;
 
 procedure TfEditorAlbaranesCliente.actGenerarEtiquetasExecute(Sender: TObject);
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm
index 3744688a..cc204529 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm	
@@ -1,6 +1,5 @@
 inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente
   Caption = 'Lista de '#243'rdenes de devoluci'#243'n a cliente'
-  ExplicitHeight = 478
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.pas
index b1087af3..fc94d886 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.pas	
@@ -26,14 +26,14 @@ implementation
 
 uses
   uDataModuleUsuarios, uViewAlbaranesDevCliente, uFactuGES_App;
-  
+
 { TfEditorAlbaranesDevCliente }
 
 procedure TfEditorAlbaranesDevCliente.actEliminarUpdate(Sender: TObject);
 begin
-	inherited;
-	if (Sender as TAction).Enabled then
-		(Sender as TAction).Enabled := (FAlbaranes.REF_FACTURA = '');
+  inherited;
+  if (Sender as TAction).Enabled then
+     (Sender as TAction).Enabled := not (FAlbaranes.ID_FACTURA > 0);
 end;
 
 procedure TfEditorAlbaranesDevCliente.AsignarVista;
diff --git a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
index 447bd6ce..57aad880 100644
--- a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas	
@@ -185,7 +185,7 @@ begin
   TIPO := CTE_TIPO_ALBARAN;
   // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
   // ALMACÉN PUESTO A CAPÓN Y PROVISIONAL
-  ID_ALMACEN := 2;
+//  ID_ALMACEN := 2;
 end;
 
 procedure TBizAlbaranProveedor.IVAOnChange(Sender: TDACustomField);
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 3e6ccaf465a068a2b35804175a608e00d6696dcc..d0e84fd9ce0552353992e5c3f350ac33553ddd7d 100644
GIT binary patch
delta 19
acmZ3mm2tsV#tlJHti}vh3`Uc~qdWmd=mt6f

delta 19
acmZ3mm2tsV#tlJHtVRr03?`GqqdWmd=>|Ih

diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 314d2e9a..5f30bda5 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.0.4.0\0"
               VALUE "ProductVersion", "1.0.4.0\0"
-              VALUE "CompileDate", "martes, 03 de junio de 2008 12:49\0"
+              VALUE "CompileDate", "martes, 03 de junio de 2008 13:29\0"
          END
     END
     BLOCK "VarFileInfo"