diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index ac3538d..043b602 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 57397da..c3591b0 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,8 +52,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">5</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">4</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">5.5.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">5.5.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">5</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">6</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">5.5.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">5.5.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index ce0eef2..1435ee5 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 8b251f3..1641339 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
index fa27c36..4b00364 100644
--- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas	
+++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas	
@@ -874,7 +874,9 @@ begin
       FECHA_FACTURA := DateOf(Now);
       ID_COMISION_LIQUIDADA := 0;
       FAC_PROV_GRADENIsNull := True;
+      VERIFACTU := 0;
 
+      
 {$IFDEF CONTABILIDAD}
       ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID;
       ESTADO_EJERCICIO := AppFactuGES.EjercicioActivo.ESTADO;
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm
index bfa12df..98f1f16 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm	
@@ -1,17 +1,17 @@
 inherited fEditorFacturasCliente: TfEditorFacturasCliente
   Caption = 'Lista de facturas de cliente'
   ClientHeight = 666
-  ClientWidth = 919
-  ExplicitWidth = 935
+  ClientWidth = 1288
+  ExplicitWidth = 1304
   ExplicitHeight = 704
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 919
+    Width = 1288
     Caption = 'Lista de facturas de cliente'
     ExplicitWidth = 919
     inherited Image1: TImage
-      Left = 892
+      Left = 1261
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -35,7 +35,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 919
+    Width = 1288
     ExplicitWidth = 919
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 780
@@ -77,14 +77,14 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       end
     end
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 919
+      ExplicitWidth = 1288
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 362
+      Left = 385
       DockPos = 385
       Visible = True
-      ExplicitLeft = 362
-      ExplicitWidth = 557
+      ExplicitLeft = 385
+      ExplicitWidth = 720
       object TBXItem41: TTBXItem
         Action = actAsignarTipoOperacion
         DisplayMode = nbdmImageAndText
@@ -117,14 +117,14 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
   end
   inherited StatusBar: TJvStatusBar
     Top = 647
-    Width = 919
+    Width = 1288
     ExplicitTop = 647
     ExplicitWidth = 919
   end
   inline frViewFacturasCliente1: TfrViewFacturasCliente [3]
     Left = 0
     Top = 105
-    Width = 919
+    Width = 1288
     Height = 542
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
@@ -139,7 +139,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     ExplicitWidth = 919
     ExplicitHeight = 542
     inherited cxGrid: TcxGrid
-      Width = 919
+      Width = 1288
       Height = 414
       ExplicitWidth = 919
       ExplicitHeight = 414
@@ -212,12 +212,12 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
-      Width = 919
+      Width = 1288
       ExplicitWidth = 919
       inherited TBXDockablePanel1: TTBXDockablePanel
         ExplicitWidth = 919
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 919
+          Width = 1288
           ExplicitWidth = 919
           inherited txtFiltroTodo: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
@@ -236,31 +236,31 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
             Width = 144
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 426
+            Left = 590
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 426
+            ExplicitLeft = 590
             ExplicitWidth = 263
             Width = 263
           end
           inherited txtFiltroTodo2: TcxTextEdit
-            Left = 675
+            Left = 943
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 675
+            ExplicitLeft = 943
             ExplicitWidth = 223
             Width = 223
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-          Width = 919
+          Width = 1288
           ExplicitWidth = 919
           inherited tbxBotones: TTBXToolbar
-            Width = 909
+            Width = 1278
             ExplicitWidth = 909
           end
         end
@@ -271,10 +271,10 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       ExplicitTop = 516
       ExplicitWidth = 919
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 919
+        Width = 1288
         ExplicitWidth = 919
         inherited TBXToolbar1: TTBXToolbar
-          Width = 909
+          Width = 1278
           ExplicitWidth = 909
         end
       end
@@ -1976,15 +1976,30 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     inherited N2: TMenuItem
       Visible = False
     end
-    object N4: TMenuItem [8]
+    object GenerarPDF1: TMenuItem [8]
+      Action = actGenerarPDF
+    end
+    object N4: TMenuItem [9]
       Caption = '-'
     end
