Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Primera subida de separación de contactos entre empresas

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@58 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2013-05-10 10:59:32 +00:00
parent b66296cfa4
commit e750a0fd9e
38 changed files with 421 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Database/scripts/factuges.sql
View File

@ -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 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_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 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_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_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_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_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; 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;

18
Database/scripts/factuges_sysdata.sql
View File

@ -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 (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 (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 (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; SET GENERATOR GEN_CONFIGURACION_ID TO 23;
COMMIT WORK; COMMIT WORK;

BIN
Source/Base/Base.res
View File

Binary file not shown.

5
Source/Cliente/FactuGES.dproj
View File

@ -51,7 +51,10 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk"> <DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Contratos de cliente\Base.dcp" /> <DCCReference Include="..\Modulos\Articulos\Base.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\ccpackD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Articulos\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxLayoutControlD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPScxCommonD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Articulos\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\frx11.dcp" /> <DCCReference Include="..\Modulos\Articulos\frx11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\frxe11.dcp" /> <DCCReference Include="..\Modulos\Articulos\frxe11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\fs11.dcp" /> <DCCReference Include="..\Modulos\Articulos\fs11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvAppFrmD11R.dcp" /> <DCCReference Include="..\Modulos\Articulos\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Articulos\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvGlobusD11R.dcp" /> <DCCReference Include="..\Modulos\Articulos\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Articulos\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Articulos\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" /> <DCCReference Include="..\Modulos\Articulos\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tb2k_d10.dcp" /> <DCCReference Include="..\Modulos\Articulos\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Articulos\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" /> <DCCReference Include="..\Modulos\Articulos\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Articulos\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" /> <DCCReference Include="..\Modulos\Articulos\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Articulos\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" /> <DCCReference Include="..\Modulos\Articulos\vclx.dcp" />
<DCCReference Include="uDialogBase.pas"> <DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form> <Form>fDialogBase</Form>
</DCCReference> </DCCReference>

BIN
Source/GUIBase/GUIBase.res
View File

Binary file not shown.

11
Source/GUIBase/uEditorDBItem.dfm
View File

@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem
Width = 650 Width = 650
ExplicitWidth = 650 ExplicitWidth = 650
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 605 ExplicitWidth = 650
inherited TBXItem26: TTBXItem inherited TBXItem26: TTBXItem
Visible = False Visible = False
end end
@ -77,12 +77,14 @@ inherited fEditorDBItem: TfEditorDBItem
object pgPaginas: TPageControl [3] object pgPaginas: TPageControl [3]
AlignWithMargins = True AlignWithMargins = True
Left = 3 Left = 3
Top = 109 Top = 112
Width = 644 Width = 644
Height = 328 Height = 325
ActivePage = pagGeneral ActivePage = pagGeneral
Align = alClient Align = alClient
TabOrder = 2 TabOrder = 2
ExplicitTop = 109
ExplicitHeight = 328
object pagGeneral: TTabSheet object pagGeneral: TTabSheet
Caption = 'General' Caption = 'General'
ExplicitLeft = 0 ExplicitLeft = 0
@ -93,7 +95,7 @@ inherited fEditorDBItem: TfEditorDBItem
end end
object PnlComentario: TPanel [4] object PnlComentario: TPanel [4]
Left = 0 Left = 0
Top = 76 Top = 79
Width = 650 Width = 650
Height = 30 Height = 30
Align = alTop Align = alTop
@ -103,6 +105,7 @@ inherited fEditorDBItem: TfEditorDBItem
ParentBackground = False ParentBackground = False
TabOrder = 4 TabOrder = 4
VerticalAlignment = taAlignTop VerticalAlignment = taAlignTop
ExplicitTop = 76
object lbComentario: TLabel object lbComentario: TLabel
AlignWithMargins = True AlignWithMargins = True
Left = 6 Left = 6

6
Source/GUIBase/uViewDetallesDTO.dfm
View File

@ -28,6 +28,7 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
Caption = 'Dto' Caption = 'Dto'
DataBinding.FieldName = 'DESCUENTO' DataBinding.FieldName = 'DESCUENTO'
PropertiesClassName = 'TcxCurrencyEditProperties' PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DisplayFormat = ',0.00 %;-,0.00 %' Properties.DisplayFormat = ',0.00 %;-,0.00 %'
Properties.EditFormat = ',0.00;-,0.00' Properties.EditFormat = ',0.00;-,0.00'
Properties.MaxValue = 100.000000000000000000 Properties.MaxValue = 100.000000000000000000
@ -55,11 +56,6 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
end end
end end
end end
inherited TBXDock1: TTBXDock
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 447
end
end
inherited ActionListContenido: TActionList inherited ActionListContenido: TActionList
inherited actAnadir: TAction inherited actAnadir: TAction
Caption = 'A'#241'adir concepto' Caption = 'A'#241'adir concepto'

52
Source/Informes/1/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

67
Source/Informes/1/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

50
Source/Informes/2/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

61
Source/Informes/2/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

65
Source/Informes/3/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

65
Source/Informes/4/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

22
Source/Informes/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

2
Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
View File

@ -117,7 +117,7 @@ begin
begin begin
Edit; Edit;
try try
if not ADetalles.DataTable.FieldByName('DESCUENTO').IsNull then if (ADetalles.DataTable.FieldByName(CAMPO_TIPO).AsString = TIPO_DETALLE_CONCEPTO) then
begin begin
//Para mantener la cantidad que ya tuviera el detalle se debe guardar y volver a poner //Para mantener la cantidad que ya tuviera el detalle se debe guardar y volver a poner
ADetalles.DataTable.FieldByName('DESCUENTO').AsFloat := ADescuento; ADetalles.DataTable.FieldByName('DESCUENTO').AsFloat := ADescuento;

BIN
Source/Modulos/Articulos/Views/Articulos_view.RES
View File

Binary file not shown.

12
Source/Modulos/Articulos/Views/uEditorArticulos.dfm
View File

@ -2,8 +2,7 @@ inherited fEditorArticulos: TfEditorArticulos
Left = 489 Left = 489
Top = 325 Top = 325
Caption = 'Lista de art'#237'culos' Caption = 'Lista de art'#237'culos'
ExplicitWidth = 320 ExplicitHeight = 482
ExplicitHeight = 471
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -27,8 +26,11 @@ inherited fEditorArticulos: TfEditorArticulos
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
inherited tbxMain: TTBXToolbar
ExplicitWidth = 543
end
inherited tbxFiltro: TTBXToolbar inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 269 ExplicitWidth = 276
inherited tbxEditFiltro: TTBXEditItem inherited tbxEditFiltro: TTBXEditItem
EditOptions = [tboUseEditWhenVertical] EditOptions = [tboUseEditWhenVertical]
end end
@ -37,9 +39,9 @@ inherited fEditorArticulos: TfEditorArticulos
end end
end end
inherited TBXTMain2: TTBXToolbar inherited TBXTMain2: TTBXToolbar
Left = 275 Left = 276
DockPos = 275 DockPos = 275
ExplicitLeft = 275 ExplicitLeft = 276
end end
end end
inherited EditorActionList: TActionList inherited EditorActionList: TActionList

6
Source/Modulos/Articulos/Views/uEditorArticulos.pas
View File

@ -141,10 +141,9 @@ begin
end; end;
procedure TfEditorArticulos.DuplicarInterno; procedure TfEditorArticulos.DuplicarInterno;
{var var
AArticulo : IBizArticulo;} AArticulo : IBizArticulo;
begin begin
{
inherited; inherited;
AArticulo := FController.Duplicar(Articulos); AArticulo := FController.Duplicar(Articulos);
try try
@ -152,7 +151,6 @@ begin
finally finally
actRefrescar.Execute; actRefrescar.Execute;
end; end;
}
end; end;
procedure TfEditorArticulos.EliminarInterno; procedure TfEditorArticulos.EliminarInterno;

11
Source/Modulos/Contactos/Controller/uClientesController.pas
View File

@ -211,8 +211,15 @@ begin
else else
Result := False; 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;
end; end;

11
Source/Modulos/Contactos/Controller/uProveedoresController.pas
View File

@ -172,8 +172,15 @@ begin
else else
Result := False; 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;
end; end;

60
Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
View File

@ -9,21 +9,21 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_DarEmpresasContacto = '{B08B2B26-6152-452E-9122-B63D4F5E8177}'; RID_DarEmpresasContacto = '{00F42015-9439-4F03-86AA-9053BAE56E60}';
RID_PersonalContacto = '{5AACCEDA-0CFB-4618-8487-AFDBEF59F1DA}'; RID_PersonalContacto = '{8D74552A-CFEB-47B3-9035-DBB85769C03B}';
RID_DarTiendaDeUsuario = '{596A636F-0514-4EE5-B1E4-EBA123DC5987}'; RID_DarTiendaDeUsuario = '{A1A770C1-133F-4F79-9FAF-B902CA78D7AB}';
RID_SubCuentasContacto = '{1233587F-0BB7-48AD-9817-2D78C9F6BD89}'; RID_SubCuentasContacto = '{46DCA8AE-E089-4600-ACE8-4DD17A16EECD}';
RID_Contactos = '{F1BCF5ED-94DB-497F-B615-3CD9D33419A5}'; RID_Contactos = '{0BE6A6BF-0394-4735-BA21-9FB16D9A99D0}';
RID_GruposCliente = '{1701F98E-9A7D-4FE1-8DF4-C5403698952F}'; RID_GruposCliente = '{5BC87FF2-2FD1-4B93-9508-3F1B5BEA6F93}';
RID_DatosBancarios = '{C7E784C2-79BD-45EC-85BD-28A4F8A28768}'; RID_DatosBancarios = '{A597124D-56FD-42B6-B2DA-800FF9CA2D20}';
RID_Clientes = '{4516040D-C7FD-42FB-A534-27D882C4E44A}'; RID_Clientes = '{CBA08C07-4C50-427E-AAFA-993C9413F253}';
RID_Proveedores = '{D94213C7-8EF1-4EE0-A3D2-6145996FEB31}'; RID_Proveedores = '{C5B628A3-9580-46A3-8E36-F25FCE8022BF}';
RID_Vendedores = '{D64ADEFD-943B-4DEB-9A00-94C5261652D0}'; RID_Vendedores = '{4E1B22A4-576A-4033-9069-1FFA304380A8}';
RID_DireccionesContacto = '{10A25629-161D-4AC6-8BC5-DD64FA06C169}'; RID_DireccionesContacto = '{FED11ACC-A937-4598-B61B-A91CB54673ED}';
RID_ClientesDescuentos = '{8CDF59EF-E8FB-476C-80DF-A8CB174FA059}'; RID_ClientesDescuentos = '{FD557CDA-2350-4487-BB6C-FD98E7816D65}';
RID_ProcedenciasCliente = '{C8B0E03E-40C8-44E6-BF61-87C2D77DA2DB}'; RID_ProcedenciasCliente = '{A0E7E9CA-4C28-4EA6-B57B-14B6B5C516C5}';
RID_GruposProveedor = '{6084BA5B-6828-40E7-B51B-20AA866EDC9B}'; RID_GruposProveedor = '{C0E2E4CB-5439-4145-A9FF-0AFA3ACDEB37}';
RID_Contactos_Refresh = '{ECE7A8D0-90FE-42BD-9882-6CECEC6B1247}'; RID_Contactos_Refresh = '{829D70DD-295E-4722-B531-2E55231BBF2C}';
{ Data table names } { Data table names }
nme_DarEmpresasContacto = 'DarEmpresasContacto'; nme_DarEmpresasContacto = 'DarEmpresasContacto';
@ -531,7 +531,7 @@ const
type type
{ IDarEmpresasContacto } { IDarEmpresasContacto }
IDarEmpresasContacto = interface(IDAStronglyTypedDataTable) IDarEmpresasContacto = interface(IDAStronglyTypedDataTable)
['{F0DE14FF-9BB7-410A-BF62-D69E20426D61}'] ['{32E74026-2CB7-4A93-886B-FF16B5C1E459}']
{ Property getters and setters } { Property getters and setters }
function GetID_EMPRESAValue: Integer; function GetID_EMPRESAValue: Integer;
procedure SetID_EMPRESAValue(const aValue: Integer); procedure SetID_EMPRESAValue(const aValue: Integer);
@ -566,7 +566,7 @@ type
{ IPersonalContacto } { IPersonalContacto }
IPersonalContacto = interface(IDAStronglyTypedDataTable) IPersonalContacto = interface(IDAStronglyTypedDataTable)
['{7E79652F-1F5A-4EDB-A235-FEBB14E8F7B4}'] ['{68D032C9-18AE-4CAE-8BD5-AD4AD66247F8}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -709,7 +709,7 @@ type
{ IDarTiendaDeUsuario } { IDarTiendaDeUsuario }
IDarTiendaDeUsuario = interface(IDAStronglyTypedDataTable) IDarTiendaDeUsuario = interface(IDAStronglyTypedDataTable)
['{1C479BCF-55C5-491A-8A3B-7BEAE736497C}'] ['{C117D8AF-FC75-444F-BE4A-CD4217198AD6}']
{ Property getters and setters } { Property getters and setters }
function GetID_TIENDAValue: Integer; function GetID_TIENDAValue: Integer;
procedure SetID_TIENDAValue(const aValue: Integer); procedure SetID_TIENDAValue(const aValue: Integer);
@ -744,7 +744,7 @@ type
{ ISubCuentasContacto } { ISubCuentasContacto }
ISubCuentasContacto = interface(IDAStronglyTypedDataTable) ISubCuentasContacto = interface(IDAStronglyTypedDataTable)
['{C03A519D-7A17-43D9-AA9A-356AE0969385}'] ['{2AED639B-B9A3-40BE-BD47-3E52A7C08E14}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -839,7 +839,7 @@ type
{ IContactos } { IContactos }
IContactos = interface(IDAStronglyTypedDataTable) IContactos = interface(IDAStronglyTypedDataTable)
['{5FF8FFAA-013B-4262-83A5-4D79B5BDB2FB}'] ['{5D40243C-B968-45E5-B145-362F818D2B8B}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1162,7 +1162,7 @@ type
{ IGruposCliente } { IGruposCliente }
IGruposCliente = interface(IDAStronglyTypedDataTable) IGruposCliente = interface(IDAStronglyTypedDataTable)
['{5DB5624D-02FF-47A3-AC0D-F9C547224C8D}'] ['{3BD8080F-6982-4E7F-9063-6561238E4FDC}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1209,7 +1209,7 @@ type
{ IDatosBancarios } { IDatosBancarios }
IDatosBancarios = interface(IDAStronglyTypedDataTable) IDatosBancarios = interface(IDAStronglyTypedDataTable)
['{1EA1794A-40CF-4222-8A00-05D99F6F711C}'] ['{7B46974C-D404-4A84-8030-356E464E576A}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1340,7 +1340,7 @@ type
{ IClientes } { IClientes }
IClientes = interface(IDAStronglyTypedDataTable) IClientes = interface(IDAStronglyTypedDataTable)
['{495F21F5-EB41-445D-9F0A-00E250308A8B}'] ['{A64C208A-88D9-45FC-B81F-89EBB2F685AD}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1879,7 +1879,7 @@ type
{ IProveedores } { IProveedores }
IProveedores = interface(IDAStronglyTypedDataTable) IProveedores = interface(IDAStronglyTypedDataTable)
['{E986088F-9A0F-45F7-AEA2-FFDECE36AE7B}'] ['{7151A550-9546-4480-B1A7-D33B2A277127}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -2406,7 +2406,7 @@ type
{ IVendedores } { IVendedores }
IVendedores = interface(IDAStronglyTypedDataTable) IVendedores = interface(IDAStronglyTypedDataTable)
['{13320D0A-CD1C-4584-8812-921048D6DA49}'] ['{56354278-A7D9-4529-8D53-9C68FCC14A10}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -2753,7 +2753,7 @@ type
{ IDireccionesContacto } { IDireccionesContacto }
IDireccionesContacto = interface(IDAStronglyTypedDataTable) IDireccionesContacto = interface(IDAStronglyTypedDataTable)
['{F5CE05FD-B302-4CD2-9D9D-255027C62E1D}'] ['{F32E6D11-C168-417A-A1D5-A0BEEF0FBC17}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -2980,7 +2980,7 @@ type
{ IClientesDescuentos } { IClientesDescuentos }
IClientesDescuentos = interface(IDAStronglyTypedDataTable) IClientesDescuentos = interface(IDAStronglyTypedDataTable)
['{304028E2-1695-44C5-A72C-4322150A3BAE}'] ['{E355C96A-2658-45AE-A458-571CC587C2FD}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -3063,7 +3063,7 @@ type
{ IProcedenciasCliente } { IProcedenciasCliente }
IProcedenciasCliente = interface(IDAStronglyTypedDataTable) IProcedenciasCliente = interface(IDAStronglyTypedDataTable)
['{8997128D-293B-4C78-A421-F4CE60FEBFFB}'] ['{10026F7E-0AFF-47AA-A869-242B35FDC14F}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -3110,7 +3110,7 @@ type
{ IGruposProveedor } { IGruposProveedor }
IGruposProveedor = interface(IDAStronglyTypedDataTable) IGruposProveedor = interface(IDAStronglyTypedDataTable)
['{0D94945D-DA5D-4A3D-B662-AAC86E635EFC}'] ['{7A4C049D-30F9-49C4-857C-D5337B78E55D}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -3157,7 +3157,7 @@ type
{ IContactos_Refresh } { IContactos_Refresh }
IContactos_Refresh = interface(IDAStronglyTypedDataTable) IContactos_Refresh = interface(IDAStronglyTypedDataTable)
['{61B17C88-7DDE-4839-9C4F-46B2934F93C4}'] ['{8CDF4B0A-7FE6-490A-B14D-3B7A5DDE2658}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);

60
Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
View File

@ -9,26 +9,26 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_DarEmpresasContactoDelta = '{FB6A8530-060C-4400-A106-FF904C79CD28}'; RID_DarEmpresasContactoDelta = '{5FA33C81-8C1D-4537-B419-7F589C4F54D5}';
RID_PersonalContactoDelta = '{7C9E3008-B9E5-4BEE-AEC8-260BA70C262B}'; RID_PersonalContactoDelta = '{D74E53F4-C0F1-4D5D-B6D6-05A77D4A9C0D}';
RID_DarTiendaDeUsuarioDelta = '{20388966-2224-417C-B15F-9E11960B3118}'; RID_DarTiendaDeUsuarioDelta = '{3315B230-9DF0-4D42-A630-4F88722A12A8}';
RID_SubCuentasContactoDelta = '{0D54356F-7EEC-4204-B201-D4AFB11C109D}'; RID_SubCuentasContactoDelta = '{C7E0C7C4-BC8A-4C86-B305-9DF867D6A5D5}';
RID_ContactosDelta = '{A558B005-DC6F-4FD7-8221-B8977A163DBD}'; RID_ContactosDelta = '{0E3D9787-3136-4245-8F91-3EBE5114B07B}';
RID_GruposClienteDelta = '{EA29DAA6-299E-490D-AF14-AF4C1E8409CF}'; RID_GruposClienteDelta = '{765D408B-0F60-4F57-AAAC-EB611A2567B3}';
RID_DatosBancariosDelta = '{26484ECF-20D8-4035-B50D-7AE609C06308}'; RID_DatosBancariosDelta = '{58EBA3FB-6358-4B0E-B027-003752A40D0A}';
RID_ClientesDelta = '{7F411F05-F7EB-45C2-8D46-0C451DCDC9EB}'; RID_ClientesDelta = '{D5CE5C47-A434-4DC9-8617-2C3C39FBCF1C}';
RID_ProveedoresDelta = '{0BE0828F-BB40-4A7B-9774-B39DFFF9B488}'; RID_ProveedoresDelta = '{65866AED-3F9E-4108-9964-F68148C5B028}';
RID_VendedoresDelta = '{44AEFE00-C5A8-4F44-83E9-D496BF800E87}'; RID_VendedoresDelta = '{ECCEABBD-8C47-4A80-9EC3-A474AC97FA89}';
RID_DireccionesContactoDelta = '{18F805F8-E168-4C5B-91D4-B688AF8FA680}'; RID_DireccionesContactoDelta = '{122A7EBF-EB98-48D4-A6B6-2A2CA2AFA08C}';
RID_ClientesDescuentosDelta = '{662A297B-A003-4239-83A5-698F54B8C2B0}'; RID_ClientesDescuentosDelta = '{4C3B17AE-119E-4957-94CE-3B041BC05FF2}';
RID_ProcedenciasClienteDelta = '{7CA86C64-4446-4EC9-9964-DF12FC859719}'; RID_ProcedenciasClienteDelta = '{74BA2BD3-5FD4-4D3B-B5EC-1AE94047F10C}';
RID_GruposProveedorDelta = '{C100483C-023A-4298-87FD-6D26CE7DEA37}'; RID_GruposProveedorDelta = '{CA02E8EE-2B59-48D4-99F2-73D8BA2128FA}';
RID_Contactos_RefreshDelta = '{2CF622BB-DBC1-47DC-8AF1-854E33953AF8}'; RID_Contactos_RefreshDelta = '{A5BBEBE8-E924-47D4-9DCA-D293C53B2E90}';
type type
{ IDarEmpresasContactoDelta } { IDarEmpresasContactoDelta }
IDarEmpresasContactoDelta = interface(IDarEmpresasContacto) IDarEmpresasContactoDelta = interface(IDarEmpresasContacto)
['{FB6A8530-060C-4400-A106-FF904C79CD28}'] ['{5FA33C81-8C1D-4537-B419-7F589C4F54D5}']
{ Property getters and setters } { Property getters and setters }
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -62,7 +62,7 @@ type
{ IPersonalContactoDelta } { IPersonalContactoDelta }
IPersonalContactoDelta = interface(IPersonalContacto) IPersonalContactoDelta = interface(IPersonalContacto)
['{7C9E3008-B9E5-4BEE-AEC8-260BA70C262B}'] ['{D74E53F4-C0F1-4D5D-B6D6-05A77D4A9C0D}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer; function GetOldID_CONTACTOValue : Integer;
@ -204,7 +204,7 @@ type
{ IDarTiendaDeUsuarioDelta } { IDarTiendaDeUsuarioDelta }
IDarTiendaDeUsuarioDelta = interface(IDarTiendaDeUsuario) IDarTiendaDeUsuarioDelta = interface(IDarTiendaDeUsuario)
['{20388966-2224-417C-B15F-9E11960B3118}'] ['{3315B230-9DF0-4D42-A630-4F88722A12A8}']
{ Property getters and setters } { Property getters and setters }
function GetOldID_TIENDAValue : Integer; function GetOldID_TIENDAValue : Integer;
@ -238,7 +238,7 @@ type
{ ISubCuentasContactoDelta } { ISubCuentasContactoDelta }
ISubCuentasContactoDelta = interface(ISubCuentasContacto) ISubCuentasContactoDelta = interface(ISubCuentasContacto)
['{0D54356F-7EEC-4204-B201-D4AFB11C109D}'] ['{C7E0C7C4-BC8A-4C86-B305-9DF867D6A5D5}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldREF_SUBCUENTAValue : String; function GetOldREF_SUBCUENTAValue : String;
@ -332,7 +332,7 @@ type
{ IContactosDelta } { IContactosDelta }
IContactosDelta = interface(IContactos) IContactosDelta = interface(IContactos)
['{A558B005-DC6F-4FD7-8221-B8977A163DBD}'] ['{0E3D9787-3136-4245-8F91-3EBE5114B07B}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer; function GetOldID_CATEGORIAValue : Integer;
@ -655,7 +655,7 @@ type
{ IGruposClienteDelta } { IGruposClienteDelta }
IGruposClienteDelta = interface(IGruposCliente) IGruposClienteDelta = interface(IGruposCliente)
['{EA29DAA6-299E-490D-AF14-AF4C1E8409CF}'] ['{765D408B-0F60-4F57-AAAC-EB611A2567B3}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String; function GetOldDESCRIPCIONValue : String;
@ -701,7 +701,7 @@ type
{ IDatosBancariosDelta } { IDatosBancariosDelta }
IDatosBancariosDelta = interface(IDatosBancarios) IDatosBancariosDelta = interface(IDatosBancarios)
['{26484ECF-20D8-4035-B50D-7AE609C06308}'] ['{58EBA3FB-6358-4B0E-B027-003752A40D0A}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer; function GetOldID_CONTACTOValue : Integer;
@ -831,7 +831,7 @@ type
{ IClientesDelta } { IClientesDelta }
IClientesDelta = interface(IClientes) IClientesDelta = interface(IClientes)
['{7F411F05-F7EB-45C2-8D46-0C451DCDC9EB}'] ['{D5CE5C47-A434-4DC9-8617-2C3C39FBCF1C}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer; function GetOldID_CATEGORIAValue : Integer;
@ -1370,7 +1370,7 @@ type
{ IProveedoresDelta } { IProveedoresDelta }
IProveedoresDelta = interface(IProveedores) IProveedoresDelta = interface(IProveedores)
['{0BE0828F-BB40-4A7B-9774-B39DFFF9B488}'] ['{65866AED-3F9E-4108-9964-F68148C5B028}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer; function GetOldID_CATEGORIAValue : Integer;
@ -1897,7 +1897,7 @@ type
{ IVendedoresDelta } { IVendedoresDelta }
IVendedoresDelta = interface(IVendedores) IVendedoresDelta = interface(IVendedores)
['{44AEFE00-C5A8-4F44-83E9-D496BF800E87}'] ['{ECCEABBD-8C47-4A80-9EC3-A474AC97FA89}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer; function GetOldID_CATEGORIAValue : Integer;
@ -2244,7 +2244,7 @@ type
{ IDireccionesContactoDelta } { IDireccionesContactoDelta }
IDireccionesContactoDelta = interface(IDireccionesContacto) IDireccionesContactoDelta = interface(IDireccionesContacto)
['{18F805F8-E168-4C5B-91D4-B688AF8FA680}'] ['{122A7EBF-EB98-48D4-A6B6-2A2CA2AFA08C}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer; function GetOldID_CONTACTOValue : Integer;
@ -2471,7 +2471,7 @@ type
{ IClientesDescuentosDelta } { IClientesDescuentosDelta }
IClientesDescuentosDelta = interface(IClientesDescuentos) IClientesDescuentosDelta = interface(IClientesDescuentos)
['{662A297B-A003-4239-83A5-698F54B8C2B0}'] ['{4C3B17AE-119E-4957-94CE-3B041BC05FF2}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CLIENTEValue : Integer; function GetOldID_CLIENTEValue : Integer;
@ -2553,7 +2553,7 @@ type
{ IProcedenciasClienteDelta } { IProcedenciasClienteDelta }
IProcedenciasClienteDelta = interface(IProcedenciasCliente) IProcedenciasClienteDelta = interface(IProcedenciasCliente)
['{7CA86C64-4446-4EC9-9964-DF12FC859719}'] ['{74BA2BD3-5FD4-4D3B-B5EC-1AE94047F10C}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String; function GetOldDESCRIPCIONValue : String;
@ -2599,7 +2599,7 @@ type
{ IGruposProveedorDelta } { IGruposProveedorDelta }
IGruposProveedorDelta = interface(IGruposProveedor) IGruposProveedorDelta = interface(IGruposProveedor)
['{C100483C-023A-4298-87FD-6D26CE7DEA37}'] ['{CA02E8EE-2B59-48D4-99F2-73D8BA2128FA}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String; function GetOldDESCRIPCIONValue : String;
@ -2645,7 +2645,7 @@ type
{ IContactos_RefreshDelta } { IContactos_RefreshDelta }
IContactos_RefreshDelta = interface(IContactos_Refresh) IContactos_RefreshDelta = interface(IContactos_Refresh)
['{2CF622BB-DBC1-47DC-8AF1-854E33953AF8}'] ['{A5BBEBE8-E924-47D4-9DCA-D293C53B2E90}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldNIF_CIFValue : String; function GetOldNIF_CIFValue : String;

12
Source/Modulos/Contactos/Model/uBizContactosServer.pas
View File

@ -102,14 +102,14 @@ begin
ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
//En el caso de querer tener los contactos separados por empresas en lugar de tenerlos en común //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 //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 try
with ACommand do with ACommand do
begin begin
ParamByName('OLD_ID_CONTACTO').Value := aChange.OldValueByName[fld_ContactosID]; 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; Execute;
end; end;
finally finally
@ -150,14 +150,14 @@ begin
ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor); ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
//En el caso de querer tener los contactos separados por empresas en lugar de tenerlos en común //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 //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 try
with ACommand do with ACommand do
begin begin
ParamByName('ID_CONTACTO').Value := aChange.NewValueByName[fld_ContactosID]; 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; Execute;
end; end;
finally finally

11
Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
View File

@ -3628,18 +3628,14 @@ object srvContactos: TsrvContactos
end end
item item
Params = < Params = <
item
Name = 'ID'
DataType = datAutoInc
GeneratorName = 'GEN_EMPRESAS_CONTACTOS_ID'
Value = ''
end
item item
Name = 'ID_EMPRESA' Name = 'ID_EMPRESA'
DataType = datInteger
Value = '' Value = ''
end end
item item
Name = 'ID_CONTACTO' Name = 'ID_CONTACTO'
DataType = datInteger
Value = '' Value = ''
end> end>
Statements = < Statements = <
@ -3648,7 +3644,8 @@ object srvContactos: TsrvContactos
TargetTable = 'EMPRESAS_CONTACTOS' TargetTable = 'EMPRESAS_CONTACTOS'
SQL = SQL =
'INSERT'#10' INTO EMPRESAS_CONTACTOS'#10' (ID, ID_EMPRESA, ID_CONTACT' + '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 StatementType = stSQL
ColumnMappings = <> ColumnMappings = <>
end> end>

31
Source/Modulos/Contactos/Views/uEditorClientes.dfm
View File

@ -5,7 +5,7 @@ inherited fEditorClientes: TfEditorClientes
ClientHeight = 519 ClientHeight = 519
ClientWidth = 786 ClientWidth = 786
ExplicitWidth = 794 ExplicitWidth = 794
ExplicitHeight = 553 ExplicitHeight = 557
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -52,17 +52,17 @@ inherited fEditorClientes: TfEditorClientes
Width = 786 Width = 786
ExplicitWidth = 786 ExplicitWidth = 786
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 632 ExplicitWidth = 711
end end
inherited tbxMenu: TTBXToolbar inherited tbxMenu: TTBXToolbar
ExplicitWidth = 786 ExplicitWidth = 786
end end
inherited TBXTMain2: TTBXToolbar inherited TBXTMain2: TTBXToolbar
Left = 275 Left = 276
DockPos = 275 DockPos = 275
Visible = True Visible = True
ExplicitLeft = 275 ExplicitLeft = 276
ExplicitWidth = 83 ExplicitWidth = 91
object TBXItem38: TTBXItem object TBXItem38: TTBXItem
Action = actInformes Action = actInformes
DisplayMode = nbdmImageAndText DisplayMode = nbdmImageAndText
@ -77,9 +77,9 @@ inherited fEditorClientes: TfEditorClientes
end end
inline frViewClientes1: TfrViewClientes [3] inline frViewClientes1: TfrViewClientes [3]
Left = 0 Left = 0
Top = 102 Top = 106
Width = 786 Width = 786
Height = 398 Height = 394
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -89,20 +89,25 @@ inherited fEditorClientes: TfEditorClientes
ParentFont = False ParentFont = False
TabOrder = 3 TabOrder = 3
ReadOnly = False ReadOnly = False
ExplicitTop = 102 ExplicitTop = 106
ExplicitWidth = 786 ExplicitWidth = 786
ExplicitHeight = 398 ExplicitHeight = 394
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 786 Width = 786
Height = 270 Height = 266
ExplicitWidth = 786 ExplicitWidth = 786
ExplicitHeight = 270 ExplicitHeight = 266
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = < DataController.Summary.FooterSummaryItems = <
item item
Format = '0 clientes' Format = '0 clientes'
Kind = skCount Kind = skCount
Column = frViewClientes1.cxGridViewTIENDA Column = frViewClientes1.cxGridViewTIENDA
end
item
Format = '0 clientes'
Kind = skCount
Column = frViewClientes1.cxGridViewNIF_CIF
end> end>
end end
end end
@ -152,8 +157,8 @@ inherited fEditorClientes: TfEditorClientes
end end
end end
inherited pnlAgrupaciones: TTBXDockablePanel inherited pnlAgrupaciones: TTBXDockablePanel
Top = 372 Top = 368
ExplicitTop = 372 ExplicitTop = 368
ExplicitWidth = 786 ExplicitWidth = 786
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 786 Width = 786

5
Source/Modulos/Contactos/Views/uEditorContactos.dfm
View File

@ -2,8 +2,7 @@ inherited fEditorContactos: TfEditorContactos
Left = 285 Left = 285
Top = 448 Top = 448
Caption = 'Lista de contactos' Caption = 'Lista de contactos'
ExplicitWidth = 320 ExplicitHeight = 482
ExplicitHeight = 240
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -14,7 +13,7 @@ inherited fEditorContactos: TfEditorContactos
ExplicitWidth = 543 ExplicitWidth = 543
end end
inherited tbxFiltro: TTBXToolbar inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 269 ExplicitWidth = 276
inherited tbxEditFiltro: TTBXEditItem inherited tbxEditFiltro: TTBXEditItem
EditOptions = [tboUseEditWhenVertical] EditOptions = [tboUseEditWhenVertical]
end end

7
Source/Modulos/Contactos/Views/uViewClientes.dfm
View File

@ -9,12 +9,7 @@ inherited frViewClientes: TfrViewClientes
ExplicitWidth = 633 ExplicitWidth = 633
ExplicitHeight = 376 ExplicitHeight = 376
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = < DataController.Summary.FooterSummaryItems = <>
item
Format = '0 clientes'
Kind = skCount
Column = cxGridViewNIF_CIF
end>
object cxGridViewBLOQUEADO: TcxGridDBColumn [1] object cxGridViewBLOQUEADO: TcxGridDBColumn [1]
DataBinding.FieldName = 'BLOQUEADO' DataBinding.FieldName = 'BLOQUEADO'
PropertiesClassName = 'TcxTextEditProperties' PropertiesClassName = 'TcxTextEditProperties'

3
Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas
View File

@ -121,6 +121,7 @@ begin
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo;
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCONCEPTO).AsString := Descripcion; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCONCEPTO).AsString := Descripcion;
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesDESCUENTO).AsVariant := Null;
//Rellenamos con las propiedades del capitulo //Rellenamos con las propiedades del capitulo
ACapitulo := FDataModule.GetCapitulo(Tipo); ACapitulo := FDataModule.GetCapitulo(Tipo);
@ -135,6 +136,7 @@ begin
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo;
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesPROPIEDAD).AsString := ACapitulo.CONCEPTO; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesPROPIEDAD).AsString := ACapitulo.CONCEPTO;
Next; Next;
until EOF; until EOF;
end; end;
@ -145,6 +147,7 @@ begin
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesTIPO_ARTICULO).AsString := Tipo;
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCONCEPTO).AsString := 'SUBTOTAL ' + Descripcion; ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesCONCEPTO).AsString := 'SUBTOTAL ' + Descripcion;
ADetalles.DataTable.FieldByName(fld_PresupuestosCliente_DetallesDESCUENTO).AsVariant := Null;
if Descuento then if Descuento then
begin begin

13
Source/Modulos/Presupuestos de cliente/Model/uBizDetallesPresupuestoCliente.pas
View File

@ -84,7 +84,8 @@ implementation
{ TBizDetallesPresupuestoCliente } { TBizDetallesPresupuestoCliente }
uses uses
Dialogs, DB, uDataTableUtils, SysUtils, JclStrings; Dialogs, DB, uDataTableUtils, SysUtils, JclStrings,
uBizPresupuestosCliente, uControllerDetallesBase;
procedure TBizDetallesPresupuestoCliente.BeforeInsert(Sender: TDADataTable); procedure TBizDetallesPresupuestoCliente.BeforeInsert(Sender: TDADataTable);
var var
@ -97,9 +98,19 @@ begin
end; end;
procedure TBizDetallesPresupuestoCliente.OnNewRecord(Sender: TDADataTable); procedure TBizDetallesPresupuestoCliente.OnNewRecord(Sender: TDADataTable);
var
AMasterTable : TDADataTable;
begin begin
inherited; inherited;
VISIBLE := 1; 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; end;
{ TBizPropiedades } { TBizPropiedades }

36
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
View File

@ -6,7 +6,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ClientWidth = 848 ClientWidth = 848
OnClose = CustomEditorClose OnClose = CustomEditorClose
ExplicitWidth = 856 ExplicitWidth = 856
ExplicitHeight = 710 ExplicitHeight = 714
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -129,7 +129,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 848 Width = 848
ExplicitWidth = 848 ExplicitWidth = 848
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 488 ExplicitWidth = 551
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
@ -176,12 +176,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 842 Width = 842
Height = 317 Height = 314
ActivePage = pagContenido ActivePage = pagContenido
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 842 ExplicitWidth = 842
ExplicitHeight = 317 ExplicitHeight = 314
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
@ -195,7 +195,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 289 Height = 286
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -208,7 +208,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 289 ExplicitHeight = 286
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 834 Width = 834
Height = 24 Height = 24
@ -289,10 +289,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 50 Top = 50
Width = 834 Width = 834
Height = 239 Height = 236
ExplicitTop = 50 ExplicitTop = 50
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 239 ExplicitHeight = 236
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPROPIEDAD: TcxGridDBColumn inherited cxGridViewPROPIEDAD: TcxGridDBColumn
IsCaptionAssigned = True IsCaptionAssigned = True
@ -305,7 +305,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 834 ExplicitWidth = 834
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 665 ExplicitWidth = 753
end end
end end
inherited cxLookupComboBox1: TcxLookupComboBox inherited cxLookupComboBox1: TcxLookupComboBox
@ -326,7 +326,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 289 Height = 286
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -337,7 +337,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 289 ExplicitHeight = 286
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 834 Width = 834
ExplicitWidth = 834 ExplicitWidth = 834
@ -347,13 +347,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 834 Width = 834
Height = 261 Height = 258
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 261 ExplicitHeight = 258
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 830 ExplicitWidth = 830
ExplicitHeight = 244 ExplicitHeight = 241
Height = 244 Height = 241
Width = 830 Width = 830
end end
end end
@ -366,7 +366,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 289 Height = 286
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -377,14 +377,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 289 ExplicitHeight = 286
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 834 Width = 834
ExplicitWidth = 834 ExplicitWidth = 834
end end
inherited ListView1: TListView inherited ListView1: TListView
Width = 834 Width = 834
Height = 266 Height = 260
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 266 ExplicitHeight = 266
end end

2
Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
View File

@ -58,7 +58,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn inherited cxGridViewTIPO: TcxGridDBColumn
VisibleForCustomization = False Visible = True
end end
inherited cxGridViewID_ARTICULO: TcxGridDBColumn inherited cxGridViewID_ARTICULO: TcxGridDBColumn
Width = 57 Width = 57

3
Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas
View File

@ -118,7 +118,8 @@ begin
end; end;
procedure TfrViewDetallesPresupuestoCliente.actAsignarDescuentoExecute(Sender: TObject); procedure TfrViewDetallesPresupuestoCliente.actAsignarDescuentoExecute(Sender: TObject);
{var {
var
AuxTop, AuxRow:Integer; AuxTop, AuxRow:Integer;
ADescuento: Variant; ADescuento: Variant;
} }

BIN
Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/ConCli_AlbCli_relation.res
View File

Binary file not shown.

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -131,15 +131,15 @@ uses
schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_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', schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
srvSubfamilias_Impl in '..\Modulos\Subfamilias\Servidor\srvSubfamilias_Impl.pas' {srvSubfamilias: TDataAbstractService}, srvSubfamilias_Impl in '..\Modulos\Subfamilias\Servidor\srvSubfamilias_Impl.pas' {srvSubfamilias: TDataAbstractService},
schSubfamiliasClient_Intf in '..\Modulos\Subfamilias\Model\schSubfamiliasClient_Intf.pas', 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 *.res}
{$R ..\Servicios\RODLFile.res} {$R ..\Servicios\RODLFile.res}

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -28,7 +28,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/> <Borland.ProjectType/>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 05 de febrero de 2013 11:10</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 29 de abril de 2013 18:48</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.