From 3db055a57fa0402412469a90cfd59ce4ce9e3103 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 15 Jan 2009 18:49:02 +0000 Subject: [PATCH] =?UTF-8?q?Se=20arreglan=20detalles=20visuales=20y=20de=20?= =?UTF-8?q?calculo=20de=20importes=20totales=20para=20facturas=20de=20clie?= =?UTF-8?q?nte=20(falta=20para=20facturas=20de=20proveedor),=20ademas=20de?= =?UTF-8?q?=20acabar=20la=20exportaci=C3=B3n=20del=20informe=20de=20factur?= =?UTF-8?q?a=20de=20cliente=20con=20soporte=20para=20retenciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@841 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Base/Base.dproj | 102 +-- Source/Base/Base.res | Bin 384 -> 4748 bytes Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 172156 -> 171984 bytes Source/GUIBase/GUIBase.dproj | 48 +- Source/GUIBase/GUIBase.res | Bin 384 -> 4748 bytes Source/GUIBase/uViewTotales.dfm | 259 +++---- Source/GUIBase/uViewTotales.pas | 8 +- Source/Informes/1/FacturaCliente.rdx | Bin 157696 -> 168448 bytes Source/Informes/1/InfFacturaCliente.fr3 | 42 +- .../Model/uBizFacturasCliente.pas | 14 +- .../Reports/uRptWordFacturaCliente.dfm | 45 +- .../Reports/uRptWordFacturaCliente.pas | 21 +- .../Views/uEditorFacturaCliente.dfm | 308 +++++---- .../Views/uEditorPresupuestoCliente.dfm | 2 +- .../Views/uViewTotalesPresupuesto.dfm | 128 ++-- .../Views/uViewTotalesPresupuesto.pas | 4 +- Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23200 bytes Source/Servidor/FactuGES_Server.dproj | 638 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 2 +- 20 files changed, 858 insertions(+), 771 deletions(-) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 07bcde00..d03ddc0b 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,57 +54,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch 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 delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 03124ef2..4ba61680 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,6,1,0 -PRODUCTVERSION 1,6,1,0 +FILEVERSION 1,6,2,0 +PRODUCTVERSION 1,6,2,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.6.1.0\0" + VALUE "FileVersion", "1.6.2.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.6.1.0\0" + VALUE "ProductVersion", "1.6.2.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 82607d818aed7df194022c29ca252f5d5c811661..de03ef673a4752385b0384633e49c849a15a2b66 100644 GIT binary patch delta 284 zcmY+9u?m7v6o$Wh(^8WVS{#K48XA0oK$;vI+AC=2Eplk^0fIYeYeQpujg3A-b3+dh z)D=bPhr{9HKj(1%&)q3*PI3@eX=MA*b6gq;Ts#j1K0CAQ4H+Qu{mOfEq0>-mgFz5f z-q`}PC4H?+7}nkZdM%AvVG%`@Ihlh^99NVs!C}3w7mv^ilR>W142=e41!DdHmD>;tEIX)HG@NcfRLrFYZfmAo6~5nG^X zG>rCHg|(7-jB8-wc}B}@sFchjlWA3aztlEiy=08 MainSource - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch 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 delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index e4894343..45ab651b 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,9 +1,9 @@ inherited frViewTotales: TfrViewTotales - Width = 949 - Height = 261 + Width = 966 + Height = 252 Align = alBottom - ExplicitWidth = 949 - ExplicitHeight = 261 + ExplicitWidth = 966 + ExplicitHeight = 252 object Bevel5: TBevel Left = 666 Top = 109 @@ -15,8 +15,8 @@ inherited frViewTotales: TfrViewTotales AlignWithMargins = True Left = 0 Top = 0 - Width = 949 - Height = 261 + Width = 966 + Height = 252 Margins.Left = 0 Margins.Top = 0 Margins.Right = 0 @@ -26,36 +26,41 @@ inherited frViewTotales: TfrViewTotales TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 451 - ExplicitHeight = 257 - object Bevel1: TBevel - Left = 131 - Top = 109 - Width = 73 - Height = 9 - Shape = bsBottomLine - end + ExplicitHeight = 265 object Bevel3: TBevel - Left = 499 + Left = 490 Top = 28 Width = 3 - Height = 122 + Height = 100 Shape = bsRightLine end object Bevel4: TBevel - Left = 611 - Top = 109 - Width = 192 + Left = 602 + Top = 70 + Width = 342 + Height = 9 + Shape = bsBottomLine + end + object Bevel1: TBevel + Left = 602 + Top = 186 + Width = 368 + Height = 9 + Shape = bsBottomLine + end + object Bevel2: TBevel + Left = 131 + Top = 188 + Width = 368 Height = 9 Shape = bsBottomLine end object ImporteDto: TcxDBCurrencyEdit Left = 202 - Top = 129 + Top = 55 AutoSize = False DataBinding.DataField = 'IMPORTE_DESCUENTO' DataBinding.DataSource = DADataSource - Enabled = False ParentFont = False Properties.Alignment.Horz = taRightJustify Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364 @@ -81,13 +86,13 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 5 + TabOrder = 2 Height = 21 Width = 87 end object ImporteIVA: TcxDBCurrencyEdit - Left = 682 - Top = 55 + Left = 673 + Top = 105 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' DataBinding.DataSource = DADataSource @@ -116,13 +121,13 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 9 + TabOrder = 10 Height = 21 Width = 20 end object ImporteTotal: TcxDBCurrencyEdit - Left = 612 - Top = 129 + Left = 603 + Top = 159 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataSource = DADataSource @@ -152,13 +157,13 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 + TabOrder = 13 Height = 21 Width = 90 end object edtDescuento: TcxDBSpinEdit Left = 131 - Top = 129 + Top = 55 AutoSize = False DataBinding.DataField = 'DESCUENTO' DataBinding.DataSource = DADataSource @@ -186,13 +191,13 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 4 + TabOrder = 1 Height = 21 Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 611 - Top = 55 + Left = 602 + Top = 105 AutoSize = False DataBinding.DataField = 'IVA' DataBinding.DataSource = DADataSource @@ -227,12 +232,12 @@ inherited frViewTotales: TfrViewTotales StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 8 + TabOrder = 9 Height = 21 Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 611 + Left = 602 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -262,13 +267,13 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 7 + TabOrder = 8 Height = 21 Width = 91 end object edtRE: TcxDBSpinEdit - Left = 611 - Top = 82 + Left = 602 + Top = 132 AutoSize = False DataBinding.DataField = 'RE' DataBinding.DataSource = DADataSource @@ -303,13 +308,13 @@ inherited frViewTotales: TfrViewTotales StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 + TabOrder = 11 Height = 21 Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 682 - Top = 82 + Left = 673 + Top = 132 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataSource = DADataSource @@ -338,7 +343,7 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 11 + TabOrder = 12 Height = 21 Width = 20 end @@ -378,7 +383,7 @@ inherited frViewTotales: TfrViewTotales end object ePorte: TcxDBCurrencyEdit Left = 131 - Top = 156 + Top = 82 AutoSize = False DataBinding.DataField = 'IMPORTE_PORTE' DataBinding.DataSource = DADataSource @@ -406,13 +411,13 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 6 + TabOrder = 3 Height = 21 Width = 158 end object eIVA: TcxDBLookupComboBox Left = 131 - Top = 55 + Top = 109 DataBinding.DataField = 'ID_TIPO_IVA' DataBinding.DataSource = DADataSource Properties.ImmediatePost = True @@ -442,20 +447,20 @@ inherited frViewTotales: TfrViewTotales StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 1 + TabOrder = 4 Width = 20 end object bTiposIVA: TButton - Left = 351 - Top = 55 + Left = 342 + Top = 109 Width = 132 Height = 21 Caption = 'Ver los tipos de IVA...' - TabOrder = 2 + TabOrder = 5 end object cbRecargoEquivalencia: TcxDBCheckBox Left = 131 - Top = 82 + Top = 136 Caption = 'Aplicar recargo de equivalencia' DataBinding.DataField = 'RECARGO_EQUIVALENCIA' DataBinding.DataSource = DADataSource @@ -480,14 +485,13 @@ inherited frViewTotales: TfrViewTotales StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 3 + TabOrder = 6 Width = 221 end object edtRetencion: TcxDBSpinEdit - Left = 676 - Top = 218 + Left = 602 + Top = 206 AutoSize = False - DataBinding.DataField = 'RETENCION' DataBinding.DataSource = DADataSource ParentFont = False Properties.Alignment.Horz = taRightJustify @@ -524,10 +528,9 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtImporteRetencion: TcxDBCurrencyEdit - Left = 747 - Top = 218 + Left = 673 + Top = 206 AutoSize = False - DataBinding.DataField = 'IMPORTE_RETENCION' DataBinding.DataSource = DADataSource Enabled = False ParentFont = False @@ -560,8 +563,7 @@ inherited frViewTotales: TfrViewTotales end object edtFechaRetencion: TcxDBDateEdit Left = 131 - Top = 218 - DataBinding.DataField = 'FECHA_RETENCION' + Top = 208 DataBinding.DataSource = DADataSource Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -580,7 +582,7 @@ inherited frViewTotales: TfrViewTotales StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 13 + TabOrder = 7 Width = 280 end object dxLayoutControl1Group_Root: TdxLayoutGroup @@ -589,7 +591,6 @@ inherited frViewTotales: TfrViewTotales ShowBorder = False object dxLayoutControl1Group1: TdxLayoutGroup AutoAligns = [aaHorizontal] - AlignVert = avClient Caption = 'Importes totales' LayoutDirection = ldHorizontal object dxLayoutControl1Group2: TdxLayoutGroup @@ -605,6 +606,38 @@ inherited frViewTotales: TfrViewTotales Control = eImporteNeto ControlOptions.ShowBorder = False end + object dxLayoutControl1Group7: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group10: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item4: TdxLayoutItem + AutoAligns = [aaVertical] + Caption = 'Descuento (%):' + Control = edtDescuento + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Importe de dto:' + ShowCaption = False + Control = ImporteDto + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Item9: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Porte:' + Control = ePorte + ControlOptions.ShowBorder = False + end + end object dxLayoutControl1Group6: TdxLayoutGroup ShowCaption = False Hidden = True @@ -630,36 +663,16 @@ inherited frViewTotales: TfrViewTotales Control = cbRecargoEquivalencia ControlOptions.ShowBorder = False end - object dxLayoutControl1Item10: TdxLayoutItem + object dxLayoutControl1Item19: TdxLayoutItem Caption = ' ' - Control = Bevel1 + Offsets.Top = 25 + Control = Bevel2 ControlOptions.ShowBorder = False end - object dxLayoutControl1Group7: TdxLayoutGroup - ShowCaption = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item4: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'Descuento (%):' - Control = edtDescuento - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item1: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Importe de dto:' - ShowCaption = False - Control = ImporteDto - ControlOptions.ShowBorder = False - end - end - object dxLayoutControl1Item9: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Porte:' - Control = ePorte + object dxLayoutControl1Item21: TdxLayoutItem + Caption = 'Fecha vto. retenci'#243'n:' + Visible = False + Control = edtFechaRetencion ControlOptions.ShowBorder = False end end @@ -693,6 +706,15 @@ inherited frViewTotales: TfrViewTotales Control = ImporteBase ControlOptions.ShowBorder = False end + object dxLayoutControl1Item14: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = ' ' + Offsets.Bottom = 15 + Offsets.Top = 15 + Control = Bevel4 + ControlOptions.ShowBorder = False + end object dxLayoutControl1Group9: TdxLayoutGroup ShowCaption = False Hidden = True @@ -736,13 +758,6 @@ inherited frViewTotales: TfrViewTotales ControlOptions.ShowBorder = False end end - object dxLayoutControl1Item14: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = ' ' - Control = Bevel4 - ControlOptions.ShowBorder = False - end object dxLayoutControl1Item3: TdxLayoutItem AutoAligns = [aaVertical] AlignHorz = ahClient @@ -751,35 +766,31 @@ inherited frViewTotales: TfrViewTotales Control = ImporteTotal ControlOptions.ShowBorder = False end - end - end - end - object dxLayoutControl1Group12: TdxLayoutGroup - LayoutDirection = ldHorizontal - object dxLayoutControl1Item21: TdxLayoutItem - Caption = 'Fecha vto. retenci'#243'n:' - Visible = False - Control = edtFechaRetencion - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Group11: TdxLayoutGroup - AutoAligns = [aaVertical] - AlignHorz = ahRight - ShowCaption = False - Visible = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item17: TdxLayoutItem - Caption = 'Retenci'#243'n (%):' - Control = edtRetencion - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item18: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Control = edtImporteRetencion - ControlOptions.ShowBorder = False + object dxLayoutControl1Item10: TdxLayoutItem + Caption = ' ' + Control = Bevel1 + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Group11: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahClient + ShowCaption = False + Visible = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item17: TdxLayoutItem + Caption = 'Retenci'#243'n (%):' + Control = edtRetencion + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item18: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Control = edtImporteRetencion + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas index 1be7908c..d4363d9d 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -39,8 +39,6 @@ type dxLayoutControl1Item9: TdxLayoutItem; ePorte: TcxDBCurrencyEdit; dxLayoutControl1Group2: TdxLayoutGroup; - Bevel1: TBevel; - dxLayoutControl1Item10: TdxLayoutItem; dxLayoutControl1Group7: TdxLayoutGroup; Bevel3: TBevel; dxLayoutControl1Item13: TdxLayoutItem; @@ -67,7 +65,11 @@ type dxLayoutControl1Group11: TdxLayoutGroup; dxLayoutControl1Item21: TdxLayoutItem; edtFechaRetencion: TcxDBDateEdit; - dxLayoutControl1Group12: TdxLayoutGroup; + dxLayoutControl1Group10: TdxLayoutGroup; + dxLayoutControl1Item10: TdxLayoutItem; + Bevel1: TBevel; + dxLayoutControl1Item19: TdxLayoutItem; + Bevel2: TBevel; public { Public declarations } end; diff --git a/Source/Informes/1/FacturaCliente.rdx b/Source/Informes/1/FacturaCliente.rdx index 4f2266a5b21be8633934aa6be10e695fd85478ec..2f6ace8129a2e9afc9e862dcf65e5e5e5ce118c1 100644 GIT binary patch delta 14843 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 delta 8629 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

w|^ z+i0)sT-pCdvh5~yq5faqv(AS0-<5}82lab6_O1Ccee79>2GK`N&#tNx z$)oq%vpXui3W?|NB#Eb?dy%N)4+fpYom93h8=4-CzIiFnMt3f?6?WizSN%>Hb$0GO zDTR1chOOa7^%Tb*fJfJ%xcdFrEpbAiPH9g&`XtxtSCu-yAzcY3bPrKXugpnO8ffPK zBI!J;+@;j|@4?XiyQ+SiyA;*0R(~hG@9d9zmSE@Cs#iuV5#h@9r6O~JNxKr$#R^dt z3MfKf4An1%2V+^H#oG zhBNkXh_Mr>ge#5)G0-O&N$gKbZG%X3Cw5X|v@7Qr62qR*64|WVcOi(Xo1_C>aXRTP z7=j~-xKeq>a^;ee+97M`s5*CmaSxziM7O34KyEdjoXEZ81#bi{bbu%O*=<T3OPdK33b>S(07tdB_D zy%!+s=wdpM-p;l9VN^ee>TV@}={_^7-q3%|s%y5a6LFH}B+a3^vdLXc%k@HGLUXBZ zw!IyT9t87@ zgmtQ7DNI(uU^!H2zNbOA4F7PaO2^z`rG>CmhkGsk7URZN&gLLqfjF%zQZ1`T1!Zb8 zTy6S)HtE5ewCO%INx8I6EUWBzr7~WpZgq8{s}c=J8jP;1kvi9JcQZPzTwX64mGv9M z{7jDTMfyxSvvVw7mzKtGaX%u&6{QtF8~ade@)M$f_dXPGB1wL4%KHf{1`4z$E(K(P t)(S6L$yI4%>kChc2f5WwJ7Y9nAj2>Ij|ZCZ51SFngiWHq^8O~V_CJD6^kM)2 diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index 6870a97e..5e2a9e92 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -7,8 +7,8 @@ - - + + @@ -23,7 +23,7 @@ - + @@ -33,28 +33,28 @@ - - - - + + - - + + + + + - - - - - - - - - + + + + + + + + - - + + diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas index 82fbc83a..20c4e673 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas @@ -41,7 +41,7 @@ type TBizFacturaCliente = class(TFacturasClienteDataTableRules, IBizFacturaCliente, ISeleccionable) private FSeleccionableInterface : ISeleccionable; - procedure CalcularDescuento; +// procedure CalcularDescuento; procedure CalcularIVA; procedure CalcularRE; procedure CalcularRetencion; @@ -141,12 +141,12 @@ begin BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO + IMPORTE_PORTE; end; -procedure TBizFacturaCliente.CalcularDescuento; +{procedure TBizFacturaCliente.CalcularDescuento; begin if not Self.DataTable.Editing then Edit; - IMPORTE_DESCUENTO := (DESCUENTO / 100) * BASE_IMPONIBLE; -end; + IMPORTE_DESCUENTO := (DESCUENTO / 100) * IMPORTE_NETO; +end;} procedure TBizFacturaCliente.CalcularImporteTotal; begin @@ -171,21 +171,21 @@ procedure TBizFacturaCliente.CalcularIVA; begin if not Self.DataTable.Editing then Edit; - IMPORTE_IVA := (IVA / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO); + IMPORTE_IVA := (IVA / 100) * BASE_IMPONIBLE; end; procedure TBizFacturaCliente.CalcularRE; begin if not Self.DataTable.Editing then Edit; - IMPORTE_RE := (RE / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO); + IMPORTE_RE := (RE / 100) * BASE_IMPONIBLE; end; procedure TBizFacturaCliente.CalcularRetencion; begin if not Self.DataTable.Editing then Edit; - IMPORTE_RETENCION := (RETENCION / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO); + IMPORTE_RETENCION := (RETENCION / 100) * BASE_IMPONIBLE; end; constructor TBizFacturaCliente.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm index 3b8dc82f..45bc8917 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm @@ -31,10 +31,11 @@ object RptWordFacturaCliente: TRptWordFacturaCliente 'acturas_cliente.poblacion, v_facturas_cliente.codigo_postal,'#10' ' + 'v_facturas_cliente.recargo_equivalencia, v_facturas_cliente.impo' + 'rte_neto,'#10' v_facturas_cliente.importe_porte, formas_pago.descr' + - 'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.datos_bancarios'#10'from' + - ' v_facturas_cliente'#10' left outer join formas_pago on (formas_pa' + - 'go.id = v_facturas_cliente.id_forma_pago)'#10'WHERE V_FACTURAS_CLIEN' + - 'TE.ID = :ID'#10 + 'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.datos_bancarios, v_f' + + 'acturas_cliente.fecha_vencimiento,'#10' v_facturas_cliente.retenci' + + 'on, v_facturas_cliente.importe_retencion'#10'from v_facturas_cliente' + + #10' left outer join formas_pago on (formas_pago.id = v_facturas_' + + 'cliente.id_forma_pago)'#10'WHERE V_FACTURAS_CLIENTE.ID = :ID'#10 StatementType = stSQL ColumnMappings = < item @@ -144,6 +145,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente item DatasetField = 'DATOS_BANCARIOS' TableField = 'DATOS_BANCARIOS' + end + item + DatasetField = 'FECHA_VENCIMIENTO' + TableField = 'FECHA_VENCIMIENTO' + end + item + DatasetField = 'RETENCION' + TableField = 'RETENCION' + end + item + DatasetField = 'IMPORTE_RETENCION' + TableField = 'IMPORTE_RETENCION' end> end> Name = 'Informe_Cabecera' @@ -268,6 +281,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente Name = 'DATOS_BANCARIOS' DataType = datString Size = 255 + end + item + Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime + end + item + Name = 'RETENCION' + DataType = datFloat + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency end> ReadOnly = True end @@ -595,6 +620,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente Name = 'DATOS_BANCARIOS' DataType = datString Size = 255 + end + item + Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime + end + item + Name = 'RETENCION' + DataType = datFloat + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency end> Params = < item diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas index 780057d8..b0e89716 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas @@ -212,13 +212,16 @@ begin ReplaceBookmark('CodigoFacturaCab', FieldByName('REFERENCIA').AsString); ReplaceBookmark('FechaFacturaCab', FieldByName('FECHA_FACTURA').AsString); - tbl_Vencimientos.First; + //Se cambia se omiten los vencimientos de los recibos solo tendremos en cuenta el de la factura + Cadena := FieldByName('FECHA_VENCIMIENTO').AsString; +{ tbl_Vencimientos.First; Cadena := ''; while not tbl_Vencimientos.eof do begin Cadena := Cadena + tbl_Vencimientos.FieldByName('FECHA_VENCIMIENTO').AsString + ' '; tbl_Vencimientos.Next; end; +} ReplaceBookmark('VencimientoCab', Cadena); ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString); @@ -232,8 +235,8 @@ begin FieldByName('CODIGO_POSTAL').AsString + ' ' + FieldByName('POBLACION').AsString + ' ' + FieldByName('PROVINCIA').AsString); - ReplaceBookmark('BaseImponible', FormatFloat(DISPLAY_EUROS2, FieldByName('BASE_IMPONIBLE').AsFloat)); - ImporteAux := FieldByName('BASE_IMPONIBLE').AsFloat - FieldByName('IMPORTE_DESCUENTO').AsFloat; + ReplaceBookmark('BaseImponible', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_NETO').AsFloat)); + ImporteAux := FieldByName('BASE_IMPONIBLE').AsFloat; // - FieldByName('IMPORTE_DESCUENTO').AsFloat; ReplaceBookmark('BaseImponible2', FormatFloat(DISPLAY_EUROS2, ImporteAux)); if (FieldByName('DESCUENTO').AsInteger = 0) then @@ -254,6 +257,18 @@ begin ReplaceBookmark('ImporteIVA', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_IVA').AsFloat)); ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat)); + if (FieldByName('RETENCION').AsInteger = 0) then + begin + FWordApp.GotoBookmark('CeldasRetencion'); + _ShiftCells := wdDeleteCellsShiftLeft; + FWordApp.Application.Selection.Cells.Delete(_ShiftCells); + end + else begin + ReplaceBookmark('Retencion', FieldByName('RETENCION').AsString); + ReplaceBookmark('ImporteRetencion', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_RETENCION').AsFloat)); + ReplaceBookmark('ImporteTotalRet', FormatFloat(DISPLAY_EUROS2, (FieldByName('IMPORTE_TOTAL').AsFloat - FieldByName('IMPORTE_RETENCION').AsFloat))); + end; + Texto := FieldByName('OBSERVACIONES').AsString; if not EsCadenaVacia(Texto) then begin diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 5c87a90f..ff8f674d 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -86,20 +86,20 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end inherited pgPaginas: TPageControl Width = 806 - Height = 277 + Height = 312 OnChanging = pgPaginasChanging ExplicitWidth = 806 - ExplicitHeight = 318 + ExplicitHeight = 277 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 798 - ExplicitHeight = 290 + ExplicitHeight = 249 inline frViewFacturaCliente1: TfrViewFacturaCliente Left = 0 Top = 0 Width = 798 - Height = 249 + Height = 284 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -110,15 +110,15 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 798 - ExplicitHeight = 290 + ExplicitHeight = 249 inherited dxLayoutControl1: TdxLayoutControl Width = 798 - Height = 249 + Height = 284 ExplicitWidth = 798 - ExplicitHeight = 290 + ExplicitHeight = 249 DesignSize = ( 798 - 249) + 284) inherited Label1: TLabel Left = 378 Width = 311 @@ -240,12 +240,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitHeight = 290 + ExplicitHeight = 249 inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 Width = 798 - Height = 249 + Height = 284 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -258,72 +258,69 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 798 - ExplicitHeight = 290 + ExplicitHeight = 249 inherited ToolBar1: TToolBar Width = 798 Height = 73 ExplicitWidth = 798 ExplicitHeight = 73 - inherited ToolButton2: TToolButton - Wrap = False - ExplicitLeft = 231 + inherited FontName: TJvFontComboBox [8] + Left = 65 + ExplicitLeft = 65 end - inherited ToolButton4: TToolButton - Left = 345 - Top = 0 - ExplicitLeft = 345 - ExplicitTop = 0 + inherited ToolButton10: TToolButton [9] + Left = 210 + ExplicitLeft = 210 end - inherited ToolButton14: TToolButton - Left = 401 - Top = 0 - Wrap = True - ExplicitLeft = 401 - ExplicitTop = 0 + inherited FontSize: TEdit [10] + Left = 335 + Top = 49 + Width = 248 + ExplicitLeft = 335 + ExplicitTop = 49 + ExplicitWidth = 248 end - inherited FontSize: TEdit - Left = 0 - Width = 200 - ExplicitLeft = 0 - ExplicitWidth = 200 + inherited UpDown1: TUpDown [11] + Left = 583 + Top = 49 + ExplicitLeft = 583 + ExplicitTop = 49 end - inherited UpDown1: TUpDown - Left = 216 - ExplicitLeft = 216 - end - inherited FontName: TJvFontComboBox - Left = 233 - ExplicitLeft = 233 - end - inherited ToolButton13: TToolButton - Left = 378 - ExplicitLeft = 378 + inherited ToolButton8: TToolButton [12] + Left = 600 + Top = 49 + ExplicitLeft = 600 + ExplicitTop = 49 end inherited ToolButton6: TToolButton - Left = 386 - ExplicitLeft = 386 - end - inherited ToolButton9: TToolButton - Wrap = False - end - inherited ToolButton10: TToolButton - Left = 369 + Left = 683 Top = 49 - ExplicitLeft = 369 + ExplicitLeft = 683 ExplicitTop = 49 end + inherited ToolButton11: TToolButton [14] + Left = 749 + Top = 49 + ExplicitLeft = 749 + ExplicitTop = 49 + end + inherited ToolButton7: TToolButton [15] + Left = 890 + ExplicitLeft = 890 + end end inherited cxGrid: TcxGrid Top = 99 Width = 798 - Height = 150 + Height = 185 ExplicitTop = 99 ExplicitWidth = 798 - ExplicitHeight = 191 + ExplicitHeight = 150 end inherited TBXDock1: TTBXDock Top = 73 Width = 798 + ExplicitTop = 73 ExplicitWidth = 798 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 798 @@ -353,9 +350,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 359 + Top = 394 Width = 812 - Height = 230 + Height = 195 Align = alBottom Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -365,128 +362,136 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 359 + ExplicitTop = 394 ExplicitWidth = 812 - ExplicitHeight = 230 + ExplicitHeight = 195 inherited dxLayoutControl1: TdxLayoutControl Width = 812 - Height = 230 + Height = 195 LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1 ExplicitWidth = 812 - ExplicitHeight = 189 - inherited Bevel1: TBevel - Top = 111 - Width = 73 - ExplicitTop = 111 - ExplicitWidth = 73 - end + ExplicitHeight = 230 inherited Bevel3: TBevel - Left = 374 + Left = 405 Top = 30 Height = 122 - ExplicitLeft = 374 + ExplicitLeft = 405 ExplicitTop = 30 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 486 - Top = 111 + Left = 517 + Top = 60 Width = 192 - ExplicitLeft = 486 - ExplicitTop = 111 + ExplicitLeft = 517 + ExplicitTop = 60 ExplicitWidth = 192 end + inherited Bevel1: TBevel + Left = 517 + Top = 164 + Width = 368 + ExplicitLeft = 517 + ExplicitTop = 164 + ExplicitWidth = 368 + end + inherited Bevel2: TBevel + Top = 190 + Width = 368 + ExplicitTop = 190 + ExplicitWidth = 368 + end inherited ImporteDto: TcxDBCurrencyEdit - Top = 131 + Top = 57 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 131 + ExplicitTop = 57 ExplicitWidth = 184 Width = 184 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 557 - Top = 57 + Left = 588 + Top = 83 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 557 - ExplicitTop = 57 + ExplicitLeft = 588 + ExplicitTop = 83 ExplicitWidth = 249 Width = 249 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 487 - Top = 131 + Left = 518 + Top = 137 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 487 - ExplicitTop = 131 + ExplicitLeft = 518 + ExplicitTop = 137 ExplicitWidth = 319 Width = 319 end inherited edtDescuento: TcxDBSpinEdit - Top = 131 - Style.LookAndFeel.SkinName = '' - Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 131 - end - inherited edtIVA: TcxDBSpinEdit - Left = 486 Top = 57 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 486 ExplicitTop = 57 end + inherited edtIVA: TcxDBSpinEdit + Left = 517 + Top = 83 + Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 517 + ExplicitTop = 83 + end inherited ImporteBase: TcxDBCurrencyEdit - Left = 486 + Left = 517 Top = 30 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 486 + ExplicitLeft = 517 ExplicitTop = 30 ExplicitWidth = 320 Width = 320 end inherited edtRE: TcxDBSpinEdit - Left = 486 - Top = 84 + Left = 517 + Top = 110 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 486 - ExplicitTop = 84 + ExplicitLeft = 517 + ExplicitTop = 110 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 557 - Top = 84 + Left = 588 + Top = 110 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 557 - ExplicitTop = 84 + ExplicitLeft = 588 + ExplicitTop = 110 ExplicitWidth = 249 Width = 249 end @@ -502,35 +507,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 255 end inherited ePorte: TcxDBCurrencyEdit - Top = 158 - Style.LookAndFeel.SkinName = '' - Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 158 - ExplicitWidth = 255 - Width = 255 - end - inherited eIVA: TcxDBLookupComboBox - Top = 57 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 57 - ExplicitWidth = 117 - Width = 117 - end - inherited bTiposIVA: TButton - Left = 226 - Top = 57 - ExplicitLeft = 226 - ExplicitTop = 57 - end - inherited cbRecargoEquivalencia: TcxDBCheckBox Top = 84 Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' @@ -538,69 +517,102 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 255 Width = 255 end + inherited eIVA: TcxDBLookupComboBox + Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitTop = 111 + ExplicitWidth = 117 + Width = 117 + end + inherited bTiposIVA: TButton + Left = 257 + Top = 111 + ExplicitLeft = 257 + ExplicitTop = 111 + end + inherited cbRecargoEquivalencia: TcxDBCheckBox + Top = 138 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitTop = 138 + ExplicitWidth = 255 + Width = 255 + end inherited edtRetencion: TcxDBSpinEdit - Left = 550 - Top = 209 + Left = 517 + Top = 184 + DataBinding.DataField = 'RETENCION' Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 550 - ExplicitTop = 209 + ExplicitLeft = 517 + ExplicitTop = 184 end inherited edtImporteRetencion: TcxDBCurrencyEdit - Left = 621 - Top = 209 + Left = 588 + Top = 184 + DataBinding.DataField = 'IMPORTE_RETENCION' Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 621 - ExplicitTop = 209 + ExplicitLeft = 588 + ExplicitTop = 184 ExplicitWidth = 152 Width = 152 end inherited edtFechaRetencion: TcxDBDateEdit - Top = 209 + Top = 210 + DataBinding.DataField = 'FECHA_RETENCION' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 209 + ExplicitTop = 210 ExplicitWidth = 150 Width = 150 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup + inherited dxLayoutControl1Group7: TdxLayoutGroup + inherited dxLayoutControl1Item9: TdxLayoutItem + Visible = False + end + end inherited dxLayoutControl1Item16: TdxLayoutItem Visible = False end - inherited dxLayoutControl1Item10: TdxLayoutItem - Visible = False + inherited dxLayoutControl1Item21: TdxLayoutItem + Visible = True end end inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup + inherited dxLayoutControl1Item14: TdxLayoutItem + Offsets.Bottom = 3 + Offsets.Top = 3 + end inherited dxLayoutControl1Group8: TdxLayoutGroup Visible = False inherited dxLayoutControl1Item7: TdxLayoutItem Visible = True end end + inherited dxLayoutControl1Group11: TdxLayoutGroup + Visible = True + end end end end - inherited dxLayoutControl1Group12: TdxLayoutGroup - inherited dxLayoutControl1Item21: TdxLayoutItem - Visible = True - end - inherited dxLayoutControl1Group11: TdxLayoutGroup - Visible = True - end - end end end end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index fdaedabf..b9ed2cc5 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -819,7 +819,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Width = 750 Height = 315 ExplicitWidth = 750 - ExplicitHeight = 307 + ExplicitHeight = 315 end end end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm index e314201a..d9974ba0 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm @@ -1,32 +1,25 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto - Width = 924 Height = 293 OnDestroy = CustomViewDestroy OnShow = CustomViewShow - ExplicitWidth = 924 ExplicitHeight = 293 inherited dxLayoutControl1: TdxLayoutControl - Width = 924 - Height = 281 + Height = 293 ExplicitWidth = 451 ExplicitHeight = 281 DesignSize = ( - 924 - 281) + 451 + 293) inherited Bevel1: TBevel Width = 73 ExplicitWidth = 73 end inherited Bevel3: TBevel - Left = 531 Height = 122 - ExplicitLeft = 531 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 643 Width = 192 - ExplicitLeft = 643 ExplicitWidth = 192 end inherited ImporteDto: TcxDBCurrencyEdit @@ -35,27 +28,29 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 87 + Width = 87 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 714 DataBinding.DataField = '' Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 - ExplicitLeft = 714 + TabOrder = 10 + ExplicitWidth = 20 + Width = 20 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 644 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 15 - ExplicitLeft = 644 + TabOrder = 13 + ExplicitWidth = 90 + Width = 90 end inherited edtDescuento: TcxDBSpinEdit Style.LookAndFeel.SkinName = '' @@ -65,46 +60,42 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleHot.LookAndFeel.SkinName = '' end inherited edtIVA: TcxDBSpinEdit - Left = 643 + Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 9 + end + inherited ImporteBase: TcxDBCurrencyEdit + Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 8 + ExplicitWidth = 91 + Width = 91 + end + inherited edtRE: TcxDBSpinEdit + DataBinding.DataField = '' Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 - ExplicitLeft = 643 - end - inherited ImporteBase: TcxDBCurrencyEdit - Left = 643 - Style.LookAndFeel.SkinName = '' - Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 - ExplicitLeft = 643 - end - inherited edtRE: TcxDBSpinEdit - Left = 643 - DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' - Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 13 - ExplicitLeft = 643 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 714 DataBinding.DataField = '' Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 14 - ExplicitLeft = 714 + TabOrder = 12 + ExplicitWidth = 20 + Width = 20 end inherited eImporteNeto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -112,6 +103,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 158 + Width = 158 end inherited ePorte: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -119,6 +112,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 158 + Width = 158 end inherited eIVA: TcxDBLookupComboBox DataBinding.DataField = '' @@ -126,10 +121,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - end - inherited bTiposIVA: TButton - Left = 383 - ExplicitLeft = 383 + ExplicitWidth = 20 + Width = 20 end inherited cbRecargoEquivalencia: TcxDBCheckBox DataBinding.DataField = '' @@ -161,7 +154,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 8 + TabOrder = 17 Height = 21 Width = 325 end @@ -196,7 +189,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 9 + TabOrder = 18 Height = 21 Width = 277 end @@ -228,6 +221,35 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto TabOrder = 7 Width = 277 end + inherited edtRetencion: TcxDBSpinEdit + Top = 240 + Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 15 + ExplicitTop = 240 + end + inherited edtImporteRetencion: TcxDBCurrencyEdit + Top = 240 + Style.LookAndFeel.SkinName = '' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 16 + ExplicitTop = 240 + end + inherited edtFechaRetencion: TcxDBDateEdit + Top = 240 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 14 + ExplicitTop = 240 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup @@ -254,16 +276,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto Control = cbBonificacion ControlOptions.ShowBorder = False end - object dxLayoutControl1Item17: TdxLayoutItem - Caption = 'Descripci'#243'n:' - Control = eDescripcionBonificacion - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item18: TdxLayoutItem - Caption = 'Importe:' - Control = eImporteBonificacion - ControlOptions.ShowBorder = False - end end inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas index 8b1d7ab6..8a12ab1b 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas @@ -8,13 +8,11 @@ uses uDADataTable, dxLayoutControl, cxCheckBox, cxDBEdit, StdCtrls, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxMaskEdit, cxSpinEdit, cxContainer, cxEdit, cxTextEdit, cxCurrencyEdit, ExtCtrls, cxControls, - uBizPresupuestosCliente, uPresupuestosClienteController; + uBizPresupuestosCliente, uPresupuestosClienteController, cxCalendar; type TfrViewTotalesPresupuesto = class(TfrViewTotales) - dxLayoutControl1Item17: TdxLayoutItem; eDescripcionBonificacion: TcxDBTextEdit; - dxLayoutControl1Item18: TdxLayoutItem; eImporteBonificacion: TcxDBCurrencyEdit; dxLayoutControl1Item19: TdxLayoutItem; cbBonificacion: TcxCheckBox; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 42780c597dc4d4424c725f677a9cf6731e1b4f6c..fe0af8c1ce9e486b2a6c2f99dfab493237007738 100644 GIT binary patch delta 17 YcmZ3mm2tsV#tmUn%!Uj`lOv + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse1620FalseFalseFalseFalseFalse308212521.6.2.01.6.2.0viernes, 09 de enero de 2009 18:39FactuGES_Server.dpr - - - - - MainSource - - - - - -

srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones_Impl
- TDataModule - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - -
srvArticulos
- TDARemoteService - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
RptFacturasProveedor
- TDataModule - - -
srvFacturasProveedor
- TDataAbstractService - - - - -
srvFamilias
- TDataAbstractService - - - - -
srvFormasPago
- TDataAbstractService - - -
srvGestorDocumentos
- TDataAbstractService - - -
srvGestorInformes
- TDataAbstractService - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvObras
- TDataAbstractService - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- TDataModule - - -
RptWordCertificadoTrabajo
- TDataModule - - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
RptRecibosProveedor
- TDataModule - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - -
srvTiposIVA
- TDataAbstractService - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse1620FalseFalseFalseFalseFalse308212521.6.2.01.6.2.0viernes, 09 de enero de 2009 18:39FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones_Impl
+ TDataModule + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + +
srvArticulos
+ TDARemoteService + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
RptFacturasProveedor
+ TDataModule + + +
srvFacturasProveedor
+ TDataAbstractService + + + + +
srvFamilias
+ TDataAbstractService + + + + +
srvFormasPago
+ TDataAbstractService + + +
srvGestorDocumentos
+ TDataAbstractService + + +
srvGestorInformes
+ TDataAbstractService + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvObras
+ TDataAbstractService + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ TDataModule + + +
RptWordCertificadoTrabajo
+ TDataModule + + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
RptRecibosProveedor
+ TDataModule + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + +
srvTiposIVA
+ TDataAbstractService + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + +