Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error en eliminar ordenes de devolucion de cliente y quitar asignación de almacen en albaranes

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@416 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-06-03 12:18:52 +00:00
parent 5fb952f00f
commit 972ebedea3
9 changed files with 26 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj
View File

@ -9,6 +9,7 @@
<Projects Include="..\..\Cliente\FactuGES.dproj" /> <Projects Include="..\..\Cliente\FactuGES.dproj" />
<Projects Include="..\..\GUIBase\GUIBase.dproj" /> <Projects Include="..\..\GUIBase\GUIBase.dproj" />
<Projects Include="..\..\Servidor\FactuGES_Server.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\Controller\Articulos_controller.dproj" />
<Projects Include="..\Articulos\Views\Articulos_view.dproj" /> <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
<Projects Include="..\Contactos\Views\Contactos_view.dproj" /> <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
@ -151,14 +152,23 @@
<Target Name="AlbCli_FacCli_relation:Make"> <Target Name="AlbCli_FacCli_relation:Make">
<MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="Make" /> <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="Make" />
</Target> </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"> <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>
<Target Name="Clean"> <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>
<Target Name="Make"> <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> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

5
Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas
View File

@ -190,8 +190,9 @@ begin
SITUACION := SITUACION_ALBARAN_PENDIENTE; SITUACION := SITUACION_ALBARAN_PENDIENTE;
REFERENCIA := ''; REFERENCIA := '';
TIPO := CTE_TIPO_ALBARAN; 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; end;
procedure TBizAlbaranCliente.IVAOnChange(Sender: TDACustomField); procedure TBizAlbaranCliente.IVAOnChange(Sender: TDACustomField);

48
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
View File

@ -408,11 +408,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Left = 164 Left = 164
Top = 112 Top = 112
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 164 ExplicitLeft = 164
ExplicitTop = 112 ExplicitTop = 112
ExplicitWidth = 188 ExplicitWidth = 188
@ -422,11 +418,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 555 Left = 555
Top = 38 Top = 38
DataBinding.DataField = '' DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 555 ExplicitLeft = 555
ExplicitTop = 38 ExplicitTop = 38
ExplicitWidth = 182 ExplicitWidth = 182
@ -435,11 +427,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 485 Left = 485
Top = 112 Top = 112
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 485 ExplicitLeft = 485
ExplicitTop = 112 ExplicitTop = 112
ExplicitWidth = 252 ExplicitWidth = 252
@ -448,11 +436,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited edtDescuento: TcxDBSpinEdit inherited edtDescuento: TcxDBSpinEdit
Left = 93 Left = 93
Top = 112 Top = 112
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93 ExplicitLeft = 93
ExplicitTop = 112 ExplicitTop = 112
end end
@ -460,22 +444,14 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 484 Left = 484
Top = 38 Top = 38
DataBinding.DataField = '' DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 484 ExplicitLeft = 484
ExplicitTop = 38 ExplicitTop = 38
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 484 Left = 484
Top = 11 Top = 11
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 484 ExplicitLeft = 484
ExplicitTop = 11 ExplicitTop = 11
ExplicitWidth = 253 ExplicitWidth = 253
@ -485,11 +461,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 484 Left = 484
Top = 65 Top = 65
DataBinding.DataField = '' DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 484 ExplicitLeft = 484
ExplicitTop = 65 ExplicitTop = 65
end end
@ -497,11 +469,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 555 Left = 555
Top = 65 Top = 65
DataBinding.DataField = '' DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 555 ExplicitLeft = 555
ExplicitTop = 65 ExplicitTop = 65
ExplicitWidth = 182 ExplicitWidth = 182
@ -510,11 +478,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited eImporteNeto: TcxDBCurrencyEdit inherited eImporteNeto: TcxDBCurrencyEdit
Left = 93 Left = 93
Top = 11 Top = 11
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93 ExplicitLeft = 93
ExplicitTop = 11 ExplicitTop = 11
ExplicitWidth = 259 ExplicitWidth = 259
@ -524,11 +488,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 93 Left = 93
Top = 139 Top = 139
Properties.OnValidate = frViewTotales1ePortePropertiesValidate Properties.OnValidate = frViewTotales1ePortePropertiesValidate
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93 ExplicitLeft = 93
ExplicitTop = 139 ExplicitTop = 139
ExplicitWidth = 259 ExplicitWidth = 259
@ -538,10 +498,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 93 Left = 93
Top = 38 Top = 38
DataBinding.DataField = '' DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93 ExplicitLeft = 93
ExplicitTop = 38 ExplicitTop = 38
ExplicitWidth = 121 ExplicitWidth = 121
@ -558,10 +514,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Top = 65 Top = 65
DataBinding.DataField = '' DataBinding.DataField = ''
DataBinding.DataSource = nil DataBinding.DataSource = nil
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93 ExplicitLeft = 93
ExplicitTop = 65 ExplicitTop = 65
ExplicitWidth = 259 ExplicitWidth = 259

7
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas
View File

@ -152,9 +152,10 @@ end;
procedure TfEditorAlbaranesCliente.actEliminarUpdate(Sender: TObject); procedure TfEditorAlbaranesCliente.actEliminarUpdate(Sender: TObject);
begin begin
inherited; inherited;
if (Sender as TAction).Enabled then if (Sender as TAction).Enabled
(Sender as TAction).Enabled := (FAlbaranes.SITUACION = SITUACION_ALBARAN_PENDIENTE) and (FAlbaranes.TIPO = CTE_TIPO_ALBARAN) then
and not (FAlbaranes.ID_FACTURA > 0) (Sender as TAction).Enabled := not (FAlbaranes.ID_FACTURA > 0)
and (FAlbaranes.SITUACION = SITUACION_ALBARAN_PENDIENTE)
end; end;
procedure TfEditorAlbaranesCliente.actGenerarEtiquetasExecute(Sender: TObject); procedure TfEditorAlbaranesCliente.actGenerarEtiquetasExecute(Sender: TObject);

1
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm
View File

@ -1,6 +1,5 @@
inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente
Caption = 'Lista de '#243'rdenes de devoluci'#243'n a cliente' Caption = 'Lista de '#243'rdenes de devoluci'#243'n a cliente'
ExplicitHeight = 478
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader

6
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.pas
View File

@ -31,9 +31,9 @@ uses
procedure TfEditorAlbaranesDevCliente.actEliminarUpdate(Sender: TObject); procedure TfEditorAlbaranesDevCliente.actEliminarUpdate(Sender: TObject);
begin begin
inherited; inherited;
if (Sender as TAction).Enabled then if (Sender as TAction).Enabled then
(Sender as TAction).Enabled := (FAlbaranes.REF_FACTURA = ''); (Sender as TAction).Enabled := not (FAlbaranes.ID_FACTURA > 0);
end; end;
procedure TfEditorAlbaranesDevCliente.AsignarVista; procedure TfEditorAlbaranesDevCliente.AsignarVista;

2
Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
View File

@ -185,7 +185,7 @@ begin
TIPO := CTE_TIPO_ALBARAN; TIPO := CTE_TIPO_ALBARAN;
// OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
// ALMACÉN PUESTO A CAPÓN Y PROVISIONAL // ALMACÉN PUESTO A CAPÓN Y PROVISIONAL
ID_ALMACEN := 2; // ID_ALMACEN := 2;
end; end;
procedure TBizAlbaranProveedor.IVAOnChange(Sender: TDACustomField); procedure TBizAlbaranProveedor.IVAOnChange(Sender: TDACustomField);

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.rc
View File

@ -14,7 +14,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileVersion", "1.0.4.0\0" VALUE "FileVersion", "1.0.4.0\0"
VALUE "ProductVersion", "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
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"