From 35a6644a2a9e0d99798904a02c7f92a04ec45461 Mon Sep 17 00:00:00 2001 From: roberto Date: Fri, 8 May 2026 18:26:37 +0200 Subject: [PATCH] =?UTF-8?q?Version=205.2.7=20Se=20quita=20tiendas=20y=20se?= =?UTF-8?q?=20a=C3=B1ade=20referencia=20proveedor=20en=20todos=20los=20doc?= =?UTF-8?q?umentos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Informes/5/3/InfPedidoProveedor.fr3 | 73 +++-- .../Informes/5/InformeIVAProveedores.fr3 | 72 ++--- .../5/InformeIVAProveedoresDesglosado.fr3 | 76 ++--- Source/Base/Base.dproj | 7 + 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/GUIBase/uViewTotales.dfm | 165 ++++++++--- Source/GUIBase/uViewTotales.pas | 6 + Source/Informes/5/3/InfPedidoProveedor.fr3 | 73 +++-- Source/Informes/5/InformeIVAProveedores.fr3 | 72 ++--- .../5/InformeIVAProveedoresDesglosado.fr3 | 76 ++--- .../Views/uViewAlbaranCliente.dfm | 1 + .../Views/uViewAlbaranesCliente.dfm | 4 + .../Views/uViewAlbaranesCliente.pas | 3 +- .../Views/uViewAlbaranProveedor.dfm | 1 + .../Views/uViewAlbaranesProveedor.dfm | 4 + .../Views/uEditorElegirArticulos.dfm | 34 +-- .../Views/uEditorElegirArticulos.pas | 2 +- .../Modulos/Articulos/Views/uViewArticulo.dfm | 16 +- .../Contactos/Views/uEditorVendedores.dfm | 47 ++- .../Modulos/Contactos/Views/uViewContacto.dfm | 1 + .../Contactos/Views/uViewContactos.dfm | 12 + .../uDetallesContratoClienteController.pas | 1 + .../Data/uDataModuleContratosCliente.dfm | 1 + .../Model/schContratosClienteClient_Intf.pas | 32 +- .../Model/schContratosClienteServer_Intf.pas | 32 +- .../Servidor/srvContratosCliente_Impl.dfm | 38 ++- .../Views/uViewContratoCliente.dfm | 1 + .../Views/uViewContratosCliente.dfm | 4 + .../Views/uViewContratosCliente.pas | 2 + .../Views/uViewDetallesContratoCliente.dfm | 7 +- .../Views/uViewDetallesContratoCliente.pas | 9 +- .../Controller/uFacturasClienteController.pas | 1 + .../Plugin/uPluginFacturasCliente.dfm | 2 +- .../Views/uEditorFacturasCliente.dfm | 4 +- .../Views/uEditorFacturasCliente.pas | 5 +- .../Views/uViewFacturaCliente.dfm | 36 ++- .../Views/uViewFacturasCliente.dfm | 4 + .../Views/uViewFacturasCliente.pas | 5 +- .../Data/uDataModuleFacturasProveedor.dfm | 8 + .../Model/schFacturasProveedorClient_Intf.pas | 86 +++++- .../Model/schFacturasProveedorServer_Intf.pas | 102 ++++++- .../Model/uBizFacturasProveedor.pas | 18 +- .../Reports/uRptFacturasProveedor_Server.dfm | 47 ++- .../Servidor/srvFacturasProveedor_Impl.dfm | 135 ++++++++- .../Views/uEditorFacturaProveedor.dfm | 274 ++++++++++-------- .../Views/uEditorFacturaProveedor.pas | 2 +- .../Views/uEditorFacturasProveedor.dfm | 116 +++++--- .../Views/uViewFacturaProveedor.dfm | 20 +- .../Views/uViewFacturasProveedor.dfm | 31 ++ .../Views/uViewFacturasProveedor.pas | 2 + .../Model/schPedidosProveedorClient_Intf.pas | 12 +- .../Model/schPedidosProveedorServer_Intf.pas | 12 +- .../Reports/uRptPedidosProveedor_Server.dfm | 10 +- .../Servidor/srvPedidosProveedor_Impl.dfm | 32 +- .../Views/uEditorPedidoProveedor.dfm | 245 +++++++++------- .../Views/uEditorPedidoProveedor.pas | 6 +- .../Views/uViewPedidoProveedor.dfm | 1 + .../Views/uViewPedidosProveedor.dfm | 4 + .../Views/uViewPedidosProveedor.pas | 3 +- .../uDetallesPresupuestoClienteController.pas | 1 + .../Data/uDataModulePresupuestosCliente.dfm | 1 + .../schPresupuestosClienteClient_Intf.pas | 24 +- .../schPresupuestosClienteServer_Intf.pas | 24 +- .../Servidor/srvPresupuestosCliente_Impl.dfm | 38 ++- ...ditorElegirArticulosPresupuestoCliente.dfm | 2 + ...ditorElegirArticulosPresupuestoCliente.pas | 2 +- .../Views/uEditorPresupuestoCliente.dfm | 102 +++++-- .../Views/uViewDetallesPresupuestoCliente.dfm | 129 ++++----- .../Views/uViewDetallesPresupuestoCliente.pas | 9 +- .../Views/uViewPresupuestoCliente.dfm | 1 + .../Views/uViewPresupuestosCliente.dfm | 4 + .../Views/uViewPresupuestosCliente.pas | 4 +- .../Views/uViewRecibosCliente.dfm | 4 + .../Views/uViewRecibosProveedor.dfm | 4 + Source/Servidor/FactuGES_Server.dpr | 18 +- Source/Servidor/FactuGES_Server.dproj | 2 +- Source/Servidor/FactuGES_Server.rc | 10 +- Source/Servidor/FactuGES_Server.res | Bin 23344 -> 23344 bytes 81 files changed, 1630 insertions(+), 855 deletions(-) diff --git a/Output/Debug/Servidor/Informes/5/3/InfPedidoProveedor.fr3 b/Output/Debug/Servidor/Informes/5/3/InfPedidoProveedor.fr3 index 066f1c34..8a9422b3 100644 --- a/Output/Debug/Servidor/Informes/5/3/InfPedidoProveedor.fr3 +++ b/Output/Debug/Servidor/Informes/5/3/InfPedidoProveedor.fr3 @@ -1,46 +1,45 @@ - + - - - - - + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/Output/Debug/Servidor/Informes/5/InformeIVAProveedores.fr3 b/Output/Debug/Servidor/Informes/5/InformeIVAProveedores.fr3 index 9fc21be4..99b13e4c 100644 --- a/Output/Debug/Servidor/Informes/5/InformeIVAProveedores.fr3 +++ b/Output/Debug/Servidor/Informes/5/InformeIVAProveedores.fr3 @@ -1,5 +1,5 @@ - + @@ -13,31 +13,34 @@ - - - - - - - + + + + + + + - + + - - - - - - - - + + + + + + + + + - - - - + + + + + @@ -47,25 +50,28 @@ - - - - + + + + + - - - + + + - + + - - - - + + + + + diff --git a/Output/Debug/Servidor/Informes/5/InformeIVAProveedoresDesglosado.fr3 b/Output/Debug/Servidor/Informes/5/InformeIVAProveedoresDesglosado.fr3 index 6aa74c15..c47dcdde 100644 --- a/Output/Debug/Servidor/Informes/5/InformeIVAProveedoresDesglosado.fr3 +++ b/Output/Debug/Servidor/Informes/5/InformeIVAProveedoresDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -14,30 +14,33 @@ - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + + @@ -48,28 +51,31 @@ - + - - - - + + + + + - - - - + + + + - + + - - - - + + + + + diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 1d93673a..db20a79a 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -51,6 +51,13 @@ + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index f52282ba..c88bae23 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,8 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse5240FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.2.4.0FactuGESFactuGES5.2.4.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse5270FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.2.7.0FactuGESFactuGES5.2.7.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 4d8869cf..af2841bd 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 5,2,4,0 -PRODUCTVERSION 5,2,4,0 +FILEVERSION 5,2,7,0 +PRODUCTVERSION 5,2,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "5.2.4.0\0" + VALUE "FileVersion", "5.2.7.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "5.2.4.0\0" + VALUE "ProductVersion", "5.2.7.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index a7f583f0038bca1804bc1c37a894883cf509c8c0..233b3921058ea78cbbcc323ddc6dea6f5eaeba7d 100644 GIT binary patch delta 42 xcmcbxpXYrJf_(|s&zh-Hvk_W4H5tV delta 42 xcmcbxpX;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/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index 7bf77e4a..5c5c9828 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,15 +1,15 @@ inherited frViewTotales: TfrViewTotales - Width = 788 - Height = 224 + Width = 1238 + Height = 305 Align = alBottom - ExplicitWidth = 451 - ExplicitHeight = 224 + ExplicitWidth = 1237 + ExplicitHeight = 305 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 788 - Height = 217 + Width = 1238 + Height = 230 Margins.Left = 0 Margins.Top = 0 Margins.Right = 0 @@ -21,14 +21,14 @@ inherited frViewTotales: TfrViewTotales AutoContentSizes = [acsWidth, acsHeight] ExplicitWidth = 451 object Bevel3: TBevel - Left = 389 + Left = 542 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 501 + Left = 654 Top = 70 Width = 210 Height = 9 @@ -66,7 +66,7 @@ inherited frViewTotales: TfrViewTotales Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 572 + Left = 725 Top = 105 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -97,8 +97,8 @@ inherited frViewTotales: TfrViewTotales Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 502 - Top = 159 + Left = 655 + Top = 186 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataSource = DADataSource @@ -124,7 +124,7 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 12 + TabOrder = 14 Height = 21 Width = 137 end @@ -159,7 +159,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 501 + Left = 654 Top = 105 AutoSize = False DataBinding.DataField = 'IVA' @@ -196,7 +196,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 501 + Left = 654 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -226,12 +226,11 @@ inherited frViewTotales: TfrViewTotales Width = 92 end object edtRE: TcxDBSpinEdit - Left = 501 - Top = 132 + Left = 654 + Top = 159 AutoSize = False DataBinding.DataField = 'RE' DataBinding.DataSource = DADataSource - Enabled = False ParentFont = False Properties.Alignment.Horz = taRightJustify Properties.AssignedValues.EditFormat = True @@ -258,17 +257,16 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 10 + TabOrder = 12 Height = 21 Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 572 - Top = 132 + Left = 725 + Top = 159 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataSource = DADataSource - Enabled = False ParentFont = False Properties.Alignment.Horz = taRightJustify Properties.ReadOnly = True @@ -289,7 +287,7 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 11 + TabOrder = 13 Height = 21 Width = 56 end @@ -387,7 +385,7 @@ inherited frViewTotales: TfrViewTotales Width = 81 end object bTiposIVA: TButton - Left = 241 + Left = 394 Top = 109 Width = 132 Height = 21 @@ -420,6 +418,72 @@ inherited frViewTotales: TfrViewTotales TabOrder = 6 Width = 219 end + object edtIRPF: TcxDBSpinEdit + Left = 654 + Top = 132 + AutoSize = False + DataBinding.DataSource = DADataSource + Enabled = False + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.AssignedValues.MinValue = 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.TextColor = clWindowText + Style.ButtonStyle = bts3D + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 10 + Height = 21 + Width = 65 + end + object ImporteIRPF: TcxDBCurrencyEdit + Left = 725 + Top = 132 + AutoSize = False + 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.TextColor = clWindowText + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 11 + Height = 21 + Width = 216 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -566,22 +630,49 @@ inherited frViewTotales: TfrViewTotales object dxLayoutControl1Group8: TdxLayoutGroup ShowCaption = False Hidden = True - LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Item6: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'RE. (%):' - CaptionOptions.AlignHorz = taRightJustify - Control = edtRE - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item7: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Importe de RE:' + object dxLayoutControl1Group13: TdxLayoutGroup + Enabled = False ShowCaption = False - Control = ImporteRE - ControlOptions.ShowBorder = False + Visible = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item10: TdxLayoutItem + Caption = 'IRPF (%):' + CaptionOptions.AlignHorz = taRightJustify + Control = edtIRPF + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item17: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + CaptionOptions.AlignHorz = taRightJustify + Control = ImporteIRPF + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Group12: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item6: TdxLayoutItem + AutoAligns = [aaVertical] + Caption = 'RE. (%):' + CaptionOptions.AlignHorz = taRightJustify + Control = edtRE + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item7: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Importe de RE:' + CaptionOptions.AlignHorz = taRightJustify + ShowCaption = False + Control = ImporteRE + ControlOptions.ShowBorder = False + end end end object dxLayoutControl1Item3: TdxLayoutItem diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas index 74583762..d1be9410 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -59,6 +59,12 @@ type cbRecargoEquivalencia: TcxDBCheckBox; dxLayoutControl1Group10: TdxLayoutGroup; dxLayoutControl1Group11: TdxLayoutGroup; + dxLayoutControl1Item10: TdxLayoutItem; + edtIRPF: TcxDBSpinEdit; + dxLayoutControl1Item17: TdxLayoutItem; + ImporteIRPF: TcxDBCurrencyEdit; + dxLayoutControl1Group12: TdxLayoutGroup; + dxLayoutControl1Group13: TdxLayoutGroup; public { Public declarations } end; diff --git a/Source/Informes/5/3/InfPedidoProveedor.fr3 b/Source/Informes/5/3/InfPedidoProveedor.fr3 index f6b0b639..075791c6 100644 --- a/Source/Informes/5/3/InfPedidoProveedor.fr3 +++ b/Source/Informes/5/3/InfPedidoProveedor.fr3 @@ -1,46 +1,45 @@ - + - - - - - + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/Source/Informes/5/InformeIVAProveedores.fr3 b/Source/Informes/5/InformeIVAProveedores.fr3 index 86a8e3a8..17b9dbc2 100644 --- a/Source/Informes/5/InformeIVAProveedores.fr3 +++ b/Source/Informes/5/InformeIVAProveedores.fr3 @@ -1,5 +1,5 @@ - + @@ -13,31 +13,34 @@ - - - - - - - + + + + + + + - + + - - - - - - - - + + + + + + + + + - - - - + + + + + @@ -47,25 +50,28 @@ - - - - + + + + + - - - + + + - + + - - - - + + + + + diff --git a/Source/Informes/5/InformeIVAProveedoresDesglosado.fr3 b/Source/Informes/5/InformeIVAProveedoresDesglosado.fr3 index d52636bc..b7f89def 100644 --- a/Source/Informes/5/InformeIVAProveedoresDesglosado.fr3 +++ b/Source/Informes/5/InformeIVAProveedoresDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -14,30 +14,33 @@ - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + + @@ -48,28 +51,31 @@ - + - - - - + + + + + - - - - + + + + - + + - - - - + + + + + diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index d53fdf99..c85851b0 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -685,6 +685,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object dxLayoutControl1Group17: TdxLayoutGroup Caption = 'El albar'#225'n pertenece a la tienda' + Visible = False object dxLayoutControl1Item17: TdxLayoutItem Caption = 'New Item' ShowCaption = False diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index f7e0ab66..3e1abbf6 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -63,6 +63,8 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' @@ -320,6 +322,8 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index cd8d0462..0d90f47c 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas @@ -227,7 +227,7 @@ procedure TfrViewAlbaranesCliente.ConfigView; begin inherited; //Solo para aliso - if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then +{ if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then begin cxGridViewTIENDA.Visible := True; cxGridViewTIENDA.VisibleForCustomization := True; @@ -237,6 +237,7 @@ begin cxGridViewTIENDA.Visible := False; cxGridViewTIENDA.VisibleForCustomization := False; end; +} end; procedure TfrViewAlbaranesCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm index 4abeefc5..ff87fe97 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm @@ -448,6 +448,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor end object dxLayoutControl1Group9: TdxLayoutGroup Caption = 'El albar'#225'n pertenece a la tienda' + Visible = False object dxLayoutControl1Item13: TdxLayoutItem Control = frViewTienda1 ControlOptions.AutoColor = True diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index b0c75ce2..65377646 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -61,6 +61,8 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' @@ -245,6 +247,8 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm index 45f6d5fe..2b771605 100644 --- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm @@ -20,14 +20,15 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos inherited TBXDock: TTBXDock Top = 91 Width = 656 - Height = 49 + Height = 52 ExplicitTop = 91 ExplicitWidth = 656 - ExplicitHeight = 49 + ExplicitHeight = 52 inherited tbxMain: TTBXToolbar Align = alLeft DockPos = -6 - ExplicitWidth = 266 + ExplicitWidth = 291 + ExplicitHeight = 27 inherited TBXItem4: TTBXItem Visible = False end @@ -43,13 +44,13 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos end end inherited tbxFiltro: TTBXToolbar - Left = 266 - Top = 23 + Left = 291 + Top = 25 Align = alLeft DockPos = 101 DockRow = 1 - ExplicitLeft = 266 - ExplicitTop = 23 + ExplicitLeft = 291 + ExplicitTop = 25 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 end @@ -58,12 +59,12 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos ExplicitWidth = 656 end inherited TBXTMain2: TTBXToolbar - Left = 536 - Top = 23 + Left = 611 + Top = 25 DockPos = 536 DockRow = 1 - ExplicitLeft = 536 - ExplicitTop = 23 + ExplicitLeft = 611 + ExplicitTop = 25 end end inherited StatusBar: TJvStatusBar @@ -129,7 +130,7 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos AlignWithMargins = True Left = 25 Top = 8 - Width = 606 + Width = 131 Height = 13 Margins.Left = 0 Margins.Top = 0 @@ -143,20 +144,17 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos Font.Name = 'Tahoma' Font.Style = [fsBold] ParentFont = False - ExplicitWidth = 131 end object lblComments: TLabel AlignWithMargins = True Left = 50 Top = 29 - Width = 581 - Height = 27 + Width = 3 + Height = 13 Margins.Left = 25 Margins.Top = 0 Margins.Right = 0 Align = alClient - ExplicitWidth = 3 - ExplicitHeight = 13 end end inherited EditorActionList: TActionList [5] @@ -185,7 +183,7 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos inherited StatusBarImages: TPngImageList [11] Top = 384 end - inherited GridPopupMenu: TPopupMenu + inherited GridPopupMenu: TPopupMenu [12] Left = 80 Top = 192 end diff --git a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas index 4c64ceeb..ce7bf3d4 100644 --- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas +++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas @@ -11,7 +11,7 @@ uses TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uViewBarraSeleccion, StdCtrls, uEditorArticulos, uBizArticulos, uIEditorElegirArticulos, - JvExComCtrls, JvStatusBar, uDAInterfaces; + JvExComCtrls, JvStatusBar, uDAInterfaces, JSDialog; type TfEditorElegirArticulos = class(TfEditorArticulos, IEditorElegirArticulos) diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm index 359da2f6..59041796 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm @@ -1,6 +1,6 @@ inherited frViewArticulo: TfrViewArticulo - Width = 1412 - Height = 634 + Width = 1169 + Height = 528 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -10,8 +10,8 @@ inherited frViewArticulo: TfrViewArticulo object dxLayoutControlArticulo: TdxLayoutControl Left = 0 Top = 0 - Width = 1412 - Height = 634 + Width = 1169 + Height = 528 Align = alClient ParentBackground = True TabOrder = 0 @@ -20,10 +20,10 @@ inherited frViewArticulo: TfrViewArticulo ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 1412 - 634) + 1169 + 528) object PngSpeedButton2: TPngSpeedButton - Left = 1321 + Left = 1078 Top = 28 Width = 23 Height = 22 @@ -50,7 +50,7 @@ inherited frViewArticulo: TfrViewArticulo PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] end object PngSpeedButton1: TPngSpeedButton - Left = 1350 + Left = 1107 Top = 28 Width = 23 Height = 22 diff --git a/Source/Modulos/Contactos/Views/uEditorVendedores.dfm b/Source/Modulos/Contactos/Views/uEditorVendedores.dfm index 27ee88bf..5343467a 100644 --- a/Source/Modulos/Contactos/Views/uEditorVendedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorVendedores.dfm @@ -1,8 +1,8 @@ inherited fEditorVendedores: TfEditorVendedores Caption = 'fEditorVendedores' ClientWidth = 786 - ExplicitWidth = 794 - ExplicitHeight = 478 + ExplicitWidth = 802 + ExplicitHeight = 482 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -49,7 +49,7 @@ inherited fEditorVendedores: TfEditorVendedores Width = 786 ExplicitWidth = 786 inherited tbxMain: TTBXToolbar - ExplicitWidth = 632 + ExplicitWidth = 786 inherited TBXItem2: TTBXItem ImageIndex = 0 Images = frViewVendedores1.PngImageList @@ -65,9 +65,9 @@ inherited fEditorVendedores: TfEditorVendedores end inline frViewVendedores1: TfrViewVendedores [3] Left = 0 - Top = 102 + Top = 105 Width = 786 - Height = 323 + Height = 320 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -77,14 +77,14 @@ inherited fEditorVendedores: TfEditorVendedores ParentFont = False TabOrder = 3 ReadOnly = False - ExplicitTop = 102 + ExplicitTop = 105 ExplicitWidth = 786 - ExplicitHeight = 323 + ExplicitHeight = 320 inherited cxGrid: TcxGrid Width = 786 - Height = 195 + Height = 192 ExplicitWidth = 786 - ExplicitHeight = 195 + ExplicitHeight = 192 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -93,6 +93,9 @@ inherited fEditorVendedores: TfEditorVendedores FieldName = 'ID' Column = frViewVendedores1.cxGridViewNIF_CIF end> + inherited cxGridViewMOVIL_1: TcxGridDBColumn + Caption = 'M'#243'vil' + end end end inherited frViewFiltroBase1: TfrViewFiltroBase @@ -104,19 +107,41 @@ inherited fEditorVendedores: TfEditorVendedores Width = 786 ExplicitWidth = 786 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 689 Width = 689 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 290 Width = 290 end inherited edtFechaFinFiltro: TcxDateEdit Left = 394 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 394 ExplicitWidth = 382 Width = 382 end + inherited txtFiltroTodo2: TcxTextEdit + Left = 609 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 609 + ExplicitWidth = 223 + Width = 223 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 786 @@ -129,8 +154,8 @@ inherited fEditorVendedores: TfEditorVendedores end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 297 - ExplicitTop = 297 + Top = 294 + ExplicitTop = 294 ExplicitWidth = 786 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 786 diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm index 378d93a5..df47729d 100644 --- a/Source/Modulos/Contactos/Views/uViewContacto.dfm +++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm @@ -702,6 +702,7 @@ inherited frViewContacto: TfrViewContacto object dxLayoutControlContactoGroup100: TdxLayoutGroup AutoAligns = [aaHorizontal] Caption = 'El contacto pertenece a la tienda' + Visible = False object dxLayoutControlContactoItem16: TdxLayoutItem Caption = 'New Item' ShowCaption = False diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index bed8ad66..3498d2f1 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -21,7 +21,9 @@ inherited frViewContactos: TfrViewContactos object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False BestFitMaxWidth = 60 + VisibleForCustomization = False Width = 60 end object cxGridViewREFERENCIA: TcxGridDBColumn @@ -144,6 +146,16 @@ inherited frViewContactos: TfrViewContactos ExplicitWidth = 307 Width = 307 end + inherited txtFiltroTodo2: TcxTextEdit + Left = 384 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 384 + ExplicitWidth = 250 + Width = 250 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 557 diff --git a/Source/Modulos/Contratos de cliente/Controller/uDetallesContratoClienteController.pas b/Source/Modulos/Contratos de cliente/Controller/uDetallesContratoClienteController.pas index 2b382c9a..cd366ea6 100644 --- a/Source/Modulos/Contratos de cliente/Controller/uDetallesContratoClienteController.pas +++ b/Source/Modulos/Contratos de cliente/Controller/uDetallesContratoClienteController.pas @@ -155,6 +155,7 @@ end; procedure TDetallesContratoClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); begin ADetalles.DataTable.FieldByName('PROPIEDAD').AsString := AArticulos.FAMILIA; + ADetalles.DataTable.FieldByName(fld_ContratosCliente_DetallesREFERENCIA_PROVEEDOR).AsString := AArticulos.REFERENCIA_PROV; //En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP // if Assigned(AArticulos) then // ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO diff --git a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm index 71f09809..d93b8e83 100644 --- a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm @@ -480,6 +480,7 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente item Name = 'REFERENCIA_PROVEEDOR' DataType = datString + Size = 255 end> Params = <> MasterMappingMode = mmWhere diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas index e0df7dd0..cad22b25 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas @@ -9,14 +9,14 @@ 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_Valores = '{B959D29A-4D0E-4C85-8253-14F1A7A94852}'; - RID_Propiedades = '{598A590B-E236-4C4E-AD40-DFF0477B435F}'; - RID_ListaAnosContratos = '{0C28F1E9-E2B3-425A-AFB8-02AA6C05B03E}'; - RID_ContratosClienteBeneficios = '{6F2C3C2B-114F-4E37-B1EC-52BC64FC0AF2}'; - RID_ContratosCliente = '{FE3220CF-C79A-4746-9F30-9F0736188F7C}'; - RID_TiposCapitulos = '{C06DCF4D-5ABF-46D4-8633-FD07FE8528B2}'; - RID_ContratosCliente_Detalles = '{958C1B7F-44FD-4E70-B5AB-C3839B9AB84F}'; - RID_ContratoClienteFacturasProv = '{789FBA41-F5CF-4585-835C-A2E69B81AACC}'; + RID_Valores = '{09104991-6624-4423-98D3-15FE5F611370}'; + RID_Propiedades = '{2DA2EE6C-EC79-44D7-BBC1-4077409FD8D7}'; + RID_ListaAnosContratos = '{D812F326-EA59-4CA0-9078-BF5D18889E65}'; + RID_ContratosClienteBeneficios = '{6FA3B500-BC8F-4977-A574-A41573BFCBE2}'; + RID_ContratosCliente = '{EA0CA8B2-8368-4381-B1D6-86CF553CF127}'; + RID_TiposCapitulos = '{88121E89-6E09-43B9-9284-01BDA13D071A}'; + RID_ContratosCliente_Detalles = '{78195605-4366-4458-8D1A-9B83369AF782}'; + RID_ContratoClienteFacturasProv = '{3BB753E3-A9ED-4CBD-A888-7707A6250D18}'; { Data table names } nme_Valores = 'Valores'; @@ -283,7 +283,7 @@ const type { IValores } IValores = interface(IDAStronglyTypedDataTable) - ['{1FA49D4B-6562-4B1A-B190-D0AF6129353D}'] + ['{FF5CF336-4CA9-44F2-9846-0146DA405305}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -342,7 +342,7 @@ type { IPropiedades } IPropiedades = interface(IDAStronglyTypedDataTable) - ['{2FB922C0-59ED-4844-861F-84BF71E0442C}'] + ['{DD22C973-20F7-4171-A0AE-06F0297CF175}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -401,7 +401,7 @@ type { IListaAnosContratos } IListaAnosContratos = interface(IDAStronglyTypedDataTable) - ['{B84B9D7F-2E8C-4073-89CA-52D6F0F1D5B6}'] + ['{B2352D5A-913D-4F32-BC95-2ED99B79DB5A}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -436,7 +436,7 @@ type { IContratosClienteBeneficios } IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable) - ['{7675C9FB-656E-4E2A-9137-FFA4B2069210}'] + ['{1391068D-DC3B-488D-8813-1589B099B4AC}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -663,7 +663,7 @@ type { IContratosCliente } IContratosCliente = interface(IDAStronglyTypedDataTable) - ['{E63C592B-6E5F-4B12-A8DF-98AEB887A49F}'] + ['{2424612B-666C-4FA7-9F2C-8EDFA6A46892}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1361,7 +1361,7 @@ type } { ITiposCapitulos } ITiposCapitulos = interface(IDAStronglyTypedDataTable) - ['{073AA046-A990-4F4C-9511-1FCECCAB82F5}'] + ['{BA0C61D3-2DAA-4266-9C56-0D6913BAF394}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1456,7 +1456,7 @@ type { IContratosCliente_Detalles } IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{DC068DE8-7645-4606-A495-EA61858FA573}'] + ['{22F61517-2D9E-4C39-A418-962A5A22AC55}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1707,7 +1707,7 @@ type { IContratoClienteFacturasProv } IContratoClienteFacturasProv = interface(IDAStronglyTypedDataTable) - ['{0FA7F5D0-2691-460F-9169-53D618623C2A}'] + ['{65D5A9BB-5575-4AD0-9D0F-D2EB75F53D37}'] { Property getters and setters } function GetID_CONTRATOValue: Integer; procedure SetID_CONTRATOValue(const aValue: Integer); diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas index 1ff7e340..5018e3c1 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas @@ -9,19 +9,19 @@ 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_ValoresDelta = '{BEF7E846-68E6-4642-A963-8239662BC18F}'; - RID_PropiedadesDelta = '{965C52FF-51FE-49E2-AB0F-CC133550B5F0}'; - RID_ListaAnosContratosDelta = '{100E85ED-6E4C-483A-A598-B561F0EEE3AA}'; - RID_ContratosClienteBeneficiosDelta = '{0EA5FDD2-43CA-49C1-BA07-FF120B4344FF}'; - RID_ContratosClienteDelta = '{FBB297BE-9076-4A45-B9FB-7296823BA42C}'; - RID_TiposCapitulosDelta = '{92BA6A50-5D11-4716-A080-9CB5DCEFCAA8}'; - RID_ContratosCliente_DetallesDelta = '{225035B8-7694-4159-AB92-AA97C02FB36B}'; - RID_ContratoClienteFacturasProvDelta = '{17B96B7F-8DF6-4136-B8C3-4E32068BE42E}'; + RID_ValoresDelta = '{CD8C36E5-C2AE-414F-BC0B-4041885CD03C}'; + RID_PropiedadesDelta = '{A6A312B4-0B8A-4330-9DDA-EBEE10F6E768}'; + RID_ListaAnosContratosDelta = '{343A2B67-3552-435F-B948-C0E887D110D8}'; + RID_ContratosClienteBeneficiosDelta = '{8FD58120-2A5F-4EC8-9E00-4D49F6812408}'; + RID_ContratosClienteDelta = '{B77C6258-9118-45E6-B08F-B842CA6A0036}'; + RID_TiposCapitulosDelta = '{D6F667D1-6D15-4AAA-BDCC-EB2760508CF2}'; + RID_ContratosCliente_DetallesDelta = '{30D8A4AA-A274-493C-B435-9DB64DA16958}'; + RID_ContratoClienteFacturasProvDelta = '{D4DF9AD0-920C-405A-9409-922C409734CB}'; type { IValoresDelta } IValoresDelta = interface(IValores) - ['{BEF7E846-68E6-4642-A963-8239662BC18F}'] + ['{CD8C36E5-C2AE-414F-BC0B-4041885CD03C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PROPIEDADValue : Integer; @@ -79,7 +79,7 @@ type { IPropiedadesDelta } IPropiedadesDelta = interface(IPropiedades) - ['{965C52FF-51FE-49E2-AB0F-CC133550B5F0}'] + ['{A6A312B4-0B8A-4330-9DDA-EBEE10F6E768}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -137,7 +137,7 @@ type { IListaAnosContratosDelta } IListaAnosContratosDelta = interface(IListaAnosContratos) - ['{100E85ED-6E4C-483A-A598-B561F0EEE3AA}'] + ['{343A2B67-3552-435F-B948-C0E887D110D8}'] { Property getters and setters } function GetOldANOValue : String; @@ -171,7 +171,7 @@ type { IContratosClienteBeneficiosDelta } IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios) - ['{0EA5FDD2-43CA-49C1-BA07-FF120B4344FF}'] + ['{8FD58120-2A5F-4EC8-9E00-4D49F6812408}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -397,7 +397,7 @@ type { IContratosClienteDelta } IContratosClienteDelta = interface(IContratosCliente) - ['{FBB297BE-9076-4A45-B9FB-7296823BA42C}'] + ['{B77C6258-9118-45E6-B08F-B842CA6A0036}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -1097,7 +1097,7 @@ type { ITiposCapitulosDelta } ITiposCapitulosDelta = interface(ITiposCapitulos) - ['{92BA6A50-5D11-4716-A080-9CB5DCEFCAA8}'] + ['{D6F667D1-6D15-4AAA-BDCC-EB2760508CF2}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldPOSICIONValue : Integer; @@ -1191,7 +1191,7 @@ type { IContratosCliente_DetallesDelta } IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles) - ['{225035B8-7694-4159-AB92-AA97C02FB36B}'] + ['{30D8A4AA-A274-493C-B435-9DB64DA16958}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTRATOValue : Integer; @@ -1441,7 +1441,7 @@ type { IContratoClienteFacturasProvDelta } IContratoClienteFacturasProvDelta = interface(IContratoClienteFacturasProv) - ['{17B96B7F-8DF6-4136-B8C3-4E32068BE42E}'] + ['{D4DF9AD0-920C-405A-9409-922C409734CB}'] { Property getters and setters } function GetOldID_CONTRATOValue : Integer; function GetOldREFERENCIAValue : String; diff --git a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm index 68540bc3..e3101377 100644 --- a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm +++ b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm @@ -921,12 +921,12 @@ object srvContratosCliente: TsrvContratosCliente 'ALLES.TIPO_ARTICULO,'#10' CONTRATOS_CLIENTE_DETALLES.INCREMENTO,'#10 + ' CONTRATOS_CLIENTE_DETALLES.DECREMENTO,'#10' CONTRATOS_CLIENTE' + '_DETALLES.DESCUENTO,'#10' CONTRATOS_CLIENTE_DETALLES.IMPORTE_PORT' + - 'E, ARTICULOS.REFERENCIA,'#10' '#39#39' as REFERENCIA_PROVEEDOR /*Es nec' + - 'esario para que no fallen los detalles porque los detalles son c' + - 'omunes para la rama de cliente y de proveedor*/'#10#10'FROM CONTRATOS_' + - 'CLIENTE_DETALLES'#10'LEFT JOIN ARTICULOS ON CONTRATOS_CLIENTE_DETALL' + - 'ES.ID_ARTICULO = ARTICULOS.ID'#10'where {where}'#10'ORDER BY POSICION;'#10#10 + - #10#10 + 'E, ARTICULOS.REFERENCIA,'#10' CONTRATOS_CLIENTE_DETALLES.REFERENC' + + 'IA_PROVEEDOR /*Es necesario para que no fallen los detalles porq' + + 'ue los detalles son comunes para la rama de cliente y de proveed' + + 'or*/'#10#10'FROM CONTRATOS_CLIENTE_DETALLES'#10'LEFT JOIN ARTICULOS ON CON' + + 'TRATOS_CLIENTE_DETALLES.ID_ARTICULO = ARTICULOS.ID'#10'where {where}' + + #10'ORDER BY POSICION;'#10#10#10#10 StatementType = stSQL ColumnMappings = < item @@ -1092,6 +1092,7 @@ object srvContratosCliente: TsrvContratosCliente item Name = 'REFERENCIA_PROVEEDOR' DataType = datString + Size = 255 end> end item @@ -1835,6 +1836,12 @@ object srvContratosCliente: TsrvContratosCliente Name = 'IMPORTE_PORTE' DataType = datCurrency Value = '' + end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + Value = '' end> Statements = < item @@ -1846,11 +1853,11 @@ object srvContratosCliente: TsrvContratosCliente 'OSICION, TIPO_DETALLE, PROPIEDAD, CONCEPTO, CANTIDAD,'#10' IMPOR' + 'TE_UNIDAD, IMPORTE_TOTAL, VISIBLE, VISIBLE2, ID_ARTICULO, TIPO_A' + 'RTICULO,'#10' INCREMENTO, DECREMENTO, DESCUENTO, IMPORTE_PORTE, ' + - 'FECHA_ALTA)'#10' VALUES'#10' (:ID, :ID_CONTRATO, :POSICION, :TIPO_DE' + - 'TALLE, :PROPIEDAD, :CONCEPTO,'#10' :CANTIDAD, :IMPORTE_UNIDAD, :' + - 'IMPORTE_TOTAL, :VISIBLE, :VISIBLE2,'#10' :ID_ARTICULO, :TIPO_ART' + - 'ICULO, :INCREMENTO, :DECREMENTO, :DESCUENTO, :IMPORTE_PORTE, CUR' + - 'RENT_TIMESTAMP)'#10 + 'FECHA_ALTA, REFERENCIA_PROVEEDOR)'#10' VALUES'#10' (:ID, :ID_CONTRAT' + + 'O, :POSICION, :TIPO_DETALLE, :PROPIEDAD, :CONCEPTO,'#10' :CANTID' + + 'AD, :IMPORTE_UNIDAD, :IMPORTE_TOTAL, :VISIBLE, :VISIBLE2,'#10' :' + + 'ID_ARTICULO, :TIPO_ARTICULO, :INCREMENTO, :DECREMENTO, :DESCUENT' + + 'O, :IMPORTE_PORTE, CURRENT_TIMESTAMP, :REFERENCIA_PROVEEDOR)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -1967,6 +1974,12 @@ object srvContratosCliente: TsrvContratosCliente DataType = datCurrency Value = '' end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + Value = '' + end item Name = 'OLD_ID' Value = '' @@ -1986,7 +1999,8 @@ object srvContratosCliente: TsrvContratosCliente 'LO, '#10' TIPO_ARTICULO = :TIPO_ARTICULO,'#10' INCREMENTO = :INCRE' + 'MENTO,'#10' DECREMENTO = :DECREMENTO,'#10' DESCUENTO = :DESCUENTO,' + ' '#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' FECHA_MODIFICACION = C' + - 'URRENT_TIMESTAMP'#10' WHERE'#10' (ID = :OLD_ID)'#10 + 'URRENT_TIMESTAMP,'#10' REFERENCIA_PROVEEDOR = :REFERENCIA_PROVEED' + + 'OR'#10' WHERE'#10' (ID = :OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm index d8e56aea..754a488b 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm @@ -596,6 +596,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente end object dxLayoutControl1Group10: TdxLayoutGroup Caption = 'El contrato pertenece a la tienda' + Visible = False object dxLayoutControl1Item13: TdxLayoutItem Control = frViewTienda1 ControlOptions.AutoColor = True diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm index 04a6cd49..f1ba74b0 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm @@ -189,6 +189,8 @@ inherited frViewContratosCliente: TfrViewContratosCliente object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewInstalador: TcxGridDBColumn Caption = 'Alba'#241'il / Instalador' @@ -334,6 +336,8 @@ inherited frViewContratosCliente: TfrViewContratosCliente end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas index 346aa669..0a2c665e 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas @@ -221,6 +221,7 @@ procedure TfrViewContratosCliente.ConfigView; begin inherited; //FILTRO DE EMPRESAS +{ if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then begin cxGridViewTIENDA.Visible := True; @@ -233,6 +234,7 @@ begin cxGridViewTIENDA.VisibleForCustomization := False; actTienda.Visible := False; end; + } end; procedure TfrViewContratosCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); diff --git a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm index 12f6d70c..6e1d774b 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm @@ -1,5 +1,8 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente inherited cxGrid: TcxGrid + ExplicitTop = 72 + ExplicitWidth = 451 + ExplicitHeight = 232 inherited cxGridView: TcxGridDBTableView inherited cxGridViewID_ARTICULO: TcxGridDBColumn Width = 57 @@ -28,7 +31,7 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente inherited cxGridViewREFERENCIA: TcxGridDBColumn [8] end inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [9] - DataBinding.FieldName = '' + Visible = True end inherited cxGridViewDESCRIPCION: TcxGridDBColumn [10] OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit @@ -65,6 +68,8 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente end end inherited TBXDock1: TTBXDock + ExplicitTop = 46 + ExplicitWidth = 451 inherited TBXToolbar1: TTBXToolbar object TBXSubmenuItem1: TTBXSubmenuItem [0] Caption = 'A'#241'adir cap'#237'tulo' diff --git a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas index a9e923f4..f409b6f4 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas @@ -77,6 +77,7 @@ type procedure CustomViewDestroy(Sender: TObject); procedure actCapituloObraExecute(Sender: TObject); procedure cxLookupComboBox1PropertiesEditValueChanged(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); private procedure AnadirCapitulo(const Tipo: String;const Descripcion: String; const Descuento:Boolean = false); @@ -248,6 +249,12 @@ begin end; end; +procedure TfrViewDetallesContratoCliente.CustomViewCreate(Sender: TObject); +begin + inherited; + cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := NIL; +end; + procedure TfrViewDetallesContratoCliente.CustomViewDestroy(Sender: TObject); begin cxGridViewVISIBLE.Properties.OnEditValueChanged := Nil; @@ -333,7 +340,7 @@ begin and (AItem.GridView.Items[IndiceCol].EditValue <> TIPO_DETALLE_CONCEPTO) then Result := False end - else if (AItem.Index in [cxGridViewPROPIEDAD.Index, cxGridViewTIPO_ARTICULO.Index]) then + else if (AItem.Index in [cxGridViewPROPIEDAD.Index, cxGridViewREFERENCIA_PROVEEDOR.Index, cxGridViewTIPO_ARTICULO.Index]) then begin IndiceCol := cxGridView.GetColumnByFieldName(CAMPO_TIPO).Index; if ((AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_SALTO) or diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index 605dfde8..1d0ae80d 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -709,6 +709,7 @@ begin SITUACION := CTE_PENDIENTE; //Al ser una nueva debe de estar pendiente FECHA_FACTURA := DateOf(Now); ID_COMISION_LIQUIDADA := 0; + VERIFACTU := 0; //CONTABILIDAD ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID; diff --git a/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm index a7281112..23dc28a3 100644 --- a/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Plugin/uPluginFacturasCliente.dfm @@ -46,7 +46,7 @@ object PluginFacturasCliente: TPluginFacturasCliente Top = 72 object actFacturasCliente: TAction Category = 'Ventas' - Caption = 'Facturas proforma de cliente' + Caption = 'Facturas de cliente' ImageIndex = 0 OnExecute = actFacturasClienteExecute end diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm index 2df12f0c..6ffec97c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm @@ -1,5 +1,5 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente - Caption = 'Lista de facturas proforma de cliente' + Caption = 'Lista de facturas de cliente' ClientHeight = 666 ClientWidth = 640 ExplicitWidth = 656 @@ -8,7 +8,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 640 - Caption = 'Lista de facturas proforma de cliente' + Caption = 'Lista de facturas de cliente' ExplicitWidth = 640 inherited Image1: TImage Left = 613 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas index 222c314c..f64f324e 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas @@ -358,13 +358,14 @@ begin inherited; (Sender as TAction).Enabled := False; - +{ if HayDatos and Assigned(ViewGrid) then (Sender as TAction).Enabled := ViewGrid.EsSeleccionCeldaDatos and (ViewGrid.NumSeleccionados > 0) and (FFacturas.VERIFACTU <> 1) else (Sender as TAction).Enabled := False; +} end; procedure TfEditorFacturasCliente.actNuevaFacturaExecute(Sender: TObject); @@ -671,7 +672,7 @@ procedure TfEditorFacturasCliente.PonerTitulos(const ATitulo: string); var FTitulo : String; begin - FTitulo := 'Lista de facturas proforma de cliente - ' + AppFactuGES.EmpresaActiva.NOMBRE; + FTitulo := 'Lista de facturas de cliente - ' + AppFactuGES.EmpresaActiva.NOMBRE; inherited PonerTitulos(FTitulo); end; diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index bcb812f5..c32d5827 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente - Width = 1081 - Height = 551 + Width = 451 + Height = 304 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,19 +9,17 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 1081 - Height = 551 + Width = 451 + Height = 304 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 451 - ExplicitHeight = 304 DesignSize = ( - 1081 - 551) + 451 + 304) object eReferencia: TcxDBTextEdit Left = 135 Top = 30 @@ -98,7 +96,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 78 end object bFormasPago: TButton - Left = 410 + Left = 311 Top = 135 Width = 132 Height = 23 @@ -126,7 +124,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente inherited dxLayoutControl1: TdxLayoutControl Width = 351 Height = 63 - ExplicitWidth = 421 + ExplicitWidth = 351 ExplicitHeight = 63 inherited cbTienda: TcxComboBox ExplicitWidth = 399 @@ -135,7 +133,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end end inline frViewClienteFactura1: TfrViewClienteFactura - Left = 570 + Left = 471 Top = 30 Width = 398 Height = 265 @@ -147,14 +145,14 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 9 ReadOnly = False - ExplicitLeft = 570 + ExplicitLeft = 471 ExplicitTop = 30 ExplicitWidth = 398 ExplicitHeight = 265 inherited dxLayoutControl1: TdxLayoutControl Width = 398 Height = 265 - ExplicitWidth = 101 + ExplicitWidth = 398 ExplicitHeight = 265 inherited edtlNombre: TcxDBTextEdit ExplicitWidth = 276 @@ -177,12 +175,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 276 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 397 - ExplicitLeft = 397 + Left = 192 + ExplicitLeft = 192 end inherited Button3: TBitBtn - Left = 287 - ExplicitLeft = 287 + Left = 82 + ExplicitLeft = 82 end inherited cxDBTextEdit1: TcxDBTextEdit ExplicitWidth = 283 @@ -231,8 +229,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente inherited memObservaciones: TcxDBMemo DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource - ExplicitWidth = 550 - ExplicitHeight = 20 + ExplicitHeight = 228 Height = 228 end end @@ -383,6 +380,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente AutoAligns = [aaVertical] AlignHorz = ahClient Caption = 'La factura pertenece a la tienda' + Visible = False object dxLayoutControl1Item3: TdxLayoutItem Caption = 'New Item' ShowCaption = False diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index 298c3e13..fc0634bb 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -41,6 +41,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' @@ -323,6 +325,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas index 0128bdfd..209e8168 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas @@ -238,13 +238,13 @@ begin inherited; //Para que nos filtre la pestaña todas y quite las facturas proforma AnadirOtrosFiltros; - +{ //Solo para aliso if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then begin cxGridViewTIENDA.Visible := True; cxGridViewTIENDA.VisibleForCustomization := True; - actTienda.Visible := True; + actTienda.Visible := True; end else begin @@ -252,6 +252,7 @@ begin cxGridViewTIENDA.VisibleForCustomization := False; actTienda.Visible := False; end; + } end; procedure TfrViewFacturasCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm index eb74094a..d1f6730f 100644 --- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm @@ -284,6 +284,14 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor Name = 'FORMA_PAGO' DataType = datString Size = 255 + end + item + Name = 'IRPF' + DataType = datFloat + end + item + Name = 'IMPORTE_IRPF' + DataType = datCurrency end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas index 7e8aafb6..e93a1a56 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 = '{CFA5EFF8-4F77-48FB-8B3E-C4A634D64B8A}'; - RID_FacturasProveedor_Contratos = '{650CC6A1-408F-473B-9E36-F65DD28066FF}'; - RID_FacturasProveedor = '{254F8AF5-8A05-452B-A23D-6BBFF2E8AFA6}'; - RID_FacturasProveedor_Detalles = '{BF54688C-7B41-4E0D-B1FA-B6E29A1984BD}'; + RID_ListaAnosFacturas = '{A5DA423A-7F40-4247-8702-3D6FE0694F3A}'; + RID_FacturasProveedor_Contratos = '{B39D1D9D-F5F5-4F15-B1B2-2F29DBFC607E}'; + RID_FacturasProveedor = '{BC60AF06-3C6A-4475-BA87-A15D314F7736}'; + RID_FacturasProveedor_Detalles = '{AC8DB502-EDCB-4F4D-B504-FD315150F723}'; { Data table names } nme_ListaAnosFacturas = 'ListaAnosFacturas'; @@ -94,6 +94,8 @@ const fld_FacturasProveedorESTADO_EJERCICIO = 'ESTADO_EJERCICIO'; fld_FacturasProveedorASIENTO_PUNTEADO = 'ASIENTO_PUNTEADO'; fld_FacturasProveedorFORMA_PAGO = 'FORMA_PAGO'; + fld_FacturasProveedorIRPF = 'IRPF'; + fld_FacturasProveedorIMPORTE_IRPF = 'IMPORTE_IRPF'; { FacturasProveedor field indexes } idx_FacturasProveedorID = 0; @@ -139,6 +141,8 @@ const idx_FacturasProveedorESTADO_EJERCICIO = 40; idx_FacturasProveedorASIENTO_PUNTEADO = 41; idx_FacturasProveedorFORMA_PAGO = 42; + idx_FacturasProveedorIRPF = 43; + idx_FacturasProveedorIMPORTE_IRPF = 44; { FacturasProveedor_Detalles fields } fld_FacturasProveedor_DetallesID = 'ID'; @@ -175,7 +179,7 @@ const type { IListaAnosFacturas } IListaAnosFacturas = interface(IDAStronglyTypedDataTable) - ['{19698B71-3828-464D-84A7-81A51A46AB12}'] + ['{873AAD72-59DF-4591-B15D-F3B81DFD8E99}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -210,7 +214,7 @@ type { IFacturasProveedor_Contratos } IFacturasProveedor_Contratos = interface(IDAStronglyTypedDataTable) - ['{265C7BB6-F929-4AF2-BEA7-045E46FCFA9C}'] + ['{5BA2D6A8-8EB8-46CA-8135-DB8DC623A28A}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -353,7 +357,7 @@ type { IFacturasProveedor } IFacturasProveedor = interface(IDAStronglyTypedDataTable) - ['{3C61C0E5-2990-4850-8368-016C0F3860B4}'] + ['{23A16D76-129B-40AC-A343-F80E4BEF0D56}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -526,6 +530,14 @@ type procedure SetFORMA_PAGOValue(const aValue: String); function GetFORMA_PAGOIsNull: Boolean; procedure SetFORMA_PAGOIsNull(const aValue: Boolean); + function GetIRPFValue: Float; + procedure SetIRPFValue(const aValue: Float); + function GetIRPFIsNull: Boolean; + procedure SetIRPFIsNull(const aValue: Boolean); + function GetIMPORTE_IRPFValue: Currency; + procedure SetIMPORTE_IRPFValue(const aValue: Currency); + function GetIMPORTE_IRPFIsNull: Boolean; + procedure SetIMPORTE_IRPFIsNull(const aValue: Boolean); { Properties } @@ -615,6 +627,10 @@ type property ASIENTO_PUNTEADOIsNull: Boolean read GetASIENTO_PUNTEADOIsNull write SetASIENTO_PUNTEADOIsNull; property FORMA_PAGO: String read GetFORMA_PAGOValue write SetFORMA_PAGOValue; property FORMA_PAGOIsNull: Boolean read GetFORMA_PAGOIsNull write SetFORMA_PAGOIsNull; + property IRPF: Float read GetIRPFValue write SetIRPFValue; + property IRPFIsNull: Boolean read GetIRPFIsNull write SetIRPFIsNull; + property IMPORTE_IRPF: Currency read GetIMPORTE_IRPFValue write SetIMPORTE_IRPFValue; + property IMPORTE_IRPFIsNull: Boolean read GetIMPORTE_IRPFIsNull write SetIMPORTE_IRPFIsNull; end; { TFacturasProveedorDataTableRules } @@ -795,6 +811,14 @@ type procedure SetFORMA_PAGOValue(const aValue: String); virtual; function GetFORMA_PAGOIsNull: Boolean; virtual; procedure SetFORMA_PAGOIsNull(const aValue: Boolean); virtual; + function GetIRPFValue: Float; virtual; + procedure SetIRPFValue(const aValue: Float); virtual; + function GetIRPFIsNull: Boolean; virtual; + procedure SetIRPFIsNull(const aValue: Boolean); virtual; + function GetIMPORTE_IRPFValue: Currency; virtual; + procedure SetIMPORTE_IRPFValue(const aValue: Currency); virtual; + function GetIMPORTE_IRPFIsNull: Boolean; virtual; + procedure SetIMPORTE_IRPFIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -883,6 +907,10 @@ type property ASIENTO_PUNTEADOIsNull: Boolean read GetASIENTO_PUNTEADOIsNull write SetASIENTO_PUNTEADOIsNull; property FORMA_PAGO: String read GetFORMA_PAGOValue write SetFORMA_PAGOValue; property FORMA_PAGOIsNull: Boolean read GetFORMA_PAGOIsNull write SetFORMA_PAGOIsNull; + property IRPF: Float read GetIRPFValue write SetIRPFValue; + property IRPFIsNull: Boolean read GetIRPFIsNull write SetIRPFIsNull; + property IMPORTE_IRPF: Currency read GetIMPORTE_IRPFValue write SetIMPORTE_IRPFValue; + property IMPORTE_IRPFIsNull: Boolean read GetIMPORTE_IRPFIsNull write SetIMPORTE_IRPFIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -892,7 +920,7 @@ type { IFacturasProveedor_Detalles } IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable) - ['{919C8CE0-36DA-4D8B-BB37-B96B43E9D858}'] + ['{42B586F9-E58B-4576-A2CC-3EC699CA6AAD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2261,6 +2289,48 @@ begin DataTable.Fields[idx_FacturasProveedorFORMA_PAGO].AsVariant := Null; end; +function TFacturasProveedorDataTableRules.GetIRPFValue: Float; +begin + result := DataTable.Fields[idx_FacturasProveedorIRPF].AsFloat; +end; + +procedure TFacturasProveedorDataTableRules.SetIRPFValue(const aValue: Float); +begin + DataTable.Fields[idx_FacturasProveedorIRPF].AsFloat := aValue; +end; + +function TFacturasProveedorDataTableRules.GetIRPFIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasProveedorIRPF].IsNull; +end; + +procedure TFacturasProveedorDataTableRules.SetIRPFIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasProveedorIRPF].AsVariant := Null; +end; + +function TFacturasProveedorDataTableRules.GetIMPORTE_IRPFValue: Currency; +begin + result := DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].AsCurrency; +end; + +procedure TFacturasProveedorDataTableRules.SetIMPORTE_IRPFValue(const aValue: Currency); +begin + DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].AsCurrency := aValue; +end; + +function TFacturasProveedorDataTableRules.GetIMPORTE_IRPFIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].IsNull; +end; + +procedure TFacturasProveedorDataTableRules.SetIMPORTE_IRPFIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].AsVariant := Null; +end; + { TFacturasProveedor_DetallesDataTableRules } constructor TFacturasProveedor_DetallesDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas index 448e04e3..b8a11286 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 = '{535C1F19-F3C7-4C02-92EB-F246084344D4}'; - RID_FacturasProveedor_ContratosDelta = '{B244C10F-B9F9-4ED5-8285-96CD764A2048}'; - RID_FacturasProveedorDelta = '{AA4FAD07-E1DB-4499-92B8-6D97A2D27F3A}'; - RID_FacturasProveedor_DetallesDelta = '{EA15980F-BAF0-4B2E-B318-49343FB89774}'; + RID_ListaAnosFacturasDelta = '{1DDB5267-5B65-4B56-B94B-4105C9DC3180}'; + RID_FacturasProveedor_ContratosDelta = '{C007EBB3-124E-488F-A237-939FC92401D5}'; + RID_FacturasProveedorDelta = '{DD501CB4-C47C-47F1-AF1F-52F9AD0E06C8}'; + RID_FacturasProveedor_DetallesDelta = '{34869678-D1B5-4A74-BE6A-3EEC1A1D9A7E}'; type { IListaAnosFacturasDelta } IListaAnosFacturasDelta = interface(IListaAnosFacturas) - ['{535C1F19-F3C7-4C02-92EB-F246084344D4}'] + ['{1DDB5267-5B65-4B56-B94B-4105C9DC3180}'] { Property getters and setters } function GetOldANOValue : String; @@ -51,7 +51,7 @@ type { IFacturasProveedor_ContratosDelta } IFacturasProveedor_ContratosDelta = interface(IFacturasProveedor_Contratos) - ['{B244C10F-B9F9-4ED5-8285-96CD764A2048}'] + ['{C007EBB3-124E-488F-A237-939FC92401D5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -193,7 +193,7 @@ type { IFacturasProveedorDelta } IFacturasProveedorDelta = interface(IFacturasProveedor) - ['{AA4FAD07-E1DB-4499-92B8-6D97A2D27F3A}'] + ['{DD501CB4-C47C-47F1-AF1F-52F9AD0E06C8}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -238,6 +238,8 @@ type function GetOldESTADO_EJERCICIOValue : String; function GetOldASIENTO_PUNTEADOValue : SmallInt; function GetOldFORMA_PAGOValue : String; + function GetOldIRPFValue : Float; + function GetOldIMPORTE_IRPFValue : Currency; { Properties } property OldID : Integer read GetOldIDValue; @@ -283,6 +285,8 @@ type property OldESTADO_EJERCICIO : String read GetOldESTADO_EJERCICIOValue; property OldASIENTO_PUNTEADO : SmallInt read GetOldASIENTO_PUNTEADOValue; property OldFORMA_PAGO : String read GetOldFORMA_PAGOValue; + property OldIRPF : Float read GetOldIRPFValue; + property OldIMPORTE_IRPF : Currency read GetOldIMPORTE_IRPFValue; end; { TFacturasProveedorBusinessProcessorRules } @@ -549,6 +553,18 @@ type function GetOldFORMA_PAGOIsNull: Boolean; virtual; procedure SetFORMA_PAGOValue(const aValue: String); virtual; procedure SetFORMA_PAGOIsNull(const aValue: Boolean); virtual; + function GetIRPFValue: Float; virtual; + function GetIRPFIsNull: Boolean; virtual; + function GetOldIRPFValue: Float; virtual; + function GetOldIRPFIsNull: Boolean; virtual; + procedure SetIRPFValue(const aValue: Float); virtual; + procedure SetIRPFIsNull(const aValue: Boolean); virtual; + function GetIMPORTE_IRPFValue: Currency; virtual; + function GetIMPORTE_IRPFIsNull: Boolean; virtual; + function GetOldIMPORTE_IRPFValue: Currency; virtual; + function GetOldIMPORTE_IRPFIsNull: Boolean; virtual; + procedure SetIMPORTE_IRPFValue(const aValue: Currency); virtual; + procedure SetIMPORTE_IRPFIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -723,6 +739,14 @@ type property FORMA_PAGOIsNull : Boolean read GetFORMA_PAGOIsNull write SetFORMA_PAGOIsNull; property OldFORMA_PAGO : String read GetOldFORMA_PAGOValue; property OldFORMA_PAGOIsNull : Boolean read GetOldFORMA_PAGOIsNull; + property IRPF : Float read GetIRPFValue write SetIRPFValue; + property IRPFIsNull : Boolean read GetIRPFIsNull write SetIRPFIsNull; + property OldIRPF : Float read GetOldIRPFValue; + property OldIRPFIsNull : Boolean read GetOldIRPFIsNull; + property IMPORTE_IRPF : Currency read GetIMPORTE_IRPFValue write SetIMPORTE_IRPFValue; + property IMPORTE_IRPFIsNull : Boolean read GetIMPORTE_IRPFIsNull write SetIMPORTE_IRPFIsNull; + property OldIMPORTE_IRPF : Currency read GetOldIMPORTE_IRPFValue; + property OldIMPORTE_IRPFIsNull : Boolean read GetOldIMPORTE_IRPFIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -732,7 +756,7 @@ type { IFacturasProveedor_DetallesDelta } IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles) - ['{EA15980F-BAF0-4B2E-B318-49343FB89774}'] + ['{34869678-D1B5-4A74-BE6A-3EEC1A1D9A7E}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -2642,6 +2666,68 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorFORMA_PAGO] := Null; end; +function TFacturasProveedorBusinessProcessorRules.GetIRPFValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetIRPFIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF]); +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIRPFValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIRPF]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIRPFIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIRPF]); +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIRPFValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF] := aValue; +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIRPFIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF] := Null; +end; + +function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_IRPFValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_IRPFIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF]); +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_IRPFValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_IRPF]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_IRPFIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_IRPF]); +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_IRPFValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF] := aValue; +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_IRPFIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF] := Null; +end; + { TFacturasProveedor_DetallesBusinessProcessorRules } constructor TFacturasProveedor_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas index 6687a4f2..40913d09 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas @@ -47,6 +47,7 @@ type FSeleccionableInterface : ISeleccionable; procedure CalcularDescuento; procedure CalcularIVA; + procedure CalcularIRPF; procedure CalcularRE; procedure CalcularBaseImponible; procedure AsignarTipoIVA (IDTipoIVA : Integer); @@ -77,6 +78,7 @@ type procedure DESCUENTOOnChange(Sender: TDACustomField); procedure IVAOnChange(Sender: TDACustomField); procedure REOnChange(Sender: TDACustomField); + procedure IRPFOnChange(Sender: TDACustomField); procedure SetID_TIENDAValue(const aValue: Integer); procedure SetID_SUBCUENTAValue(const aValue: Integer); @@ -159,17 +161,25 @@ begin try CalcularBaseImponible; CalcularIVA; + CalcularIRPF; CalcularRE; if not Self.DataTable.Editing then Edit; - IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA + IMPORTE_RE; + IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA - IMPORTE_IRPF + IMPORTE_RE; finally DataTable.Fields.FieldEventsDisabled := False; DataTable.EnableControls; end; end; +procedure TBizFacturaProveedor.CalcularIRPF; +begin + if not Self.DataTable.Editing then + Edit; + IMPORTE_IRPF := (IRPF / 100) * BASE_IMPONIBLE; +end; + procedure TBizFacturaProveedor.CalcularIVA; begin if not Self.DataTable.Editing then @@ -199,6 +209,7 @@ begin FieldByName(fld_FacturasProveedorDESCUENTO).OnChange := DESCUENTOOnChange; FieldByName(fld_FacturasProveedorIVA).OnChange := IVAOnChange; FieldByName(fld_FacturasProveedorRE).OnChange := REOnChange; + FieldByName(fld_FacturasProveedorIRPF).OnChange := IRPFOnChange; end; FDetallesLink := TDADataSource.Create(NIL); @@ -252,6 +263,11 @@ begin CalcularImporteTotal; end; +procedure TBizFacturaProveedor.IRPFOnChange(Sender: TDACustomField); +begin + CalcularImporteTotal; +end; + procedure TBizFacturaProveedor.SetID_SUBCUENTAValue(const aValue: Integer); begin if aValue < 0 then diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm index 9fe02de8..43bdddc6 100644 --- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm +++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm @@ -49,10 +49,11 @@ object RptFacturasProveedor: TRptFacturasProveedor 'select V_facturas_proveedor.ID_EMPRESA,'#10'contactos.REFERENCIA,'#10'co' + 'ntactos.nif_cif,'#10'contactos.poblacion,'#10'V_facturas_proveedor.NOMBR' + 'E,'#10'sum(V_facturas_proveedor.BASE_IMPONIBLE) as BASE_IMPONIBLE,'#10's' + - 'um(V_facturas_proveedor.IMPORTE_IVA) as IMPORTE_IVA,'#10'sum(V_factu' + - 'ras_proveedor.IMPORTE_TOTAL) AS IMPORTE_TOTAL'#10'from V_facturas_pr' + - 'oveedor'#10'left join contactos on (contactos.ID = V_facturas_provee' + - 'dor.ID_PROVEEDOR)'#10'group by 1,2,3,4,5'#10'order by 1,5,2,3,4'#10 + 'um(V_facturas_proveedor.IMPORTE_IRPF) as IMPORTE_IRPF,'#10'sum(V_fac' + + 'turas_proveedor.IMPORTE_IVA) as IMPORTE_IVA,'#10'sum(V_facturas_prov' + + 'eedor.IMPORTE_TOTAL) AS IMPORTE_TOTAL'#10'from V_facturas_proveedor'#10 + + 'left join contactos on (contactos.ID = V_facturas_proveedor.ID_P' + + 'ROVEEDOR)'#10'group by 1,2,3,4,5'#10'order by 1,5,2,3,4'#10 StatementType = stSQL ColumnMappings = < item @@ -86,6 +87,10 @@ object RptFacturasProveedor: TRptFacturasProveedor item DatasetField = 'REFERENCIA' TableField = 'REFERENCIA' + end + item + DatasetField = 'IMPORTE_IRPF' + TableField = 'IMPORTE_IRPF' end> end> Name = 'ListadoFacturasProveedorResumen' @@ -118,6 +123,10 @@ object RptFacturasProveedor: TRptFacturasProveedor Name = 'BASE_IMPONIBLE' DataType = datCurrency end + item + Name = 'IMPORTE_IRPF' + DataType = datCurrency + end item Name = 'IMPORTE_IVA' DataType = datCurrency @@ -156,9 +165,9 @@ object RptFacturasProveedor: TRptFacturasProveedor 'fecha_factura) = 12 then '#39'DICIEMBRE - '#39' || extract (year from fe' + 'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, TIENDA, REFERENCIA_PROVE' + 'EDOR, ID_PROVEEDOR, NOMBRE, SITUACION, NIF_CIF,'#10'FECHA_FACTURA, F' + - 'ECHA_VENCIMIENTO, BASE_IMPONIBLE, IMPORTE_IVA, IMPORTE_TOTAL'#10#10'fr' + - 'om V_facturas_proveedor'#10'where {where}'#10'order by ANO, MES, FECHA_F' + - 'ACTURA, NOMBRE'#10#10 + 'ECHA_VENCIMIENTO, BASE_IMPONIBLE, IMPORTE_IVA, IRPF, IMPORTE_IRP' + + 'F, IMPORTE_TOTAL'#10#10'from V_facturas_proveedor'#10'where {where}'#10'order ' + + 'by ANO, MES, FECHA_FACTURA, NOMBRE'#10#10 StatementType = stSQL ColumnMappings = < item @@ -227,6 +236,14 @@ object RptFacturasProveedor: TRptFacturasProveedor item DatasetField = 'TIENDA' TableField = 'TIENDA' + end + item + DatasetField = 'IRPF' + TableField = 'IRPF' + end + item + DatasetField = 'IMPORTE_IRPF' + TableField = 'IMPORTE_IRPF' end> end> Name = 'ListadoFacturasProveedor' @@ -298,6 +315,14 @@ object RptFacturasProveedor: TRptFacturasProveedor Name = 'IMPORTE_IVA' DataType = datCurrency end + item + Name = 'IRPF' + DataType = datFloat + end + item + Name = 'IMPORTE_IRPF' + DataType = datCurrency + end item Name = 'IMPORTE_TOTAL' DataType = datCurrency @@ -594,6 +619,14 @@ object RptFacturasProveedor: TRptFacturasProveedor Name = 'IMPORTE_IVA' DataType = datCurrency end + item + Name = 'IRPF' + DataType = datFloat + end + item + Name = 'IMPORTE_IRPF' + DataType = datCurrency + end item Name = 'IMPORTE_TOTAL' DataType = datCurrency diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm index ac166495..c82828aa 100644 --- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm +++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm @@ -344,6 +344,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor item DatasetField = 'FORMA_PAGO' TableField = 'FORMA_PAGO' + end + item + DatasetField = 'IRPF' + TableField = 'IRPF' + end + item + DatasetField = 'IMPORTE_IRPF' + TableField = 'IMPORTE_IRPF' end> end> Name = 'FacturasProveedor' @@ -573,6 +581,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor Name = 'FORMA_PAGO' DataType = datString Size = 255 + end + item + Name = 'IRPF' + DataType = datFloat + end + item + Name = 'IMPORTE_IRPF' + DataType = datCurrency end> end item @@ -812,118 +828,166 @@ object srvFacturasProveedor: TsrvFacturasProveedor end item Name = 'ID_EMPRESA' + DataType = datInteger Value = '' end item Name = 'REFERENCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 Value = '' end item Name = 'FECHA_FACTURA' + DataType = datDateTime Value = '' end item Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime Value = '' end item Name = 'BASE_IMPONIBLE' + DataType = datCurrency Value = '' end item Name = 'DESCUENTO' + DataType = datFloat Value = '' end item Name = 'IMPORTE_DESCUENTO' + DataType = datCurrency Value = '' end item Name = 'IVA' + DataType = datFloat Value = '' end item Name = 'IMPORTE_IVA' + DataType = datCurrency Value = '' end item Name = 'RE' + DataType = datFloat Value = '' end item Name = 'IMPORTE_RE' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_TOTAL' + DataType = datCurrency Value = '' end item Name = 'OBSERVACIONES' + DataType = datMemo Value = '' end item Name = 'ID_PROVEEDOR' + DataType = datInteger Value = '' end item Name = 'NIF_CIF' + DataType = datString + Size = 15 Value = '' end item Name = 'NOMBRE' + DataType = datString + Size = 255 Value = '' end item Name = 'CALLE' + DataType = datString + Size = 255 Value = '' end item Name = 'POBLACION' + DataType = datString + Size = 255 Value = '' end item Name = 'PROVINCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'CODIGO_POSTAL' + DataType = datString + Size = 10 Value = '' end item Name = 'USUARIO' + DataType = datString + Size = 30 Value = '' end item Name = 'ID_FORMA_PAGO' + DataType = datInteger Value = '' end item Name = 'RECARGO_EQUIVALENCIA' + DataType = datSmallInt Value = '' end item Name = 'ID_TIPO_IVA' + DataType = datInteger Value = '' end item Name = 'IMPORTE_NETO' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_PORTE' + DataType = datCurrency Value = '' end item Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt Value = '' end item Name = 'ID_TIENDA' + DataType = datInteger + Value = '' + end + item + Name = 'IRPF' + DataType = datFloat + Value = '' + end + item + Name = 'IMPORTE_IRPF' + DataType = datCurrency Value = '' end> Statements = < @@ -939,15 +1003,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor 'EDOR, NIF_CIF, '#10' NOMBRE, CALLE, POBLACION, PROVINCIA, CODIGO' + '_POSTAL, '#10' FECHA_ALTA, USUARIO, ID_FORMA_PAGO,'#10' RECARGO_' + 'EQUIVALENCIA, ID_TIPO_IVA, IMPORTE_NETO, IMPORTE_PORTE, IGNORAR_' + - 'CONTABILIDAD,'#10' ID_TIENDA)'#10' VALUES'#10' (:ID, :ID_EMPRESA, :R' + - 'EFERENCIA, :REFERENCIA_PROVEEDOR,'#10' :FECHA_FACTURA, :FECHA_VE' + - 'NCIMIENTO, :BASE_IMPONIBLE, :DESCUENTO,'#10' :IMPORTE_DESCUENTO,' + - ' :IVA, :IMPORTE_IVA, :RE, :IMPORTE_RE, '#10' :IMPORTE_TOTAL, :OB' + - 'SERVACIONES, :ID_PROVEEDOR, :NIF_CIF, '#10' :NOMBRE, :CALLE, :PO' + - 'BLACION, :PROVINCIA, :CODIGO_POSTAL, '#10' CURRENT_TIMESTAMP, :U' + - 'SUARIO, :ID_FORMA_PAGO,'#10' :RECARGO_EQUIVALENCIA, :ID_TIPO_IVA' + - ', :IMPORTE_NETO, '#10' :IMPORTE_PORTE, :IGNORAR_CONTABILIDAD, :I' + - 'D_TIENDA)'#10' '#10' '#10#10 + 'CONTABILIDAD,'#10' ID_TIENDA, IRPF, IMPORTE_IRPF)'#10' VALUES'#10' (' + + ':ID, :ID_EMPRESA, :REFERENCIA, :REFERENCIA_PROVEEDOR,'#10' :FECH' + + 'A_FACTURA, :FECHA_VENCIMIENTO, :BASE_IMPONIBLE, :DESCUENTO,'#10' ' + + ' :IMPORTE_DESCUENTO, :IVA, :IMPORTE_IVA, :RE, :IMPORTE_RE, '#10' ' + + ' :IMPORTE_TOTAL, :OBSERVACIONES, :ID_PROVEEDOR, :NIF_CIF, '#10' ' + + ':NOMBRE, :CALLE, :POBLACION, :PROVINCIA, :CODIGO_POSTAL, '#10' C' + + 'URRENT_TIMESTAMP, :USUARIO, :ID_FORMA_PAGO,'#10' :RECARGO_EQUIVA' + + 'LENCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10' :IMPORTE_PORTE, :IGNO' + + 'RAR_CONTABILIDAD, :ID_TIENDA, :IRPF, :IMPORTE_IRPF)'#10' '#10' '#10 + + #10 StatementType = stSQL ColumnMappings = <> end> @@ -976,122 +1041,171 @@ object srvFacturasProveedor: TsrvFacturasProveedor Params = < item Name = 'ID' + DataType = datInteger Value = '' end item Name = 'ID_EMPRESA' + DataType = datInteger Value = '' end item Name = 'REFERENCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 Value = '' end item Name = 'FECHA_FACTURA' + DataType = datDateTime Value = '' end item Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime Value = '' end item Name = 'BASE_IMPONIBLE' + DataType = datCurrency Value = '' end item Name = 'DESCUENTO' + DataType = datFloat Value = '' end item Name = 'IMPORTE_DESCUENTO' + DataType = datCurrency Value = '' end item Name = 'IVA' + DataType = datFloat Value = '' end item Name = 'IMPORTE_IVA' + DataType = datCurrency Value = '' end item Name = 'RE' + DataType = datFloat Value = '' end item Name = 'IMPORTE_RE' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_TOTAL' + DataType = datCurrency Value = '' end item Name = 'OBSERVACIONES' + DataType = datMemo Value = '' end item Name = 'ID_PROVEEDOR' + DataType = datInteger Value = '' end item Name = 'NIF_CIF' + DataType = datString + Size = 15 Value = '' end item Name = 'NOMBRE' + DataType = datString + Size = 255 Value = '' end item Name = 'CALLE' + DataType = datString + Size = 255 Value = '' end item Name = 'POBLACION' + DataType = datString + Size = 255 Value = '' end item Name = 'PROVINCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'CODIGO_POSTAL' + DataType = datString + Size = 10 Value = '' end item Name = 'USUARIO' + DataType = datString + Size = 30 Value = '' end item Name = 'ID_FORMA_PAGO' + DataType = datInteger Value = '' end item Name = 'RECARGO_EQUIVALENCIA' + DataType = datSmallInt Value = '' end item Name = 'ID_TIPO_IVA' + DataType = datInteger Value = '' end item Name = 'IMPORTE_NETO' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_PORTE' + DataType = datCurrency Value = '' end item Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt Value = '' end item Name = 'ID_TIENDA' + DataType = datInteger + Value = '' + end + item + Name = 'IRPF' + DataType = datFloat + Value = '' + end + item + Name = 'IMPORTE_IRPF' + DataType = datCurrency Value = '' end item @@ -1120,7 +1234,8 @@ object srvFacturasProveedor: TsrvFacturasProveedor 'ECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA, '#10' ID_TIPO_IVA = ' + ':ID_TIPO_IVA, '#10' IMPORTE_NETO = :IMPORTE_NETO, '#10' IMPORTE_PO' + 'RTE = :IMPORTE_PORTE,'#10' IGNORAR_CONTABILIDAD = :IGNORAR_CONTAB' + - 'ILIDAD,'#10' ID_TIENDA = :ID_TIENDA'#10' WHERE'#10' (ID = :OLD_ID)'#10 + 'ILIDAD,'#10' ID_TIENDA = :ID_TIENDA,'#10' IRPF = :IRPF,'#10' IMPORT' + + 'E_IRPF = :IMPORTE_IRPF'#10' WHERE'#10' (ID = :OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index 7ae43402..3a3c225d 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -2,20 +2,20 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Left = 454 Top = 208 Caption = 'Nueva factura de proveedor' - ClientHeight = 606 - ClientWidth = 746 + ClientHeight = 694 + ClientWidth = 783 Position = poScreenCenter OnClose = CustomEditorClose - ExplicitWidth = 754 - ExplicitHeight = 640 + ExplicitWidth = 799 + ExplicitHeight = 732 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 746 + Width = 783 Caption = 'Nueva factura de proveedor' - ExplicitWidth = 746 + ExplicitWidth = 783 inherited Image1: TImage - Left = 719 + Left = 756 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -37,12 +37,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor 454E44AE426082} ExplicitLeft = 742 end + inherited lblDesbloquear: TcxLabel + Left = 658 + ExplicitLeft = 658 + AnchorX = 703 + AnchorY = 14 + end end inherited TBXDock: TTBXDock - Width = 746 - ExplicitWidth = 746 + Width = 783 + ExplicitWidth = 783 inherited tbxMain: TTBXToolbar - ExplicitWidth = 330 + ExplicitWidth = 347 inherited TBXItem2: TTBXItem Visible = False end @@ -54,7 +60,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 746 + ExplicitWidth = 783 inherited TBXSubmenuItem4: TTBXSubmenuItem inherited TBXItem8: TTBXItem Visible = False @@ -69,32 +75,33 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited StatusBar: TJvStatusBar - Top = 587 - Width = 746 + Top = 485 + Width = 783 Panels = < item Width = 200 end> - ExplicitTop = 587 - ExplicitWidth = 746 + ExplicitTop = 485 + ExplicitWidth = 783 end inherited pgPaginas: TPageControl - Width = 740 - Height = 312 + Width = 777 + Height = 371 ActivePage = PagContratos OnChanging = pgPaginasChanging - ExplicitWidth = 740 - ExplicitHeight = 312 + ExplicitTop = 111 + ExplicitWidth = 777 + ExplicitHeight = 371 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 732 - ExplicitHeight = 284 + ExplicitWidth = 769 + ExplicitHeight = 343 inline frViewFacturaProveedor1: TfrViewFacturaProveedor Left = 0 Top = 0 - Width = 732 - Height = 284 + Width = 769 + Height = 343 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -104,16 +111,16 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 732 - ExplicitHeight = 284 + ExplicitWidth = 769 + ExplicitHeight = 343 inherited dxLayoutControl1: TdxLayoutControl - Width = 732 - Height = 284 - ExplicitWidth = 732 - ExplicitHeight = 284 + Width = 769 + Height = 343 + ExplicitWidth = 769 + ExplicitHeight = 343 DesignSize = ( - 732 - 284) + 769 + 343) inherited eReferencia: TcxDBTextEdit ExplicitWidth = 191 Width = 191 @@ -127,8 +134,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 53 end inherited bFormasPago: TButton - Left = 183 - ExplicitLeft = 183 + Left = 220 + ExplicitLeft = 220 end inherited eReferenciaProveedor: TcxDBTextEdit ExplicitWidth = 191 @@ -151,9 +158,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 191 end inherited frViewProveedorFactura1: TfrViewProveedorFactura - Left = 343 + Left = 380 Width = 350 - ExplicitLeft = 343 + ExplicitLeft = 380 ExplicitWidth = 350 inherited dxLayoutControl1: TdxLayoutControl Width = 350 @@ -208,7 +215,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitHeight = 228 inherited memObservaciones: TcxDBMemo DataBinding.DataSource = frViewFacturaProveedor1.DADataSource - ExplicitWidth = 671 + ExplicitWidth = 708 ExplicitHeight = 20 Height = 228 Width = 671 @@ -223,8 +230,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor Left = 0 Top = 0 - Width = 732 - Height = 284 + Width = 769 + Height = 343 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -236,11 +243,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 732 - ExplicitHeight = 284 + ExplicitWidth = 769 + ExplicitHeight = 343 inherited ToolBar1: TToolBar - Width = 732 - ExplicitWidth = 732 + Width = 769 + ExplicitWidth = 769 inherited ToolButton4: TToolButton Wrap = False end @@ -262,51 +269,56 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 202 - ExplicitLeft = 202 + Left = 218 + ExplicitLeft = 218 end inherited ToolButton13: TToolButton - Left = 219 - ExplicitLeft = 219 + Left = 235 + ExplicitLeft = 235 end inherited ToolButton6: TToolButton - Left = 227 - ExplicitLeft = 227 + Left = 243 + ExplicitLeft = 243 end inherited ToolButton7: TToolButton - Left = 261 - ExplicitLeft = 261 + Left = 277 + ExplicitLeft = 277 end inherited ToolButton8: TToolButton - Left = 295 - ExplicitLeft = 295 + Left = 311 + ExplicitLeft = 311 end inherited ToolButton12: TToolButton - Left = 329 - ExplicitLeft = 329 + Left = 345 + ExplicitLeft = 345 end inherited ToolButton9: TToolButton - Left = 337 - ExplicitLeft = 337 + Left = 353 + ExplicitLeft = 353 end inherited ToolButton10: TToolButton - Left = 371 - ExplicitLeft = 371 + Left = 387 + ExplicitLeft = 387 end inherited ToolButton11: TToolButton - Left = 405 - ExplicitLeft = 405 + Left = 421 + ExplicitLeft = 421 end end inherited cxGrid: TcxGrid - Width = 732 - Height = 212 - ExplicitWidth = 732 - ExplicitHeight = 212 + Width = 769 + Height = 271 + ExplicitTop = 72 + ExplicitWidth = 769 + ExplicitHeight = 271 end inherited TBXDock1: TTBXDock - Width = 732 - ExplicitWidth = 732 + Width = 769 + ExplicitTop = 46 + ExplicitWidth = 769 + inherited TBXToolbar1: TTBXToolbar + ExplicitWidth = 487 + end end end end @@ -316,8 +328,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inline frViewContratosFacturaProveedor1: TfrViewContratosFacturaProveedor Left = 0 Top = 0 - Width = 732 - Height = 284 + Width = 769 + Height = 343 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -327,17 +339,17 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 732 - ExplicitHeight = 284 + ExplicitWidth = 769 + ExplicitHeight = 343 inherited cxGrid: TcxGrid - Width = 732 - Height = 259 - ExplicitWidth = 732 - ExplicitHeight = 259 + Width = 769 + Height = 318 + ExplicitWidth = 769 + ExplicitHeight = 318 end inherited ToolBar1: TToolBar - Width = 732 - ExplicitWidth = 732 + Width = 769 + ExplicitWidth = 769 end end end @@ -347,7 +359,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 Top = 0 - Width = 732 + Width = 769 Height = 69 Align = alTop Font.Charset = DEFAULT_CHARSET @@ -358,10 +370,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 732 + ExplicitWidth = 769 inherited dxLayoutControl1: TdxLayoutControl - Width = 732 - ExplicitWidth = 732 + Width = 769 + ExplicitWidth = 769 inherited cbSubCuentas: TcxComboBox Left = 92 Style.LookAndFeel.SkinName = '' @@ -373,12 +385,12 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 407 end inherited eContabilizar: TcxCheckBox - Left = 505 + Left = 531 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 505 + ExplicitLeft = 531 ExplicitWidth = 217 Width = 217 end @@ -393,9 +405,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 424 - Width = 746 - Height = 163 + Top = 504 + Width = 783 + Height = 190 Align = alBottom Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -405,25 +417,25 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 5 ReadOnly = False - ExplicitTop = 424 - ExplicitWidth = 746 - ExplicitHeight = 163 + ExplicitTop = 504 + ExplicitWidth = 783 + ExplicitHeight = 190 inherited dxLayoutControl1: TdxLayoutControl - Width = 746 - ExplicitWidth = 746 + Width = 783 + ExplicitWidth = 783 inherited Bevel3: TBevel - Left = 398 + Left = 381 Top = 30 Height = 122 - ExplicitLeft = 398 + ExplicitLeft = 381 ExplicitTop = 30 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 510 + Left = 493 Top = 57 Width = 186 - ExplicitLeft = 510 + ExplicitLeft = 493 ExplicitTop = 57 ExplicitWidth = 186 end @@ -439,28 +451,28 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 207 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 581 + Left = 564 Top = 77 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 581 + ExplicitLeft = 564 ExplicitTop = 77 ExplicitWidth = 143 Width = 143 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 511 - Top = 131 + Left = 494 + Top = 158 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 511 - ExplicitTop = 131 + ExplicitLeft = 494 + ExplicitTop = 158 ExplicitWidth = 213 Width = 213 end @@ -475,51 +487,53 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitTop = 57 end inherited edtIVA: TcxDBSpinEdit - Left = 510 + Left = 493 Top = 77 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 510 + ExplicitLeft = 493 ExplicitTop = 77 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 510 + Left = 493 Top = 30 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 510 + ExplicitLeft = 493 ExplicitTop = 30 ExplicitWidth = 214 Width = 214 end inherited edtRE: TcxDBSpinEdit - Left = 510 - Top = 104 + Left = 493 + Top = 131 + Enabled = False Properties.AssignedValues.MinValue = True Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 510 - ExplicitTop = 104 + ExplicitLeft = 493 + ExplicitTop = 131 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 581 - Top = 104 + Left = 564 + Top = 131 + Enabled = False Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 581 - ExplicitTop = 104 + ExplicitLeft = 564 + ExplicitTop = 131 ExplicitWidth = 143 Width = 143 end @@ -561,10 +575,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 140 end inherited bTiposIVA: TButton - Left = 250 + Left = 233 Top = 111 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 250 + ExplicitLeft = 233 ExplicitTop = 111 end inherited cbRecargoEquivalencia: TcxDBCheckBox @@ -577,6 +591,25 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 278 Width = 278 end + inherited edtIRPF: TcxDBSpinEdit + Left = 493 + Top = 104 + DataBinding.DataField = 'IRPF' + Enabled = True + Style.IsFontAssigned = True + ExplicitLeft = 493 + ExplicitTop = 104 + end + inherited ImporteIRPF: TcxDBCurrencyEdit + Left = 564 + Top = 104 + DataBinding.DataField = 'IMPORTE_IRPF' + Style.IsFontAssigned = True + ExplicitLeft = 564 + ExplicitTop = 104 + ExplicitWidth = 216 + Width = 216 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1 inherited dxLayoutControl1Group1: TdxLayoutGroup @@ -602,6 +635,12 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Visible = False end end + inherited dxLayoutControl1Group8: TdxLayoutGroup + inherited dxLayoutControl1Group13: TdxLayoutGroup + Enabled = True + Visible = True + end + end end end end @@ -609,10 +648,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited PnlComentario: TPanel [5] - Width = 746 - ExplicitWidth = 746 + Width = 783 + ExplicitTop = 78 + ExplicitWidth = 783 inherited lbComentario: TLabel - Width = 736 + Width = 773 Height = 25 end end diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas index 5b6a9f0d..7fd073ba 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas @@ -15,7 +15,7 @@ uses uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uViewDetallesFacturaProveedor, uViewFacturaProveedor, uDAInterfaces, cxControls, cxContainer, cxEdit, cxCheckBox, cxDBEdit, uViewListaSubCuentas, - uViewDetallesGenerico, uViewContratosFacturaProveedor; + uViewDetallesGenerico, uViewContratosFacturaProveedor, cxLabel; type diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm index 6874657b..5a183e63 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm @@ -2,8 +2,8 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor Caption = 'Lista de facturas de proveedor' ClientHeight = 666 ClientWidth = 640 - ExplicitWidth = 648 - ExplicitHeight = 700 + ExplicitWidth = 656 + ExplicitHeight = 704 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -60,7 +60,7 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor end inherited tbxFiltro: TTBXToolbar DockPos = -6 - ExplicitWidth = 431 + ExplicitWidth = 362 inherited lblAno: TTBXLabelItem Visible = True end @@ -75,10 +75,10 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor ExplicitWidth = 640 end inherited TBXTMain2: TTBXToolbar - Left = 431 + Left = 362 Visible = True - ExplicitLeft = 431 - ExplicitWidth = 83 + ExplicitLeft = 362 + ExplicitWidth = 87 object TBXItem40: TTBXItem Action = actInformes DisplayMode = nbdmImageAndText @@ -93,9 +93,9 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor end inline frViewFacturasProveedor1: TfrViewFacturasProveedor [3] Left = 0 - Top = 102 + Top = 105 Width = 640 - Height = 545 + Height = 542 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -105,14 +105,14 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor ParentFont = False TabOrder = 3 ReadOnly = False - ExplicitTop = 102 + ExplicitTop = 105 ExplicitWidth = 640 - ExplicitHeight = 545 + ExplicitHeight = 542 inherited cxGrid: TcxGrid Width = 640 - Height = 417 + Height = 414 ExplicitWidth = 640 - ExplicitHeight = 417 + ExplicitHeight = 414 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -138,6 +138,12 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor Kind = skSum Position = spFooter Column = frViewFacturasProveedor1.cxGridViewIMPORTE_RE + end + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Position = spFooter + Column = frViewFacturasProveedor1.cxGridViewIMPORTE_IRPF end> DataController.Summary.FooterSummaryItems = < item @@ -164,6 +170,11 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Column = frViewFacturasProveedor1.cxGridViewIMPORTE_RE + end + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Column = frViewFacturasProveedor1.cxGridViewIMPORTE_IRPF end> end end @@ -201,6 +212,16 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor ExplicitWidth = 263 Width = 263 end + inherited txtFiltroTodo2: TcxTextEdit + Left = 459 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 459 + ExplicitWidth = 250 + Width = 250 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 640 @@ -213,8 +234,8 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 519 - ExplicitTop = 519 + Top = 516 + ExplicitTop = 516 ExplicitWidth = 640 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 640 @@ -3412,39 +3433,40 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741 4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000 80E8000075300000EA6000003A98000017709CBA513C00000009704859730000 - 0AE900000AE901FD75CED3000003F049444154484BBD557B6C53651C3D7DAD7B - B0ADADC0363ADDA0834D2DDA6E5904A24C17E64864BAF8484C348E104940FD47 - 128D31121213134DD4C4F8644F794C6413188E81A003B3A15B8AC87C4CA39D9A - 685013515B36D8B3F7E7F9AEDCDAB9760F62BCC94D9ADEEF3BE7FCCE777EBFCF - 2422F8DF9ED781A56D0EFB730D56945D0EA9BE3F2F676F3D70DF36C01C15FF0A - 30AF333BB9E9E74ADF68E4A12A19A8F0851BADB869B6242F00292DD9AE6DBD2B - BD43273D4E79371D5A1DB05527B807B0BCE7C0FEC1EB20A3373A447B60B5688F - 544BF0567FA8113393D45970F3C9E265FD7D371448E77C93746442DB6945B322 - D5099ACCD8F8DBD5D0467C90E1EB21178A6D3276979F247748B0A2385C6FC5EA - 789550A1EBD02247DD57AB964DF4E4A7C9072E487B06B426139E55A2D51E9DE0 - 656051201B030A7C885584BC9073D740C2E55789B6799D0C54964CB1EB0D6065 - 4F81EBC76FFDD9F2E17CE8E0B465BCC18C4763C544CF603B5074C68D5FFFBC16 - C26AE49742C84F4B21677D193252532EC1B5A521E34C76D9CD0FF67B175CFCCC - 931A056F4BC3700370FFBF2B9D94D02660455F2E060DF01F3C90E062C8371E8B - FC5EE593606569B8353D69F7803F2B12C8B546C10F109CA9B92D9E8D535A6087 - 05EBFADC1835C0BFCE837C7125E44C2EC94A72E4F4E264F928CB2427AE80BCEF - 841C9C8771567F6FA2B4C5EDB15D366CF8D48D8928B81B722A07D29305E95E80 - 28383D8FD0F387A78B72C2266E4EC29304D5782E71C10F5D4ACB4C7D92904075 - E1DE64040254FE319577C5283F9209A1EF5A1DE34802D39C2BA0A7B6B7D3936A - BFBC65B966801FA7E7C7E8F96182D31AD99F06D9930CAD16786A4E04044F6D77 - BB0E9CDB52239F143A75E5F1C05B52206FD9216F5A75922DB33A6482671E5B92 - 73E2E2E335F25DA57F0A382DFB638F1DE70DF09D3648A305B2DD840936DEA669 - 634ACFAD47721D1D639BAA24B47EAD742D344D52DE9A82610A287B0D286C34A3 - 7B87F56FF05A1384E0C2293AC66F35091BAD25DDF6F460758936B1A1424E79D2 - A593AD7FD401E9C880EC4B458436AC3736B770CE10F431FE7741811BEF25128E - A17F1E3D4554527E7655FEB8DCE993EF4BDD93C0555AEA4D783E5EF954EC2568 - 2F5F2D8668E455A0CA58AF139C2E5AD82FD5CBE5FC9A0239CE716B2867970A3B - BB4BA52AD121D2DA24126D25C9704C2543DCB3263A4DBBF39DAD91DBBD12C84B - 9904DE6CC7A0BAA1666A26F59D80C524E88BA924AC26AE5E418305777F5EE414 - 5E3AC20E95362A6752D48DB47936E0C69A97003B053DA3CE82E0115A55A613A8 - 32391A7ADBD9400AFC9D5426C48CA3AA9BE74260ACA5652BF8BE18B548FDE0F5 - E662F40E2BE5CC77880B965C0EF8B4F7818A1F6D7982F1DBF85F801B15FC059E - 6028BEE22B69170000000049454E44AE426082} + 0AE900000AE901FD75CED30000040449444154484BB5957B6C53551CC7BF7DAD + 7BD0AD2D8F6D74BA413736B060BB65911165BA304702D3C54762A271844002EA + 3F90608C9190989868A226C6277B0A38918DC7700CE431301BBAA5080C6510EC + D444C32301B465833D7B7FFECEEDE96537ED3209F19B9CA4F79EDFEFF33DE7D7 + DF391744F4BF0E9D3E07F25AEDD6F7EACD2895AFEE496A7E76E6AE3AE0C52D80 + 5133F80498D69191D878A5C23B127EA592FACBBDA106331E8BCC4EAD0F80A4E6 + 0CE7969E12CFE049B783BEB541A90536AB06CF03A6EFECD83BB00834F2A89D94 + 979792F25A15059EF4051B30B549AD098F9F2C9CD7D7FB482E75CC30507B1A94 + ED66340953D5A0D188B5D7E74319F682861E06DD2EB4D0E8B33E36799A02E585 + A13A33964A964EBC42E781D9F6DA0B4BE68D77E7A4D03127A82D154AA301EF8A + 458B18D5E06360B63F03FD023EC8BB087A4037168042650F92B27E25F55714C5 + 94EB0BA0A43BD7F9E7AFBE0CFA7E0654389765ACDE880D324495F61F6C050ACE + BA70ED9F8740BC1BBA9A0FFA2B0F74D99B4AC3D56514585E1C8C9AECB01AD7F4 + 7966DE39E74ED6E0AD2918AA075E526113A4190835028B7BB3301085FFE10605 + E6802EB94D74B3D24B818AE2508B2DE1AB7E5F7AD89F65D6E0FB18CE5DB34262 + 74D219086D336165AF0B2351F8C56CD02F0F80CE66F17351269D9E93483FA41B + E8C474D0510768FF348CF1EE5F90E9318A3110DA61C1EA332E8C6B7017E85426 + A83B1DD435131A9C6B1EE69ABF2AD3E22AAE81505302DE64A83219FC80EC1619 + 3EA9263510A7705722FC7E86FFC8F0CE09F043696ADD95DA88812192115F710D + B8A6966F6C0935E79F58A844E1C7197E84E10719CEA5A1BD29A09D89506A80B7 + 645A5CC518303CB9CDE5DC77636335FD94EF9814DE9C04FADA0AFAD2AC9A6C94 + E931D219303CEDC8DCCC13775EAFA6DF2A7C31702ED9DF3BADB815856FB7801A + 4CA0AD068CF3C15B27313A69065C73F3A12C7BFBE8BA4A0AAE5A4E9DB30C3A78 + 4B12867801A59F01F90D46746D3347E0350610C3896FD1519EAB8ED0EE4A3368 + B659DE1EA82A52C65797D329B78D3AF8001DB683DA53417B9211E632AC8A4472 + 2CDF330CDDC4EF6E0B78744813BE86EE4A35E095945D5E923346CF78E9F76297 + 0E2EBAA5CE80F765BC4E0CF330B4878732C168F853A05286440C4E17CCEAA3AA + 85746B592E1DE7EB360AE7534A7CB23B4557C9F818716913D868339B0C4DD8C9 + 20E72C13F3AA41578EA325FC9487FCD9493A789315031C9CA792A610030B19DE + 1B35E111E251A21AD49BF0DCCF050EE28F8E38A1D4CA70EE14F1455A2FF3FF93 + 3E02ACBCA077788C323CCCA52A550DC436F96AE869E31E17F0DDC9DC21461C16 + A759E6DE93B8648B797C287EAB0642FC797372EB1D142BE7FE0E72C0DCC8CCFD + 49331012EDC7657983DB6FAD7C75DF2222FC0B51266D78E692E7220000000049 + 454E44AE426082} Instruction.Text = 'Las siguientes facturas no han podido ser eliminadas:' Instruction.Glyph.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00 diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm index e5d9c80d..f4a3956d 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor - Width = 1227 - Height = 559 + Width = 952 + Height = 446 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,8 +9,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 1227 - Height = 559 + Width = 952 + Height = 446 Align = alClient ParentBackground = True TabOrder = 0 @@ -20,8 +20,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 1227 - 559) + 952 + 446) object eReferencia: TcxDBTextEdit Left = 124 Top = 30 @@ -97,7 +97,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 169 end object bFormasPago: TButton - Left = 733 + Left = 458 Top = 135 Width = 132 Height = 23 @@ -173,7 +173,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 158 end inline frViewProveedorFactura1: TfrViewProveedorFactura - Left = 893 + Left = 618 Top = 30 Width = 312 Height = 265 @@ -186,7 +186,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ParentFont = False TabOrder = 7 ReadOnly = False - ExplicitLeft = 893 + ExplicitLeft = 618 ExplicitTop = 30 ExplicitWidth = 312 ExplicitHeight = 265 @@ -195,6 +195,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Height = 265 Align = alClient ExplicitWidth = 312 + ExplicitHeight = 265 inherited Bevel1: TBevel Width = 242 ExplicitWidth = 242 @@ -320,6 +321,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor end object dxLayoutControl1Group4: TdxLayoutGroup Caption = 'La factura pertenece a la tienda' + Visible = False object dxLayoutControl1Item7: TdxLayoutItem Control = frViewTienda1 ControlOptions.AutoColor = True diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm index b6b5b7bc..8aa125c2 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm @@ -31,6 +31,12 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Kind = skSum Position = spFooter Column = cxGridViewBASE_IMPONIBLE + end + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Position = spFooter + Column = cxGridViewIMPORTE_IRPF end> DataController.Summary.FooterSummaryItems = < item @@ -52,6 +58,11 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Column = cxGridViewBASE_IMPONIBLE + end + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Column = cxGridViewIMPORTE_IRPF end> OptionsCustomize.ColumnHidingOnGrouping = False OptionsView.GroupFooters = gfAlwaysVisible @@ -74,6 +85,8 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' @@ -182,6 +195,22 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor HeaderAlignmentHorz = taRightJustify Width = 98 end + object cxGridViewIRPF: TcxGridDBColumn + DataBinding.FieldName = 'IRPF' + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMPORTE_IRPF: TcxGridDBColumn + Caption = 'Importe IRPF' + DataBinding.FieldName = 'IMPORTE_IRPF' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + GroupSummaryAlignment = taRightJustify + HeaderAlignmentHorz = taRightJustify + end end inherited cxGridLevel: TcxGridLevel Caption = 'Todas' @@ -311,6 +340,8 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas index 969375d5..f99b806e 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas @@ -67,6 +67,8 @@ type actTienda: TAction; TBXSeparatorItem4: TTBXSeparatorItem; TBXItem5: TTBXItem; + cxGridViewIRPF: TcxGridDBColumn; + cxGridViewIMPORTE_IRPF: TcxGridDBColumn; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas index 89d7860d..8e37663e 100644 --- a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas +++ b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas @@ -9,9 +9,9 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosPedidos = '{0471E5EB-E097-47EE-85CB-A9B0D3EFBA02}'; - RID_PedidosProveedor = '{3D092D23-1AEF-4D2D-B140-B1557750224A}'; - RID_PedidosProveedor_Detalles = '{B9DD8E3F-27D7-4831-AFF2-9649931F1731}'; + RID_ListaAnosPedidos = '{05136CAF-C958-42DE-A3C3-B87CF4C8D030}'; + RID_PedidosProveedor = '{3C2E67AB-ACBF-4B23-A920-618AE28D1AD7}'; + RID_PedidosProveedor_Detalles = '{AC18795B-0194-440A-B37A-9619D725D8B1}'; { Data table names } nme_ListaAnosPedidos = 'ListaAnosPedidos'; @@ -159,7 +159,7 @@ const type { IListaAnosPedidos } IListaAnosPedidos = interface(IDAStronglyTypedDataTable) - ['{630E20EB-7A1B-4D94-A37F-FC3D7E2B2F94}'] + ['{05D90311-61C0-4319-9BB7-85B2482E2E94}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -194,7 +194,7 @@ type { IPedidosProveedor } IPedidosProveedor = interface(IDAStronglyTypedDataTable) - ['{A6855621-219A-4EDE-8021-69F65DE1ED37}'] + ['{9E6FD469-719D-4996-8DCA-6C31223CD7EA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -793,7 +793,7 @@ type { IPedidosProveedor_Detalles } IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable) - ['{40CDF59D-E1C3-4DE3-A623-C9E9378BE6EB}'] + ['{8D8CCB76-B027-459A-8831-0DB42C190E1B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas index 6b36ff51..f73b3953 100644 --- a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas +++ b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas @@ -9,14 +9,14 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosPedidosDelta = '{4CF5B425-E5E1-4A34-B09B-2C2C56FB6743}'; - RID_PedidosProveedorDelta = '{C3FCC424-2B70-439A-BC7B-C55B3AE767A5}'; - RID_PedidosProveedor_DetallesDelta = '{DEAC45DE-E6E4-45DD-BCE2-68B14A0D19E4}'; + RID_ListaAnosPedidosDelta = '{A3E7B26F-F069-41B8-9344-C1B94E5D8836}'; + RID_PedidosProveedorDelta = '{001721AA-4EE4-4271-80D6-9BA0B8BDEA47}'; + RID_PedidosProveedor_DetallesDelta = '{FBC5E82A-F857-4558-A136-CD0AB68E7A8C}'; type { IListaAnosPedidosDelta } IListaAnosPedidosDelta = interface(IListaAnosPedidos) - ['{4CF5B425-E5E1-4A34-B09B-2C2C56FB6743}'] + ['{A3E7B26F-F069-41B8-9344-C1B94E5D8836}'] { Property getters and setters } function GetOldANOValue : String; @@ -50,7 +50,7 @@ type { IPedidosProveedorDelta } IPedidosProveedorDelta = interface(IPedidosProveedor) - ['{C3FCC424-2B70-439A-BC7B-C55B3AE767A5}'] + ['{001721AA-4EE4-4271-80D6-9BA0B8BDEA47}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -650,7 +650,7 @@ type { IPedidosProveedor_DetallesDelta } IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles) - ['{DEAC45DE-E6E4-45DD-BCE2-68B14A0D19E4}'] + ['{FBC5E82A-F857-4558-A136-CD0AB68E7A8C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PEDIDOValue : Integer; diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm index 5fd63a4b..0e0b2267 100644 --- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm +++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm @@ -350,11 +350,10 @@ object RptPedidosProveedor: TRptPedidosProveedor 'ES.CONCEPTO as CONCEPTO_RTF, F_RTFTOTEXT(CONCEPTO) AS CONCEPTO, ' + 'PEDIDOS_PROVEEDOR_DETALLES.CANTIDAD,'#10' PEDIDOS_PROVEEDOR_DE' + 'TALLES.IMPORTE_UNIDAD, PEDIDOS_PROVEEDOR_DETALLES.IMPORTE_TOTAL,' + - #10' ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFER' + - 'ENCIA_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM PEDIDOS_PROVEEDOR_DETAL' + - 'LES'#10'LEFT JOIN ARTICULOS ON (PEDIDOS_PROVEEDOR_DETALLES.ID_ARTICU' + - 'LO = ARTICULOS.ID)'#10'WHERE ID_PEDIDO = :ID_PEDIDO'#10'ORDER BY POSICIO' + - 'N'#10 + #10' ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, PEDIDOS_PROVEED' + + 'OR_DETALLES.REFERENCIA_PROVEEDOR'#10#10'FROM PEDIDOS_PROVEEDOR_DETALLE' + + 'S'#10'LEFT JOIN ARTICULOS ON (PEDIDOS_PROVEEDOR_DETALLES.ID_ARTICULO' + + ' = ARTICULOS.ID)'#10'WHERE ID_PEDIDO = :ID_PEDIDO'#10'ORDER BY POSICION'#10 StatementType = stSQL ColumnMappings = < item @@ -518,6 +517,7 @@ object RptPedidosProveedor: TRptPedidosProveedor UseFileCache = True ShowProgress = False OverwritePrompt = False + EmbeddedFonts = True PrintOptimized = True Outline = False Background = False diff --git a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm index 9f0f3138..091f09fd 100644 --- a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm +++ b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm @@ -517,10 +517,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor 'E_TOTAL,'#10' PEDIDOS_PROVEEDOR_DETALLES.VISIBLE,'#10#10' PEDIDOS_PR' + 'OVEEDOR_DETALLES.ID_ARTICULO, PEDIDOS_PROVEEDOR_DETALLES.DESCUEN' + 'TO,'#10' PEDIDOS_PROVEEDOR_DETALLES.IMPORTE_PORTE,'#10#10' ARTICULOS' + - '.REFERENCIA, ARTICULOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR'#10#10 + - 'FROM PEDIDOS_PROVEEDOR_DETALLES'#10'LEFT JOIN ARTICULOS ON PEDIDOS_P' + - 'ROVEEDOR_DETALLES.ID_ARTICULO = ARTICULOS.ID'#10'WHERE {where}'#10'ORDER' + - ' BY POSICION;'#10 + '.REFERENCIA, PEDIDOS_PROVEEDOR_DETALLES.REFERENCIA_PROVEEDOR'#10#10'FR' + + 'OM PEDIDOS_PROVEEDOR_DETALLES'#10'LEFT JOIN ARTICULOS ON PEDIDOS_PRO' + + 'VEEDOR_DETALLES.ID_ARTICULO = ARTICULOS.ID'#10'WHERE {where}'#10'ORDER B' + + 'Y POSICION;'#10 StatementType = stSQL ColumnMappings = < item @@ -730,6 +730,12 @@ object srvPedidosProveedor: TsrvPedidosProveedor Name = 'IMPORTE_PORTE' DataType = datCurrency Value = '' + end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + Value = '' end> Statements = < item @@ -739,9 +745,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor 'INSERT'#10' INTO PEDIDOS_PROVEEDOR_DETALLES'#10' (ID, ID_PEDIDO, CAN' + 'TIDAD, POSICION, TIPO_DETALLE, CONCEPTO, IMPORTE_UNIDAD,'#10' IM' + 'PORTE_TOTAL, VISIBLE,'#10' ID_ARTICULO, DESCUENTO, IMPORTE_PORTE' + - ')'#10' VALUES'#10' (:ID, :ID_PEDIDO, :CANTIDAD, :POSICION, :TIPO_DET' + - 'ALLE, :CONCEPTO,'#10' :IMPORTE_UNIDAD, :IMPORTE_TOTAL, :VISIBLE,' + - #10' :ID_ARTICULO, :DESCUENTO, :IMPORTE_PORTE)'#10 + ', REFERENCIA_PROVEEDOR)'#10' VALUES'#10' (:ID, :ID_PEDIDO, :CANTIDAD' + + ', :POSICION, :TIPO_DETALLE, :CONCEPTO,'#10' :IMPORTE_UNIDAD, :IM' + + 'PORTE_TOTAL, :VISIBLE,'#10' :ID_ARTICULO, :DESCUENTO, :IMPORTE_P' + + 'ORTE, :REFERENCIA_PROVEEDOR)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -824,6 +831,12 @@ object srvPedidosProveedor: TsrvPedidosProveedor DataType = datCurrency Value = '' end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + Value = '' + end item Name = 'OLD_ID' Value = '' @@ -838,8 +851,9 @@ object srvPedidosProveedor: TsrvPedidosProveedor #10' CONCEPTO = :CONCEPTO, '#10' IMPORTE_UNIDAD = :IMPORTE_UNIDAD' + ', '#10' IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10' VISIBLE = :VISIBLE, ' + #10' ID_PEDIDO = :ID_PEDIDO, '#10' ID_ARTICULO = :ID_ARTICULO,'#10' ' + - ' DESCUENTO = :DESCUENTO,'#10' IMPORTE_PORTE = :IMPORTE_PORTE'#10' W' + - 'HERE'#10' (ID = :OLD_ID)'#10 + ' DESCUENTO = :DESCUENTO,'#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' ' + + ' REFERENCIA_PROVEEDOR = :REFERENCIA_PROVEEDOR'#10' WHERE'#10' (ID =' + + ' :OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm index 4ef8b64b..c89b406e 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm @@ -2,19 +2,19 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Left = 332 Top = 147 Caption = 'Nuevo pedido a proveedor' - ClientHeight = 668 - ClientWidth = 922 + ClientHeight = 801 + ClientWidth = 1027 OnClose = CustomEditorClose - ExplicitWidth = 938 - ExplicitHeight = 706 + ExplicitWidth = 1043 + ExplicitHeight = 839 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 922 + Width = 1027 Caption = 'Nuevo pedido a proveedor' - ExplicitWidth = 922 + ExplicitWidth = 1027 inherited Image1: TImage - Left = 895 + Left = 1000 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -42,15 +42,15 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitLeft = 735 end inherited lblDesbloquear: TcxLabel - Left = 797 - ExplicitLeft = 797 - AnchorX = 842 + Left = 902 + ExplicitLeft = 902 + AnchorX = 947 AnchorY = 14 end end inherited TBXDock: TTBXDock - Width = 922 - ExplicitWidth = 922 + Width = 1027 + ExplicitWidth = 1027 inherited tbxMain: TTBXToolbar ExplicitWidth = 518 inherited TBXItem2: TTBXItem @@ -64,38 +64,37 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 922 + ExplicitWidth = 1027 end end inherited StatusBar: TJvStatusBar - Top = 649 - Width = 922 + Top = 782 + Width = 1027 Panels = < item Width = 200 end> - ExplicitTop = 649 - ExplicitWidth = 922 + ExplicitTop = 782 + ExplicitWidth = 1027 end inherited pgPaginas: TPageControl - Width = 916 - Height = 489 - ActivePage = pagContenido + Width = 1021 + Height = 622 TabOrder = 1 OnChanging = pgPaginasChanging ExplicitTop = 111 - ExplicitWidth = 916 - ExplicitHeight = 489 + ExplicitWidth = 1021 + ExplicitHeight = 622 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 908 - ExplicitHeight = 461 + ExplicitWidth = 1013 + ExplicitHeight = 594 inline frViewPedidoProveedor1: TfrViewPedidoProveedor Left = 0 Top = 0 - Width = 908 - Height = 461 + Width = 1013 + Height = 594 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -105,17 +104,17 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 908 - ExplicitHeight = 461 + ExplicitWidth = 1013 + ExplicitHeight = 594 inherited dxLayoutControl1: TdxLayoutControl - Width = 908 - Height = 461 - ExplicitWidth = 908 - ExplicitHeight = 461 + Width = 1013 + Height = 594 + ExplicitWidth = 1013 + ExplicitHeight = 594 inherited frViewProveedorPedido: TfrViewDatosYSeleccionProveedor - Left = 551 + Left = 625 Width = 350 - ExplicitLeft = 551 + ExplicitLeft = 625 ExplicitWidth = 350 inherited dxLayoutControl1: TdxLayoutControl Width = 350 @@ -140,12 +139,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 283 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 237 - ExplicitLeft = 237 + Left = 285 + ExplicitLeft = 285 end inherited Button3: TBitBtn - Left = 110 - ExplicitLeft = 110 + Left = 158 + ExplicitLeft = 158 end end end @@ -186,8 +185,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 238 end inherited bModificar: TBitBtn - Left = 342 - ExplicitLeft = 342 + Left = 366 + ExplicitLeft = 366 end inherited txtDireccion: TStaticText Width = 238 @@ -214,8 +213,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 183 end inherited eNumBultos: TcxDBSpinEdit - Left = 401 - ExplicitLeft = 401 + Left = 425 + ExplicitLeft = 425 end end end @@ -224,8 +223,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 20 end inherited bFormasPago: TButton - Left = 389 - ExplicitLeft = 389 + Left = 463 + ExplicitLeft = 463 end inherited edtFechaEnvio: TcxDBDateEdit ExplicitWidth = 158 @@ -236,14 +235,14 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 20 end inherited Button1: TButton - Left = 421 - ExplicitLeft = 421 + Left = 495 + ExplicitLeft = 495 end inherited frViewTienda1: TfrViewTienda - Left = 551 + Left = 625 Width = 357 Enabled = True - ExplicitLeft = 551 + ExplicitLeft = 625 ExplicitWidth = 357 inherited dxLayoutControl1: TdxLayoutControl Width = 357 @@ -274,8 +273,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 250 end inherited Button2: TButton - Left = 315 - ExplicitLeft = 315 + Left = 389 + ExplicitLeft = 389 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup @@ -293,8 +292,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor Left = 0 Top = 0 - Width = 908 - Height = 461 + Width = 1013 + Height = 594 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -306,12 +305,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 908 - ExplicitHeight = 461 + ExplicitWidth = 1013 + ExplicitHeight = 594 inherited ToolBar1: TToolBar - Width = 908 + Width = 1013 Height = 24 - ExplicitWidth = 908 + ExplicitWidth = 1013 ExplicitHeight = 24 inherited ToolButton4: TToolButton Wrap = False @@ -391,8 +390,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end inherited cxGrid: TcxGrid Top = 50 - Width = 908 - Height = 411 + Width = 1013 + Height = 544 ExplicitTop = 50 ExplicitWidth = 908 ExplicitHeight = 411 @@ -404,7 +403,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end inherited TBXDock1: TTBXDock Top = 24 - Width = 908 + Width = 1013 ExplicitTop = 24 ExplicitWidth = 908 inherited TBXToolbar1: TTBXToolbar @@ -419,8 +418,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor inline frViewIncidenciasProv: TfrViewIncidencias Left = 0 Top = 0 - Width = 908 - Height = 461 + Width = 1013 + Height = 594 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -430,20 +429,25 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 908 + ExplicitWidth = 1013 + ExplicitHeight = 594 inherited pnlSup: TPanel - Width = 908 - ExplicitWidth = 908 + Width = 1013 + ExplicitWidth = 1013 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end end inherited GroupBox1: TGroupBox - Width = 908 - ExplicitWidth = 908 + Width = 1013 + Height = 566 + ExplicitWidth = 1013 + ExplicitHeight = 566 inherited eIncidencias: TcxDBMemo - ExplicitWidth = 904 - Width = 904 + ExplicitWidth = 1009 + ExplicitHeight = 549 + Height = 549 + Width = 1009 end end end @@ -455,8 +459,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor inline frViewDocumentosPedidoProveedor1: TfrViewDocumentosPedidoProveedor Left = 0 Top = 0 - Width = 908 - Height = 461 + Width = 1013 + Height = 594 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -466,26 +470,26 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 908 - ExplicitHeight = 461 + ExplicitWidth = 1013 + ExplicitHeight = 594 inherited TBXDock: TTBXDock - Width = 908 - ExplicitWidth = 908 + Width = 1013 + ExplicitWidth = 1013 end inherited ListView1: TListView - Width = 908 - Height = 436 - ExplicitTop = 29 - ExplicitWidth = 908 - ExplicitHeight = 425 + Width = 1013 + Height = 569 + ExplicitTop = 25 + ExplicitWidth = 1013 + ExplicitHeight = 569 end end end end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 603 - Width = 922 + Top = 736 + Width = 1027 Height = 46 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -496,26 +500,26 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ParentFont = False TabOrder = 5 ReadOnly = False - ExplicitTop = 603 - ExplicitWidth = 922 + ExplicitTop = 736 + ExplicitWidth = 1027 ExplicitHeight = 46 inherited dxLayoutControl1: TdxLayoutControl - Width = 922 + Width = 1027 LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 922 + ExplicitWidth = 1027 inherited Bevel3: TBevel - Left = 453 + Left = 451 Top = 11 Height = 30 - ExplicitLeft = 453 + ExplicitLeft = 451 ExplicitTop = 11 ExplicitHeight = 30 end inherited Bevel4: TBevel - Left = 565 + Left = 563 Top = 53 Width = 21 - ExplicitLeft = 565 + ExplicitLeft = 563 ExplicitTop = 53 ExplicitWidth = 21 end @@ -529,20 +533,20 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 636 + Left = 634 Top = 88 Style.IsFontAssigned = True - ExplicitLeft = 636 + ExplicitLeft = 634 ExplicitTop = 88 ExplicitWidth = 137 Width = 137 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 566 - Top = 142 + Left = 564 + Top = 169 Style.IsFontAssigned = True - ExplicitLeft = 566 - ExplicitTop = 142 + ExplicitLeft = 564 + ExplicitTop = 169 ExplicitWidth = 137 Width = 137 end @@ -554,38 +558,38 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitTop = 38 end inherited edtIVA: TcxDBSpinEdit - Left = 565 + Left = 563 Top = 88 Style.IsFontAssigned = True - ExplicitLeft = 565 + ExplicitLeft = 563 ExplicitTop = 88 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 565 + Left = 563 Top = 11 Style.IsFontAssigned = True - ExplicitLeft = 565 + ExplicitLeft = 563 ExplicitTop = 11 ExplicitWidth = 92 Width = 92 end inherited edtRE: TcxDBSpinEdit - Left = 565 - Top = 115 + Left = 563 + Top = 142 DataBinding.DataField = '' DataBinding.DataSource = nil Style.IsFontAssigned = True - ExplicitLeft = 565 - ExplicitTop = 115 + ExplicitLeft = 563 + ExplicitTop = 142 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 636 - Top = 115 + Left = 634 + Top = 142 DataBinding.DataField = '' DataBinding.DataSource = nil Style.IsFontAssigned = True - ExplicitLeft = 636 - ExplicitTop = 115 + ExplicitLeft = 634 + ExplicitTop = 142 ExplicitWidth = 56 Width = 56 end @@ -619,9 +623,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 81 end inherited bTiposIVA: TButton - Left = 305 + Left = 303 Top = 92 - ExplicitLeft = 305 + ExplicitLeft = 303 ExplicitTop = 92 end inherited cbRecargoEquivalencia: TcxDBCheckBox @@ -633,6 +637,23 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitWidth = 219 Width = 219 end + inherited edtIRPF: TcxDBSpinEdit + Left = 563 + Top = 115 + Style.IsFontAssigned = True + ExplicitLeft = 563 + ExplicitTop = 115 + end + inherited ImporteIRPF: TcxDBCurrencyEdit + Left = 634 + Top = 115 + DataBinding.DataSource = nil + Style.IsFontAssigned = True + ExplicitLeft = 634 + ExplicitTop = 115 + ExplicitWidth = 216 + Width = 216 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup ShowCaption = False @@ -677,11 +698,11 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end end inherited PnlComentario: TPanel [5] - Width = 922 + Width = 1027 ExplicitTop = 78 - ExplicitWidth = 922 + ExplicitWidth = 1027 inherited lbComentario: TLabel - Width = 912 + Width = 1017 Height = 25 end end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas index e0785771..c36f10b3 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas @@ -220,10 +220,10 @@ procedure TfEditorPedidoProveedor.OnProveedorChanged(Sender: TObject); begin FPedido.Proveedor := ViewPedido.ViewProveedorPedido.Proveedor; - if (ShowConfirmMessage('Atención tienda asignada', '¿Desea actualizar la tienda a la pertenece el pedido en base a la tienda a la que pertenece el proveedor seleccionado?') = IDYES) then - FController.AsignarTienda(FPedido, FPedido.Proveedor.ID_TIENDA); +// if (ShowConfirmMessage('Atención tienda asignada', '¿Desea actualizar la tienda a la pertenece el pedido en base a la tienda a la que pertenece el proveedor seleccionado?') = IDYES) then +// FController.AsignarTienda(FPedido, FPedido.Proveedor.ID_TIENDA); - frViewPedidoProveedor1.frViewTienda1.ElegirTienda(FPedido.ID_TIENDA); +// frViewPedidoProveedor1.frViewTienda1.ElegirTienda(FPedido.ID_TIENDA); // Si el pedido tiene detalles hay que mirar si los descuentos y otros campos // para los artículos hay que cambiarlos. diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm index 39a34aba..a01a1f8b 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm @@ -620,6 +620,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor object dxLayoutControl1Group11: TdxLayoutGroup Caption = 'El pedido pertenece a la tienda' Enabled = False + Visible = False object dxLayoutControl1Item13: TdxLayoutItem Control = frViewTienda1 ControlOptions.AutoColor = True diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index c2423c1f..c72a6581 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -64,6 +64,8 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn Caption = 'Referencia' @@ -310,6 +312,8 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas index 221a14b6..74dd2d5a 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas @@ -217,7 +217,7 @@ procedure TfrViewPedidosProveedor.ConfigView; begin inherited; //FILTRO DE EMPRESAS - if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then +{ if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then begin cxGridViewTIENDA.Visible := True; cxGridViewTIENDA.VisibleForCustomization := True; @@ -229,6 +229,7 @@ begin cxGridViewTIENDA.VisibleForCustomization := False; actTienda.Visible := False; end; +} end; procedure TfrViewPedidosProveedor.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); diff --git a/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas b/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas index 94e430d1..46a8f417 100644 --- a/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas +++ b/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas @@ -242,6 +242,7 @@ end; procedure TDetallesPresupuestoClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); begin ADetalles.DataTable.FieldByName('PROPIEDAD').AsString := AArticulos.FAMILIA; + ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesREFERENCIA_PROVEEDOR).AsString := AArticulos.REFERENCIA_PROV; //En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP // if Assigned(AArticulos) then // ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO diff --git a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm index bc9fb958..2b26f5a8 100644 --- a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm @@ -424,6 +424,7 @@ inherited DataModulePresupuestosCliente: TDataModulePresupuestosCliente item Name = 'REFERENCIA_PROVEEDOR' DataType = datString + Size = 255 end> Params = <> MasterMappingMode = mmWhere diff --git a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas index ba349bad..b523ceb2 100644 --- a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas +++ b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas @@ -9,12 +9,12 @@ 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_Valores = '{A50539DF-0F94-4F50-B306-92F2530E0DF5}'; - RID_Propiedades = '{FC2876CF-73B5-4DBD-A896-9B5580E1182C}'; - RID_ListaAnosPresupuestos = '{3480D852-9D3D-450B-8857-745532FCAF51}'; - RID_PresupuestosCliente = '{2C9BBE6F-490F-45DE-942A-9A01CEE80892}'; - RID_CapitulosPresupuesto = '{45D87B74-D253-409A-860C-40D216298F14}'; - RID_PresupuestosCliente_Detalles = '{D5FCA165-32A0-46FB-B9D0-3B1A4A76E5C8}'; + RID_Valores = '{B1489CF0-8865-4C50-9C44-8B936FF38323}'; + RID_Propiedades = '{10D85CC5-B94D-4833-A2B4-891567416B0E}'; + RID_ListaAnosPresupuestos = '{B948BFFD-00B0-4503-8789-2154BCB1E5D4}'; + RID_PresupuestosCliente = '{008E4148-775E-4D39-9C02-E3A6654C1A60}'; + RID_CapitulosPresupuesto = '{AB5280C0-4995-40CE-9EF8-E69EA90BDB8C}'; + RID_PresupuestosCliente_Detalles = '{AD3F4C80-AE81-409F-B1D6-5EDECB09F5A9}'; { Data table names } nme_Valores = 'Valores'; @@ -225,7 +225,7 @@ const type { IValores } IValores = interface(IDAStronglyTypedDataTable) - ['{6BA9F35E-B31F-42DD-B267-3A6068D97775}'] + ['{EE7C8A09-275A-4DB7-964E-D74D9B769FFE}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -332,7 +332,7 @@ type { IPropiedades } IPropiedades = interface(IDAStronglyTypedDataTable) - ['{BD401EFD-6694-4728-9B85-36D9ED3B72F8}'] + ['{710C4267-06FC-4558-BD11-AF526BBFA421}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -379,7 +379,7 @@ type { IListaAnosPresupuestos } IListaAnosPresupuestos = interface(IDAStronglyTypedDataTable) - ['{187A3EC4-6046-4860-AC38-B25237C36E2D}'] + ['{3DB06FB1-5131-4036-B2B4-A13DD30FED72}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -414,7 +414,7 @@ type { IPresupuestosCliente } IPresupuestosCliente = interface(IDAStronglyTypedDataTable) - ['{9F13C2C0-4480-4495-A41E-0ED3CD8509F4}'] + ['{B0966BC7-7501-47DA-8AE1-039C0963B7E8}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1001,7 +1001,7 @@ type { ICapitulosPresupuesto } ICapitulosPresupuesto = interface(IDAStronglyTypedDataTable) - ['{254BD61D-0CAA-4514-8E0E-AB64926E6DA5}'] + ['{78AEE822-A9A1-4AFA-8B3D-DEA3858EC243}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1156,7 +1156,7 @@ type { IPresupuestosCliente_Detalles } IPresupuestosCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{B99888D1-1407-4023-A400-F1B41ACF9A84}'] + ['{1BAC4F11-6DFA-49B0-BD87-59A320A9FACB}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas index 577c4053..beecaffc 100644 --- a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas +++ b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas @@ -9,17 +9,17 @@ 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_ValoresDelta = '{7948E371-CD64-4D0C-9E9C-401A8DC37243}'; - RID_PropiedadesDelta = '{F3EE64C0-99BF-49EC-BA9B-38B7607C525F}'; - RID_ListaAnosPresupuestosDelta = '{F67788DA-A062-498E-9176-93D02C9684CA}'; - RID_PresupuestosClienteDelta = '{ED33D82E-0CB2-44D7-8204-9B22F70C9ABC}'; - RID_CapitulosPresupuestoDelta = '{E97D0DFC-1517-475A-AADC-4CE3C091C7A3}'; - RID_PresupuestosCliente_DetallesDelta = '{3BA09AF3-28D1-4918-9F7F-B6324CE29BEF}'; + RID_ValoresDelta = '{8C71911B-A708-477A-B3AC-3E61E5BB89B3}'; + RID_PropiedadesDelta = '{0F355A22-B6D2-4836-97DD-4F05F7A32B12}'; + RID_ListaAnosPresupuestosDelta = '{97E80223-89C3-4827-90E1-EDE2627EAEA5}'; + RID_PresupuestosClienteDelta = '{B564288F-5956-4898-AC1D-C6B31E08903F}'; + RID_CapitulosPresupuestoDelta = '{A9BCE1AE-A9A8-4257-AF96-36F5E4E918B7}'; + RID_PresupuestosCliente_DetallesDelta = '{D8481FEF-3F0E-4ECB-A0D6-6075AEF9D05A}'; type { IValoresDelta } IValoresDelta = interface(IValores) - ['{7948E371-CD64-4D0C-9E9C-401A8DC37243}'] + ['{8C71911B-A708-477A-B3AC-3E61E5BB89B3}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -125,7 +125,7 @@ type { IPropiedadesDelta } IPropiedadesDelta = interface(IPropiedades) - ['{F3EE64C0-99BF-49EC-BA9B-38B7607C525F}'] + ['{0F355A22-B6D2-4836-97DD-4F05F7A32B12}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -171,7 +171,7 @@ type { IListaAnosPresupuestosDelta } IListaAnosPresupuestosDelta = interface(IListaAnosPresupuestos) - ['{F67788DA-A062-498E-9176-93D02C9684CA}'] + ['{97E80223-89C3-4827-90E1-EDE2627EAEA5}'] { Property getters and setters } function GetOldANOValue : String; @@ -205,7 +205,7 @@ type { IPresupuestosClienteDelta } IPresupuestosClienteDelta = interface(IPresupuestosCliente) - ['{ED33D82E-0CB2-44D7-8204-9B22F70C9ABC}'] + ['{B564288F-5956-4898-AC1D-C6B31E08903F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -796,7 +796,7 @@ type { ICapitulosPresupuestoDelta } ICapitulosPresupuestoDelta = interface(ICapitulosPresupuesto) - ['{E97D0DFC-1517-475A-AADC-4CE3C091C7A3}'] + ['{A9BCE1AE-A9A8-4257-AF96-36F5E4E918B7}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldPOSICIONValue : Integer; @@ -950,7 +950,7 @@ type { IPresupuestosCliente_DetallesDelta } IPresupuestosCliente_DetallesDelta = interface(IPresupuestosCliente_Detalles) - ['{3BA09AF3-28D1-4918-9F7F-B6324CE29BEF}'] + ['{D8481FEF-3F0E-4ECB-A0D6-6075AEF9D05A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PRESUPUESTOValue : Integer; diff --git a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm index ed10e335..5fd80172 100644 --- a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm +++ b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm @@ -762,11 +762,12 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente ' PRESUPUESTOS_CLIENTE_DETALLES.INCREMENTO,'#10' PRESUPUESTOS_CL' + 'IENTE_DETALLES.DECREMENTO,'#10' PRESUPUESTOS_CLIENTE_DETALLES.DES' + 'CUENTO,'#10' PRESUPUESTOS_CLIENTE_DETALLES.IMPORTE_PORTE, ARTICUL' + - 'OS.REFERENCIA,'#10' '#39#39' as REFERENCIA_PROVEEDOR /*Es necesario par' + - 'a que no fallen los detalles porque los detalles son comunes par' + - 'a la rama de cliente y de proveedor*/'#10#10'FROM PRESUPUESTOS_CLIENTE' + - '_DETALLES'#10'LEFT JOIN ARTICULOS ON PRESUPUESTOS_CLIENTE_DETALLES.I' + - 'D_ARTICULO = ARTICULOS.ID'#10'where {where}'#10'ORDER BY POSICION;'#10#10#10 + 'OS.REFERENCIA,'#10' PRESUPUESTOS_CLIENTE_DETALLES.REFERENCIA_PROV' + + 'EEDOR /*Es necesario para que no fallen los detalles porque los ' + + 'detalles son comunes para la rama de cliente y de proveedor*/'#10#10'F' + + 'ROM PRESUPUESTOS_CLIENTE_DETALLES'#10'LEFT JOIN ARTICULOS ON PRESUPU' + + 'ESTOS_CLIENTE_DETALLES.ID_ARTICULO = ARTICULOS.ID'#10'where {where}'#10 + + 'ORDER BY POSICION;'#10#10#10 StatementType = stSQL ColumnMappings = < item @@ -934,6 +935,7 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente item Name = 'REFERENCIA_PROVEEDOR' DataType = datString + Size = 255 end> end> JoinDataTables = <> @@ -1517,6 +1519,12 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente Name = 'IMPORTE_PORTE' DataType = datCurrency Value = '' + end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + Value = '' end> Statements = < item @@ -1528,11 +1536,12 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente 'STO, POSICION, TIPO_DETALLE, PROPIEDAD, CONCEPTO, CANTIDAD,'#10' ' + ' IMPORTE_UNIDAD, IMPORTE_TOTAL, VISIBLE, VISIBLE2, ID_ARTICULO, ' + 'TIPO_ARTICULO,'#10' INCREMENTO, DECREMENTO, DESCUENTO, IMPORTE_P' + - 'ORTE, FECHA_ALTA)'#10' VALUES'#10' (:ID, :ID_PRESUPUESTO, :POSICION,' + - ' :TIPO_DETALLE, :PROPIEDAD, :CONCEPTO,'#10' :CANTIDAD, :IMPORTE_' + - 'UNIDAD, :IMPORTE_TOTAL, :VISIBLE, :VISIBLE2,'#10' :ID_ARTICULO, ' + - ':TIPO_ARTICULO, :INCREMENTO, :DECREMENTO, :DESCUENTO, :IMPORTE_P' + - 'ORTE, CURRENT_TIMESTAMP)'#10 + 'ORTE, FECHA_ALTA, REFERENCIA_PROVEEDOR)'#10' VALUES'#10' (:ID, :ID_P' + + 'RESUPUESTO, :POSICION, :TIPO_DETALLE, :PROPIEDAD, :CONCEPTO,'#10' ' + + ' :CANTIDAD, :IMPORTE_UNIDAD, :IMPORTE_TOTAL, :VISIBLE, :VISIBLE' + + '2,'#10' :ID_ARTICULO, :TIPO_ARTICULO, :INCREMENTO, :DECREMENTO, ' + + ':DESCUENTO, :IMPORTE_PORTE, CURRENT_TIMESTAMP, :REFERENCIA_PROVE' + + 'EDOR)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -1649,6 +1658,12 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente DataType = datCurrency Value = '' end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + Value = '' + end item Name = 'OLD_ID' Value = '' @@ -1668,7 +1683,8 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente ' :ID_ARTICULO, '#10' TIPO_ARTICULO = :TIPO_ARTICULO,'#10' INCREMEN' + 'TO = :INCREMENTO,'#10' DECREMENTO = :DECREMENTO,'#10' DESCUENTO = ' + ':DESCUENTO, '#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' FECHA_MODIF' + - 'ICACION = CURRENT_TIMESTAMP'#10' WHERE'#10' (ID = :OLD_ID)'#10 + 'ICACION = CURRENT_TIMESTAMP,'#10' REFERENCIA_PROVEEDOR = :REFEREN' + + 'CIA_PROVEEDOR'#10' WHERE'#10' (ID = :OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.dfm index 5be9d0bd..19080c03 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.dfm @@ -1,5 +1,7 @@ inherited fEditorElegirArticulosPresupuestoCliente: TfEditorElegirArticulosPresupuestoCliente Caption = 'fEditorElegirArticulosPresupuestoCliente' + ExplicitWidth = 672 + ExplicitHeight = 482 PixelsPerInch = 96 TextHeight = 13 inherited pnlHeader: TPanel diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas index f06d52be..62fddede 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas @@ -10,7 +10,7 @@ uses JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, JvgWizardHeader, uIEditorElegirArticulosPresupuestosCliente, uDAInterfaces, - uViewGridBase, uViewGrid, uViewArticulos, StdCtrls; + uViewGridBase, uViewGrid, uViewArticulos, StdCtrls, JSDialog; type TfEditorElegirArticulosPresupuestoCliente = class(TfEditorElegirArticulos, IEditorElegirArticulosPresupuestosCliente) diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index 9d2fdac4..2278ec00 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -388,57 +388,57 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitTop = 22 end inherited UpDown1: TUpDown - Left = 301 + Left = 349 Top = 22 - ExplicitLeft = 301 + ExplicitLeft = 349 ExplicitTop = 22 end inherited ToolButton13: TToolButton - Left = 318 + Left = 366 Top = 22 - ExplicitLeft = 318 + ExplicitLeft = 366 ExplicitTop = 22 end inherited ToolButton6: TToolButton - Left = 326 + Left = 374 Top = 22 - ExplicitLeft = 326 + ExplicitLeft = 374 ExplicitTop = 22 end inherited ToolButton7: TToolButton - Left = 360 + Left = 408 Top = 22 - ExplicitLeft = 360 + ExplicitLeft = 408 ExplicitTop = 22 end inherited ToolButton8: TToolButton - Left = 394 + Left = 442 Top = 22 - ExplicitLeft = 394 + ExplicitLeft = 442 ExplicitTop = 22 end inherited ToolButton12: TToolButton - Left = 428 + Left = 476 Top = 22 - ExplicitLeft = 428 + ExplicitLeft = 476 ExplicitTop = 22 end inherited ToolButton9: TToolButton - Left = 436 + Left = 484 Top = 22 - ExplicitLeft = 436 + ExplicitLeft = 484 ExplicitTop = 22 end inherited ToolButton10: TToolButton - Left = 470 + Left = 518 Top = 22 - ExplicitLeft = 470 + ExplicitLeft = 518 ExplicitTop = 22 end inherited ToolButton11: TToolButton - Left = 504 + Left = 552 Top = 22 - ExplicitLeft = 504 + ExplicitLeft = 552 ExplicitTop = 22 end end @@ -449,6 +449,44 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitTop = 72 ExplicitWidth = 834 ExplicitHeight = 340 + inherited cxGridView: TcxGridDBTableView + inherited cxGridViewVISIBLE2: TcxGridDBColumn + Width = 29 + end + inherited cxGridViewVISIBLE: TcxGridDBColumn + Width = 28 + end + inherited cxGridViewPROPIEDAD: TcxGridDBColumn + Width = 165 + end + inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn + Width = 83 + end + inherited cxGridViewDESCRIPCION: TcxGridDBColumn + Width = 277 + end + inherited cxGridViewCANTIDAD: TcxGridDBColumn + Width = 29 + end + inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn + Width = 39 + end + inherited cxGridViewINCREMENTO: TcxGridDBColumn + Width = 46 + end + inherited cxGridViewIMPORTENETO: TcxGridDBColumn + Width = 22 + end + inherited cxGridViewDESCUENTO: TcxGridDBColumn + Width = 22 + end + inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn + Width = 47 + end + inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn + Width = 33 + end + end end inherited TBXDock1: TTBXDock Top = 46 @@ -666,10 +704,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end inherited ImporteTotal: TcxDBCurrencyEdit Left = 465 - Top = 162 + Top = 189 Style.IsFontAssigned = True ExplicitLeft = 465 - ExplicitTop = 162 + ExplicitTop = 189 ExplicitWidth = 137 Width = 137 end @@ -696,17 +734,17 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end inherited edtRE: TcxDBSpinEdit Left = 464 - Top = 135 + Top = 162 Style.IsFontAssigned = True ExplicitLeft = 464 - ExplicitTop = 135 + ExplicitTop = 162 end inherited ImporteRE: TcxDBCurrencyEdit Left = 535 - Top = 135 + Top = 162 Style.IsFontAssigned = True ExplicitLeft = 535 - ExplicitTop = 135 + ExplicitTop = 162 ExplicitWidth = 56 Width = 56 end @@ -751,6 +789,22 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 455 Width = 455 end + inherited edtIRPF: TcxDBSpinEdit + Left = 464 + Top = 135 + Style.IsFontAssigned = True + ExplicitLeft = 464 + ExplicitTop = 135 + end + inherited ImporteIRPF: TcxDBCurrencyEdit + Left = 535 + Top = 135 + Style.IsFontAssigned = True + ExplicitLeft = 535 + ExplicitTop = 135 + ExplicitWidth = 216 + Width = 216 + end end inherited DADataSource: TDADataSource Left = 40 diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm index bdbab3fc..683d3218 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm @@ -1,86 +1,88 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente - Width = 872 - Height = 481 inherited ToolBar1: TToolBar - Width = 872 - ButtonWidth = 123 + Height = 73 ExplicitHeight = 73 - inherited ToolButton1: TToolButton - ExplicitWidth = 119 - end - inherited ToolButton2: TToolButton - Left = 119 - ExplicitLeft = 119 - ExplicitWidth = 127 - end - inherited ToolButton3: TToolButton - Left = 246 - ExplicitLeft = 246 - ExplicitWidth = 58 - end inherited ToolButton4: TToolButton - Left = 304 Wrap = False - ExplicitLeft = 304 - ExplicitWidth = 57 end - inherited ToolButton14: TToolButton - Left = 361 + inherited FontName: TJvFontComboBox [4] + Left = 334 Top = 0 - Wrap = True - ExplicitLeft = 361 + ExplicitLeft = 334 ExplicitTop = 0 end - inherited FontName: TJvFontComboBox - Left = 0 - ExplicitLeft = 0 + inherited FontSize: TEdit [5] + Left = 479 + Top = 0 + Width = 218 + ExplicitLeft = 479 + ExplicitTop = 0 + ExplicitWidth = 218 end inherited ToolButton13: TToolButton [6] - Left = 145 - ExplicitLeft = 145 + Left = 0 + Top = 0 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitHeight = 30 end - inherited ToolButton6: TToolButton [7] - Left = 153 - ExplicitLeft = 153 + inherited ToolButton14: TToolButton [7] + Top = 30 + Wrap = True end - inherited ToolButton7: TToolButton [8] - Left = 187 - ExplicitLeft = 187 + inherited UpDown1: TUpDown [8] + Left = 0 + Top = 52 + ExplicitLeft = 0 + ExplicitTop = 52 end - inherited ToolButton8: TToolButton [9] - Left = 221 - ExplicitLeft = 221 + inherited ToolButton6: TToolButton + Left = 17 + Top = 52 + ExplicitLeft = 17 + ExplicitTop = 52 end - inherited ToolButton12: TToolButton [10] - Left = 255 - ExplicitLeft = 255 + inherited ToolButton7: TToolButton + Left = 51 + Top = 52 + ExplicitLeft = 51 + ExplicitTop = 52 end - inherited ToolButton9: TToolButton [11] - Left = 263 - ExplicitLeft = 263 + inherited ToolButton8: TToolButton + Left = 85 + Top = 52 + ExplicitLeft = 85 + ExplicitTop = 52 end - inherited ToolButton10: TToolButton [12] - Left = 297 - ExplicitLeft = 297 + inherited ToolButton12: TToolButton + Left = 119 + Top = 52 + ExplicitLeft = 119 + ExplicitTop = 52 end - inherited ToolButton11: TToolButton [13] - Left = 331 - ExplicitLeft = 331 + inherited ToolButton9: TToolButton + Left = 127 + Top = 52 + ExplicitLeft = 127 + ExplicitTop = 52 end - inherited FontSize: TEdit [14] - Left = 365 - Width = 122 - ExplicitLeft = 365 - ExplicitWidth = 122 + inherited ToolButton10: TToolButton + Left = 161 + Top = 52 + ExplicitLeft = 161 + ExplicitTop = 52 end - inherited UpDown1: TUpDown [15] - Left = 487 - ExplicitLeft = 487 + inherited ToolButton11: TToolButton + Left = 195 + Top = 52 + ExplicitLeft = 195 + ExplicitTop = 52 end end inherited cxGrid: TcxGrid - Width = 872 - Height = 409 + Top = 99 + Height = 205 ExplicitTop = 99 ExplicitWidth = 451 ExplicitHeight = 205 @@ -118,7 +120,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente inherited cxGridViewREFERENCIA: TcxGridDBColumn [8] end inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [9] - DataBinding.FieldName = '' + Visible = True end inherited cxGridViewDESCRIPCION: TcxGridDBColumn [10] OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit @@ -156,12 +158,10 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente end end inherited TBXDock1: TTBXDock - Width = 872 + Top = 73 ExplicitTop = 73 - ExplicitWidth = 451 inherited TBXToolbar1: TTBXToolbar DockPos = 0 - ExplicitWidth = 806 object TBXSubmenuItem1: TTBXSubmenuItem [0] Caption = 'A'#241'adir cap'#237'tulo' DisplayMode = nbdmImageAndText @@ -209,7 +209,6 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente Action = actAsignarDescuento end inherited TBXItem23: TTBXItem - Action = actDesglosarIVA DisplayMode = nbdmImageAndText end end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas index 30331abe..ebaf47ec 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas @@ -78,6 +78,7 @@ type procedure CustomViewDestroy(Sender: TObject); procedure actCapituloObraExecute(Sender: TObject); procedure cxLookupComboBox1PropertiesEditValueChanged(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); private procedure AnadirCapitulo(const Tipo: String;const Descripcion: String; const Descuento:Boolean = false); @@ -246,6 +247,12 @@ begin end; end; +procedure TfrViewDetallesPresupuestoCliente.CustomViewCreate(Sender: TObject); +begin + inherited; + cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := NIL; +end; + procedure TfrViewDetallesPresupuestoCliente.CustomViewDestroy(Sender: TObject); begin cxGridViewVISIBLE2.Properties.OnEditValueChanged := Nil; @@ -376,7 +383,7 @@ begin and (AItem.GridView.Items[IndiceCol].EditValue <> TIPO_DETALLE_CONCEPTO) then Result := False end - else if (AItem.Index in [cxGridViewPROPIEDAD.Index, cxGridViewTIPO_ARTICULO.Index]) then + else if (AItem.Index in [cxGridViewPROPIEDAD.Index, cxGridViewREFERENCIA_PROVEEDOR.Index, cxGridViewTIPO_ARTICULO.Index]) then begin IndiceCol := cxGridView.GetColumnByFieldName(CAMPO_TIPO).Index; if ((AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_SALTO) or diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm index b23446d9..1bb7b155 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm @@ -571,6 +571,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente end object dxLayoutControl1Group13: TdxLayoutGroup Caption = 'La factura pertenece a la tienda' + Visible = False object dxLayoutControl1Item14: TdxLayoutItem Control = frViewTienda1 ControlOptions.AutoColor = True diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm index 92324acb..05f5038d 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm @@ -177,6 +177,8 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewFECHA_ULT_PRESENTACION_CLIENTE: TcxGridDBColumn Caption = 'Fecha '#250'lt. actualizaci'#243'n' @@ -327,6 +329,8 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas index 6c3bc1b2..6afefc0a 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas @@ -258,7 +258,8 @@ begin AnadirOtrosFiltros; //FILTRO DE EMPRESAS - if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then +//20/04/2026 Se pide quitar tienda almagro por José Luís +{ if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ALISO) then begin cxGridViewTIENDA.Visible := True; cxGridViewTIENDA.VisibleForCustomization := True; @@ -272,6 +273,7 @@ begin actTienda.Visible := False; end; +} end; procedure TfrViewPresupuestosCliente.CustomViewDestroy(Sender: TObject); diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index d11ff72d..0b701bb6 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -58,7 +58,9 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False BestFitMaxWidth = 60 + VisibleForCustomization = False end object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn Caption = 'Compensado' @@ -316,6 +318,8 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm index 2c15f817..616bef22 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm @@ -46,6 +46,8 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn Caption = 'Referencia' @@ -277,6 +279,8 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor end object actTienda: TAction Caption = 'Tienda' + Enabled = False + Visible = False OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 6b14857c..30ce5b5d 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -121,25 +121,25 @@ uses schBase_Intf in '..\Base\schBase_Intf.pas', schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', - schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', - schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', uBizInstaladoresServer in '..\Modulos\Contactos\Model\uBizInstaladoresServer.pas', schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', - schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', - schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', - schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', - schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', - schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas', - schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas', schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas', schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas', schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas', schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas', - schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas'; + schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', + schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', + schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', + schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas', + schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas', + schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', + schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', + schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', + schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 6a79a144..c0a21026 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse5240FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.2.4.0FactuGES (Servidor)5.2.4.0lunes, 19 de enero de 2026 18:28 + FalseTrueFalseTrueFalse5270FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.2.7.0FactuGES (Servidor)5.2.7.0jueves, 23 de abril de 2026 18:15 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 ee9316a2..de25e432 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 5,2,4,0 -PRODUCTVERSION 5,2,4,0 +FILEVERSION 5,2,7,0 +PRODUCTVERSION 5,2,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "5.2.4.0\0" + VALUE "FileVersion", "5.2.7.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" - VALUE "ProductVersion", "5.2.4.0\0" - VALUE "CompileDate", "martes, 20 de enero de 2026 18:22\0" + VALUE "ProductVersion", "5.2.7.0\0" + VALUE "CompileDate", "jueves, 07 de mayo de 2026 10:52\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 3b10658a1f19bb4df87b23c5a0686b515bb9a376..7d1038b853e006c0334fdb426938ab53b398cf62 100644 GIT binary patch delta 127 zcmdn6jd24I8AWokGcYl*GB7Z(PqvPfWt=oQGE$i_Z*py9JEQqz)~IT3a|S&I1E72o zgW}}wC|SoWhEj%9hB6>7X3$|!0LqyI$rK=8fgzV6k)e_yAI>)d${I140r`eNmKB33 LkjF6jWt2MrBTpH6 delta 127 zcmdn6jd24I8AWokFfcK&GB7Z(Oty}cWt=iOGE$kbU~+9_JEO^D)~IT369zp71E72g zgVN;gC|So`hD3%Uh7yKUhGGUC1_cHqpsWH=HWf&wGUNeq5ko#)1SD(3U