Archivado/LuisLeon_FactuGES2
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se adpatan para guardar el número de impresiones de todos los documentos, y se ha repasado toda la lógica de relaciones en la parte de cliente, falta solo recibos de cliente y remesas

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@48 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2
This commit is contained in:
roberto 2010-08-26 17:10:53 +00:00
parent 3e8b527835
commit fb0bf72b63
119 changed files with 3139 additions and 1658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Base/Base.dpk
View File

@ -77,7 +77,8 @@ requires
dxPSCoreD11,
cxIntl6D11,
cxIntlPrintSys3D11,
RemObjects_Indy_D11;
RemObjects_Indy_D11,
dxCoreD11;
contains
uDataTableUtils in 'Utiles\uDataTableUtils.pas',
@ -114,6 +115,8 @@ contains
uReferenciasUtils in 'Utiles\uReferenciasUtils.pas',
uEMailUtils in 'Utiles\uEMailUtils.pas',
uSaveClipboard in 'Utiles\uSaveClipboard.pas',
MidasSpeedFix in 'Utiles\MidasSpeedFix.pas';
MidasSpeedFix in 'Utiles\MidasSpeedFix.pas',
uDataModuleImpresiones in '..\Modulos\Impresiones\Data\uDataModuleImpresiones.pas' {DataModuleImpresiones: TDataModule},
uDataModuleRegistroCorreos in '..\Modulos\Registro de correos\Data\uDataModuleRegistroCorreos.pas' {DataModuleRegistroCorreos: TDataModule};
end.

105
Source/Base/Base.dproj
View File

@ -54,58 +54,61 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Facturas de proveedor\adortl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\designide.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dsnap.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\Jcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\rtl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcldb.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vclx.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\xmlrtl.dcp" />
<DCCReference Include="..\Modulos\Impresiones\Data\uDataModuleImpresiones.pas" />
<DCCReference Include="..\Modulos\Registro de correos\Data\uDataModuleRegistroCorreos.pas" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Indy_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass>

19
Source/Base/Utiles/uIntegerListUtils.pas
View File

@ -15,10 +15,14 @@ type
function Find(Value: integer; var Index: Integer): Boolean;
property Integers[index: integer]: integer read GetInteger write SetInteger; default;
function ToIntegerArray : TIntegerArray;
function ToString : String;
end;
implementation
uses
SysUtils;
function TIntegerList.GetInteger(Index: integer): integer;
begin
Result := Integer(Items[index]);
@ -38,6 +42,21 @@ begin
Result.Add(Integers[i]);
end;
function TIntegerList.ToString: String;
var
i : Integer;
AList : TStringList;
begin
AList := TStringList.Create;
try
for i := 0 to Count - 1 do
AList.Add(IntToStr(Integers[i]));
Result := AList.CommaText;
finally
FreeANDNIL(AList);
end;
end;
procedure TIntegerList.Add(Value: integer);
var
Index: integer;

8
Source/Cliente/uBootStrap.pas
View File

@ -13,8 +13,8 @@ procedure Terminate;
implementation
uses
uDMBase, uDataModuleConexion, uDataModuleConfiguracion, uPlugins_Intf,
uMainMenuController, uNavPaneController, uPantallaPrincipal;
uDMBase, uDataModuleConexion, uDataModuleConfiguracion, uDataModuleImpresiones,
uPlugins_Intf, uMainMenuController, uNavPaneController, uPantallaPrincipal;
procedure DoAppLoadModules;
begin
@ -71,6 +71,7 @@ begin
dmConexion := TdmConexion.Create(NIL);
dmConfiguracion := TdmConfiguracion.Create(NIL);
dmBase := TdmBase.Create(NIL);
dmImpresiones := TDataModuleImpresiones.Create(NIL);
AppFactuGES := TAppFactuGES.Create;
with AppFactuGES do
@ -78,7 +79,7 @@ begin
AppSplashForm := TAppSplashForm.Create;
DoMainFormEvent := DoAppMainForm;
DoLoadModulesEvent := DoAppLoadModules;
DoRefreshMainFormEvent := DoRefreshMainForm;
DoRefreshMainFormEvent := DoRefreshMainForm;
end;
NavPaneController := TNavPaneController.Create;
@ -100,6 +101,7 @@ begin
FreeANDNIL(dmBase);
FreeANDNIL(dmConfiguracion);
FreeAndNil(dmConexion);
FreeAndNil(dmImpresiones);
Application.ProcessMessages
end;

25
Source/GUIBase/uEditorPreview.dfm
View File

@ -2478,7 +2478,7 @@ inherited fEditorPreview: TfEditorPreview
Bitmap = {}
end
object frxReport1: TfrxReport
Version = '4.3'
Version = '4.7.71'
DotMatrixReport = False
EngineOptions.DoublePass = True
IniFile = '\Software\Fast Reports'
@ -2529,6 +2529,7 @@ inherited fEditorPreview: TfEditorPreview
ShowDialog = False
UseFileCache = True
ShowProgress = True
OverwritePrompt = False
Monochrome = True
Left = 120
Top = 384
@ -2536,13 +2537,21 @@ inherited fEditorPreview: TfEditorPreview
object frxPDFExport1: TfrxPDFExport
UseFileCache = True
ShowProgress = True
OverwritePrompt = False
PrintOptimized = True
Outline = False
Background = False
HTMLTags = False
Author = 'FastReport'#174
Subject = 'FastReport PDF export'
Background = False
Creator = 'FastReport (http://www.fast-report.com)'
HTMLTags = False
ProtectionFlags = [ePrint, eModify, eCopy, eAnnot]
HideToolbar = False
HideMenubar = False
HideWindowUI = False
FitWindow = False
CenterWindow = False
PrintScaling = False
Left = 160
Top = 384
end
@ -2550,6 +2559,7 @@ inherited fEditorPreview: TfEditorPreview
ShowDialog = False
UseFileCache = True
ShowProgress = True
OverwritePrompt = False
Monochrome = True
Left = 192
Top = 384
@ -2557,6 +2567,8 @@ inherited fEditorPreview: TfEditorPreview
object frxXLSExport1: TfrxXLSExport
UseFileCache = True
ShowProgress = True
OverwritePrompt = False
ExportEMF = True
AsText = False
Background = True
FastExport = True
@ -2569,25 +2581,32 @@ inherited fEditorPreview: TfEditorPreview
object frxMailExport1: TfrxMailExport
UseFileCache = True
ShowProgress = True
OverwritePrompt = False
ShowExportDialog = True
SmtpPort = 25
UseIniFile = True
TimeOut = 60
ConfurmReading = False
Left = 80
Top = 384
end
object frxRTFExport: TfrxRTFExport
UseFileCache = True
ShowProgress = True
OverwritePrompt = False
ExportEMF = True
Wysiwyg = True
Creator = 'FastReport http://www.fast-report.com'
SuppressPageHeadersFooters = False
HeaderFooterMode = hfText
AutoSize = False
Left = 232
Top = 384
end
object frxSimpleTextExport1: TfrxSimpleTextExport
UseFileCache = True
ShowProgress = True
OverwritePrompt = False
Frames = False
EmptyLines = False
OEMCodepage = False

61
Source/GUIBase/uEditorPreview.pas
View File

@ -26,7 +26,7 @@ type
procedure LoadFromStream(AStream : TStream);
function ExportToFile : String;
procedure Print;
function Print: Boolean;
procedure Preview;
function GetController : IControllerBase;
@ -38,6 +38,13 @@ type
procedure SetListaID (const Value : TIntegerList);
property ListaID : TIntegerList read GetListaID
write SetListaID;
function GetTablaImpresion: String;
function GetIdTablaImpresion: String;
procedure SetTablaImpresion (Value: String);
procedure SetIdTablaImpresion (Value: String);
property TablaImpresion: String read GetTablaImpresion write SetTablaImpresion;
property IdTablaImpresion: String read GetIdTablaImpresion write SetIdTablaImpresion;
end;
TfEditorPreview = class(TfEditorBase, IEditorPreview)
@ -142,13 +149,23 @@ type
procedure actExportarRTFExecute(Sender: TObject);
procedure actExportarTextoExecute(Sender: TObject);
private
FVariable: Boolean;
FPreview : TfrViewPreview;
FTitle : TCaption;
FController : IControllerBase;
FListaID : TIntegerList;
procedure OnPageChanged(Sender: TfrxPreview; PageNo: Integer);
procedure UpdateZoom;
procedure OnPrint(Sender: Tobject);
protected
FTablaImpresion: String;
FIdTablaImpresion: String;
function GetTablaImpresion: String;
function GetIdTablaImpresion: String;
procedure SetTablaImpresion (Value: String);
procedure SetIdTablaImpresion (Value: String);
function GetReport: TfrxReport; virtual;
procedure SetTitle(const Value: string);
function GetTitle: string;
@ -157,7 +174,11 @@ type
procedure SetController (const Value : IControllerBase);
procedure SetListaID (const Value : TIntegerList);
function GetListaID : TIntegerList;
public
property TablaImpresion: String read GetTablaImpresion write SetTablaImpresion;
property IdTablaImpresion: String read GetIdTablaImpresion write SetIdTablaImpresion;
constructor Create(AOwner: TComponent); override;
property ListaID : TIntegerList read GetListaID
write SetListaID;
@ -165,7 +186,7 @@ type
write SetController;
property Title: string read GetTitle write SetTitle;
property Report: TfrxReport read GetReport;
procedure Print;
function Print: boolean;
procedure Preview;
procedure LoadFromStream(AStream : TStream);
function ExportToFile : String;
@ -175,7 +196,7 @@ type
implementation
uses
frxRes, frxUtils, frxPrinter,
frxRes, frxUtils, frxPrinter, uDataModuleImpresiones,
uCustomEditor, uSistemaFunc;
{$R *.dfm}
@ -187,6 +208,11 @@ begin
Result := FController;
end;
function TfEditorPreview.GetIdTablaImpresion: String;
begin
Result := FIdTablaImpresion;
end;
function TfEditorPreview.GetListaID: TIntegerList;
begin
Result := FListaID;
@ -198,6 +224,11 @@ begin
end;
function TfEditorPreview.GetTablaImpresion: String;
begin
Result := FTablaImpresion;
end;
function TfEditorPreview.GetTitle: string;
begin
Result := FTitle;
@ -399,6 +430,13 @@ begin
[PageNo, Sender.PageCount]);
end;
procedure TfEditorPreview.OnPrint(Sender: Tobject);
begin
FVariable := True;
if (FTablaImpresion <> '-1') and (FIdTablaImpresion <> '-1') then
dmImpresiones.AnadirMarcaImpresion(TablaImpresion, IdTablaImpresion);
end;
constructor TfEditorPreview.Create(AOwner: TComponent);
begin
inherited;
@ -441,13 +479,18 @@ begin
Self.ShowModal;
end;
procedure TfEditorPreview.Print;
function TfEditorPreview.Print: Boolean;
begin
FVariable := False;
FPreview.Preview.Report.OnPrintReport := OnPrint;
if not frxPrinters.HasPhysicalPrinters then
frxErrorMsg(frxResources.Get('clNoPrinters'))
else
FPreview.Preview.Print;
Enabled := True;
Result := FVariable;
end;
procedure TfEditorPreview.SetController(const Value: IControllerBase);
@ -455,11 +498,21 @@ begin
FController := Value;
end;
procedure TfEditorPreview.SetIdTablaImpresion(Value: String);
begin
FIdTablaImpresion := Value;
end;
procedure TfEditorPreview.SetListaID(const Value: TIntegerList);
begin
FListaID := Value;
end;
procedure TfEditorPreview.SetTablaImpresion(Value: String);
begin
FTablaImpresion := Value;
end;
procedure TfEditorPreview.SetTitle(const Value: string);
begin
FTitle := Value;

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

@ -17,6 +17,7 @@
<Projects Include="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" />
<Projects Include="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" />
<Projects Include="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" />
<Projects Include="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" />
<Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
<Projects Include="..\Recibos de cliente\Views\RecibosCliente_view.dproj" />
<Projects Include="..\Recibos de proveedor\Views\RecibosProveedor_view.dproj" />
@ -261,14 +262,23 @@
<Target Name="RemesasProveedor_view:Make">
<MSBuild Projects="..\Remesas de proveedor\Views\RemesasProveedor_view.dproj" Targets="Make" />
</Target>
<Target Name="PedidosCliente_view">
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" Targets="" />
</Target>
<Target Name="PedidosCliente_view:Clean">
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" Targets="Clean" />
</Target>
<Target Name="PedidosCliente_view:Make">
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_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;FacturasCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;AlbaranesProveedor_view;AlbProv_FacProv_relation;Contactos_controller;FacturasProveedor_view;PedidosProveedor_view;PresupuestosCliente_view;RecibosCliente_view;RecibosProveedor_view;RemesasCliente_view;RemesasProveedor_view" />
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;FacturasCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;AlbaranesProveedor_view;AlbProv_FacProv_relation;Contactos_controller;FacturasProveedor_view;PedidosProveedor_view;PresupuestosCliente_view;RecibosCliente_view;RecibosProveedor_view;RemesasCliente_view;RemesasProveedor_view;PedidosCliente_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;FacturasCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesProveedor_view:Clean;AlbProv_FacProv_relation:Clean;Contactos_controller:Clean;FacturasProveedor_view:Clean;PedidosProveedor_view:Clean;PresupuestosCliente_view:Clean;RecibosCliente_view:Clean;RecibosProveedor_view:Clean;RemesasCliente_view:Clean;RemesasProveedor_view: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;FacturasCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesProveedor_view:Clean;AlbProv_FacProv_relation:Clean;Contactos_controller:Clean;FacturasProveedor_view:Clean;PedidosProveedor_view:Clean;PresupuestosCliente_view:Clean;RecibosCliente_view:Clean;RecibosProveedor_view:Clean;RemesasCliente_view:Clean;RemesasProveedor_view:Clean;PedidosCliente_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;FacturasCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesProveedor_view:Make;AlbProv_FacProv_relation:Make;Contactos_controller:Make;FacturasProveedor_view:Make;PedidosProveedor_view:Make;PresupuestosCliente_view:Make;RecibosCliente_view:Make;RecibosProveedor_view:Make;RemesasCliente_view:Make;RemesasProveedor_view: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;FacturasCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesProveedor_view:Make;AlbProv_FacProv_relation:Make;Contactos_controller:Make;FacturasProveedor_view:Make;PedidosProveedor_view:Make;PresupuestosCliente_view:Make;RecibosCliente_view:Make;RecibosProveedor_view:Make;RemesasCliente_view:Make;RemesasProveedor_view:Make;PedidosCliente_view:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

42
Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas
View File

@ -43,6 +43,7 @@ type
procedure DescartarCambios(AAlbaran : IBizAlbaranCliente);
function Existe(const ID: Integer) : Boolean;
function Duplicar(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente;
function GenerarOrdenDev(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente;
function ExtraerSeleccionados(AAlbaran: IBizAlbaranCliente) : IBizAlbaranCliente;
function ElegirAlbaranes(AAlbaran: IBizAlbaranCliente; AMensaje: String; AMultiSelect: Boolean): IBizAlbaranCliente;
@ -132,6 +133,7 @@ type
const AHeaderText: String = '');
procedure VerDireccionEntrega(AAlbaran : IBizAlbaranCliente);
function Duplicar(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente;
function GenerarOrdenDev(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente;
procedure CopiarDireccionEnvio (const ADireccionEnvio: IBizDireccionesContacto;
AAlbaran: IBizAlbaranCliente);
@ -162,6 +164,7 @@ type
function DarListaAnosAlbaranes: TStringList;
procedure FiltrarAno(AAlbaran: IBizAlbaranCliente; ADynWhereDataTable: WideString; const Ano: String);
end;
implementation
@ -479,7 +482,9 @@ begin
FECHA_ENVIO := 0;
FECHA_RECEPCION := 0;
ID_FACTURA := 0;
REF_FACTURA := '';
ID_PEDIDO := 0;
REF_PEDIDO := '';
end;
Result.Post;
finally
@ -490,6 +495,8 @@ end;
function TAlbaranesClienteController.ValidarAlbaran(
AAlbaran: IBizAlbaranCliente): Boolean;
begin
Result := False;
if not Assigned(AAlbaran) then
raise Exception.Create ('Albarán no asignado');
@ -502,8 +509,6 @@ begin
if (AAlbaran.ID_Cliente <= 0) then
// Si hay altas automáticas no hay objeto Cliente pero sí hay ID_CLIENTE
{ (not Assigned(AAlbaran.Cliente)) or
(AAlbaran.Cliente.IsEmpty) then}
raise Exception.Create('Debe indicar el cliente de este albarán');
if (EsFechaVacia(AAlbaran.FECHA_ALBARAN)) then
@ -524,8 +529,8 @@ begin
raise Exception.Create('Una orden de devolución no puede tener un importe total positivo');
//Una orden de devolución debe tener relleno el almacén de entrada de material
// if (AAlbaran.ID_ALMACEN < 0) or (AAlbaran.ID_ALMACEN = 0) then
// raise Exception.Create('Debe indicar el almacén de entrada de esta orden de devolución');
if (AAlbaran.ID_ALMACEN < 0) or (AAlbaran.ID_ALMACEN = 0) then
raise Exception.Create('Debe indicar el almacén de entrada de esta orden de devolución');
//Ponemos la fecha del albaran de devolución como fecha de envio para que se contabilice según dicha fecha
AAlbaran.Edit;
@ -1162,7 +1167,6 @@ begin
ShowHourglassCursor;
try
AAlbaran.IMPORTE_NETO := FDetallesController.DarTotalImporteTotal(AAlbaran.Detalles);
AAlbaran.IMPORTE_PORTE := FDetallesController.DarTotalPorteTotal(AAlbaran.Detalles);
if not bEnEdicion then
AAlbaran.Post;
@ -1173,6 +1177,33 @@ begin
end;
end;
function TAlbaranesClienteController.GenerarOrdenDev(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente;
var
AOrden : IBizAlbaranCliente;
IdAlbaran: Integer;
begin
if Assigned(AAlbaran) then
begin
IdAlbaran := AAlbaran.ID;
AOrden := Duplicar(AAlbaran);
if Assigned(AOrden) then
begin
if not AOrden.DataTable.Editing then
AOrden.Edit;
AOrden.TIPO := CTE_TIPO_ALBARAN_DEV;
AOrden.ID_ALBARAN_DEV := IdAlbaran;
AOrden.Post;
//Convierte todos los articulos del albaran a negativos por se una orden de devolucion
FDetallesController.CambiarSignoDetalles(AOrden.Detalles);
end;
Ver(AOrden);
end;
end;
function TAlbaranesClienteController.GetClienteController: IClientesController;
begin
Result := FClienteController;
@ -1184,4 +1215,3 @@ begin
end;
end.

4
Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas
View File

@ -49,7 +49,7 @@ implementation
uses
uROTypes, uEditorRegistryUtils, uIEditorAlbaranesClientePreview,
uEditorPreview, uDataModuleAlbaranesCliente, uEditorBase, cxControls,
uStringsUtils, uSistemaFunc, uFactuGES_App;
uStringsUtils, uSistemaFunc, uFactuGES_App, schAlbaranesClienteClient_Intf;
{ TAlbaranesClienteReportController }
@ -238,6 +238,8 @@ begin
AEditor.ListaID := AListaID;
AEditor.Title := 'Albarán - ' + AppFactuGES.EmpresaActiva.NOMBRE;
AEditor.LoadFromStream(AStream);
AEditor.TablaImpresion := nme_AlbaranesCliente;
AEditor.IdTablaImpresion := AListaID.ToString;
AEditor.Print;
finally
AEditor.Release;

37
Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas
View File

@ -19,7 +19,6 @@ type
private
FDataModule : IDataModuleAlbaranesCliente;
protected
// procedure AsignarDatos(ADetalles: IDAStronglyTypedDataTable; IDCabecera: Integer); override;
procedure RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); override;
procedure RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); override;
@ -53,7 +52,7 @@ begin
try
AArticulos := (FArticulosController.BuscarTodos(ACliente) as IBizArticulo);
ActualizarDetalles(ADetalles, AArticulos);
// ShowInfoMessage('Se ha actualizado el descuento para el cliente seleccionado'); Esta desactivado el descuento general para los albaranes de cliente
ShowInfoMessage('Se ha actualizado el descuento para el cliente seleccionado');
finally
AArticulos := Nil;
end;
@ -92,19 +91,6 @@ begin
FArticulosController := TArticulosAlbaranClienteController.Create;
end;
{procedure TDetallesAlbaranClienteController.AsignarDatos(ADetalles: IDAStronglyTypedDataTable; IDCabecera: Integer);
begin
inherited;
with (ADetalles as IBizDetallesAlbaranCliente) do
begin
Edit;
// ID := FDataModule.GetNextID(DataTable.LogicalName);
ID_ALBARAN := IDCabecera;
Post
end;
end;}
function TDetallesAlbaranClienteController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
begin
Result := CalcularLineaConcepto(DataTable);
@ -136,11 +122,10 @@ end;
procedure TDetallesAlbaranClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin
//En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP
// if Assigned(AArticulos) then
// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
// else
// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0;
if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
else
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0;
end;
procedure TDetallesAlbaranClienteController.ValidarCampos(DataTable: TDADataTable);
@ -151,14 +136,10 @@ end;
procedure TDetallesAlbaranClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin
//Como en tecsitel no hay descuento por linea de detalle, solo recuperamos nuevamente el valor del articulo cuando el detalle no tenga niguno
//de esta forma evitamos que al cambiar de cliente se quiten los importes que se hubiesen establecido para los articulos.
if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then
if Assigned(AArticulos) then
// ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_NETO
else
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE
else
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
end;
end.

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

@ -190,9 +190,7 @@ begin
SITUACION := SITUACION_ALBARAN_PENDIENTE;
REFERENCIA := '';
TIPO := CTE_TIPO_ALBARAN;
// NO SE TIENEN EN CUENTA LOS ALBARANES DE CLIENTE PARA EL STOCK DE ALMACEN "DE MOMENTO"
ID_ALMACEN := ID_NULO;
ID_ALMACEN := AppFactuGES.EmpresaActiva.ID_ALMACEN;
end;
procedure TBizAlbaranCliente.IVAOnChange(Sender: TDACustomField);

11
Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm
View File

@ -524,12 +524,11 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
'E_UNIDAD,'#10' ALBARANES_CLIENTE_DETALLES.DESCUENTO, ALBARANES_CL' +
'IENTE_DETALLES.IMPORTE_PORTE,'#10' ALBARANES_CLIENTE_DETALLES.IMP' +
'ORTE_TOTAL,'#10' ALBARANES_CLIENTE_DETALLES.VISIBLE,'#10' ALBARANE' +
'S_CLIENTE_DETALLES.ID_ARTICULO, ARTICULOS.REFERENCIA,'#10' '#39#39' as ' +
'REFERENCIA_PROVEEDOR, /*Es necesario para que no pete detalles p' +
'orque tanto en la rama de cliente como de proveedor es comun*/'#10' ' +
' ALBARANES_CLIENTE_DETALLES.ID_PEDIDO'#10#10#10'FROM ALBARANES_CLIENTE' +
'_DETALLES'#10'LEFT JOIN ARTICULOS ON ALBARANES_CLIENTE_DETALLES.ID_A' +
'RTICULO = ARTICULOS.ID'#10'where {where}'#10'ORDER BY POSICION;'#10#10
'S_CLIENTE_DETALLES.ID_ARTICULO, ARTICULOS.REFERENCIA, ARTICULOS.' +
'REFERENCIA_PROV as REFERENCIA_PROVEEDOR,'#10' ALBARANES_CLIENTE_D' +
'ETALLES.ID_PEDIDO'#10#10#10'FROM ALBARANES_CLIENTE_DETALLES'#10'LEFT JOIN AR' +
'TICULOS ON ALBARANES_CLIENTE_DETALLES.ID_ARTICULO = ARTICULOS.ID' +
#10'where {where}'#10'ORDER BY POSICION;'#10#10
StatementType = stSQL
ColumnMappings = <
item

9
Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk
View File

@ -34,7 +34,12 @@ requires
Almacenes_controller,
AlbCli_FacCli_relation,
rtl,
vcl;
vcl,
PedidosCliente_controller,
PedidosCliente_model,
Inventario_controller,
FacturasCliente_model,
FacturasCliente_controller;
contains
uAlbaranesClienteViewRegister in 'uAlbaranesClienteViewRegister.pas',
@ -53,6 +58,6 @@ contains
uEditorAlbaranDevCliente in 'uEditorAlbaranDevCliente.pas' {fEditorAlbaranDevCliente: TCustomEditor},
uViewAlbaranDevCliente in 'uViewAlbaranDevCliente.pas' {frViewAlbaranDevCliente: TCustomView},
uViewDatosYSeleccionClienteAlbaran in 'uViewDatosYSeleccionClienteAlbaran.pas' {frViewDatosYSeleccionClienteAlbaran: TCustomView},
uDialogOpcionesImpresionAlbaranesCliente in 'uDialogOpcionesImpresionAlbaranesCliente.pas' {frDialogOpcionesImpresionAlbaranesCliente: TForm};
uDialogOpcionesImpresionAlbaranesCliente in 'uDialogOpcionesImpresionAlbaranesCliente.pas' {frDialogOpcionesImpresionAlbaranesCliente: T};
end.

25
Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj
View File

@ -54,15 +54,21 @@
<DelphiCompile Include="AlbaranesCliente_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="AlbaranesCliente_controller.dcp" />
<DCCReference Include="AlbaranesCliente_model.dcp" />
<DCCReference Include="AlbCli_FacCli_relation.dcp" />
<DCCReference Include="Almacenes_controller.dcp" />
<DCCReference Include="ApplicationBase.dcp" />
<DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="Base.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="rtl.dcp" />
<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\ApplicationBase.dcp" />
<DCCReference Include="..\..\Lib\Articulos_view.dcp" />
<DCCReference Include="..\..\Lib\Base.dcp" />
<DCCReference Include="..\..\Lib\FacturasCliente_controller.dcp" />
<DCCReference Include="..\..\Lib\FacturasCliente_model.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\Inventario_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_model.dcp" />
<DCCReference Include="..\..\Lib\rtl.dcp" />
<DCCReference Include="..\..\Lib\vcl.dcp" />
<DCCReference Include="uAlbaranesClienteViewRegister.pas" />
<DCCReference Include="uDialogOpcionesImpresionAlbaranesCliente.pas">
<Form>frDialogOpcionesImpresionAlbaranesCliente</Form>
@ -128,7 +134,6 @@
<Form>frViewElegirArticulosAlbaranesCliente</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="vcl.dcp" />
</ItemGroup>
</Project>
<!-- EurekaLog First Line

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

@ -165,6 +165,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited pgPaginas: TPageControl
Width = 759
Height = 406
ActivePage = pagContenido
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 759
@ -185,7 +186,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Height = 378
Align = alClient
BiDiMode = bdLeftToRight
Enabled = False
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
@ -199,45 +199,40 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitHeight = 378
inherited ToolBar1: TToolBar
Width = 751
Height = 46
Height = 51
ExplicitWidth = 751
ExplicitHeight = 46
ExplicitHeight = 51
inherited ToolButton3: TToolButton
Wrap = False
end
inherited ToolButton4: TToolButton
Left = 278
Top = 0
Wrap = True
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
Left = 0
Left = 334
Top = 0
Wrap = False
ExplicitLeft = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 65
Top = 22
Left = 399
Top = 0
ExplicitLeft = 399
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 544
Top = 0
Width = 122
Width = 154
ExplicitLeft = 544
ExplicitTop = 0
ExplicitWidth = 122
ExplicitWidth = 154
end
inherited UpDown1: TUpDown
Left = 666
Top = 0
ExplicitLeft = 666
ExplicitTop = 0
end
inherited ToolButton13: TToolButton
inherited ToolButton13: TToolButton [7]
Left = 0
Top = 0
Wrap = True
@ -245,46 +240,52 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitTop = 0
ExplicitHeight = 27
end
inherited ToolButton6: TToolButton
inherited UpDown1: TUpDown [8]
Left = 0
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
inherited ToolButton7: TToolButton
Left = 66
inherited ToolButton6: TToolButton
Left = 17
Top = 27
ExplicitLeft = 66
ExplicitLeft = 17
ExplicitTop = 27
end
inherited ToolButton7: TToolButton
Left = 83
Top = 27
ExplicitLeft = 83
ExplicitTop = 27
end
inherited ToolButton8: TToolButton
Left = 133
Left = 150
Top = 27
ExplicitLeft = 133
ExplicitLeft = 150
ExplicitTop = 27
end
inherited ToolButton12: TToolButton
Left = 216
Left = 233
Top = 27
ExplicitLeft = 216
ExplicitLeft = 233
ExplicitTop = 27
end
inherited ToolButton9: TToolButton
Left = 224
Left = 241
Top = 27
ExplicitLeft = 224
ExplicitLeft = 241
ExplicitTop = 27
end
inherited ToolButton10: TToolButton
Left = 369
Left = 386
Top = 27
ExplicitLeft = 369
ExplicitLeft = 386
ExplicitTop = 27
end
inherited ToolButton11: TToolButton
Left = 494
Left = 511
Top = 27
ExplicitLeft = 494
ExplicitLeft = 511
ExplicitTop = 27
end
end
@ -294,7 +295,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Height = 301
ExplicitTop = 77
ExplicitWidth = 751
ExplicitHeight = 334
ExplicitHeight = 301
end
inherited TBXDock1: TTBXDock
Top = 51
@ -346,7 +347,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Width = 751
Height = 350
ExplicitWidth = 751
ExplicitHeight = 383
ExplicitHeight = 350
inherited eIncidencias: TcxDBMemo
ExplicitWidth = 734
ExplicitHeight = 323

57
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas
View File

@ -262,47 +262,25 @@ procedure TfEditorAlbaranCliente.OnClienteChanged(Sender: TObject);
var
ADireccion : IBizDireccionesContacto;
begin
if Assigned(FAlbaran) then
begin
FAlbaran.Cliente := ViewAlbaran.ViewClienteAlbaran.Cliente;
if Assigned(FAlbaran) then
begin
FAlbaran.Cliente := ViewAlbaran.ViewClienteAlbaran.Cliente;
// Avisar si no hay datos bancarios
{if not AClientesController.TieneDatosBancarios(FAlbaran.Cliente) then
ShowWarningMessage('Este cliente no tiene datos bancarios en su ficha');}
// Elegir la dirección de envio
{ case FAlbaran.Cliente.Direcciones.RecordCount of
0 : begin
ADireccion := NIL;
//ShowWarningMessage('Este cliente no tiene ninguna dirección de envío en su ficha');
end;
1 : begin
ADireccion := FAlbaran.Cliente.Direcciones;
end
end;
// Si hay dirección de envio, copiarla al albarán y poner el coste del porte
if Assigned(ADireccion) then
if FAlbaran.Cliente.Direcciones.RecordCount = 0 then
begin
try
FAlbaran.Edit;
FAlbaran.IMPORTE_PORTE := ADireccion.PORTE;
FController.CopiarDireccionEnvio(ADireccion, FAlbaran);
finally
ADireccion := NIL;
end;
end
else begin
FController.QuitarDireccionEnvio(FAlbaran);
FAlbaran.Edit;
FAlbaran.IMPORTE_PORTE := 0;
MessageBox(0, '¡Atención! Este cliente no tiene ' + #10#13 + 'ninguna dirección de envío en su ficha', 'Atención', MB_ICONWARNING or MB_OK);
FAlbaran.Edit;
FAlbaran.IMPORTE_PORTE := 0;
end;
}
// Si el pedido tiene detalles hay que mirar si los descuentos
// para los artículos hay que cambiarlos.
if (FAlbaran.Detalles.RecordCount > 0) then
FController.DetallesController.ActualizarDetalles(FAlbaran.Detalles, FAlbaran.Cliente);
end;
if not Controller.ClienteController.TieneDatosBancarios(FAlbaran.Cliente) then
MessageBox(0, 'Este cliente no tiene datos bancarios en su ficha', 'Atención', MB_ICONWARNING or MB_OK);
// Si el pedido tiene detalles hay que mirar si los descuentos y otros campos
// para los artículos hay que cambiarlos.
if (FAlbaran.Detalles.RecordCount > 0) then
FController.DetallesController.ActualizarDetalles(FAlbaran.Detalles, FAlbaran.Cliente);
end;
end;
procedure TfEditorAlbaranCliente.pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
@ -366,7 +344,10 @@ begin
FController := Value;
if Assigned(FController) then
begin
ViewAlbaran.Controller := Controller;
frViewDetallesAlbaranCliente1.Controller := Controller.DetallesController;
end;
end;
procedure TfEditorAlbaranCliente.SetAlbaran(const Value: IBizAlbaranCliente);

104
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
View File

@ -34,18 +34,61 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
CF64E1FD8EAB4462333BFDABE01FB5ECE4DE78A5FDCFED49477EE232E4EE5CAF
3CAB4D7E2B002400F40B7DA11C32DBE756950000000049454E44AE426082}
end
inherited lblDesbloquear: TcxLabel
AnchorX = 712
AnchorY = 14
end
end
inherited pgPaginas: TPageControl
inherited pagGeneral: TTabSheet
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
end
inherited pagContenido: TTabSheet
inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
inherited ToolBar1: TToolBar
inherited FontSize: TEdit
Width = 90
ExplicitWidth = 90
inherited ToolButton14: TToolButton [5]
Left = 479
Top = 0
ExplicitLeft = 479
end
inherited UpDown1: TUpDown
Left = 634
ExplicitLeft = 634
inherited FontSize: TEdit [6]
Left = 544
ExplicitLeft = 544
end
inherited ToolButton13: TToolButton [7]
end
inherited UpDown1: TUpDown [8]
end
inherited ToolButton11: TToolButton [9]
Left = 17
ExplicitLeft = 17
end
inherited ToolButton12: TToolButton [10]
Left = 158
ExplicitLeft = 158
end
inherited ToolButton9: TToolButton [11]
Left = 166
ExplicitLeft = 166
end
inherited ToolButton10: TToolButton [12]
Left = 311
ExplicitLeft = 311
end
inherited ToolButton6: TToolButton [13]
Left = 436
ExplicitLeft = 436
end
inherited ToolButton7: TToolButton [14]
Left = 502
ExplicitLeft = 502
end
inherited ToolButton8: TToolButton [15]
Left = 569
ExplicitLeft = 569
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
@ -76,17 +119,21 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
inherited dxLayoutControl1: TdxLayoutControl
LookAndFeel = dxLayoutOfficeLookAndFeel1
inherited Bevel3: TBevel
Left = 340
Left = 380
Height = 54
ExplicitLeft = 340
ExplicitLeft = 380
ExplicitHeight = 54
end
inherited Bevel4: TBevel
Left = 456
Left = 496
Width = 285
ExplicitLeft = 456
ExplicitLeft = 496
ExplicitWidth = 285
end
inherited Bevel1: TBevel
Left = 496
ExplicitLeft = 496
end
inherited ImporteDto: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
@ -97,24 +144,24 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
Width = 151
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 527
Left = 567
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 527
ExplicitLeft = 567
ExplicitWidth = 219
Width = 219
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 457
Left = 497
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 457
ExplicitLeft = 497
ExplicitWidth = 289
Width = 289
end
@ -126,42 +173,42 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtIVA: TcxDBSpinEdit
Left = 456
Left = 496
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 456
ExplicitLeft = 496
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 456
Left = 496
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 456
ExplicitLeft = 496
ExplicitWidth = 290
Width = 290
end
inherited edtRE: TcxDBSpinEdit
Left = 456
Left = 496
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 456
ExplicitLeft = 496
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 527
Left = 567
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 527
ExplicitLeft = 567
ExplicitWidth = 219
Width = 219
end
@ -192,8 +239,8 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
Width = 84
end
inherited bTiposIVA: TButton
Left = 192
ExplicitLeft = 192
Left = 232
ExplicitLeft = 232
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Style.LookAndFeel.SkinName = ''
@ -204,18 +251,22 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
Width = 222
end
inherited edtRetencion: TcxDBSpinEdit
Left = 496
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 496
end
inherited edtImporteRetencion: TcxDBCurrencyEdit
Left = 567
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 567
end
inherited edtFechaRetencion: TcxDBDateEdit
Style.LookAndFeel.SkinName = ''
@ -228,11 +279,6 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
inherited dxLayoutControl1Group2: TdxLayoutGroup
Visible = False
end
inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Item13: TdxLayoutItem
Visible = False
end
end
end
end
end

16
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm
View File

@ -162,6 +162,10 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente
Action = actCancelarEnvio
DisplayMode = nbdmImageAndText
end
object TBXItem40: TTBXItem
Action = actGenerarOrden
DisplayMode = nbdmImageAndText
end
object TBXSeparatorItem18: TTBXSeparatorItem
end
object TBXItem44: TTBXItem
@ -207,27 +211,21 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente
object actEnviar: TAction
Category = 'Acciones'
Caption = 'Enviar albar'#225'n...'
Enabled = False
ImageIndex = 23
Visible = False
OnExecute = actEnviarExecute
OnUpdate = actEnviarUpdate
end
object actCancelarEnvio: TAction
Category = 'Acciones'
Caption = 'Cancelar envio'
Enabled = False
ImageIndex = 23
Visible = False
OnExecute = actCancelarEnvioExecute
OnUpdate = actCancelarEnvioUpdate
end
object actConfirmarRecepcion: TAction
Category = 'Acciones'
Caption = 'Confirmar recepcion'
Enabled = False
ImageIndex = 23
Visible = False
OnExecute = actConfirmarRecepcionExecute
OnUpdate = actConfirmarRecepcionUpdate
end
@ -244,6 +242,12 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente
OnExecute = actEnviarEMailExecute
OnUpdate = actEnviarEMailUpdate
end
object actGenerarOrden: TAction
Category = 'Acciones'
Caption = 'Generar orden dev.'
ImageIndex = 23
OnExecute = actGenerarOrdenExecute
end
end
inherited SmallImages: TPngImageList
PngImages = <

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

@ -40,6 +40,8 @@ type
Enviarporemail1: TMenuItem;
TBXSubmenuItem2: TTBXSubmenuItem;
TBXItem39: TTBXItem;
actGenerarOrden: TAction;
TBXItem40: TTBXItem;
procedure FormShow(Sender: TObject);
procedure actGenerarFacturaUpdate(Sender: TObject);
procedure actGenerarFacturaExecute(Sender: TObject);
@ -55,6 +57,7 @@ type
procedure actEnviarEMailExecute(Sender: TObject);
procedure actEnviarEMailUpdate(Sender: TObject);
procedure OnListaAnosChange(Sender: TObject; const Text: string);
procedure actGenerarOrdenExecute(Sender: TObject);
protected
FAlbaranes: IBizAlbaranCliente;
@ -94,8 +97,8 @@ uses
//En tecsitel no estaran habilitados los pedidos
// uPedidosClienteController, uBizPedidosCliente,
uDialogUtils, schAlbaranesClienteClient_Intf,
// uFacturasClienteController, uBizFacturasCliente,
// uInventarioController, uGenerarAlbaranesCliUtils,
uFacturasClienteController, uBizFacturasCliente, uInventarioController,
// uGenerarAlbaranesCliUtils,
uEditorBase, uDialogOpcionesImpresionAlbaranesCliente,
cxCustomData, uGridStatusUtils, uDBSelectionListUtils;
@ -106,7 +109,6 @@ uses
}
procedure TfEditorAlbaranesCliente.actCancelarEnvioExecute(Sender: TObject);
begin
{
inherited;
if (ShowConfirmMessage('Envío de albarán de cliente', '¿Desea cancelar el envío de este albarán de cliente?') = IDYES) then
@ -119,7 +121,6 @@ begin
end;
end;
actRefrescar.Execute;
}
end;
procedure TfEditorAlbaranesCliente.actCancelarEnvioUpdate(Sender: TObject);
@ -133,7 +134,6 @@ end;
procedure TfEditorAlbaranesCliente.actConfirmarRecepcionExecute(Sender: TObject);
begin
{
inherited;
try
@ -143,7 +143,6 @@ begin
ShowErrorMessage('Error al cambiar la situación del albarán', E.Message, E);
end;
actRefrescar.Execute;
}
end;
procedure TfEditorAlbaranesCliente.actConfirmarRecepcionUpdate(Sender: TObject);
@ -203,6 +202,12 @@ begin
and ViewGrid.esSeleccionCeldaDatos;
end;
procedure TfEditorAlbaranesCliente.actGenerarOrdenExecute(Sender: TObject);
begin
inherited;
FController.GenerarOrdenDev(Albaranes);
end;
procedure TfEditorAlbaranesCliente.actEnviarEMailExecute(Sender: TObject);
begin
inherited;
@ -220,14 +225,14 @@ begin
end;
procedure TfEditorAlbaranesCliente.actEnviarExecute(Sender: TObject);
//var
// AInventarioController : IInventarioController;
// bCambiarEstado : Boolean;
// AFactura : IBizFacturaCliente;
// AFacturasController : IFacturasClienteController;
// AAlbaran : IBizAlbaranCliente;
var
AInventarioController : IInventarioController;
bCambiarEstado : Boolean;
AFactura : IBizFacturaCliente;
AFacturasController : IFacturasClienteController;
AAlbaran : IBizAlbaranCliente;
begin
{
inherited;
bCambiarEstado := False;
@ -269,16 +274,12 @@ begin
end;
end;
}
{
except
on E : Exception do
ShowErrorMessage('Error al cambiar la situación del albarán', E.Message, E);
end;
end;
actRefrescar.Execute;
}
end;
procedure TfEditorAlbaranesCliente.actEnviarUpdate(Sender: TObject);

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

@ -49,10 +49,26 @@ inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente
inherited actGenerarFactura: TAction
Caption = 'Generar abono...'
end
inherited actEnviar: TAction
Enabled = False
Visible = False
end
inherited actCancelarEnvio: TAction
Enabled = False
Visible = False
end
inherited actConfirmarRecepcion: TAction
Enabled = False
Visible = False
end
inherited actGenerarEtiquetas: TAction
Enabled = False
Visible = False
end
inherited actGenerarOrden: TAction
Enabled = False
Visible = False
end
end
inherited SmallImages: TPngImageList
PngImages = <

72
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
View File

@ -1,23 +1,25 @@
inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 903
Height = 506
Width = 907
Height = 591
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
ExplicitWidth = 903
ExplicitHeight = 506
ExplicitWidth = 907
ExplicitHeight = 591
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 903
Height = 506
Width = 907
Height = 591
Align = alClient
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 903
ExplicitHeight = 506
DesignSize = (
903
506)
907
591)
object Label1: TLabel
Left = 22
Top = 450
@ -59,7 +61,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 336
end
object memObservaciones: TcxDBMemo
Left = 478
Left = 480
Top = 356
Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'OBSERVACIONES'
@ -134,7 +136,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 336
end
object eCodigoPostal: TcxDBTextEdit
Left = 383
Left = 385
Top = 251
DataBinding.DataField = 'CODIGO_POSTAL'
DataBinding.DataSource = DADataSource
@ -204,16 +206,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 336
end
object bElegirDireccion: TBitBtn
Left = 276
Left = 278
Top = 359
Width = 172
Height = 23
Action = actElegirDireccion
Caption = 'Elegir una direcci'#243'n de env'#237'o...'
Enabled = False
TabOrder = 14
end
object Button1: TButton
Left = 316
Left = 318
Top = 138
Width = 132
Height = 23
@ -282,7 +285,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 198
end
object bFormasPago: TButton
Left = 316
Left = 318
Top = 109
Width = 132
Height = 23
@ -291,7 +294,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
OnClick = bFormasPagoClick
end
object eFechaRecepcion: TcxDBDateEdit
Left = 612
Left = 614
Top = 299
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_RECEPCION'
@ -393,7 +396,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 336
end
object eFechaPrevista: TcxDBDateEdit
Left = 612
Left = 614
Top = 245
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_PREVISTA_ENVIO'
@ -453,7 +456,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 336
end
object eFechaEnvio: TcxDBDateEdit
Left = 612
Left = 614
Top = 272
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ENVIO'
@ -540,7 +543,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 336
end
inline frViewDatosYSeleccionClienteAlbaran1: TfrViewDatosYSeleccionClienteAlbaran
Left = 478
Left = 480
Top = 28
Width = 406
Height = 181
@ -552,7 +555,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
ParentFont = False
TabOrder = 17
ReadOnly = False
ExplicitLeft = 478
ExplicitLeft = 480
ExplicitTop = 28
ExplicitWidth = 406
ExplicitHeight = 181
@ -570,17 +573,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
Left = 290
Left = 292
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 290
ExplicitLeft = 292
end
inherited Button3: TBitBtn
Left = 201
Left = 203
Top = 139
ExplicitLeft = 201
ExplicitLeft = 203
ExplicitTop = 139
end
inherited edtPersonaContacto: TcxDBTextEdit
@ -604,15 +607,24 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 287
end
inherited Button4: TButton
Left = 370
ExplicitLeft = 370
Left = 372
ExplicitLeft = 372
end
inherited Button5: TButton
Left = 370
Left = 372
Top = 108
ExplicitLeft = 370
ExplicitLeft = 372
ExplicitTop = 108
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Item5: TdxLayoutItem
Visible = False
end
end
end
end
end
inherited dsCliente: TDADataSource
Left = 352
@ -621,6 +633,12 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
inherited ActionList1: TActionList
Left = 312
Top = 32
inherited actElegirContacto: TAction
OnUpdate = frViewClienteAlbaranactElegirContactoUpdate
end
inherited actAnadirContacto: TAction
OnUpdate = frViewClienteAlbaranactAnadirContactoUpdate
end
end
inherited PngImageList: TPngImageList
Left = 232
@ -770,7 +788,9 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
object dxLayoutControl1Item14: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahRight
Enabled = False
ShowCaption = False
Visible = False
Control = bElegirDireccion
ControlOptions.ShowBorder = False
end

