diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 768e1256..f7b023fe 100644 --- a/Database/scripts/factuges.sql +++ b/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'; diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index f43c1ed4..d7d8bd4c 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,57 +53,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 00f6baa7..56490d16 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,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" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 631a4c24..add6efae 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm index 40ed7363..1cf030cf 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm +++ b/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 diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas index 0cded226..a3940399 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas +++ b/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; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm index fec9ed94..b36f8ffa 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm +++ b/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 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas index 1ea7597d..d11468c2 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas +++ b/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; diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.dfm index d9ab8ce3..27a22f08 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.dfm +++ b/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 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas index aec02cb2..02ec9002 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas +++ b/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; diff --git a/Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas index 6c07b4e6..293e81d6 100644 --- a/Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas +++ b/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); diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm index 1405f553..e0fa2148 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm +++ b/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() = 0) then' - ' Memo47.Visible := False; ' + ' 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 diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index dff9978e..14ca7361 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 95df3bb2..39b56556 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,279 +1,279 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - -FalseTrueFalse/standaloneTrueFalse1050FalseFalseFalseFalseFalse308212521.0.5.01.0.5.0martes, 03 de junio de 2008 19:12FactuGES_Server.dpr - - - - - MainSource - - - - -
srvEmpresas
- TDARemoteService - - - - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
srvFacturasProveedor
- TDataAbstractService - - - - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + + FalseTrueFalse/standaloneTrueFalse1050FalseFalseFalseFalseFalse308212521.0.5.01.0.5.0martes, 03 de junio de 2008 19:12FactuGES_Server.dpr + + + + + MainSource + + + + +
srvEmpresas
+ TDARemoteService + + + + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
srvFacturasProveedor
+ TDataAbstractService + + + + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + +