- Presupuestos de cliente: Fallo en el cálculo de los totales en el resumen.

- Creación de las tablas para provincias y poblaciones
- Añadir varios artículos a la vez en pedidos y albaranes de proveedor.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@435 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Database/scripts/factuges.sql

@@ -936,6 +936,13 @@ CREATE TABLE PERMISOSEX (
 );
 
 
+CREATE TABLE POBLACIONES (
+    ID         		TIPO_ID NOT NULL,
+    ID_PROVINCIA	TIPO_ID NOT NULL,	
+    DESCRIPCION  	VARCHAR(255) NOT NULL
+);
+
+
 CREATE TABLE PRESUPUESTOS_CLIENTE (
     ID                   TIPO_ID NOT NULL,
     ID_EMPRESA           TIPO_ID,
@@ -1009,6 +1016,12 @@ CREATE TABLE PROVEEDORES_GRUPOS (
 );
 
 
+CREATE TABLE PROVINCIAS (
+    ID         		TIPO_ID NOT NULL,
+    DESCRIPCION  	VARCHAR(255) NOT NULL
+);
+
+
 CREATE TABLE RECIBOS_CLIENTE (
     ID                    TIPO_ID NOT NULL,
     ID_FACTURA            TIPO_ID,
@@ -2929,9 +2942,11 @@ ALTER TABLE PEDIDOS_CLIENTE ADD CONSTRAINT PK_PEDIDOS_CLIENTE PRIMARY KEY (ID);
 ALTER TABLE PEDIDOS_CLIENTE_DETALLES ADD CONSTRAINT PK_PEDIDOS_CLIENTE_DETALLES PRIMARY KEY (ID);
 ALTER TABLE PEDIDOS_PROVEEDOR ADD CONSTRAINT PK_PEDIDOS_PROVEEDOR PRIMARY KEY (ID);
 ALTER TABLE PEDIDOS_PROVEEDOR_DETALLES ADD CONSTRAINT PK_PEDIDOS_PROVEEDOR_DETALLES PRIMARY KEY (ID);
+ALTER TABLE POBLACIONES ADD CONSTRAINT PK_POBLACIONES PRIMARY KEY (ID);
 ALTER TABLE PRESUPUESTOS_CLIENTE ADD CONSTRAINT PK_PRESUPUESTOS_CLIENTE PRIMARY KEY (ID);
 ALTER TABLE PRESUPUESTOS_CLIENTE_DETALLES ADD CONSTRAINT PK_PRESUPUESTOS_CLIENTE_DETALLE PRIMARY KEY (ID);
 ALTER TABLE PROVEEDORES_DATOS ADD CONSTRAINT PK_PROVEEDORES_DATOS PRIMARY KEY (ID_PROVEEDOR);
+ALTER TABLE PROVINCIAS ADD CONSTRAINT PK_PROVINCIAS PRIMARY KEY (ID);
 ALTER TABLE RECIBOS_CLIENTE ADD CONSTRAINT PK_RECIBOS_CLIENTE PRIMARY KEY (ID);
 ALTER TABLE RECIBOS_PROVEEDOR ADD CONSTRAINT PK_RECIBOS_PROVEEDOR PRIMARY KEY (ID);
 ALTER TABLE REFERENCIAS ADD CONSTRAINT PK_REFERENCIAS PRIMARY KEY (ID);
@@ -3267,6 +3282,7 @@ begin
             contador = contador + 1;
             if ((tipo_detalle <> 'Concepto') or (contador = num_filas))  then
             begin
+			    total_acumulado = total_acumulado + importe_total;
                 importe_total = total_acumulado;
                 tipo_detalle = 'Titulo';
                 concepto = 'General';

Source/Base/Base.dproj

@@ -53,57 +53,57 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\designide.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\xmlrtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\designide.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\GUISDK_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 1,0,4,0
-PRODUCTVERSION 1,0,4,0
+FILEVERSION 1,0,5,0
+PRODUCTVERSION 1,0,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "1.0.4.0\0"
+              VALUE "FileVersion", "1.0.5.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "1.0.4.0\0"
+              VALUE "ProductVersion", "1.0.5\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm

@@ -1,87 +1,81 @@
 inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
   inherited ToolBar1: TToolBar
-    Height = 95
-    ExplicitHeight = 95
-    inherited FontName: TJvFontComboBox [4]
-      Left = 56
+    Height = 73
+    ExplicitHeight = 73
+    inherited ToolButton3: TToolButton
+      Wrap = False
+    end
+    inherited ToolButton4: TToolButton
+      Left = 278
+      Top = 0
+      ExplicitLeft = 278
+      ExplicitTop = 0
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
+    inherited FontName: TJvFontComboBox
       Top = 22
-      ExplicitLeft = 56
       ExplicitTop = 22
     end
-    inherited ToolButton14: TToolButton [5]
-      Left = 201
-      Wrap = False
-      ExplicitLeft = 201
-    end
     inherited FontSize: TEdit
-      Left = 266
       Top = 22
-      ExplicitLeft = 266
       ExplicitTop = 22
     end
     inherited UpDown1: TUpDown
-      Left = 308
       Top = 22
-      ExplicitLeft = 308
       ExplicitTop = 22
     end
     inherited ToolButton13: TToolButton
-      Left = 325
       Top = 22
-      ExplicitLeft = 325
       ExplicitTop = 22
     end
-    inherited ToolButton11: TToolButton [9]
-      Left = 333
+    inherited ToolButton6: TToolButton
       Top = 22
-      ExplicitLeft = 333
       ExplicitTop = 22
     end
-    inherited ToolButton12: TToolButton [10]
+    inherited ToolButton7: TToolButton
+      Top = 22
+      ExplicitTop = 22
+    end
+    inherited ToolButton8: TToolButton
+      Top = 22
+      ExplicitTop = 22
+    end
+    inherited ToolButton12: TToolButton
       Left = 0
       Top = 22
       Wrap = True
       ExplicitLeft = 0
       ExplicitTop = 22
-      ExplicitHeight = 30
+      ExplicitHeight = 27
     end
-    inherited ToolButton9: TToolButton [11]
+    inherited ToolButton9: TToolButton
       Left = 0
-      Top = 52
+      Top = 49
       ExplicitLeft = 0
-      ExplicitTop = 52
+      ExplicitTop = 49
     end
-    inherited ToolButton10: TToolButton [12]
+    inherited ToolButton10: TToolButton
       Left = 145
-      Top = 52
+      Top = 49
       ExplicitLeft = 145
-      ExplicitTop = 52
+      ExplicitTop = 49
     end
-    inherited ToolButton6: TToolButton [13]
+    inherited ToolButton11: TToolButton
       Left = 270
-      Top = 52
+      Top = 49
       ExplicitLeft = 270
-      ExplicitTop = 52
-    end
-    inherited ToolButton7: TToolButton [14]
-      Left = 336
-      Top = 52
-      Wrap = True
-      ExplicitLeft = 336
-      ExplicitTop = 52
-    end
-    inherited ToolButton8: TToolButton [15]
-      Left = 0
-      Top = 74
-      ExplicitLeft = 0
-      ExplicitTop = 74
+      ExplicitTop = 49
     end
   end
   inherited cxGrid: TcxGrid
-    Top = 121
-    Height = 183
-    ExplicitTop = 99
-    ExplicitHeight = 210
+    Top = 99
+    Height = 205
+    ExplicitWidth = 451
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewTIPO: TcxGridDBColumn
         Visible = False
@@ -90,16 +84,30 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
     end
   end
   inherited TBXDock1: TTBXDock
-    Top = 95
-    ExplicitTop = 68
+    Top = 73
+    ExplicitWidth = 451
     inherited TBXToolbar1: TTBXToolbar
       DockPos = 0
       inherited TBXSubmenuItem1: TTBXSubmenuItem
         Visible = False
       end
-      inherited TBXSeparatorItem6: TTBXSeparatorItem
-        Visible = False
+      object TBXItem18: TTBXItem [1]
+        Action = actAnadirArticulos
+        DisplayMode = nbdmImageAndText
       end
     end
   end
+  inherited ActionListContenido: TActionList
+    inherited actAnadirArticulos: TAction
+      Caption = 'A'#241'adir art'#237'culos...'
+    end
+  end
+  inherited GridGeneralPopupMenu: TPopupMenu
+    object Aadirartculos1: TMenuItem [4]
+      Action = actAnadirArticulos
+    end
+    object N2: TMenuItem [5]
+      Caption = '-'
+    end
+  end
 end

Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas

@@ -31,6 +31,9 @@ type
   end;
 
   TfrViewDetallesAlbaranCliente = class(TfrViewDetallesArticulos, IViewDetallesAlbaranCliente)
+    N2: TMenuItem;
+    Aadirartculos1: TMenuItem;
+    TBXItem18: TTBXItem;
   protected
     FAlbaran: IBizAlbaranCliente;
     function GetAlbaran: IBizAlbaranCliente;

Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm

@@ -1,87 +1,81 @@
 inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
   inherited ToolBar1: TToolBar
-    Height = 95
-    ExplicitHeight = 95
-    inherited FontName: TJvFontComboBox [4]
-      Left = 56
+    Height = 73
+    ExplicitHeight = 73
+    inherited ToolButton3: TToolButton
+      Wrap = False
+    end
+    inherited ToolButton4: TToolButton
+      Left = 278
+      Top = 0
+      ExplicitLeft = 278
+      ExplicitTop = 0
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
+    inherited FontName: TJvFontComboBox
       Top = 22
-      ExplicitLeft = 56
       ExplicitTop = 22
     end
-    inherited ToolButton14: TToolButton [5]
-      Left = 201
-      Wrap = False
-      ExplicitLeft = 201
-    end
     inherited FontSize: TEdit
-      Left = 266
       Top = 22
-      ExplicitLeft = 266
       ExplicitTop = 22
     end
     inherited UpDown1: TUpDown
-      Left = 308
       Top = 22
-      ExplicitLeft = 308
       ExplicitTop = 22
     end
     inherited ToolButton13: TToolButton
-      Left = 325
       Top = 22
-      ExplicitLeft = 325
       ExplicitTop = 22
     end
-    inherited ToolButton11: TToolButton [9]
-      Left = 333
+    inherited ToolButton6: TToolButton
       Top = 22
-      ExplicitLeft = 333
       ExplicitTop = 22
     end
-    inherited ToolButton12: TToolButton [10]
+    inherited ToolButton7: TToolButton
+      Top = 22
+      ExplicitTop = 22
+    end
+    inherited ToolButton8: TToolButton
+      Top = 22
+      ExplicitTop = 22
+    end
+    inherited ToolButton12: TToolButton
       Left = 0
       Top = 22
       Wrap = True
       ExplicitLeft = 0
       ExplicitTop = 22
-      ExplicitHeight = 30
+      ExplicitHeight = 27
     end
-    inherited ToolButton9: TToolButton [11]
+    inherited ToolButton9: TToolButton
       Left = 0
-      Top = 52
+      Top = 49
       ExplicitLeft = 0
-      ExplicitTop = 52
+      ExplicitTop = 49
     end
-    inherited ToolButton10: TToolButton [12]
+    inherited ToolButton10: TToolButton
       Left = 145
-      Top = 52
+      Top = 49
       ExplicitLeft = 145
-      ExplicitTop = 52
+      ExplicitTop = 49
     end
-    inherited ToolButton6: TToolButton [13]
+    inherited ToolButton11: TToolButton
       Left = 270
-      Top = 52
+      Top = 49
       ExplicitLeft = 270
-      ExplicitTop = 52
-    end
-    inherited ToolButton7: TToolButton [14]
-      Left = 336
-      Top = 52
-      Wrap = True
-      ExplicitLeft = 336
-      ExplicitTop = 52
-    end
-    inherited ToolButton8: TToolButton [15]
-      Left = 0
-      Top = 74
-      ExplicitLeft = 0
-      ExplicitTop = 74
+      ExplicitTop = 49
     end
   end
   inherited cxGrid: TcxGrid
-    Top = 121
-    Height = 183
-    ExplicitTop = 99
-    ExplicitHeight = 210
+    Top = 99
+    Height = 205
+    ExplicitWidth = 451
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
         Properties.ReadOnly = False
@@ -89,15 +83,29 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
     end
   end
   inherited TBXDock1: TTBXDock
-    Top = 95
-    ExplicitTop = 68
+    Top = 73
+    ExplicitWidth = 451
     inherited TBXToolbar1: TTBXToolbar
       inherited TBXSubmenuItem1: TTBXSubmenuItem
         Visible = False
       end
-      inherited TBXSeparatorItem6: TTBXSeparatorItem
-        Visible = False
+      object TBXItem18: TTBXItem [1]
+        Action = actAnadirArticulos
+        DisplayMode = nbdmImageAndText
       end
     end
   end
+  inherited ActionListContenido: TActionList
+    inherited actAnadirArticulos: TAction
+      Caption = 'A'#241'adir art'#237'culos...'
+    end
+  end
+  inherited GridGeneralPopupMenu: TPopupMenu
+    object Aadirartculos1: TMenuItem [4]
+      Action = actAnadirArticulos
+    end
+    object N2: TMenuItem [5]
+      Caption = '-'
+    end
+  end
 end

Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas

@@ -29,6 +29,9 @@ type
   end;
 
   TfrViewDetallesAlbaranProveedor = class(TfrViewDetallesArticulos, IViewDetallesAlbaranProveedor)
+    TBXItem18: TTBXItem;
+    N2: TMenuItem;
+    Aadirartculos1: TMenuItem;
   protected
     FAlbaran: IBizAlbaranProveedor;
     function GetAlbaran: IBizAlbaranProveedor;

Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.dfm

@@ -1,12 +1,25 @@
 inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
-  Width = 734
-  Height = 415
+  Width = 753
   inherited ToolBar1: TToolBar
-    Width = 734
+    Width = 753
     Height = 51
-    inherited ToolButton14: TToolButton
+    ExplicitHeight = 73
+    inherited ToolButton3: TToolButton
       Wrap = False
     end
+    inherited ToolButton4: TToolButton
+      Left = 278
+      Top = 0
+      ExplicitLeft = 278
+      ExplicitTop = 0
+    end
+    inherited ToolButton14: TToolButton
+      Left = 334
+      Top = 0
+      Wrap = False
+      ExplicitLeft = 334
+      ExplicitTop = 0
+    end
     inherited FontName: TJvFontComboBox
       Left = 399
       Top = 0
@@ -54,10 +67,8 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
     inherited ToolButton12: TToolButton
       Left = 216
       Top = 27
-      Wrap = False
       ExplicitLeft = 216
       ExplicitTop = 27
-      ExplicitHeight = 22
     end
     inherited ToolButton9: TToolButton
       Left = 224
@@ -80,8 +91,9 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
   end
   inherited cxGrid: TcxGrid
     Top = 77
-    Width = 734
-    Height = 338
+    Width = 753
+    Height = 227
+    ExplicitWidth = 451
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewTIPO: TcxGridDBColumn
         Visible = False
@@ -94,15 +106,27 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
   end
   inherited TBXDock1: TTBXDock
     Top = 51
-    Width = 734
+    Width = 753
+    ExplicitWidth = 451
     inherited TBXToolbar1: TTBXToolbar
-      ExplicitWidth = 626
+      ExplicitWidth = 745
       inherited TBXSubmenuItem1: TTBXSubmenuItem
         Visible = False
       end
-      inherited TBXSeparatorItem6: TTBXSeparatorItem
-        Visible = False
+      object TBXItem18: TTBXItem [1]
+        Action = actAnadirArticulos
+        Caption = 'A'#241'adir art'#237'culos...'
+        DisplayMode = nbdmImageAndText
       end
     end
   end
+  inherited GridGeneralPopupMenu: TPopupMenu
+    object Artculosdelcatlogo1: TMenuItem [4]
+      Action = actAnadirArticulos
+      Caption = 'A'#241'adir art'#237'culos...'
+    end
+    object N2: TMenuItem [5]
+      Caption = '-'
+    end
+  end
 end

Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas

@@ -12,7 +12,13 @@ uses
   Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns,
   JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
   uControllerDetallesArticulos, uBizPedidosProveedor, uDAInterfaces,
-  cxButtonEdit, cxDropDownEdit;
+  cxButtonEdit, cxDropDownEdit, dxSkinsCore, dxSkinBlack, dxSkinBlue,
+  dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter, Menus, cxGridCustomPopupMenu, cxGridPopupMenu;
 
 type
   IViewDetallesPedidoProveedor = interface(IViewDetallesArticulos)
@@ -23,6 +29,9 @@ type
   end;
 
   TfrViewDetallesPedidoProveedor = class(TfrViewDetallesArticulos, IViewDetallesPedidoProveedor)
+    TBXItem18: TTBXItem;
+    Artculosdelcatlogo1: TMenuItem;
+    N2: TMenuItem;
     procedure CustomViewDestroy(Sender: TObject);
   protected
     FPedido: IBizPedidoProveedor;

Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas

@@ -26,10 +26,11 @@ implementation
 { TBizDetallesPresupuestoCliente }
 
 uses
-  Dialogs, DB,  SysUtils;
+  Dialogs, DB,  SysUtils, JclStrings;
 
 const
-  SaltoLinea = #13#10; //--> #$D#$A
+  SALTO_LINEA = #13#10; //--> #$D#$A
+  PARRAFO_FINAL = '\par}';
 
 procedure TBizDetallesPresupuestoCliente.BeforeInsert(Sender: TDADataTable);
 var
@@ -45,7 +46,9 @@ procedure TBizDetallesPresupuestoCliente.BeforePost(Sender: TDADataTable);
 begin
   inherited;
   // Hay que quitar los saltos de línea que puedan estar en CONCEPTO
-  CONCEPTO := StringReplace(CONCEPTO, SaltoLinea, '', [rfReplaceAll]);
+  CONCEPTO := StringReplace(CONCEPTO, SALTO_LINEA, '', [rfReplaceAll]);
+  if StrStrCount(CONCEPTO, PARRAFO_FINAL) > 0 then
+    CONCEPTO := StrEnsureNoSuffix(PARRAFO_FINAL, CONCEPTO) + '}';
 end;
 
 procedure TBizDetallesPresupuestoCliente.OnNewRecord(Sender: TDADataTable);

Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm

@@ -618,7 +618,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     PrintOptions.Printer = 'Por defecto'
     PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 39065.872423495400000000
-    ReportOptions.LastChange = 39461.553128067100000000
+    ReportOptions.LastChange = 39604.452998402800000000
     ScriptLanguage = 'PascalScript'
     ScriptText.Strings = (
       ''
@@ -733,7 +733,12 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
       'procedure Memo47OnBeforePrint(Sender: TfrxComponent);'
       'begin'
       '    if (Length(<frxDBCabecera."OBSERVACIONES">) = 0) then'
+      '    begin'
+      
+        '       Rich8.Visible := False;                                  ' +
+        '                                                    '
       '        Memo47.Visible := False;'
+      '    end                               '
       'end;'
       ''
       'begin'
@@ -980,7 +985,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Top = 128
   end
   object IBDatabase1: TIBDatabase
-    DatabaseName = 'C:\Codigo Tecsitel\Database\FACTUGES.FDB'
+    DatabaseName = 'C:\Codigo Tecsitel\Output\Debug\Database\FACTUGES_PRODUCCION.FDB'
     Params.Strings = (
       'user_name=sysdba'
       'password=masterkey'
@@ -1008,7 +1013,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Database = IBDatabase1
     Transaction = IBTransaction1
     SQL.Strings = (
-      'SELECT * FROM PRO_PRES_CAPITULOS(31)')
+      'SELECT * FROM PRO_PRES_CAPITULOS(18)')
     Left = 136
     Top = 352
   end
@@ -1021,7 +1026,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Database = IBDatabase1
     Transaction = IBTransaction1
     SQL.Strings = (
-      'SELECT * FROM PRO_PRES_CAPITULOS_CONCEPTOS(31)')
+      'SELECT * FROM PRO_PRES_CAPITULOS_CONCEPTOS(18)')
     Left = 136
     Top = 416
   end
@@ -1037,7 +1042,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
       'select id, id_presupuesto, posicion, tipo_detalle, concepto,'
       '       importe_total, visible'
       'from presupuestos_cliente_detalles'
-      'where tipo_detalle = '#39'Titulo'#39' and id_presupuesto = 31'
+      'where tipo_detalle = '#39'Titulo'#39' and id_presupuesto = 18'
       'order by posicion'
       '')
     Left = 136
@@ -1133,7 +1138,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
       'FROM'
       '    V_PRESUPUESTOS_CLIENTE INNER JOIN V_CLIENTES ON'
       '        (V_PRESUPUESTOS_CLIENTE.ID_CLIENTE = V_CLIENTES.ID)'
-      '  WHERE V_PRESUPUESTOS_CLIENTE.ID = 31')
+      '  WHERE V_PRESUPUESTOS_CLIENTE.ID = 18')
     Left = 136
     Top = 296
     object cabeceraID: TIntegerField

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?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>

Source/Servidor/FactuGES_Server.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 1,0,4,0
-PRODUCTVERSION 1,0,4,0
+FILEVERSION 1,0,5,0
+PRODUCTVERSION 1,0,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "1.0.4.0\0"
-              VALUE "ProductVersion", "1.0.4.0\0"
-              VALUE "CompileDate", "martes, 03 de junio de 2008 19:12\0"
+              VALUE "FileVersion", "1.0.5.0\0"
+              VALUE "ProductVersion", "1.0.5.0\0"
+              VALUE "CompileDate", "jueves, 05 de junio de 2008 15:27\0"
          END
     END
     BLOCK "VarFileInfo"