58
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
View File

@ -12,11 +12,11 @@ uses
cxTextEdit, cxMaskEdit, cxCalendar, dxLayoutControl, cxControls, cxMemo,
uViewDireccionEntregaAlbaranCliente, Buttons, ActnList,
// uBizPedidosCliente, uPedidosClienteController,
uBizPedidosCliente, uPedidosClienteController,
ExtCtrls, cxLookupEdit, cxDBLookupEdit, uBizFormasPago,
cxDBLookupComboBox, uFormasPagoController, uAlmacenesController, uDAInterfaces,
uViewDatosYSeleccionClienteBase, uViewDatosYSeleccionClienteAlbaran;
uViewDatosYSeleccionClienteBase, uViewDatosYSeleccionClienteAlbaran, uAlbaranesClienteController;
type
IViewAlbaranCliente = interface(IViewBase)
@ -27,6 +27,10 @@ type
function GetViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran;
property ViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran read GetViewClienteAlbaran;
function GetController : IAlbaranesClienteController;
procedure SetController (const Value : IAlbaranesClienteController);
property Controller : IAlbaranesClienteController read GetController write SetController;
end;
TfrViewAlbaranCliente = class(TfrViewBase, IViewAlbaranCliente)
@ -120,10 +124,11 @@ type
procedure cbPoblacionPropertiesInitPopup(Sender: TObject);
protected
FController : IAlbaranesClienteController;
FAlbaran : IBizAlbaranCliente;
FAlmacenesController : IAlmacenesController;
// FPedidoAsociado : IBizPedidoCliente;
// FPedidoController : IPedidosClienteController;
FPedidoAsociado : IBizPedidoCliente;
FPedidoController : IPedidosClienteController;
FViewClienteAlbaran : IViewDatosYSeleccionClienteAlbaran;
FFormasPago : IBizFormaPago;
FFormasPagoController : IFormasPagoController;
@ -137,9 +142,14 @@ type
function GetAlbaran: IBizAlbaranCliente;
procedure SetAlbaran(const Value: IBizAlbaranCliente); virtual;
function GetViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran;
function GetController : IAlbaranesClienteController;
procedure SetController (const Value : IAlbaranesClienteController);
public
property Albaran: IBizAlbaranCliente read GetAlbaran write SetAlbaran;
property ViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran read GetViewClienteAlbaran;
property Controller : IAlbaranesClienteController read GetController write SetController;
end;
implementation
@ -149,7 +159,7 @@ implementation
{ TfrViewAlbaranCliente }
uses
uClientesController, uBizDireccionesContacto, uAlbaranesClienteController,
uClientesController, uBizDireccionesContacto,
schAlbaranesClienteClient_Intf, uBizAlmacenes, uDateUtils,
uDialogUtils, uProvinciasPoblacionesController, uStringsUtils;
@ -197,7 +207,7 @@ end;
procedure TfrViewAlbaranCliente.actVerPedidoCliExecute(Sender: TObject);
begin
inherited;
// FPedidoController.Ver(FPedidoAsociado);
FPedidoController.Ver(FPedidoAsociado);
end;
procedure TfrViewAlbaranCliente.actVerPedidoCliUpdate(Sender: TObject);
@ -323,8 +333,8 @@ begin
FFormasPago := Nil;
FFormasPagoController := TFormasPagoController.Create;
// FPedidoAsociado := NIL;
// FPedidoController := TPedidosClienteController.Create;
FPedidoAsociado := NIL;
FPedidoController := TPedidosClienteController.Create;
FViewClienteAlbaran := frViewDatosYSeleccionClienteAlbaran1;
FAlmacenesController := TAlmacenesController.Create;
@ -338,12 +348,13 @@ begin
if Assigned(FPoblaciones) then
FreeANDNIL(FPoblaciones);
FController := Nil;
FFormasPago := Nil;
FFormasPagoController := NIL;
FViewClienteAlbaran := Nil;
// FPedidoController := NIL;
// FPedidoAsociado := NIL;
FPedidoController := NIL;
FPedidoAsociado := NIL;
FAlmacenesController := NIL;
end;
@ -404,18 +415,14 @@ end;
procedure TfrViewAlbaranCliente.frViewClienteAlbaranactAnadirContactoUpdate(Sender: TObject);
begin
{
if (Sender as TAction).Enabled then
(Sender as TAction).Enabled := not Assigned(FPedidoAsociado);
}
end;
procedure TfrViewAlbaranCliente.frViewClienteAlbaranactElegirContactoUpdate(Sender: TObject);
begin
{
if (Sender as TAction).Enabled then
(Sender as TAction).Enabled := not Assigned(FPedidoAsociado);
}
end;
function TfrViewAlbaranCliente.GetAlbaran: IBizAlbaranCliente;
@ -423,6 +430,11 @@ begin
Result := FAlbaran;
end;
function TfrViewAlbaranCliente.GetController: IAlbaranesClienteController;
begin
Result := FController;
end;
function TfrViewAlbaranCliente.GetViewClienteAlbaran: IViewDatosYSeleccionClienteAlbaran;
begin
Result := FViewClienteAlbaran;
@ -467,7 +479,6 @@ begin
end;
end;
{
FPedidoAsociado := NIL;
if (FAlbaran.ID_PEDIDO > 0) then
begin
@ -482,15 +493,26 @@ begin
end
else
eReferenciaPedidoCli.Text := 'No hay pedido asociado';
}
end
else begin
DADataSource.DataTable := NIL;
FViewClienteAlbaran.Albaran := NIL;
// FPedidoAsociado := NIL;
FPedidoAsociado := NIL;
dsFormaPago.DataTable := NIL;
dsAlmacenes.DataTable := NIL;
end;
end;
procedure TfrViewAlbaranCliente.SetController(const Value: IAlbaranesClienteController);
begin
FController := Value;
{ if Assigned(FController) then
begin
ViewClienteAlbaran.Controller := Controller.ClienteController;
end;
}
end;
end.

178
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm
View File

@ -1,177 +1,244 @@
inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
Height = 531
ExplicitHeight = 531
inherited dxLayoutControl1: TdxLayoutControl
Height = 531
inherited Label1: TLabel
Width = 299
ExplicitWidth = 299
Top = 479
ExplicitTop = 479
end
inherited edtFechaAlbaran: TcxDBDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
end
inherited memObservaciones: TcxDBMemo
Left = 469
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitHeight = 69
Height = 69
TabOrder = 23
ExplicitLeft = 469
end
inherited eReferencia: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
end
inherited eCalle: TcxDBTextEdit
Top = 253
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
TabOrder = 10
ExplicitTop = 253
end
inherited eCodigoPostal: TcxDBTextEdit
Left = 374
Top = 280
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 12
ExplicitLeft = 374
ExplicitTop = 280
end
inherited ePersonaContacto: TcxDBTextEdit
Top = 334
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
TabOrder = 14
ExplicitTop = 334
end
inherited eTlfTrabajo: TcxDBTextEdit
Top = 361
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
TabOrder = 15
ExplicitTop = 361
end
object eReferenciaAlbaranCli: TcxTextEdit [8]
Left = 116
Top = 167
Anchors = [akLeft, akTop, akRight]
Enabled = False
Properties.ReadOnly = False
Properties.ValidateOnEnter = True
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Color = clWindow
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 7
Width = 165
end
object Button2: TButton [9]
Left = 307
Top = 167
Width = 132
Height = 23
TabOrder = 8
end
inherited bElegirDireccion: TBitBtn
Left = 267
Top = 388
TabOrder = 16
ExplicitLeft = 267
ExplicitTop = 388
end
inherited Button1: TButton
Left = 307
ExplicitLeft = 307
end
inherited eReferenciaPedidoCli: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 198
Width = 198
end
inherited cbFormaPago: TcxDBLookupComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 198
Width = 198
end
inherited bFormasPago: TButton
Left = 307
ExplicitLeft = 307
end
inherited eFechaRecepcion: TcxDBDateEdit
Left = 603
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 265
Width = 265
TabOrder = 22
ExplicitLeft = 603
end
inherited cbConAlmacen: TCheckBox
Top = 447
TabOrder = 17
ExplicitTop = 447
end
inherited cbAlmacen: TcxDBLookupComboBox
Top = 447
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 235
Width = 235
TabOrder = 18
ExplicitTop = 447
end
inherited eRefFacturaCli: TcxDBTextEdit
Top = 196
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
TabOrder = 9
ExplicitTop = 196
end
inherited eFechaPrevista: TcxDBDateEdit
Left = 603
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 265
Width = 265
TabOrder = 20
ExplicitLeft = 603
end
inherited eRefCliente: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
end
inherited eFechaEnvio: TcxDBDateEdit
Left = 603
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 265
Width = 265
TabOrder = 21
ExplicitLeft = 603
end
inherited cbProvincia: TcxDBComboBox
Top = 280
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 235
Width = 235
TabOrder = 11
ExplicitTop = 280
end
inherited cbPoblacion: TcxDBComboBox
Top = 307
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 336
Width = 336
TabOrder = 13
ExplicitTop = 307
end
inherited frViewDatosYSeleccionClienteAlbaran1: TfrViewDatosYSeleccionClienteAlbaran
Width = 406
ExplicitWidth = 406
Left = 469
TabOrder = 19
ExplicitLeft = 469
inherited dxLayoutControl1: TdxLayoutControl
Width = 406
inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
Left = 282
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 282
end
inherited Button3: TBitBtn
Left = 193
ExplicitLeft = 193
end
inherited edtPersonaContacto: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283
Width = 283
end
inherited edtDireccion: TcxMemo
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 287
Width = 287
end
inherited Button4: TButton
Left = 362
ExplicitLeft = 362
end
inherited Button5: TButton
Left = 362
ExplicitLeft = 362
end
end
end
@ -187,6 +254,24 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
inherited dxLayoutControl1Group15: TdxLayoutGroup
Visible = False
end
object dxLayoutControl1Group16: TdxLayoutGroup [1]
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item17: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Ref. alb. origen:'
Control = eReferenciaAlbaranCli
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item25: TdxLayoutItem
ShowCaption = False
Control = Button2
ControlOptions.ShowBorder = False
end
end
inherited dxLayoutControl1Item22: TdxLayoutItem
Caption = 'Ref. abono:'
end
@ -215,4 +300,11 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
end
end
end
inherited ActionList1: TActionList
object actVerAlbaranCli: TAction
Caption = 'Ver el albar'#225'n origen'
OnExecute = actVerAlbaranCliExecute
OnUpdate = actVerAlbaranCliUpdate
end
end
end

71
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas
View File

@ -9,14 +9,24 @@ uses
cxDBLookupComboBox, cxTextEdit, Buttons, uCustomView, uViewBase,
uViewDatosYSeleccionCliente, cxDBEdit, cxMemo, cxContainer, cxEdit,
cxMaskEdit, cxCalendar, cxControls, uDAInterfaces,
uViewDatosYSeleccionClienteAlbaran;
uViewDatosYSeleccionClienteAlbaran, uBizAlbaranesCliente;
type
TfrViewAlbaranDevCliente = class(TfrViewAlbaranCliente)
private
{ Private declarations }
public
{ Public declarations }
dxLayoutControl1Item17: TdxLayoutItem;
eReferenciaAlbaranCli: TcxTextEdit;
dxLayoutControl1Item25: TdxLayoutItem;
Button2: TButton;
dxLayoutControl1Group16: TdxLayoutGroup;
actVerAlbaranCli: TAction;
procedure actVerAlbaranCliExecute(Sender: TObject);
procedure actVerAlbaranCliUpdate(Sender: TObject);
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
protected
FAlbaranAsociado : IBizAlbaranCliente;
procedure SetAlbaran(const Value: IBizAlbaranCliente); override;
end;
var
@ -26,4 +36,55 @@ implementation
{$R *.dfm}
procedure TfrViewAlbaranDevCliente.actVerAlbaranCliExecute(Sender: TObject);
begin
inherited;
Controller.Ver(FAlbaranAsociado);
end;
procedure TfrViewAlbaranDevCliente.actVerAlbaranCliUpdate(Sender: TObject);
begin
inherited;
if (Sender as TAction).Enabled then
(Sender as TAction).Enabled := Assigned(FAlbaranAsociado);
end;
procedure TfrViewAlbaranDevCliente.CustomViewCreate(Sender: TObject);
begin
inherited;
FAlbaranAsociado := NIL;
end;
procedure TfrViewAlbaranDevCliente.CustomViewDestroy(Sender: TObject);
begin
FAlbaranAsociado := NIL;
inherited;
end;
procedure TfrViewAlbaranDevCliente.SetAlbaran(const Value: IBizAlbaranCliente);
begin
inherited;
if Assigned(FAlbaran) then
begin
FAlbaranAsociado := NIL;
if (FAlbaran.ID_ALBARAN_DEV > 0) then
begin
FAlbaranAsociado := Controller.Buscar(FAlbaran.ID_ALBARAN_DEV);
if Assigned(FAlbaranAsociado) then
begin
FAlbaranAsociado.DataTable.Active := True;
eReferenciaAlbaranCli.Text := FAlbaranAsociado.REFERENCIA
end
else
eReferenciaAlbaranCli.Text := '';
end
else
eReferenciaAlbaranCli.Text := 'No hay pedido asociado';
end
else begin
FAlbaranAsociado := NIL;
end;
end;
end.

2
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
View File

@ -254,8 +254,6 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 638
ExplicitWidth = 215
Width = 215
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel

40
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm
View File

@ -2,12 +2,42 @@ inherited frViewAlbaranesDevCliente: TfrViewAlbaranesDevCliente
OnCreate = CustomViewCreate
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
DataController.Summary.DefaultGroupSummaryItems = <
item
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Position = spFooter
Column = cxGridViewPERSONA_CONTACTO
end>
DataController.Summary.FooterSummaryItems = <
item
Format = '0 pedidos'
Kind = skCount
end
item
Format = '0 albaranes'
Kind = skCount
Column = cxGridViewREFERENCIA
end
item
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = cxGridViewPERSONA_CONTACTO
end>
inherited cxGridViewNUM_COPIAS: TcxGridDBColumn
IsCaptionAssigned = True
end
inherited cxGridViewNUM_CORREOS: TcxGridDBColumn
IsCaptionAssigned = True
end
object cxGridViewREFERENCIA_ALB_DEV: TcxGridDBColumn [5]
Caption = 'Ref. alb. origen'
DataBinding.FieldName = 'REFERENCIA_ALB_DEV'
end
object cxGridViewREFERENCIA_FAC_AlB_DEV: TcxGridDBColumn [6]
Caption = 'Ref. fac. alb. origen'
DataBinding.FieldName = 'REFERENCIA_FAC_AlB_DEV'
end
inherited cxGridViewFECHA_ALBARAN: TcxGridDBColumn
Caption = 'Fecha'
end
@ -34,24 +64,22 @@ inherited frViewAlbaranesDevCliente: TfrViewAlbaranesDevCliente
Width = 322
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 328
Left = 351
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 328
ExplicitLeft = 351
ExplicitWidth = 366
Width = 366
end
inherited eLista: TcxComboBox
Left = 638
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 638
ExplicitWidth = 215
Width = 215
ExplicitWidth = 140
Width = 140
end
end
end

4
Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas
View File

@ -20,7 +20,9 @@ type
end;
TfrViewAlbaranesDevCliente = class(TfrViewAlbaranesCliente, IViewAlbaranesDevCliente)
procedure CustomViewCreate(Sender: TObject);
cxGridViewREFERENCIA_ALB_DEV: TcxGridDBColumn;
cxGridViewREFERENCIA_FAC_AlB_DEV: TcxGridDBColumn;
procedure CustomViewCreate(Sender: TObject);
end;
implementation

4
Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.dfm
View File

@ -213,6 +213,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
AutoSize = False
DataBinding.DataField = 'PERSONA_CONTACTO'
DataBinding.DataSource = dsAlbaran
Enabled = False
ParentFont = False
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
@ -267,6 +268,7 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
Width = 23
Height = 25
Action = actElegirPersonaContacto
Enabled = False
TabOrder = 7
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
@ -339,7 +341,9 @@ inherited frViewDatosYSeleccionClienteAlbaran: TfrViewDatosYSeleccionClienteAlba
end
end
object dxLayoutControl1Group5: TdxLayoutGroup
Enabled = False
ShowCaption = False
Visible = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False

48
Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas
View File

@ -98,6 +98,7 @@ type
FAlbaran : IBizAlbaranCliente;
FCliente : IBizCliente;
FDireccion : IBizDireccionesContacto;
FDireccionEntrega : IBizDireccionesContacto;
function GetCliente: IBizCliente; virtual;
procedure SetCliente(Value: IBizCliente); virtual;
function GetOnClienteChanged : TNotifyEvent;
@ -247,24 +248,40 @@ var
ADireccion : IBizDireccionesContacto;
begin
inherited;
ADireccion := FClientesController.ElegirDireccionEntrega(FCliente, ' ');
FDireccionesController.CopiarDireccionFiscal(FCliente, FDireccion);
if (FCliente.Direcciones.RecordCount > 1) then
ADireccion := FClientesController.ElegirDireccionEntrega(FCliente, 'Seleccione la dirección del cliente que quiere utilizar como dirección de envio de este albaran.')
else
ADireccion := FCliente.Direcciones;
if Assigned(ADireccion) then
begin
FDireccion := ADireccion;
FDireccionEntrega := ADireccion;
FAlbaran.Edit;
if FDireccion.IDIsNull then
if FDireccionEntrega.IDIsNull then
begin
FAlbaran.ClearField('ID_DIRECCION');
FAlbaran.ClearField('IMPORTE_PORTE');
FAlbaran.ClearField('CALLE');
FAlbaran.ClearField('POBLACION');
FAlbaran.ClearField('PROVINCIA');
FAlbaran.ClearField('CODIGO_POSTAL');
FAlbaran.ClearField('TELEFONO');
FAlbaran.ClearField('PERSONA_CONTACTO');
end
else begin
FAlbaran.ID_DIRECCION := FDireccion.ID;
FAlbaran.IMPORTE_PORTE := FDireccion.PORTE;
FAlbaran.ID_DIRECCION := FDireccionEntrega.ID;
FAlbaran.CALLE := FDireccionEntrega.CALLE;
FAlbaran.POBLACION := FDireccionEntrega.POBLACION;
FAlbaran.PROVINCIA := FDireccionEntrega.PROVINCIA;
FAlbaran.CODIGO_POSTAL := FDireccionEntrega.CODIGO_POSTAL;
FAlbaran.TELEFONO := FDireccionEntrega.TELEFONO;
FAlbaran.PERSONA_CONTACTO := FDireccionEntrega.PERSONA_CONTACTO;
FAlbaran.IMPORTE_PORTE := FDireccionEntrega.PORTE;
end;
//Siempre asignaremos la persona de contacto ya sea de las direcciones del contacto o la ID_Direccion=0 que es la principal de la ficha
FAlbaran.PERSONA_CONTACTO := FDireccion.PERSONA_CONTACTO;
EscribirTextoDireccion;
end;
end;
@ -289,10 +306,18 @@ begin
ACadena := '';
if Assigned(FDireccion) then
begin
ACadena := Format('%s %s %s %s',
[FDireccion.CALLE, FDireccion.POBLACION,
FDireccion.CODIGO_POSTAL, FDireccion.PROVINCIA]);
if (not FDireccion.TELEFONOIsNull) and (FDireccion.TELEFONO <> '') then
ACadena := ACadena + #13#10 + 'Teléfono: ' + FDireccion.TELEFONO;
if (not FDireccion.FAXIsNull) and (FDireccion.FAX <> '') then
ACadena := ACadena + #13#10 + 'Fax: ' + FDireccion.FAX;
end;
edtDireccion.Text := ACadena;
end;
@ -322,13 +347,7 @@ begin
if FCliente.ID > 0 then
edtPersonaContacto.Enabled := True;
// if FCliente.Direcciones.RecordCount > 0 then
// ElegirDireccionCliente
// else begin
// FAlbaran.Edit;
// FAlbaran.PERSONA_CONTACTO := FCliente.PERSONA_CONTACTO;
// RefrescarDireccion;
// end;
ElegirDireccionCliente
end
else begin
dsCliente.DataTable := NIL;
@ -411,6 +430,7 @@ begin
actAnadirContacto.Enabled := not ReadOnly;
actElegirContacto.Enabled := not ReadOnly;
edtPersonaContacto.Enabled := not ReadOnly;
end;
procedure TfrViewDatosYSeleccionClienteAlbaran.VerFichaCliente;

