From eedb9c04b32b1aa78c03128be33a6c62ddc7a132 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 6 Nov 2013 12:46:52 +0000 Subject: [PATCH] =?UTF-8?q?Tarea=20#1279=20->=20A=C3=B1adir=20a=20las=20fa?= =?UTF-8?q?cturas=20de=20proveedor=20un=20%=20de=20retenci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1083 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Database/scripts/factuges.sql | 4 +- Source/Cliente/FactuGES.dproj | 2 +- Source/Cliente/FactuGES.res | Bin 171984 -> 172156 bytes .../Data/uDataModuleFacturasProveedor.dfm | 19 +- .../Model/schFacturasProveedorClient_Intf.pas | 126 +++- .../Model/schFacturasProveedorServer_Intf.pas | 102 ++- .../Model/uBizFacturasProveedor.pas | 19 +- .../Servidor/srvFacturasProveedor_Impl.dfm | 83 ++- .../Views/uEditorFacturaProveedor.dfm | 167 +++-- .../Views/uViewTotalesVariosIVA.dfm | 130 +++- .../Views/uViewTotalesVariosIVA.pas | 5 + Source/Servidor/FactuGES_Server.RES | Bin 23216 -> 23496 bytes Source/Servidor/FactuGES_Server.dproj | 661 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 2 +- 14 files changed, 846 insertions(+), 474 deletions(-) diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 6fede1c5..a7da7d63 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -743,7 +743,9 @@ CREATE TABLE FACTURAS_PROVEEDOR ( RECARGO_EQUIVALENCIA TIPO_BOOLEANO, DATOS_BANCARIOS VARCHAR(255), FECHA_VENCIMIENTO DATE, - FECHA_RECEPCION DATE + FECHA_RECEPCION DATE, + RETENCION TIPO_PORCENTAJE, + IMPORTE_RETENCION TIPO_IMPORTE ); CREATE TABLE FACTURAS_PROVEEDOR_DETALLES ( diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 811899bb..4a332c94 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2020FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.2.0FactuGESFactuGES2.0.2.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2030FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.3.0FactuGESFactuGES2.0.3.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index b9a97faa7f7f5833a92ba80a9e89e3dde2850835..7146d6c6fa53cf006fb715e83e8408397b9edd07 100644 GIT binary patch delta 488 zcmY+9J4*vW6otQ;JWSRgTc%tHzMFt{A_f%+DA=S=7L{z!XoxmeNns#AK-ebPwEF{W zMN3OdYdil#Al}{C7(6hKGv}Op?|i;l(|4=?q+WD-+_P<~z#kL^Y#S6gyi9Z&=HR74 zQ!ERkc4|GX= z`EH==n_HqQPH1t%700sfxu7e&!-MR1+?u%m8t84cO!bAYCJvWN$+hL|axLBFFy8Z|MoaoemFJU1tSz}1ercjznPo81r@t=*M3Vpj delta 318 zcmex!fa}73u7(!IElezP>kS0Bco^V-k%5OnK!AaPkwJnXgB3)>c`OVJObikd5V;d< z3=GV0UI!-w0}F$K0z_^F2Ll5uf(JB>jlsYGD#ypbz>eUlGQ=}*FgQ3sBsH8E7&sX` zJRrP|5C#S=hJ*yD#wiR8+zbs3P?a1YhcYmHU}RuW0Mh^e3ji^Y0|W*P2oHT=oc?Go zlZiSLP#l8o!D>LxWdV8)6$DJToyVlis53or9#j1EH}jY@7>%Zj&S$coeqlaS0+4OE HfXN#G2U99^ diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm index 70624720..ef75b369 100644 --- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm @@ -69,11 +69,14 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor item Name = 'FECHA_RECEPCION' DataType = datDateTime + DisplayLabel = 'FacturasProveedor_FECHA_RECEPCION' + DictionaryEntry = 'FacturasProveedor_FECHA_RECEPCION' end item Name = 'FECHA_VENCIMIENTO' DataType = datDateTime - DisplayLabel = 'Fecha vto.' + DisplayLabel = 'Fecha de vencimiento' + DictionaryEntry = 'FacturasProveedor_FECHA_VENCIMIENTO' end item Name = 'SITUACION' @@ -116,6 +119,20 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor Alignment = taRightJustify DictionaryEntry = 'FacturasProveedor_IMPORTE_IVA' end + item + Name = 'RETENCION' + DataType = datFloat + DisplayLabel = 'Retenci'#243'n' + Alignment = taRightJustify + DictionaryEntry = 'FacturasProveedor_RETENCION' + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency + DisplayLabel = 'Importe retenci'#243'n' + Alignment = taRightJustify + DictionaryEntry = 'FacturasProveedor_IMPORTE_RETENCION' + end item Name = 'RE' DataType = datFloat diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas index cea6457b..91963d1f 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas @@ -9,10 +9,10 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturas = '{808B7CB0-1C43-42C9-91A4-D748FAA7F572}'; - RID_FacturasProveedor = '{29AC430E-100E-43BC-A978-30313D8902B6}'; - RID_FacturasProveedor_Detalles = '{1BF06DAC-27E7-418F-B98C-F9C098C52DF9}'; - RID_FacturasProveedor_Pedidos = '{7005038D-FBAA-4C82-A86D-1B4A04AC45E7}'; + RID_ListaAnosFacturas = '{5BF20483-0987-4847-9C60-D1E2273B804C}'; + RID_FacturasProveedor = '{4DA50F35-8E3D-4026-87AC-0463785925E3}'; + RID_FacturasProveedor_Detalles = '{6CB75F1D-81CB-406B-BC72-36935ABD0A7E}'; + RID_FacturasProveedor_Pedidos = '{26EB0745-E499-4FE1-B52D-6AB1F550D0AE}'; { Data table names } nme_ListaAnosFacturas = 'ListaAnosFacturas'; @@ -41,6 +41,8 @@ const fld_FacturasProveedorIMPORTE_DESCUENTO = 'IMPORTE_DESCUENTO'; fld_FacturasProveedorIVA = 'IVA'; fld_FacturasProveedorIMPORTE_IVA = 'IMPORTE_IVA'; + fld_FacturasProveedorRETENCION = 'RETENCION'; + fld_FacturasProveedorIMPORTE_RETENCION = 'IMPORTE_RETENCION'; fld_FacturasProveedorRE = 'RE'; fld_FacturasProveedorIMPORTE_RE = 'IMPORTE_RE'; fld_FacturasProveedorIMPORTE_TOTAL = 'IMPORTE_TOTAL'; @@ -77,26 +79,28 @@ const idx_FacturasProveedorIMPORTE_DESCUENTO = 11; idx_FacturasProveedorIVA = 12; idx_FacturasProveedorIMPORTE_IVA = 13; - idx_FacturasProveedorRE = 14; - idx_FacturasProveedorIMPORTE_RE = 15; - idx_FacturasProveedorIMPORTE_TOTAL = 16; - idx_FacturasProveedorOBSERVACIONES = 17; - idx_FacturasProveedorID_PROVEEDOR = 18; - idx_FacturasProveedorNIF_CIF = 19; - idx_FacturasProveedorNOMBRE = 20; - idx_FacturasProveedorCALLE = 21; - idx_FacturasProveedorPOBLACION = 22; - idx_FacturasProveedorPROVINCIA = 23; - idx_FacturasProveedorCODIGO_POSTAL = 24; - idx_FacturasProveedorFECHA_ALTA = 25; - idx_FacturasProveedorFECHA_MODIFICACION = 26; - idx_FacturasProveedorUSUARIO = 27; - idx_FacturasProveedorID_FORMA_PAGO = 28; - idx_FacturasProveedorRECARGO_EQUIVALENCIA = 29; - idx_FacturasProveedorID_TIPO_IVA = 30; - idx_FacturasProveedorIMPORTE_NETO = 31; - idx_FacturasProveedorIMPORTE_PORTE = 32; - idx_FacturasProveedorDATOS_BANCARIOS = 33; + idx_FacturasProveedorRETENCION = 14; + idx_FacturasProveedorIMPORTE_RETENCION = 15; + idx_FacturasProveedorRE = 16; + idx_FacturasProveedorIMPORTE_RE = 17; + idx_FacturasProveedorIMPORTE_TOTAL = 18; + idx_FacturasProveedorOBSERVACIONES = 19; + idx_FacturasProveedorID_PROVEEDOR = 20; + idx_FacturasProveedorNIF_CIF = 21; + idx_FacturasProveedorNOMBRE = 22; + idx_FacturasProveedorCALLE = 23; + idx_FacturasProveedorPOBLACION = 24; + idx_FacturasProveedorPROVINCIA = 25; + idx_FacturasProveedorCODIGO_POSTAL = 26; + idx_FacturasProveedorFECHA_ALTA = 27; + idx_FacturasProveedorFECHA_MODIFICACION = 28; + idx_FacturasProveedorUSUARIO = 29; + idx_FacturasProveedorID_FORMA_PAGO = 30; + idx_FacturasProveedorRECARGO_EQUIVALENCIA = 31; + idx_FacturasProveedorID_TIPO_IVA = 32; + idx_FacturasProveedorIMPORTE_NETO = 33; + idx_FacturasProveedorIMPORTE_PORTE = 34; + idx_FacturasProveedorDATOS_BANCARIOS = 35; { FacturasProveedor_Detalles fields } fld_FacturasProveedor_DetallesID_TIPO_IVA = 'ID_TIPO_IVA'; @@ -161,7 +165,7 @@ const type { IListaAnosFacturas } IListaAnosFacturas = interface(IDAStronglyTypedDataTable) - ['{28EC39BD-0654-47A4-AC5C-F1D3A2D82BF3}'] + ['{FA78624A-FCC5-43A8-A8F2-902DBC3D2F55}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -196,7 +200,7 @@ type { IFacturasProveedor } IFacturasProveedor = interface(IDAStronglyTypedDataTable) - ['{14C04314-139C-4DD3-AE5E-775EDC464C88}'] + ['{EAAE2560-477C-4DFD-8683-2F20B4030377}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -254,6 +258,14 @@ type procedure SetIMPORTE_IVAValue(const aValue: Currency); function GetIMPORTE_IVAIsNull: Boolean; procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); + function GetRETENCIONValue: Float; + procedure SetRETENCIONValue(const aValue: Float); + function GetRETENCIONIsNull: Boolean; + procedure SetRETENCIONIsNull(const aValue: Boolean); + function GetIMPORTE_RETENCIONValue: Currency; + procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); + function GetIMPORTE_RETENCIONIsNull: Boolean; + procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); function GetREValue: Float; procedure SetREValue(const aValue: Float); function GetREIsNull: Boolean; @@ -364,6 +376,10 @@ type property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull; property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue; property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull; + property RETENCION: Float read GetRETENCIONValue write SetRETENCIONValue; + property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; + property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; + property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; property RE: Float read GetREValue write SetREValue; property REIsNull: Boolean read GetREIsNull write SetREIsNull; property IMPORTE_RE: Currency read GetIMPORTE_REValue write SetIMPORTE_REValue; @@ -469,6 +485,14 @@ type procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual; function GetIMPORTE_IVAIsNull: Boolean; virtual; procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual; + function GetRETENCIONValue: Float; virtual; + procedure SetRETENCIONValue(const aValue: Float); virtual; + function GetRETENCIONIsNull: Boolean; virtual; + procedure SetRETENCIONIsNull(const aValue: Boolean); virtual; + function GetIMPORTE_RETENCIONValue: Currency; virtual; + procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual; + function GetIMPORTE_RETENCIONIsNull: Boolean; virtual; + procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual; function GetREValue: Float; virtual; procedure SetREValue(const aValue: Float); virtual; function GetREIsNull: Boolean; virtual; @@ -578,6 +602,10 @@ type property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull; property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue; property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull; + property RETENCION: Float read GetRETENCIONValue write SetRETENCIONValue; + property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; + property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; + property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; property RE: Float read GetREValue write SetREValue; property REIsNull: Boolean read GetREIsNull write SetREIsNull; property IMPORTE_RE: Currency read GetIMPORTE_REValue write SetIMPORTE_REValue; @@ -627,7 +655,7 @@ type { IFacturasProveedor_Detalles } IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable) - ['{FA7537D3-E822-4B9E-A6B5-05DDA7FCEA45}'] + ['{E6999FBD-4DDF-4EE7-8FB5-B942CC4E32B4}'] { Property getters and setters } function GetID_TIPO_IVAValue: Integer; procedure SetID_TIPO_IVAValue(const aValue: Integer); @@ -878,7 +906,7 @@ type { IFacturasProveedor_Pedidos } IFacturasProveedor_Pedidos = interface(IDAStronglyTypedDataTable) - ['{3BB01751-E7BB-4F57-A36D-07E688D24EA5}'] + ['{EC1CFD23-1D05-4E2F-B8E8-23E3A096F755}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1336,6 +1364,48 @@ begin DataTable.Fields[idx_FacturasProveedorIMPORTE_IVA].AsVariant := Null; end; +function TFacturasProveedorDataTableRules.GetRETENCIONValue: Float; +begin + result := DataTable.Fields[idx_FacturasProveedorRETENCION].AsFloat; +end; + +procedure TFacturasProveedorDataTableRules.SetRETENCIONValue(const aValue: Float); +begin + DataTable.Fields[idx_FacturasProveedorRETENCION].AsFloat := aValue; +end; + +function TFacturasProveedorDataTableRules.GetRETENCIONIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasProveedorRETENCION].IsNull; +end; + +procedure TFacturasProveedorDataTableRules.SetRETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasProveedorRETENCION].AsVariant := Null; +end; + +function TFacturasProveedorDataTableRules.GetIMPORTE_RETENCIONValue: Currency; +begin + result := DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsCurrency; +end; + +procedure TFacturasProveedorDataTableRules.SetIMPORTE_RETENCIONValue(const aValue: Currency); +begin + DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsCurrency := aValue; +end; + +function TFacturasProveedorDataTableRules.GetIMPORTE_RETENCIONIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].IsNull; +end; + +procedure TFacturasProveedorDataTableRules.SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsVariant := Null; +end; + function TFacturasProveedorDataTableRules.GetREValue: Float; begin result := DataTable.Fields[idx_FacturasProveedorRE].AsFloat; diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas index fd0a04c0..0e2baee6 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas @@ -9,15 +9,15 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturasDelta = '{18BE29AD-3087-4F44-941F-77D6F3F40870}'; - RID_FacturasProveedorDelta = '{589004DA-1ECB-413A-8896-94D723671F59}'; - RID_FacturasProveedor_DetallesDelta = '{BA6AE653-A6E5-4E77-99EC-EE6D723D13DA}'; - RID_FacturasProveedor_PedidosDelta = '{73BDBD6A-D292-4B54-BA09-A8922EFD69C5}'; + RID_ListaAnosFacturasDelta = '{B700EE7C-8AB3-431C-9FA7-A6079A789D81}'; + RID_FacturasProveedorDelta = '{CF80EDF3-AF67-4435-91F0-083105B1A702}'; + RID_FacturasProveedor_DetallesDelta = '{A9EE3D34-89F5-48E3-80EB-286EDCE922A2}'; + RID_FacturasProveedor_PedidosDelta = '{4F861C80-9436-4371-9127-530175C91776}'; type { IListaAnosFacturasDelta } IListaAnosFacturasDelta = interface(IListaAnosFacturas) - ['{18BE29AD-3087-4F44-941F-77D6F3F40870}'] + ['{B700EE7C-8AB3-431C-9FA7-A6079A789D81}'] { Property getters and setters } function GetOldANOValue : String; @@ -51,7 +51,7 @@ type { IFacturasProveedorDelta } IFacturasProveedorDelta = interface(IFacturasProveedor) - ['{589004DA-1ECB-413A-8896-94D723671F59}'] + ['{CF80EDF3-AF67-4435-91F0-083105B1A702}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -67,6 +67,8 @@ type function GetOldIMPORTE_DESCUENTOValue : Currency; function GetOldIVAValue : Float; function GetOldIMPORTE_IVAValue : Currency; + function GetOldRETENCIONValue : Float; + function GetOldIMPORTE_RETENCIONValue : Currency; function GetOldREValue : Float; function GetOldIMPORTE_REValue : Currency; function GetOldIMPORTE_TOTALValue : Currency; @@ -103,6 +105,8 @@ type property OldIMPORTE_DESCUENTO : Currency read GetOldIMPORTE_DESCUENTOValue; property OldIVA : Float read GetOldIVAValue; property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue; + property OldRETENCION : Float read GetOldRETENCIONValue; + property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue; property OldRE : Float read GetOldREValue; property OldIMPORTE_RE : Currency read GetOldIMPORTE_REValue; property OldIMPORTE_TOTAL : Currency read GetOldIMPORTE_TOTALValue; @@ -216,6 +220,18 @@ type function GetOldIMPORTE_IVAIsNull: Boolean; virtual; procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual; procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual; + function GetRETENCIONValue: Float; virtual; + function GetRETENCIONIsNull: Boolean; virtual; + function GetOldRETENCIONValue: Float; virtual; + function GetOldRETENCIONIsNull: Boolean; virtual; + procedure SetRETENCIONValue(const aValue: Float); virtual; + procedure SetRETENCIONIsNull(const aValue: Boolean); virtual; + function GetIMPORTE_RETENCIONValue: Currency; virtual; + function GetIMPORTE_RETENCIONIsNull: Boolean; virtual; + function GetOldIMPORTE_RETENCIONValue: Currency; virtual; + function GetOldIMPORTE_RETENCIONIsNull: Boolean; virtual; + procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual; + procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual; function GetREValue: Float; virtual; function GetREIsNull: Boolean; virtual; function GetOldREValue: Float; virtual; @@ -393,6 +409,14 @@ type property IMPORTE_IVAIsNull : Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull; property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue; property OldIMPORTE_IVAIsNull : Boolean read GetOldIMPORTE_IVAIsNull; + property RETENCION : Float read GetRETENCIONValue write SetRETENCIONValue; + property RETENCIONIsNull : Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; + property OldRETENCION : Float read GetOldRETENCIONValue; + property OldRETENCIONIsNull : Boolean read GetOldRETENCIONIsNull; + property IMPORTE_RETENCION : Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; + property IMPORTE_RETENCIONIsNull : Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; + property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue; + property OldIMPORTE_RETENCIONIsNull : Boolean read GetOldIMPORTE_RETENCIONIsNull; property RE : Float read GetREValue write SetREValue; property REIsNull : Boolean read GetREIsNull write SetREIsNull; property OldRE : Float read GetOldREValue; @@ -482,7 +506,7 @@ type { IFacturasProveedor_DetallesDelta } IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles) - ['{BA6AE653-A6E5-4E77-99EC-EE6D723D13DA}'] + ['{A9EE3D34-89F5-48E3-80EB-286EDCE922A2}'] { Property getters and setters } function GetOldID_TIPO_IVAValue : Integer; function GetOldIVAValue : Float; @@ -732,7 +756,7 @@ type { IFacturasProveedor_PedidosDelta } IFacturasProveedor_PedidosDelta = interface(IFacturasProveedor_Pedidos) - ['{73BDBD6A-D292-4B54-BA09-A8922EFD69C5}'] + ['{4F861C80-9436-4371-9127-530175C91776}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -1340,6 +1364,68 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IVA] := Null; end; +function TFacturasProveedorBusinessProcessorRules.GetRETENCIONValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetRETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION]); +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldRETENCIONValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorRETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldRETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorRETENCION]); +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetRETENCIONValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION] := aValue; +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetRETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION] := Null; +end; + +function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_RETENCIONValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_RETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION]); +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_RETENCIONValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_RETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_RETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_RETENCION]); +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_RETENCIONValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION] := aValue; +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION] := Null; +end; + function TFacturasProveedorBusinessProcessorRules.GetREValue: Float; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRE]; diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas index 7ce1605e..9e88bc94 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas @@ -52,6 +52,7 @@ type procedure CalcularRE; procedure CalcularBaseImponible; procedure AsignarTipoIVA (IDTipoIVA : Integer); + procedure CalcularRETENCION; protected FProveedor : IBizProveedor; FDetalles : IBizDetallesFacturaProveedor; @@ -77,6 +78,7 @@ type procedure IMPORTE_NETOOnChange(Sender: TDACustomField); procedure IMPORTE_PORTEOnChange(Sender: TDACustomField); procedure DESCUENTOOnChange(Sender: TDACustomField); + procedure RETENCIONOnChange(Sender: TDACustomField); procedure IVAOnChange(Sender: TDACustomField); procedure REOnChange(Sender: TDACustomField); @@ -160,10 +162,11 @@ begin CalcularBaseImponible; CalcularIVA; CalcularRE; + CalcularRETENCION; if not Self.DataTable.Editing then Edit; - IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA + IMPORTE_RE; + IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA + IMPORTE_RE + IMPORTE_RETENCION; finally DataTable.Fields.FieldEventsDisabled := False; DataTable.EnableControls; @@ -190,6 +193,14 @@ begin IMPORTE_IVA := ATotal; end; +procedure TBizFacturaProveedor.CalcularRETENCION; +begin + if not Self.DataTable.Editing then + Edit; + IMPORTE_RETENCION := (RETENCION / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO); +end; + + procedure TBizFacturaProveedor.CalcularRE; begin if not Self.DataTable.Editing then @@ -212,6 +223,7 @@ begin FieldByName(fld_FacturasProveedorDESCUENTO).OnChange := DESCUENTOOnChange; FieldByName(fld_FacturasProveedorIVA).OnChange := IVAOnChange; FieldByName(fld_FacturasProveedorRE).OnChange := REOnChange; + FieldByName(fld_FacturasProveedorRETENCION).OnChange := RETENCIONOnChange; end; FDetallesLink := TDADataSource.Create(NIL); @@ -307,6 +319,11 @@ begin CalcularImporteTotal; end; +procedure TBizFacturaProveedor.RETENCIONOnChange(Sender: TDACustomField); +begin + CalcularImporteTotal; +end; + procedure TBizFacturaProveedor.SetPedidos(Value: IBizPedidosFacturaProveedor); begin FPedidos := Value; diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm index fdd0ee9c..0f15c494 100644 --- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm +++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm @@ -183,6 +183,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor item DatasetField = 'FECHA_RECEPCION' TableField = 'FECHA_RECEPCION' + end + item + DatasetField = 'RETENCION' + TableField = 'RETENCION' + end + item + DatasetField = 'IMPORTE_RETENCION' + TableField = 'IMPORTE_RETENCION' end> end> Name = 'FacturasProveedor' @@ -226,11 +234,12 @@ object srvFacturasProveedor: TsrvFacturasProveedor item Name = 'FECHA_RECEPCION' DataType = datDateTime + DictionaryEntry = 'FacturasProveedor_FECHA_RECEPCION' end item Name = 'FECHA_VENCIMIENTO' DataType = datDateTime - DisplayLabel = 'Fecha vto.' + DictionaryEntry = 'FacturasProveedor_FECHA_VENCIMIENTO' end item Name = 'SITUACION' @@ -263,6 +272,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor DataType = datCurrency DictionaryEntry = 'FacturasProveedor_IMPORTE_IVA' end + item + Name = 'RETENCION' + DataType = datFloat + DictionaryEntry = 'FacturasProveedor_RETENCION' + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency + DictionaryEntry = 'FacturasProveedor_IMPORTE_RETENCION' + end item Name = 'RE' DataType = datFloat @@ -703,6 +722,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor end item Params = < + item + Name = 'RETENCION' + DataType = datFloat + Value = '' + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency + Value = '' + end item Name = 'ID' DataType = datAutoInc @@ -877,15 +906,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor ' NOMBRE, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, '#10' FECH' + 'A_ALTA, USUARIO, ID_FORMA_PAGO,'#10' RECARGO_EQUIVALENCIA, ID_TI' + 'PO_IVA, IMPORTE_NETO, IMPORTE_PORTE,'#10' DATOS_BANCARIOS, FECHA' + - '_VENCIMIENTO, FECHA_RECEPCION)'#10' VALUES'#10' (:ID, :ID_EMPRESA, :' + - 'REFERENCIA, :REFERENCIA_PROVEEDOR,'#10' :FECHA_FACTURA, :BASE_IM' + - 'PONIBLE, :DESCUENTO,'#10' :IMPORTE_DESCUENTO, :IVA, :IMPORTE_IVA' + - ', :RE, :IMPORTE_RE, '#10' :IMPORTE_TOTAL, :OBSERVACIONES, :ID_PR' + - 'OVEEDOR, :NIF_CIF, '#10' :NOMBRE, :CALLE, :POBLACION, :PROVINCIA' + - ', :CODIGO_POSTAL, '#10' CURRENT_TIMESTAMP, :USUARIO, :ID_FORMA_P' + - 'AGO,'#10' :RECARGO_EQUIVALENCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10' ' + - ' :IMPORTE_PORTE, :DATOS_BANCARIOS, :FECHA_VENCIMIENTO, :FECHA' + - '_RECEPCION)'#10' '#10' '#10#10 + '_VENCIMIENTO, FECHA_RECEPCION,'#10' RETENCION, IMPORTE_RETENCION' + + ')'#10' VALUES'#10' (:ID, :ID_EMPRESA, :REFERENCIA, :REFERENCIA_PROVE' + + 'EDOR,'#10' :FECHA_FACTURA, :BASE_IMPONIBLE, :DESCUENTO,'#10' :IM' + + 'PORTE_DESCUENTO, :IVA, :IMPORTE_IVA, :RE, :IMPORTE_RE, '#10' :IM' + + 'PORTE_TOTAL, :OBSERVACIONES, :ID_PROVEEDOR, :NIF_CIF, '#10' :NOM' + + 'BRE, :CALLE, :POBLACION, :PROVINCIA, :CODIGO_POSTAL, '#10' CURRE' + + 'NT_TIMESTAMP, :USUARIO, :ID_FORMA_PAGO,'#10' :RECARGO_EQUIVALENC' + + 'IA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10' :IMPORTE_PORTE, :DATOS_BA' + + 'NCARIOS, :FECHA_VENCIMIENTO, :FECHA_RECEPCION,'#10' :RETENCION, ' + + ':IMPORTE_RETENCION)'#10' '#10' '#10#10 StatementType = stSQL ColumnMappings = <> end> @@ -912,6 +942,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor end item Params = < + item + Name = 'RETENCION' + DataType = datFloat + Value = '' + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency + Value = '' + end item Name = 'ID' DataType = datInteger @@ -1098,7 +1138,9 @@ object srvFacturasProveedor: TsrvFacturasProveedor ' '#10' ID_TIPO_IVA = :ID_TIPO_IVA, '#10' IMPORTE_NETO = :IMPORTE_N' + 'ETO, '#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' DATOS_BANCARIOS = ' + ':DATOS_BANCARIOS,'#10' FECHA_VENCIMIENTO = :FECHA_VENCIMIENTO,'#10' ' + - ' FECHA_RECEPCION = :FECHA_RECEPCION'#10' WHERE'#10' (ID = :OLD_ID)'#10 + ' FECHA_RECEPCION = :FECHA_RECEPCION,'#10' RETENCION = :RETENCION' + + ','#10' IMPORTE_RETENCION = :IMPORTE_RETENCION'#10' WHERE'#10' (ID = :' + + 'OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -1829,6 +1871,25 @@ object srvFacturasProveedor: TsrvFacturasProveedor Name = 'FacturasProveedor_Detalles_REFERENCIA_FABRICANTE' DataType = datString Size = 255 + end + item + Name = 'FacturasProveedor_FECHA_RECEPCION' + DataType = datDateTime + end + item + Name = 'FacturasProveedor_RETENCION' + DataType = datFloat + DisplayLabel = 'Retenci'#243'n' + Alignment = taRightJustify + end + item + Name = 'FacturasProveedor_Field' + end + item + Name = 'FacturasProveedor_IMPORTE_RETENCION' + DataType = datCurrency + DisplayLabel = 'Importe retenci'#243'n' + Alignment = taRightJustify end> Left = 150 Top = 22 diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index b86349d9..117abdc6 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -278,80 +278,83 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited ToolButton3: TToolButton Wrap = False end - inherited FontName: TJvFontComboBox [3] + inherited ToolButton4: TToolButton Left = 278 Top = 0 + ExplicitLeft = 278 ExplicitTop = 0 end - inherited ToolButton4: TToolButton [4] - Left = 423 + inherited ToolButton14: TToolButton + Left = 334 Top = 0 - ExplicitLeft = 423 + ExplicitLeft = 334 ExplicitTop = 0 end - inherited ToolButton14: TToolButton [5] - Left = 479 - Top = 0 - ExplicitLeft = 479 - ExplicitTop = 0 + inherited FontName: TJvFontComboBox + Top = 22 + ExplicitTop = 22 end - inherited ToolButton13: TToolButton [6] - Top = 0 - ExplicitTop = 0 + inherited FontSize: TEdit + Top = 22 + Width = 344 + ExplicitTop = 22 + ExplicitWidth = 344 end - inherited FontSize: TEdit [7] + inherited ToolButton13: TToolButton [7] Left = 0 - Top = 27 - Width = 328 - ExplicitTop = 27 - ExplicitWidth = 328 + Top = 22 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 22 + ExplicitHeight = 27 end inherited UpDown1: TUpDown [8] - Left = 328 - Top = 27 - ExplicitLeft = 328 - ExplicitTop = 27 - end - inherited ToolButton6: TToolButton - Left = 345 - Top = 27 - ExplicitLeft = 345 - ExplicitTop = 27 - end - inherited ToolButton7: TToolButton [10] - Left = 411 - Top = 27 - Wrap = True - ExplicitLeft = 411 - ExplicitTop = 27 - end - inherited ToolButton8: TToolButton [11] Left = 0 Top = 49 ExplicitLeft = 0 ExplicitTop = 49 end - inherited ToolButton12: TToolButton [12] - Left = 83 - Wrap = False - ExplicitLeft = 83 - ExplicitHeight = 22 - end - inherited ToolButton9: TToolButton [13] - Left = 91 + inherited ToolButton6: TToolButton + Left = 17 Top = 49 - ExplicitLeft = 91 + ExplicitLeft = 17 + ExplicitTop = 49 + end + inherited ToolButton7: TToolButton + Left = 83 + Top = 49 + ExplicitLeft = 83 + ExplicitTop = 49 + end + inherited ToolButton8: TToolButton + Left = 150 + Top = 49 + ExplicitLeft = 150 + ExplicitTop = 49 + end + inherited ToolButton12: TToolButton + Left = 233 + Top = 49 + ExplicitLeft = 233 + ExplicitTop = 49 + end + inherited ToolButton9: TToolButton + Left = 241 + Top = 49 + ExplicitLeft = 241 ExplicitTop = 49 end inherited ToolButton10: TToolButton - Left = 236 + Left = 386 Top = 49 - ExplicitLeft = 236 + ExplicitLeft = 386 ExplicitTop = 49 end - inherited ToolButton11: TToolButton [15] - Left = 361 - ExplicitLeft = 361 + inherited ToolButton11: TToolButton + Left = 511 + Top = 49 + ExplicitLeft = 511 + ExplicitTop = 49 end end inherited cxGrid: TcxGrid @@ -462,21 +465,21 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 819 ExplicitHeight = 254 inherited Bevel3: TBevel - Left = 418 + Left = 392 Height = 100 - ExplicitLeft = 418 + ExplicitLeft = 392 ExplicitHeight = 100 end inherited Bevel1: TBevel - Left = 530 + Left = 504 Width = 368 - ExplicitLeft = 530 + ExplicitLeft = 504 ExplicitWidth = 368 end inherited Bevel2: TBevel - Left = 530 + Left = 504 Width = 368 - ExplicitLeft = 530 + ExplicitLeft = 504 ExplicitWidth = 368 end inherited Bevel4: TBevel @@ -484,13 +487,13 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 388 end inherited ImporteDto: TcxDBCurrencyEdit - Left = 601 + Left = 575 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 601 + ExplicitLeft = 575 ExplicitWidth = 290 Width = 290 end @@ -504,64 +507,60 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 234 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 531 + Left = 505 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 531 - ExplicitWidth = 90 - Width = 90 + ExplicitLeft = 505 end inherited edtDescuento: TcxDBSpinEdit - Left = 530 + Left = 504 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 530 + ExplicitLeft = 504 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 530 + Left = 504 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 530 + ExplicitLeft = 504 ExplicitWidth = 284 Width = 284 end inherited edtRE: TcxDBSpinEdit - Left = 530 + Left = 504 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 530 + ExplicitLeft = 504 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 601 + Left = 575 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 601 - ExplicitWidth = 20 - Width = 20 + ExplicitLeft = 575 end inherited eImporteNeto: TcxDBCurrencyEdit - Left = 530 + Left = 504 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 530 + ExplicitLeft = 504 ExplicitWidth = 297 Width = 297 end @@ -629,6 +628,26 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 358 Width = 358 end + inherited edtRetencion: TcxDBSpinEdit + Left = 504 + Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 504 + end + inherited ImporteRetencion: TcxDBCurrencyEdit + Left = 575 + Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 575 + ExplicitWidth = 345 + Width = 345 + end end end inherited EditorActionList: TActionList [5] diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm index 98d3984e..3aaa51b4 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.dfm @@ -1,9 +1,9 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA - Width = 451 - Height = 275 + Width = 1048 + Height = 401 Align = alBottom ExplicitWidth = 451 - ExplicitHeight = 275 + ExplicitHeight = 401 object Bevel5: TBevel Left = 666 Top = 109 @@ -15,8 +15,8 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA AlignWithMargins = True Left = 0 Top = 0 - Width = 451 - Height = 275 + Width = 1048 + Height = 401 Margins.Left = 0 Margins.Top = 0 Margins.Right = 0 @@ -26,22 +26,23 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] + ExplicitWidth = 451 object Bevel3: TBevel - Left = 236 + Left = 508 Top = 28 Width = 3 Height = 100 Shape = bsRightLine end object Bevel1: TBevel - Left = 348 - Top = 181 + Left = 620 + Top = 208 Width = 368 Height = 9 Shape = bsBottomLine end object Bevel2: TBevel - Left = 348 + Left = 620 Top = 107 Width = 368 Height = 9 @@ -55,7 +56,7 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA Shape = bsBottomLine end object ImporteDto: TcxDBCurrencyEdit - Left = 419 + Left = 691 Top = 55 AutoSize = False DataBinding.DataField = 'IMPORTE_DESCUENTO' @@ -127,8 +128,8 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA Width = 234 end object ImporteTotal: TcxDBCurrencyEdit - Left = 349 - Top = 201 + Left = 621 + Top = 228 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataSource = DADataSource @@ -158,12 +159,12 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 15 + TabOrder = 17 Height = 21 Width = 90 end object edtDescuento: TcxDBSpinEdit - Left = 348 + Left = 620 Top = 55 AutoSize = False DataBinding.DataField = 'DESCUENTO' @@ -197,7 +198,7 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 348 + Left = 620 Top = 127 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -232,7 +233,7 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA Width = 284 end object edtRE: TcxDBSpinEdit - Left = 348 + Left = 620 Top = 154 AutoSize = False DataBinding.DataField = 'RE' @@ -272,11 +273,12 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 419 + Left = 691 Top = 154 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataSource = DADataSource + Enabled = False ParentFont = False Properties.Alignment.Horz = taRightJustify Properties.ReadOnly = True @@ -306,7 +308,7 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA Width = 20 end object eImporteNeto: TcxDBCurrencyEdit - Left = 348 + Left = 620 Top = 28 AutoSize = False DataBinding.DataField = 'IMPORTE_NETO' @@ -625,6 +627,81 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA Height = 21 Width = 358 end + object edtRetencion: TcxDBSpinEdit + Left = 620 + Top = 181 + AutoSize = False + DataBinding.DataField = 'RETENCION' + DataBinding.DataSource = DADataSource + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.AssignedValues.EditFormat = True + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + Properties.ImmediatePost = True + Properties.MaxValue = 100.000000000000000000 + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -11 + Style.Font.Name = 'Tahoma' + Style.Font.Style = [] + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.TextColor = clWindowText + Style.ButtonStyle = bts3D + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 15 + Height = 21 + Width = 65 + end + object ImporteRetencion: TcxDBCurrencyEdit + Left = 691 + Top = 181 + AutoSize = False + DataBinding.DataField = 'IMPORTE_RETENCION' + DataBinding.DataSource = DADataSource + Enabled = False + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Properties.UseLeftAlignmentOnEditing = False + Properties.UseThousandSeparator = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -11 + Style.Font.Name = 'Tahoma' + Style.Font.Style = [] + Style.HotTrack = False + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.TextColor = clWindowText + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 16 + Height = 21 + Width = 345 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -823,6 +900,23 @@ inherited frViewTotalesVariosIVA: TfrViewTotalesVariosIVA ControlOptions.ShowBorder = False end end + object dxLayoutControl1Group11: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item14: TdxLayoutItem + Caption = 'Retenci'#243'n (%):' + Control = edtRetencion + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item16: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Control = ImporteRetencion + ControlOptions.ShowBorder = False + end + end object dxLayoutControl1Item10: TdxLayoutItem Caption = ' ' Control = Bevel1 diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas index 998f9347..de79a337 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uViewTotalesVariosIVA.pas @@ -73,6 +73,11 @@ type dxLayoutControl1Group10: TdxLayoutGroup; dxLayoutControl1Item11: TdxLayoutItem; Bevel4: TBevel; + dxLayoutControl1Item14: TdxLayoutItem; + edtRetencion: TcxDBSpinEdit; + dxLayoutControl1Item16: TdxLayoutItem; + ImporteRetencion: TcxDBCurrencyEdit; + dxLayoutControl1Group11: TdxLayoutGroup; public { Public declarations } end; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index e6f6e02aceffc8c7c3560acae6da09560b781c3f..066bbe5c16386043add96af34c2b9820e4d1748c 100644 GIT binary patch delta 490 zcmY*Uy-LJD7@XbQA0m>q|Tz6#^3kbB}x`03jNmEzTc}N<7gy$J< z)&U&bd6-erK)-LfHK1uba+{zh@FmrEupwD~gTc1L7s=z`khccyxvh?#RFkkPTT(rT z>!)4v0!PS@B1eRKJYme5;(8(LRWm1;;*PJ!JP)`;!9GXHJEN+CdJT78eC&duVVsBL zN-7H0i2AzsR^>b*A6Kl-ku!nzj*(DlU=l3nE;te4in^4wz%3J5jA4e)tjW|a{*SL? jEI(&Lo^v*%-6OwM)+4Hqa8LN^C(PPD4zQ1biYLQAfGb3` delta 211 zcmX@HopHlf#tkJASq1`JJPdHa$iT)RAi%)D$RNRx!3v_`JQfB9CI$rsh};Se1_ovX z52%BM!N342$H&0Hir}d-0L^4z*upsZUW6PIkop&4qQL|dfna;6-7G*87@=$!CB!&6 vDpHB*9mC|hNU_OJA~jfz81xtnCf|(GXEd738J*8=z+lB-!eBAEKH3uileHa~ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index c4783070..556a3fa5 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,334 +1,335 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse2020FalseFalseFalseFalseFalse308212522.0.2.02.0.2.0miércoles, 02 de octubre de 2013 12:16 - ExpressPrinting System by Developer Express Inc. - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService -
- -
srvProvinciasPoblaciones_Impl
- TDataModule -
- - - -
srvUsuarios
- TDataAbstractService -
- - - - - - - -
RptAlbaranesCliente
- TDataModule -
- -
RptWordAlbaranCliente
- TDataModule -
- -
srvAlbaranesCliente
- TDataAbstractService -
- - - - -
RptAlbaranesProveedor
- TDataModule -
- -
RptWordAlbaranProveedor
- TDataModule -
- -
srvAlbaranesProveedor
- TDataAbstractService -
- - - -
srvAlmacenes
- TDARemoteService -
- - - - -
srvArticulos
- TDARemoteService -
- - - - - - - -
RptEtiquetasContacto
- TDataModule -
- -
RptFichasEmpleado
- TDataModule -
- -
srvContactos
- TDARemoteService -
- - - -
srvFabricantes
- TDataAbstractService -
- - - - -
RptFacturasCliente
- TDataModule -
- -
RptWordFacturaCliente
- TDataModule -
- -
srvFacturasCliente
- TDataAbstractService -
- - - - -
RptFacturasProveedor
- TDataModule -
- -
srvFacturasProveedor
- TDataAbstractService -
- - - -
srvFamilias
- TDataAbstractService -
- - - -
srvFormasPago
- TDataAbstractService -
- -
srvGestorDocumentos
- TDataAbstractService -
- -
srvGestorInformes
- TDataAbstractService -
- - - -
srvHistoricoMovimientos
- TDataAbstractService -
- - - -
srvInventario
- TDataAbstractService -
- - - - -
srvObras
- TDataAbstractService -
- - - - -
RptPedidosProveedor
- TDataModule -
- -
RptWordPedidoProveedor
- TDataModule -
- -
srvPedidosProveedor
- TDataAbstractService -
- - - - -
RptPresupuestosCliente
- TDataModule -
- -
RptWordCertificadoTrabajo
- TDataModule -
- -
RptWordPresupuestoCliente
- TDataModule -
- -
srvPresupuestosCliente
- TDataAbstractService -
- - - -
RptRecibosCliente
- TDataModule -
- -
srvRecibosCliente
- TDataAbstractService -
- - - -
RptRecibosProveedor
- TDataModule -
- -
srvRecibosProveedor
- TDataAbstractService -
- - - -
srvReferencias
- TDataAbstractService -
- - - - -
srvRemesasCliente
- TDataAbstractService -
- - - - -
srvRemesasProveedor
- TDataAbstractService -
- - - -
srvTiposIVA
- TDataAbstractService -
- - - -
srvUnidadesMedida
- TDataAbstractService -
- - - -
srvConfiguracion
- TDataAbstractService -
- -
frConexionBD
- TFrame -
- -
frConfGeneral
- TFrame -
- -
fConfiguracion
- TForm -
- -
FrameConfiguracion
- TFrame -
- -
srvLogin
- TDARemoteService -
- -
fAcercaDe
-
- -
dmServer
- TDataModule -
- -
fServerForm
-
- - - - - - - - - - -
+ + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse2030FalseFalseFalseFalseFalse308212522.0.3.02.0.3.0miércoles, 06 de noviembre de 2013 13:14 + + ExpressPrinting System by Developer Express Inc. + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService +
+ +
srvProvinciasPoblaciones_Impl
+ TDataModule +
+ + + +
srvUsuarios
+ TDataAbstractService +
+ + + + + + + +
RptAlbaranesCliente
+ TDataModule +
+ +
RptWordAlbaranCliente
+ TDataModule +
+ +
srvAlbaranesCliente
+ TDataAbstractService +
+ + + + +
RptAlbaranesProveedor
+ TDataModule +
+ +
RptWordAlbaranProveedor
+ TDataModule +
+ +
srvAlbaranesProveedor
+ TDataAbstractService +
+ + + +
srvAlmacenes
+ TDARemoteService +
+ + + + +
srvArticulos
+ TDARemoteService +
+ + + + + + + +
RptEtiquetasContacto
+ TDataModule +
+ +
RptFichasEmpleado
+ TDataModule +
+ +
srvContactos
+ TDARemoteService +
+ + + +
srvFabricantes
+ TDataAbstractService +
+ + + + +
RptFacturasCliente
+ TDataModule +
+ +
RptWordFacturaCliente
+ TDataModule +
+ +
srvFacturasCliente
+ TDataAbstractService +
+ + + + +
RptFacturasProveedor
+ TDataModule +
+ +
srvFacturasProveedor
+ TDataAbstractService +
+ + + +
srvFamilias
+ TDataAbstractService +
+ + + +
srvFormasPago
+ TDataAbstractService +
+ +
srvGestorDocumentos
+ TDataAbstractService +
+ +
srvGestorInformes
+ TDataAbstractService +
+ + + +
srvHistoricoMovimientos
+ TDataAbstractService +
+ + + +
srvInventario
+ TDataAbstractService +
+ + + + +
srvObras
+ TDataAbstractService +
+ + + + +
RptPedidosProveedor
+ TDataModule +
+ +
RptWordPedidoProveedor
+ TDataModule +
+ +
srvPedidosProveedor
+ TDataAbstractService +
+ + + + +
RptPresupuestosCliente
+ TDataModule +
+ +
RptWordCertificadoTrabajo
+ TDataModule +
+ +
RptWordPresupuestoCliente
+ TDataModule +
+ +
srvPresupuestosCliente
+ TDataAbstractService +
+ + + +
RptRecibosCliente
+ TDataModule +
+ +
srvRecibosCliente
+ TDataAbstractService +
+ + + +
RptRecibosProveedor
+ TDataModule +
+ +
srvRecibosProveedor
+ TDataAbstractService +
+ + + +
srvReferencias
+ TDataAbstractService +
+ + + + +
srvRemesasCliente
+ TDataAbstractService +
+ + + + +
srvRemesasProveedor
+ TDataAbstractService +
+ + + +
srvTiposIVA
+ TDataAbstractService +
+ + + +
srvUnidadesMedida
+ TDataAbstractService +
+ + + +
srvConfiguracion
+ TDataAbstractService +
+ +
frConexionBD
+ TFrame +
+ +
frConfGeneral
+ TFrame +
+ +
fConfiguracion
+ TForm +
+ +
FrameConfiguracion
+ TFrame +
+ +
srvLogin
+ TDARemoteService +
+ +
fAcercaDe
+
+ +
dmServer
+ TDataModule +
+ +
fServerForm
+
+ + + + + + + + + + +