From 523e2825fbd1956ab8261cfaa08c01807c9ca4ef Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 10 Oct 2018 14:54:35 +0000 Subject: [PATCH] =?UTF-8?q?Cambios=20solicitados=20en=20las=20formas=20de?= =?UTF-8?q?=20pago=20para=20soportar=20la=20generaci=C3=B3n=20autom=C3=A1t?= =?UTF-8?q?ica=20de=20los=20pagos=20en=20los=20recibos=20de=20una=20factur?= =?UTF-8?q?a.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@671 f4e31baf-9722-1c47-927c-6f952f962d4b --- Source/ApplicationBase/uPlugins_Intf.pas | 1 + Source/Cliente/FactuGES.dproj | 3 +- Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 171984 -> 171984 bytes Source/GUIBase/GUIBase.res | Bin 4748 -> 384 bytes Source/Informes/InfPedidoProveedor.fr3 | 58 +-- .../Views/uViewCuentasEspeciales.dfm | 12 + .../Views/uViewCuentasEspeciales.pas | Bin 2839 -> 2863 bytes .../Views/uViewExtractoMovimientos.dfm | 12 + .../Views/uViewExtractoMovimientos.pas | 3 +- .../uFacturasProveedorController.pas | 24 + .../FacturasProveedor_Group.groupproj | 26 +- .../Data/uDataModuleFormasPago.dfm | 14 +- .../Formas de pago/FormasPago_Group.groupproj | 56 ++- .../Model/schFormasPagoClient_Intf.pas | 192 +++++++- .../Model/schFormasPagoServer_Intf.pas | 216 ++++++++- .../Servidor/srvFormasPago_Impl.dfm | 67 ++- .../Formas de pago/Views/FormasPago_view.dpk | Bin 835 -> 897 bytes .../Views/FormasPago_view.dproj | 20 +- .../Formas de pago/Views/uEditorFormaPago.dfm | 451 ++++++++++++------ .../Formas de pago/Views/uEditorFormaPago.pas | 89 +++- Source/Servidor/FactuGES_Server.dpr | 6 +- Source/Servidor/FactuGES_Server.dproj | 2 +- Source/Servidor/FactuGES_Server.rc | 10 +- Source/Servidor/FactuGES_Server.res | Bin 23344 -> 23356 bytes 25 files changed, 1017 insertions(+), 253 deletions(-) diff --git a/Source/ApplicationBase/uPlugins_Intf.pas b/Source/ApplicationBase/uPlugins_Intf.pas index 1aee0757..c8717db4 100644 --- a/Source/ApplicationBase/uPlugins_Intf.pas +++ b/Source/ApplicationBase/uPlugins_Intf.pas @@ -14,6 +14,7 @@ const MODULENAME_RECIBOS_CLIENTE = 'RecibosCliente_plugin.bpl'; } MODULENAME_PEDIDOS_PROVEEDOR = 'PedidosProveedor_plugin.bpl'; + { MODULENAME_ALBARANES_PROVEEDOR = 'AlbaranesProveedor_plugin.bpl'; MODULENAME_FACTURAS_PROVEEDOR = 'FacturasProveedor_plugin.bpl'; diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 0ed4df6b..d491e968 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,8 +52,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2870FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.7.0FactuGESFactuGES2.8.7.0 - +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2880FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.8.0FactuGESFactuGES2.8.8.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index a118fe42..635a18c3 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 2,8,7,0 -PRODUCTVERSION 2,8,7,0 +FILEVERSION 2,8,8,0 +PRODUCTVERSION 2,8,8,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.8.7.0\0" + VALUE "FileVersion", "2.8.8.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "2.8.7.0\0" + VALUE "ProductVersion", "2.8.8.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index e35d6fc176cc1478a9627c7c3f96f5ffaeba6baf..13b1bf640dc641c1502f7921704068f95b96809a 100644 GIT binary patch delta 42 xcmcbxpXCs7&xZO&tp2tXfgfeJf_(|s&zh-Hvk{D4H*Cc delta 42 xcmcbxpXCs7}%%F&tp2tXg>YrJf_(|s&zh-Hvk`V4HW;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Informes/InfPedidoProveedor.fr3 b/Source/Informes/InfPedidoProveedor.fr3 index b1a2691b..996a1b54 100644 --- a/Source/Informes/InfPedidoProveedor.fr3 +++ b/Source/Informes/InfPedidoProveedor.fr3 @@ -1,47 +1,47 @@ - + - + - + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + diff --git a/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm b/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm index e4888df5..69f07902 100644 --- a/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm @@ -37,14 +37,26 @@ inherited frViewCuentasEspeciales: TfrViewCuentasEspeciales inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end diff --git a/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.pas b/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.pas index c340c7082bc3f790a4a6d44ccf12eb9dab88f4df..7c838da080a972c07f03bda728c0ba80da887ed4 100644 GIT binary patch delta 37 pcmbO(wq9&Q4zq-gLaB3UaY=q|SY~QDkOQKe5{pwe=P<8k2LSd)4J-fv delta 12 TcmZ24HeGB(4)f*~=GE)~A6W!` diff --git a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm index ed832b3c..4f956c8f 100644 --- a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm @@ -127,15 +127,27 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 242 Width = 242 end inherited edtFechaFinFiltro: TcxDateEdit Left = 346 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 346 ExplicitWidth = 198 Width = 198 diff --git a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas index 323cca5f..6fbead8a 100644 --- a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas +++ b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.pas @@ -14,7 +14,8 @@ uses dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar, - cxImageComboBox, cxTextEdit, cxCurrencyEdit, uBizSubCuentas, uAsientosController; + cxImageComboBox, cxTextEdit, cxCurrencyEdit, uBizSubCuentas, uAsientosController, + uCustomView, uViewBase; type IViewExtractoMovimientos = interface(IViewGrid) diff --git a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas index b968824a..8e82b9bf 100644 --- a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas +++ b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas @@ -1239,6 +1239,7 @@ var ADiaVencimiento: Integer; ADiasMas: Integer; BSemaforo: Boolean; + AID: Integer; begin if not Assigned(AFactura) then @@ -1326,6 +1327,13 @@ begin ARecibos.DESCRIPCION := 'Pago de factura ' + AFactura.REFERENCIA + ': son ' + CifraToLetras(ARecibos.IMPORTE); ARecibosProveedorController.Guardar(ARecibos); + + if (AFormaPago.Plazos.RecordCount < 1) and (not AFormaPago.ID_SUBCUENTAIsNull) then + begin + ARecibosProveedorController.AnadirPago(ARecibos, DateToStr(ARecibos.FECHA_VENCIMIENTO), AFormaPago.IGNORAR_CONTABILIDAD, AFormaPago.ID_SUBCUENTA); + ARecibosProveedorController.Guardar(ARecibos); + end; + Inc(i); Next; until (eof); @@ -1336,6 +1344,22 @@ begin AFormaPago := Nil; ARecibosProveedorController := Nil; ARecibos := Nil; + + //Refresco de la cabecera de la factura para que quede en situación de pagada si asi lo requiere. + with AFactura.DataTable do + begin + AID := RecIDValue; + DisableControls; //<- No descomentar + + ShowHourglassCursor; + try + Refresh; + Locate(RecIDField.FieldName, AID, []); + finally + EnableControls; //<- No descomentar + HideHourglassCursor; + end; + end; end; function TFacturasProveedorController.GetProveedorController: IProveedoresController; diff --git a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj index 50af6aea..a067af86 100644 --- a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj +++ b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj @@ -18,6 +18,8 @@ + + @@ -221,14 +223,32 @@ + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Formas de pago/Data/uDataModuleFormasPago.dfm b/Source/Modulos/Formas de pago/Data/uDataModuleFormasPago.dfm index afe340f7..193e7154 100644 --- a/Source/Modulos/Formas de pago/Data/uDataModuleFormasPago.dfm +++ b/Source/Modulos/Formas de pago/Data/uDataModuleFormasPago.dfm @@ -14,12 +14,12 @@ inherited DataModuleFormasPago: TDataModuleFormasPago Top = 104 end object rda_FormasPago: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 208 Top = 24 end @@ -82,12 +82,18 @@ inherited DataModuleFormasPago: TDataModuleFormasPago Size = 15 DisplayLabel = 'C'#243'd. Cuenta' DictionaryEntry = 'FormasPago_CUENTA' + end + item + Name = 'ID_SUBCUENTA' + DataType = datInteger + end + item + Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_FormasPago - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'FormasPago' IndexDefs = <> Left = 208 @@ -139,8 +145,6 @@ inherited DataModuleFormasPago: TDataModuleFormasPago MasterSource = ds_FormasPago MasterFields = 'ID' DetailFields = 'ID_FORMA_PAGO' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'FormasPagoPlazos' IndexDefs = <> Left = 344 diff --git a/Source/Modulos/Formas de pago/FormasPago_Group.groupproj b/Source/Modulos/Formas de pago/FormasPago_Group.groupproj index 07ae0463..bdc58714 100644 --- a/Source/Modulos/Formas de pago/FormasPago_Group.groupproj +++ b/Source/Modulos/Formas de pago/FormasPago_Group.groupproj @@ -8,6 +8,11 @@ + + + + + @@ -101,14 +106,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas b/Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas index 5f4b493d..d13f69d1 100644 --- a/Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas +++ b/Source/Modulos/Formas de pago/Model/schFormasPagoClient_Intf.pas @@ -3,19 +3,29 @@ unit schFormasPagoClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; 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_FormasPago = '{0AC9176F-E9B6-43BA-B03E-0973D7074140}'; - RID_FormasPagoPlazos = '{F02E8B61-F06F-48FE-B705-0C42FB672FB5}'; + RID_ListaFormasPago = '{2B3ABE15-A405-4394-A2E1-ABE8557CC213}'; + RID_FormasPago = '{5691CFDF-40DA-4B7E-A1BB-0F3742347583}'; + RID_FormasPagoPlazos = '{807478A5-FF90-416D-822E-280382B76115}'; { Data table names } + nme_ListaFormasPago = 'ListaFormasPago'; nme_FormasPago = 'FormasPago'; nme_FormasPagoPlazos = 'FormasPagoPlazos'; + { ListaFormasPago fields } + fld_ListaFormasPagoID = 'ID'; + fld_ListaFormasPagoDESCRIPCION = 'DESCRIPCION'; + + { ListaFormasPago field indexes } + idx_ListaFormasPagoID = 0; + idx_ListaFormasPagoDESCRIPCION = 1; + { FormasPago fields } fld_FormasPagoID = 'ID'; fld_FormasPagoREFERENCIA = 'REFERENCIA'; @@ -25,6 +35,8 @@ const fld_FormasPagoSUCURSAL = 'SUCURSAL'; fld_FormasPagoDC = 'DC'; fld_FormasPagoCUENTA = 'CUENTA'; + fld_FormasPagoID_SUBCUENTA = 'ID_SUBCUENTA'; + fld_FormasPagoIGNORAR_CONTABILIDAD = 'IGNORAR_CONTABILIDAD'; { FormasPago field indexes } idx_FormasPagoID = 0; @@ -35,6 +47,8 @@ const idx_FormasPagoSUCURSAL = 5; idx_FormasPagoDC = 6; idx_FormasPagoCUENTA = 7; + idx_FormasPagoID_SUBCUENTA = 8; + idx_FormasPagoIGNORAR_CONTABILIDAD = 9; { FormasPagoPlazos fields } fld_FormasPagoPlazosID = 'ID'; @@ -49,9 +63,56 @@ const idx_FormasPagoPlazosPORCENTAJE = 3; type + { IListaFormasPago } + IListaFormasPago = interface(IDAStronglyTypedDataTable) + ['{2C5FADC5-48E4-4697-A72D-1B93FF2068F1}'] + { Property getters and setters } + function GetIDValue: Integer; + procedure SetIDValue(const aValue: Integer); + function GetIDIsNull: Boolean; + procedure SetIDIsNull(const aValue: Boolean); + function GetDESCRIPCIONValue: String; + procedure SetDESCRIPCIONValue(const aValue: String); + function GetDESCRIPCIONIsNull: Boolean; + procedure SetDESCRIPCIONIsNull(const aValue: Boolean); + + + { Properties } + property ID: Integer read GetIDValue write SetIDValue; + property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull; + property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue; + property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull; + end; + + { TListaFormasPagoDataTableRules } + TListaFormasPagoDataTableRules = class(TIntfObjectDADataTableRules, IListaFormasPago) + private + protected + { Property getters and setters } + function GetIDValue: Integer; virtual; + procedure SetIDValue(const aValue: Integer); virtual; + function GetIDIsNull: Boolean; virtual; + procedure SetIDIsNull(const aValue: Boolean); virtual; + function GetDESCRIPCIONValue: String; virtual; + procedure SetDESCRIPCIONValue(const aValue: String); virtual; + function GetDESCRIPCIONIsNull: Boolean; virtual; + procedure SetDESCRIPCIONIsNull(const aValue: Boolean); virtual; + + { Properties } + property ID: Integer read GetIDValue write SetIDValue; + property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull; + property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue; + property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull; + + public + constructor Create(aDataTable: TDADataTable); override; + destructor Destroy; override; + + end; + { IFormasPago } IFormasPago = interface(IDAStronglyTypedDataTable) - ['{2906012F-51D2-4722-A42A-1A1F0B5F5DA3}'] + ['{58C39D48-70C7-46A4-B465-9EA5F97DB50D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -85,6 +146,14 @@ type procedure SetCUENTAValue(const aValue: String); function GetCUENTAIsNull: Boolean; procedure SetCUENTAIsNull(const aValue: Boolean); + function GetID_SUBCUENTAValue: Integer; + procedure SetID_SUBCUENTAValue(const aValue: Integer); + function GetID_SUBCUENTAIsNull: Boolean; + procedure SetID_SUBCUENTAIsNull(const aValue: Boolean); + function GetIGNORAR_CONTABILIDADValue: SmallInt; + procedure SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); + function GetIGNORAR_CONTABILIDADIsNull: Boolean; + procedure SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); { Properties } @@ -104,6 +173,10 @@ type property DCIsNull: Boolean read GetDCIsNull write SetDCIsNull; property CUENTA: String read GetCUENTAValue write SetCUENTAValue; property CUENTAIsNull: Boolean read GetCUENTAIsNull write SetCUENTAIsNull; + property ID_SUBCUENTA: Integer read GetID_SUBCUENTAValue write SetID_SUBCUENTAValue; + property ID_SUBCUENTAIsNull: Boolean read GetID_SUBCUENTAIsNull write SetID_SUBCUENTAIsNull; + property IGNORAR_CONTABILIDAD: SmallInt read GetIGNORAR_CONTABILIDADValue write SetIGNORAR_CONTABILIDADValue; + property IGNORAR_CONTABILIDADIsNull: Boolean read GetIGNORAR_CONTABILIDADIsNull write SetIGNORAR_CONTABILIDADIsNull; end; { TFormasPagoDataTableRules } @@ -143,6 +216,14 @@ type procedure SetCUENTAValue(const aValue: String); virtual; function GetCUENTAIsNull: Boolean; virtual; procedure SetCUENTAIsNull(const aValue: Boolean); virtual; + function GetID_SUBCUENTAValue: Integer; virtual; + procedure SetID_SUBCUENTAValue(const aValue: Integer); virtual; + function GetID_SUBCUENTAIsNull: Boolean; virtual; + procedure SetID_SUBCUENTAIsNull(const aValue: Boolean); virtual; + function GetIGNORAR_CONTABILIDADValue: SmallInt; virtual; + procedure SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); virtual; + function GetIGNORAR_CONTABILIDADIsNull: Boolean; virtual; + procedure SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -161,6 +242,10 @@ type property DCIsNull: Boolean read GetDCIsNull write SetDCIsNull; property CUENTA: String read GetCUENTAValue write SetCUENTAValue; property CUENTAIsNull: Boolean read GetCUENTAIsNull write SetCUENTAIsNull; + property ID_SUBCUENTA: Integer read GetID_SUBCUENTAValue write SetID_SUBCUENTAValue; + property ID_SUBCUENTAIsNull: Boolean read GetID_SUBCUENTAIsNull write SetID_SUBCUENTAIsNull; + property IGNORAR_CONTABILIDAD: SmallInt read GetIGNORAR_CONTABILIDADValue write SetIGNORAR_CONTABILIDADValue; + property IGNORAR_CONTABILIDADIsNull: Boolean read GetIGNORAR_CONTABILIDADIsNull write SetIGNORAR_CONTABILIDADIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -170,7 +255,7 @@ type { IFormasPagoPlazos } IFormasPagoPlazos = interface(IDAStronglyTypedDataTable) - ['{6C99169B-3B96-4E95-9886-BFBDAF1C5836}'] + ['{61EB507B-9EA5-4E9C-8D3D-DEAE5F1073BD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -243,6 +328,60 @@ implementation uses Variants, uROBinaryHelpers; +{ TListaFormasPagoDataTableRules } +constructor TListaFormasPagoDataTableRules.Create(aDataTable: TDADataTable); +begin + inherited; +end; + +destructor TListaFormasPagoDataTableRules.Destroy; +begin + inherited; +end; + +function TListaFormasPagoDataTableRules.GetIDValue: Integer; +begin + result := DataTable.Fields[idx_ListaFormasPagoID].AsInteger; +end; + +procedure TListaFormasPagoDataTableRules.SetIDValue(const aValue: Integer); +begin + DataTable.Fields[idx_ListaFormasPagoID].AsInteger := aValue; +end; + +function TListaFormasPagoDataTableRules.GetIDIsNull: boolean; +begin + result := DataTable.Fields[idx_ListaFormasPagoID].IsNull; +end; + +procedure TListaFormasPagoDataTableRules.SetIDIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ListaFormasPagoID].AsVariant := Null; +end; + +function TListaFormasPagoDataTableRules.GetDESCRIPCIONValue: String; +begin + result := DataTable.Fields[idx_ListaFormasPagoDESCRIPCION].AsString; +end; + +procedure TListaFormasPagoDataTableRules.SetDESCRIPCIONValue(const aValue: String); +begin + DataTable.Fields[idx_ListaFormasPagoDESCRIPCION].AsString := aValue; +end; + +function TListaFormasPagoDataTableRules.GetDESCRIPCIONIsNull: boolean; +begin + result := DataTable.Fields[idx_ListaFormasPagoDESCRIPCION].IsNull; +end; + +procedure TListaFormasPagoDataTableRules.SetDESCRIPCIONIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ListaFormasPagoDESCRIPCION].AsVariant := Null; +end; + + { TFormasPagoDataTableRules } constructor TFormasPagoDataTableRules.Create(aDataTable: TDADataTable); begin @@ -422,6 +561,48 @@ begin DataTable.Fields[idx_FormasPagoCUENTA].AsVariant := Null; end; +function TFormasPagoDataTableRules.GetID_SUBCUENTAValue: Integer; +begin + result := DataTable.Fields[idx_FormasPagoID_SUBCUENTA].AsInteger; +end; + +procedure TFormasPagoDataTableRules.SetID_SUBCUENTAValue(const aValue: Integer); +begin + DataTable.Fields[idx_FormasPagoID_SUBCUENTA].AsInteger := aValue; +end; + +function TFormasPagoDataTableRules.GetID_SUBCUENTAIsNull: boolean; +begin + result := DataTable.Fields[idx_FormasPagoID_SUBCUENTA].IsNull; +end; + +procedure TFormasPagoDataTableRules.SetID_SUBCUENTAIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FormasPagoID_SUBCUENTA].AsVariant := Null; +end; + +function TFormasPagoDataTableRules.GetIGNORAR_CONTABILIDADValue: SmallInt; +begin + result := DataTable.Fields[idx_FormasPagoIGNORAR_CONTABILIDAD].AsSmallInt; +end; + +procedure TFormasPagoDataTableRules.SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); +begin + DataTable.Fields[idx_FormasPagoIGNORAR_CONTABILIDAD].AsSmallInt := aValue; +end; + +function TFormasPagoDataTableRules.GetIGNORAR_CONTABILIDADIsNull: boolean; +begin + result := DataTable.Fields[idx_FormasPagoIGNORAR_CONTABILIDAD].IsNull; +end; + +procedure TFormasPagoDataTableRules.SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FormasPagoIGNORAR_CONTABILIDAD].AsVariant := Null; +end; + { TFormasPagoPlazosDataTableRules } constructor TFormasPagoPlazosDataTableRules.Create(aDataTable: TDADataTable); @@ -520,6 +701,7 @@ end; initialization + RegisterDataTableRules(RID_ListaFormasPago, TListaFormasPagoDataTableRules); RegisterDataTableRules(RID_FormasPago, TFormasPagoDataTableRules); RegisterDataTableRules(RID_FormasPagoPlazos, TFormasPagoPlazosDataTableRules); diff --git a/Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas b/Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas index 874b45cd..8c4bd779 100644 --- a/Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas +++ b/Source/Modulos/Formas de pago/Model/schFormasPagoServer_Intf.pas @@ -9,13 +9,60 @@ 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_FormasPagoDelta = '{3B5575C3-8103-4890-A2BF-8B93698E666B}'; - RID_FormasPagoPlazosDelta = '{E0326434-91CF-4E0E-B620-9C98B3FF28EA}'; + RID_ListaFormasPagoDelta = '{BD6D4DED-0109-4CD2-B6D9-99208EA6157D}'; + RID_FormasPagoDelta = '{257D7005-3F68-4FA7-94BD-4EDB95ED361F}'; + RID_FormasPagoPlazosDelta = '{46BB2583-A6D4-4A62-BB44-BAC8789FD0A2}'; type + { IListaFormasPagoDelta } + IListaFormasPagoDelta = interface(IListaFormasPago) + ['{BD6D4DED-0109-4CD2-B6D9-99208EA6157D}'] + { Property getters and setters } + function GetOldIDValue : Integer; + function GetOldDESCRIPCIONValue : String; + + { Properties } + property OldID : Integer read GetOldIDValue; + property OldDESCRIPCION : String read GetOldDESCRIPCIONValue; + end; + + { TListaFormasPagoBusinessProcessorRules } + TListaFormasPagoBusinessProcessorRules = class(TDABusinessProcessorRules, IListaFormasPago, IListaFormasPagoDelta) + private + protected + { Property getters and setters } + function GetIDValue: Integer; virtual; + function GetIDIsNull: Boolean; virtual; + function GetOldIDValue: Integer; virtual; + function GetOldIDIsNull: Boolean; virtual; + procedure SetIDValue(const aValue: Integer); virtual; + procedure SetIDIsNull(const aValue: Boolean); virtual; + function GetDESCRIPCIONValue: String; virtual; + function GetDESCRIPCIONIsNull: Boolean; virtual; + function GetOldDESCRIPCIONValue: String; virtual; + function GetOldDESCRIPCIONIsNull: Boolean; virtual; + procedure SetDESCRIPCIONValue(const aValue: String); virtual; + procedure SetDESCRIPCIONIsNull(const aValue: Boolean); virtual; + + { Properties } + property ID : Integer read GetIDValue write SetIDValue; + property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull; + property OldID : Integer read GetOldIDValue; + property OldIDIsNull : Boolean read GetOldIDIsNull; + property DESCRIPCION : String read GetDESCRIPCIONValue write SetDESCRIPCIONValue; + property DESCRIPCIONIsNull : Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull; + property OldDESCRIPCION : String read GetOldDESCRIPCIONValue; + property OldDESCRIPCIONIsNull : Boolean read GetOldDESCRIPCIONIsNull; + + public + constructor Create(aBusinessProcessor: TDABusinessProcessor); override; + destructor Destroy; override; + + end; + { IFormasPagoDelta } IFormasPagoDelta = interface(IFormasPago) - ['{3B5575C3-8103-4890-A2BF-8B93698E666B}'] + ['{257D7005-3F68-4FA7-94BD-4EDB95ED361F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREFERENCIAValue : String; @@ -25,6 +72,8 @@ type function GetOldSUCURSALValue : String; function GetOldDCValue : String; function GetOldCUENTAValue : String; + function GetOldID_SUBCUENTAValue : Integer; + function GetOldIGNORAR_CONTABILIDADValue : SmallInt; { Properties } property OldID : Integer read GetOldIDValue; @@ -35,6 +84,8 @@ type property OldSUCURSAL : String read GetOldSUCURSALValue; property OldDC : String read GetOldDCValue; property OldCUENTA : String read GetOldCUENTAValue; + property OldID_SUBCUENTA : Integer read GetOldID_SUBCUENTAValue; + property OldIGNORAR_CONTABILIDAD : SmallInt read GetOldIGNORAR_CONTABILIDADValue; end; { TFormasPagoBusinessProcessorRules } @@ -90,6 +141,18 @@ type function GetOldCUENTAIsNull: Boolean; virtual; procedure SetCUENTAValue(const aValue: String); virtual; procedure SetCUENTAIsNull(const aValue: Boolean); virtual; + function GetID_SUBCUENTAValue: Integer; virtual; + function GetID_SUBCUENTAIsNull: Boolean; virtual; + function GetOldID_SUBCUENTAValue: Integer; virtual; + function GetOldID_SUBCUENTAIsNull: Boolean; virtual; + procedure SetID_SUBCUENTAValue(const aValue: Integer); virtual; + procedure SetID_SUBCUENTAIsNull(const aValue: Boolean); virtual; + function GetIGNORAR_CONTABILIDADValue: SmallInt; virtual; + function GetIGNORAR_CONTABILIDADIsNull: Boolean; virtual; + function GetOldIGNORAR_CONTABILIDADValue: SmallInt; virtual; + function GetOldIGNORAR_CONTABILIDADIsNull: Boolean; virtual; + procedure SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); virtual; + procedure SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -124,6 +187,14 @@ type property CUENTAIsNull : Boolean read GetCUENTAIsNull write SetCUENTAIsNull; property OldCUENTA : String read GetOldCUENTAValue; property OldCUENTAIsNull : Boolean read GetOldCUENTAIsNull; + property ID_SUBCUENTA : Integer read GetID_SUBCUENTAValue write SetID_SUBCUENTAValue; + property ID_SUBCUENTAIsNull : Boolean read GetID_SUBCUENTAIsNull write SetID_SUBCUENTAIsNull; + property OldID_SUBCUENTA : Integer read GetOldID_SUBCUENTAValue; + property OldID_SUBCUENTAIsNull : Boolean read GetOldID_SUBCUENTAIsNull; + property IGNORAR_CONTABILIDAD : SmallInt read GetIGNORAR_CONTABILIDADValue write SetIGNORAR_CONTABILIDADValue; + property IGNORAR_CONTABILIDADIsNull : Boolean read GetIGNORAR_CONTABILIDADIsNull write SetIGNORAR_CONTABILIDADIsNull; + property OldIGNORAR_CONTABILIDAD : SmallInt read GetOldIGNORAR_CONTABILIDADValue; + property OldIGNORAR_CONTABILIDADIsNull : Boolean read GetOldIGNORAR_CONTABILIDADIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -133,7 +204,7 @@ type { IFormasPagoPlazosDelta } IFormasPagoPlazosDelta = interface(IFormasPagoPlazos) - ['{E0326434-91CF-4E0E-B620-9C98B3FF28EA}'] + ['{46BB2583-A6D4-4A62-BB44-BAC8789FD0A2}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FORMA_PAGOValue : Integer; @@ -206,6 +277,80 @@ implementation uses Variants, uROBinaryHelpers, uDAInterfaces; +{ TListaFormasPagoBusinessProcessorRules } +constructor TListaFormasPagoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); +begin + inherited; +end; + +destructor TListaFormasPagoBusinessProcessorRules.Destroy; +begin + inherited; +end; + +function TListaFormasPagoBusinessProcessorRules.GetIDValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoID]; +end; + +function TListaFormasPagoBusinessProcessorRules.GetIDIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoID]); +end; + +function TListaFormasPagoBusinessProcessorRules.GetOldIDValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ListaFormasPagoID]; +end; + +function TListaFormasPagoBusinessProcessorRules.GetOldIDIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ListaFormasPagoID]); +end; + +procedure TListaFormasPagoBusinessProcessorRules.SetIDValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoID] := aValue; +end; + +procedure TListaFormasPagoBusinessProcessorRules.SetIDIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoID] := Null; +end; + +function TListaFormasPagoBusinessProcessorRules.GetDESCRIPCIONValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoDESCRIPCION]; +end; + +function TListaFormasPagoBusinessProcessorRules.GetDESCRIPCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoDESCRIPCION]); +end; + +function TListaFormasPagoBusinessProcessorRules.GetOldDESCRIPCIONValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ListaFormasPagoDESCRIPCION]; +end; + +function TListaFormasPagoBusinessProcessorRules.GetOldDESCRIPCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ListaFormasPagoDESCRIPCION]); +end; + +procedure TListaFormasPagoBusinessProcessorRules.SetDESCRIPCIONValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoDESCRIPCION] := aValue; +end; + +procedure TListaFormasPagoBusinessProcessorRules.SetDESCRIPCIONIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ListaFormasPagoDESCRIPCION] := Null; +end; + + { TFormasPagoBusinessProcessorRules } constructor TFormasPagoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); begin @@ -465,6 +610,68 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoCUENTA] := Null; end; +function TFormasPagoBusinessProcessorRules.GetID_SUBCUENTAValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoID_SUBCUENTA]; +end; + +function TFormasPagoBusinessProcessorRules.GetID_SUBCUENTAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoID_SUBCUENTA]); +end; + +function TFormasPagoBusinessProcessorRules.GetOldID_SUBCUENTAValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FormasPagoID_SUBCUENTA]; +end; + +function TFormasPagoBusinessProcessorRules.GetOldID_SUBCUENTAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FormasPagoID_SUBCUENTA]); +end; + +procedure TFormasPagoBusinessProcessorRules.SetID_SUBCUENTAValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoID_SUBCUENTA] := aValue; +end; + +procedure TFormasPagoBusinessProcessorRules.SetID_SUBCUENTAIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoID_SUBCUENTA] := Null; +end; + +function TFormasPagoBusinessProcessorRules.GetIGNORAR_CONTABILIDADValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoIGNORAR_CONTABILIDAD]; +end; + +function TFormasPagoBusinessProcessorRules.GetIGNORAR_CONTABILIDADIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoIGNORAR_CONTABILIDAD]); +end; + +function TFormasPagoBusinessProcessorRules.GetOldIGNORAR_CONTABILIDADValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FormasPagoIGNORAR_CONTABILIDAD]; +end; + +function TFormasPagoBusinessProcessorRules.GetOldIGNORAR_CONTABILIDADIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FormasPagoIGNORAR_CONTABILIDAD]); +end; + +procedure TFormasPagoBusinessProcessorRules.SetIGNORAR_CONTABILIDADValue(const aValue: SmallInt); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoIGNORAR_CONTABILIDAD] := aValue; +end; + +procedure TFormasPagoBusinessProcessorRules.SetIGNORAR_CONTABILIDADIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FormasPagoIGNORAR_CONTABILIDAD] := Null; +end; + { TFormasPagoPlazosBusinessProcessorRules } constructor TFormasPagoPlazosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); @@ -603,6 +810,7 @@ end; initialization + RegisterBusinessProcessorRules(RID_ListaFormasPagoDelta, TListaFormasPagoBusinessProcessorRules); RegisterBusinessProcessorRules(RID_FormasPagoDelta, TFormasPagoBusinessProcessorRules); RegisterBusinessProcessorRules(RID_FormasPagoPlazosDelta, TFormasPagoPlazosBusinessProcessorRules); diff --git a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm index 71af1d7e..46436186 100644 --- a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm +++ b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm @@ -14,8 +14,8 @@ object srvFormasPago: TsrvFormasPago DiagramData = ''#13#10' '#13#10' '#13#10' '#13#10' '#13#10''#13#10 + '00" Top="0,00" />'#13#10' '#13#10' '#13#10''#13#10 end object DataDictionary: TDADataDictionary Fields = < @@ -171,6 +171,14 @@ object srvFormasPago: TsrvFormasPago item DatasetField = 'CUENTA' TableField = 'CUENTA' + end + item + DatasetField = 'ID_SUBCUENTA' + TableField = 'ID_SUBCUENTA' + end + item + DatasetField = 'IGNORAR_CONTABILIDAD' + TableField = 'IGNORAR_CONTABILIDAD' end> end> Name = 'FormasPago' @@ -224,6 +232,14 @@ object srvFormasPago: TsrvFormasPago DataType = datString Size = 15 DictionaryEntry = 'FormasPago_CUENTA' + end + item + Name = 'ID_SUBCUENTA' + DataType = datInteger + end + item + Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt end> end item @@ -290,30 +306,54 @@ object srvFormasPago: TsrvFormasPago end item Name = 'REFERENCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'DESCRIPCION' + DataType = datString + Size = 255 Value = '' end item Name = 'TITULAR' + DataType = datString + Size = 255 Value = '' end item Name = 'ENTIDAD' + DataType = datString + Size = 15 Value = '' end item Name = 'SUCURSAL' + DataType = datString + Size = 15 Value = '' end item Name = 'DC' + DataType = datString + Size = 15 Value = '' end item Name = 'CUENTA' + DataType = datString + Size = 15 + Value = '' + end + item + Name = 'ID_SUBCUENTA' + DataType = datInteger + Value = '' + end + item + Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt Value = '' end> Statements = < @@ -323,9 +363,10 @@ object srvFormasPago: TsrvFormasPago TargetTable = 'FORMAS_PAGO' SQL = 'INSERT'#10' INTO FORMAS_PAGO'#10' (ID, REFERENCIA, DESCRIPCION, TITU' + - 'LAR, ENTIDAD, SUCURSAL,'#10' DC, CUENTA)'#10' VALUES'#10' (:ID, :REF' + - 'ERENCIA, :DESCRIPCION, :TITULAR, :ENTIDAD, :SUCURSAL,'#10' :DC, ' + - ':CUENTA)'#10 + 'LAR, ENTIDAD, SUCURSAL,'#10' DC, CUENTA, ID_SUBCUENTA, IGNORAR_C' + + 'ONTABILIDAD)'#10' VALUES'#10' (:ID, :REFERENCIA, :DESCRIPCION, :TITU' + + 'LAR, :ENTIDAD, :SUCURSAL,'#10' :DC, :CUENTA, :ID_SUBCUENTA, :IGN' + + 'ORAR_CONTABILIDAD)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -393,10 +434,19 @@ object srvFormasPago: TsrvFormasPago Size = 15 Value = '' end + item + Name = 'ID_SUBCUENTA' + DataType = datInteger + Value = '' + end + item + Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt + Value = '' + end item Name = 'OLD_ID' - DataType = datAutoInc - Value = '0' + Value = '' end> Statements = < item @@ -407,7 +457,8 @@ object srvFormasPago: TsrvFormasPago 'UPDATE FORMAS_PAGO'#10' SET '#10' REFERENCIA = :REFERENCIA, '#10' DES' + 'CRIPCION = :DESCRIPCION, '#10' TITULAR = :TITULAR, '#10' ENTIDAD =' + ' :ENTIDAD, '#10' SUCURSAL = :SUCURSAL, '#10' DC = :DC, '#10' CUENTA' + - ' = :CUENTA'#10' WHERE'#10' (ID = :OLD_ID)' + ' = :CUENTA,'#10' ID_SUBCUENTA = :ID_SUBCUENTA,'#10' IGNORAR_CONTAB' + + 'ILIDAD = :IGNORAR_CONTABILIDAD'#10' WHERE'#10' (ID = :OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Formas de pago/Views/FormasPago_view.dpk b/Source/Modulos/Formas de pago/Views/FormasPago_view.dpk index 45b1792253f83f74617cff47043666e14551cdc6..e031dfc8dd42194118ef0484c351452784f8d67c 100644 GIT binary patch delta 74 zcmX@i*2umgn8{9umrFsREIB77sRGP&&d)1JOv=p3Oi4_MPX=;|@^f-hi!kMK^HWlD JCI>Tp003ir83+IX delta 11 ScmZoDelphi.Personality Package -FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0FormasPago_view.dpk +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0FormasPago_view.dpk MainSource - - - - - - - + + + + + + + + + +
fEditorFormaPago
fEditorFormasPago
+ TfEditorFormasPago diff --git a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm index b774ef85..1a556547 100644 --- a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm +++ b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm @@ -1,12 +1,11 @@ object fEditorFormaPago: TfEditorFormaPago Left = 453 Top = 234 - ActiveControl = eReferencia BorderIcons = [biSystemMenu] BorderStyle = bsSingle Caption = 'Forma de pago' - ClientHeight = 352 - ClientWidth = 404 + ClientHeight = 390 + ClientWidth = 484 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -18,169 +17,305 @@ object fEditorFormaPago: TfEditorFormaPago OnShow = FormShow PixelsPerInch = 96 TextHeight = 13 - object Label1: TLabel - Left = 16 - Top = 17 - Width = 151 - Height = 13 - Caption = 'Datos de la forma de pago' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentFont = False - end - object Bevel1: TBevel - Left = 173 - Top = 17 - Width = 212 - Height = 10 - Shape = bsBottomLine - end - object Label2: TLabel - Left = 62 - Top = 43 - Width = 55 - Height = 13 - Alignment = taRightJustify - Caption = 'Referencia:' - end - object Label3: TLabel - Left = 58 - Top = 71 - Width = 59 - Height = 13 - Alignment = taRightJustify - Caption = 'Descripci'#243'n:' - end - object Label11: TLabel - Left = 16 - Top = 112 - Width = 91 - Height = 13 - Caption = 'Plazos del pago' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentFont = False - end - object Bevel3: TBevel - Left = 113 - Top = 112 - Width = 272 - Height = 10 - Shape = bsBottomLine - end - object Bevel4: TBevel - Left = 8 - Top = 290 - Width = 388 - Height = 10 - Shape = bsBottomLine - end object JvEnterAsTab1: TJvEnterAsTab Left = 137 Top = 306 Width = 28 Height = 28 end - object bAceptar: TButton - Left = 234 - Top = 314 - Width = 75 - Height = 23 - Action = actAceptar - TabOrder = 5 - end - object bCancelar: TButton - Left = 319 - Top = 314 - Width = 75 - Height = 23 - Action = actCancelar - Cancel = True - TabOrder = 6 - end - object eReferencia: TDBEdit - Left = 123 - Top = 40 - Width = 118 - Height = 21 - Color = clInfoBk - DataField = 'REFERENCIA' - DataSource = dsFormaPago + object dxLayoutControl1: TdxLayoutControl + Left = 0 + Top = 0 + Width = 484 + Height = 390 + Align = alClient TabOrder = 0 - end - object eDescripcion: TDBEdit - Left = 123 - Top = 68 - Width = 262 - Height = 21 - Color = clInfoBk - DataField = 'DESCRIPCION' - DataSource = dsFormaPago - TabOrder = 1 - end - object bAnadir: TButton - Left = 290 - Top = 134 - Width = 95 - Height = 23 - Action = actAnadir - TabOrder = 3 - end - object bEliminar: TButton - Left = 290 - Top = 163 - Width = 95 - Height = 23 - Action = actEliminar - TabOrder = 4 - end - object ListaFormasPago: TcxGrid - Left = 32 - Top = 134 - Width = 252 - Height = 150 - TabOrder = 2 - LookAndFeel.Kind = lfStandard - LookAndFeel.NativeStyle = True - object ListaFormasPagoDBTableView1: TcxGridDBTableView - NavigatorButtons.ConfirmDelete = False - DataController.DataSource = dsPlazos - DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> - OptionsCustomize.ColumnFiltering = False - OptionsCustomize.ColumnGrouping = False - OptionsCustomize.ColumnMoving = False - OptionsCustomize.ColumnSorting = False - OptionsData.Deleting = False - OptionsData.DeletingConfirmation = False - OptionsData.Inserting = False - OptionsView.CellEndEllipsis = True - OptionsView.GroupByBox = False - object ListaFormasPagoDBTableView1NUM_DIAS: TcxGridDBColumn - DataBinding.FieldName = 'NUM_DIAS' - PropertiesClassName = 'TcxSpinEditProperties' - Properties.AssignedValues.MinValue = True - Width = 112 + TabStop = False + ExplicitWidth = 412 + ExplicitHeight = 515 + object Bevel4: TBevel + Left = 10 + Top = 329 + Width = 388 + Height = 10 + Shape = bsBottomLine + end + object Bevel2: TBevel + Left = 10 + Top = 151 + Width = 388 + Height = 10 + Shape = bsBottomLine + end + object eReferencia: TDBEdit + Left = 76 + Top = 12 + Width = 118 + Height = 21 + BorderStyle = bsNone + Color = clInfoBk + DataField = 'REFERENCIA' + DataSource = dsFormaPago + TabOrder = 0 + end + object eDescripcion: TDBEdit + Left = 76 + Top = 43 + Width = 262 + Height = 21 + BorderStyle = bsNone + Color = clInfoBk + DataField = 'DESCRIPCION' + DataSource = dsFormaPago + TabOrder = 1 + end + object ListaFormasPago: TcxGrid + Left = 10 + Top = 167 + Width = 246 + Height = 156 + TabOrder = 6 + LookAndFeel.Kind = lfStandard + LookAndFeel.NativeStyle = True + object ListaFormasPagoDBTableView1: TcxGridDBTableView + NavigatorButtons.ConfirmDelete = False + DataController.DataSource = dsPlazos + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsCustomize.ColumnGrouping = False + OptionsCustomize.ColumnMoving = False + OptionsCustomize.ColumnSorting = False + OptionsData.Deleting = False + OptionsData.DeletingConfirmation = False + OptionsData.Inserting = False + OptionsView.CellEndEllipsis = True + OptionsView.GroupByBox = False + object ListaFormasPagoDBTableView1NUM_DIAS: TcxGridDBColumn + DataBinding.FieldName = 'NUM_DIAS' + PropertiesClassName = 'TcxSpinEditProperties' + Properties.AssignedValues.MinValue = True + Width = 112 + end + object ListaFormasPagoDBTableView1PORCENTAJE: TcxGridDBColumn + DataBinding.FieldName = 'PORCENTAJE' + PropertiesClassName = 'TcxSpinEditProperties' + Properties.AssignedValues.MinValue = True + Properties.MaxValue = 100.000000000000000000 + HeaderAlignmentHorz = taRightJustify + Width = 132 + end end - object ListaFormasPagoDBTableView1PORCENTAJE: TcxGridDBColumn - DataBinding.FieldName = 'PORCENTAJE' - PropertiesClassName = 'TcxSpinEditProperties' - Properties.AssignedValues.MinValue = True - Properties.MaxValue = 100.000000000000000000 - HeaderAlignmentHorz = taRightJustify - Width = 132 + object ListaFormasPagoLevel1: TcxGridLevel + GridView = ListaFormasPagoDBTableView1 end end - object ListaFormasPagoLevel1: TcxGridLevel - GridView = ListaFormasPagoDBTableView1 + object bAnadir: TButton + Left = 262 + Top = 167 + Width = 95 + Height = 23 + Action = actAnadir + TabOrder = 7 + end + object bEliminar: TButton + Left = 262 + Top = 196 + Width = 95 + Height = 23 + Action = actEliminar + TabOrder = 8 + end + object bAceptar: TButton + Left = 314 + Top = 345 + Width = 75 + Height = 23 + Action = actAceptar + TabOrder = 9 + end + object bCancelar: TButton + Left = 395 + Top = 345 + Width = 75 + Height = 23 + Action = actCancelar + Cancel = True + TabOrder = 10 + end + object rdPagoPlazos: TcxRadioButton + Left = 10 + Top = 125 + Width = 388 + Height = 20 + Caption = 'Plazos del pago' + TabOrder = 5 + OnClick = rdPagoPlazosClick + end + object rdPagoVencimiento: TcxRadioButton + Left = 10 + Top = 72 + Width = 388 + Height = 20 + Caption = 'Pago por vencimiento' + TabOrder = 2 + OnClick = rdPagoPlazosClick + end + object cbSubcuenta: TcxDBLookupComboBox + Left = 74 + Top = 98 + DataBinding.DataField = 'ID_SUBCUENTA' + DataBinding.DataSource = dsFormaPago + Properties.KeyFieldNames = 'ID' + Properties.ListColumns = < + item + FieldName = 'DESCRIPCION' + end> + Properties.ListOptions.GridLines = glNone + Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True + Properties.ListSource = dsSubcuentas + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 3 + Width = 250 + end + object cxDBCheckBox1: TcxDBCheckBox + Left = 330 + Top = 98 + Caption = 'Ignorar en contabilidad' + DataBinding.DataField = 'IGNORAR_CONTABILIDAD' + DataBinding.DataSource = dsFormaPago + Properties.ValueChecked = 1 + Properties.ValueUnchecked = 0 + TabOrder = 4 + Width = 140 + end + object dxLayoutControl1Group_Root: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Referencia:' + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group2: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group3: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Referencia:' + Control = eReferencia + end + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Descripci'#243'n:' + Control = eDescripcion + end + object dxLayoutControl1Item11: TdxLayoutItem + ShowCaption = False + Control = rdPagoVencimiento + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object panelVencimiento: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item12: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Cuenta:' + Control = cbSubcuenta + ControlOptions.ShowBorder = False + end + object checkIgnorarContabilidad: TdxLayoutItem + AutoAligns = [aaVertical] + Caption = 'cxDBCheckBox1' + ShowCaption = False + Control = cxDBCheckBox1 + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Item10: TdxLayoutItem + Caption = 'cxRadioButton1' + ShowCaption = False + Control = rdPagoPlazos + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item9: TdxLayoutItem + Control = Bevel2 + ControlOptions.ShowBorder = False + end + end + object panelPlazosDePago: TdxLayoutGroup + Caption = 'asdadsa' + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item3: TdxLayoutItem + Control = ListaFormasPago + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Group1: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahClient + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Item4: TdxLayoutItem + ShowCaption = False + Control = bAnadir + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item5: TdxLayoutItem + ShowCaption = False + Control = bEliminar + ControlOptions.ShowBorder = False + end + end + end + end + object dxLayoutControl1Item8: TdxLayoutItem + Control = Bevel4 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Group5: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahRight + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item6: TdxLayoutItem + ShowCaption = False + Control = bAceptar + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item7: TdxLayoutItem + ShowCaption = False + Control = bCancelar + ControlOptions.ShowBorder = False + end + end end end object ActionList1: TActionList @@ -220,4 +355,8 @@ object fEditorFormaPago: TfEditorFormaPago Left = 8 Top = 300 end + object dsSubcuentas: TDADataSource + Left = 248 + Top = 68 + end end diff --git a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas index 242236f8..7812e023 100644 --- a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas +++ b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas @@ -34,7 +34,10 @@ uses JvComponent, JvEnterTab, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, cxSpinEdit, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, - cxGridCustomView, cxGrid, uDAInterfaces; + cxGridCustomView, cxGrid, uDAInterfaces, dxLayoutControl, dblookup, + cxRadioGroup, cxContainer, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit, + cxDBLookupEdit, cxDBLookupComboBox, uBizSubCuentas, uSubCuentasController, + cxCheckBox, cxDBEdit; type TfEditorFormaPago = class(TForm, IEditorFormaPago) @@ -44,28 +47,49 @@ type actEliminar: TAction; actAceptar: TAction; actCancelar: TAction; - bAceptar: TButton; - bCancelar: TButton; actCerrar: TAction; actModificar: TAction; - eReferencia: TDBEdit; - eDescripcion: TDBEdit; dsPlazos: TDADataSource; - Label1: TLabel; - Bevel1: TBevel; - Label2: TLabel; - Label3: TLabel; - Label11: TLabel; - Bevel3: TBevel; - Bevel4: TBevel; - bAnadir: TButton; - bEliminar: TButton; JvEnterAsTab1: TJvEnterAsTab; - ListaFormasPagoDBTableView1: TcxGridDBTableView; - ListaFormasPagoLevel1: TcxGridLevel; + dxLayoutControl1Group_Root: TdxLayoutGroup; + dxLayoutControl1: TdxLayoutControl; + dxLayoutControl1Item1: TdxLayoutItem; + eReferencia: TDBEdit; + dxLayoutControl1Item2: TdxLayoutItem; + eDescripcion: TDBEdit; + dxLayoutControl1Item3: TdxLayoutItem; ListaFormasPago: TcxGrid; + ListaFormasPagoDBTableView1: TcxGridDBTableView; ListaFormasPagoDBTableView1NUM_DIAS: TcxGridDBColumn; ListaFormasPagoDBTableView1PORCENTAJE: TcxGridDBColumn; + ListaFormasPagoLevel1: TcxGridLevel; + dxLayoutControl1Group3: TdxLayoutGroup; + dxLayoutControl1Item4: TdxLayoutItem; + bAnadir: TButton; + panelPlazosDePago: TdxLayoutGroup; + dxLayoutControl1Item5: TdxLayoutItem; + bEliminar: TButton; + dxLayoutControl1Group1: TdxLayoutGroup; + dxLayoutControl1Item6: TdxLayoutItem; + bAceptar: TButton; + dxLayoutControl1Item7: TdxLayoutItem; + bCancelar: TButton; + dxLayoutControl1Item8: TdxLayoutItem; + Bevel4: TBevel; + dxLayoutControl1Group2: TdxLayoutGroup; + dxLayoutControl1Group5: TdxLayoutGroup; + dxLayoutControl1Item9: TdxLayoutItem; + Bevel2: TBevel; + rdPagoPlazos: TcxRadioButton; + dxLayoutControl1Item10: TdxLayoutItem; + dxLayoutControl1Item11: TdxLayoutItem; + rdPagoVencimiento: TcxRadioButton; + dsSubcuentas: TDADataSource; + dxLayoutControl1Item12: TdxLayoutItem; + cbSubcuenta: TcxDBLookupComboBox; + cxDBCheckBox1: TcxDBCheckBox; + checkIgnorarContabilidad: TdxLayoutItem; + panelVencimiento: TdxLayoutGroup; procedure FormShow(Sender: TObject); procedure actAnadirExecute(Sender: TObject); @@ -75,9 +99,12 @@ type procedure actCerrarExecute(Sender: TObject); procedure actAnadirUpdate(Sender: TObject); procedure actEliminarUpdate(Sender: TObject); + procedure rdPagoPlazosClick(Sender: TObject); protected FFormaPago: IBizFormaPago; FPlazos : IBizFormaPagoPlazos; + FSubCuentas: IBizSubCuenta; + FSubCuentasController: TSubCuentasController; FController : IFormasPagoController; FPlazosController: IFormasPagoPlazosController; function GetFormaPago: IBizFormaPago; @@ -102,6 +129,20 @@ begin Result := FFormaPago; end; +procedure TfEditorFormaPago.rdPagoPlazosClick(Sender: TObject); +begin + if rdPagoPlazos.Checked then + begin + panelPlazosDePago.Enabled := True; + panelVencimiento.Enabled := False; + end + else + begin + panelPlazosDePago.Enabled := False; + panelVencimiento.Enabled := True; + end +end; + procedure TfEditorFormaPago.SetFormaPago(const Value: IBizFormaPago); begin FFormaPago := Value; @@ -141,11 +182,17 @@ begin inherited; FController := TFormasPagoController.Create; FPlazosController := TFormasPagoPlazosController.Create; + FSubCuentasController := TSubCuentasController.Create; + FSubCuentas := FSubCuentasController.BuscarCajasBancos; + dsSubcuentas.DataTable := FSubCuentas.DataTable; end; destructor TfEditorFormaPago.Destroy; begin + dsSubcuentas.DataTable := Nil; FFormaPago := NIL; + FSubCuentas := NIL; + FSubCuentasController := NIL; FPlazosController := NIL; FController := NIL; inherited; @@ -180,13 +227,23 @@ end; procedure TfEditorFormaPago.FormShow(Sender: TObject); begin + rdPagoVencimiento.Checked := True; + + if not FSubCuentas.DataTable.Active then + FSubCuentas.DataTable.Active := True; + if not FFormaPago.DataTable.Active then FFormaPago.DataTable.Active := True; if FFormaPago.EsNuevo then Self.Caption := 'Nueva forma de pago' else + begin Self.Caption := 'Modificar forma de pago'; + if (FFormaPago.Plazos.RecordCount > 0) then + rdPagoPlazos.Checked := True; + end; + end; end. diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 4feb426a..1d36f360 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -46,8 +46,6 @@ uses uBizAlbaranClienteServer in '..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas', srvRecibosCliente_Impl in '..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas' {srvRecibosCliente: TDataAbstractService}, srvFacturasCliente_Impl in '..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas' {srvFacturasCliente: TDataAbstractService}, - schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas', - schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas', uRptPresupuestosCliente_Server in '..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas' {RptPresupuestosCliente}, srvRecibosProveedor_Impl in '..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas' {srvRecibosProveedor: TDataAbstractService}, uBizFacturasClienteServer in '..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas', @@ -138,7 +136,9 @@ uses schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', - schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas'; + schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas', + schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas', + schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index b91c81fa..ed20775f 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2870FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.7.0FactuGES (Servidor)2.8.7.0miércoles, 25 de octubre de 2017 16:15 + FalseTrueFalseTrueFalse2880FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.8.0FactuGES (Servidor)2.8.8.0miércoles, 10 de octubre de 2018 12:13 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 115c51f4..04303a86 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,8,7,0 -PRODUCTVERSION 2,8,7,0 +FILEVERSION 2,8,8,0 +PRODUCTVERSION 2,8,8,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.8.7.0\0" + VALUE "FileVersion", "2.8.8.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" - VALUE "ProductVersion", "2.8.7.0\0" - VALUE "CompileDate", "jueves, 31 de mayo de 2018 13:22\0" + VALUE "ProductVersion", "2.8.8.0\0" + VALUE "CompileDate", "miércoles, 10 de octubre de 2018 16:29\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 5bf2d3f7c12d8967ff37357655352c9861f8b0bd..b5598183473e77e5f99ea06240c6ecf1cf4b6428 100644 GIT binary patch delta 149 zcmdn6jd9O5#tnBO7#$|xjgSYDe3usI3`<1$}-NI92u$1ST(sevYpXl zGHX;dw*`Y9g8@)Jk3oHMca*GmE<+~6ONJtbWQKf(9EMbeVg?-s1qMT)8U=hrIYRwp|7>pP!CqIw!1ORv~I