120
Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
View File

@ -1,90 +1,79 @@
inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
Enabled = False
inherited ToolBar1: TToolBar
Height = 95
ExplicitHeight = 95
inherited ToolButton3: TToolButton [1]
Left = 109
ExplicitLeft = 109
end
inherited ToolButton4: TToolButton [2]
Left = 164
ExplicitLeft = 164
end
inherited ToolButton14: TToolButton [3]
Left = 220
Enabled = True
ExplicitLeft = 220
end
inherited ToolButton2: TToolButton [4]
Left = 0
inherited FontName: TJvFontComboBox [4]
Left = 56
Top = 22
ExplicitLeft = 0
ExplicitLeft = 56
ExplicitTop = 22
end
inherited FontName: TJvFontComboBox
Left = 114
ExplicitLeft = 114
end
inherited ToolButton12: TToolButton [6]
Left = 259
inherited ToolButton14: TToolButton [5]
Left = 201
Wrap = False
ExplicitLeft = 259
ExplicitHeight = 22
ExplicitLeft = 201
end
inherited FontSize: TEdit [7]
Left = 267
ExplicitLeft = 267
inherited FontSize: TEdit
Left = 266
Top = 22
ExplicitLeft = 266
ExplicitTop = 22
end
inherited UpDown1: TUpDown
Left = 308
Top = 22
ExplicitLeft = 308
ExplicitTop = 22
end
inherited ToolButton13: TToolButton
Left = 325
Top = 22
ExplicitLeft = 325
ExplicitTop = 22
end
inherited ToolButton11: TToolButton [9]
Left = 333
Top = 22
ExplicitLeft = 333
ExplicitTop = 22
end
inherited ToolButton12: TToolButton [10]
Left = 0
Top = 22
Wrap = True
ExplicitLeft = 0
ExplicitTop = 22
ExplicitHeight = 27
end
inherited ToolButton6: TToolButton
Left = 0
Top = 49
Enabled = True
ExplicitLeft = 0
ExplicitTop = 49
end
inherited ToolButton7: TToolButton
Left = 66
Top = 49
Enabled = True
ExplicitLeft = 66
ExplicitTop = 49
end
inherited ToolButton9: TToolButton [11]
Left = 133
Enabled = True
Wrap = True
ExplicitLeft = 133
end
inherited UpDown1: TUpDown [12]
Left = 0
Top = 71
Top = 49
ExplicitLeft = 0
ExplicitTop = 71
ExplicitTop = 49
end
inherited ToolButton10: TToolButton [13]
Left = 17
Top = 71
ExplicitLeft = 17
ExplicitTop = 71
inherited ToolButton10: TToolButton [12]
Left = 145
Top = 49
ExplicitLeft = 145
ExplicitTop = 49
end
inherited ToolButton11: TToolButton [14]
Left = 142
Top = 71
ExplicitLeft = 142
ExplicitTop = 71
inherited ToolButton6: TToolButton [13]
Left = 270
Top = 49
ExplicitLeft = 270
ExplicitTop = 49
end
inherited ToolButton7: TToolButton [14]
Left = 336
Top = 49
Wrap = True
ExplicitLeft = 336
ExplicitTop = 49
end
inherited ToolButton8: TToolButton [15]
Left = 283
Left = 0
Top = 71
Enabled = True
ExplicitLeft = 283
ExplicitLeft = 0
ExplicitTop = 71
end
end
@ -92,9 +81,8 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
Top = 121
Height = 183
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
Visible = True
end
end
end

16
Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
View File

@ -61,8 +61,8 @@ type
procedure Preview(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function DarListaAnosAlbaranes: TStringList;
procedure FiltrarAno(AAlbaran: IBizAlbaranProveedor; ADynWhereDataTable: WideString; const Ano: String);
@ -142,8 +142,8 @@ type
procedure Preview(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function DarListaAnosAlbaranes: TStringList;
procedure FiltrarAno(AAlbaran: IBizAlbaranProveedor; ADynWhereDataTable: WideString; const Ano: String);
@ -1113,12 +1113,14 @@ begin
end;
end;
procedure TAlbaranesProveedorController.Print(AAlbaran: IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function TAlbaranesProveedorController.Print(AAlbaran: IBizAlbaranProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
var
AReportController : IAlbaranesProveedorReportController;
ID_Albaranes: TIntegerList;
begin
Result := False;
AReportController := TAlbaranesProveedorReportController.Create;
ID_Albaranes := TIntegerList.Create;
@ -1140,7 +1142,7 @@ begin
else
ID_Albaranes.Add(AAlbaran.ID);
AReportController.Print(ID_Albaranes, VerPrecios, VerRefProveedor);
Result := AReportController.Print(ID_Albaranes, VerPrecios, VerRefProveedor);
finally
AReportController := NIL;
FreeANDNIL(ID_Albaranes)

19
Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorReportController.pas
View File

@ -12,8 +12,8 @@ type
['{11F9D087-C6BE-4401-AB13-4342025D62BB}']
procedure Preview(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToWord(const AID: Integer; const AFileName : String = '';
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = '';
@ -30,8 +30,8 @@ type
procedure Preview(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToWord(const AID: Integer; const AFileName : String = '';
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = '';
@ -44,7 +44,7 @@ implementation
uses
uROTypes, uEditorRegistryUtils, uIEditorAlbaranesProveedorPreview,
uEditorPreview, uDataModuleAlbaranesProveedor, uEditorBase, cxControls,
uStringsUtils, uSistemaFunc, uFactuGES_App;
uStringsUtils, uSistemaFunc, uFactuGES_App, schAlbaranesProveedorClient_Intf;
{ TAlbaranesProveedorReportController }
@ -152,12 +152,13 @@ begin
end;
end;
procedure TAlbaranesProveedorReportController.Print(const AListaID: TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function TAlbaranesProveedorReportController.Print(const AListaID: TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
var
AStream: Binary;
AEditor : IEditorAlbaranesProveedorPreview;
begin
Result := False;
AEditor := NIL;
ShowHourglassCursor;
@ -174,7 +175,9 @@ begin
AEditor.VerRefProveedor := VerRefProveedor;
AEditor.Title := 'Albarán de proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE;
AEditor.LoadFromStream(AStream);
AEditor.Print;
AEditor.TablaImpresion := nme_AlbaranesProveedor;
AEditor.IdTablaImpresion := AListaID.ToString;
Result := AEditor.Print;
finally
AEditor.Release;
end;

8
Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas
View File

@ -3,7 +3,7 @@ unit schAlbaranesProveedorClient_Intf;
interface
uses
Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const
{ Data table rules ids
@ -173,7 +173,7 @@ type
end;
{ TListaAnosAlbaranesDataTableRules }
TListaAnosAlbaranesDataTableRules = class(TDADataTableRules, IListaAnosAlbaranes)
TListaAnosAlbaranesDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosAlbaranes)
private
protected
{ Property getters and setters }
@ -470,7 +470,7 @@ type
end;
{ TAlbaranesProveedorDataTableRules }
TAlbaranesProveedorDataTableRules = class(TDADataTableRules, IAlbaranesProveedor)
TAlbaranesProveedorDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesProveedor)
private
f_OBSERVACIONES: IROStrings;
f_INCIDENCIAS: IROStrings;
@ -867,7 +867,7 @@ type
end;
{ TAlbaranesProveedor_DetallesDataTableRules }
TAlbaranesProveedor_DetallesDataTableRules = class(TDADataTableRules, IAlbaranesProveedor_Detalles)
TAlbaranesProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesProveedor_Detalles)
private
protected
{ Property getters and setters }

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

@ -185,6 +185,7 @@ begin
INCIDENCIAS_ACTIVAS := 0;
TIPO := CTE_TIPO_ALBARAN;
TIPO_ALMACEN := CTE_INV_ALMACEN;
ID_ALMACEN := AppFactuGES.EmpresaActiva.ID_ALMACEN;
end;
procedure TBizAlbaranProveedor.IVAOnChange(Sender: TDACustomField);

3
Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas
View File

@ -271,7 +271,8 @@ begin
if Assigned(AAlbaranes) then
begin
if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
FController.Print(AAlbaranes, AllItems, FImprimirPrecios, FImprimirRefProveedor);
if FController.Print(AAlbaranes, AllItems, FImprimirPrecios, FImprimirRefProveedor) then
RefrescarInterno;
end;
end;
end;

2
Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas
View File

@ -80,7 +80,7 @@ begin
try
//Los almacenes serán comunes para todas las empresas.
dsData := ASchema.NewDataset(AConn, 'ListaAlmacenes'); //, ['ID_EMPRESA'], [IntToStr(IDEmpresa)]);
dsData := ASchema.NewDataset(AConn, 'ListaAlmacenes'); //, ['ID_EMPRESA'], [IntToStr(IDEmpresa)]);
except
RaiseError('No existe la tabla ALMACENES');
end;

62
Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
View File

@ -2,95 +2,50 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
ParentBiDiMode = False
OnShow = CustomViewShow
inherited ToolBar1: TToolBar
Height = 73
ExplicitHeight = 73
inherited ToolButton3: TToolButton
Wrap = False
end
inherited ToolButton4: TToolButton
Left = 278
Top = 0
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Top = 22
ExplicitTop = 22
end
inherited FontSize: TEdit
Top = 22
Width = 42
ExplicitTop = 22
ExplicitWidth = 42
end
inherited UpDown1: TUpDown
Left = 187
Top = 22
Width = 17
ExplicitLeft = 187
ExplicitTop = 22
ExplicitWidth = 17
end
inherited ToolButton13: TToolButton
Left = 204
Top = 22
ExplicitLeft = 204
ExplicitTop = 22
end
inherited ToolButton6: TToolButton
Left = 212
Top = 22
ExplicitLeft = 212
ExplicitTop = 22
end
inherited ToolButton7: TToolButton
Left = 278
Top = 22
ExplicitLeft = 278
ExplicitTop = 22
end
inherited ToolButton8: TToolButton
Left = 345
Top = 22
ExplicitLeft = 345
ExplicitTop = 22
end
inherited ToolButton12: TToolButton
Left = 0
Top = 22
Wrap = True
ExplicitLeft = 0
ExplicitTop = 22
ExplicitHeight = 27
Left = 428
ExplicitLeft = 428
end
inherited ToolButton9: TToolButton
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
Left = 436
ExplicitLeft = 436
end
inherited ToolButton10: TToolButton
Left = 145
Top = 49
ExplicitLeft = 145
ExplicitTop = 49
Left = 581
ExplicitLeft = 581
end
inherited ToolButton11: TToolButton
Left = 270
Top = 49
ExplicitLeft = 270
ExplicitTop = 49
Left = 706
ExplicitLeft = 706
end
end
inherited cxGrid: TcxGrid
Top = 99
Height = 205
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn
Visible = False
@ -187,7 +142,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
end
end
inherited TBXDock1: TTBXDock
Top = 73
inherited TBXToolbar1: TTBXToolbar
inherited TBXSubmenuItem1: TTBXSubmenuItem
object TBXSeparatorItem8: TTBXSeparatorItem [4]

4
Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
View File

@ -107,7 +107,7 @@ begin
begin
cxGridView.BeginUpdate;
try
if Assigned(FindField('UNIDAD_MEDIDA')) then
{ if Assigned(FindField('UNIDAD_MEDIDA')) then
begin
cxGridViewUNIDAD_MEDIDA.DataBinding.FieldName := 'UNIDAD_MEDIDA';
cxGridViewUNIDAD_MEDIDA.Visible := True;
@ -132,7 +132,7 @@ begin
cxGridViewREFERENCIA_FABRICANTE.Visible := False;
cxGridViewREFERENCIA_FABRICANTE.VisibleForCustomization := False;
end;
}
finally
cxGridView.EndUpdate;
end;

15
Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
View File

@ -44,8 +44,8 @@ type
procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True);
function Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True): Boolean;
procedure RecalcularImportes(AFactura: IBizFacturaCliente);
function EsModificable(AFactura: IBizFacturaCliente): Boolean;
@ -112,8 +112,8 @@ type
procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True);
function Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True): Boolean;
procedure RecalcularImportes(AFactura: IBizFacturaCliente);
function EsModificable(AFactura: IBizFacturaCliente): Boolean;
@ -1079,13 +1079,14 @@ begin
end;
end;
procedure TFacturasClienteController.Print(AFactura: IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True);
function TFacturasClienteController.Print(AFactura: IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True; const VerCopia: Boolean = True): Boolean;
var
AReportController : IFacturasClienteReportController;
ID_Facturas: TIntegerList;
begin
Result := False;
AReportController := TFacturasClienteReportController.Create;
ID_Facturas := TIntegerList.Create;
@ -1107,7 +1108,7 @@ begin
else
ID_Facturas.Add(AFactura.ID);
AReportController.Print(ID_Facturas, VerSello, VerCopia);
Result := AReportController.Print(ID_Facturas, VerSello, VerCopia);
finally
AReportController := NIL;

13
Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas
View File

@ -11,7 +11,7 @@ type
IFacturasClienteReportController = interface(IControllerBase)
['{A0F41767-4FF6-4BAE-9FC9-894DD721D756}']
procedure Preview(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
function Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True): Boolean;
function ExportToWord(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
end;
@ -25,7 +25,7 @@ type
destructor Destroy; override;
procedure Preview(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
function Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True): Boolean;
function ExportToWord(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
end;
@ -36,7 +36,7 @@ implementation
uses
uROTypes, uEditorRegistryUtils, uIEditorFacturasClientePreview,
uEditorPreview, uDataModuleFacturasCliente, uEditorBase, cxControls,
uStringsUtils, uSistemaFunc;
uStringsUtils, uSistemaFunc, schFacturasClienteClient_Intf;
{ TFacturasClienteReportController }
@ -137,11 +137,12 @@ begin
end;
end;
procedure TFacturasClienteReportController.Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
function TFacturasClienteReportController.Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True): Boolean;
var
AStream: Binary;
AEditor : IEditorFacturasClientePreview;
begin
Result := False;
AEditor := NIL;
ShowHourglassCursor;
@ -153,7 +154,9 @@ begin
try
AEditor.Controller := Self;
AEditor.LoadFromStream(AStream);
AEditor.Print;
AEditor.TablaImpresion := nme_FacturasCliente;
AEditor.IdTablaImpresion := AListaID.ToString;
Result := AEditor.Print;
finally
AEditor.Release;
end;

5
Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
View File

@ -101,6 +101,11 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
Alignment = taRightJustify
DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO'
end
item
Name = 'DESCRIPCION_DESCUENTO'
DataType = datString
Size = 255
end
item
Name = 'IVA'
DataType = datFloat

16
Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj
View File

@ -25,6 +25,7 @@
<Projects Include="..\Gestor de informes\Plugin\GestorInformes_plugin.dproj" />
<Projects Include="..\Gestor de informes\Views\GestorInformes_view.dproj" />
<Projects Include="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" />
<Projects Include="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" />
<Projects Include="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" />
<Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
<Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
@ -311,14 +312,23 @@
<Target Name="PedidosProveedor_view:Make">
<MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="Make" />
</Target>
<Target Name="PedidosCliente_view">
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" Targets="" />
</Target>
<Target Name="PedidosCliente_view:Clean">
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" Targets="Clean" />
</Target>
<Target Name="PedidosCliente_view:Make">
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;PreCli_FacCli_relation;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;AlbaranesCliente_view;PresupuestosCliente_controller;GestorInformes_view;AlbaranesCliente_controller;GestorInformes_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view;PedidosProveedor_view" />
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;PreCli_FacCli_relation;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;AlbaranesCliente_view;PresupuestosCliente_controller;GestorInformes_view;AlbaranesCliente_controller;GestorInformes_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view;PedidosProveedor_view;PedidosCliente_view" />
</Target>
<Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PreCli_FacCli_relation:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;GestorInformes_view:Clean;AlbaranesCliente_controller:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean;PedidosProveedor_view:Clean" />
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PreCli_FacCli_relation:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;GestorInformes_view:Clean;AlbaranesCliente_controller:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean;PedidosProveedor_view:Clean;PedidosCliente_view:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PreCli_FacCli_relation:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;GestorInformes_view:Make;AlbaranesCliente_controller:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make;PedidosProveedor_view:Make" />
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PreCli_FacCli_relation:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;GestorInformes_view:Make;AlbaranesCliente_controller:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make;PedidosProveedor_view:Make;PedidosCliente_view:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

107
Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
View File

@ -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_ListaAnosFacturas = '{E7935072-AD67-4E72-A592-77AC3F93FCD9}';
RID_FacturasCliente = '{F4587A5B-A8AC-4605-90D4-88915446029D}';
RID_FacturasCliente_Detalles = '{AFA39953-8724-431E-AF7A-EF5048BAFAAA}';
RID_ListaAnosFacturas = '{72AC5E11-A400-4768-BFCD-7CDD2FD8593F}';
RID_FacturasCliente = '{7FB89523-3D7D-400B-83B4-6B2D1DE2285E}';
RID_FacturasCliente_Detalles = '{58C861A5-814B-44F5-9F3D-BD207276C275}';
{ Data table names }
nme_ListaAnosFacturas = 'ListaAnosFacturas';
@ -37,6 +37,7 @@ const
fld_FacturasClienteBASE_IMPONIBLE = 'BASE_IMPONIBLE';
fld_FacturasClienteDESCUENTO = 'DESCUENTO';
fld_FacturasClienteIMPORTE_DESCUENTO = 'IMPORTE_DESCUENTO';
fld_FacturasClienteDESCRIPCION_DESCUENTO = 'DESCRIPCION_DESCUENTO';
fld_FacturasClienteIVA = 'IVA';
fld_FacturasClienteIMPORTE_IVA = 'IMPORTE_IVA';
fld_FacturasClienteRE = 'RE';
@ -81,36 +82,37 @@ const
idx_FacturasClienteBASE_IMPONIBLE = 9;
idx_FacturasClienteDESCUENTO = 10;
idx_FacturasClienteIMPORTE_DESCUENTO = 11;
idx_FacturasClienteIVA = 12;
idx_FacturasClienteIMPORTE_IVA = 13;
idx_FacturasClienteRE = 14;
idx_FacturasClienteIMPORTE_RE = 15;
idx_FacturasClienteIMPORTE_TOTAL = 16;
idx_FacturasClienteOBSERVACIONES = 17;
idx_FacturasClienteID_CLIENTE = 18;
idx_FacturasClienteNIF_CIF = 19;
idx_FacturasClienteNOMBRE = 20;
idx_FacturasClienteID_DIRECCION = 21;
idx_FacturasClienteCALLE = 22;
idx_FacturasClientePOBLACION = 23;
idx_FacturasClientePROVINCIA = 24;
idx_FacturasClienteCODIGO_POSTAL = 25;
idx_FacturasClienteDATOS_BANCARIOS = 26;
idx_FacturasClienteCLIENTE_FINAL = 27;
idx_FacturasClienteFECHA_ALTA = 28;
idx_FacturasClienteFECHA_MODIFICACION = 29;
idx_FacturasClienteUSUARIO = 30;
idx_FacturasClienteID_FORMA_PAGO = 31;
idx_FacturasClienteRECARGO_EQUIVALENCIA = 32;
idx_FacturasClienteID_TIPO_IVA = 33;
idx_FacturasClienteIMPORTE_NETO = 34;
idx_FacturasClienteIMPORTE_PORTE = 35;
idx_FacturasClienteID_AGENTE = 36;
idx_FacturasClienteREFERENCIA_COMISION = 37;
idx_FacturasClienteRETENCION = 38;
idx_FacturasClienteIMPORTE_RETENCION = 39;
idx_FacturasClienteNUM_COPIAS = 40;
idx_FacturasClienteNUM_CORREOS = 41;
idx_FacturasClienteDESCRIPCION_DESCUENTO = 12;
idx_FacturasClienteIVA = 13;
idx_FacturasClienteIMPORTE_IVA = 14;
idx_FacturasClienteRE = 15;
idx_FacturasClienteIMPORTE_RE = 16;
idx_FacturasClienteIMPORTE_TOTAL = 17;
idx_FacturasClienteOBSERVACIONES = 18;
idx_FacturasClienteID_CLIENTE = 19;
idx_FacturasClienteNIF_CIF = 20;
idx_FacturasClienteNOMBRE = 21;
idx_FacturasClienteID_DIRECCION = 22;
idx_FacturasClienteCALLE = 23;
idx_FacturasClientePOBLACION = 24;
idx_FacturasClientePROVINCIA = 25;
idx_FacturasClienteCODIGO_POSTAL = 26;
idx_FacturasClienteDATOS_BANCARIOS = 27;
idx_FacturasClienteCLIENTE_FINAL = 28;
idx_FacturasClienteFECHA_ALTA = 29;
idx_FacturasClienteFECHA_MODIFICACION = 30;
idx_FacturasClienteUSUARIO = 31;
idx_FacturasClienteID_FORMA_PAGO = 32;
idx_FacturasClienteRECARGO_EQUIVALENCIA = 33;
idx_FacturasClienteID_TIPO_IVA = 34;
idx_FacturasClienteIMPORTE_NETO = 35;
idx_FacturasClienteIMPORTE_PORTE = 36;
idx_FacturasClienteID_AGENTE = 37;
idx_FacturasClienteREFERENCIA_COMISION = 38;
idx_FacturasClienteRETENCION = 39;
idx_FacturasClienteIMPORTE_RETENCION = 40;
idx_FacturasClienteNUM_COPIAS = 41;
idx_FacturasClienteNUM_CORREOS = 42;
{ FacturasCliente_Detalles fields }
fld_FacturasCliente_DetallesID = 'ID';
@ -149,7 +151,7 @@ const
type
{ IListaAnosFacturas }
IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
['{336BD820-C75A-47DC-832A-16223BB894AC}']
['{D1966795-0438-4F3D-B5A1-3FABEAB20487}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@ -184,7 +186,7 @@ type
{ IFacturasCliente }
IFacturasCliente = interface(IDAStronglyTypedDataTable)
['{F1E25F0E-E187-4B6D-810D-91901438511B}']
['{2D6A8E2D-6BA4-44F6-BA2A-73C7200F01E1}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -234,6 +236,10 @@ type
procedure SetIMPORTE_DESCUENTOValue(const aValue: Currency);
function GetIMPORTE_DESCUENTOIsNull: Boolean;
procedure SetIMPORTE_DESCUENTOIsNull(const aValue: Boolean);
function GetDESCRIPCION_DESCUENTOValue: String;
procedure SetDESCRIPCION_DESCUENTOValue(const aValue: String);
function GetDESCRIPCION_DESCUENTOIsNull: Boolean;
procedure SetDESCRIPCION_DESCUENTOIsNull(const aValue: Boolean);
function GetIVAValue: Float;
procedure SetIVAValue(const aValue: Float);
function GetIVAIsNull: Boolean;
@ -380,6 +386,8 @@ type
property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
property IMPORTE_DESCUENTO: Currency read GetIMPORTE_DESCUENTOValue write SetIMPORTE_DESCUENTOValue;
property IMPORTE_DESCUENTOIsNull: Boolean read GetIMPORTE_DESCUENTOIsNull write SetIMPORTE_DESCUENTOIsNull;
property DESCRIPCION_DESCUENTO: String read GetDESCRIPCION_DESCUENTOValue write SetDESCRIPCION_DESCUENTOValue;
property DESCRIPCION_DESCUENTOIsNull: Boolean read GetDESCRIPCION_DESCUENTOIsNull write SetDESCRIPCION_DESCUENTOIsNull;
property IVA: Float read GetIVAValue write SetIVAValue;
property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull;
property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
@ -497,6 +505,10 @@ type
procedure SetIMPORTE_DESCUENTOValue(const aValue: Currency); virtual;
function GetIMPORTE_DESCUENTOIsNull: Boolean; virtual;
procedure SetIMPORTE_DESCUENTOIsNull(const aValue: Boolean); virtual;
function GetDESCRIPCION_DESCUENTOValue: String; virtual;
procedure SetDESCRIPCION_DESCUENTOValue(const aValue: String); virtual;
function GetDESCRIPCION_DESCUENTOIsNull: Boolean; virtual;
procedure SetDESCRIPCION_DESCUENTOIsNull(const aValue: Boolean); virtual;
function GetIVAValue: Float; virtual;
procedure SetIVAValue(const aValue: Float); virtual;
function GetIVAIsNull: Boolean; virtual;
@ -642,6 +654,8 @@ type
property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
property IMPORTE_DESCUENTO: Currency read GetIMPORTE_DESCUENTOValue write SetIMPORTE_DESCUENTOValue;
property IMPORTE_DESCUENTOIsNull: Boolean read GetIMPORTE_DESCUENTOIsNull write SetIMPORTE_DESCUENTOIsNull;
property DESCRIPCION_DESCUENTO: String read GetDESCRIPCION_DESCUENTOValue write SetDESCRIPCION_DESCUENTOValue;
property DESCRIPCION_DESCUENTOIsNull: Boolean read GetDESCRIPCION_DESCUENTOIsNull write SetDESCRIPCION_DESCUENTOIsNull;
property IVA: Float read GetIVAValue write SetIVAValue;
property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull;
property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
@ -711,7 +725,7 @@ type
{ IFacturasCliente_Detalles }
IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{17CE0DA6-6CB8-45D5-A703-BFFDEE8F11D6}']
['{C8059B01-082C-4227-9754-3FADF5F53A22}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1223,6 +1237,27 @@ begin
DataTable.Fields[idx_FacturasClienteIMPORTE_DESCUENTO].AsVariant := Null;
end;
function TFacturasClienteDataTableRules.GetDESCRIPCION_DESCUENTOValue: String;
begin
result := DataTable.Fields[idx_FacturasClienteDESCRIPCION_DESCUENTO].AsString;
end;
procedure TFacturasClienteDataTableRules.SetDESCRIPCION_DESCUENTOValue(const aValue: String);
begin
DataTable.Fields[idx_FacturasClienteDESCRIPCION_DESCUENTO].AsString := aValue;
end;
function TFacturasClienteDataTableRules.GetDESCRIPCION_DESCUENTOIsNull: boolean;
begin
result := DataTable.Fields[idx_FacturasClienteDESCRIPCION_DESCUENTO].IsNull;
end;
procedure TFacturasClienteDataTableRules.SetDESCRIPCION_DESCUENTOIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_FacturasClienteDESCRIPCION_DESCUENTO].AsVariant := Null;
end;
function TFacturasClienteDataTableRules.GetIVAValue: Float;
begin
result := DataTable.Fields[idx_FacturasClienteIVA].AsFloat;

55
Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
View File

@ -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_ListaAnosFacturasDelta = '{E2C1C6AC-57B7-494A-949D-3AF9A2B933BB}';
RID_FacturasClienteDelta = '{1D394716-852A-4987-BD0E-3913EBC5A414}';
RID_FacturasCliente_DetallesDelta = '{2784C40F-DECD-4045-8F0A-F3B69AFDA573}';
RID_ListaAnosFacturasDelta = '{80E08922-7D16-4852-AC18-9501740C5B1B}';
RID_FacturasClienteDelta = '{9F91B45C-9EB3-4A70-B3F0-0BFDB8413F17}';
RID_FacturasCliente_DetallesDelta = '{284D9A63-867C-4AA6-83C4-6C7C40B49EF7}';
type
{ IListaAnosFacturasDelta }
IListaAnosFacturasDelta = interface(IListaAnosFacturas)
['{E2C1C6AC-57B7-494A-949D-3AF9A2B933BB}']
['{80E08922-7D16-4852-AC18-9501740C5B1B}']
{ Property getters and setters }
function GetOldANOValue : String;
@ -50,7 +50,7 @@ type
{ IFacturasClienteDelta }
IFacturasClienteDelta = interface(IFacturasCliente)
['{1D394716-852A-4987-BD0E-3913EBC5A414}']
['{9F91B45C-9EB3-4A70-B3F0-0BFDB8413F17}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -64,6 +64,7 @@ type
function GetOldBASE_IMPONIBLEValue : Currency;
function GetOldDESCUENTOValue : Float;
function GetOldIMPORTE_DESCUENTOValue : Currency;
function GetOldDESCRIPCION_DESCUENTOValue : String;
function GetOldIVAValue : Float;
function GetOldIMPORTE_IVAValue : Currency;
function GetOldREValue : Float;
@ -108,6 +109,7 @@ type
property OldBASE_IMPONIBLE : Currency read GetOldBASE_IMPONIBLEValue;
property OldDESCUENTO : Float read GetOldDESCUENTOValue;
property OldIMPORTE_DESCUENTO : Currency read GetOldIMPORTE_DESCUENTOValue;
property OldDESCRIPCION_DESCUENTO : String read GetOldDESCRIPCION_DESCUENTOValue;
property OldIVA : Float read GetOldIVAValue;
property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue;
property OldRE : Float read GetOldREValue;
@ -219,6 +221,12 @@ type
function GetOldIMPORTE_DESCUENTOIsNull: Boolean; virtual;
procedure SetIMPORTE_DESCUENTOValue(const aValue: Currency); virtual;
procedure SetIMPORTE_DESCUENTOIsNull(const aValue: Boolean); virtual;
function GetDESCRIPCION_DESCUENTOValue: String; virtual;
function GetDESCRIPCION_DESCUENTOIsNull: Boolean; virtual;
function GetOldDESCRIPCION_DESCUENTOValue: String; virtual;
function GetOldDESCRIPCION_DESCUENTOIsNull: Boolean; virtual;
procedure SetDESCRIPCION_DESCUENTOValue(const aValue: String); virtual;
procedure SetDESCRIPCION_DESCUENTOIsNull(const aValue: Boolean); virtual;
function GetIVAValue: Float; virtual;
function GetIVAIsNull: Boolean; virtual;
function GetOldIVAValue: Float; virtual;
@ -448,6 +456,10 @@ type
property IMPORTE_DESCUENTOIsNull : Boolean read GetIMPORTE_DESCUENTOIsNull write SetIMPORTE_DESCUENTOIsNull;
property OldIMPORTE_DESCUENTO : Currency read GetOldIMPORTE_DESCUENTOValue;
property OldIMPORTE_DESCUENTOIsNull : Boolean read GetOldIMPORTE_DESCUENTOIsNull;
property DESCRIPCION_DESCUENTO : String read GetDESCRIPCION_DESCUENTOValue write SetDESCRIPCION_DESCUENTOValue;
property DESCRIPCION_DESCUENTOIsNull : Boolean read GetDESCRIPCION_DESCUENTOIsNull write SetDESCRIPCION_DESCUENTOIsNull;
property OldDESCRIPCION_DESCUENTO : String read GetOldDESCRIPCION_DESCUENTOValue;
property OldDESCRIPCION_DESCUENTOIsNull : Boolean read GetOldDESCRIPCION_DESCUENTOIsNull;
property IVA : Float read GetIVAValue write SetIVAValue;
property IVAIsNull : Boolean read GetIVAIsNull write SetIVAIsNull;
property OldIVA : Float read GetOldIVAValue;
@ -577,7 +589,7 @@ type
{ IFacturasCliente_DetallesDelta }
IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
['{2784C40F-DECD-4045-8F0A-F3B69AFDA573}']
['{284D9A63-867C-4AA6-83C4-6C7C40B49EF7}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer;
@ -1219,6 +1231,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIMPORTE_DESCUENTO] := Null;
end;
function TFacturasClienteBusinessProcessorRules.GetDESCRIPCION_DESCUENTOValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDESCRIPCION_DESCUENTO];
end;
function TFacturasClienteBusinessProcessorRules.GetDESCRIPCION_DESCUENTOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDESCRIPCION_DESCUENTO]);
end;
function TFacturasClienteBusinessProcessorRules.GetOldDESCRIPCION_DESCUENTOValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteDESCRIPCION_DESCUENTO];
end;
function TFacturasClienteBusinessProcessorRules.GetOldDESCRIPCION_DESCUENTOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteDESCRIPCION_DESCUENTO]);
end;
procedure TFacturasClienteBusinessProcessorRules.SetDESCRIPCION_DESCUENTOValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDESCRIPCION_DESCUENTO] := aValue;
end;
procedure TFacturasClienteBusinessProcessorRules.SetDESCRIPCION_DESCUENTOIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDESCRIPCION_DESCUENTO] := Null;
end;
function TFacturasClienteBusinessProcessorRules.GetIVAValue: Float;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIVA];

