From 335caba848be73cec923c4180ad3ca557efa5c77 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Thu, 15 Jan 2009 13:12:13 +0000
Subject: [PATCH] Se abren los editores para que hereden los cambios de la
 vista de totales

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@840 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/Base/Base.res                          | Bin 4748 -> 384 bytes
 .../Views/uEditorAlbaranCliente.dfm           | 108 +--
 .../Views/uEditorAlbaranDevCliente.dfm        |  66 +-
 .../Views/uEditorAlbaranDevProveedor.dfm      |  74 +-
 .../Views/uEditorAlbaranProveedor.dfm         | 180 ++---
 .../Model/schFacturasClienteClient_Intf.pas   |   6 +-
 .../Views/uEditorFacturaProveedor.dfm         |  88 ++-
 .../Views/uEditorPedidoProveedor.dfm          |  68 +-
 .../Views/uEditorPresupuestoCliente.dfm       | 152 +++--
 Source/Servidor/FactuGES_Server.RES           | Bin 23484 -> 23200 bytes
 Source/Servidor/FactuGES_Server.dproj         | 638 +++++++++---------
 Source/Servidor/FactuGES_Server.rc            |  10 +-
 12 files changed, 775 insertions(+), 615 deletions(-)

diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
delta 11
ScmeBCZD5|Duvteife`=|>;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?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>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*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;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;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>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-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}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((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
index ef376508..687529c7 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm	
@@ -196,27 +196,27 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         ExplicitHeight = 378
         inherited ToolBar1: TToolBar
           Width = 751
-          Height = 51
+          Height = 46
           ExplicitWidth = 751
-          ExplicitHeight = 51
+          ExplicitHeight = 46
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
+            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
-          inherited ToolButton14: TToolButton [4]
-            Left = 334
-            Top = 0
-            ExplicitLeft = 334
-            ExplicitTop = 0
+          inherited ToolButton14: TToolButton
+            Left = 0
+            Wrap = False
+            ExplicitLeft = 0
           end
-          inherited FontName: TJvFontComboBox [5]
-            Left = 399
-            Top = 0
+          inherited FontName: TJvFontComboBox
+            Left = 65
+            Top = 22
             ExplicitLeft = 399
             ExplicitTop = 0
           end
@@ -242,44 +242,43 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
             ExplicitTop = 0
             ExplicitHeight = 27
           end
-          inherited ToolButton6: TToolButton [9]
+          inherited ToolButton6: TToolButton
             Left = 0
             Top = 27
             ExplicitLeft = 0
             ExplicitTop = 27
           end
-          inherited ToolButton7: TToolButton [10]
+          inherited ToolButton7: TToolButton
             Left = 66
             Top = 27
             ExplicitLeft = 66
             ExplicitTop = 27
           end
-          inherited ToolButton8: TToolButton [11]
+          inherited ToolButton8: TToolButton
             Left = 133
             Top = 27
             ExplicitLeft = 133
             ExplicitTop = 27
           end
-          inherited ToolButton12: TToolButton [12]
+          inherited ToolButton12: TToolButton
             Left = 216
             Top = 27
             ExplicitLeft = 216
             ExplicitTop = 27
-            ExplicitHeight = 22
           end
-          inherited ToolButton9: TToolButton [13]
+          inherited ToolButton9: TToolButton
             Left = 224
             Top = 27
             ExplicitLeft = 224
             ExplicitTop = 27
           end
-          inherited ToolButton10: TToolButton [14]
+          inherited ToolButton10: TToolButton
             Left = 369
             Top = 27
             ExplicitLeft = 369
             ExplicitTop = 27
           end
-          inherited ToolButton11: TToolButton [15]
+          inherited ToolButton11: TToolButton
             Left = 494
             Top = 27
             ExplicitLeft = 494
@@ -385,7 +384,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 765
       Height = 78
-      Align = alClient
       LookAndFeel = dxLayoutOfficeLookAndFeel1
       ExplicitWidth = 765
       ExplicitHeight = 78
@@ -398,20 +396,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 368
+        Left = 378
         Top = 11
         Width = 7
         Height = 54
-        ExplicitLeft = 368
+        ExplicitLeft = 378
         ExplicitTop = 11
         ExplicitWidth = 7
         ExplicitHeight = 54
       end
       inherited Bevel4: TBevel
-        Left = 484
+        Left = 494
         Top = 92
         Width = 192
-        ExplicitLeft = 484
+        ExplicitLeft = 494
         ExplicitTop = 92
         ExplicitWidth = 192
       end
@@ -425,11 +423,9 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 164
         ExplicitTop = 112
-        ExplicitWidth = 188
-        Width = 188
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 555
+        Left = 565
         Top = 38
         DataBinding.DataField = ''
         Style.LookAndFeel.SkinName = ''
@@ -437,20 +433,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 555
+        ExplicitLeft = 565
         ExplicitTop = 38
         ExplicitWidth = 182
         Width = 182
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 485
+        Left = 495
         Top = 112
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 485
+        ExplicitLeft = 495
         ExplicitTop = 112
         ExplicitWidth = 252
         Width = 252
@@ -467,7 +463,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         ExplicitTop = 112
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 484
+        Left = 494
         Top = 38
         DataBinding.DataField = ''
         Style.LookAndFeel.SkinName = ''
@@ -475,24 +471,24 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 484
+        ExplicitLeft = 494
         ExplicitTop = 38
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 484
+        Left = 494
         Top = 11
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 484
+        ExplicitLeft = 494
         ExplicitTop = 11
         ExplicitWidth = 253
         Width = 253
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 484
+        Left = 494
         Top = 65
         DataBinding.DataField = ''
         Style.LookAndFeel.SkinName = ''
@@ -500,11 +496,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 484
+        ExplicitLeft = 494
         ExplicitTop = 65
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 555
+        Left = 565
         Top = 65
         DataBinding.DataField = ''
         Style.LookAndFeel.SkinName = ''
@@ -512,7 +508,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 555
+        ExplicitLeft = 565
         ExplicitTop = 65
         ExplicitWidth = 182
         Width = 182
@@ -527,8 +523,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 11
-        ExplicitWidth = 259
-        Width = 259
       end
       inherited ePorte: TcxDBCurrencyEdit
         Left = 93
@@ -541,8 +535,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 139
-        ExplicitWidth = 259
-        Width = 259
       end
       inherited eIVA: TcxDBLookupComboBox
         Left = 93
@@ -554,13 +546,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 38
-        ExplicitWidth = 121
-        Width = 121
       end
       inherited bTiposIVA: TButton
-        Left = 220
+        Left = 230
         Top = 38
-        ExplicitLeft = 220
+        ExplicitLeft = 230
         ExplicitTop = 38
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
@@ -574,8 +564,32 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 65
-        ExplicitWidth = 259
-        Width = 259
+      end
+      inherited edtRetencion: TcxDBSpinEdit
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 185
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 185
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 185
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
index f652cc68..64d98ea7 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm	
@@ -36,12 +36,6 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
     end
   end
   inherited pgPaginas: TPageControl
-    inherited pagGeneral: TTabSheet
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
-    end
     inherited pagContenido: TTabSheet
       inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
         inherited ToolBar1: TToolBar
@@ -49,6 +43,10 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
             Width = 90
             ExplicitWidth = 90
           end
+          inherited UpDown1: TUpDown
+            Left = 634
+            ExplicitLeft = 634
+          end
         end
         inherited cxGridPopupMenu: TcxGridPopupMenu
           PopupMenus = <
@@ -78,15 +76,15 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
     inherited dxLayoutControl1: TdxLayoutControl
       LookAndFeel = dxLayoutOfficeLookAndFeel1
       inherited Bevel3: TBevel
-        Left = 351
+        Left = 340
         Height = 54
-        ExplicitLeft = 351
+        ExplicitLeft = 340
         ExplicitHeight = 54
       end
       inherited Bevel4: TBevel
-        Left = 467
+        Left = 456
         Width = 285
-        ExplicitLeft = 467
+        ExplicitLeft = 456
         ExplicitWidth = 285
       end
       inherited ImporteDto: TcxDBCurrencyEdit
@@ -99,24 +97,24 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
         Width = 151
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 538
+        Left = 527
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 538
+        ExplicitLeft = 527
         ExplicitWidth = 219
         Width = 219
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 468
+        Left = 457
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 468
+        ExplicitLeft = 457
         ExplicitWidth = 289
         Width = 289
       end
@@ -128,42 +126,42 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
         StyleHot.LookAndFeel.SkinName = ''
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 467
+        Left = 456
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 467
+        ExplicitLeft = 456
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 467
+        Left = 456
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 467
+        ExplicitLeft = 456
         ExplicitWidth = 290
         Width = 290
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 467
+        Left = 456
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 467
+        ExplicitLeft = 456
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 538
+        Left = 527
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 538
+        ExplicitLeft = 527
         ExplicitWidth = 219
         Width = 219
       end
@@ -194,8 +192,8 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
         Width = 84
       end
       inherited bTiposIVA: TButton
-        Left = 203
-        ExplicitLeft = 203
+        Left = 192
+        ExplicitLeft = 192
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Style.LookAndFeel.SkinName = ''
@@ -205,6 +203,26 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
         ExplicitWidth = 222
         Width = 222
       end
+      inherited edtRetencion: TcxDBSpinEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           inherited dxLayoutControl1Group2: TdxLayoutGroup
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm
index ef373cf9..1a5f4d09 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm	
@@ -1,7 +1,5 @@
 inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
   Caption = 'Nueva orden de devoluci'#243'n de proveedor'
-  ExplicitWidth = 320
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -38,42 +36,8 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
     end
   end
   inherited pgPaginas: TPageControl
-    inherited pagGeneral: TTabSheet
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
-    end
     inherited pagContenido: TTabSheet
       inherited frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor
-        inherited ToolBar1: TToolBar
-          inherited FontSize: TEdit [1]
-            Left = 109
-            ExplicitLeft = 109
-          end
-          inherited UpDown1: TUpDown [2]
-            Left = 199
-            ExplicitLeft = 199
-          end
-          inherited ToolButton2: TToolButton [3]
-            Left = 216
-          end
-          inherited ToolButton3: TToolButton [4]
-            Left = 330
-            Wrap = False
-          end
-          inherited ToolButton14: TToolButton [5]
-            Left = 385
-            ExplicitLeft = 385
-          end
-          inherited FontName: TJvFontComboBox [6]
-            Left = 450
-            ExplicitLeft = 450
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitTop = 27
-          end
-        end
         inherited cxGrid: TcxGrid
           ExplicitTop = 72
         end
@@ -122,6 +86,8 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 199
+        Width = 199
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
         Style.LookAndFeel.SkinName = ''
@@ -129,6 +95,8 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 192
+        Width = 192
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
         Style.LookAndFeel.SkinName = ''
@@ -136,6 +104,8 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 262
+        Width = 262
       end
       inherited edtDescuento: TcxDBSpinEdit
         Style.LookAndFeel.SkinName = ''
@@ -157,6 +127,8 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 263
+        Width = 263
       end
       inherited edtRE: TcxDBSpinEdit
         Style.LookAndFeel.SkinName = ''
@@ -171,6 +143,8 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 192
+        Width = 192
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
         Style.LookAndFeel.SkinName = ''
@@ -178,6 +152,8 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 270
+        Width = 270
       end
       inherited ePorte: TcxDBCurrencyEdit
         Style.LookAndFeel.SkinName = ''
@@ -185,18 +161,44 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 270
+        Width = 270
       end
       inherited eIVA: TcxDBLookupComboBox
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 132
+        Width = 132
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitWidth = 270
+        Width = 270
+      end
+      inherited edtRetencion: TcxDBSpinEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
index f7548248..eff07445 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm	
@@ -164,10 +164,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor
         Left = 0
         Top = 0
@@ -188,103 +184,106 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         ExplicitHeight = 426
         inherited ToolBar1: TToolBar
           Width = 751
-          Height = 46
+          Height = 51
           ExplicitWidth = 751
-          ExplicitHeight = 46
+          ExplicitHeight = 51
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
-            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
-            Left = 0
+            Left = 334
+            Top = 0
             Wrap = False
-            ExplicitLeft = 0
+            ExplicitLeft = 334
+            ExplicitTop = 0
           end
           inherited FontName: TJvFontComboBox
-            Left = 65
-            Top = 22
-            ExplicitLeft = 65
-            ExplicitTop = 22
+            Left = 399
+            Top = 0
+            ExplicitLeft = 399
+            ExplicitTop = 0
           end
           inherited FontSize: TEdit
-            Left = 210
-            Top = 22
+            Left = 544
+            Top = 0
             Width = 90
-            ExplicitLeft = 210
-            ExplicitTop = 22
+            ExplicitLeft = 544
+            ExplicitTop = 0
             ExplicitWidth = 90
           end
           inherited UpDown1: TUpDown
-            Left = 300
-            Top = 22
-            ExplicitLeft = 300
-            ExplicitTop = 22
+            Left = 634
+            Top = 0
+            ExplicitLeft = 634
+            ExplicitTop = 0
           end
           inherited ToolButton13: TToolButton
-            Left = 317
-            Top = 22
-            ExplicitLeft = 317
-            ExplicitTop = 22
+            Left = 0
+            Top = 0
+            Wrap = True
+            ExplicitLeft = 0
+            ExplicitTop = 0
+            ExplicitHeight = 27
           end
           inherited ToolButton6: TToolButton
-            Left = 325
-            Top = 22
-            ExplicitLeft = 325
-            ExplicitTop = 22
+            Left = 0
+            Top = 27
+            ExplicitLeft = 0
+            ExplicitTop = 27
           end
           inherited ToolButton7: TToolButton
-            Left = 391
-            Top = 22
-            ExplicitLeft = 391
-            ExplicitTop = 22
+            Left = 66
+            Top = 27
+            ExplicitLeft = 66
+            ExplicitTop = 27
           end
           inherited ToolButton8: TToolButton
-            Left = 458
-            Top = 22
-            ExplicitLeft = 458
-            ExplicitTop = 22
+            Left = 133
+            Top = 27
+            ExplicitLeft = 133
+            ExplicitTop = 27
           end
           inherited ToolButton12: TToolButton
-            Left = 541
-            Top = 22
-            ExplicitLeft = 541
-            ExplicitTop = 22
+            Left = 216
+            Top = 27
+            ExplicitLeft = 216
+            ExplicitTop = 27
           end
           inherited ToolButton9: TToolButton
-            Left = 549
-            Top = 22
-            ExplicitLeft = 549
-            ExplicitTop = 22
+            Left = 224
+            Top = 27
+            ExplicitLeft = 224
+            ExplicitTop = 27
           end
           inherited ToolButton10: TToolButton
-            Left = 694
-            Top = 22
-            ExplicitLeft = 694
-            ExplicitTop = 22
+            Left = 369
+            Top = 27
+            ExplicitLeft = 369
+            ExplicitTop = 27
           end
           inherited ToolButton11: TToolButton
-            Left = 819
-            Top = 22
-            ExplicitLeft = 819
-            ExplicitTop = 22
+            Left = 494
+            Top = 27
+            ExplicitLeft = 494
+            ExplicitTop = 27
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 72
+          Top = 77
           Width = 751
-          Height = 354
+          Height = 349
           ExplicitTop = 77
           ExplicitWidth = 751
           ExplicitHeight = 349
         end
         inherited TBXDock1: TTBXDock
-          Top = 46
+          Top = 51
           Width = 751
           ExplicitTop = 51
           ExplicitWidth = 751
@@ -306,10 +305,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
@@ -377,8 +372,10 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
     ExplicitHeight = 64
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 765
+      Height = 64
       LookAndFeel = dxLayoutOfficeLookAndFeel1
       ExplicitWidth = 765
+      ExplicitHeight = 64
       inherited Bevel1: TBevel
         Left = 93
         Top = 92
@@ -388,18 +385,18 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 379
+        Left = 381
         Top = 11
         Height = 30
-        ExplicitLeft = 379
+        ExplicitLeft = 381
         ExplicitTop = 11
         ExplicitHeight = 30
       end
       inherited Bevel4: TBevel
-        Left = 491
+        Left = 493
         Top = 92
         Width = 21
-        ExplicitLeft = 491
+        ExplicitLeft = 493
         ExplicitTop = 92
         ExplicitWidth = 21
       end
@@ -417,27 +414,27 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         Width = 199
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 562
+        Left = 564
         Top = 38
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 562
+        ExplicitLeft = 564
         ExplicitTop = 38
         ExplicitWidth = 192
         Width = 192
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 492
+        Left = 494
         Top = 112
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 492
+        ExplicitLeft = 494
         ExplicitTop = 112
         ExplicitWidth = 262
         Width = 262
@@ -455,7 +452,7 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         ExplicitTop = 112
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 491
+        Left = 493
         Top = 38
         Properties.OnValidate = frViewTotales1edtIVAPropertiesValidate
         Style.LookAndFeel.SkinName = ''
@@ -463,24 +460,24 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 491
+        ExplicitLeft = 493
         ExplicitTop = 38
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 491
+        Left = 493
         Top = 11
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 491
+        ExplicitLeft = 493
         ExplicitTop = 11
         ExplicitWidth = 263
         Width = 263
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 491
+        Left = 493
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
@@ -489,11 +486,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 491
+        ExplicitLeft = 493
         ExplicitTop = 65
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 562
+        Left = 564
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
@@ -502,7 +499,7 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 562
+        ExplicitLeft = 564
         ExplicitTop = 65
         ExplicitWidth = 192
         Width = 192
@@ -549,9 +546,9 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         Width = 132
       end
       inherited bTiposIVA: TButton
-        Left = 231
+        Left = 233
         Top = 38
-        ExplicitLeft = 231
+        ExplicitLeft = 233
         ExplicitTop = 38
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
@@ -565,9 +562,34 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         ExplicitLeft = 93
         ExplicitTop = 65
         ExplicitWidth = 270
-        ExplicitHeight = 0
         Width = 270
       end
+      inherited edtRetencion: TcxDBSpinEdit
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 185
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 185
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 185
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           ShowCaption = False
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
index 53658ae5..94cf99d0 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schFacturasClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -384,7 +384,7 @@ type
   end;
 
   { TFacturasClienteDataTableRules }
-  TFacturasClienteDataTableRules = class(TDADataTableRules, IFacturasCliente)
+  TFacturasClienteDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente)
   private
     f_OBSERVACIONES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
@@ -738,7 +738,7 @@ type
   end;
 
   { TFacturasCliente_DetallesDataTableRules }
-  TFacturasCliente_DetallesDataTableRules = class(TDADataTableRules, IFacturasCliente_Detalles)
+  TFacturasCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente_Detalles)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
index 5327addd..213c625f 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
@@ -140,8 +140,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             Width = 104
           end
           inherited bFormasPago: TButton
-            Left = 246
-            ExplicitLeft = 246
+            Left = 251
+            ExplicitLeft = 251
           end
           inherited eReferenciaProveedor: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
@@ -152,9 +152,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             Width = 242
           end
           inherited frViewProveedorFactura: TfrViewDatosYSeleccionProveedor
-            Left = 406
+            Left = 411
             Width = 377
-            ExplicitLeft = 406
+            ExplicitLeft = 411
             ExplicitWidth = 377
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 377
@@ -205,17 +205,17 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
                 Width = 303
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 285
+                Left = 280
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 285
+                ExplicitLeft = 280
               end
               inherited Button3: TBitBtn
-                Left = 169
-                ExplicitLeft = 169
+                Left = 164
+                ExplicitLeft = 164
               end
             end
           end
@@ -224,12 +224,16 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 165
+            Width = 165
           end
           inherited edtFechaVencimiento: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 251
+            Width = 251
           end
         end
       end
@@ -452,7 +456,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     ExplicitHeight = 163
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 819
+      Height = 163
       ExplicitWidth = 819
+      ExplicitHeight = 163
       inherited Bevel1: TBevel
         Top = 111
         Width = 73
@@ -460,18 +466,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 451
+        Left = 454
         Top = 30
         Height = 122
-        ExplicitLeft = 451
+        ExplicitLeft = 454
         ExplicitTop = 30
         ExplicitHeight = 122
       end
       inherited Bevel4: TBevel
-        Left = 563
+        Left = 566
         Top = 111
         Width = 186
-        ExplicitLeft = 563
+        ExplicitLeft = 566
         ExplicitTop = 111
         ExplicitWidth = 186
       end
@@ -487,27 +493,27 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Width = 260
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 634
+        Left = 637
         Top = 57
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 634
+        ExplicitLeft = 637
         ExplicitTop = 57
         ExplicitWidth = 163
         Width = 163
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 564
+        Left = 567
         Top = 131
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 564
+        ExplicitLeft = 567
         ExplicitTop = 131
         ExplicitWidth = 233
         Width = 233
@@ -523,31 +529,31 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitTop = 131
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 563
+        Left = 566
         Top = 57
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 563
+        ExplicitLeft = 566
         ExplicitTop = 57
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 563
+        Left = 566
         Top = 30
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 563
+        ExplicitLeft = 566
         ExplicitTop = 30
         ExplicitWidth = 234
         Width = 234
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 563
+        Left = 566
         Top = 84
         Properties.AssignedValues.MinValue = True
         Style.LookAndFeel.SkinName = ''
@@ -555,18 +561,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 563
+        ExplicitLeft = 566
         ExplicitTop = 84
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 634
+        Left = 637
         Top = 84
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 634
+        ExplicitLeft = 637
         ExplicitTop = 84
         ExplicitWidth = 163
         Width = 163
@@ -609,10 +615,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Width = 193
       end
       inherited bTiposIVA: TButton
-        Left = 303
+        Left = 306
         Top = 57
         OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 303
+        ExplicitLeft = 306
         ExplicitTop = 57
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
@@ -626,6 +632,36 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitWidth = 331
         Width = 331
       end
+      inherited edtRetencion: TcxDBSpinEdit
+        Left = 529
+        Top = 209
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 529
+        ExplicitTop = 209
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Left = 600
+        Top = 209
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 600
+        ExplicitTop = 209
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Top = 209
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 209
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1
         inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
index f66b1c40..854aeec3 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
@@ -299,8 +299,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     ExplicitHeight = 43
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 879
+      Height = 43
       LookAndFeel = dxLayoutOfficeLookAndFeel1
       ExplicitWidth = 879
+      ExplicitHeight = 43
       inherited Bevel1: TBevel
         Left = 93
         Top = 92
@@ -310,18 +312,18 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 433
+        Left = 425
         Top = 11
         Height = 30
-        ExplicitLeft = 433
+        ExplicitLeft = 425
         ExplicitTop = 11
         ExplicitHeight = 30
       end
       inherited Bevel4: TBevel
-        Left = 545
+        Left = 537
         Top = 92
         Width = 21
-        ExplicitLeft = 545
+        ExplicitLeft = 537
         ExplicitTop = 92
         ExplicitWidth = 21
       end
@@ -339,27 +341,27 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Width = 253
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 616
+        Left = 608
         Top = 38
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 616
+        ExplicitLeft = 608
         ExplicitTop = 38
         ExplicitWidth = 252
         Width = 252
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 546
+        Left = 538
         Top = 112
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 546
+        ExplicitLeft = 538
         ExplicitTop = 112
         ExplicitWidth = 322
         Width = 322
@@ -376,31 +378,31 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         ExplicitTop = 112
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 545
+        Left = 537
         Top = 38
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 545
+        ExplicitLeft = 537
         ExplicitTop = 38
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 545
+        Left = 537
         Top = 11
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 545
+        ExplicitLeft = 537
         ExplicitTop = 11
         ExplicitWidth = 323
         Width = 323
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 545
+        Left = 537
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
@@ -409,11 +411,11 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 545
+        ExplicitLeft = 537
         ExplicitTop = 65
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 616
+        Left = 608
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
@@ -422,7 +424,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 616
+        ExplicitLeft = 608
         ExplicitTop = 65
         ExplicitWidth = 252
         Width = 252
@@ -469,9 +471,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Width = 186
       end
       inherited bTiposIVA: TButton
-        Left = 285
+        Left = 277
         Top = 38
-        ExplicitLeft = 285
+        ExplicitLeft = 277
         ExplicitTop = 38
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
@@ -487,6 +489,36 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         ExplicitWidth = 324
         Width = 324
       end
+      inherited edtRetencion: TcxDBSpinEdit
+        Left = 589
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 589
+        ExplicitTop = 185
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Left = 660
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 660
+        ExplicitTop = 185
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Top = 185
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 185
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           ShowCaption = False
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
index 7e72b786..fdaedabf 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm	
@@ -854,169 +854,184 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 764
       Height = 125
-      Align = alClient
       AutoContentSizes = [acsWidth]
       ExplicitWidth = 764
       ExplicitHeight = 125
       inherited Bevel1: TBevel
         Left = 103
-        Top = 110
+        Top = 167
         Width = 73
         ExplicitLeft = 103
-        ExplicitTop = 110
+        ExplicitTop = 167
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 432
-        Top = 29
+        Left = 391
+        Top = 86
         Height = 75
-        ExplicitLeft = 432
-        ExplicitTop = 29
+        ExplicitLeft = 391
+        ExplicitTop = 86
         ExplicitHeight = 75
       end
       inherited Bevel4: TBevel
-        Left = 544
-        Top = 110
+        Left = 503
+        Top = 167
         Width = 192
-        ExplicitLeft = 544
-        ExplicitTop = 110
+        ExplicitLeft = 503
+        ExplicitTop = 167
         ExplicitWidth = 192
       end
       inherited ImporteDto: TcxDBCurrencyEdit
         Left = 174
-        Top = 130
+        Top = 187
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 174
-        ExplicitTop = 130
+        ExplicitTop = 187
+        ExplicitWidth = 87
+        Width = 87
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 615
-        Top = 56
+        Left = 574
+        Top = 113
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 615
-        ExplicitTop = 56
+        ExplicitLeft = 574
+        ExplicitTop = 113
+        ExplicitWidth = 20
+        Width = 20
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 545
-        Top = 130
+        Left = 504
+        Top = 187
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 545
-        ExplicitTop = 130
+        ExplicitLeft = 504
+        ExplicitTop = 187
+        ExplicitWidth = 90
+        Width = 90
       end
       inherited edtDescuento: TcxDBSpinEdit
         Left = 103
-        Top = 130
+        Top = 187
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 103
-        ExplicitTop = 130
+        ExplicitTop = 187
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 544
-        Top = 56
+        Left = 503
+        Top = 113
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 544
-        ExplicitTop = 56
+        ExplicitLeft = 503
+        ExplicitTop = 113
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 544
-        Top = 29
+        Left = 503
+        Top = 86
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 544
-        ExplicitTop = 29
+        ExplicitLeft = 503
+        ExplicitTop = 86
+        ExplicitWidth = 91
+        Width = 91
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 544
-        Top = 83
+        Left = 503
+        Top = 140
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 544
-        ExplicitTop = 83
+        ExplicitLeft = 503
+        ExplicitTop = 140
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 615
-        Top = 83
+        Left = 574
+        Top = 140
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 615
-        ExplicitTop = 83
+        ExplicitLeft = 574
+        ExplicitTop = 140
+        ExplicitWidth = 20
+        Width = 20
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
         Left = 103
-        Top = 29
+        Top = 86
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 103
-        ExplicitTop = 29
+        ExplicitTop = 86
+        ExplicitWidth = 158
+        Width = 158
       end
       inherited ePorte: TcxDBCurrencyEdit
         Left = 103
-        Top = 157
+        Top = 214
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 103
-        ExplicitTop = 157
+        ExplicitTop = 214
+        ExplicitWidth = 158
+        Width = 158
       end
       inherited eIVA: TcxDBLookupComboBox
         Left = 103
-        Top = 56
+        Top = 113
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 103
-        ExplicitTop = 56
+        ExplicitTop = 113
+        ExplicitWidth = 20
+        Width = 20
       end
       inherited bTiposIVA: TButton
-        Left = 284
-        Top = 56
-        ExplicitLeft = 284
-        ExplicitTop = 56
+        Left = 243
+        Top = 113
+        ExplicitLeft = 243
+        ExplicitTop = 113
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Left = 103
-        Top = 83
+        Top = 140
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 103
-        ExplicitTop = 83
+        ExplicitTop = 140
         ExplicitWidth = 221
         Width = 221
       end
@@ -1029,8 +1044,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 103
         ExplicitTop = 211
-        ExplicitWidth = 325
-        Width = 325
       end
       inherited eImporteBonificacion: TcxDBCurrencyEdit
         Left = 103
@@ -1042,24 +1055,47 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 103
         ExplicitTop = 238
-        ExplicitWidth = 277
-        Width = 277
       end
       inherited cbBonificacion: TcxCheckBox
         Left = 21
-        Top = 184
+        Top = 241
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 21
-        ExplicitTop = 184
+        ExplicitTop = 241
         ExplicitWidth = 277
         Width = 277
       end
+      inherited edtRetencion: TcxDBSpinEdit
+        Top = 28
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 28
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Top = 28
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 28
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Top = 28
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 28
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
-          AutoAligns = [aaHorizontal]
           AlignVert = avBottom
           LookAndFeel = dxLayoutOfficeLookAndFeel1
         end
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index bb9d8bc2e3ea14dc05577dc3bf2c6d23690b7ff2..42780c597dc4d4424c725f677a9cf6731e1b4f6c 100644
GIT binary patch
delta 235
zcmdn9opHfd#tkJASq1`JJPdHa$iT)RAi%)D$RNRx!3v_`JQfB9CI$rsh};Se1_ovX
z52%BM!N342$H&0Hir}d-0L^4zSi(5@UW6PIkop(lA;JPQ85OWFPL7IHVtT+Zxh_&{
z@{>q|$#<emj8hntfGV9C@)>d&3K%jOau`w>To@7=N`N#7WHFQiS!F<6%%H=dz+lK=
VI@vW^o!x}Niot-vY;tL|I{=$BBx(Qv

delta 492
zcmY*UJxjw-6g@9(rHV)fb+d$u3hEH(pmkNMf?tC}Ubf&zQ#B@}QE<`UAny-2c61RJ
z2mK@d5C!qPytE}3lFNPP<DUESCO+Q9Yvx_q_S7^+B`^Wo1_bH|Yr31sL0APWIF7*v
zb)ZsA4hB?I;kpGj1JsI%*b?Xod|K+;YglZ5-rlTcmaAbYUpB2Dp&sS@VUxJPHey6b
z5a1RMIAV`*F_Nw3oDO=p;p+~+KF*MGPLS~*Q<ax`maQk_xX-tY%#=N#uI#y-J01}4
z=BVDEaI^O8BBauk**xZ*k`dsXx`;i+HIod>aF08MNv~KujICpgk1`=o$c<@t$8)lB
oMD-;%DwkMPzj9&jp0Ug+`t)@;aM4z4{>tPgw$MTwP}1N12Uh7xrvLx|

diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 1097c82e..cb072198 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,323 +1,323 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>FactuGES_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>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</DCC_UsePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-    <DCC_DebugVN>True</DCC_DebugVN>
-    <DCC_UnitSearchPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-    <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-    <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-    <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType />
-    <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.6.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.6.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de enero de 2009 18:39</VersionInfoKeys></VersionInfoKeys><Excluded_Packages /><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-  <ItemGroup>
-    <DelphiCompile Include="FactuGES_Server.dpr">
-      <MainSource>MainSource</MainSource>
-    </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <Form>srvEmpresas</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-      <Form>srvProvinciasPoblaciones_Impl</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-      <Form>srvUsuarios</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-      <Form>RptAlbaranesCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-      <Form>RptWordAlbaranCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-      <Form>srvAlbaranesCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-      <Form>srvAlbaranesProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-      <Form>srvAlmacenes</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-      <Form>srvArticulos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-      <Form>RptEtiquetasContacto</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-      <Form>RptFichasEmpleado</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-      <Form>srvContactos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-      <Form>srvFabricantes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-      <Form>RptFacturasCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-      <Form>RptWordFacturaCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-      <Form>srvFacturasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-      <Form>RptFacturasProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-      <Form>srvFacturasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
-      <Form>srvFamilias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
-      <Form>srvFormasPago</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-      <Form>srvGestorDocumentos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-      <Form>srvGestorInformes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-      <Form>srvHistoricoMovimientos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-      <Form>srvInventario</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
-    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
-      <Form>srvObras</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-      <Form>RptPedidosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-      <Form>RptWordPedidoProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-      <Form>srvPedidosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-      <Form>RptPresupuestosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
-      <Form>RptWordCertificadoTrabajo</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-      <Form>RptWordPresupuestoCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-      <Form>srvPresupuestosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-      <Form>RptRecibosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-      <Form>srvRecibosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-      <Form>RptRecibosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-      <Form>srvRecibosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-      <Form>srvRemesasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-      <Form>srvRemesasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
-      <Form>srvTiposIVA</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
-    </DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uServerMainForm.pas">
-      <Form>fServerForm</Form>
-    </DCCReference>
-    <DCCReference Include="Utiles\AHWord97.pas" />
-    <DCCReference Include="Utiles\RegExpr.pas" />
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<MainSource>FactuGES_Server.dpr</MainSource>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_UsePackage>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</DCC_UsePackage>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_Define>RELEASE</DCC_Define>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_Define>DEBUG;</DCC_Define>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+		<DCC_DebugVN>True</DCC_DebugVN>
+		<DCC_UnitSearchPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+		<DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+		<DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+		<DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+	</PropertyGroup>
+	<ProjectExtensions>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.ProjectType/>
+		<BorlandProject>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.6.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.6.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de enero de 2009 18:39</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+	</ProjectExtensions>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+	<ItemGroup>
+		<DelphiCompile Include="FactuGES_Server.dpr">
+			<MainSource>MainSource</MainSource>
+		</DelphiCompile>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<Form>srvEmpresas</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+			<Form>srvProvinciasPoblaciones_Impl</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+			<Form>srvUsuarios</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+			<Form>RptAlbaranesCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+			<Form>RptWordAlbaranCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+			<Form>srvAlbaranesCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+			<Form>srvAlbaranesProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+			<Form>srvAlmacenes</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+			<Form>srvArticulos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+			<Form>RptEtiquetasContacto</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+			<Form>RptFichasEmpleado</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+			<Form>srvContactos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+			<Form>srvFabricantes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+			<Form>RptFacturasCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+			<Form>RptWordFacturaCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+			<Form>srvFacturasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+			<Form>RptFacturasProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+			<Form>srvFacturasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
+			<Form>srvFamilias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
+			<Form>srvFormasPago</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+			<Form>srvGestorDocumentos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+			<Form>srvGestorInformes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+			<Form>srvHistoricoMovimientos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+			<Form>srvInventario</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
+			<Form>srvObras</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+			<Form>RptPedidosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+			<Form>RptWordPedidoProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+			<Form>srvPedidosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<Form>RptPresupuestosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
+			<Form>RptWordCertificadoTrabajo</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+			<Form>RptWordPresupuestoCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+			<Form>srvPresupuestosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+			<Form>RptRecibosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+			<Form>srvRecibosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+			<Form>RptRecibosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+			<Form>srvRecibosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<Form>srvReferencias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+			<Form>srvRemesasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+			<Form>srvRemesasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
+			<Form>srvTiposIVA</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+			<Form>srvUnidadesMedida</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<Form>srvConfiguracion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
+			<DesignClass>TForm</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
+		</DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uServerMainForm.pas">
+			<Form>fServerForm</Form>
+		</DCCReference>
+		<DCCReference Include="Utiles\AHWord97.pas"/>
+		<DCCReference Include="Utiles\RegExpr.pas"/>
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 926e822f..0600816e 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.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
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "1.6.1.0\0"
-              VALUE "ProductVersion", "1.6.1.0\0"
-              VALUE "CompileDate", "viernes, 09 de enero de 2009 18:39\0"
+              VALUE "FileVersion", "1.6.2.0\0"
+              VALUE "ProductVersion", "1.6.2.0\0"
+              VALUE "CompileDate", "jueves, 15 de enero de 2009 14:06\0"
          END
     END
     BLOCK "VarFileInfo"