From 43e5f77582a04ad892965332faa943c6db3a4d37 Mon Sep 17 00:00:00 2001 From: roberto Date: Sat, 17 Nov 2007 17:39:17 +0000 Subject: [PATCH] repaso albaranes, pedidos, y facturas con error al asignar proveedor git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@116 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Build/Build.fbp5 | 1611 +++++++++-------- Source/Base/Base.dproj | 105 +- Source/Cliente/uBootStrap.pas | 4 +- .../Views/AlbaranesProveedor_view.identcache | Bin 1749 -> 1749 bytes .../Views/uViewAlbaranProveedor.dfm | 6 - .../Views/uViewAlbaranProveedor.pas | 18 +- .../Contactos_controller.identcache | Bin 2748 -> 2748 bytes .../Contactos/Views/Contactos_view.identcache | Bin 2868 -> 2868 bytes .../Views/uViewFacturaCliente.dfm | 28 +- .../FacturasProveedor_controller.dpk | 23 +- .../FacturasProveedor_controller.dproj | 559 +++++- .../FacturasProveedor_controller.rc | 22 + .../FacturasProveedor_controller.res | Bin 5056 -> 384 bytes .../uDetallesFacturaProveedorController.pas | 14 - .../uFacturasProveedorController.pas | 39 +- .../Data/FacturasProveedor_data.dpk | 12 +- .../Data/FacturasProveedor_data.dproj | 541 +++++- .../Data/FacturasProveedor_data.rc | 22 + .../Data/FacturasProveedor_data.res | Bin 5056 -> 384 bytes .../Data/uDataModuleFacturasProveedor.dfm | 174 +- .../Data/uDataModuleFacturasProveedor.pas | 12 +- .../FacturasProveedor_Group.groupproj | 28 +- .../Data/uIDataModuleFacturasProveedor.pas | 1 - .../Model/FacturasProveedor_model.dpk | 20 +- .../Model/FacturasProveedor_model.dproj | 572 +++++- .../Model/FacturasProveedor_model.rc | 22 + .../Model/FacturasProveedor_model.res | Bin 5056 -> 384 bytes .../Model/schFacturasProveedorClient_Intf.pas | 47 +- .../Model/schFacturasProveedorServer_Intf.pas | 55 +- .../Model/uBizFacturasProveedor.pas | 6 +- .../Model/uBizFacturasProveedorServer.pas | 12 +- .../Plugin/FacturasProveedor_plugin.dpk | 11 +- .../Plugin/FacturasProveedor_plugin.dproj | 552 +++++- .../Plugin/FacturasProveedor_plugin.rc | 22 + .../Plugin/FacturasProveedor_plugin.res | Bin 5056 -> 384 bytes .../Servidor/srvFacturasProveedor_Impl.dfm | 135 +- .../Servidor/srvFacturasProveedor_Impl.pas | 4 +- .../Views/FacturasProveedor_view.dpk | 64 +- .../Views/FacturasProveedor_view.dproj | 594 ++++-- .../Views/FacturasProveedor_view.rc | 22 + .../Views/FacturasProveedor_view.res | Bin 5056 -> 384 bytes .../Views/uEditorFacturaProveedor.dfm | 59 +- .../Views/uEditorFacturaProveedor.pas | 10 +- .../Views/uEditorFacturasProveedor.pas | 8 +- .../Views/uEditorFacturasProveedorReport.pas | 4 +- .../Views/uViewDetallesFacturaProveedor.pas | 3 +- .../Views/uViewFacturaProveedor.dfm | 113 +- .../Views/uViewFacturaProveedor.pas | 19 +- .../Views/uViewPedidoProveedor.dfm | 4 +- .../Views/uViewPedidoProveedor.pas | 18 +- Source/Servidor/FactuGES_Server.RES | Bin 23208 -> 23208 bytes Source/Servidor/FactuGES_Server.dpr | 7 +- Source/Servidor/FactuGES_Server.dproj | 1 + Source/Servidor/FactuGES_Server.rc | 2 +- 54 files changed, 3752 insertions(+), 1853 deletions(-) diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index 78ffa941..16442548 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -5035,7 +5035,7 @@ Comments= False False - False + True True False False @@ -5045,7 +5045,7 @@ Comments= False False False - 3081 + 3082 1 0 @@ -5068,7 +5068,16 @@ Comments= [usPackages,usCompiler,usLinker,usVersionInfo] False False - @@ -7607,7 +7616,7 @@ Comments= False False - False + True True False False @@ -7617,7 +7626,7 @@ Comments= False False False - 3081 + 3082 1 0 @@ -7640,7 +7649,16 @@ Comments= [usPackages,usCompiler,usLinker,usVersionInfo] False False - @@ -9014,6 +9032,385 @@ Comments= + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 1 + 0 + 0 + False + 0 + + + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 1 + 0 + 0 + False + 0 + + + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + + + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + @@ -9645,6 +10042,403 @@ Comments= + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + + + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + + + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + True + True + False + False + False + False + False + False + False + False + 3082 + + 1 + 0 + 0 + False + 0 + + + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 3 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + Logística @@ -10471,791 +11265,6 @@ Comments= - - - - 0 - - - - True - True - False - True - False - - 0 - False - 0 - 1000 - False - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - False - True - False - False - False - False - False - False - False - False - 3081 - - 1 - 0 - 0 - False - 0 - - - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - False - True - False - False - False - False - False - False - False - False - 3081 - - 1 - 0 - 0 - False - 0 - - - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - True - True - False - False - False - False - False - False - False - False - 3082 - - 1 - 0 - 0 - False - 0 - - - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 3 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - - - 0 - - - - False - True - False - True - False - - 0 - False - 0 - 1000 - False - - - - 0 - - True - False - False - True - True - 0 - 1252 - 11 - Release - False - - - True - True - - False - - False - False - False - True - False - False - False - False - False - False - False - False - 3081 - - 0 - 0 - 0 - False - 0 - - - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [] - False - False - - - - False - False - False - True - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - True - - True - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - True - 0 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - True - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 11 - Release - False - - - True - True - - False - - False - False - False - True - False - False - False - False - False - False - False - False - 3081 - - 0 - 0 - 0 - False - 0 - - - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [] - False - False - - - - False - False - False - True - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - True - - True - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - True - 0 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - True - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 11 - Release - False - - - True - True - - False - - False - False - False - True - False - False - False - False - False - False - False - False - 3081 - - 0 - 0 - 0 - False - 0 - - - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [] - False - False - - - - False - False - False - True - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - True - - True - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - True - 0 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - True - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - Relaciones @@ -15140,12 +15149,12 @@ Comments= True 0 1252 - 11 + 12 Release False - False + True True False @@ -15182,7 +15191,7 @@ Comments= False False False - [] + [usPackages,usCompiler,usLinker,usVersionInfo] False False False False False - True + False True True False @@ -15232,7 +15241,7 @@ Comments= %library_path% 0 True - 0 + 3 1048576 16384 @@ -15269,12 +15278,12 @@ Comments= True 0 1252 - 11 + 12 Release False - False + True True False @@ -15311,7 +15320,7 @@ Comments= False False False - [] + [usPackages,usCompiler,usLinker,usVersionInfo] False False False False False - True + False True True False @@ -15361,7 +15370,7 @@ Comments= %library_path% 0 True - 0 + 3 1048576 16384 diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index f3588d42..ac85e14e 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,13 +44,6 @@ Package FalseTrueFalseLibreria base de FactuGESTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -65,57 +58,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index be5b59a7..73e44e34 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -36,9 +36,9 @@ begin LoadModule('PedidosProveedor_plugin.bpl'); LoadModule('AlbaranesProveedor_plugin.bpl'); - - LoadModule('RecibosProveedor_plugin.bpl'); + LoadModule('RecibosProveedor_plugin.bpl'); + LoadModule('FacturasProveedor_plugin.bpl'); end; end; diff --git a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.identcache b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.identcache index fcb70591c05720a25b90a4d3d50465a7c18fdf77..30b32fc585757d5f41ce025973d29dc64a48e8a7 100644 GIT binary patch delta 90 zcmV-g0Hy!c4b=?+5R(oAv6Jrt5|iZx7L(@#Y>{kllRg4Llg$MUleq>QlRg4!kpyUy wB?V`bzyxKJ`vq{3+d-4L0}Yd(0VtD<1xJ&=11OWn0e6#A1Z|Pqc9W`oSeYKGTEBV5Xdf@EW}zqS)M6t zat>SOM3!}vU$JORyp=P#lQnm81as;{pyE6hw#gRE3KO&QC+}r00IG!u{b5uF05!QF Ae*gdg diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm index 08bbfa22..667de217 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm @@ -120,12 +120,6 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Left = 239 ExplicitLeft = 239 end - inherited Button1: TBitBtn - OnClick = frViewProveedorAlbaranButton1Click - end - inherited Button2: TBitBtn - OnClick = frViewProveedorAlbaranButton2Click - end inherited Button3: TBitBtn Left = 123 ExplicitLeft = 123 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas index e0c80218..4e871317 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas @@ -12,7 +12,8 @@ uses cxTextEdit, cxMaskEdit, cxCalendar, dxLayoutControl, cxControls, cxMemo, uViewDireccionEntregaAlbaranProv, Buttons, ActnList, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, - uBizPedidosProveedor, uPedidosProveedorController; + uBizPedidosProveedor, uPedidosProveedorController, uBizFormasPago, + uDAInterfaces; type IViewAlbaranProveedor = interface(IViewBase) @@ -82,6 +83,7 @@ type protected FAlbaran : IBizAlbaranProveedor; FViewProveedorAlbaran : TfrViewDatosYSeleccionProveedor; + FFormasPago : IBizFormaPago; FFormasPagoController : IFormasPagoController; FPedidoAsociado : IBizPedidoProveedor; FPedidoController : IPedidosProveedorController; @@ -104,7 +106,7 @@ implementation uses uProveedoresController, uBizDireccionesContacto, uAlbaranesProveedorController, - uBizFormasPago, schAlbaranesProveedorClient_Intf; + schAlbaranesProveedorClient_Intf; procedure TfrViewAlbaranProveedor.actElegirDireccionExecute(Sender: TObject); @@ -159,14 +161,16 @@ end; procedure TfrViewAlbaranProveedor.bFormasPagoClick(Sender: TObject); begin inherited; - FFormasPagoController.VerTodos((dsFormaPago.DataTable) as IBizFormaPago); + if Assigned(FFormasPago) then + FFormasPagoController.VerTodos(FFormasPago); end; procedure TfrViewAlbaranProveedor.CustomViewCreate(Sender: TObject); begin inherited; FPedidoAsociado := NIL; - FPedidoController := TPedidosProveedorController.Create; + FPedidoController := TPedidosProveedorController.Create; + FFormasPago := Nil; FFormasPagoController := TFormasPagoController.Create; FViewProveedorAlbaran := frViewProveedorAlbaran; FViewProveedorAlbaran.MsgElegirProveedor := 'Elija el proveedor de este albarán.'; @@ -177,6 +181,7 @@ end; procedure TfrViewAlbaranProveedor.CustomViewDestroy(Sender: TObject); begin FPedidoController := NIL; + FFormasPago := Nil; FFormasPagoController := NIL; FPedidoAsociado := NIL; FViewProveedorAlbaran := Nil; @@ -233,8 +238,11 @@ begin if Assigned(FAlbaran) then begin DADataSource.DataTable := FAlbaran.DataTable; - dsFormaPago.DataTable := FFormasPagoController.BuscarTodos.DataTable; + + FFormasPago := FFormasPagoController.BuscarTodos; + dsFormaPago.DataTable := FFormasPago.DataTable; dsFormaPago.DataTable.Active := True; + frViewProveedorAlbaran.Proveedor := FAlbaran.Proveedor; frViewDireccionEntregaAlbaranProv1.AlbaranProveedor := FAlbaran; diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.identcache b/Source/Modulos/Contactos/Controller/Contactos_controller.identcache index 2ac351aa406e3de04540d7567464f1ccc489185e..eb5f187572aee2932198b5d6f0dee2f57ae937d4 100644 GIT binary patch delta 33 pcmdlZx<_=wJC@0HY?hOIS=%Qka^!6mVe@60{Ej7U^LdW9i~!^v4JrTt delta 29 lcmdlZx<_=wJC@0r9BGr^u^iYe!{*C0c^zxs=JOnH83Db03`76` diff --git a/Source/Modulos/Contactos/Views/Contactos_view.identcache b/Source/Modulos/Contactos/Views/Contactos_view.identcache index 75324b6a07a915c8655597bf38523e75c69a59e7..9a87d2bde4cf26282f09c8f0c3fea94e62ad1161 100644 GIT binary patch delta 135 zcmdlYwndClaq>fsu!$^7C;Ks)Ok!u9Xv;pim|bx4d`7E{kGC^Uw&${%Y{Z-ck!6`I z%`G|k8*}vJSxgp_?OFLZe_%0Y1gf>3yp>ISB8$c3Yz~RdXV}siCo8jsPj2Q&oIH;? kVzM^7$z**-w#kK@@<5GolkanG28vrv?q-pjJb}|60LkPmoB#j- delta 140 zcmdlYwndCpk%581dGbUS^NIbrn|&ESGESbrVllCwWAYwOxykbxttMA6=S=S9vYMRF z!Zw+kQ)03yOEi!lv3UYZ72{-Kj_}F8Kt(QW5}Vhsr87>BVGEd?#gPcqX)@V>k!7Nd r^ki;!lga-%*e1tv%1?gE..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib - DEBUG Delphi.Personality Package - - False - True - False - - - False - False - False - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - FacturasProveedor_controller.dpk - - +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0FacturasProveedor_controller.dpk - + MainSource - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -117,5 +65,488 @@ - - \ No newline at end of file + + + diff --git a/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.rc b/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.rc +++ b/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.res b/Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5 AFactura.Proveedor.ID) then @@ -866,12 +843,13 @@ begin AFactura.DataTable.Active := False; // Filtrar las facturas actuales por empresa - with AFactura.DataTable.Where do +{ with AFactura.DataTable.Where do begin if NotEmpty then AddOperator(opAND); AddCondition(fld_FacturasProveedorID_EMPRESA, cEqual, dmUsuarios.IDEmpresaActual); end; +} end; procedure TFacturasProveedorController.SetProveedorController(const Value: IProveedoresController); @@ -904,13 +882,6 @@ begin RecalcularImportes(AFactura); try - if (AFactura.EsNuevo) then - IDNuevo := FDataModule.GetNextID(AFactura.DataTable.LogicalName) - else - IDNuevo := AFactura.ID; - - AsignarID(AFactura, IDNuevo); - AFactura.DataTable.ApplyUpdates; //Se generan los recibos automáticamente a partir de la forma de pago diff --git a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dpk b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dpk index 0350aad4..ba45f5cc 100644 --- a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dpk +++ b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dpk @@ -22,17 +22,11 @@ package FacturasProveedor_data; {$WRITEABLECONST OFF} {$MINENUMSIZE 1} {$IMAGEBASE $400000} -{$IMPLICITBUILD OFF} +{$IMPLICITBUILD ON} requires - rtl, - dbrtl, - dsnap, - vcldb, - vcl, - adortl, - Contactos_model, - FacturasProveedor_model; + FacturasProveedor_model, + Base; contains uDataModuleFacturasProveedor in 'uDataModuleFacturasProveedor.pas' {DataModuleFacturasProveedor: TDAClientDataModule}; diff --git a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dproj b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dproj index 33d1c14d..5d94bae9 100644 --- a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dproj +++ b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.dproj @@ -36,71 +36,506 @@ ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib - DEBUG Delphi.Personality Package - - False - True - False - - - False - False - False - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - FacturasProveedor_data.dpk - - +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0FacturasProveedor_data.dpk - + MainSource - - - - - - - - + +
DataModuleFacturasProveedor
TDAClientDataModule - - \ No newline at end of file + + diff --git a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.rc b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.rc +++ b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.res b/Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5 Params = <> - MasterMappingMode = mmDataRequest StreamingOptions = [soDisableEventsWhileStreaming] + RemoteDataAdapter = rda_FacturasProveedor DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'FacturasProveedor' IndexDefs = <> - Left = 224 - Top = 160 + Left = 208 + Top = 112 end object ds_FacturasProveedor: TDADataSource DataSet = tbl_FacturasProveedor.Dataset DataTable = tbl_FacturasProveedor - Left = 224 - Top = 104 + Left = 208 + Top = 48 end - object tbl_FacturasProveedor_Detalles: TDACDSDataTable + object tbl_FacturasProveedor_Detalles: TDAMemDataTable RemoteUpdatesOptions = [] Fields = < item Name = 'ID' DataType = datAutoInc + GeneratorName = 'GEN_FACTURA_PROV_DETALLES_ID' Required = True - DictionaryEntry = 'FacturasCliente_Detalles_ID' + ServerAutoRefresh = True + DictionaryEntry = 'FacturasProveedor_Detalles_ID' InPrimaryKey = True end item Name = 'ID_FACTURA' DataType = datInteger - DictionaryEntry = 'FacturasCliente_Detalles_ID_FACTURA' + DictionaryEntry = 'FacturasProveedor_Detalles_ID_FACTURA' end item Name = 'POSICION' DataType = datInteger - DisplayLabel = 'Posici'#243'n' - DictionaryEntry = 'FacturasCliente_Detalles_POSICION' + DisplayLabel = 'Posici'#195#179'n' + DictionaryEntry = 'FacturasProveedor_Detalles_POSICION' end item Name = 'TIPO_DETALLE' DataType = datString Size = 10 DisplayLabel = 'Tipo detalle' - DictionaryEntry = 'FacturasCliente_Detalles_TIPO_DETALLE' + DictionaryEntry = 'FacturasProveedor_Detalles_TIPO_DETALLE' end item Name = 'CONCEPTO' DataType = datString Size = 2000 DisplayLabel = 'Concepto' - DictionaryEntry = 'FacturasCliente_Detalles_CONCEPTO' + DictionaryEntry = 'FacturasProveedor_Detalles_CONCEPTO' end item Name = 'CANTIDAD' DataType = datInteger DisplayLabel = 'Cantidad' - DictionaryEntry = 'FacturasCliente_Detalles_CANTIDAD' + DictionaryEntry = 'FacturasProveedor_Detalles_CANTIDAD' end item Name = 'IMPORTE_UNIDAD' DataType = datCurrency DisplayLabel = 'Importe unidad' Alignment = taRightJustify - DictionaryEntry = 'FacturasCliente_Detalles_IMPORTE_UNIDAD' - end - item - Name = 'DESCUENTO' - DataType = datFloat - DictionaryEntry = 'FacturasProveedor_Detalles_DESCUENTO' + DictionaryEntry = 'FacturasProveedor_Detalles_IMPORTE_UNIDAD' end item Name = 'IMPORTE_TOTAL' DataType = datCurrency DisplayLabel = 'Importe total' Alignment = taRightJustify - DictionaryEntry = 'FacturasCliente_Detalles_IMPORTE_TOTAL' + DictionaryEntry = 'FacturasProveedor_Detalles_IMPORTE_TOTAL' + end + item + Name = 'VISIBLE' + DataType = datInteger + DisplayLabel = #194#191'Visible?' + DictionaryEntry = 'FacturasProveedor_Detalles_VISIBLE' end item Name = 'ID_ARTICULO' @@ -300,10 +313,9 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor DictionaryEntry = 'FacturasProveedor_Detalles_ID_ARTICULO' end item - Name = 'VISIBLE' - DataType = datInteger - DisplayLabel = #191'Visible?' - DictionaryEntry = 'FacturasCliente_Detalles_VISIBLE' + Name = 'DESCUENTO' + DataType = datFloat + DictionaryEntry = 'FacturasProveedor_Detalles_DESCUENTO' end item Name = 'IMPORTE_PORTE' @@ -322,16 +334,10 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor Size = 255 DictionaryEntry = 'FacturasProveedor_Detalles_REFERENCIA_PROVEEDOR' end> - Params = < - item - Name = 'ID_FACTURA' - DataType = datInteger - Value = '' - ParamType = daptInput - end> - MasterParamsMappings.Strings = ( - 'ID_FACTURA=ID') + Params = <> + MasterMappingMode = mmWhere StreamingOptions = [soDisableEventsWhileStreaming] + RemoteDataAdapter = rda_FacturasProveedor MasterSource = ds_FacturasProveedor MasterFields = 'ID' DetailFields = 'ID_FACTURA' @@ -340,26 +346,12 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor LogicalName = 'FacturasProveedor_Detalles' IndexDefs = <> Left = 400 - Top = 160 + Top = 112 end object ds_FacturasProveedor_Detalles: TDADataSource DataSet = tbl_FacturasProveedor_Detalles.Dataset DataTable = tbl_FacturasProveedor_Detalles Left = 400 - Top = 104 - end - object Bin2DataStreamer: TDABin2DataStreamer - Left = 48 - Top = 84 - end - object rda_FacturasProveedor: TDARemoteDataAdapter - GetSchemaCall.RemoteService = RORemoteService - GetDataCall.RemoteService = RORemoteService - UpdateDataCall.RemoteService = RORemoteService - GetScriptsCall.RemoteService = RORemoteService - RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer - Left = 51 - Top = 151 + Top = 40 end end diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas index 7d259655..27a852af 100644 --- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas @@ -9,17 +9,17 @@ uses uDataModuleBase, uIDataModuleFacturasProveedor, uBizFacturasProveedor, uBizDetallesFacturaProveedor, uDADesigntimeCall, uIDataModuleFacturasProveedorReport, uDARemoteDataAdapter, - uDADataStreamer, uDABin2DataStreamer, uDAInterfaces; + uDADataStreamer, uDABin2DataStreamer, uDAInterfaces, uDAMemDataTable; type TDataModuleFacturasProveedor = class(TDataModuleBase, IDataModuleFacturasProveedor, IDataModuleFacturasProveedorReport) RORemoteService: TRORemoteService; - tbl_FacturasProveedor: TDACDSDataTable; - ds_FacturasProveedor: TDADataSource; - tbl_FacturasProveedor_Detalles: TDACDSDataTable; - ds_FacturasProveedor_Detalles: TDADataSource; Bin2DataStreamer: TDABin2DataStreamer; rda_FacturasProveedor: TDARemoteDataAdapter; + tbl_FacturasProveedor: TDAMemDataTable; + ds_FacturasProveedor: TDADataSource; + tbl_FacturasProveedor_Detalles: TDAMemDataTable; + ds_FacturasProveedor_Detalles: TDADataSource; procedure DAClientDataModuleCreate(Sender: TObject); private function _GetDetalles : IBizDetallesFacturaProveedor; @@ -37,7 +37,7 @@ implementation {$R *.DFM} uses - FactuGES_Intf, uDataModuleConexion, uDataTableUtils, cxControls, uDAInterfaces, + FactuGES_Intf, uDataTableUtils, uDataModuleConexion, cxControls, schFacturasProveedorClient_Intf, uBizContactos; { TdmFacturasProveedor } diff --git a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj index 770c4de1..01270199 100644 --- a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj +++ b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj @@ -6,9 +6,11 @@ + + @@ -19,7 +21,7 @@ Default.Personality - + @@ -30,6 +32,15 @@ + + + + + + + + + @@ -111,14 +122,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Facturas de proveedor/Model/Data/uIDataModuleFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/Data/uIDataModuleFacturasProveedor.pas index eec61a03..763c4989 100644 --- a/Source/Modulos/Facturas de proveedor/Model/Data/uIDataModuleFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/Data/uIDataModuleFacturasProveedor.pas @@ -11,7 +11,6 @@ type ['{FD0F5B2F-5556-4031-86F0-EFF96805FD66}'] function GetItems: IBizFacturaProveedor; function GetItem(const ID : Integer) : IBizFacturaProveedor; - function GetNextID(const DataSetName : String) : Integer; function NewItem : IBizFacturaProveedor; end; diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dpk b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dpk index fb18d45f..701c372d 100644 --- a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dpk +++ b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dpk @@ -22,28 +22,10 @@ package FacturasProveedor_model; {$WRITEABLECONST OFF} {$MINENUMSIZE 1} {$IMAGEBASE $400000} -{$IMPLICITBUILD OFF} -{%TogetherDiagram 'ModelSupport_FacturasProveedor_model\default.txaPackage'} +{$IMPLICITBUILD ON} requires - rtl, - dbrtl, - vcl, - DataAbstract_D10, - dsnap, - vcldb, - adortl, - vcljpg, - cxLibraryD10, - dxThemeD10, - cxEditorsD10, - cxDataD10, - cxExtEditorsD10, - cxGridD10, - cxPageControlD10, Base, - Empresas_controller, - Usuarios, Contactos_model, TiposIVA_model, TiposIVA_controller; diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj index 214165aa..5665d3d0 100644 --- a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj +++ b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj @@ -36,95 +36,529 @@ ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib - DEBUG Delphi.Personality Package - - False - True - False - - - False - False - False - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + + + + RemObjects Pascal Script - RemObjects SDK 3.0 Integration EurekaLog 5.1.9 - - - FacturasProveedor_model.dpk - - + FacturasProveedor_model.dpk - + MainSource - - - - - - - - - - - - - - - - - - - - - - + + + + + - - \ No newline at end of file + + + diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.rc b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.rc +++ b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib - DEBUG Delphi.Personality Package - - False - True - False - - - False - False - False - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + RemObjects Pascal Script - RemObjects SDK 3.0 Integration EurekaLog 5.1.9 - - - FacturasProveedor_plugin.dpk - - + FacturasProveedor_plugin.dpk - + MainSource - - - - - - - - - - - + +
PluginFacturasProveedor
 - - \ No newline at end of file + + + diff --git a/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.rc b/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.rc +++ b/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.res b/Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5 end item @@ -447,6 +442,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor Name = 'ID' DataType = datAutoInc GeneratorName = 'GEN_FACTURA_PROV_DETALLES_ID' + ServerAutoRefresh = True DictionaryEntry = 'FacturasProveedor_Detalles_ID' InPrimaryKey = True end @@ -552,9 +548,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor Params = < item Name = 'OLD_ID' - DataType = datInteger Value = '' - ParamType = daptInput end> Statements = < item @@ -570,77 +564,53 @@ object srvFacturasProveedor: TsrvFacturasProveedor Params = < item Name = 'ID' - DataType = datInteger + DataType = datAutoInc + GeneratorName = 'GEN_FACTURA_PROV_DETALLES_ID' Value = '' - ParamType = daptInput end item Name = 'CANTIDAD' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'POSICION' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'ID_FACTURA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'TIPO_DETALLE' - DataType = datString - Size = 10 Value = '' - ParamType = daptInput end item Name = 'CONCEPTO' - DataType = datString - Size = 2000 Value = '' - ParamType = daptInput end item Name = 'IMPORTE_UNIDAD' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_TOTAL' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'VISIBLE' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'ID_ARTICULO' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_PORTE' - DataType = datFloat Value = '' - ParamType = daptInput end> Statements = < item @@ -662,9 +632,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor Params = < item Name = 'OLD_ID' - DataType = datInteger Value = '' - ParamType = daptInput end> Statements = < item @@ -682,77 +650,51 @@ object srvFacturasProveedor: TsrvFacturasProveedor Params = < item Name = 'CANTIDAD' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'POSICION' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'ID_FACTURA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'TIPO_DETALLE' - DataType = datString - Size = 10 Value = '' - ParamType = daptInput end item Name = 'CONCEPTO' - DataType = datString - Size = 2000 Value = '' - ParamType = daptInput end item Name = 'IMPORTE_UNIDAD' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_TOTAL' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'VISIBLE' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'ID_ARTICULO' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_PORTE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'OLD_ID' - DataType = datInteger Value = '' - ParamType = daptInput end> Statements = < item @@ -775,186 +717,121 @@ object srvFacturasProveedor: TsrvFacturasProveedor Params = < item Name = 'ID' - DataType = datInteger + DataType = datAutoInc + GeneratorName = 'GEN_FACTURAS_PROVEEDOR_ID' Value = '' - ParamType = daptInput end item Name = 'ID_EMPRESA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'REFERENCIA' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'REFERENCIA_PROVEEDOR' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'FECHA_FACTURA' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'BASE_IMPONIBLE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_DESCUENTO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IVA' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_IVA' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'RE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_RE' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_TOTAL' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'OBSERVACIONES' - DataType = datMemo Value = '' - ParamType = daptInput end item Name = 'ID_PROVEEDOR' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'NIF_CIF' - DataType = datString - Size = 15 Value = '' - ParamType = daptInput end item Name = 'NOMBRE' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'CALLE' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'POBLACION' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'PROVINCIA' - DataType = datString - Size = 255 Value = '' - ParamType = daptInput end item Name = 'CODIGO_POSTAL' - DataType = datString - Size = 10 Value = '' - ParamType = daptInput end item Name = 'FECHA_ALTA' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'FECHA_MODIFICACION' - DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'USUARIO' - DataType = datString - Size = 20 Value = '' - ParamType = daptInput end item Name = 'ID_FORMA_PAGO' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RECARGO_EQUIVALENCIA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'ID_TIPO_IVA' - DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'IMPORTE_NETO' - DataType = datFloat Value = '' - ParamType = daptInput end item Name = 'IMPORTE_PORTE' - DataType = datFloat Value = '' - ParamType = daptInput end> Statements = < item diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas index 94873381..0f1ff7fa 100644 --- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas +++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas @@ -43,7 +43,7 @@ implementation uses {Generated:} FactuGES_Invk, Dialogs, uDataModuleServer, uDatabaseUtils, uUsersManager, schFacturasProveedorClient_Intf, - uRestriccionesUsuarioUtils; //uBizFacturasProveedorServer, + uRestriccionesUsuarioUtils, uBizFacturasProveedorServer; // uRptFacturasProveedor_Server; procedure Create_srvFacturasProveedor(out anInstance : IUnknown); @@ -70,7 +70,7 @@ end; procedure TsrvFacturasProveedor.DARemoteServiceCreate(Sender: TObject); begin SessionManager := dmServer.SessionManager; -// bpFacturasProveedor.BusinessRulesID := BIZ_SERVER_FACTURAS_PROVEEDOR; + bpFacturasProveedor.BusinessRulesID := BIZ_SERVER_FACTURAS_PROVEEDOR; end; procedure TsrvFacturasProveedor.DataAbstractServiceBeforeAcquireConnection( diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk index 1ffc1515..74e9aaf3 100644 --- a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk +++ b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk @@ -22,71 +22,13 @@ package FacturasProveedor_view; {$WRITEABLECONST OFF} {$MINENUMSIZE 1} {$IMAGEBASE $400000} -{$IMPLICITBUILD OFF} +{$IMPLICITBUILD ON} requires - rtl, - FacturasProveedor_model, FacturasProveedor_controller, - FacturasProveedor_data, - vcl, - dbrtl, - vcldb, - cxLibraryD10, - dxThemeD10, - cxEditorsD10, - cxDataD10, - vcljpg, - cxGridD10, - cxPageControlD10, - cxExtEditorsD10, - vclx, - cxExportD10, - dxPSCoreD10, - dxComnD10, - dxPScxCommonD10, - dxPSLnksD10, - designide, - xmlrtl, - vclactnband, - vclshlctrls, - dxPScxGridLnkD10, - dclcxLibraryD10, - dsnap, - adortl, + FacturasProveedor_model, GUIBase, - tbx_d10, - tb2k_d10, - JvCoreD10R, - Jcl, - JclVcl, - JvSystemD10R, - JvStdCtrlsD10R, - JvPageCompsD10R, - PNG_D10, - Base, - DataAbstract_D10, - dxLayoutControlD10, - Contactos_view, - PngComponentsD10, - Articulos_view, - JvGlobusD10R, - VclSmp, - bdertl, - vclie, - frx10, - fs10, - fqb100, - frxe10, - frxTee10, - fsTee10, - tee, - teeui, - teedb, - PedidosProveedor_controller, - PedidosProveedor_model, - AlbaranesProveedor_model, - AlbProv_FacProv_relation; + Articulos_view; contains uFacturasProveedorViewRegister in 'uFacturasProveedorViewRegister.pas', diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj index 8af19d86..7eb9d900 100644 --- a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj +++ b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj @@ -34,126 +34,28 @@ ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib ..\..\..\Lib;..\..\Lib - DEBUG Delphi.Personality Package - - False - True - False - - - False - False - False - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + RemObjects Pascal Script - RemObjects SDK 3.0 Integration - - - FacturasProveedor_view.dpk - - + FacturasProveedor_view.dpk - + MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fEditorElegirArticulosFacturaProveedor
TfEditorElegirArticulosFacturaProveedor @@ -188,5 +90,487 @@ TFrame - - \ No newline at end of file + + diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.rc b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.rc +++ b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res index 86c94e6ada7b3c85f6761b1ee234a9f34ef3c861..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 89 zcmX@0-oQLTLCJxUfkAA@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!E%D)b;IaF{ zzPG~QEyw>z^LKm}whzS>Dx3Ct`1w98?Y5