18
Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
View File

@ -215,6 +215,10 @@ object srvFacturasCliente: TsrvFacturasCliente
item
DatasetField = 'NUM_CORREOS'
TableField = 'NUM_CORREOS'
end
item
DatasetField = 'DESCRIPCION_DESCUENTO'
TableField = 'DESCRIPCION_DESCUENTO'
end>
end>
Name = 'FacturasCliente'
@ -283,6 +287,11 @@ object srvFacturasCliente: TsrvFacturasCliente
DataType = datCurrency
DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO'
end
item
Name = 'DESCRIPCION_DESCUENTO'
DataType = datString
Size = 255
end
item
Name = 'IVA'
DataType = datFloat
@ -454,11 +463,10 @@ object srvFacturasCliente: TsrvFacturasCliente
','#10' FACTURAS_CLIENTE_DETALLES.IMPORTE_TOTAL, FACTURAS_CLIENTE_' +
'DETALLES.VISIBLE,'#10#10' FACTURAS_CLIENTE_DETALLES.ID_ARTICULO, FA' +
'CTURAS_CLIENTE_DETALLES.DESCUENTO,'#10' FACTURAS_CLIENTE_DETALLES' +
'.IMPORTE_PORTE, ARTICULOS.REFERENCIA,'#10' '#10' '#39#39' as REFERENCIA_' +
'PROVEEDOR /*Es necesario porque los detalles es comun para la ra' +
'ma del cliente como del proveedor*/'#10#10'FROM FACTURAS_CLIENTE_DETAL' +
'LES'#10'LEFT JOIN ARTICULOS ON FACTURAS_CLIENTE_DETALLES.ID_ARTICULO' +
' = ARTICULOS.ID'#10'where {where}'#10'ORDER BY POSICION;'#10
'.IMPORTE_PORTE, ARTICULOS.REFERENCIA, ARTICULOS.REFERENCIA_PROV ' +
'as REFERENCIA_PROVEEDOR'#10#10'FROM FACTURAS_CLIENTE_DETALLES'#10'LEFT JOI' +
'N ARTICULOS ON FACTURAS_CLIENTE_DETALLES.ID_ARTICULO = ARTICULOS' +
'.ID'#10'where {where}'#10'ORDER BY POSICION;'#10
StatementType = stSQL
ColumnMappings = <
item

129
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

@ -122,10 +122,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
809
290)
inherited Label1: TLabel
Left = 383
Width = 311
ExplicitLeft = 383
ExplicitWidth = 311
Left = 412
ExplicitLeft = 412
end
inherited eReferencia: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
@ -162,8 +160,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 111
end
inherited bFormasPago: TButton
Left = 201
ExplicitLeft = 201
Left = 230
ExplicitLeft = 230
end
inherited cbCuentaBancaria: TcxDBComboBox
Style.LookAndFeel.SkinName = ''
@ -174,26 +172,26 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 249
end
inherited cbClienteFinal: TcxDBTextEdit
Left = 383
Left = 412
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 383
ExplicitWidth = 339
Width = 339
ExplicitLeft = 412
end
inherited bElegirClienteFinal: TButton
Left = 736
ExplicitLeft = 736
end
inherited frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
Left = 372
Left = 401
Width = 505
ExplicitLeft = 372
ExplicitLeft = 401
ExplicitWidth = 505
inherited dxLayoutControl1: TdxLayoutControl
Width = 505
ExplicitWidth = 505
ExplicitHeight = 170
inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
@ -203,28 +201,26 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
Left = 285
Left = 256
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 285
ExplicitLeft = 256
end
inherited Button3: TBitBtn
Left = 196
ExplicitLeft = 196
Left = 167
ExplicitLeft = 167
end
inherited edtDireccion: TcxTextEdit
inherited Button4: TButton
Left = 336
ExplicitLeft = 336
end
inherited edtDireccion: TcxMemo
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 121
Width = 121
end
inherited Button4: TButton
Left = 365
ExplicitLeft = 365
end
end
end
@ -233,8 +229,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 275
Width = 275
end
end
end
@ -262,9 +256,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitHeight = 290
inherited ToolBar1: TToolBar
Width = 809
Height = 46
Height = 73
ExplicitWidth = 809
ExplicitHeight = 46
ExplicitHeight = 73
inherited ToolButton3: TToolButton
Wrap = False
end
@ -274,76 +268,44 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
inherited FontName: TJvFontComboBox
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Top = 22
ExplicitTop = 22
inherited ToolButton14: TToolButton
Left = 479
Top = 0
Wrap = True
ExplicitLeft = 479
ExplicitTop = 0
end
inherited FontSize: TEdit
Top = 22
Left = 0
Width = 296
ExplicitTop = 22
ExplicitLeft = 0
ExplicitWidth = 296
end
inherited UpDown1: TUpDown
Left = 441
Top = 22
ExplicitLeft = 441
ExplicitTop = 22
Left = 312
ExplicitLeft = 312
end
inherited ToolButton13: TToolButton
Left = 0
Top = 22
Wrap = True
ExplicitLeft = 0
ExplicitTop = 22
ExplicitHeight = 27
end
inherited ToolButton6: TToolButton
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
inherited ToolButton7: TToolButton
Left = 66
Top = 49
ExplicitLeft = 66
ExplicitTop = 49
end
inherited ToolButton8: TToolButton
Left = 133
Top = 49
ExplicitLeft = 133
ExplicitTop = 49
end
inherited ToolButton12: TToolButton
Left = 216
Top = 49
ExplicitLeft = 216
ExplicitTop = 49
end
inherited ToolButton9: TToolButton
Left = 224
Top = 49
ExplicitLeft = 224
ExplicitTop = 49
end
inherited ToolButton10: TToolButton
Left = 369
Top = 49
ExplicitLeft = 369
ExplicitTop = 49
Left = 329
ExplicitLeft = 329
end
inherited ToolButton11: TToolButton
Left = 494
Left = 337
ExplicitLeft = 337
end
inherited ToolButton7: TToolButton
Wrap = False
end
inherited ToolButton8: TToolButton
Left = 403
Top = 49
ExplicitLeft = 494
ExplicitLeft = 403
ExplicitTop = 49
end
end
@ -351,9 +313,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Top = 99
Width = 809
Height = 191
ExplicitTop = 99
ExplicitWidth = 809
ExplicitHeight = 205
ExplicitHeight = 191
end
inherited TBXDock1: TTBXDock
Top = 73
@ -361,7 +322,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitTop = 73
ExplicitWidth = 809
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 523
ExplicitWidth = 566
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu

3
Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas
View File

@ -340,7 +340,8 @@ begin
//Preguntamos si desea que en las facturas se vea el Sello
// if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
if Assigned(AFacturas) then
FController.Print(AFacturas, AllItems, AVerSello, AVerCopia);
if FController.Print(AFacturas, AllItems, AVerSello, AVerCopia) then
RefrescarInterno;
end;
end;
end;

60
Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm
View File

@ -1,13 +1,13 @@
inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClienteFacturaCliente
Width = 505
Height = 138
ExplicitWidth = 505
ExplicitHeight = 138
Width = 467
Height = 234
ExplicitWidth = 467
ExplicitHeight = 234
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 505
Height = 138
Width = 467
Height = 234
Margins.Left = 0
Margins.Top = 0
Margins.Right = 0
@ -17,11 +17,13 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 505
ExplicitHeight = 186
DesignSize = (
505
138)
467
234)
object edtlNombre: TcxDBTextEdit
Left = 58
Left = 62
Top = 41
Anchors = [akLeft, akTop, akRight]
AutoSize = False
@ -48,7 +50,7 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
Width = 224
end
object edtNIFCIF: TcxDBTextEdit
Left = 392
Left = 354
Top = 41
Anchors = [akLeft, akTop, akRight]
AutoSize = False
@ -163,8 +165,8 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
FF00FF00FF00006000000060000000600000FF00FF00FF00FF00}
end
object Button3: TBitBtn
Left = 303
Top = 99
Left = 265
Top = 199
Width = 192
Height = 25
Action = actVerContacto
@ -206,9 +208,17 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
end
object edtDireccion: TcxTextEdit
Left = 58
Top = 70
object Button4: TButton
Left = 434
Top = 68
Width = 23
Height = 25
Action = actElegirDireccion
TabOrder = 5
end
object edtDireccion: TcxMemo
Left = 62
Top = 68
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
@ -226,15 +236,8 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 4
Width = 121
end
object Button4: TButton
Left = 472
Top = 68
Width = 23
Height = 25
Action = actElegirDireccion
TabOrder = 5
Height = 61
Width = 403
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
@ -259,6 +262,8 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
end
end
object dxLayoutControl1Group2: TdxLayoutGroup
AutoAligns = [aaHorizontal]
AlignVert = avClient
ShowCaption = False
Hidden = True
ShowBorder = False
@ -287,11 +292,10 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = []
object dxLayoutControl1Item3: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
AlignVert = avCenter
Caption = 'Direcci'#243'n'
Caption = 'Direcci'#243'n:'
Control = edtDireccion
ControlOptions.ShowBorder = False
end

22
Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas
View File

@ -10,7 +10,8 @@ uses
pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
DBCtrls, uClientesController, dxLayoutControl, Buttons, uDAInterfaces,
cxMaskEdit, cxButtonEdit, uBizFacturasCliente, uBizDireccionesContacto,
uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons;
uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons,
cxMemo;
type
IViewDatosYSeleccionClienteFacturaCliente = interface(IViewBase)
@ -63,10 +64,10 @@ type
dsFactura: TDADataSource;
actElegirDireccion: TAction;
dxLayoutControl1Group4: TdxLayoutGroup;
dxLayoutControl1Item4: TdxLayoutItem;
edtDireccion: TcxTextEdit;
Button4: TButton;
dxLayoutControl1Item5: TdxLayoutItem;
dxLayoutControl1Item3: TdxLayoutItem;
edtDireccion: TcxMemo;
dxLayoutControl1Group3: TdxLayoutGroup;
procedure actElegirContactoExecute(Sender: TObject);
procedure actAnadirContactoExecute(Sender: TObject);
@ -233,19 +234,14 @@ var
ADireccion : IBizDireccionesContacto;
begin
inherited;
ADireccion := FClientesController.ElegirDireccionEntrega(FCliente, ' ');
FDireccionesController.CopiarDireccionFiscal(FCliente, FDireccion);
if Assigned(ADireccion) then
begin
FDireccion := ADireccion;
// if FDireccion.IDIsNull then
// LimpiarDireccionDeFactura
// else
if FDireccion.IDIsNull then
LimpiarDireccionDeFactura
else
CopiarDireccionAFactura;
EscribirTextoDireccion;
end;
EscribirTextoDireccion;
end;
procedure TfrViewDatosYSeleccionClienteFacturaCliente.EscribirTextoDireccion;

93
Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
View File

@ -1,43 +1,51 @@
inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
inherited ToolBar1: TToolBar
Height = 95
ExplicitHeight = 95
inherited FontName: TJvFontComboBox [4]
Left = 56
Height = 73
ExplicitHeight = 73
inherited ToolButton3: TToolButton
Wrap = False
end
inherited ToolButton4: TToolButton
Left = 278
Top = 0
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Top = 22
ExplicitLeft = 56
ExplicitTop = 22
end
inherited ToolButton14: TToolButton [5]
Left = 201
Wrap = False
ExplicitLeft = 201
end
inherited FontSize: TEdit
Left = 266
Top = 22
ExplicitLeft = 266
ExplicitTop = 22
end
inherited UpDown1: TUpDown
Left = 308
Top = 22
ExplicitLeft = 308
ExplicitTop = 22
end
inherited ToolButton13: TToolButton
Left = 325
Top = 22
ExplicitLeft = 325
ExplicitTop = 22
end
inherited ToolButton11: TToolButton [9]
Left = 333
inherited ToolButton6: TToolButton
Top = 22
ExplicitLeft = 333
ExplicitTop = 22
end
inherited ToolButton12: TToolButton [10]
inherited ToolButton7: TToolButton
Top = 22
ExplicitTop = 22
end
inherited ToolButton8: TToolButton
Top = 22
ExplicitTop = 22
end
inherited ToolButton12: TToolButton
Left = 0
Top = 22
Wrap = True
@ -45,45 +53,48 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
ExplicitTop = 22
ExplicitHeight = 27
end
inherited ToolButton9: TToolButton [11]
inherited ToolButton9: TToolButton
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
inherited ToolButton10: TToolButton [12]
inherited ToolButton10: TToolButton
Left = 145
Top = 49
ExplicitLeft = 145
ExplicitTop = 49
end
inherited ToolButton6: TToolButton [13]
inherited ToolButton11: TToolButton
Left = 270
Top = 49
ExplicitLeft = 270
ExplicitTop = 49
end
inherited ToolButton7: TToolButton [14]
Left = 336
Top = 49
Wrap = True
ExplicitLeft = 336
ExplicitTop = 49
end
inherited ToolButton8: TToolButton [15]
Left = 0
Top = 71
ExplicitLeft = 0
ExplicitTop = 71
end
end
inherited cxGrid: TcxGrid
Top = 121
Height = 183
ExplicitHeight = 210
Top = 99
Height = 205
ExplicitTop = 99
ExplicitHeight = 205
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
Visible = True
end
end
end
inherited TBXDock1: TTBXDock
Top = 95
ExplicitTop = 68
Top = 73
ExplicitTop = 73
inherited TBXToolbar1: TTBXToolbar
object TBXItem18: TTBXItem [0]
Action = actAnadirArticulos
Caption = 'A'#241'adir art'#237'culos...'
DisplayMode = nbdmImageAndText
end
inherited TBXSubmenuItem1: TTBXSubmenuItem
Visible = False
end
end
end
end

1
Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas
View File

@ -24,6 +24,7 @@ type
end;
TfrViewDetallesFacturaCliente = class(TfrViewDetallesArticulosParaVenta, IViewDetallesFacturaCliente)
TBXItem18: TTBXItem;
protected
FFactura: IBizFacturaCliente;
function GetFactura: IBizFacturaCliente;

66
Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
View File

@ -1,6 +1,6 @@
inherited frViewFacturaCliente: TfrViewFacturaCliente
Width = 988
Height = 535
Width = 900
Height = 585
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 988
Height = 535
Width = 900
Height = 585
Align = alClient
ParentBackground = True
TabOrder = 0
@ -20,11 +20,11 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
ExplicitWidth = 451
ExplicitHeight = 304
DesignSize = (
988
535)
900
585)
object Label1: TLabel
Left = 535
Top = 193
Left = 543
Top = 225
Width = 311
Height = 26
Caption =
@ -84,7 +84,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
end
object memObservaciones: TcxDBMemo
Left = 22
Top = 285
Top = 317
Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource
@ -142,7 +142,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Width = 269
end
object bFormasPago: TButton
Left = 353
Left = 361
Top = 103
Width = 132
Height = 23
@ -173,8 +173,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Width = 165
end
object cbClienteFinal: TcxDBTextEdit
Left = 535
Top = 227
Left = 543
Top = 259
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'CLIENTE_FINAL'
DataBinding.DataSource = DADataSource
@ -201,18 +201,18 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Width = 339
end
object bElegirClienteFinal: TButton
Left = 932
Top = 225
Left = 844
Top = 257
Width = 23
Height = 25
Action = actElegirClienteFinal
TabOrder = 8
end
inline frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
Left = 524
Left = 532
Top = 30
Width = 505
Height = 138
Width = 346
Height = 170
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
@ -221,30 +221,42 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
ParentFont = False
TabOrder = 6
ReadOnly = False
ExplicitLeft = 524
ExplicitLeft = 532
ExplicitTop = 30
ExplicitWidth = 346
ExplicitHeight = 170
inherited dxLayoutControl1: TdxLayoutControl
Width = 346
Height = 170
ExplicitWidth = 101
ExplicitHeight = 138
inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 224
Width = 224
ExplicitWidth = 277
Width = 277
end
inherited edtNIFCIF: TcxDBTextEdit
Left = 329
Left = 233
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 329
ExplicitLeft = 233
end
inherited Button3: TBitBtn
Left = 240
ExplicitLeft = 240
Left = 144
Top = 135
ExplicitLeft = 144
ExplicitTop = 135
end
inherited edtDireccion: TcxTextEdit
inherited Button4: TButton
Left = 313
ExplicitLeft = 313
end
inherited edtDireccion: TcxMemo
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
@ -252,10 +264,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
ExplicitWidth = 121
Width = 121
end
inherited Button4: TButton
Left = 409
ExplicitLeft = 409
end
end
inherited ActionList1: TActionList
Left = 120

4
Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
View File

@ -167,14 +167,14 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
DataBinding.FieldName = 'IMPORTE_RETENCION'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Visible = False
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
VisibleForCustomization = False
end
object cxGridViewREFERENCIA_COMISION: TcxGridDBColumn
Caption = 'Liquidaci'#243'n'
DataBinding.FieldName = 'REFERENCIA_COMISION'
Visible = False
VisibleForCustomization = False
Width = 54
end
end

10
Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas
View File

@ -42,7 +42,7 @@ type
function GenerarAbono(AFactura: IBizFacturaProveedor): IBizFacturaProveedor;
procedure Preview(AFactura : IBizFacturaProveedor; AllItems: Boolean = false);
procedure Print(AFactura : IBizFacturaProveedor; AllItems: Boolean = false);
function Print(AFactura : IBizFacturaProveedor; AllItems: Boolean = false): Boolean;
procedure RecalcularImportes(FFactura: IBizFacturaProveedor);
function EsModificable(AFactura: IBizFacturaProveedor): Boolean;
@ -110,7 +110,7 @@ type
procedure RecuperarProveedor(AFactura : IBizFacturaProveedor);
procedure Preview(AFactura : IBizFacturaProveedor; AllItems: Boolean = false);
procedure Print(AFactura : IBizFacturaProveedor; AllItems: Boolean = false);
function Print(AFactura : IBizFacturaProveedor; AllItems: Boolean = false): Boolean;
procedure RecalcularImportes(FFactura: IBizFacturaProveedor);
function EsModificable(AFactura: IBizFacturaProveedor): Boolean;
@ -932,12 +932,14 @@ begin
end;
end;
procedure TFacturasProveedorController.Print(AFactura: IBizFacturaProveedor; AllItems: Boolean = false);
function TFacturasProveedorController.Print(AFactura: IBizFacturaProveedor; AllItems: Boolean = false): Boolean;
var
AReportController : IFacturasProveedorReportController;
ID_Facturas: TIntegerList;
begin
Result := False;
AReportController := TFacturasProveedorReportController.Create;
try
ID_Facturas := TIntegerList.Create;
@ -959,7 +961,7 @@ begin
else
ID_Facturas.Add(AFactura.ID);
AReportController.Print(ID_Facturas);
Result := AReportController.Print(ID_Facturas);
finally
AReportController := NIL;

13
Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorReportController.pas
View File

@ -11,7 +11,7 @@ type
IFacturasProveedorReportController = interface(IControllerBase)
['{551F82DC-B8DC-482E-A20D-15003E845078}']
procedure Preview(const AListaID : TIntegerList);
procedure Print(const AListaID : TIntegerList);
function Print(const AListaID : TIntegerList): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
end;
@ -24,7 +24,7 @@ type
destructor Destroy; override;
procedure Preview(const AListaID : TIntegerList);
procedure Print(const AListaID : TIntegerList);
function Print(const AListaID : TIntegerList): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
end;
@ -34,7 +34,7 @@ implementation
uses
uROTypes, uEditorRegistryUtils, uIEditorFacturasProveedorPreview,
uEditorPreview, uDataModuleFacturasProveedor, uEditorBase, cxControls,
uStringsUtils;
uStringsUtils, schFacturasProveedorClient_Intf;
{ TFacturasProveedorReportController }
@ -108,11 +108,12 @@ begin
end;
end;
procedure TFacturasProveedorReportController.Print(const AListaID : TIntegerList);
function TFacturasProveedorReportController.Print(const AListaID : TIntegerList): Boolean;
var
AStream: Binary;
AEditor : IEditorFacturasProveedorPreview;
begin
Result := False;
AEditor := NIL;
ShowHourglassCursor;
@ -123,7 +124,9 @@ begin
if Assigned(AEditor) then
try
AEditor.LoadFromStream(AStream);
AEditor.Print;
AEditor.TablaImpresion := nme_FacturasProveedor;
AEditor.IdTablaImpresion := AListaID.ToString;
Result := AEditor.Print;
finally
AEditor.Release;
end;

3
Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas
View File

@ -360,7 +360,8 @@ begin
//Preguntamos si desea que en las facturas se vea el Sello
// if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
if Assigned(AFacturas) then
FController.Print(AFacturas, AllItems);
if FController.Print(AFacturas, AllItems) then
RefrescarInterno;
end;
end;
end;

21
Source/Modulos/Inventario/Data/uDataModuleInventario.dfm
View File

@ -165,6 +165,15 @@ inherited DataModuleInventario: TDataModuleInventario
DataType = datString
Size = 255
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
end
item
Name = 'PRECIO_NETO'
DataType = datCurrency
end
item
Name = 'STOCK'
DataType = datFloat
@ -172,10 +181,8 @@ inherited DataModuleInventario: TDataModuleInventario
DictionaryEntry = 'INVENTARIO_STOCK'
end
item
Name = 'UNIDADES_ALMACEN'
DataType = datFloat
DisplayLabel = 'U. Almac'#233'n'
DictionaryEntry = 'INVENTARIO_UNIDADES_ALMACEN'
Name = 'COSTE_UNIDADES'
DataType = datCurrency
end
item
Name = 'RESERVA'
@ -194,6 +201,12 @@ inherited DataModuleInventario: TDataModuleInventario
DataType = datString
Size = 10
end
item
Name = 'UNIDADES_ALMACEN'
DataType = datFloat
DisplayLabel = 'U. Almac'#233'n'
DictionaryEntry = 'INVENTARIO_UNIDADES_ALMACEN'
end
item
Name = 'ID'
DataType = datInteger

177
Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
View File

@ -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_Inventario = '{B558C6EC-462B-47CD-A0A1-277535DCDCD3}';
RID_DetalleReservas = '{B0B5857C-72EA-4C1D-841A-91AA5270F172}';
RID_Inventario = '{D04FC2C5-D75A-471F-A38D-F2609EE8EDB5}';
RID_DetalleReservas = '{BFC29192-74A7-46CC-BB5D-75D9B57EB4DA}';
{ Data table names }
nme_Inventario = 'Inventario';
@ -25,11 +25,14 @@ const
fld_InventarioFAMILIA = 'FAMILIA';
fld_InventarioDESCRIPCION = 'DESCRIPCION';
fld_InventarioUNIDAD_MEDIDA = 'UNIDAD_MEDIDA';
fld_InventarioREFERENCIA_PROVEEDOR = 'REFERENCIA_PROVEEDOR';
fld_InventarioPRECIO_NETO = 'PRECIO_NETO';
fld_InventarioSTOCK = 'STOCK';
fld_InventarioUNIDADES_ALMACEN = 'UNIDADES_ALMACEN';
fld_InventarioCOSTE_UNIDADES = 'COSTE_UNIDADES';
fld_InventarioRESERVA = 'RESERVA';
fld_InventarioPENDIENTE_RECEPCION = 'PENDIENTE_RECEPCION';
fld_InventarioTIPO_ALMACEN = 'TIPO_ALMACEN';
fld_InventarioUNIDADES_ALMACEN = 'UNIDADES_ALMACEN';
fld_InventarioID = 'ID';
fld_InventarioCANTIDAD = 'CANTIDAD';
fld_InventarioFECHA_MOVIMIENTO = 'FECHA_MOVIMIENTO';
@ -46,17 +49,20 @@ const
idx_InventarioFAMILIA = 5;
idx_InventarioDESCRIPCION = 6;
idx_InventarioUNIDAD_MEDIDA = 7;
idx_InventarioSTOCK = 8;
idx_InventarioUNIDADES_ALMACEN = 9;
idx_InventarioRESERVA = 10;
idx_InventarioPENDIENTE_RECEPCION = 11;
idx_InventarioTIPO_ALMACEN = 12;
idx_InventarioID = 13;
idx_InventarioCANTIDAD = 14;
idx_InventarioFECHA_MOVIMIENTO = 15;
idx_InventarioCAUSA = 16;
idx_InventarioTIPO = 17;
idx_InventarioID_ALMACEN_RESERVA = 18;
idx_InventarioREFERENCIA_PROVEEDOR = 8;
idx_InventarioPRECIO_NETO = 9;
idx_InventarioSTOCK = 10;
idx_InventarioCOSTE_UNIDADES = 11;
idx_InventarioRESERVA = 12;
idx_InventarioPENDIENTE_RECEPCION = 13;
idx_InventarioTIPO_ALMACEN = 14;
idx_InventarioUNIDADES_ALMACEN = 15;
idx_InventarioID = 16;
idx_InventarioCANTIDAD = 17;
idx_InventarioFECHA_MOVIMIENTO = 18;
idx_InventarioCAUSA = 19;
idx_InventarioTIPO = 20;
idx_InventarioID_ALMACEN_RESERVA = 21;
{ DetalleReservas fields }
fld_DetalleReservasID = 'ID';
@ -99,7 +105,7 @@ const
type
{ IInventario }
IInventario = interface(IDAStronglyTypedDataTable)
['{BE22C3F8-FA99-475E-8C10-4F08590A9331}']
['{5FE325FA-C485-4522-8F90-B6B037D1764A}']
{ Property getters and setters }
function GetID_ALMACENValue: Integer;
procedure SetID_ALMACENValue(const aValue: Integer);
@ -133,14 +139,22 @@ type
procedure SetUNIDAD_MEDIDAValue(const aValue: String);
function GetUNIDAD_MEDIDAIsNull: Boolean;
procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
function GetREFERENCIA_PROVEEDORValue: String;
procedure SetREFERENCIA_PROVEEDORValue(const aValue: String);
function GetREFERENCIA_PROVEEDORIsNull: Boolean;
procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean);
function GetPRECIO_NETOValue: Currency;
procedure SetPRECIO_NETOValue(const aValue: Currency);
function GetPRECIO_NETOIsNull: Boolean;
procedure SetPRECIO_NETOIsNull(const aValue: Boolean);
function GetSTOCKValue: Float;
procedure SetSTOCKValue(const aValue: Float);
function GetSTOCKIsNull: Boolean;
procedure SetSTOCKIsNull(const aValue: Boolean);
function GetUNIDADES_ALMACENValue: Float;
procedure SetUNIDADES_ALMACENValue(const aValue: Float);
function GetUNIDADES_ALMACENIsNull: Boolean;
procedure SetUNIDADES_ALMACENIsNull(const aValue: Boolean);
function GetCOSTE_UNIDADESValue: Currency;
procedure SetCOSTE_UNIDADESValue(const aValue: Currency);
function GetCOSTE_UNIDADESIsNull: Boolean;
procedure SetCOSTE_UNIDADESIsNull(const aValue: Boolean);
function GetRESERVAValue: Float;
procedure SetRESERVAValue(const aValue: Float);
function GetRESERVAIsNull: Boolean;
@ -153,6 +167,10 @@ type
procedure SetTIPO_ALMACENValue(const aValue: String);
function GetTIPO_ALMACENIsNull: Boolean;
procedure SetTIPO_ALMACENIsNull(const aValue: Boolean);
function GetUNIDADES_ALMACENValue: Float;
procedure SetUNIDADES_ALMACENValue(const aValue: Float);
function GetUNIDADES_ALMACENIsNull: Boolean;
procedure SetUNIDADES_ALMACENIsNull(const aValue: Boolean);
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
function GetIDIsNull: Boolean;
@ -196,16 +214,22 @@ type
property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
property REFERENCIA_PROVEEDOR: String read GetREFERENCIA_PROVEEDORValue write SetREFERENCIA_PROVEEDORValue;
property REFERENCIA_PROVEEDORIsNull: Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
property PRECIO_NETO: Currency read GetPRECIO_NETOValue write SetPRECIO_NETOValue;
property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
property STOCK: Float read GetSTOCKValue write SetSTOCKValue;
property STOCKIsNull: Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull: Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property COSTE_UNIDADES: Currency read GetCOSTE_UNIDADESValue write SetCOSTE_UNIDADESValue;
property COSTE_UNIDADESIsNull: Boolean read GetCOSTE_UNIDADESIsNull write SetCOSTE_UNIDADESIsNull;
property RESERVA: Float read GetRESERVAValue write SetRESERVAValue;
property RESERVAIsNull: Boolean read GetRESERVAIsNull write SetRESERVAIsNull;
property PENDIENTE_RECEPCION: Float read GetPENDIENTE_RECEPCIONValue write SetPENDIENTE_RECEPCIONValue;
property PENDIENTE_RECEPCIONIsNull: Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull;
property TIPO_ALMACEN: String read GetTIPO_ALMACENValue write SetTIPO_ALMACENValue;
property TIPO_ALMACENIsNull: Boolean read GetTIPO_ALMACENIsNull write SetTIPO_ALMACENIsNull;
property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull: Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property ID: Integer read GetIDValue write SetIDValue;
property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
property CANTIDAD: Float read GetCANTIDADValue write SetCANTIDADValue;
@ -257,14 +281,22 @@ type
procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
function GetREFERENCIA_PROVEEDORValue: String; virtual;
procedure SetREFERENCIA_PROVEEDORValue(const aValue: String); virtual;
function GetREFERENCIA_PROVEEDORIsNull: Boolean; virtual;
procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean); virtual;
function GetPRECIO_NETOValue: Currency; virtual;
procedure SetPRECIO_NETOValue(const aValue: Currency); virtual;
function GetPRECIO_NETOIsNull: Boolean; virtual;
procedure SetPRECIO_NETOIsNull(const aValue: Boolean); virtual;
function GetSTOCKValue: Float; virtual;
procedure SetSTOCKValue(const aValue: Float); virtual;
function GetSTOCKIsNull: Boolean; virtual;
procedure SetSTOCKIsNull(const aValue: Boolean); virtual;
function GetUNIDADES_ALMACENValue: Float; virtual;
procedure SetUNIDADES_ALMACENValue(const aValue: Float); virtual;
function GetUNIDADES_ALMACENIsNull: Boolean; virtual;
procedure SetUNIDADES_ALMACENIsNull(const aValue: Boolean); virtual;
function GetCOSTE_UNIDADESValue: Currency; virtual;
procedure SetCOSTE_UNIDADESValue(const aValue: Currency); virtual;
function GetCOSTE_UNIDADESIsNull: Boolean; virtual;
procedure SetCOSTE_UNIDADESIsNull(const aValue: Boolean); virtual;
function GetRESERVAValue: Float; virtual;
procedure SetRESERVAValue(const aValue: Float); virtual;
function GetRESERVAIsNull: Boolean; virtual;
@ -277,6 +309,10 @@ type
procedure SetTIPO_ALMACENValue(const aValue: String); virtual;
function GetTIPO_ALMACENIsNull: Boolean; virtual;
procedure SetTIPO_ALMACENIsNull(const aValue: Boolean); virtual;
function GetUNIDADES_ALMACENValue: Float; virtual;
procedure SetUNIDADES_ALMACENValue(const aValue: Float); virtual;
function GetUNIDADES_ALMACENIsNull: Boolean; virtual;
procedure SetUNIDADES_ALMACENIsNull(const aValue: Boolean); virtual;
function GetIDValue: Integer; virtual;
procedure SetIDValue(const aValue: Integer); virtual;
function GetIDIsNull: Boolean; virtual;
@ -319,16 +355,22 @@ type
property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
property REFERENCIA_PROVEEDOR: String read GetREFERENCIA_PROVEEDORValue write SetREFERENCIA_PROVEEDORValue;
property REFERENCIA_PROVEEDORIsNull: Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
property PRECIO_NETO: Currency read GetPRECIO_NETOValue write SetPRECIO_NETOValue;
property PRECIO_NETOIsNull: Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
property STOCK: Float read GetSTOCKValue write SetSTOCKValue;
property STOCKIsNull: Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull: Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property COSTE_UNIDADES: Currency read GetCOSTE_UNIDADESValue write SetCOSTE_UNIDADESValue;
property COSTE_UNIDADESIsNull: Boolean read GetCOSTE_UNIDADESIsNull write SetCOSTE_UNIDADESIsNull;
property RESERVA: Float read GetRESERVAValue write SetRESERVAValue;
property RESERVAIsNull: Boolean read GetRESERVAIsNull write SetRESERVAIsNull;
property PENDIENTE_RECEPCION: Float read GetPENDIENTE_RECEPCIONValue write SetPENDIENTE_RECEPCIONValue;
property PENDIENTE_RECEPCIONIsNull: Boolean read GetPENDIENTE_RECEPCIONIsNull write SetPENDIENTE_RECEPCIONIsNull;
property TIPO_ALMACEN: String read GetTIPO_ALMACENValue write SetTIPO_ALMACENValue;
property TIPO_ALMACENIsNull: Boolean read GetTIPO_ALMACENIsNull write SetTIPO_ALMACENIsNull;
property UNIDADES_ALMACEN: Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull: Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property ID: Integer read GetIDValue write SetIDValue;
property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
property CANTIDAD: Float read GetCANTIDADValue write SetCANTIDADValue;
@ -350,7 +392,7 @@ type
{ IDetalleReservas }
IDetalleReservas = interface(IDAStronglyTypedDataTable)
['{8A4D1E34-9AFD-4798-9D59-1649308DD4AB}']
['{7FE92649-C32F-47EB-9D9F-0CD43FECC0A1}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -758,6 +800,48 @@ begin
DataTable.Fields[idx_InventarioUNIDAD_MEDIDA].AsVariant := Null;
end;
function TInventarioDataTableRules.GetREFERENCIA_PROVEEDORValue: String;
begin
result := DataTable.Fields[idx_InventarioREFERENCIA_PROVEEDOR].AsString;
end;
procedure TInventarioDataTableRules.SetREFERENCIA_PROVEEDORValue(const aValue: String);
begin
DataTable.Fields[idx_InventarioREFERENCIA_PROVEEDOR].AsString := aValue;
end;
function TInventarioDataTableRules.GetREFERENCIA_PROVEEDORIsNull: boolean;
begin
result := DataTable.Fields[idx_InventarioREFERENCIA_PROVEEDOR].IsNull;
end;
procedure TInventarioDataTableRules.SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_InventarioREFERENCIA_PROVEEDOR].AsVariant := Null;
end;
function TInventarioDataTableRules.GetPRECIO_NETOValue: Currency;
begin
result := DataTable.Fields[idx_InventarioPRECIO_NETO].AsCurrency;
end;
procedure TInventarioDataTableRules.SetPRECIO_NETOValue(const aValue: Currency);
begin
DataTable.Fields[idx_InventarioPRECIO_NETO].AsCurrency := aValue;
end;
function TInventarioDataTableRules.GetPRECIO_NETOIsNull: boolean;
begin
result := DataTable.Fields[idx_InventarioPRECIO_NETO].IsNull;
end;
procedure TInventarioDataTableRules.SetPRECIO_NETOIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_InventarioPRECIO_NETO].AsVariant := Null;
end;
function TInventarioDataTableRules.GetSTOCKValue: Float;
begin
result := DataTable.Fields[idx_InventarioSTOCK].AsFloat;
@ -779,25 +863,25 @@ begin
DataTable.Fields[idx_InventarioSTOCK].AsVariant := Null;
end;
function TInventarioDataTableRules.GetUNIDADES_ALMACENValue: Float;
function TInventarioDataTableRules.GetCOSTE_UNIDADESValue: Currency;
begin
result := DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].AsFloat;
result := DataTable.Fields[idx_InventarioCOSTE_UNIDADES].AsCurrency;
end;
procedure TInventarioDataTableRules.SetUNIDADES_ALMACENValue(const aValue: Float);
procedure TInventarioDataTableRules.SetCOSTE_UNIDADESValue(const aValue: Currency);
begin
DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].AsFloat := aValue;
DataTable.Fields[idx_InventarioCOSTE_UNIDADES].AsCurrency := aValue;
end;
function TInventarioDataTableRules.GetUNIDADES_ALMACENIsNull: boolean;
function TInventarioDataTableRules.GetCOSTE_UNIDADESIsNull: boolean;
begin
result := DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].IsNull;
result := DataTable.Fields[idx_InventarioCOSTE_UNIDADES].IsNull;
end;
procedure TInventarioDataTableRules.SetUNIDADES_ALMACENIsNull(const aValue: Boolean);
procedure TInventarioDataTableRules.SetCOSTE_UNIDADESIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].AsVariant := Null;
DataTable.Fields[idx_InventarioCOSTE_UNIDADES].AsVariant := Null;
end;
function TInventarioDataTableRules.GetRESERVAValue: Float;
@ -863,6 +947,27 @@ begin
DataTable.Fields[idx_InventarioTIPO_ALMACEN].AsVariant := Null;
end;
function TInventarioDataTableRules.GetUNIDADES_ALMACENValue: Float;
begin
result := DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].AsFloat;
end;
procedure TInventarioDataTableRules.SetUNIDADES_ALMACENValue(const aValue: Float);
begin
DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].AsFloat := aValue;
end;
function TInventarioDataTableRules.GetUNIDADES_ALMACENIsNull: boolean;
begin
result := DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].IsNull;
end;
procedure TInventarioDataTableRules.SetUNIDADES_ALMACENIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_InventarioUNIDADES_ALMACEN].AsVariant := Null;
end;
function TInventarioDataTableRules.GetIDValue: Integer;
begin
result := DataTable.Fields[idx_InventarioID].AsInteger;

