diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 23f6085..d6be5b1 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -4361,8 +4361,12 @@ ALTER TABLE CONT_EPIGRAFES ADD CONSTRAINT FK_CONT_EPIGRAFES_1 FOREIGN KEY (ID_EJ ALTER TABLE CONT_SUBCUENTAS ADD CONSTRAINT FK_CONT_SUBCUENTAS_1 FOREIGN KEY (ID_EJERCICIO) REFERENCES CONT_EJERCICIOS (ID) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE EMPRESAS_DATOS_BANCO ADD CONSTRAINT FK_EMPRESAS_DATOS_BANCO FOREIGN KEY (ID_EMPRESA) REFERENCES EMPRESAS (ID) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE EMPRESAS_TIENDAS ADD CONSTRAINT FK_EMPRESAS_TIENDAS_1 FOREIGN KEY (ID_EMPRESA) REFERENCES EMPRESAS (ID) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE PRESUPUESTOS_CLIENTE ADD CONSTRAINT FK_PRESUPUESTOS_CLIENTE_2 FOREIGN KEY (ID_CLIENTE) REFERENCES CONTACTOS (ID); +ALTER TABLE CONTRATOS_CLIENTE ADD CONSTRAINT FK_CONTRATOS_CLIENTE_2 FOREIGN KEY (ID_CLIENTE) REFERENCES CONTACTOS (ID); ALTER TABLE FACTURAS_CLIENTE ADD CONSTRAINT FK_FACTURAS_CLIENTE_EMPRESAS FOREIGN KEY (ID_EMPRESA) REFERENCES EMPRESAS (ID) ON DELETE NO ACTION ON UPDATE NO ACTION; +ALTER TABLE FACTURAS_CLIENTE ADD CONSTRAINT FK_FACTURAS_CLIENTE_2 FOREIGN KEY (ID_CLIENTE) REFERENCES CONTACTOS (ID); ALTER TABLE FACTURAS_PROVEEDOR ADD CONSTRAINT FK_FACTURAS_PROVEEDOR_EMPRESAS FOREIGN KEY (ID_EMPRESA) REFERENCES EMPRESAS (ID) ON DELETE NO ACTION ON UPDATE NO ACTION; +ALTER TABLE FACTURAS_PROVEEDOR ADD CONSTRAINT FK_FACTURAS_PROVEEDOR_2 FOREIGN KEY (ID_PROVEEDOR) REFERENCES CONTACTOS (ID); ALTER TABLE FACTURAS_PROVEEDOR_DETALLES ADD CONSTRAINT FK_FACTURAS_PRO_DET_ID_FACTURA FOREIGN KEY (ID_FACTURA) REFERENCES FACTURAS_PROVEEDOR (ID) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE FACTURAS_PROVEEDOR_CONTRATOS ADD CONSTRAINT FK_FACTURAS_PROVEEDOR_CONTRATO2 FOREIGN KEY (ID_CONTRATO) REFERENCES CONTRATOS_CLIENTE (ID) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE FACTURAS_PROVEEDOR_CONTRATOS ADD CONSTRAINT FK_FACTURAS_PROVEEDOR_CONTRATOS FOREIGN KEY (ID_FACTURA) REFERENCES FACTURAS_PROVEEDOR (ID) ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/Database/scripts/factuges_sysdata.sql b/Database/scripts/factuges_sysdata.sql index b7979c2..6f4c120 100644 --- a/Database/scripts/factuges_sysdata.sql +++ b/Database/scripts/factuges_sysdata.sql @@ -42,7 +42,23 @@ INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (18, 'FORMA_PAG INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (19, 'PLAZOS_ENTREGA_VARIOS', '35 - 40 dias', NULL); INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (20, 'OBSERVACIONES_VARIOS', 'Incluye transporte e instalación.', NULL); INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (21, 'CONDICIONES_VARIOS', '', NULL); -INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (22, 'RUTA_DOCUMENTOS', 'C:\Codigo\Output\Debug\Servidor\DOCUMENTOS', NULL); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (22, 'RUTA_DOCUMENTOS', 'C:\Archivos de programa\FactuGES2\Servidor\DOCUMENTOS', NULL); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (23, 'FORMA_PAGO_OBRA', 'obra', NULL); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (24, 'PLAZOS_ENTREGA_OBRA', 'obra', NULL); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (25, 'OBSERVACIONES_OBRA', 'obra', NULL); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (26, 'CONDICIONES_OBRA', '', NULL); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (27, 'EMPRESAS_CONTACTOS_COMUNES', '4', 1); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (28, 'EMPRESAS_CONTACTOS_COMUNES', '1', 4); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (29, 'EMPRESAS_CONTACTOS_COMUNES', '3', 2); +INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (30, 'EMPRESAS_CONTACTOS_COMUNES', '2', 3); + +COMMIT WORK; + + + + + + SET GENERATOR GEN_CONFIGURACION_ID TO 23; COMMIT WORK; diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339..8b251f3 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 1ce2d09..972dc60 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -51,7 +51,10 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2540FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.5.0FactuGESFactuGES2.5.5.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2570FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.7.0FactuGESFactuGES2.5.7.0 + + + File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 1ef1321..bccd6fc 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 547af96..49bbcfb 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 1641339..8b251f3 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 15294aa..3493aa6 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem Width = 650 ExplicitWidth = 650 inherited tbxMain: TTBXToolbar - ExplicitWidth = 605 + ExplicitWidth = 650 inherited TBXItem26: TTBXItem Visible = False end @@ -77,12 +77,14 @@ inherited fEditorDBItem: TfEditorDBItem object pgPaginas: TPageControl [3] AlignWithMargins = True Left = 3 - Top = 109 + Top = 112 Width = 644 - Height = 328 + Height = 325 ActivePage = pagGeneral Align = alClient TabOrder = 2 + ExplicitTop = 109 + ExplicitHeight = 328 object pagGeneral: TTabSheet Caption = 'General' ExplicitLeft = 0 @@ -93,7 +95,7 @@ inherited fEditorDBItem: TfEditorDBItem end object PnlComentario: TPanel [4] Left = 0 - Top = 76 + Top = 79 Width = 650 Height = 30 Align = alTop @@ -103,6 +105,7 @@ inherited fEditorDBItem: TfEditorDBItem ParentBackground = False TabOrder = 4 VerticalAlignment = taAlignTop + ExplicitTop = 76 object lbComentario: TLabel AlignWithMargins = True Left = 6 diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm index 618d7d4..6c53a6f 100644 --- a/Source/GUIBase/uViewDetallesDTO.dfm +++ b/Source/GUIBase/uViewDetallesDTO.dfm @@ -28,6 +28,7 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO Caption = 'Dto' DataBinding.FieldName = 'DESCUENTO' PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify Properties.DisplayFormat = ',0.00 %;-,0.00 %' Properties.EditFormat = ',0.00;-,0.00' Properties.MaxValue = 100.000000000000000000 @@ -55,11 +56,6 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end end - inherited TBXDock1: TTBXDock - inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 447 - end - end inherited ActionListContenido: TActionList inherited actAnadir: TAction Caption = 'A'#241'adir concepto' diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 index e165474..873ea84 100644 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ b/Source/Informes/1/InfAlbaranCliente.fr3 @@ -1,52 +1,54 @@ - + - - - - + + + - - - + - + + + - - - - + + + + + - - + + - + - - - - - - - - - + + + + + + + + + + + diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index 30a1e79..4ab4cda 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,71 +1,72 @@ - + - - - - - - + + + + + + + + - - - + - + - - + - + + + - + + - - - - - + + + + + - + - + - - - - - - - - - + + + + + + + + + - - + diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 index 523ff53..fb91a3d 100644 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ b/Source/Informes/2/InfAlbaranCliente.fr3 @@ -1,52 +1,56 @@ - + - - - - + + + - + - + + + - - - - + + + + + - - + + - + - - - - - - - - - + + + + + + + + + + + diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3 index e68361a..89441ac 100644 --- a/Source/Informes/2/InfFacturaCliente.fr3 +++ b/Source/Informes/2/InfFacturaCliente.fr3 @@ -1,14 +1,16 @@ - + - - - - - - + + + + + + + + @@ -21,51 +23,52 @@ - - + - + + + - + + - - - - - + + + + + - + - + - - - - - - - - - + + + + + + + + + - - + diff --git a/Source/Informes/3/InfFacturaCliente.fr3 b/Source/Informes/3/InfFacturaCliente.fr3 index 5d587f3..2b2e9b5 100644 --- a/Source/Informes/3/InfFacturaCliente.fr3 +++ b/Source/Informes/3/InfFacturaCliente.fr3 @@ -1,18 +1,20 @@ - + - - - - - - + + + + + + + + - + @@ -21,51 +23,52 @@ - - + - + + + - - + + + - - - - - + + + + + - + - + - - - - - - - - - + + + + + + + + + - - + diff --git a/Source/Informes/4/InfFacturaCliente.fr3 b/Source/Informes/4/InfFacturaCliente.fr3 index 5d587f3..2b2e9b5 100644 --- a/Source/Informes/4/InfFacturaCliente.fr3 +++ b/Source/Informes/4/InfFacturaCliente.fr3 @@ -1,18 +1,20 @@ - + - - - - - - + + + + + + + + - + @@ -21,51 +23,52 @@ - - + - + + + - - + + + - - - - - + + + + + - + - + - - - - - - - - - + + + + + + + + + - - + diff --git a/Source/Informes/InfContratoCliente.fr3 b/Source/Informes/InfContratoCliente.fr3 index af7ab64..7c949c5 100644 --- a/Source/Informes/InfContratoCliente.fr3 +++ b/Source/Informes/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -15,20 +15,22 @@ - + - - - - + + + + + - - - - + + + + + diff --git a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas index 41f56e0..981c76f 100644 --- a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas +++ b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas @@ -117,7 +117,7 @@ begin begin Edit; try - if not ADetalles.DataTable.FieldByName('DESCUENTO').IsNull then + if (ADetalles.DataTable.FieldByName(CAMPO_TIPO).AsString = TIPO_DETALLE_CONCEPTO) then begin //Para mantener la cantidad que ya tuviera el detalle se debe guardar y volver a poner ADetalles.DataTable.FieldByName('DESCUENTO').AsFloat := ADescuento; diff --git a/Source/Modulos/Articulos/Views/Articulos_view.RES b/Source/Modulos/Articulos/Views/Articulos_view.RES index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Articulos/Views/Articulos_view.RES and b/Source/Modulos/Articulos/Views/Articulos_view.RES differ diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm index 3735794..d66847b 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm @@ -2,8 +2,7 @@ inherited fEditorArticulos: TfEditorArticulos Left = 489 Top = 325 Caption = 'Lista de art'#237'culos' - ExplicitWidth = 320 - ExplicitHeight = 471 + ExplicitHeight = 482 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -27,8 +26,11 @@ inherited fEditorArticulos: TfEditorArticulos end end inherited TBXDock: TTBXDock + inherited tbxMain: TTBXToolbar + ExplicitWidth = 543 + end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 269 + ExplicitWidth = 276 inherited tbxEditFiltro: TTBXEditItem EditOptions = [tboUseEditWhenVertical] end @@ -37,9 +39,9 @@ inherited fEditorArticulos: TfEditorArticulos end end inherited TBXTMain2: TTBXToolbar - Left = 275 + Left = 276 DockPos = 275 - ExplicitLeft = 275 + ExplicitLeft = 276 end end inherited EditorActionList: TActionList diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.pas b/Source/Modulos/Articulos/Views/uEditorArticulos.pas index 5db8a8e..85d07e2 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulos.pas +++ b/Source/Modulos/Articulos/Views/uEditorArticulos.pas @@ -141,10 +141,9 @@ begin end; procedure TfEditorArticulos.DuplicarInterno; -{var - AArticulo : IBizArticulo;} +var + AArticulo : IBizArticulo; begin -{ inherited; AArticulo := FController.Duplicar(Articulos); try @@ -152,7 +151,6 @@ begin finally actRefrescar.Execute; end; -} end; procedure TfEditorArticulos.EliminarInterno; diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas index 2a93cde..d034667 100644 --- a/Source/Modulos/Contactos/Controller/uClientesController.pas +++ b/Source/Modulos/Contactos/Controller/uClientesController.pas @@ -211,8 +211,15 @@ begin else Result := False; - finally - HideHourglassCursor; + HideHourglassCursor; + except + on E: Exception do + begin + ACliente.DataTable.CancelUpdates; + HideHourglassCursor; + if (Pos('FOREIGN KEY', E.Message) > 0) then + MessageBox(0, 'No se puede borrar este contacto porque tiene documentos dados de alta (como presupuestos, albaranes, facturas, etc)', 'Atención', MB_ICONWARNING or MB_OK); + end; end; end; diff --git a/Source/Modulos/Contactos/Controller/uProveedoresController.pas b/Source/Modulos/Contactos/Controller/uProveedoresController.pas index aa984d3..40bd180 100644 --- a/Source/Modulos/Contactos/Controller/uProveedoresController.pas +++ b/Source/Modulos/Contactos/Controller/uProveedoresController.pas @@ -172,8 +172,15 @@ begin else Result := False; - finally - HideHourglassCursor; + HideHourglassCursor; + except + on E: Exception do + begin + AProveedor.DataTable.CancelUpdates; + HideHourglassCursor; + if (Pos('FOREIGN KEY', E.Message) > 0) then + MessageBox(0, 'No se puede borrar este contacto porque tiene documentos dados de alta (como facturas, recibos, etc)', 'Atención', MB_ICONWARNING or MB_OK); + end; end; end; diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas index 16d085a..e952e44 100644 --- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas +++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas @@ -9,21 +9,21 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_DarEmpresasContacto = '{B08B2B26-6152-452E-9122-B63D4F5E8177}'; - RID_PersonalContacto = '{5AACCEDA-0CFB-4618-8487-AFDBEF59F1DA}'; - RID_DarTiendaDeUsuario = '{596A636F-0514-4EE5-B1E4-EBA123DC5987}'; - RID_SubCuentasContacto = '{1233587F-0BB7-48AD-9817-2D78C9F6BD89}'; - RID_Contactos = '{F1BCF5ED-94DB-497F-B615-3CD9D33419A5}'; - RID_GruposCliente = '{1701F98E-9A7D-4FE1-8DF4-C5403698952F}'; - RID_DatosBancarios = '{C7E784C2-79BD-45EC-85BD-28A4F8A28768}'; - RID_Clientes = '{4516040D-C7FD-42FB-A534-27D882C4E44A}'; - RID_Proveedores = '{D94213C7-8EF1-4EE0-A3D2-6145996FEB31}'; - RID_Vendedores = '{D64ADEFD-943B-4DEB-9A00-94C5261652D0}'; - RID_DireccionesContacto = '{10A25629-161D-4AC6-8BC5-DD64FA06C169}'; - RID_ClientesDescuentos = '{8CDF59EF-E8FB-476C-80DF-A8CB174FA059}'; - RID_ProcedenciasCliente = '{C8B0E03E-40C8-44E6-BF61-87C2D77DA2DB}'; - RID_GruposProveedor = '{6084BA5B-6828-40E7-B51B-20AA866EDC9B}'; - RID_Contactos_Refresh = '{ECE7A8D0-90FE-42BD-9882-6CECEC6B1247}'; + RID_DarEmpresasContacto = '{00F42015-9439-4F03-86AA-9053BAE56E60}'; + RID_PersonalContacto = '{8D74552A-CFEB-47B3-9035-DBB85769C03B}'; + RID_DarTiendaDeUsuario = '{A1A770C1-133F-4F79-9FAF-B902CA78D7AB}'; + RID_SubCuentasContacto = '{46DCA8AE-E089-4600-ACE8-4DD17A16EECD}'; + RID_Contactos = '{0BE6A6BF-0394-4735-BA21-9FB16D9A99D0}'; + RID_GruposCliente = '{5BC87FF2-2FD1-4B93-9508-3F1B5BEA6F93}'; + RID_DatosBancarios = '{A597124D-56FD-42B6-B2DA-800FF9CA2D20}'; + RID_Clientes = '{CBA08C07-4C50-427E-AAFA-993C9413F253}'; + RID_Proveedores = '{C5B628A3-9580-46A3-8E36-F25FCE8022BF}'; + RID_Vendedores = '{4E1B22A4-576A-4033-9069-1FFA304380A8}'; + RID_DireccionesContacto = '{FED11ACC-A937-4598-B61B-A91CB54673ED}'; + RID_ClientesDescuentos = '{FD557CDA-2350-4487-BB6C-FD98E7816D65}'; + RID_ProcedenciasCliente = '{A0E7E9CA-4C28-4EA6-B57B-14B6B5C516C5}'; + RID_GruposProveedor = '{C0E2E4CB-5439-4145-A9FF-0AFA3ACDEB37}'; + RID_Contactos_Refresh = '{829D70DD-295E-4722-B531-2E55231BBF2C}'; { Data table names } nme_DarEmpresasContacto = 'DarEmpresasContacto'; @@ -531,7 +531,7 @@ const type { IDarEmpresasContacto } IDarEmpresasContacto = interface(IDAStronglyTypedDataTable) - ['{F0DE14FF-9BB7-410A-BF62-D69E20426D61}'] + ['{32E74026-2CB7-4A93-886B-FF16B5C1E459}'] { Property getters and setters } function GetID_EMPRESAValue: Integer; procedure SetID_EMPRESAValue(const aValue: Integer); @@ -566,7 +566,7 @@ type { IPersonalContacto } IPersonalContacto = interface(IDAStronglyTypedDataTable) - ['{7E79652F-1F5A-4EDB-A235-FEBB14E8F7B4}'] + ['{68D032C9-18AE-4CAE-8BD5-AD4AD66247F8}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -709,7 +709,7 @@ type { IDarTiendaDeUsuario } IDarTiendaDeUsuario = interface(IDAStronglyTypedDataTable) - ['{1C479BCF-55C5-491A-8A3B-7BEAE736497C}'] + ['{C117D8AF-FC75-444F-BE4A-CD4217198AD6}'] { Property getters and setters } function GetID_TIENDAValue: Integer; procedure SetID_TIENDAValue(const aValue: Integer); @@ -744,7 +744,7 @@ type { ISubCuentasContacto } ISubCuentasContacto = interface(IDAStronglyTypedDataTable) - ['{C03A519D-7A17-43D9-AA9A-356AE0969385}'] + ['{2AED639B-B9A3-40BE-BD47-3E52A7C08E14}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -839,7 +839,7 @@ type { IContactos } IContactos = interface(IDAStronglyTypedDataTable) - ['{5FF8FFAA-013B-4262-83A5-4D79B5BDB2FB}'] + ['{5D40243C-B968-45E5-B145-362F818D2B8B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1162,7 +1162,7 @@ type { IGruposCliente } IGruposCliente = interface(IDAStronglyTypedDataTable) - ['{5DB5624D-02FF-47A3-AC0D-F9C547224C8D}'] + ['{3BD8080F-6982-4E7F-9063-6561238E4FDC}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1209,7 +1209,7 @@ type { IDatosBancarios } IDatosBancarios = interface(IDAStronglyTypedDataTable) - ['{1EA1794A-40CF-4222-8A00-05D99F6F711C}'] + ['{7B46974C-D404-4A84-8030-356E464E576A}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1340,7 +1340,7 @@ type { IClientes } IClientes = interface(IDAStronglyTypedDataTable) - ['{495F21F5-EB41-445D-9F0A-00E250308A8B}'] + ['{A64C208A-88D9-45FC-B81F-89EBB2F685AD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1879,7 +1879,7 @@ type { IProveedores } IProveedores = interface(IDAStronglyTypedDataTable) - ['{E986088F-9A0F-45F7-AEA2-FFDECE36AE7B}'] + ['{7151A550-9546-4480-B1A7-D33B2A277127}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2406,7 +2406,7 @@ type { IVendedores } IVendedores = interface(IDAStronglyTypedDataTable) - ['{13320D0A-CD1C-4584-8812-921048D6DA49}'] + ['{56354278-A7D9-4529-8D53-9C68FCC14A10}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2753,7 +2753,7 @@ type { IDireccionesContacto } IDireccionesContacto = interface(IDAStronglyTypedDataTable) - ['{F5CE05FD-B302-4CD2-9D9D-255027C62E1D}'] + ['{F32E6D11-C168-417A-A1D5-A0BEEF0FBC17}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2980,7 +2980,7 @@ type { IClientesDescuentos } IClientesDescuentos = interface(IDAStronglyTypedDataTable) - ['{304028E2-1695-44C5-A72C-4322150A3BAE}'] + ['{E355C96A-2658-45AE-A458-571CC587C2FD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3063,7 +3063,7 @@ type { IProcedenciasCliente } IProcedenciasCliente = interface(IDAStronglyTypedDataTable) - ['{8997128D-293B-4C78-A421-F4CE60FEBFFB}'] + ['{10026F7E-0AFF-47AA-A869-242B35FDC14F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3110,7 +3110,7 @@ type { IGruposProveedor } IGruposProveedor = interface(IDAStronglyTypedDataTable) - ['{0D94945D-DA5D-4A3D-B662-AAC86E635EFC}'] + ['{7A4C049D-30F9-49C4-857C-D5337B78E55D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3157,7 +3157,7 @@ type { IContactos_Refresh } IContactos_Refresh = interface(IDAStronglyTypedDataTable) - ['{61B17C88-7DDE-4839-9C4F-46B2934F93C4}'] + ['{8CDF4B0A-7FE6-490A-B14D-3B7A5DDE2658}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas index f04e95f..7eec941 100644 --- a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas +++ b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas @@ -9,26 +9,26 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_DarEmpresasContactoDelta = '{FB6A8530-060C-4400-A106-FF904C79CD28}'; - RID_PersonalContactoDelta = '{7C9E3008-B9E5-4BEE-AEC8-260BA70C262B}'; - RID_DarTiendaDeUsuarioDelta = '{20388966-2224-417C-B15F-9E11960B3118}'; - RID_SubCuentasContactoDelta = '{0D54356F-7EEC-4204-B201-D4AFB11C109D}'; - RID_ContactosDelta = '{A558B005-DC6F-4FD7-8221-B8977A163DBD}'; - RID_GruposClienteDelta = '{EA29DAA6-299E-490D-AF14-AF4C1E8409CF}'; - RID_DatosBancariosDelta = '{26484ECF-20D8-4035-B50D-7AE609C06308}'; - RID_ClientesDelta = '{7F411F05-F7EB-45C2-8D46-0C451DCDC9EB}'; - RID_ProveedoresDelta = '{0BE0828F-BB40-4A7B-9774-B39DFFF9B488}'; - RID_VendedoresDelta = '{44AEFE00-C5A8-4F44-83E9-D496BF800E87}'; - RID_DireccionesContactoDelta = '{18F805F8-E168-4C5B-91D4-B688AF8FA680}'; - RID_ClientesDescuentosDelta = '{662A297B-A003-4239-83A5-698F54B8C2B0}'; - RID_ProcedenciasClienteDelta = '{7CA86C64-4446-4EC9-9964-DF12FC859719}'; - RID_GruposProveedorDelta = '{C100483C-023A-4298-87FD-6D26CE7DEA37}'; - RID_Contactos_RefreshDelta = '{2CF622BB-DBC1-47DC-8AF1-854E33953AF8}'; + RID_DarEmpresasContactoDelta = '{5FA33C81-8C1D-4537-B419-7F589C4F54D5}'; + RID_PersonalContactoDelta = '{D74E53F4-C0F1-4D5D-B6D6-05A77D4A9C0D}'; + RID_DarTiendaDeUsuarioDelta = '{3315B230-9DF0-4D42-A630-4F88722A12A8}'; + RID_SubCuentasContactoDelta = '{C7E0C7C4-BC8A-4C86-B305-9DF867D6A5D5}'; + RID_ContactosDelta = '{0E3D9787-3136-4245-8F91-3EBE5114B07B}'; + RID_GruposClienteDelta = '{765D408B-0F60-4F57-AAAC-EB611A2567B3}'; + RID_DatosBancariosDelta = '{58EBA3FB-6358-4B0E-B027-003752A40D0A}'; + RID_ClientesDelta = '{D5CE5C47-A434-4DC9-8617-2C3C39FBCF1C}'; + RID_ProveedoresDelta = '{65866AED-3F9E-4108-9964-F68148C5B028}'; + RID_VendedoresDelta = '{ECCEABBD-8C47-4A80-9EC3-A474AC97FA89}'; + RID_DireccionesContactoDelta = '{122A7EBF-EB98-48D4-A6B6-2A2CA2AFA08C}'; + RID_ClientesDescuentosDelta = '{4C3B17AE-119E-4957-94CE-3B041BC05FF2}'; + RID_ProcedenciasClienteDelta = '{74BA2BD3-5FD4-4D3B-B5EC-1AE94047F10C}'; + RID_GruposProveedorDelta = '{CA02E8EE-2B59-48D4-99F2-73D8BA2128FA}'; + RID_Contactos_RefreshDelta = '{A5BBEBE8-E924-47D4-9DCA-D293C53B2E90}'; type { IDarEmpresasContactoDelta } IDarEmpresasContactoDelta = interface(IDarEmpresasContacto) - ['{FB6A8530-060C-4400-A106-FF904C79CD28}'] + ['{5FA33C81-8C1D-4537-B419-7F589C4F54D5}'] { Property getters and setters } function GetOldID_EMPRESAValue : Integer; @@ -62,7 +62,7 @@ type { IPersonalContactoDelta } IPersonalContactoDelta = interface(IPersonalContacto) - ['{7C9E3008-B9E5-4BEE-AEC8-260BA70C262B}'] + ['{D74E53F4-C0F1-4D5D-B6D6-05A77D4A9C0D}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -204,7 +204,7 @@ type { IDarTiendaDeUsuarioDelta } IDarTiendaDeUsuarioDelta = interface(IDarTiendaDeUsuario) - ['{20388966-2224-417C-B15F-9E11960B3118}'] + ['{3315B230-9DF0-4D42-A630-4F88722A12A8}'] { Property getters and setters } function GetOldID_TIENDAValue : Integer; @@ -238,7 +238,7 @@ type { ISubCuentasContactoDelta } ISubCuentasContactoDelta = interface(ISubCuentasContacto) - ['{0D54356F-7EEC-4204-B201-D4AFB11C109D}'] + ['{C7E0C7C4-BC8A-4C86-B305-9DF867D6A5D5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREF_SUBCUENTAValue : String; @@ -332,7 +332,7 @@ type { IContactosDelta } IContactosDelta = interface(IContactos) - ['{A558B005-DC6F-4FD7-8221-B8977A163DBD}'] + ['{0E3D9787-3136-4245-8F91-3EBE5114B07B}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -655,7 +655,7 @@ type { IGruposClienteDelta } IGruposClienteDelta = interface(IGruposCliente) - ['{EA29DAA6-299E-490D-AF14-AF4C1E8409CF}'] + ['{765D408B-0F60-4F57-AAAC-EB611A2567B3}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -701,7 +701,7 @@ type { IDatosBancariosDelta } IDatosBancariosDelta = interface(IDatosBancarios) - ['{26484ECF-20D8-4035-B50D-7AE609C06308}'] + ['{58EBA3FB-6358-4B0E-B027-003752A40D0A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -831,7 +831,7 @@ type { IClientesDelta } IClientesDelta = interface(IClientes) - ['{7F411F05-F7EB-45C2-8D46-0C451DCDC9EB}'] + ['{D5CE5C47-A434-4DC9-8617-2C3C39FBCF1C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1370,7 +1370,7 @@ type { IProveedoresDelta } IProveedoresDelta = interface(IProveedores) - ['{0BE0828F-BB40-4A7B-9774-B39DFFF9B488}'] + ['{65866AED-3F9E-4108-9964-F68148C5B028}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1897,7 +1897,7 @@ type { IVendedoresDelta } IVendedoresDelta = interface(IVendedores) - ['{44AEFE00-C5A8-4F44-83E9-D496BF800E87}'] + ['{ECCEABBD-8C47-4A80-9EC3-A474AC97FA89}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -2244,7 +2244,7 @@ type { IDireccionesContactoDelta } IDireccionesContactoDelta = interface(IDireccionesContacto) - ['{18F805F8-E168-4C5B-91D4-B688AF8FA680}'] + ['{122A7EBF-EB98-48D4-A6B6-2A2CA2AFA08C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -2471,7 +2471,7 @@ type { IClientesDescuentosDelta } IClientesDescuentosDelta = interface(IClientesDescuentos) - ['{662A297B-A003-4239-83A5-698F54B8C2B0}'] + ['{4C3B17AE-119E-4957-94CE-3B041BC05FF2}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CLIENTEValue : Integer; @@ -2553,7 +2553,7 @@ type { IProcedenciasClienteDelta } IProcedenciasClienteDelta = interface(IProcedenciasCliente) - ['{7CA86C64-4446-4EC9-9964-DF12FC859719}'] + ['{74BA2BD3-5FD4-4D3B-B5EC-1AE94047F10C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2599,7 +2599,7 @@ type { IGruposProveedorDelta } IGruposProveedorDelta = interface(IGruposProveedor) - ['{C100483C-023A-4298-87FD-6D26CE7DEA37}'] + ['{CA02E8EE-2B59-48D4-99F2-73D8BA2128FA}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2645,7 +2645,7 @@ type { IContactos_RefreshDelta } IContactos_RefreshDelta = interface(IContactos_Refresh) - ['{2CF622BB-DBC1-47DC-8AF1-854E33953AF8}'] + ['{A5BBEBE8-E924-47D4-9DCA-D293C53B2E90}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; diff --git a/Source/Modulos/Contactos/Model/uBizContactosServer.pas b/Source/Modulos/Contactos/Model/uBizContactosServer.pas index c9fb911..5a02880 100644 --- a/Source/Modulos/Contactos/Model/uBizContactosServer.pas +++ b/Source/Modulos/Contactos/Model/uBizContactosServer.pas @@ -102,14 +102,14 @@ begin ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); //En el caso de querer tener los contactos separados por empresas en lugar de tenerlos en común -// ACommand := ASchema.NewCommand(ACurrentConn, 'Delete_ContactoEmpresa'); + ACommand := ASchema.NewCommand(ACurrentConn, 'Delete_ContactoEmpresa'); //En el caso de querer tener los contactos en común para todas las empresas - ACommand := ASchema.NewCommand(ACurrentConn, 'Delete_ContactoEmpresas'); +// ACommand := ASchema.NewCommand(ACurrentConn, 'Delete_ContactoEmpresas'); try with ACommand do begin ParamByName('OLD_ID_CONTACTO').Value := aChange.OldValueByName[fld_ContactosID]; -// ParamByName('OLD_ID_EMPRESA').Value := aChange.OldValueByName[fld_ContactosID_EMPRESA]; + ParamByName('OLD_ID_EMPRESA').Value := aChange.OldValueByName[fld_ContactosID_EMPRESA]; Execute; end; finally @@ -150,14 +150,14 @@ begin ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); //En el caso de querer tener los contactos separados por empresas en lugar de tenerlos en común -// ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_ContactoEmpresa'); + ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_ContactoEmpresa'); //En el caso de querer tener los contactos en común para todas las empresas - ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_ContactoEmpresas'); +// ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_ContactoEmpresas'); try with ACommand do begin ParamByName('ID_CONTACTO').Value := aChange.NewValueByName[fld_ContactosID]; -// ParamByName('ID_EMPRESA').Value := aChange.NewValueByName[fld_ContactosID_EMPRESA]; + ParamByName('ID_EMPRESA').Value := aChange.NewValueByName[fld_ContactosID_EMPRESA]; Execute; end; finally diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm index 796931d..6e878db 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm @@ -3628,18 +3628,14 @@ object srvContactos: TsrvContactos end item Params = < - item - Name = 'ID' - DataType = datAutoInc - GeneratorName = 'GEN_EMPRESAS_CONTACTOS_ID' - Value = '' - end item Name = 'ID_EMPRESA' + DataType = datInteger Value = '' end item Name = 'ID_CONTACTO' + DataType = datInteger Value = '' end> Statements = < @@ -3648,7 +3644,8 @@ object srvContactos: TsrvContactos TargetTable = 'EMPRESAS_CONTACTOS' SQL = 'INSERT'#10' INTO EMPRESAS_CONTACTOS'#10' (ID, ID_EMPRESA, ID_CONTACT' + - 'O)'#10' VALUES'#10' (:ID, :ID_EMPRESA, :ID_CONTACTO)'#10 + 'O)'#10' VALUES'#10' ((SELECT GEN_ID(GEN_EMPRESAS_CONTACTOS_ID, 1) FR' + + 'OM RDB$DATABASE), :ID_EMPRESA, :ID_CONTACTO)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 7ed4333..427814a 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -5,7 +5,7 @@ inherited fEditorClientes: TfEditorClientes ClientHeight = 519 ClientWidth = 786 ExplicitWidth = 794 - ExplicitHeight = 553 + ExplicitHeight = 557 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -52,17 +52,17 @@ inherited fEditorClientes: TfEditorClientes Width = 786 ExplicitWidth = 786 inherited tbxMain: TTBXToolbar - ExplicitWidth = 632 + ExplicitWidth = 711 end inherited tbxMenu: TTBXToolbar ExplicitWidth = 786 end inherited TBXTMain2: TTBXToolbar - Left = 275 + Left = 276 DockPos = 275 Visible = True - ExplicitLeft = 275 - ExplicitWidth = 83 + ExplicitLeft = 276 + ExplicitWidth = 91 object TBXItem38: TTBXItem Action = actInformes DisplayMode = nbdmImageAndText @@ -77,9 +77,9 @@ inherited fEditorClientes: TfEditorClientes end inline frViewClientes1: TfrViewClientes [3] Left = 0 - Top = 102 + Top = 106 Width = 786 - Height = 398 + Height = 394 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -89,20 +89,25 @@ inherited fEditorClientes: TfEditorClientes ParentFont = False TabOrder = 3 ReadOnly = False - ExplicitTop = 102 + ExplicitTop = 106 ExplicitWidth = 786 - ExplicitHeight = 398 + ExplicitHeight = 394 inherited cxGrid: TcxGrid Width = 786 - Height = 270 + Height = 266 ExplicitWidth = 786 - ExplicitHeight = 270 + ExplicitHeight = 266 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item Format = '0 clientes' Kind = skCount Column = frViewClientes1.cxGridViewTIENDA + end + item + Format = '0 clientes' + Kind = skCount + Column = frViewClientes1.cxGridViewNIF_CIF end> end end @@ -152,8 +157,8 @@ inherited fEditorClientes: TfEditorClientes end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 372 - ExplicitTop = 372 + Top = 368 + ExplicitTop = 368 ExplicitWidth = 786 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 786 diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm index b46aee5..67952d3 100644 --- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm @@ -2,8 +2,7 @@ inherited fEditorContactos: TfEditorContactos Left = 285 Top = 448 Caption = 'Lista de contactos' - ExplicitWidth = 320 - ExplicitHeight = 240 + ExplicitHeight = 482 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -14,7 +13,7 @@ inherited fEditorContactos: TfEditorContactos ExplicitWidth = 543 end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 269 + ExplicitWidth = 276 inherited tbxEditFiltro: TTBXEditItem EditOptions = [tboUseEditWhenVertical] end diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index 38c3868..c9bf262 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -9,12 +9,7 @@ inherited frViewClientes: TfrViewClientes ExplicitWidth = 633 ExplicitHeight = 376 inherited cxGridView: TcxGridDBTableView - DataController.Summary.FooterSummaryItems = < - item - Format = '0 clientes' - Kind = skCount - Column = cxGridViewNIF_CIF - end> + DataController.Summary.FooterSummaryItems = <> object cxGridViewBLOQUEADO: TcxGridDBColumn [1] DataBinding.FieldName = 'BLOQUEADO' PropertiesClassName = 'TcxTextEditProperties' diff --git a/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas b/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas index 392b129..dbfff67 100644 --- a/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas +++ b/Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas @@ -48,7 +48,7 @@ type function DarPropiedades: IBizPropiedades; procedure AnadirCapitulo (const Tipo: String; const Descripcion: String; const Descuento:Boolean; ADetalles: IDAStronglyTypedDataTable); - function BuscarCapitulo (const Tipo: String): IBizCapitulo; + function BuscarCapitulo (const Tipo: String): IBizCapitulo; //Se sobre escribe para hacer otro recorrido y rellenar el tipo_articulo a todos los conceptos de los capitulos procedure ValidarDetalles(ADataTable: IDAStronglyTypedDataTable); override; @@ -121,6 +121,7 @@ begin ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCONCEPTO).AsString := Descripcion; + ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesDESCUENTO).AsVariant := Null; //Rellenamos con las propiedades del capitulo ACapitulo := FDataModule.GetCapitulo(Tipo); @@ -135,6 +136,7 @@ begin ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesPROPIEDAD).AsString := ACapitulo.CONCEPTO; + Next; until EOF; end; @@ -145,6 +147,7 @@ begin ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCONCEPTO).AsString := 'SUBTOTAL ' + Descripcion; + ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesDESCUENTO).AsVariant := Null; if Descuento then begin diff --git a/Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas index f81d438..dec5a33 100644 --- a/Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas @@ -84,7 +84,8 @@ implementation { TBizDetallesPresupuestoCliente } uses - Dialogs, DB, uDataTableUtils, SysUtils, JclStrings; + Dialogs, DB, uDataTableUtils, SysUtils, JclStrings, + uBizPresupuestosCliente, uControllerDetallesBase; procedure TBizDetallesPresupuestoCliente.BeforeInsert(Sender: TDADataTable); var @@ -97,9 +98,19 @@ begin end; procedure TBizDetallesPresupuestoCliente.OnNewRecord(Sender: TDADataTable); +var + AMasterTable : TDADataTable; + begin inherited; VISIBLE := 1; + + AMasterTable := DataTable.GetMasterDataTable; +// if (TIPO_DETALLE = TIPO_DETALLE_CONCEPTO) + if Assigned(AMasterTable) + and Assigned((AMasterTable as IBizPresupuestoCliente).Cliente) + and ((AMasterTable as IBizPresupuestoCliente).Cliente.DESCUENTO_LINEA > 0) then + DESCUENTO := (AMasterTable as IBizPresupuestoCliente).Cliente.DESCUENTO_LINEA; end; { TBizPropiedades } diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index 5555721..ec94a05 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -6,7 +6,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ClientWidth = 848 OnClose = CustomEditorClose ExplicitWidth = 856 - ExplicitHeight = 710 + ExplicitHeight = 714 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -129,7 +129,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Width = 848 ExplicitWidth = 848 inherited tbxMain: TTBXToolbar - ExplicitWidth = 488 + ExplicitWidth = 551 inherited TBXItem2: TTBXItem Visible = False end @@ -176,12 +176,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end inherited pgPaginas: TPageControl Width = 842 - Height = 317 + Height = 314 ActivePage = pagContenido TabOrder = 1 OnChanging = pgPaginasChanging ExplicitWidth = 842 - ExplicitHeight = 317 + ExplicitHeight = 314 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 @@ -195,7 +195,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Left = 0 Top = 0 Width = 834 - Height = 289 + Height = 286 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -208,7 +208,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 834 - ExplicitHeight = 289 + ExplicitHeight = 286 inherited ToolBar1: TToolBar Width = 834 Height = 24 @@ -289,10 +289,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente inherited cxGrid: TcxGrid Top = 50 Width = 834 - Height = 239 + Height = 236 ExplicitTop = 50 ExplicitWidth = 834 - ExplicitHeight = 239 + ExplicitHeight = 236 inherited cxGridView: TcxGridDBTableView inherited cxGridViewPROPIEDAD: TcxGridDBColumn IsCaptionAssigned = True @@ -305,7 +305,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitTop = 24 ExplicitWidth = 834 inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 665 + ExplicitWidth = 753 end end inherited cxLookupComboBox1: TcxLookupComboBox @@ -326,7 +326,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Left = 0 Top = 0 Width = 834 - Height = 289 + Height = 286 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -337,7 +337,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 834 - ExplicitHeight = 289 + ExplicitHeight = 286 inherited pnlSup: TPanel Width = 834 ExplicitWidth = 834 @@ -347,13 +347,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end inherited GroupBox1: TGroupBox Width = 834 - Height = 261 + Height = 258 ExplicitWidth = 834 - ExplicitHeight = 261 + ExplicitHeight = 258 inherited eIncidencias: TcxDBMemo ExplicitWidth = 830 - ExplicitHeight = 244 - Height = 244 + ExplicitHeight = 241 + Height = 241 Width = 830 end end @@ -366,7 +366,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Left = 0 Top = 0 Width = 834 - Height = 289 + Height = 286 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -377,14 +377,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 834 - ExplicitHeight = 289 + ExplicitHeight = 286 inherited TBXDock: TTBXDock Width = 834 ExplicitWidth = 834 end inherited ListView1: TListView Width = 834 - Height = 266 + Height = 260 ExplicitWidth = 834 ExplicitHeight = 266 end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm index 1707bac..0c308e1 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm @@ -58,7 +58,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente inherited cxGrid: TcxGrid inherited cxGridView: TcxGridDBTableView inherited cxGridViewTIPO: TcxGridDBColumn - VisibleForCustomization = False + Visible = True end inherited cxGridViewID_ARTICULO: TcxGridDBColumn Width = 57 diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas index 931244a..43987a6 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas @@ -118,7 +118,8 @@ begin end; procedure TfrViewDetallesPresupuestoCliente.actAsignarDescuentoExecute(Sender: TObject); -{var +{ +var AuxTop, AuxRow:Integer; ADescuento: Variant; } diff --git a/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/ConCli_AlbCli_relation.res b/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/ConCli_AlbCli_relation.res index 86c94e6..8b251f3 100644 Binary files a/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/ConCli_AlbCli_relation.res and b/Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/ConCli_AlbCli_relation.res differ diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index f55e3ee..3f7b9cf 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -131,15 +131,15 @@ uses schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas', - schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', - schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', srvSubfamilias_Impl in '..\Modulos\Subfamilias\Servidor\srvSubfamilias_Impl.pas' {srvSubfamilias: TDataAbstractService}, schSubfamiliasClient_Intf in '..\Modulos\Subfamilias\Model\schSubfamiliasClient_Intf.pas', - schSubfamiliasServer_Intf in '..\Modulos\Subfamilias\Model\schSubfamiliasServer_Intf.pas'; + schSubfamiliasServer_Intf in '..\Modulos\Subfamilias\Model\schSubfamiliasServer_Intf.pas', + schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', + schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index cc81bf8..b0dc1a6 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2550FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.5.0FactuGES (Servidor)2.5.5.0martes, 05 de febrero de 2013 11:10 + FalseTrueFalseTrueFalse2570FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.7.0FactuGES (Servidor)2.5.7.0lunes, 29 de abril de 2013 18:48 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index c86ff02..b12e9da 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