-    object Cambiarlasituacin1: TMenuItem [9]
+    object Cambiarlasituacin1: TMenuItem [10]
       Caption = 'Cambiar la situaci'#243'n'
       Hint = 
         'Cambiar la situaci'#243'n de la factura seleccionada (Pendiente/Pagad' +
         'a)'
     end
+    object AsignarTipoOperacin1: TMenuItem [11]
+      Action = actAsignarTipoOperacion
+    end
+    object AsignarContrato1: TMenuItem [12]
+      Action = actAsignarContrato
+    end
+    object GenerarfacturaproveedorenGraden1: TMenuItem [13]
+      Action = ActGenerarFacturaGraden
+    end
+    object MandarVerifactu1: TMenuItem [14]
+      Action = actMandarVerifactu
+    end
   end
   object JsNuevaFacturaDialog: TJSDialog
     Content.Strings = (
@@ -4165,8 +4180,8 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       0007C0000007C000000700000007000000070000000700000007C000000FC000
       001F8000003F800000FFF8FFFFFF}
     Width = 450
-    Left = 408
-    Top = 80
+    Left = 368
+    Top = 120
   end
   object JsNuevaProformaDialog: TJSDialog
     Content.Strings = (
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas
index 103bcc8..497c4cb 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas	
@@ -53,6 +53,11 @@ type
     actMandarVerifactu: TAction;
     TBXItem46: TTBXItem;
     TBSeparatorItem2: TTBSeparatorItem;
+    GenerarPDF1: TMenuItem;
+    AsignarContrato1: TMenuItem;
+    AsignarTipoOperacin1: TMenuItem;
+    GenerarfacturaproveedorenGraden1: TMenuItem;
+    MandarVerifactu1: TMenuItem;
     procedure FormShow(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
     procedure actNuevaFacturaExecute(Sender: TObject);
diff --git a/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas b/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas
index 5d4dc26..3300f21 100644
--- a/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas	
+++ b/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas	
@@ -53,7 +53,10 @@ begin
   AAlbaran.CODIGO_POSTAL := AContrato.CODIGO_POSTAL_ENVIO;
   AAlbaran.POBLACION := AContrato.POBLACION_ENVIO;
   AAlbaran.PROVINCIA := AContrato.PROVINCIA_ENVIO;
-  AAlbaran.PAIS := AContrato.PAIS_ENVIO;
+  AAlbaran.PAIS := AContrato.PAIS;
+  AAlbaran.IDIOMA_ISO := AContrato.IDIOMA_ISO;
+  AAlbaran.IDIOMA := AContrato.IDIOMA;
+  AAlbaran.PAIS_ENVIO := AContrato.PAIS_ENVIO;
   AAlbaran.PERSONA_CONTACTO := AContrato.PERS_CONTACTO_ENVIO;
   AAlbaran.TELEFONO := AContrato.TLFS_ENVIO;
   AAlbaran.NOTAS_ENVIO := AContrato.NOTAS_ENVIO;  
diff --git a/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas b/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas
index 5b5219b..f990407 100644
--- a/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas	
+++ b/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas	
@@ -63,7 +63,9 @@ begin
   AFactura.POBLACION := AContrato.POBLACION;
   AFactura.PROVINCIA := AContrato.PROVINCIA;
   AFactura.CODIGO_POSTAL := AContrato.CODIGO_POSTAL;
-
+  AFactura.PAIS := AContrato.PAIS;
+  AFactura.IDIOMA_ISO := AContrato.IDIOMA_ISO;
+  AFactura.IDIOMA := AContrato.IDIOMA;
 
 //  AFactura.PERSONA_CONTACTO := AContrato.PERSONA_CONTACTO;
 //  AFactura.DataTable.FieldByName(fld_FacturasClientePLAZO_ENTREGA).AsVariant := AContrato.DataTable.FieldByName(fld_ContratosClientePLAZO_ENTREGA).AsVariant;
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 705af99..543816f 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