185
Source/Modulos/Inventario/Model/schInventarioServer_Intf.pas
View File

@ -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_InventarioDelta = '{D5FDE8E5-7FF7-4ABB-AE86-0650D9D28956}';
RID_DetalleReservasDelta = '{3087502E-1C78-45AA-9164-988726607EE9}';
RID_InventarioDelta = '{96541F59-4DFF-438C-A049-462AB7552CF7}';
RID_DetalleReservasDelta = '{1693AAD2-69C6-48CE-AB23-D215F4164451}';
type
{ IInventarioDelta }
IInventarioDelta = interface(IInventario)
['{D5FDE8E5-7FF7-4ABB-AE86-0650D9D28956}']
['{96541F59-4DFF-438C-A049-462AB7552CF7}']
{ Property getters and setters }
function GetOldID_ALMACENValue : Integer;
function GetOldID_ARTICULOValue : Integer;
@ -25,11 +25,14 @@ type
function GetOldFAMILIAValue : String;
function GetOldDESCRIPCIONValue : String;
function GetOldUNIDAD_MEDIDAValue : String;
function GetOldREFERENCIA_PROVEEDORValue : String;
function GetOldPRECIO_NETOValue : Currency;
function GetOldSTOCKValue : Float;
function GetOldUNIDADES_ALMACENValue : Float;
function GetOldCOSTE_UNIDADESValue : Currency;
function GetOldRESERVAValue : Float;
function GetOldPENDIENTE_RECEPCIONValue : Float;
function GetOldTIPO_ALMACENValue : String;
function GetOldUNIDADES_ALMACENValue : Float;
function GetOldIDValue : Integer;
function GetOldCANTIDADValue : Float;
function GetOldFECHA_MOVIMIENTOValue : DateTime;
@ -46,11 +49,14 @@ type
property OldFAMILIA : String read GetOldFAMILIAValue;
property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
property OldREFERENCIA_PROVEEDOR : String read GetOldREFERENCIA_PROVEEDORValue;
property OldPRECIO_NETO : Currency read GetOldPRECIO_NETOValue;
property OldSTOCK : Float read GetOldSTOCKValue;
property OldUNIDADES_ALMACEN : Float read GetOldUNIDADES_ALMACENValue;
property OldCOSTE_UNIDADES : Currency read GetOldCOSTE_UNIDADESValue;
property OldRESERVA : Float read GetOldRESERVAValue;
property OldPENDIENTE_RECEPCION : Float read GetOldPENDIENTE_RECEPCIONValue;
property OldTIPO_ALMACEN : String read GetOldTIPO_ALMACENValue;
property OldUNIDADES_ALMACEN : Float read GetOldUNIDADES_ALMACENValue;
property OldID : Integer read GetOldIDValue;
property OldCANTIDAD : Float read GetOldCANTIDADValue;
property OldFECHA_MOVIMIENTO : DateTime read GetOldFECHA_MOVIMIENTOValue;
@ -112,18 +118,30 @@ type
function GetOldUNIDAD_MEDIDAIsNull: Boolean; virtual;
procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
function GetREFERENCIA_PROVEEDORValue: String; virtual;
function GetREFERENCIA_PROVEEDORIsNull: Boolean; virtual;
function GetOldREFERENCIA_PROVEEDORValue: String; virtual;
function GetOldREFERENCIA_PROVEEDORIsNull: Boolean; virtual;
procedure SetREFERENCIA_PROVEEDORValue(const aValue: String); virtual;
procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean); virtual;
function GetPRECIO_NETOValue: Currency; virtual;
function GetPRECIO_NETOIsNull: Boolean; virtual;
function GetOldPRECIO_NETOValue: Currency; virtual;
function GetOldPRECIO_NETOIsNull: Boolean; virtual;
procedure SetPRECIO_NETOValue(const aValue: Currency); virtual;
procedure SetPRECIO_NETOIsNull(const aValue: Boolean); virtual;
function GetSTOCKValue: Float; virtual;
function GetSTOCKIsNull: Boolean; virtual;
function GetOldSTOCKValue: Float; virtual;
function GetOldSTOCKIsNull: Boolean; virtual;
procedure SetSTOCKValue(const aValue: Float); virtual;
procedure SetSTOCKIsNull(const aValue: Boolean); virtual;
function GetUNIDADES_ALMACENValue: Float; virtual;
function GetUNIDADES_ALMACENIsNull: Boolean; virtual;
function GetOldUNIDADES_ALMACENValue: Float; virtual;
function GetOldUNIDADES_ALMACENIsNull: Boolean; virtual;
procedure SetUNIDADES_ALMACENValue(const aValue: Float); virtual;
procedure SetUNIDADES_ALMACENIsNull(const aValue: Boolean); virtual;
function GetCOSTE_UNIDADESValue: Currency; virtual;
function GetCOSTE_UNIDADESIsNull: Boolean; virtual;
function GetOldCOSTE_UNIDADESValue: Currency; virtual;
function GetOldCOSTE_UNIDADESIsNull: Boolean; virtual;
procedure SetCOSTE_UNIDADESValue(const aValue: Currency); virtual;
procedure SetCOSTE_UNIDADESIsNull(const aValue: Boolean); virtual;
function GetRESERVAValue: Float; virtual;
function GetRESERVAIsNull: Boolean; virtual;
function GetOldRESERVAValue: Float; virtual;
@ -142,6 +160,12 @@ type
function GetOldTIPO_ALMACENIsNull: Boolean; virtual;
procedure SetTIPO_ALMACENValue(const aValue: String); virtual;
procedure SetTIPO_ALMACENIsNull(const aValue: Boolean); virtual;
function GetUNIDADES_ALMACENValue: Float; virtual;
function GetUNIDADES_ALMACENIsNull: Boolean; virtual;
function GetOldUNIDADES_ALMACENValue: Float; virtual;
function GetOldUNIDADES_ALMACENIsNull: Boolean; virtual;
procedure SetUNIDADES_ALMACENValue(const aValue: Float); virtual;
procedure SetUNIDADES_ALMACENIsNull(const aValue: Boolean); virtual;
function GetIDValue: Integer; virtual;
function GetIDIsNull: Boolean; virtual;
function GetOldIDValue: Integer; virtual;
@ -212,14 +236,22 @@ type
property UNIDAD_MEDIDAIsNull : Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
property OldUNIDAD_MEDIDAIsNull : Boolean read GetOldUNIDAD_MEDIDAIsNull;
property REFERENCIA_PROVEEDOR : String read GetREFERENCIA_PROVEEDORValue write SetREFERENCIA_PROVEEDORValue;
property REFERENCIA_PROVEEDORIsNull : Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
property OldREFERENCIA_PROVEEDOR : String read GetOldREFERENCIA_PROVEEDORValue;
property OldREFERENCIA_PROVEEDORIsNull : Boolean read GetOldREFERENCIA_PROVEEDORIsNull;
property PRECIO_NETO : Currency read GetPRECIO_NETOValue write SetPRECIO_NETOValue;
property PRECIO_NETOIsNull : Boolean read GetPRECIO_NETOIsNull write SetPRECIO_NETOIsNull;
property OldPRECIO_NETO : Currency read GetOldPRECIO_NETOValue;
property OldPRECIO_NETOIsNull : Boolean read GetOldPRECIO_NETOIsNull;
property STOCK : Float read GetSTOCKValue write SetSTOCKValue;
property STOCKIsNull : Boolean read GetSTOCKIsNull write SetSTOCKIsNull;
property OldSTOCK : Float read GetOldSTOCKValue;
property OldSTOCKIsNull : Boolean read GetOldSTOCKIsNull;
property UNIDADES_ALMACEN : Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull : Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property OldUNIDADES_ALMACEN : Float read GetOldUNIDADES_ALMACENValue;
property OldUNIDADES_ALMACENIsNull : Boolean read GetOldUNIDADES_ALMACENIsNull;
property COSTE_UNIDADES : Currency read GetCOSTE_UNIDADESValue write SetCOSTE_UNIDADESValue;
property COSTE_UNIDADESIsNull : Boolean read GetCOSTE_UNIDADESIsNull write SetCOSTE_UNIDADESIsNull;
property OldCOSTE_UNIDADES : Currency read GetOldCOSTE_UNIDADESValue;
property OldCOSTE_UNIDADESIsNull : Boolean read GetOldCOSTE_UNIDADESIsNull;
property RESERVA : Float read GetRESERVAValue write SetRESERVAValue;
property RESERVAIsNull : Boolean read GetRESERVAIsNull write SetRESERVAIsNull;
property OldRESERVA : Float read GetOldRESERVAValue;
@ -232,6 +264,10 @@ type
property TIPO_ALMACENIsNull : Boolean read GetTIPO_ALMACENIsNull write SetTIPO_ALMACENIsNull;
property OldTIPO_ALMACEN : String read GetOldTIPO_ALMACENValue;
property OldTIPO_ALMACENIsNull : Boolean read GetOldTIPO_ALMACENIsNull;
property UNIDADES_ALMACEN : Float read GetUNIDADES_ALMACENValue write SetUNIDADES_ALMACENValue;
property UNIDADES_ALMACENIsNull : Boolean read GetUNIDADES_ALMACENIsNull write SetUNIDADES_ALMACENIsNull;
property OldUNIDADES_ALMACEN : Float read GetOldUNIDADES_ALMACENValue;
property OldUNIDADES_ALMACENIsNull : Boolean read GetOldUNIDADES_ALMACENIsNull;
property ID : Integer read GetIDValue write SetIDValue;
property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull;
property OldID : Integer read GetOldIDValue;
@ -265,7 +301,7 @@ type
{ IDetalleReservasDelta }
IDetalleReservasDelta = interface(IDetalleReservas)
['{3087502E-1C78-45AA-9164-988726607EE9}']
['{1693AAD2-69C6-48CE-AB23-D215F4164451}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -753,6 +789,68 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDAD_MEDIDA] := Null;
end;
function TInventarioBusinessProcessorRules.GetREFERENCIA_PROVEEDORValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioREFERENCIA_PROVEEDOR];
end;
function TInventarioBusinessProcessorRules.GetREFERENCIA_PROVEEDORIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioREFERENCIA_PROVEEDOR]);
end;
function TInventarioBusinessProcessorRules.GetOldREFERENCIA_PROVEEDORValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioREFERENCIA_PROVEEDOR];
end;
function TInventarioBusinessProcessorRules.GetOldREFERENCIA_PROVEEDORIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioREFERENCIA_PROVEEDOR]);
end;
procedure TInventarioBusinessProcessorRules.SetREFERENCIA_PROVEEDORValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioREFERENCIA_PROVEEDOR] := aValue;
end;
procedure TInventarioBusinessProcessorRules.SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioREFERENCIA_PROVEEDOR] := Null;
end;
function TInventarioBusinessProcessorRules.GetPRECIO_NETOValue: Currency;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPRECIO_NETO];
end;
function TInventarioBusinessProcessorRules.GetPRECIO_NETOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPRECIO_NETO]);
end;
function TInventarioBusinessProcessorRules.GetOldPRECIO_NETOValue: Currency;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioPRECIO_NETO];
end;
function TInventarioBusinessProcessorRules.GetOldPRECIO_NETOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioPRECIO_NETO]);
end;
procedure TInventarioBusinessProcessorRules.SetPRECIO_NETOValue(const aValue: Currency);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPRECIO_NETO] := aValue;
end;
procedure TInventarioBusinessProcessorRules.SetPRECIO_NETOIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioPRECIO_NETO] := Null;
end;
function TInventarioBusinessProcessorRules.GetSTOCKValue: Float;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioSTOCK];
@ -784,35 +882,35 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioSTOCK] := Null;
end;
function TInventarioBusinessProcessorRules.GetUNIDADES_ALMACENValue: Float;
function TInventarioBusinessProcessorRules.GetCOSTE_UNIDADESValue: Currency;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN];
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_UNIDADES];
end;
function TInventarioBusinessProcessorRules.GetUNIDADES_ALMACENIsNull: Boolean;
function TInventarioBusinessProcessorRules.GetCOSTE_UNIDADESIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN]);
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_UNIDADES]);
end;
function TInventarioBusinessProcessorRules.GetOldUNIDADES_ALMACENValue: Float;
function TInventarioBusinessProcessorRules.GetOldCOSTE_UNIDADESValue: Currency;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDADES_ALMACEN];
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCOSTE_UNIDADES];
end;
function TInventarioBusinessProcessorRules.GetOldUNIDADES_ALMACENIsNull: Boolean;
function TInventarioBusinessProcessorRules.GetOldCOSTE_UNIDADESIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDADES_ALMACEN]);
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioCOSTE_UNIDADES]);
end;
procedure TInventarioBusinessProcessorRules.SetUNIDADES_ALMACENValue(const aValue: Float);
procedure TInventarioBusinessProcessorRules.SetCOSTE_UNIDADESValue(const aValue: Currency);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN] := aValue;
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_UNIDADES] := aValue;
end;
procedure TInventarioBusinessProcessorRules.SetUNIDADES_ALMACENIsNull(const aValue: Boolean);
procedure TInventarioBusinessProcessorRules.SetCOSTE_UNIDADESIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN] := Null;
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioCOSTE_UNIDADES] := Null;
end;
function TInventarioBusinessProcessorRules.GetRESERVAValue: Float;
@ -908,6 +1006,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioTIPO_ALMACEN] := Null;
end;
function TInventarioBusinessProcessorRules.GetUNIDADES_ALMACENValue: Float;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN];
end;
function TInventarioBusinessProcessorRules.GetUNIDADES_ALMACENIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN]);
end;
function TInventarioBusinessProcessorRules.GetOldUNIDADES_ALMACENValue: Float;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDADES_ALMACEN];
end;
function TInventarioBusinessProcessorRules.GetOldUNIDADES_ALMACENIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_InventarioUNIDADES_ALMACEN]);
end;
procedure TInventarioBusinessProcessorRules.SetUNIDADES_ALMACENValue(const aValue: Float);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN] := aValue;
end;
procedure TInventarioBusinessProcessorRules.SetUNIDADES_ALMACENIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioUNIDADES_ALMACEN] := Null;
end;
function TInventarioBusinessProcessorRules.GetIDValue: Integer;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_InventarioID];

55
Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
View File

@ -19,18 +19,17 @@ object srvInventario: TsrvInventario
TargetTable = 'V_INVENTARIO'
SQL =
'SELECT'#10' ID_ALMACEN, ID_ARTICULO, NOMBRE as ALMACEN, ID_EMPRES' +
'A, REFERENCIA, FAMILIA,'#10' DESCRIPCION, UNIDAD_MEDIDA,'#10'/* RE' +
'FERENCIA_PROV as REFERENCIA_PROVEEDOR, PRECIO_NETO, COSTE_UNIDAD' +
'ES, SE ELIMINAN LOS PRECIOS CON HASTA SABER QUE DECISIONES SE T' +
'OMAN*/'#10' STOCK, UNIDADES_ALMACEN, RESERVA, PENDIENTE_RECEPCION' +
', TIPO_ALMACEN,'#10' '#10' /*'#10' NO BORRAR YA QUE SIRVE PARA LAS ' +
'ENTRADAS Y SALIDAS DE ALMACEN(TABLA MOVIMIENTOS)'#10' DEBERIA GEN' +
'ERAR UNA TABLA DE MOVIMIENTOS INDEPENDIENTE DEL INVENTARIO PERO ' +
'POR FALTA'#10' DE TIEMPO Y FIABILIDAD YA QUE AHORA FUNCIONA TODO,' +
' CREAMOS ESTOS CAMPOS FICTICIOS'#10' */'#10#10' 0 as ID, 0 as CANTID' +
'AD, current_date as FECHA_MOVIMIENTO, NULL as CAUSA, NULL as TIP' +
'O,'#10' 0 as ID_ALMACEN_RESERVA'#10#10#10'FROM V_INVENTARIO'#10'where {where}' +
#10'ORDER BY ID_ARTICULO'#10
'A, REFERENCIA, FAMILIA,'#10' DESCRIPCION, UNIDAD_MEDIDA,'#10' REFE' +
'RENCIA_PROV as REFERENCIA_PROVEEDOR, PRECIO_NETO, STOCK, COSTE_U' +
'NIDADES, RESERVA, PENDIENTE_RECEPCION, TIPO_ALMACEN,'#10' UNIDADE' +
'S_ALMACEN,'#10' '#10' /*'#10' NO BORRAR YA QUE SIRVE PARA LAS ENTRA' +
'DAS Y SALIDAS DE ALMACEN(TABLA MOVIMIENTOS)'#10' DEBERIA GENERAR ' +
'UNA TABLA DE MOVIMIENTOS INDEPENDIENTE DEL INVENTARIO PERO POR F' +
'ALTA'#10' DE TIEMPO Y FIABILIDAD YA QUE AHORA FUNCIONA TODO, CREA' +
'MOS ESTOS CAMPOS FICTICIOS'#10' */'#10#10' 0 as ID, 0 as CANTIDAD, c' +
'urrent_date as FECHA_MOVIMIENTO, NULL as CAUSA, NULL as TIPO,'#10' ' +
' 0 as ID_ALMACEN_RESERVA'#10#10#10'FROM V_INVENTARIO'#10'where {where}'#10'ORDE' +
'R BY ID_ARTICULO'#10#10#10#10#10
StatementType = stSQL
ColumnMappings = <
item
@ -115,6 +114,19 @@ object srvInventario: TsrvInventario
DatasetField = 'ID_ALMACEN_RESERVA'
TableField = '<unknown>'
SQLOrigin = 'ID_ALMACEN_RESERVA'
end
item
DatasetField = 'REFERENCIA_PROVEEDOR'
TableField = '<unknown>'
SQLOrigin = 'REFERENCIA_PROVEEDOR'
end
item
DatasetField = 'PRECIO_NETO'
TableField = 'PRECIO_NETO'
end
item
DatasetField = 'COSTE_UNIDADES'
TableField = 'COSTE_UNIDADES'
end>
end>
Name = 'Inventario'
@ -163,15 +175,23 @@ object srvInventario: TsrvInventario
DataType = datString
Size = 255
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
end
item
Name = 'PRECIO_NETO'
DataType = datCurrency
end
item
Name = 'STOCK'
DataType = datFloat
DictionaryEntry = 'INVENTARIO_STOCK'
end
item
Name = 'UNIDADES_ALMACEN'
DataType = datFloat
DictionaryEntry = 'INVENTARIO_UNIDADES_ALMACEN'
Name = 'COSTE_UNIDADES'
DataType = datCurrency
end
item
Name = 'RESERVA'
@ -188,6 +208,11 @@ object srvInventario: TsrvInventario
DataType = datString
Size = 10
end
item
Name = 'UNIDADES_ALMACEN'
DataType = datFloat
DictionaryEntry = 'INVENTARIO_UNIDADES_ALMACEN'
end
item
Name = 'ID'
DataType = datInteger

18
Source/Modulos/Inventario/Views/uViewInventario.dfm
View File

@ -120,19 +120,21 @@ inherited frViewInventario: TfrViewInventario
Width = 50
end
object cxGridViewPRECIO_NETO: TcxGridDBColumn
Caption = 'Precio unidad'
DataBinding.FieldName = 'PRECIO_NETO'
PropertiesClassName = 'TcxCurrencyEditProperties'
Visible = False
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify
GroupSummaryAlignment = taRightJustify
HeaderAlignmentHorz = taRightJustify
VisibleForCustomization = False
end
object cxGridViewCOSTE_UNIDADES: TcxGridDBColumn
Caption = 'Coste unidades'
DataBinding.FieldName = 'COSTE_UNIDADES'
PropertiesClassName = 'TcxCurrencyEditProperties'
Visible = False
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
VisibleForCustomization = False
end
object cxGridViewRESERVA: TcxGridDBColumn
DataBinding.FieldName = 'RESERVA'
@ -182,8 +184,6 @@ inherited frViewInventario: TfrViewInventario
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 510
Width = 510
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
@ -192,18 +192,20 @@ inherited frViewInventario: TfrViewInventario
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 300
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 300
end
inherited eLista: TcxComboBox
Left = 507
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 215
Width = 215
ExplicitLeft = 507
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel

16
Source/Modulos/Inventario/Views/uViewInventario.pas
View File

@ -15,7 +15,7 @@ uses
cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid,
uBizInventario, cxSpinEdit, uViewFiltroBase, TB2Item, TBX,
TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit, uDAInterfaces,
cxContainer, cxMaskEdit, cxDropDownEdit;
cxContainer, cxMaskEdit, cxDropDownEdit, uCustomView, uViewBase;
// uBizAlmacenes, uBizObras;
type
@ -89,7 +89,8 @@ type
implementation
{$R *.dfm}
uses uDataModuleInventario, schInventarioClient_Intf, uReferenciasUtils, cxVariants;
uses uDataModuleInventario, schInventarioClient_Intf, uReferenciasUtils, cxVariants,
uFactuGES_App;
procedure TfrViewInventario.AnadirFiltroAlmacenesObras;
var
@ -123,10 +124,19 @@ begin
end;
procedure TfrViewInventario.CustomViewShow(Sender: TObject);
var
i, Aindex: integer;
begin
inherited;
if Assigned(FAlmacenes) or Assigned(FObras) then
cxListaAlmacenesObras.ItemIndex := 0
begin
for i := 0 to FAlmacenes.Count - 1 do
begin
if (FAlmacenes.ValueFromIndex[i] = IntToStr(AppFactuGES.EmpresaActiva.ID_ALMACEN)) then
Aindex := i;
end;
cxListaAlmacenesObras.ItemIndex := Aindex;
end
//En el caso de ser la vista para la selección de articulos de un determinado almacén
else
pnlAlmacenes.Visible:= False;

15
Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
View File

@ -40,8 +40,8 @@ type
procedure Preview(APedido : IBizPedidoProveedor; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(APedido : IBizPedidoProveedor; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(APedido : IBizPedidoProveedor; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
procedure RecalcularImportes(APedido: IBizPedidoProveedor);
function EsModificable(APedido : IBizPedidoProveedor): Boolean;
@ -116,8 +116,8 @@ type
procedure Preview(APedido : IBizPedidoProveedor; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(APedido : IBizPedidoProveedor; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(APedido : IBizPedidoProveedor; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
procedure RecalcularImportes(APedido: IBizPedidoProveedor);
function EsModificable(APedido : IBizPedidoProveedor): Boolean;
@ -931,12 +931,13 @@ begin
end;
end;
procedure TPedidosProveedorController.Print(APedido: IBizPedidoProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function TPedidosProveedorController.Print(APedido: IBizPedidoProveedor; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
var
AReportController : IPedidosProveedorReportController;
ID_Pedidos: TIntegerList;
begin
REsult := False;
AReportController := TPedidosProveedorReportController.Create;
ID_Pedidos := TIntegerList.Create;
@ -958,7 +959,7 @@ begin
else
ID_Pedidos.Add(APedido.ID);
AReportController.Print(ID_Pedidos, VerPrecios, VerRefProveedor);
Result := AReportController.Print(ID_Pedidos, VerPrecios, VerRefProveedor);
finally
AReportController := NIL;
FreeANDNIL(ID_Pedidos)

19
Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorReportController.pas
View File

@ -12,8 +12,8 @@ type
['{D0686358-251C-43C4-9927-6112F2F4D3B8}']
procedure Preview(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToWord(const AID: Integer; const AFileName : String = '';
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = '';
@ -30,8 +30,8 @@ type
procedure Preview(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToWord(const AID: Integer; const AFileName : String = '';
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = '';
@ -44,7 +44,7 @@ implementation
uses
uROTypes, uEditorRegistryUtils, uIEditorPedidosProveedorPreview,
uEditorPreview, uDataModulePedidosProveedor, uEditorBase, cxControls,
uFactuGES_App, uStringsUtils, uSistemaFunc;
uFactuGES_App, uStringsUtils, uSistemaFunc, schPedidosProveedorClient_Intf;
{ TPedidosProveedorReportController }
@ -154,12 +154,13 @@ begin
end;
end;
procedure TPedidosProveedorReportController.Print(const AListaID : TIntegerList;
const VerPrecios: Boolean; const VerRefProveedor: Boolean);
function TPedidosProveedorReportController.Print(const AListaID : TIntegerList;
const VerPrecios: Boolean; const VerRefProveedor: Boolean): Boolean;
var
AStream: Binary;
AEditor : IEditorPedidosProveedorPreview;
begin
Result := False;
AEditor := NIL;
ShowHourglassCursor;
@ -174,7 +175,9 @@ begin
AEditor.ListaID := AListaID;
AEditor.Title := 'Pedido a proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE;
AEditor.LoadFromStream(AStream);
AEditor.Print;
AEditor.TablaImpresion := nme_PedidosProveedor;
AEditor.IdTablaImpresion := AListaID.ToString;
Result := AEditor.Print;
finally
AEditor.Release;
end;

16
Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas
View File

@ -9,10 +9,10 @@ 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_ListaAnosPedidos = '{F7F27923-FB30-40B2-8F05-6B9563D17395}';
RID_PedidosProveedor = '{8C858277-77F8-4D71-A60F-8003348A72AA}';
RID_PedidosProveedor_Detalles = '{5C63501F-5ADE-45AD-B72C-52E7EA7EE819}';
RID_PedidosProveedor_Articulos_Pendientes = '{1928FD1A-A663-4568-B2AF-E6E1EA2DF22F}';
RID_ListaAnosPedidos = '{0CF426F5-0E7A-4D31-B771-4F0EB05D0996}';
RID_PedidosProveedor = '{B9580F94-5437-478A-90F5-3D27A6CFFDA1}';
RID_PedidosProveedor_Detalles = '{0A1F339A-A148-4057-B7E2-89076A2F465F}';
RID_PedidosProveedor_Articulos_Pendientes = '{D6F47337-9293-44B1-BFFA-48F19BD0E00E}';
{ Data table names }
nme_ListaAnosPedidos = 'ListaAnosPedidos';
@ -173,7 +173,7 @@ const
type
{ IListaAnosPedidos }
IListaAnosPedidos = interface(IDAStronglyTypedDataTable)
['{D3E6D035-02AB-4F73-A14A-EF9351F42E0F}']
['{B738AA83-D8BD-4C38-98CD-DD28E31C9858}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@ -208,7 +208,7 @@ type
{ IPedidosProveedor }
IPedidosProveedor = interface(IDAStronglyTypedDataTable)
['{5EF1B3BD-4774-46DF-B868-897B3A0F2818}']
['{78E9FF8F-05A2-4515-9C75-BB069DAF094B}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -759,7 +759,7 @@ type
{ IPedidosProveedor_Detalles }
IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
['{AE5543A6-B0AC-4168-857F-C66C80AFDABC}']
['{E2F0E04D-0D79-474B-A2E9-32934B613F97}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -974,7 +974,7 @@ type
{ IPedidosProveedor_Articulos_Pendientes }
IPedidosProveedor_Articulos_Pendientes = interface(IDAStronglyTypedDataTable)
['{9F527A92-29EF-42D2-8704-594EA3926CCD}']
['{7F61AF69-4E60-41A2-9429-E67F707C289C}']
{ Property getters and setters }
function GetID_PEDIDOValue: Integer;
procedure SetID_PEDIDOValue(const aValue: Integer);

16
Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas
View File

@ -9,15 +9,15 @@ 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_ListaAnosPedidosDelta = '{ED73D976-2DA8-409E-9A56-827BAB200193}';
RID_PedidosProveedorDelta = '{1A2AA90B-29E8-4944-9082-7CFEDEC9E9A0}';
RID_PedidosProveedor_DetallesDelta = '{EE10E854-7C9C-4EFB-9C85-BFFF777218EA}';
RID_PedidosProveedor_Articulos_PendientesDelta = '{7839E7D3-A150-4648-8FF5-AA4F543D5622}';
RID_ListaAnosPedidosDelta = '{70208471-680B-41B3-AB3C-0DC5FCD26D51}';
RID_PedidosProveedorDelta = '{CB41A028-BDED-41AB-9C88-A581E3DE6CCC}';
RID_PedidosProveedor_DetallesDelta = '{0CE5E016-2EBE-4452-9E33-C5BC9A358EF8}';
RID_PedidosProveedor_Articulos_PendientesDelta = '{7DB1761B-D15F-4075-9CB7-14F89144CD43}';
type
{ IListaAnosPedidosDelta }
IListaAnosPedidosDelta = interface(IListaAnosPedidos)
['{ED73D976-2DA8-409E-9A56-827BAB200193}']
['{70208471-680B-41B3-AB3C-0DC5FCD26D51}']
{ Property getters and setters }
function GetOldANOValue : String;
@ -51,7 +51,7 @@ type
{ IPedidosProveedorDelta }
IPedidosProveedorDelta = interface(IPedidosProveedor)
['{1A2AA90B-29E8-4944-9082-7CFEDEC9E9A0}']
['{CB41A028-BDED-41AB-9C88-A581E3DE6CCC}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -603,7 +603,7 @@ type
{ IPedidosProveedor_DetallesDelta }
IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
['{EE10E854-7C9C-4EFB-9C85-BFFF777218EA}']
['{0CE5E016-2EBE-4452-9E33-C5BC9A358EF8}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_PEDIDOValue : Integer;
@ -817,7 +817,7 @@ type
{ IPedidosProveedor_Articulos_PendientesDelta }
IPedidosProveedor_Articulos_PendientesDelta = interface(IPedidosProveedor_Articulos_Pendientes)
['{7839E7D3-A150-4648-8FF5-AA4F543D5622}']
['{7DB1761B-D15F-4075-9CB7-14F89144CD43}']
{ Property getters and setters }
function GetOldID_PEDIDOValue : Integer;
function GetOldREFERENCIAValue : String;

16
Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm
View File

@ -486,14 +486,14 @@ object srvPedidosProveedor: TsrvPedidosProveedor
'OS_PROVEEDOR_DETALLES.VISIBLE,'#10#10' PEDIDOS_PROVEEDOR_DETALLES.I' +
'D_ARTICULO, PEDIDOS_PROVEEDOR_DETALLES.DESCUENTO,'#10' PEDIDOS_PR' +
'OVEEDOR_DETALLES.IMPORTE_PORTE,'#10' ARTICULOS.REFERENCIA, ARTICU' +
'LOS_PROVEEDORES.REFERENCIA_PROV as REFERENCIA_PROVEEDOR,'#10' ART' +
'ICULOS.REFERENCIA_FABR as REFERENCIA_FABRICANTE'#10'FROM PEDIDOS_PRO' +
'VEEDOR_DETALLES'#10'LEFT JOIN ARTICULOS ON (ARTICULOS.ID = PEDIDOS_P' +
'ROVEEDOR_DETALLES.ID_ARTICULO)'#10'LEFT JOIN PEDIDOS_PROVEEDOR ON (P' +
'EDIDOS_PROVEEDOR.ID = PEDIDOS_PROVEEDOR_DETALLES.ID_PEDIDO)'#10'LEFT' +
' JOIN ARTICULOS_PROVEEDORES ON ((ARTICULOS_PROVEEDORES.ID_ARTICU' +
'LO = ARTICULOS.ID) AND (ARTICULOS_PROVEEDORES.ID_PROVEEDOR = PED' +
'IDOS_PROVEEDOR.ID_PROVEEDOR))'#10'WHERE {where}'#10'ORDER BY POSICION;'#10
'LOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR,'#10' ARTICULOS.REFER' +
'ENCIA_FABR as REFERENCIA_FABRICANTE'#10'FROM PEDIDOS_PROVEEDOR_DETAL' +
'LES'#10'LEFT JOIN ARTICULOS ON (ARTICULOS.ID = PEDIDOS_PROVEEDOR_DET' +
'ALLES.ID_ARTICULO)'#10'LEFT JOIN PEDIDOS_PROVEEDOR ON (PEDIDOS_PROVE' +
'EDOR.ID = PEDIDOS_PROVEEDOR_DETALLES.ID_PEDIDO)'#10'LEFT JOIN ARTICU' +
'LOS_PROVEEDORES ON ((ARTICULOS_PROVEEDORES.ID_ARTICULO = ARTICUL' +
'OS.ID) AND (ARTICULOS_PROVEEDORES.ID_PROVEEDOR = PEDIDOS_PROVEED' +
'OR.ID_PROVEEDOR))'#10'WHERE {where}'#10'ORDER BY POSICION;'#10
StatementType = stSQL
ColumnMappings = <
item

6
Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk
View File

@ -69,7 +69,9 @@ requires
Jcl,
JvCoreD11R,
JvSystemD11R,
JvCtrlsD11R;
JvCtrlsD11R,
PedidosCliente_model,
PedidosCliente_controller;
contains
uPedidosProveedorViewRegister in 'uPedidosProveedorViewRegister.pas',
@ -89,6 +91,6 @@ contains
uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorSituacionPedidoProveedor},
uViewObraReserva in 'uViewObraReserva.pas' {frViewObraReserva: TFrame},
uDialogOpcionesImpresionPedidosProveedor in 'uDialogOpcionesImpresionPedidosProveedor.pas' {fDialogOpcionesImpresionPedidosProveedor: TForm},
uViewDatosYSeleccionProveedorPedido in 'uViewDatosYSeleccionProveedorPedido.pas'{frViewDatosYSeleccionProveedorPedido: TFrame};
uViewDatosYSeleccionProveedorPedido in 'uViewDatosYSeleccionProveedorPedido.pas' {frViewDatosYSeleccionProveedorPedido: TFrame};
end.

97
Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj
View File

@ -49,45 +49,53 @@
<DelphiCompile Include="PedidosProveedor_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="adortl.dcp" />
<DCCReference Include="Almacenes_controller.dcp" />
<DCCReference Include="Almacenes_model.dcp" />
<DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="Contactos_controller.dcp" />
<DCCReference Include="Contactos_model.dcp" />
<DCCReference Include="Contactos_view.dcp" />
<DCCReference Include="cxDataD11.dcp" />
<DCCReference Include="cxEditorsD11.dcp" />
<DCCReference Include="cxExtEditorsD11.dcp" />
<DCCReference Include="cxLibraryD11.dcp" />
<DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="dbrtl.dcp" />
<DCCReference Include="designide.dcp" />
<DCCReference Include="dsnap.dcp" />
<DCCReference Include="dxComnD11.dcp" />
<DCCReference Include="dxCoreD11.dcp" />
<DCCReference Include="dxGDIPlusD11.dcp" />
<DCCReference Include="dxLayoutControlD11.dcp" />
<DCCReference Include="dxThemeD11.dcp" />
<DCCReference Include="GestorInformes_controller.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="GUISDK_D11R.dcp" />
<DCCReference Include="Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" />
<DCCReference Include="JvCtrlsD11R.dcp" />
<DCCReference Include="JvStdCtrlsD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" />
<DCCReference Include="Obras_controller.dcp" />
<DCCReference Include="Obras_model.dcp" />
<DCCReference Include="PedidosProveedor_controller.dcp" />
<DCCReference Include="PedidosProveedor_model.dcp" />
<DCCReference Include="PedProv_AlbProv_relation.dcp" />
<DCCReference Include="PedProv_FacProv_relation.dcp" />
<DCCReference Include="PngComponentsD10.dcp" />
<DCCReference Include="PNG_D10.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="..\..\Lib\adortl.dcp" />
<DCCReference Include="..\..\Lib\Almacenes_controller.dcp" />
<DCCReference Include="..\..\Lib\Almacenes_model.dcp" />
<DCCReference Include="..\..\Lib\Articulos_view.dcp" />
<DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
<DCCReference Include="..\..\Lib\Contactos_model.dcp" />
<DCCReference Include="..\..\Lib\Contactos_view.dcp" />
<DCCReference Include="..\..\Lib\cxDataD11.dcp" />
<DCCReference Include="..\..\Lib\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Lib\cxExtEditorsD11.dcp" />
<DCCReference Include="..\..\Lib\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Lib\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\dbrtl.dcp" />
<DCCReference Include="..\..\Lib\designide.dcp" />
<DCCReference Include="..\..\Lib\dsnap.dcp" />
<DCCReference Include="..\..\Lib\dxComnD11.dcp" />
<DCCReference Include="..\..\Lib\dxCoreD11.dcp" />
<DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Lib\dxLayoutControlD11.dcp" />
<DCCReference Include="..\..\Lib\dxThemeD11.dcp" />
<DCCReference Include="..\..\Lib\GestorInformes_controller.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\GUISDK_D11R.dcp" />
<DCCReference Include="..\..\Lib\Jcl.dcp" />
<DCCReference Include="..\..\Lib\JclVcl.dcp" />
<DCCReference Include="..\..\Lib\JvCoreD11R.dcp" />
<DCCReference Include="..\..\Lib\JvCtrlsD11R.dcp" />
<DCCReference Include="..\..\Lib\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\..\Lib\JvSystemD11R.dcp" />
<DCCReference Include="..\..\Lib\Obras_controller.dcp" />
<DCCReference Include="..\..\Lib\Obras_model.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_model.dcp" />
<DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" />
<DCCReference Include="..\..\Lib\PedProv_AlbProv_relation.dcp" />
<DCCReference Include="..\..\Lib\PedProv_FacProv_relation.dcp" />
<DCCReference Include="..\..\Lib\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Lib\PNG_D10.dcp" />
<DCCReference Include="..\..\Lib\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\rtl.dcp" />
<DCCReference Include="..\..\Lib\vcl.dcp" />
<DCCReference Include="..\..\Lib\vclactnband.dcp" />
<DCCReference Include="..\..\Lib\vcldb.dcp" />
<DCCReference Include="..\..\Lib\vcljpg.dcp" />
<DCCReference Include="..\..\Lib\vclx.dcp" />
<DCCReference Include="..\..\Lib\xmlrtl.dcp" />
<DCCReference Include="uDialogOpcionesImpresionPedidosProveedor.pas">
<Form>fDialogOpcionesImpresionPedidosProveedor</Form>
<DesignClass>TForm</DesignClass>
@ -125,7 +133,10 @@
<DesignClass>TfEditorSituacionPedidoProveedor</DesignClass>
</DCCReference>
<DCCReference Include="uPedidosProveedorViewRegister.pas" />
<DCCReference Include="uViewDatosYSeleccionProveedorPedido.pas" />
<DCCReference Include="uViewDatosYSeleccionProveedorPedido.pas">
<Form>frViewDatosYSeleccionProveedorPedido</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="uViewDetallesPedidoProveedor.pas">
<Form>frViewDetallesPedidoProveedor</Form>
<DesignClass>TFrame</DesignClass>
@ -154,12 +165,6 @@
<Form>frViewProveedorPedido</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclx.dcp" />
<DCCReference Include="xmlrtl.dcp" />
</ItemGroup>
</Project>
<!-- EurekaLog First Line

163
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
View File

@ -80,16 +80,17 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
inherited pgPaginas: TPageControl
Width = 873
Height = 534
Height = 528
ActivePage = pagContenido
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 873
ExplicitHeight = 534
ExplicitHeight = 528
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 865
ExplicitHeight = 506
ExplicitHeight = 500
end
object pagContenido: TTabSheet
Caption = 'Contenido'
@ -98,7 +99,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Left = 0
Top = 0
Width = 865
Height = 506
Height = 500
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -111,12 +112,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
TabOrder = 0
ReadOnly = False
ExplicitWidth = 865
ExplicitHeight = 506
ExplicitHeight = 500
inherited ToolBar1: TToolBar
Width = 865
Height = 46
Height = 51
ExplicitWidth = 865
ExplicitHeight = 46
ExplicitHeight = 51
inherited ToolButton3: TToolButton
Wrap = False
end
@ -126,91 +127,96 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
inherited ToolButton14: TToolButton [4]
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Top = 22
ExplicitTop = 22
inherited FontName: TJvFontComboBox [5]
Left = 399
Top = 0
ExplicitLeft = 399
ExplicitTop = 0
end
inherited FontSize: TEdit
Top = 22
Width = 310
ExplicitTop = 22
ExplicitWidth = 310
Left = 544
Top = 0
Width = 58
ExplicitLeft = 544
ExplicitTop = 0
ExplicitWidth = 58
end
inherited UpDown1: TUpDown
Left = 455
Top = 22
ExplicitLeft = 455
ExplicitTop = 22
end
inherited ToolButton13: TToolButton
inherited ToolButton13: TToolButton [7]
Left = 0
Top = 22
Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitTop = 22
ExplicitTop = 0
ExplicitHeight = 27
end
inherited ToolButton6: TToolButton
inherited UpDown1: TUpDown [8]
Left = 0
Top = 49
Top = 27
ExplicitLeft = 0
ExplicitTop = 49
ExplicitTop = 27
end
inherited ToolButton7: TToolButton
Left = 66
Top = 49
ExplicitLeft = 66
ExplicitTop = 49
inherited ToolButton6: TToolButton [9]
Left = 17
Top = 27
ExplicitLeft = 17
ExplicitTop = 27
end
inherited ToolButton8: TToolButton
Left = 133
Top = 49
ExplicitLeft = 133
ExplicitTop = 49
inherited ToolButton7: TToolButton [10]
Left = 83
Top = 27
ExplicitLeft = 83
ExplicitTop = 27
end
inherited ToolButton12: TToolButton
Left = 216
Top = 49
ExplicitLeft = 216
ExplicitTop = 49
inherited ToolButton8: TToolButton [11]
Left = 150
Top = 27
ExplicitLeft = 150
ExplicitTop = 27
end
inherited ToolButton9: TToolButton
Left = 224
Top = 49
ExplicitLeft = 224
ExplicitTop = 49
inherited ToolButton12: TToolButton [12]
Left = 233
Top = 27
ExplicitLeft = 233
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton10: TToolButton
Left = 369
Top = 49
ExplicitLeft = 369
ExplicitTop = 49
inherited ToolButton9: TToolButton [13]
Left = 241
Top = 27
ExplicitLeft = 241
ExplicitTop = 27
end
inherited ToolButton11: TToolButton
Left = 494
Top = 49
ExplicitLeft = 494
ExplicitTop = 49
inherited ToolButton10: TToolButton [14]
Left = 386
Top = 27
ExplicitLeft = 386
ExplicitTop = 27
end
inherited ToolButton11: TToolButton [15]
Left = 511
Top = 27
ExplicitLeft = 511
ExplicitTop = 27
end
end
inherited cxGrid: TcxGrid
Top = 99
Top = 77
Width = 865
Height = 407
ExplicitTop = 104
Height = 423
ExplicitTop = 77
ExplicitWidth = 865
ExplicitHeight = 399
ExplicitHeight = 423
end
inherited TBXDock1: TTBXDock
Top = 73
Top = 51
Width = 865
ExplicitTop = 78
ExplicitTop = 51
ExplicitWidth = 865
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 566
@ -234,7 +240,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Left = 0
Top = 0
Width = 865
Height = 506
Height = 500
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -245,7 +251,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
TabOrder = 0
ReadOnly = False
ExplicitWidth = 865
ExplicitHeight = 506
ExplicitHeight = 500
inherited pnlSup: TPanel
Width = 865
ExplicitWidth = 865
@ -255,13 +261,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
inherited GroupBox1: TGroupBox
Width = 865
Height = 478
Height = 472
ExplicitWidth = 865
ExplicitHeight = 475
ExplicitHeight = 472
inherited eIncidencias: TcxDBMemo
ExplicitWidth = 848
ExplicitHeight = 451
Height = 451
ExplicitHeight = 445
Height = 445
Width = 848
end
end
@ -280,9 +286,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
inline frViewTotales1: TfrViewTotales [4]
Left = 0
Top = 616
Top = 610
Width = 879
Height = 43
Height = 49
Align = alBottom
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -292,15 +298,15 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ParentFont = False
TabOrder = 4
ReadOnly = False
ExplicitTop = 616
ExplicitTop = 610
ExplicitWidth = 879
ExplicitHeight = 43
ExplicitHeight = 49
inherited dxLayoutControl1: TdxLayoutControl
Width = 879
Height = 43
Height = 49
LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 879
ExplicitHeight = 43
ExplicitHeight = 49
inherited Bevel3: TBevel
Left = 458
Top = 11
@ -540,7 +546,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Visible = False
end
inherited dxLayoutControl1Group7: TdxLayoutGroup
Visible = False
inherited dxLayoutControl1Group10: TdxLayoutGroup
Visible = False
end
end
inherited dxLayoutControl1Group6: TdxLayoutGroup
Visible = False
@ -553,9 +561,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
end
inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Item13: TdxLayoutItem
Visible = False
end
inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Item12: TdxLayoutItem
Visible = False

2
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas
View File

@ -21,7 +21,6 @@ type
pagContenido: TTabSheet;
pagInicidencias: TTabSheet;
frViewIncidenciasProv: TfrViewIncidencias;
frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor;
dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList;
dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel;
frViewTotales1: TfrViewTotales;
@ -30,6 +29,7 @@ type
actEnviarEMail: TAction;
TBXSeparatorItem6: TTBXSeparatorItem;
TBXItem33: TTBXItem;
frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor;
procedure FormShow(Sender: TObject);
procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);

3
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas
View File

@ -325,7 +325,8 @@ begin
if Assigned(APedidos) then
if ElegirOpcionesImpresionPedidoProveedor(FImprimirPrecios, FImprimirRefProveedor) then
FController.Print(APedidos, AllItems, FImprimirPrecios, FImprimirRefProveedor);
if FController.Print(APedidos, AllItems, FImprimirPrecios, FImprimirRefProveedor) then
RefrescarInterno;
end;
end;
end;

6
Source/Modulos/Pedidos a proveedor/Views/uViewDatosYSeleccionProveedorPedido.pas
View File

@ -295,9 +295,11 @@ begin
[FDireccion.CALLE, FDireccion.POBLACION,
FDireccion.CODIGO_POSTAL, FDireccion.PROVINCIA]);
if not FDireccion.FAXIsNull then
ACadena := ACadena + #13#10 + 'Fax: ' + FDireccion.FAX;
if (not FDireccion.TELEFONOIsNull) and (FDireccion.TELEFONO <> '') then
ACadena := ACadena + #13#10 + 'Teléfono: ' + FDireccion.TELEFONO;
if (not FDireccion.FAXIsNull) and (FDireccion.FAX <> '') then
ACadena := ACadena + #13#10 + 'Fax: ' + FDireccion.FAX;
end;
edtDireccion.Text := ACadena;

21
Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.dfm
View File

@ -76,10 +76,6 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
Top = 99
Height = 205
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
Properties.Buttons = <
item
@ -91,28 +87,13 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
Properties.OnButtonClick = nil
Options.Editing = False
end
inherited cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn
Properties.Buttons = <
item
Default = True
Kind = bkEllipsis
Visible = False
end>
Properties.ReadOnly = True
Properties.OnButtonClick = nil
Options.Editing = False
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn
inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
Visible = True
end
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Caption = 'Importe coste'
end
end
end
inherited TBXDock1: TTBXDock
Top = 73
ExplicitTop = 73
inherited TBXToolbar1: TTBXToolbar
inherited TBXSubmenuItem1: TTBXSubmenuItem
Visible = False

3
Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas
View File

@ -239,6 +239,9 @@ begin
txtDireccion.Caption := FPedido.CALLE;
txtDireccion.Caption := txtDireccion.Caption + #13#10 + FPedido.CODIGO_POSTAL + ' ' + FPedido.POBLACION;
txtDireccion.Caption := txtDireccion.Caption + #13#10 + FPedido.PROVINCIA;
if (not FPedido.TELEFONOIsNull) and (FPedido.TELEFONO <> '') then
txtDireccion.Caption := txtDireccion.Caption + #13#10 + 'Teléfono: ' + FPedido.TELEFONO;
bModificar.Enabled := True;
end
else if (actListaAlmacenes.Checked) then

6
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm
View File

@ -220,6 +220,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Visible = False
end
end
inherited dxLayoutControl1Item8: TdxLayoutItem
Visible = False
end
inherited dxLayoutControl1Item7: TdxLayoutItem
Visible = False
end
end
end
inherited ActionList1: TActionList

45
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas
View File

@ -11,7 +11,7 @@ uses
cxGraphics, cxDropDownEdit, cxImageComboBox, cxDBEdit, cxContainer, cxEdit,
cxTextEdit, cxMaskEdit, cxCalendar, dxLayoutControl, cxControls, cxMemo,
uViewDireccionEntregaPedidoProv, cxLookupEdit, cxDBLookupEdit,
// uBizPedidosCliente, uPedidosClienteController,
uBizPedidosCliente, uPedidosClienteController,
cxDBLookupComboBox, uFormasPagoController, ActnList, uDAInterfaces, uBizFormasPago,
uViewProveedorPedido, uViewObraReserva, uObrasController,
uPedidosProveedorController, uViewDatosYSeleccionProveedorPedido;
@ -92,8 +92,8 @@ type
FFormasPagoController : IFormasPagoController;
FObras: TStringList;
FObrasController : IObrasController;
// FPedidoCliAsociado : IBizPedidoCliente;
// FPedidoCliController : IPedidosClienteController;
FPedidoCliAsociado : IBizPedidoCliente;
FPedidoCliController : IPedidosClienteController;
function GetPedido: IBizPedidoProveedor;
procedure SetPedido(const Value: IBizPedidoProveedor); virtual;
@ -117,14 +117,14 @@ uses uStringsUtils;
procedure TfrViewPedidoProveedor.actVerPedidoCliExecute(Sender: TObject);
begin
inherited;
// FPedidoCliController.Ver(FPedidoCliAsociado);
FPedidoCliController.Ver(FPedidoCliAsociado);
end;
procedure TfrViewPedidoProveedor.actVerPedidoCliUpdate(Sender: TObject);
begin
inherited;
// if (Sender as TAction).Enabled then
// (Sender as TAction).Enabled := Assigned(FPedidoCliAsociado)
if (Sender as TAction).Enabled then
(Sender as TAction).Enabled := Assigned(FPedidoCliAsociado)
end;
procedure TfrViewPedidoProveedor.bFormasPagoClick(Sender: TObject);
@ -143,6 +143,9 @@ begin
FObras := FObrasController.DarListaObras;
FViewProveedorPedido := frViewDatosYSeleccionProveedorPedido1;
eReferencia.Enabled := False;
eReferenciaPedidoCli.Enabled := False;
FPedidoCliAsociado := NIL;
FPedidoCliController := TPedidosClienteController.Create;
end;
procedure TfrViewPedidoProveedor.CustomViewDestroy(Sender: TObject);
@ -245,20 +248,20 @@ begin
dsFormaPago.DataTable := FFormasPago.DataTable;
dsFormaPago.DataTable.Active := True;
// FPedidoCliAsociado := NIL;
// if (FPedido.ID_PEDIDO_CLIENTE > 0) then
// begin
// FPedidoCliAsociado := FPedidoCliController.Buscar(FPedido.ID_PEDIDO_CLIENTE);
// if Assigned(FPedidoCliAsociado) then
// begin
// FPedidoCliAsociado.DataTable.Active := True;
// eReferenciaPedidoCli.Text := FPedidoCliAsociado.REFERENCIA
// end
// else
// eReferenciaPedidoCli.Text := '';
// end
// else
// eReferenciaPedidoCli.Text := 'No hay pedido asociado';
FPedidoCliAsociado := NIL;
if (FPedido.ID_PEDIDO_CLIENTE > 0) then
begin
FPedidoCliAsociado := FPedidoCliController.Buscar(FPedido.ID_PEDIDO_CLIENTE);
if Assigned(FPedidoCliAsociado) then
begin
FPedidoCliAsociado.DataTable.Active := True;
eReferenciaPedidoCli.Text := FPedidoCliAsociado.REFERENCIA
end
else
eReferenciaPedidoCli.Text := '';
end
else
eReferenciaPedidoCli.Text := 'No hay pedido asociado';
FViewProveedorPedido.Pedido := FPedido;
frViewDireccionEntregaPedidoProv1.PedidoProveedor := FPedido;
@ -269,7 +272,7 @@ begin
else begin
DADataSource.DataTable := NIL;
dsFormaPago.DataTable := NIL;
// FPedidoCliAsociado := NIL;
FPedidoCliAsociado := NIL;
FViewProveedorPedido.Pedido := NIL;
end;
end;

15
Source/Modulos/Pedidos de cliente/Controller/uDetallesPedidoClienteController.pas
View File

@ -44,7 +44,7 @@ type
implementation
uses uDAInterfaces, Variants, uControllerDetallesBase, uDataModulePedidosCliente,
uses uDAInterfaces, Variants, uControllerDetallesBase, uDataModulePedidosCliente, uDialogUtils,
uCalculosUtils, schArticulosClient_Intf, schPedidosClienteClient_Intf, uArticulosPedidoClienteController;
{ TDetallesPedidoClienteController }
@ -58,8 +58,7 @@ begin
try
AArticulos := (FArticulosController.BuscarTodos(ACliente) as IBizArticulo);
ActualizarDetalles(ADetalles, AArticulos);
// EliminarArticulosCliente(ADetalles);
// ShowInfoMessage('Se han actualizado los descuentos para el cliente seleccionado');
ShowInfoMessage('Se han actualizado los descuentos para el cliente seleccionado');
finally
AArticulos := Nil;
end;
@ -148,10 +147,6 @@ begin
AField := AArticulos.DataTable.FindField(CAMPO_ID_ARTICULOS);
if Assigned(AField) then
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AField.AsVariant;
// AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
// if Assigned(AField) then
// ADetalles.DataTable.FieldByName(fld_PedidosCliente_DetallesREFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
end;
procedure TDetallesPedidoClienteController.ValidarCampos(DataTable: TDADataTable);
@ -163,13 +158,9 @@ end;
procedure TDetallesPedidoClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin
if Assigned(AArticulos) then
begin
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE;
end
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE
else
begin
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
end;
end;
end.

42
Source/Modulos/Pedidos de cliente/Controller/uPedidosClienteController.pas
View File

@ -6,7 +6,7 @@ interface
uses
Classes, SysUtils, uDADataTable,
uControllerBase, uIDataModulePedidosCliente, uClientesController,
uDetallesPedidoClienteController, uBizPedidosCliente;
uDetallesPedidoClienteController, uBizPedidosCliente, uBizDetallesPedidoCliente;
type
IPedidosClienteController = interface(IControllerBase)
@ -23,7 +23,7 @@ type
function BuscarTodos: IBizPedidoCliente; overload;
function BuscarTodos(const AID_Cliente: Integer): IBizPedidoCliente; overload;
function BuscarPendientes : IBizPedidoCliente;
// function BuscarPendientesPedir(const ID : Integer): IBizPedidoClienteArticulosPendientesPedirAProv;
function BuscarPendientesPedir(const ID : Integer): IBizPedidoClienteArticulosPendientesPedirAProv;
// function BuscarSinFacturar : IBizPedidoCliente;
procedure Ver(APedido : IBizPedidoCliente);
@ -42,8 +42,8 @@ type
procedure Preview(APedido : IBizPedidoCliente; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(APedido : IBizPedidoCliente; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(APedido : IBizPedidoCliente; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
procedure RecalcularImportes(APedido: IBizPedidoCliente);
function EsModificable(APedido : IBizPedidoCliente): Boolean;
@ -57,6 +57,8 @@ type
procedure RecuperarCliente(APedido: IBizPedidoCliente);
procedure EnviarPedidoPorEMail(APedido: IBizPedidoCliente);
function ArticulosPendientes(const ID : Integer): IBizPedidoClienteArticulosPend;
// Procedure AsignarIDObra(APedido: IBizPedidoCliente; const IDObra: Variant);
// Procedure AsignarIDAlmacen(APedido: IBizPedidoCliente; const IDAlmacen: Variant);
@ -104,7 +106,7 @@ type
function BuscarTodos: IBizPedidoCliente; overload;
function BuscarTodos(const AID_Cliente: Integer): IBizPedidoCliente; overload;
function BuscarPendientes : IBizPedidoCliente;
// function BuscarPendientesPedir(const ID : Integer): IBizPedidoClienteArticulosPendientesPedirAProv;
function BuscarPendientesPedir(const ID : Integer): IBizPedidoClienteArticulosPendientesPedirAProv;
// function BuscarSinFacturar : IBizPedidoCliente;
function Nuevo : IBizPedidoCliente;
@ -118,8 +120,8 @@ type
procedure Preview(APedido : IBizPedidoCliente; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(APedido : IBizPedidoCliente; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(APedido : IBizPedidoCliente; AllItems: Boolean = False;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
procedure RecalcularImportes(APedido: IBizPedidoCliente);
function EsModificable(APedido : IBizPedidoCliente): Boolean;
@ -134,6 +136,7 @@ type
// Procedure AsignarIDObra(APedido: IBizPedidoCliente; const IDObra: Variant);
// Procedure AsignarIDAlmacen(APedido: IBizPedidoCliente; const IDAlmacen: Variant);
function ArticulosPendientes(const ID : Integer): IBizPedidoClienteArticulosPend;
function DarListaAnosPedidos: TStringList;
procedure FiltrarAno(APedido: IBizPedidoCliente; ADynWhereDataTable: WideString; const Ano: String);
@ -144,7 +147,7 @@ implementation
uses
uROTypes, Controls, cxControls, DB, uEditorRegistryUtils, uEditorPreview, DateUtils,
uIEditorPedidosCliente, uDataModulePedidosCliente, uFactuGES_App,
uBizDetallesPedidoCliente, uBizContactos, uDataTableUtils, uDataModuleUsuarios,
uBizContactos, uDataTableUtils, uDataModuleUsuarios,
schPedidosClienteClient_Intf, uDAInterfaces, uPedidosClienteReportController,
uDateUtils, uIEditorPedidoCliente, uIEditorElegirPedidosCliente,
Dialogs, uIEditorDireccionEntregaPedidoCliente,
@ -160,6 +163,11 @@ begin
APedido.Insert;
end;
function TPedidosClienteController.ArticulosPendientes(const ID: Integer): IBizPedidoClienteArticulosPend;
begin
Result := FDataModule.GetArticulosPendientes(ID);
end;
procedure TPedidosClienteController.AsignarDataModule;
begin
FDataModule := TDataModulePedidosCliente.Create(Nil);
@ -229,6 +237,16 @@ begin
end;
end;
function TPedidosClienteController.BuscarPendientesPedir(const ID: Integer): IBizPedidoClienteArticulosPendientesPedirAProv;
begin
ShowHourglassCursor;
try
Result := FDataModule.GetArticulosPendientesPedirAProv(ID);
finally
HideHourglassCursor;
end;
end;
{function TPedidosClienteController.BuscarSinFacturar: IBizPedidoCliente;
var
Condicion: TDAWhereExpression;
@ -723,7 +741,6 @@ begin
ShowHourglassCursor;
try
APedido.IMPORTE_NETO := FDetallesController.DarTotalImporteTotal(APedido.Detalles);
// APedido.IMPORTE_PORTE := FDetallesController.DarTotalPorteTotal(APedido.Detalles);
if not bEnEdicion then
APedido.Post;
finally
@ -910,12 +927,13 @@ begin
end;
end;
procedure TPedidosClienteController.Print(APedido: IBizPedidoCliente; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function TPedidosClienteController.Print(APedido: IBizPedidoCliente; AllItems: Boolean = false;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
var
AReportController : IPedidosClienteReportController;
ID_Pedidos: TIntegerList;
begin
Result := False;
AReportController := TPedidosClienteReportController.Create;
ID_Pedidos := TIntegerList.Create;
@ -937,7 +955,7 @@ begin
else
ID_Pedidos.Add(APedido.ID);
AReportController.Print(ID_Pedidos, VerPrecios, VerRefProveedor);
Result := AReportController.Print(ID_Pedidos, VerPrecios, VerRefProveedor);
finally
AReportController := NIL;
FreeANDNIL(ID_Pedidos)

19
Source/Modulos/Pedidos de cliente/Controller/uPedidosClienteReportController.pas
View File

@ -12,8 +12,8 @@ type
['{D68620B5-2EB6-47DE-89D9-560943990895}']
procedure Preview(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = '';
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
end;
@ -28,8 +28,8 @@ type
procedure Preview(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
procedure Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
function Print(const AListaID : TIntegerList;
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = '';
const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
end;
@ -40,7 +40,7 @@ implementation
uses
uROTypes, uEditorRegistryUtils, uIEditorPedidosClientePreview,
uEditorPreview, uDataModulePedidosCliente, uEditorBase, cxControls,
uFactuGES_App, uStringsUtils, uSistemaFunc;
uFactuGES_App, uStringsUtils, uSistemaFunc, schPedidosClienteClient_Intf;
{ TPedidosClienteReportController }
@ -123,12 +123,13 @@ begin
end;
end;
procedure TPedidosClienteReportController.Print(const AListaID : TIntegerList;
const VerPrecios: Boolean; const VerRefProveedor: Boolean);
function TPedidosClienteReportController.Print(const AListaID : TIntegerList;
const VerPrecios: Boolean; const VerRefProveedor: Boolean): Boolean;
var
AStream: Binary;
AEditor : IEditorPedidosClientePreview;
begin
Result := False;
AEditor := NIL;
ShowHourglassCursor;
@ -143,7 +144,9 @@ begin
AEditor.ListaID := AListaID;
AEditor.Title := 'Pedido de cliente - ' + AppFactuGES.EmpresaActiva.NOMBRE;
AEditor.LoadFromStream(AStream);
AEditor.Print;
AEditor.TablaImpresion := nme_PedidosCliente;
AEditor.IdTablaImpresion := AListaID.ToString;
Result := AEditor.Print;
finally
AEditor.Release;
end;

7
Source/Modulos/Pedidos de cliente/Model/uBizPedidosCliente.pas
View File

@ -89,6 +89,10 @@ type
destructor Destroy; override;
end;
TBizPedidoClienteArticulosPendientesPedirAProv = class(TPedidoCliente_ArticulosPendientesPedirAProvDataTableRules, IBizPedidoClienteArticulosPendientesPedirAProv)
end;
implementation
uses
@ -304,7 +308,8 @@ end;}
initialization
RegisterDataTableRules(BIZ_CLIENT_PEDIDO_CLIENTE, TBizPedidoCliente);
RegisterDataTableRules(BIZ_CLIENT_PEDIDO_CLIENTE_ARTICULOS_PENDIENTES_PEDIR_A_PROV, TBizPedidoClienteArticulosPendientesPedirAProv);
finalization
end.

36
Source/Modulos/Pedidos de cliente/PedidosCliente_Group.groupproj
View File

@ -25,8 +25,9 @@
<Projects Include="..\Inventario\Controller\Inventario_controller.dproj" />
<Projects Include="..\Inventario\Data\Inventario_data.dproj" />
<Projects Include="..\Inventario\Views\Inventario_view.dproj" />
<Projects Include="..\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.dproj" />
<Projects Include="..\Relaciones\Pedidos de cliente - Pedidos a proveedor\PedCli_PedProv_relation.dproj" />
<Projects Include="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" />
<Projects Include="..\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.dproj" />
<Projects Include="Controller\PedidosCliente_controller.dproj" />
<Projects Include="Data\PedidosCliente_data.dproj" />
<Projects Include="Model\PedidosCliente_model.dproj" />
@ -192,6 +193,24 @@
<Target Name="PedProv_AlbProv_relation:Make">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="PedCli_AlbCli_relation">
<MSBuild Projects="..\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.dproj" Targets="" />
</Target>
<Target Name="PedCli_AlbCli_relation:Clean">
<MSBuild Projects="..\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PedCli_AlbCli_relation:Make">
<MSBuild Projects="..\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="PedCli_PedProv_relation">
<MSBuild Projects="..\Relaciones\Pedidos de cliente - Pedidos a proveedor\PedCli_PedProv_relation.dproj" Targets="" />
</Target>
<Target Name="PedCli_PedProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Pedidos de cliente - Pedidos a proveedor\PedCli_PedProv_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PedCli_PedProv_relation:Make">
<MSBuild Projects="..\Relaciones\Pedidos de cliente - Pedidos a proveedor\PedCli_PedProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="FacturasProveedor_controller">
<MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="" />
</Target>
@ -201,15 +220,6 @@
<Target Name="FacturasProveedor_controller:Make">
<MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="Make" />
</Target>
<Target Name="PedProv_FacProv_relation">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.dproj" Targets="" />
</Target>
<Target Name="PedProv_FacProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PedProv_FacProv_relation:Make">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="PedidosCliente_view">
<MSBuild Projects="Views\PedidosCliente_view.dproj" Targets="" />
</Target>
@ -292,13 +302,13 @@
<MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;PedidosCliente_model;PedidosCliente_data;PedidosCliente_controller;AlbaranesProveedor_controller;Inventario_controller;PedProv_AlbProv_relation;FacturasProveedor_controller;PedProv_FacProv_relation;PedidosCliente_view;PedidosCliente_plugin;AlbaranesProveedor_data;AlbaranesCliente_data;FactuGES;FactuGES_Server;Inventario_data;Inventario_view;AlbaranesProveedor_view" />
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;PedidosCliente_model;PedidosCliente_data;PedidosCliente_controller;AlbaranesProveedor_controller;Inventario_controller;PedProv_AlbProv_relation;PedCli_AlbCli_relation;PedCli_PedProv_relation;FacturasProveedor_controller;PedidosCliente_view;PedidosCliente_plugin;AlbaranesProveedor_data;AlbaranesCliente_data;FactuGES;FactuGES_Server;Inventario_data;Inventario_view;AlbaranesProveedor_view" />
</Target>
<Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosCliente_model:Clean;PedidosCliente_data:Clean;PedidosCliente_controller:Clean;AlbaranesProveedor_controller:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;FacturasProveedor_controller:Clean;PedProv_FacProv_relation:Clean;PedidosCliente_view:Clean;PedidosCliente_plugin:Clean;AlbaranesProveedor_data:Clean;AlbaranesCliente_data:Clean;FactuGES:Clean;FactuGES_Server:Clean;Inventario_data:Clean;Inventario_view:Clean;AlbaranesProveedor_view:Clean" />
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosCliente_model:Clean;PedidosCliente_data:Clean;PedidosCliente_controller:Clean;AlbaranesProveedor_controller:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;PedCli_AlbCli_relation:Clean;PedCli_PedProv_relation:Clean;FacturasProveedor_controller:Clean;PedidosCliente_view:Clean;PedidosCliente_plugin:Clean;AlbaranesProveedor_data:Clean;AlbaranesCliente_data:Clean;FactuGES:Clean;FactuGES_Server:Clean;Inventario_data:Clean;Inventario_view:Clean;AlbaranesProveedor_view:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosCliente_model:Make;PedidosCliente_data:Make;PedidosCliente_controller:Make;AlbaranesProveedor_controller:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;FacturasProveedor_controller:Make;PedProv_FacProv_relation:Make;PedidosCliente_view:Make;PedidosCliente_plugin:Make;AlbaranesProveedor_data:Make;AlbaranesCliente_data:Make;FactuGES:Make;FactuGES_Server:Make;Inventario_data:Make;Inventario_view:Make;AlbaranesProveedor_view:Make" />
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosCliente_model:Make;PedidosCliente_data:Make;PedidosCliente_controller:Make;AlbaranesProveedor_controller:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;PedCli_AlbCli_relation:Make;PedCli_PedProv_relation:Make;FacturasProveedor_controller:Make;PedidosCliente_view:Make;PedidosCliente_plugin:Make;AlbaranesProveedor_data:Make;AlbaranesCliente_data:Make;FactuGES:Make;FactuGES_Server:Make;Inventario_data:Make;Inventario_view:Make;AlbaranesProveedor_view:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

24
Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.dproj
View File

@ -43,8 +43,6 @@
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">PedidosCliente_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@ -54,18 +52,16 @@
<DelphiCompile Include="PedidosCliente_plugin.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\Inventario\ApplicationBase.dcp" />
<DCCReference Include="..\..\Inventario\Articulos_view.dcp" />
<DCCReference Include="..\..\Inventario\Base.dcp" />
<DCCReference Include="..\..\Inventario\Contactos_controller.dcp" />
<DCCReference Include="..\..\Inventario\Contactos_model.dcp" />
<DCCReference Include="..\..\Inventario\Contactos_view.dcp" />
<DCCReference Include="..\..\Inventario\GUIBase.dcp" />
<DCCReference Include="..\..\Inventario\Obras_controller.dcp" />
<DCCReference Include="..\..\Inventario\Obras_model.dcp" />
<DCCReference Include="..\..\Inventario\PedidosCliente_controller.dcp" />
<DCCReference Include="..\..\Inventario\PedidosCliente_model.dcp" />
<DCCReference Include="..\..\Inventario\PedidosCliente_view.dcp" />
<DCCReference Include="..\..\Lib\ApplicationBase.dcp" />
<DCCReference Include="..\..\Lib\Articulos_view.dcp" />
<DCCReference Include="..\..\Lib\Base.dcp" />
<DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
<DCCReference Include="..\..\Lib\Contactos_model.dcp" />
<DCCReference Include="..\..\Lib\Contactos_view.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_model.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_view.dcp" />
<DCCReference Include="uPluginPedidosCliente.pas">
<Form>PluginPedidosCliente</Form>
</DCCReference>

10
Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.dpk
View File

@ -30,8 +30,6 @@ requires
Contactos_controller,
Contactos_view,
Articulos_view,
PedProv_AlbProv_relation,
PedProv_FacProv_relation,
GestorInformes_controller,
rtl,
vcl,
@ -82,7 +80,11 @@ requires
fs11,
fqb110,
bdertl,
frxe11;
frxe11,
PedCli_AlbCli_relation,
Almacenes_model,
Almacenes_controller,
PedCli_PedProv_relation;
contains
uPedidosClienteViewRegister in 'uPedidosClienteViewRegister.pas',
@ -97,6 +99,6 @@ contains
uViewElegirArticulosPedidosCliente in 'uViewElegirArticulosPedidosCliente.pas' {frViewElegirArticulosPedidosCliente: TFrame},
uEditorDireccionEntregaPedidoCliente in 'uEditorDireccionEntregaPedidoCliente.pas' {frEditorDireccionEntregaPedidoCliente: TForm},
uEditorElegirArticulosPedidoCliente in 'uEditorElegirArticulosPedidoCliente.pas' {frEditorElegirArticulosPedidoCliente: TForm},
uEditorPedidosClienteReport in 'uEditorPedidosClienteReport.pas' {frEditorPedidosClienteReport: TForm};
uEditorPedidosClienteReport in 'uEditorPedidosClienteReport.pas' {frEditorPedidosClienteReport: T};
end.

118
Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.dproj
View File

@ -49,57 +49,66 @@
<DelphiCompile Include="PedidosCliente_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="adortl.dcp" />
<DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="bdertl.dcp" />
<DCCReference Include="Contactos_controller.dcp" />
<DCCReference Include="Contactos_model.dcp" />
<DCCReference Include="Contactos_view.dcp" />
<DCCReference Include="cxDataD11.dcp" />
<DCCReference Include="cxEditorsD11.dcp" />
<DCCReference Include="cxExportD11.dcp" />
<DCCReference Include="cxExtEditorsD11.dcp" />
<DCCReference Include="cxGridD11.dcp" />
<DCCReference Include="cxLibraryD11.dcp" />
<DCCReference Include="cxPageControlD11.dcp" />
<DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="dbrtl.dcp" />
<DCCReference Include="dclcxLibraryD11.dcp" />
<DCCReference Include="designide.dcp" />
<DCCReference Include="dsnap.dcp" />
<DCCReference Include="dxComnD11.dcp" />
<DCCReference Include="dxCoreD11.dcp" />
<DCCReference Include="dxGDIPlusD11.dcp" />
<DCCReference Include="dxLayoutControlD11.dcp" />
<DCCReference Include="dxPSCoreD11.dcp" />
<DCCReference Include="dxPScxCommonD11.dcp" />
<DCCReference Include="dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="dxPSLnksD11.dcp" />
<DCCReference Include="dxThemeD11.dcp" />
<DCCReference Include="fqb110.dcp" />
<DCCReference Include="frx11.dcp" />
<DCCReference Include="frxe11.dcp" />
<DCCReference Include="fs11.dcp" />
<DCCReference Include="GestorInformes_controller.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="GUISDK_D11R.dcp" />
<DCCReference Include="Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" />
<DCCReference Include="JvCtrlsD11R.dcp" />
<DCCReference Include="JvPageCompsD11R.dcp" />
<DCCReference Include="JvStdCtrlsD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" />
<DCCReference Include="PedidosCliente_controller.dcp" />
<DCCReference Include="PedidosCliente_model.dcp" />
<DCCReference Include="PedProv_AlbProv_relation.dcp" />
<DCCReference Include="PedProv_FacProv_relation.dcp" />
<DCCReference Include="PngComponentsD10.dcp" />
<DCCReference Include="PNG_D10.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="tb2k_d10.dcp" />
<DCCReference Include="tbx_d10.dcp" />
<DCCReference Include="..\..\Lib\adortl.dcp" />
<DCCReference Include="..\..\Lib\Almacenes_controller.dcp" />
<DCCReference Include="..\..\Lib\Almacenes_model.dcp" />
<DCCReference Include="..\..\Lib\Articulos_view.dcp" />
<DCCReference Include="..\..\Lib\bdertl.dcp" />
<DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
<DCCReference Include="..\..\Lib\Contactos_model.dcp" />
<DCCReference Include="..\..\Lib\Contactos_view.dcp" />
<DCCReference Include="..\..\Lib\cxDataD11.dcp" />
<DCCReference Include="..\..\Lib\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Lib\cxExportD11.dcp" />
<DCCReference Include="..\..\Lib\cxExtEditorsD11.dcp" />
<DCCReference Include="..\..\Lib\cxGridD11.dcp" />
<DCCReference Include="..\..\Lib\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Lib\cxPageControlD11.dcp" />
<DCCReference Include="..\..\Lib\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\dbrtl.dcp" />
<DCCReference Include="..\..\Lib\dclcxLibraryD11.dcp" />
<DCCReference Include="..\..\Lib\designide.dcp" />
<DCCReference Include="..\..\Lib\dsnap.dcp" />
<DCCReference Include="..\..\Lib\dxComnD11.dcp" />
<DCCReference Include="..\..\Lib\dxCoreD11.dcp" />
<DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Lib\dxLayoutControlD11.dcp" />
<DCCReference Include="..\..\Lib\dxPSCoreD11.dcp" />
<DCCReference Include="..\..\Lib\dxPScxCommonD11.dcp" />
<DCCReference Include="..\..\Lib\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\..\Lib\dxPSLnksD11.dcp" />
<DCCReference Include="..\..\Lib\dxThemeD11.dcp" />
<DCCReference Include="..\..\Lib\fqb110.dcp" />
<DCCReference Include="..\..\Lib\frx11.dcp" />
<DCCReference Include="..\..\Lib\frxe11.dcp" />
<DCCReference Include="..\..\Lib\fs11.dcp" />
<DCCReference Include="..\..\Lib\GestorInformes_controller.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\GUISDK_D11R.dcp" />
<DCCReference Include="..\..\Lib\Jcl.dcp" />
<DCCReference Include="..\..\Lib\JclVcl.dcp" />
<DCCReference Include="..\..\Lib\JvCoreD11R.dcp" />
<DCCReference Include="..\..\Lib\JvCtrlsD11R.dcp" />
<DCCReference Include="..\..\Lib\JvPageCompsD11R.dcp" />
<DCCReference Include="..\..\Lib\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\..\Lib\JvSystemD11R.dcp" />
<DCCReference Include="..\..\Lib\PedCli_AlbCli_relation.dcp" />
<DCCReference Include="..\..\Lib\PedCli_PedProv_relation.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosCliente_model.dcp" />
<DCCReference Include="..\..\Lib\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Lib\PNG_D10.dcp" />
<DCCReference Include="..\..\Lib\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\rtl.dcp" />
<DCCReference Include="..\..\Lib\tb2k_d10.dcp" />
<DCCReference Include="..\..\Lib\tbx_d10.dcp" />
<DCCReference Include="..\..\Lib\vcl.dcp" />
<DCCReference Include="..\..\Lib\vclactnband.dcp" />
<DCCReference Include="..\..\Lib\vcldb.dcp" />
<DCCReference Include="..\..\Lib\vcljpg.dcp" />
<DCCReference Include="..\..\Lib\vclshlctrls.dcp" />
<DCCReference Include="..\..\Lib\vclx.dcp" />
<DCCReference Include="..\..\Lib\xmlrtl.dcp" />
<DCCReference Include="uDialogOpcionesImpresionPedidosCliente.pas">
<Form>fDialogOpcionesImpresionPedidosCliente</Form>
<DesignClass>TfEditorPedidosProveedor</DesignClass>
@ -149,13 +158,6 @@
<Form>frViewPedidosCliente</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclshlctrls.dcp" />
<DCCReference Include="vclx.dcp" />
<DCCReference Include="xmlrtl.dcp" />
</ItemGroup>
</Project>
<!-- EurekaLog First Line

26
Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.dfm
View File

@ -309,14 +309,13 @@ inherited fEditorPedidoCliente: TfEditorPedidoCliente
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
inherited ToolButton14: TToolButton [4]
Left = 334
Top = 0
Wrap = False
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
inherited FontName: TJvFontComboBox [5]
Left = 399
Top = 0
ExplicitLeft = 399
@ -325,18 +324,14 @@ inherited fEditorPedidoCliente: TfEditorPedidoCliente
inherited FontSize: TEdit
Left = 544
Top = 0
Width = 90
Width = 106
ExplicitLeft = 544
ExplicitTop = 0
ExplicitWidth = 90
ExplicitWidth = 106
end
inherited ToolButton13: TToolButton [7]
Left = 0
Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitTop = 0
ExplicitHeight = 27
end
inherited UpDown1: TUpDown [8]
Left = 0
@ -344,37 +339,38 @@ inherited fEditorPedidoCliente: TfEditorPedidoCliente
ExplicitLeft = 0
ExplicitTop = 27
end
inherited ToolButton6: TToolButton
inherited ToolButton6: TToolButton [9]
Left = 17
Top = 27
ExplicitLeft = 17
ExplicitTop = 27
end
inherited ToolButton7: TToolButton
inherited ToolButton7: TToolButton [10]
Left = 83
Top = 27
ExplicitLeft = 83
ExplicitTop = 27
end
inherited ToolButton8: TToolButton
inherited ToolButton8: TToolButton [11]
Left = 150
Top = 27
ExplicitLeft = 150
ExplicitTop = 27
end
inherited ToolButton12: TToolButton
inherited ToolButton12: TToolButton [12]
Left = 233
Top = 27
ExplicitLeft = 233
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton9: TToolButton
inherited ToolButton9: TToolButton [13]
Left = 241
Top = 27
ExplicitLeft = 241
ExplicitTop = 27
end
inherited ToolButton10: TToolButton
inherited ToolButton10: TToolButton [14]
Left = 386
Top = 27
ExplicitLeft = 386

2
Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas
View File

@ -179,7 +179,7 @@ begin
else
FPedido.IMPORTE_PORTE := 0;
RecalcularPortePorUnidad;
// RecalcularPortePorUnidad;
end;
function TfEditorPedidoCliente.GetController: IPedidosClienteController;

360
Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.dfm
View File

@ -5,7 +5,6 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente
ClientWidth = 700
Position = poDesigned
ExplicitWidth = 708
ExplicitHeight = 240
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@ -69,9 +68,9 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente
Left = 427
Visible = True
ExplicitLeft = 427
ExplicitWidth = 273
ExplicitWidth = 79
object TBXItem39: TTBXItem
Action = actRecibirPedido
Action = actGenerar
DisplayMode = nbdmImageAndText
end
object TBXItem38: TTBXItem
@ -194,7 +193,7 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente
inherited pnlAgrupaciones: TTBXDockablePanel
Top = 357
ExplicitTop = 357
ExplicitWidth = 128
ExplicitWidth = 700
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 700
ExplicitWidth = 700
@ -233,17 +232,12 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente
inherited actAnchoAuto: TAction
ImageIndex = 22
end
object actRecibirPedido: TAction
Category = 'Acciones'
Caption = 'Recibir pedido...'
ImageIndex = 23
OnExecute = actRecibirPedidoExecute
OnUpdate = actRecibirPedidoUpdate
end
object actFacturarPedido: TAction
Category = 'Acciones'
Caption = 'Generar factura'
Enabled = False
ImageIndex = 23
Visible = False
OnExecute = actFacturarPedidoExecute
OnUpdate = actFacturarPedidoUpdate
end
@ -256,8 +250,27 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente
object actInformes: TAction
Category = 'Acciones'
Caption = 'Informes'
Enabled = False
Visible = False
OnExecute = actInformesExecute
end
object actGenerar: TAction
Category = 'Acciones'
Caption = 'Generar'
ImageIndex = 23
OnExecute = actGenerarExecute
OnUpdate = actGenerarUpdate
end
object actGenerarAlbaranCli: TAction
Category = 'Acciones'
Caption = 'Generar albar'#225'n de cliente'
OnExecute = actGenerarAlbaranCliExecute
end
object actGenerarPedidoProv: TAction
Category = 'Acciones'
Caption = 'Generar pedido a proveedor'
OnExecute = actGenerarPedidoProvExecute
end
end
inherited SmallImages: TPngImageList [5]
PngImages = <
@ -1627,7 +1640,9 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente
end
inherited GridPopupMenu: TPopupMenu
object Cambiarsituacin1: TMenuItem [4]
Action = actRecibirPedido
Caption = 'Recibir pedido...'
ImageIndex = 23
OnClick = actRecibirPedidoExecute
end
object N4: TMenuItem [5]
Caption = '-'
@ -1949,6 +1964,327 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente
Left = 144
Top = 112
end
object JsGenerarDialog: TJSDialog
Content.Strings = (
'Elija una opci'#243'n:')
DialogOptions = [doCommandLinks, doModal]
Glyph.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00
00001C0806000000720DDF940000000970485973000017120000171201679FD2
520000000467414D410000B18E7CFB5193000003104944415478DAAD96FB4B14
5114C7CFE463DC1E606444BFF54424D3DC55CA52B1CCD7165A219905054182FD
1452FD5810FD100406610A669A998FC4F5BDB6266265DAB60F5DD15E58FE03B2
3F99D29ABBA7B9779C71C61D9D6177CFCE70CFDCB97B3EF7DCF3BD33C38082FD
B502B2B300CC656020048688A24F036233A0671F40D43160BA87BF62AEEE1010
60D7AE293AD8B835815E9B625C80DC8F1E88D4A7C1E8C1FB8F9FD6C3C44035B3
21500A65F6D700FE2EA580A5EC551F4A50359316B31D76EFDC0EE5F72A645045
A067AE0623074B8140891108F1057064CC0D556053DF173812B707E6DCF332A8
225080D201DB4AF99BF335B4D502F371415BCC364833C4C29F458F0C2A031281
081734AB0B3C88403C1E6E3E2E7960F6A8FFD27A7D3EF07A11DA2C76C84A8D87
A57FCB32E8B8A54A4C8C21B59365C9015996EF2240B6634DF435B51460A46D1F
70C093AA46BF09C980C12CA914E6F371ADD707EF1DB3B0B0B8006EB79B8EA96B
EA5106121851245129118FD8BFA2DC5C53C6BAF5EBBBBA97C2D64EC064195B1F
286C76E956A0EA5C51AEB4764A9929F5750D5A9581D2274B9B651C0BA2F514A8
6F28E36B70AD9A4253EF97A9AA55B0CEBA87D03B645B3F43C1DE589C58186D10
81150FCAC57B11E161B04517099BB953C78643141B01BA28EEE4DAB0B04DE2B8
CA460B9C399902E661BB3AB0F5AD038BF30CD4D7E7DD14815A61023027DD00EF
469C1A80FD1C307F1578FD4A81E665945AD68924181A9D5007B6F4DBF1527E32
F5C9D3632351F8F549AEE916B14EAA039BCD362C31A6040D23E7887D4A03B0CF
86C5C6641A24BB7646D3F2D51A77F8C1BCDCFFC79CD3EAC0D7BD56AE86294165
4660CB5C6B737DD3062CCA31D00069E76E05241862CF1EDD05E7D40F756063CF
673C7F5A4F679A59541EF03E4C8C3B0893DF67D481AFBAC7B0F05412CD30EBE2
ED80F7617CEC0198FEF94B1BF06C6622AD4B4EC99D80F7A1666043D7281A3312
FD84C20B8417C3AA789405239826E0CBCE4F98979E10344C33B0BE630473D312
82866906D6993E62F6F1C3F45D160A5305BE68FF8095CF5B4302134CFE1185EA
1FB8A1B4FF4FE32FF6FADB8B5E0000000049454E44AE426082}
Instruction.Text = 'Generar a partir del pedido...'
Instruction.Glyph.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00
00001C0806000000720DDF940000000970485973000017120000171201679FD2
520000000467414D410000B18E7CFB5193000003104944415478DAAD96FB4B14
5114C7CFE463DC1E606444BFF54424D3DC55CA52B1CCD7165A219905054182FD
1452FD5810FD100406610A669A998FC4F5BDB6266265DAB60F5DD15E58FE03B2
3F99D29ABBA7B9779C71C61D9D6177CFCE70CFDCB97B3EF7DCF3BD33C38082FD
B502B2B300CC656020048688A24F036233A0671F40D43160BA87BF62AEEE1010
60D7AE293AD8B835815E9B625C80DC8F1E88D4A7C1E8C1FB8F9FD6C3C44035B3
21500A65F6D700FE2EA580A5EC551F4A50359316B31D76EFDC0EE5F72A645045
A067AE0623074B8140891108F1057064CC0D556053DF173812B707E6DCF332A8
225080D201DB4AF99BF335B4D502F371415BCC364833C4C29F458F0C2A031281
081734AB0B3C88403C1E6E3E2E7960F6A8FFD27A7D3EF07A11DA2C76C84A8D87
A57FCB32E8B8A54A4C8C21B59365C9015996EF2240B6634DF435B51460A46D1F
70C093AA46BF09C980C12CA914E6F371ADD707EF1DB3B0B0B8006EB79B8EA96B
EA5106121851245129118FD8BFA2DC5C53C6BAF5EBBBBA97C2D64EC064195B1F
286C76E956A0EA5C51AEB4764A9929F5750D5A9581D2274B9B651C0BA2F514A8
6F28E36B70AD9A4253EF97A9AA55B0CEBA87D03B645B3F43C1DE589C58186D10
81150FCAC57B11E161B04517099BB953C78643141B01BA28EEE4DAB0B04DE2B8
CA460B9C399902E661BB3AB0F5AD038BF30CD4D7E7DD14815A61023027DD00EF
469C1A80FD1C307F1578FD4A81E665945AD68924181A9D5007B6F4DBF1527E32
F5C9D3632351F8F549AEE916B14EAA039BCD362C31A6040D23E7887D4A03B0CF
86C5C6641A24BB7646D3F2D51A77F8C1BCDCFFC79CD3EAC0D7BD56AE86294165
4660CB5C6B737DD3062CCA31D00069E76E05241862CF1EDD05E7D40F756063CF
673C7F5A4F679A59541EF03E4C8C3B0893DF67D481AFBAC7B0F05412CD30EBE2
ED80F7617CEC0198FEF94B1BF06C6622AD4B4EC99D80F7A1666043D7281A3312
FD84C20B8417C3AA789405239826E0CBCE4F98979E10344C33B0BE630473D312
82866906D6993E62F6F1C3F45D160A5305BE68FF8095CF5B4302134CFE1185EA
1FB8A1B4FF4FE32FF6FADB8B5E0000000049454E44AE426082}
Instruction.Icon = tdiCustom
CustomButtons = <
item
Caption = 'Generar un albar'#225'n de cliente'
Value = 100
Default = True
Info.Strings = (
'Se generar'#225' un albar'#225'n de cliente basado en este pedido. Solo se' +
' tendr'#225'n en cuenta aquellos art'#237'culos que existan en el cat'#225'logo' +
' y sean inventariables.'
'')
end
item
Caption = 'Generar uno o m'#225's pedidos a proveedor'
Value = 200
Info.Strings = (
'Generar pedidos a los proveedores con los art'#237'culos de este pedi' +
'do que existan en el cat'#225'logo y sean inventariables.')
end>
ButtonBar.Buttons = [cbCancel]
MainIcon = tdiCustom
Title = 'FactuGES'
Position = dpMainFormCenter
Icon.Data = {
0000010003002020100001000400E8020000360000002020000001000800A808
00001E0300002020000001002000A8100000C60B000028000000200000004000
0000010004000000000000020000000000000000000000000000000000000000
000000008000008000000080800080000000800080008080000080808000C0C0
C0000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF000000
0000000000000000000000000000000008777777777777777777777700000000
0877767777677776777767760000000008F88888888888888888888700000000
08F8FF8F8F888888888888860000000008FF8F8F88F8F8888888888C00000000
08F88888F8888888888888860000000008F8688878E8888E88E8788700000000
08F8688888F8F8FFFFFF88760000000008FF4888888F8FFFFFFF788700000000
08F8676767677677677658E50000000008FF8888888887878787888700000000
08FF8887887E8888888888860000000008FFE8E8E788C8E8FF8F8F8600000000
08FFF8F8F8F8FF8F88F8F8870000000008FFFFFF8FF8F8F8F88F888600000000
0FF8477878787878788788860000000008FF68888888F8FF8F8F788700000000
08B7588888FF8FFFFFFF78860000083008BB47887776777777776F86000000B7
8B9B73BB88788787E87878870000008BB8B9BB78888888EFF8F8FF8600000087
B8BB8B888E8E8E88FFF8F886000000088BBB888FFFFFFFFFF8F877770000B9BB
B8FFBB9B9BFFFFFFF87466460000BBB9BB8FBBBBB8FFFFFFF88F888700000008
B8BB88888FFFFFFFF88F8F7700000008BBBBBB8FFFFFFFFFFF8887700000007B
B7B98BB8FFFFFFFFF8887700000000B78B9B87B888F88F88F8877000000007B0
08BB883B78888788787700000000000000B9000000000000000000000000FFFF
FFFFF800000FF800000FF800000FF800000FF800000FF800000FF800000FF800
000FF800000FF800000FF800000FF800000FF800000FF800000FF800000FF800
000FF800000FF800000F9800000FC000000FC000000FC000000FE000000F0000
000F0000000FE000000FE000001FC000003FC000007F980000FFFCFFFFFF2800
0000200000004000000001000800000000000004000000000000000000000001
00000001000000000000694731007C5D49007E604C0081635000826451008567
540085685500886B5900896D5B008A6E5D008B705F008E715F008B7260008C72
61008E74640084766C00957A6900977D6D00887B72009A8171009D8272009C84
76009D8778009F897B00A28A7900A08B7D00A18C7E00E1B06E00E1B67D003E7A
970073A0A5007AA2B70074AFBD007BB2BB003CAACE0028A5DB0020ADDF000D9A
E500209EE3000DA6E2001AA4EF0000A6FF000CABFE0009ACFE0010A4F10015AC
FA0000B5FB0000B0FD000CB6FC0000BFF90000BAFD0004BAFD0009BBFB0013B6
F40015BFFA001CBDFB0026B7FD00589EC50040A4CD0040ABCC0050A2C7005DAE
C00060A3C20062A4C60060B7CB006AB0CD007BB6C80077BAC80061BADD0044AD
E50000C3F80007C6FB0000CAF80000CFFB0000D4F90026C8FA0026CDF8002BCC
F90039C4FB0039C2FC0039CAFA003FCFFB0024D6F80030D2F80039D5F80000F8
F8001FF8F8002CF6F8003EF4F8005AC6DC0070CDDF0052C0E40054C9E3004DCE
FA005FC7FF004FD2FB004DD9F8005FD9FB006ED3E70063CDFE0060D1FB0060D8
F90060DDF80046F8F90056F0F8005FFAFA0073E3F80073E4F90073EEF80060F1
F800958A84009A918C0081999500A68F8200AD968500A3968C00AE988900AD9A
8D00B19A8B00AF9C9000B09E9200B59F9200B7A29300B2A19600B5A19400B7A4
9700BDA79700B4A39800B1A59D00B4A79F00BAA69800BCA79900B4A89F00BCA8
9900BAA89C00BDAA9D00BEAC9E0083ADBD00B5A9A100BDABA000BEADA100BFAF
A500A0BABE00C0AB9E00C1AC9E00C6AE9F00E2B98100E4BA8300E4BB8400E5BC
8500E1BD8E00E3BF9000C0ADA000C2B0A300C2B1A500C4B2A600C1B2A800C3B5
AB00C8B4A800CCB9AD00CEBCB100D0BEB200D1BFB400E4C19300E5C29400E6C4
9600E8C69900D0C9A300CFC1B800D2C1B600D3C3B800D5C4B900D6C6BC00D8C6
BC00D6C8BE00DAC9BF00ECD3B000EDD4B200EFD6B500E7D1B800E7D3BD00F0D8
B6008CB7C40080BEC70097C3C70099C3C900ABD7CF00AFD9DD0086E3F90086E7
F90086ECF8009EE5FB0090E8F900ACEDFC00BCEAFD00BCF1FB00BFF1FD00D7C9
C000D9CAC100DCCBC200DACCC200DDCCC300DACCC400DDCEC400DED0C600DED1
C900DED3CC00DFD4CD00E1D1C900E2D5CD00F0DCC200E3D8D200E5D9D200E2DA
D500E6DBD400E5DCD500E8DDD600E6DDD800E9DFD900E6E0DB00EAE0DA00EAE2
DD00ECE3DE00EBE4DE00ECE4DE00F3E7D900C6E1EF00C9EFFD00D7F6FD00DFF3
FF00DFFEFE00EBE7E300EDE6E100EFE7E400EEE8E400F0EAE600F2EDE900F2EE
EC00F4EFEC00F5F0EE00F9F4ED00E7FAFD00EBF8FF00F6F2F000F7F4F100F8F4
F200F9F7F500FAF8F600FBF9F900FCFBFA00FCFCFB00FEFEFE00000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000007D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
0D0D0000000000000000009C9C19191919191919191919191919191919191919
1903000000000000000000ABDECBCBC7C7AFABABABABAAA3A2A2A0A0A0A0A0A0
8607000000000000000000ABECEAE9DEDEDEDED7D5D2D2D2CBCBCBCBB0CBB0CB
9007000000000000000000ABEDECEAE9DEDEDBD7D7D5D2D2D2CDCDCBB0B0B0B0
9007000000000000000000AFEDE9A9CFD2CFD2CDCBCBCBB0B0ABACA3A3A3A3B0
9007000000000000000000AFF0D5017783838386868686869099909999907BB0
9007000000000000000000B0F4D501A0B0CBD2D5DEECEDF7FAFAFAFAFAF77BAA
9007000000000000000000CBF4DC01A0B0B0B0D2D5DBEAEDF7FAFAFAFAF47BB0
9007000000000000000000CBF8DC010404070604090909090D0D110D110D02A3
9007000000000000000000CBFAED9E9E9E9C999E8C8C8C868683837E7D7D7ACB
9007000000000000000000CBFAF1A7A7A6A6A6A69898989898B5DBDBD5D5D2D2
9907000000000000000000CDFAF796969696961D961D931D1DB4DEDBD7D5D5D2
9C07000000000000000000CFFAFAFAFAF8F7F0F0EDEDEDECE9E9DEDEDED7D5D5
9907000000000000000000CDFAFAEAF0EDEDECEAEAE9DEDEDBDCD5D5D5D5D2D5
9C07000000000000000000D2FAEC01737D7D7B7D7D7B7D7B7D7B7B7B7D7B7DD2
9907000000000000000000CFFAEC019EABB0CBD2D5DCDEECEDF4F4F4F4EA7BD2
9C07000000000000000000B9524601A0B0B0CBB5D5DEEAEDF7FAFAFAFAF47DD5
9C070000000000213F0000B83226010C3F5C1F111214141616191B1B1B1807D2
9C07000000000000253D8A5B322D711E2860BA7E7E7A7E797A797979767676D5
9E0700000000000041375E662F2B65314EBBB6B6B6B6B4B4B1E2F4EDEDEDECEA
9C070000000000008F5D66663232394EC1A81C1C1C1C1C1C1CD3F7F4EDDED7D5
9C0700000000000000B7BE6E5758BEBDE4E6E6F3FAFAFAFAFAFAF7F4D5928675
7304000000002A2A2A2A4A6AFAE7562F2A2A2A5FFAFAFAFAFAFAF8D577010101
0101000000004747472F4A59C5E7564A32474766FAFAFAFAFAFAFADCA0D2CFB0
A20C00000000000000436C6958686D6BC2C5C5E7FAFAFAFAFAFAFADEAADEDBCB
1470000000000000004551534A4A5250C0E7FAFAFAFAFAFAFAFAFADEAAD7B514
700000000000000042384C54472B613550C3FAFAFAFAFAFAFAFAFADEA1B0196F
000000000000000024234463322EBC5A3664E3ECE9E9E9E9E9E9E9CF90731300
000000000000003A3C00002232298B8B3E3B207E8B7E8B7E827E817E74100000
0000000000000000000000003227000000000000000000000000000000000000
000000000000FFFFFFFFF800000FF800000FF800000FF800000FF800000FF800
000FF800000FF800000FF800000FF800000FF800000FF800000FF800000FF800
000FF800000FF800000FF800000FF800000F9800000FC000000FC000000FC000
000FE000000F0000000F0000000FE000000FE000001FC000003FC000007F9800
00FFFCFFFFFF2800000020000000400000000100200000000000801000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000007067
5F70AA9382E570513CE3735540E3735540E3735540E3735540E3735540E37355
40E3735540E3735540E3735540E3735540E3735540E3735540E3735540E37355
40E3735540E3735540E3735540E3735540E3735540E3735540E372533EE5BAAB
A070000000000000000000000000000000000000000000000000000000005E54
4C7FCAB7ABFFC5B5AAFFA18877FFA28A78FFA28A79FFA28A79FFA28A79FFA28A
79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A
79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA58D7CFF7A5B46FFB2A1
967F000000000000000000000000000000000000000000000000000000006055
4D7ED7C6BBFFEDE4E0FFD9CCC4FFD9CCC4FFD9CBC3FFD8CAC1FFD7C9BFFFD6C7
BDFFD5C6BBFFD4C4BAFFD3C3B8FFD2C1B7FFD1C0B5FFD0BEB3FFCFBDB2FFCEBC
B0FFCEBBAFFFCEBBAFFFCEBBAFFFCEBBAFFFCEBCB0FFBEAA9CFF82644FFFB2A1
967E000000000000000000000000000000000000000000000000000000006056
4D7ED7C8BCFFF2EBE8FFEFE9E5FFEEE7E2FFECE5E0FFEBE2DEFFEAE0DBFFE9DE
D8FFE7DBD4FFE5D9D1FFE3D7CFFFE2D4CCFFE1D2C9FFDFD0C7FFDDCDC4FFDCCB
C2FFDBC9BFFFDBC9BFFFDBC9BFFFDBC9BFFFDCCAC1FFC1AC9FFF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006155
4E7ED8C9BDFFF3EDE9FFF1EAE6FFF0E9E6FFEEE6E1FFECE4DFFFEBE2DDFFEAE0
DAFFE9DED7FFE7DBD4FFE5D9D1FFE3D7CFFFE2D4CCFFE1D2C9FFDFD0C7FFDDCD
C4FFDCCBC2FFDBC9BFFFDBC9BFFFDBC9BFFFDCCAC0FFC1AC9FFF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006157
4E7ED9C9BFFFF4EFEDFFEFE8E3FFD0C2B9FFDFD5CEFFE0D5CEFFE0D4CCFFDED3
CBFFDDD1C8FFDCCFC6FFDACCC4FFD9CBC1FFD8C9BFFFD7C7BDFFD6C5BBFFD5C4
B9FFD3C2B7FFD2C0B5FFD2BFB4FFD2BFB4FFDAC8BEFFC1AC9FFF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006256
4F7EDACCC0FFF5F2EFFFE5DDD9FF5C3821FFB0998AFFB8A394FFB8A394FFB9A3
94FFB8A495FFB9A597FFB9A698FFBAA698FFBBA799FFBBA89AFFBBA89BFFBCA8
9BFFBCA89BFFBCA89BFFBBA89AFFB49E8FFFD8C6BBFFC1AC9FFF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006256
4F7EDBCBC1FFF8F4F3FFE7E0DBFF5F3C24FFD0BDB2FFDCCBC1FFDDCCC3FFE2D2
CBFFE7DBD4FFEDE2DEFFF0E8E6FFF5F0EDFFF9F7F4FFFDFDFDFFFFFFFFFFFFFF
FFFFFFFFFFFFFFFFFFFFFAF8F7FFB39D8DFFD8C6BBFFC1AC9FFF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006256
4F7EDCCEC3FFFAF6F5FFE9E2DDFF5F3C24FFD2BFB5FFDFCDC4FFDECCC3FFE0CE
C6FFE4D4CDFFE9DDD6FFEFE4E0FFF1EAE8FFF7F1EFFFFBF8F6FFFFFEFFFFFFFF
FFFFFFFFFFFFFFFFFFFFFCFBFAFFB5A090FFD9C7BEFFC1AD9FFF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006257
4F7EDDCFC4FFFCF9F9FFE9E4E0FF5F3A23FF7C5D49FF7F5F4CFF7E5F4CFF7E60
4DFF7F614DFF816350FF826552FF836654FF846856FF856A57FF866B59FF876C
5BFF876D5BFF876D5BFF866B59FF72523DFFD5C3B9FFC1AFA1FF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006357
507EDECFC6FFFCFCFBFFF4F1F0FFC3B6AEFFC3B5ADFFC1B4ACFFC0B3AAFFBFB1
A9FFBEB0A6FFBDAEA5FFBDACA3FFBCABA2FFBBAAA0FFBAA99FFFB8A69AFFB8A4
98FFB6A396FFB5A194FFB49F93FFB39D90FFDCCDC4FFC2AEA1FF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006357
507EDFD2C7FFFEFEFDFFF9F5EFFFE8C696FFE9C799FFE8C697FFE7C596FFE7C4
95FFE6C394FFE5C293FFE4C091FFE4C090FFE3BF8FFFE2BD8CFFE9D5BFFFEBE1
DCFFEADFD8FFE7DCD5FFE5DAD3FFE4D8D0FFE3D4CCFFC2AFA2FF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006458
517EE0D3C8FFFFFFFFFFFAF5EFFFE3B77CFFE4B97FFFE2B87EFFE3B77DFFE2B7
7CFFE2B67BFFE1B57AFFE1B479FFE0B478FFE0B377FFDFB174FFE6D0B7FFEBE1
DCFFE8DFD9FFE8DDD6FFE6D9D2FFE3D8D1FFE4D7CFFFC3AFA2FF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006458
517EE1D2C9FFFFFFFFFFFEFEFDFFFEFFFFFFFCFDFEFFFBFBFBFFF9F7F8FFF8F5
F6FFF7F3F2FFF5F1F0FFF4EFEEFFF1EDEBFFF0EBE9FFEEE9E6FFEDE6E2FFECE3
DEFFEBE1DBFFE9DFD9FFE8DDD6FFE6DAD3FFE5D9D2FFC3B0A3FF81634FFFB2A1
967E000000000000000000000000000000000000000000000000000000006459
517EE1D4CAFFFFFFFFFFFDFDFCFFEEEBE8FFF5F2F0FFF4F0EFFFF3EFECFFF2ED
EAFFF1EBE8FFEEE9E5FFEFE7E3FFECE5E1FFEAE4DEFFEAE1DCFFE8E0DAFFE7DE
D8FFE6DDD6FFE5DBD4FFE4D8D1FFE2D6CEFFE6DBD4FFC3B1A4FF81634EFFB2A1
967E000000000000000000000000000000000000000000000000000000006559
527EE2D4CAFFFFFFFFFFF0ECEAFF5B361EFFAB9383FFB39D8EFFB39D8DFFB39D
8DFFB29D8DFFB29C8DFFB29C8CFFB29C8CFFB29C8CFFB29C8CFFB29C8CFFB29C
8CFFB29C8CFFB29C8CFFB29C8DFFB39D8EFFE3D8D0FFC4B1A4FF81634EFFB2A1
967E000000000000000000000000000000000000000000000000000000006559
527EE5D4CAFFFFFFFFFFF7F0EBFF5F3B24FFCCB8ADFFD7C5BAFFD9C7BDFFDCCC
C3FFE1D4CCFFE5DAD4FFE8E0DBFFEDE5E1FFF1EBE9FFF5F2EFFFF7F5F3FFF8F6
F4FFF8F5F4FFF8F6F4FFF1EEEAFFB29C8DFFE6DAD3FFC4B2A5FF81634EFFB2A1
967E00000000000000000000000000000000000000000000000000000000685A
527E9AC6C9FF35CFFEFF3DAEEBFF663E24FFD2BFB4FFE0CBBFFFE0C9BDFFE1CD
C4FFE4D5CDFFE9DED7FFEEE5E0FFF2EBE8FFF6F2F0FFFCF8F8FFFFFFFEFFFFFF
FFFFFFFFFFFFFFFFFFFFFCFAF9FFB49E8FFFE7DED7FFC5B3A6FF81634EFFB2A1
967E00000000000000000000000000000000007792910072A7A3001E33366957
4C7C86C1C8FF00BFFBFF079AEBFF6A3E23FF926D57FF5FA3C8FF4AC1E8FF6C9C
A2FF917260FF927767FF947A69FF957C6CFF977E6FFF998171FF9A8374FF9B85
76FF9C8678FF9C8678FF998274FF7D5E49FFE3D9D4FFC5B3A7FF81634EFFB2A1
967E00000000000000000000000000000000005A6F7000A9E5E40075AEAE5C90
A5BD75D0E0FF00BFFAFF0CA3F4FF8A9A91FF3C7492FF03A4E4FF4AD5FFFF98C4
CBFFB3A196FFB1A197FFB0A096FFB09F95FFAF9D92FFAF9C91FFAD9A8EFFAC99
8CFFAB988AFFAB9789FFAA9688FFA99386FFE8E0DAFFC5B4A7FF81634EFFB2A1
967E00000000000000000000000000000000000000002DA5BFC110C2FFFF4DD0
FDFF64DBF9FF00B3FAFF09A8FEFF68D7FFFF04B5FFFF24CCFBFFAFD8CEFFF7DA
B8FFF3DBBBFFF3DBBAFFF2D9B9FFF1D8B7FFF0D7B4FFEED5B2FFF6EADDFFF9F6
F4FFF7F3F1FFF5F1EEFFF5EFECFFF4EDEAFFF1EBE7FFC6B4A8FF81634EFFB2A1
967E00000000000000000000000000000000000000005F8A909142C7E4E960DE
F8FF64D7FAFF00B6FDFF00B8FDFF21B2FDFF1ECCF7FF93EBFCFFD2C69BFFE1AB
63FFDFAC66FFDFAC66FFDFAC66FFDFAC66FFDFAC66FFDEA961FFEFDBC0FFF8F6
F5FFF6F2F0FFF3EDEBFFECE2DCFFE9DFD9FFE5DBD6FFC2B1A4FF81634FFFB2A1
967E000000000000000000000000000E171A000E171A00040B145994A4A990EB
FCFF61F1F7FF13FAF7FF23F9F7FF93EDF7FF8CE5F8FFD5F2FDFFE9F8FFFFE7F8
FFFFF0FCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFDFEFFFFFAFAF9FFF9F7
F5FFF7F2F0FFE8DFD8FFC7AE9FFFBEA998FFAF9888FFB09A8AFF7F604DFFB2A1
967E00000000000000000000000000AAFFFF00AAFFFF00AAFFFF00A4FFFF00CD
FAFF5DFCF9FFFFFFFFFFEEFEFEFF00FBF7FF00AAFEFF00A1FFFF00A1FFFF00A0
FFFF56C3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFDFBFFFCFBFAFFFBFA
F8FFE6DDD6FFAA9180FF5D3922FF603D26FF613E27FF613E28FF634029FFB4A3
987E00000000000000000000000000CAFFFF00CAFFFF00CBFFFF00B0FFFF00CD
FBFF38F5F7FFC3EFFAFFF0FFFEFF00FAF7FF00C8F7FF00C2F7FF00C2F7FF00C1
F7FF57D7FAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFEFFFDFDFCFFFCFC
FBFFE7DED8FFCCB9ACFFE6DBD5FFE2D7D0FFDCCFC5FFD7C5BBFF8E705DFFB4A2
9680000000000000000000000000002E383C002E383C00252F364C99B0B57DE8
FBFF59F1F7FF25F7F7FF41FAF8FF7CEEF7FF77E4F7FFB5EFFCFFC6F2FDFFC3F2
FDFFD9F6FCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDFEFEFFFEFE
FEFFE9E1DAFFCEBCAFFFF1E9E3FFEADFD8FFE4D5CCFF9D816FFF3A291F868985
831C00000000000000000000000000000000000000004E7073774AB0DADC37C9
FBFF22D5F7FF00D3F9FF02C3FBFF37D5F7FF34BEFCFFA2E6FAFFECFBFDFFFFFF
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFF
FFFFEAE2DCFFCDBBADFFEADFD8FFE3D5CBFF9F8271FF3E2D2386050100200000
000000000000000000000000000000000000000000003E9CC4C219C0FFFF23C9
FCFF30D3F8FF00BEF8FF06A8FEFF4FDCF8FF00B8FCFF32C2FBFFC0EBFCFFFFFF
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
FFFFEAE3DEFFCDB9ABFFDDCEC4FFA58979FF3E2C1F8F0905041B000000000000
000000000000000000000000000000000000003451510099DDDB0091C0C35DAD
BCCF76D7E9FF00BEF9FF10A9FBFFBDDEDEFF5AC8DDFF0AB5F7FF62CEFFFFCBE4
F1FFF1E7E0FFEFE7E1FFEEE6E1FFEEE6E1FFEEE6E0FFEDE6E0FFEDE5E0FFEEE6
E1FFE1D4CCFFC5AE9FFFA68D7FF53E2718A10402000E00000000000000000000
0000000000000000000000000000000000000075B7AF0099C7C500323E425442
3B5C6BA8B1DA00C1FCFF0EA1F3F8A98E80C0AB9081C12698B1C10088C4C14C85
A3C1A18D80C19E8D81C19E8B81C19D8C80C19B8C7FC19B8A7FC19C897FC19A89
7EC19B8B7EC1897769C2432B1BAC000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000045565A00C5FFFF0094E6E2000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000FFFFFFFFF0000007F0000007F0000007F000
0007F0000007F0000007F0000007F0000007F0000007F0000007F0000007F000
0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000
0007C0000007C000000700000007000000070000000700000007C000000FC000
001F8000003F800000FFF8FFFFFF}
Width = 450
Left = 144
Top = 144
end
object JsPrevisualizarDialog: TJSDialog
Content.Strings = (
'Elija una opci'#243'n:')

68
Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.pas
View File

@ -18,7 +18,6 @@ type
TfEditorPedidosCliente = class(TfEditorGridBase, IEditorPedidosCliente)
N4: TMenuItem;
Cambiarsituacin1: TMenuItem;
actRecibirPedido: TAction;
JsNuevoPedidoProveedorDialog: TJSDialog;
JsPrevisualizarDialog: TJSDialog;
JsImprimirDialog: TJSDialog;
@ -32,7 +31,11 @@ type
actInformes: TAction;
TBXItem41: TTBXItem;
JSInformesDialog: TJSDialog;
JsGenerarDialog: TJSDialog;
frViewPedidosCliente1: TfrViewPedidosCliente;
actGenerar: TAction;
actGenerarAlbaranCli: TAction;
actGenerarPedidoProv: TAction;
procedure FormShow(Sender: TObject);
procedure actCambiarSituacionExecute(Sender: TObject);
procedure actRecibirPedidoUpdate(Sender: TObject);
@ -44,6 +47,10 @@ type
procedure actEnviarEMailUpdate(Sender: TObject);
procedure actInformesExecute(Sender: TObject);
procedure OnListaAnosChange(Sender: TObject; const Text: string);
procedure actGenerarExecute(Sender: TObject);
procedure actGenerarUpdate(Sender: TObject);
procedure actGenerarAlbaranCliExecute(Sender: TObject);
procedure actGenerarPedidoProvExecute(Sender: TObject);
protected
FPedidos: IBizPedidoCliente;
@ -76,12 +83,12 @@ implementation
uses
uDataModulePedidosCliente, uDataModuleUsuarios, uFactuGES_App, uEditorDBBase,
uGenerarAlbaranesProvUtils, uGenerarFacturasProvPedUtils,
// uGenerarFacturasProvPedUtils,
// uInventarioController, uBizInventario,
uDialogUtils, uGridStatusUtils, uDBSelectionListUtils,
uDialogOpcionesImpresionPedidosCliente, uGestorInformesController;
uDialogOpcionesImpresionPedidosCliente, uGestorInformesController,
// uAlbaranesProveedorController, uBizAlbaranesProveedor,
// uGenerarPedidosProvUtils, ;
uGenerarAlbaranesCliUtils, uGenerarPedidosProvUtils;
{$R *.dfm}
@ -122,13 +129,14 @@ end;
procedure TfEditorPedidosCliente.actFacturarPedidoExecute(Sender: TObject);
begin
inherited;
{
if (ShowConfirmMessage('Generar factura', Format('¿Desea copiar todos los conceptos del pedido %s a la factura?', [Pedidos.REFERENCIA])) = IDYES) then
GenerarFacturaProvPed(Pedidos.ID)
else
GenerarFacturaProvPed(Pedidos.ID, False);
actRefrescar.Execute;
}
end;
procedure TfEditorPedidosCliente.actFacturarPedidoUpdate(Sender: TObject);
@ -140,6 +148,53 @@ begin
and ViewGrid.esSeleccionCeldaDatos;
end;
procedure TfEditorPedidosCliente.actGenerarAlbaranCliExecute(Sender: TObject);
var
IDAlbaranAux : Integer;
begin
inherited;
GenerarAlbaranCli(FPedidos.ID, IDAlbaranAux);
end;
procedure TfEditorPedidosCliente.actGenerarExecute(Sender: TObject);
var
Respuesta : Integer;
begin
inherited;
Respuesta := JsGenerarDialog.Execute;
if Respuesta <> IDCANCEL then
begin
case JsGenerarDialog.CustomButtonResult of
200 : begin // Generar uno o más pedidos a proveedor
actGenerarPedidoProv.Execute;
end;
100 : begin // Albaran nuevo
actGenerarAlbaranCli.Execute;
end;
end;
actRefrescar.Execute;
end;
end;
procedure TfEditorPedidosCliente.actGenerarPedidoProvExecute(Sender: TObject);
begin
inherited;
GenerarPedidosProv(FPedidos);
end;
procedure TfEditorPedidosCliente.actGenerarUpdate(Sender: TObject);
begin
inherited;
(Sender as TAction).Enabled := HayDatos and
not (ViewGrid.NumSeleccionados > 1) and
ViewGrid.esSeleccionCeldaDatos and
(FPedidos.SITUACION <> SITUACION_PEDIDO_SERVIDO);
end;
procedure TfEditorPedidosCliente.actInformesExecute(Sender: TObject);
var
Respuesta : Integer;
@ -325,7 +380,8 @@ begin
if Assigned(APedidos) then
if ElegirOpcionesImpresionPedidoCliente(FImprimirPrecios, FImprimirRefProveedor) then
FController.Print(APedidos, AllItems, FImprimirPrecios, FImprimirRefProveedor);
if FController.Print(APedidos, AllItems, FImprimirPrecios, FImprimirRefProveedor) then
RefrescarInterno;
end;
end;
end;

7
Source/Modulos/Pedidos de cliente/Views/uViewDatosYSeleccionClientePedido.pas
View File

@ -252,7 +252,7 @@ begin
FDireccionesController.CopiarDireccionFiscal(FCliente, FDireccion);
if (FCliente.Direcciones.RecordCount > 1) then
ADireccion := FClientesController.ElegirDireccionEntrega(FCliente, ' ')
ADireccion := FClientesController.ElegirDireccionEntrega(FCliente, 'Seleccione la dirección del cliente que quiere utilizar como dirección de envio de este pedido.')
else
ADireccion := FCliente.Direcciones;
@ -313,7 +313,10 @@ begin
[FDireccion.CALLE, FDireccion.POBLACION,
FDireccion.CODIGO_POSTAL, FDireccion.PROVINCIA]);
if not FDireccion.FAXIsNull then
if (not FDireccion.TELEFONOIsNull) and (FDireccion.TELEFONO <> '') then
ACadena := ACadena + #13#10 + 'Teléfono: ' + FDireccion.TELEFONO;
if (not FDireccion.FAXIsNull) and (FDireccion.FAX <> '') then
ACadena := ACadena + #13#10 + 'Fax: ' + FDireccion.FAX;
end;

5
Source/Modulos/Pedidos de cliente/Views/uViewDireccionEntregaPedidoCli.pas
View File

@ -86,7 +86,7 @@ implementation
{$R *.dfm}
uses
uEditorRegistryUtils, uCustomView, uBizInventario;
uEditorRegistryUtils, uCustomView; //, uBizInventario;
procedure TfrViewDireccionEntregaPedidoCli.actListaAlmacenesExecute(
Sender: TObject);
@ -243,6 +243,9 @@ begin
txtDireccion.Caption := FPedido.CALLE;
txtDireccion.Caption := txtDireccion.Caption + #13#10 + FPedido.CODIGO_POSTAL + ' ' + FPedido.POBLACION;
txtDireccion.Caption := txtDireccion.Caption + #13#10 + FPedido.PROVINCIA;
if (not FPedido.TELEFONOIsNull) and (FPedido.TELEFONO <> '') then
txtDireccion.Caption := txtDireccion.Caption + #13#10 + 'Teléfono: ' + FPedido.TELEFONO;
bModificar.Enabled := True;
end
else if (actListaAlmacenes.Checked) then

2
Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas
View File

@ -830,7 +830,7 @@ begin
ShowHourglassCursor;
try
APresupuesto.IMPORTE_NETO := FDetallesController.DarTotalImporteTotal(APresupuesto.Detalles);
APresupuesto.IMPORTE_PORTE := FDetallesController.DarTotalPorteTotal(APresupuesto.Detalles);
// APresupuesto.IMPORTE_PORTE := FDetallesController.DarTotalPorteTotal(APresupuesto.Detalles);
if not bEnEdicion then
APresupuesto.Post;

2
Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteReportController.pas
View File

@ -185,6 +185,8 @@ begin
AEditor.ListaID := AListaID;
AEditor.Title := 'Presupuesto - ' + AppFactuGES.EmpresaActiva.NOMBRE;
AEditor.LoadFromStream(AStream);
AEditor.TablaImpresion := nme_PresupuestosCliente;
AEditor.IdTablaImpresion := AListaID.ToString;
AEditor.Print;
finally
AEditor.Release;

9
Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas
View File

@ -79,7 +79,7 @@ type
procedure QuitarReciboCompensado(ARecibo : IBizRecibosCliente);
procedure Preview(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false);
procedure Print(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false);
function Print(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false): Boolean;
function DarListaAnosRecibos: TStringList;
procedure FiltrarAno(ARecibo: IBizRecibosCliente; ADynWhereDataTable: WideString; const Ano: String);
@ -149,7 +149,7 @@ type
procedure SetSituacionCobrados(ARecibos : IBizRecibosCliente; WithDeltas: Boolean=False);
procedure Preview(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false);
procedure Print(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false);
function Print(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false): Boolean;
function DarListaAnosRecibos: TStringList;
procedure FiltrarAno(ARecibo: IBizRecibosCliente; ADynWhereDataTable: WideString; const Ano: String);
@ -966,12 +966,13 @@ begin
end;
end;
procedure TRecibosClienteController.Print(ARecibosCliente: IBizRecibosCliente; AllItems: Boolean = false);
function TRecibosClienteController.Print(ARecibosCliente: IBizRecibosCliente; AllItems: Boolean = false): Boolean;
var
AReportController : IRecibosClienteReportController;
ID_Recibos: TIntegerList;
begin
Result := False;
AReportController := TRecibosClienteReportController.Create;
ID_Recibos := TIntegerList.Create;
@ -993,7 +994,7 @@ begin
else
ID_Recibos.Add(ARecibosCliente.ID);
AReportController.Print(ID_Recibos);
Result := AReportController.Print(ID_Recibos);
finally
AReportController := NIL;
FreeANDNil(ID_Recibos);

17
Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas
View File

@ -10,7 +10,7 @@ type
IRecibosClienteReportController = interface(IControllerBase)
['{3837DFA3-0A38-4BB2-B0DB-D0615249EA49}']
procedure Preview(const ListaID : TIntegerList);
procedure Print(const ListaID : TIntegerList);
function Print(const ListaID : TIntegerList): Boolean;
end;
TRecibosClienteReportController = class(TControllerBase, IRecibosClienteReportController)
@ -22,7 +22,7 @@ type
destructor Destroy; override;
procedure Preview(const ListaID : TIntegerList);
procedure Print(const ListaID : TIntegerList);
function Print(const ListaID : TIntegerList): Boolean;
end;
@ -30,7 +30,9 @@ implementation
uses
uROTypes, uEditorRegistryUtils, uIEditorRecibosClientePreview,
uEditorPreview, uDataModuleRecibosCliente, uEditorBase, cxControls;
uEditorPreview, uDataModuleRecibosCliente, uEditorBase, cxControls,
uFactuGES_App, uStringsUtils, uSistemaFunc, schRecibosClienteClient_Intf;
{ TRecibosClienteReportController }
@ -85,13 +87,14 @@ begin
end;
end;
procedure TRecibosClienteReportController.Print(const ListaID : TIntegerList);
function TRecibosClienteReportController.Print(const ListaID : TIntegerList): Boolean;
var
AStream: Binary;
AEditor : IEditorRecibosClientePreview;
begin
Result := False;
AEditor := NIL;
ShowHourglassCursor;
try
AStream := FDataModule.GetReport(ListaID);
@ -103,7 +106,9 @@ begin
AEditor.Controller := Self;
AEditor.ListaID := ListaID;
AEditor.LoadFromStream(AStream);
AEditor.Print;
AEditor.TablaImpresion := nme_RecibosCliente;
AEditor.IdTablaImpresion := ListaID.ToString;
Result := AEditor.Print;
finally
AEditor.Release;
end;

5
Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm
View File

@ -41,7 +41,7 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
Width = 645
ExplicitWidth = 645
inherited tbxMain: TTBXToolbar
ExplicitWidth = 577
ExplicitWidth = 434
end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 427
@ -129,6 +129,9 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
Kind = skSum
Column = frViewRecibosCliente1.cxGridViewOTROS_GASTOS
end>
inherited cxGridViewNUM_COPIAS: TcxGridDBColumn
IsCaptionAssigned = True
end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase

7
Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas
View File

@ -191,10 +191,10 @@ begin
inherited
else
begin
Respuesta := JsPrevisualizarDialog.Execute;
Respuesta := JsImprimirDialog.Execute;
if Respuesta <> IDCANCEL then
begin
case JsPrevisualizarDialog.CustomButtonResult of
case JsImprimirDialog.CustomButtonResult of
200 : begin // Lista de elementos visibles
inherited;
end;
@ -208,7 +208,8 @@ begin
ARecibosCliente := RecibosCliente;
if Assigned(ARecibosCliente) then
FController.Print(ARecibosCliente, AllItems);
if FController.Print(ARecibosCliente, AllItems) then
RefrescarInterno;
end;
end;
end;

10
Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas
View File

@ -3,7 +3,7 @@ unit schRecibosProveedorClient_Intf;
interface
uses
Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const
{ Data table rules ids
@ -207,7 +207,7 @@ type
end;
{ TListaAnosRecibosDataTableRules }
TListaAnosRecibosDataTableRules = class(TDADataTableRules, IListaAnosRecibos)
TListaAnosRecibosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosRecibos)
private
protected
{ Property getters and setters }
@ -428,7 +428,7 @@ type
end;
{ TRecibosCompensadosProvDataTableRules }
TRecibosCompensadosProvDataTableRules = class(TDADataTableRules, IRecibosCompensadosProv)
TRecibosCompensadosProvDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosProv)
private
protected
{ Property getters and setters }
@ -835,7 +835,7 @@ type
end;
{ TRecibosProveedorDataTableRules }
TRecibosProveedorDataTableRules = class(TDADataTableRules, IRecibosProveedor)
TRecibosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IRecibosProveedor)
private
protected
{ Property getters and setters }
@ -1122,7 +1122,7 @@ type
end;
{ TPagosProveedorDataTableRules }
TPagosProveedorDataTableRules = class(TDADataTableRules, IPagosProveedor)
TPagosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IPagosProveedor)
private
protected
{ Property getters and setters }

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

@ -216,12 +216,7 @@ begin
AAlbaran := AAlbaranesClienteController.Buscar(IDAlbaran);
if Assigned(AAlbaran) then
begin
if (ShowConfirmMessage('Generar factura', Format('¿Desea copiar todos los conceptos del albaran seleccionados a su factura correspondiente?', [])) = IDYES) then
Result := GenerarFacturaCliAlb(AAlbaran)
else
Result := GenerarFacturaCliAlb(AAlbaran, False);
end;
Result := GenerarFacturaCliAlb(AAlbaran);
if Assigned(AAlbaranesClienteController) then
Finalizar;
@ -297,12 +292,7 @@ begin
+ #10#13 + 'Si elige albaranes de clientes diferentes se dará de alta una factura por cada uno de ellos.' , True);
if Assigned(AAlbaranes) then
begin
if (ShowConfirmMessage('Generar factura', Format('¿Desea copiar todos los conceptos de/los albaran/es seleccionados a sus facturas correspondientes?', [])) = IDYES) then
Result := GenerarFacturaCliAlb(AAlbaranes)
else
Result := GenerarFacturaCliAlb(AAlbaranes, False);
end;
Result := GenerarFacturaCliAlb(AAlbaranes);
if Assigned(AAlbaranesClienteController) then
Finalizar;

5
Source/Modulos/Relaciones/Pedidos de cliente - Albaranes de cliente/PedCli_AlbCli_relation.dpk
View File

@ -26,14 +26,13 @@ package PedCli_AlbCli_relation;
requires
rtl,
Base,
ControllerBase,
Contactos_model,
Contactos_controller,
PedidosCliente_model,
PedidosCliente_controller,
AlbaranesCliente_model,
AlbaranesCliente_controller;
AlbaranesCliente_controller,
Base;
contains
uGenerarAlbaranesCliUtils in 'uGenerarAlbaranesCliUtils.pas';

Some files were not shown because too many files have changed in this diff Show More