Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 2.8.6. Se arregla editor de familias que no abria correctamente, tambien se arregla calculo de detalles para que los decimales no se descompensen por 4 decimales, tambien se sube posibilidad de duplicar pedidos a proveedor asociando el mismo contrato de cliente

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@662 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2017-10-25 14:38:21 +00:00
parent 7cf342a631
commit 39c50b27e1
18 changed files with 153 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.dfm
View File

@ -18,7 +18,7 @@ inherited fEditorUsuarios: TfEditorUsuarios
Width = 840 Width = 840
ExplicitWidth = 840 ExplicitWidth = 840
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 521 ExplicitWidth = 664
object TBXItem39: TTBXItem [8] object TBXItem39: TTBXItem [8]
Action = actCambiarPassword Action = actCambiarPassword
end end

9
Source/Base/Controladores/uControllerDetallesBase.pas
View File

@ -103,7 +103,7 @@ implementation
{ TControllerDetallesBase } { TControllerDetallesBase }
uses uses
cxControls, SysUtils, DB, uDAInterfaces, Dialogs; cxControls, SysUtils, DB, uDAInterfaces, Dialogs, uNumUtils;
procedure TControllerDetallesBase.ActualizarTotales(ADataTable: IDAStronglyTypedDataTable); procedure TControllerDetallesBase.ActualizarTotales(ADataTable: IDAStronglyTypedDataTable);
begin begin
@ -256,9 +256,12 @@ procedure TControllerDetallesBase.CalculoDetalleConcepto(DataTable: TDADataTable
begin begin
with DataTable do with DataTable do
begin begin
ImporteAcumulado := ImporteAcumulado + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat;
ImporteAcumulado := ImporteAcumulado + RoundCurrency(FieldByName(CAMPO_IMPORTE_TOTAL).AsCurrency);
// ImporteAcumulado := ImporteAcumulado + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat;
if not Opcional then if not Opcional then
ImporteTotal := ImporteTotal + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat; ImporteTotal := ImporteTotal + RoundCurrency(FieldByName(CAMPO_IMPORTE_TOTAL).AsCurrency);
// ImporteTotal := ImporteTotal + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat;
end; end;
end; end;

16
Source/Base/Utiles/uNumUtils.pas
View File

@ -28,12 +28,28 @@ interface
Function IntToLetras(Numero:LongInt):String; Function IntToLetras(Numero:LongInt):String;
Function xxIntToLetras(Valor:LongInt):String; Function xxIntToLetras(Valor:LongInt):String;
Function CifraToLetras(Cifra: Double): String; Function CifraToLetras(Cifra: Double): String;
function RoundCurrency(const Value: Currency): Currency;
implementation implementation
uses SysUtils, Dialogs; uses SysUtils, Dialogs;
// SysUtils, Windows, Dialogs, Messages, Classes, Graphics, Controls, Forms, StdCtrls; // SysUtils, Windows, Dialogs, Messages, Classes, Graphics, Controls, Forms, StdCtrls;
function RoundCurrency(const Value: Currency): Currency;
var
V64: Int64 absolute Result;
Decimals: Integer;
begin
Result := Value;
Decimals := V64 mod 100;
Dec(V64, Decimals);
case Decimals of
-99 .. -50 : Dec(V64, 100);
50 .. 99 : Inc(V64, 100);
end;
end;
Function xxIntToLetras(Valor:LongInt):String; Function xxIntToLetras(Valor:LongInt):String;
const const
aUnitat : array[1..15] of String = ('UNO','DOS','TRES','CUATRO','CINCO','SEIS', aUnitat : array[1..15] of String = ('UNO','DOS','TRES','CUATRO','CINCO','SEIS',

3
Source/Cliente/FactuGES.dproj
View File

@ -52,8 +52,7 @@
<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">8</VersionInfo><VersionInfo Name="Release">3</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.8.3.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.8.3.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">8</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.8.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

8
Source/Cliente/FactuGES.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico" MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,8,3,0 FILEVERSION 2,8,6,0
PRODUCTVERSION 2,8,3,0 PRODUCTVERSION 2,8,6,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.8.3.0\0" VALUE "FileVersion", "2.8.6.0\0"
VALUE "InternalName", "FactuGES\0" VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0" VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "2.8.3.0\0" VALUE "ProductVersion", "2.8.6.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

42
Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj
View File

@ -171,6 +171,24 @@
<Target Name="ConCli_FacCli_relation:Make"> <Target Name="ConCli_FacCli_relation:Make">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" Targets="Make" /> <MSBuild Projects="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" Targets="Make" />
</Target> </Target>
<Target Name="PreCli_ConCli_relation">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="" />
</Target>
<Target Name="PreCli_ConCli_relation:Clean">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PreCli_ConCli_relation:Make">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="ConCli_PedProv_relation">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="" />
</Target>
<Target Name="ConCli_PedProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="Clean" />
</Target>
<Target Name="ConCli_PedProv_relation:Make">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="ContratosCliente_view"> <Target Name="ContratosCliente_view">
<MSBuild Projects="Views\ContratosCliente_view.dproj" Targets="" /> <MSBuild Projects="Views\ContratosCliente_view.dproj" Targets="" />
</Target> </Target>
@ -207,15 +225,6 @@
<Target Name="FactuGES_Server:Make"> <Target Name="FactuGES_Server:Make">
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" /> <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
</Target> </Target>
<Target Name="PreCli_ConCli_relation">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="" />
</Target>
<Target Name="PreCli_ConCli_relation:Clean">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PreCli_ConCli_relation:Make">
<MSBuild Projects="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="PresupuestosCliente_view"> <Target Name="PresupuestosCliente_view">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" /> <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" />
</Target> </Target>
@ -225,15 +234,6 @@
<Target Name="PresupuestosCliente_view:Make"> <Target Name="PresupuestosCliente_view:Make">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" /> <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
</Target> </Target>
<Target Name="ConCli_PedProv_relation">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="" />
</Target>
<Target Name="ConCli_PedProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="Clean" />
</Target>
<Target Name="ConCli_PedProv_relation:Make">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="PedidosProveedor_controller"> <Target Name="PedidosProveedor_controller">
<MSBuild Projects="..\Pedidos a proveedor\Controller\PedidosProveedor_controller.dproj" Targets="" /> <MSBuild Projects="..\Pedidos a proveedor\Controller\PedidosProveedor_controller.dproj" Targets="" />
</Target> </Target>
@ -262,13 +262,13 @@
<MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="Make" /> <MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="Make" />
</Target> </Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;ContratosCliente_model;ContratosCliente_data;ContratosCliente_controller;ConCli_AlbCli_relation;ConCli_FacCli_relation;ContratosCliente_view;ContratosCliente_plugin;FactuGES;FactuGES_Server;PreCli_ConCli_relation;PresupuestosCliente_view;ConCli_PedProv_relation;PedidosProveedor_controller;PedidosProveedor_plugin;PedidosProveedor_view" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;ContratosCliente_model;ContratosCliente_data;ContratosCliente_controller;ConCli_AlbCli_relation;ConCli_FacCli_relation;PreCli_ConCli_relation;ConCli_PedProv_relation;ContratosCliente_view;ContratosCliente_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view;PedidosProveedor_controller;PedidosProveedor_plugin;PedidosProveedor_view" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;ContratosCliente_model:Clean;ContratosCliente_data:Clean;ContratosCliente_controller:Clean;ConCli_AlbCli_relation:Clean;ConCli_FacCli_relation:Clean;ContratosCliente_view:Clean;ContratosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PreCli_ConCli_relation:Clean;PresupuestosCliente_view:Clean;ConCli_PedProv_relation:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_plugin:Clean;PedidosProveedor_view:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;ContratosCliente_model:Clean;ContratosCliente_data:Clean;ContratosCliente_controller:Clean;ConCli_AlbCli_relation:Clean;ConCli_FacCli_relation:Clean;PreCli_ConCli_relation:Clean;ConCli_PedProv_relation:Clean;ContratosCliente_view:Clean;ContratosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_plugin:Clean;PedidosProveedor_view:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;ContratosCliente_model:Make;ContratosCliente_data:Make;ContratosCliente_controller:Make;ConCli_AlbCli_relation:Make;ConCli_FacCli_relation:Make;ContratosCliente_view:Make;ContratosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PreCli_ConCli_relation:Make;PresupuestosCliente_view:Make;ConCli_PedProv_relation:Make;PedidosProveedor_controller:Make;PedidosProveedor_plugin:Make;PedidosProveedor_view:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;ContratosCliente_model:Make;ContratosCliente_data:Make;ContratosCliente_controller:Make;ConCli_AlbCli_relation:Make;ConCli_FacCli_relation:Make;PreCli_ConCli_relation:Make;ConCli_PedProv_relation:Make;ContratosCliente_view:Make;ContratosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make;PedidosProveedor_controller:Make;PedidosProveedor_plugin:Make;PedidosProveedor_view:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

50
Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm
View File

@ -1,23 +1,25 @@
inherited frViewContratoCliente: TfrViewContratoCliente inherited frViewContratoCliente: TfrViewContratoCliente
Width = 810 Width = 817
Height = 449 Height = 491
OnCreate = CustomViewCreate OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy OnDestroy = CustomViewDestroy
ExplicitWidth = 810 ExplicitWidth = 817
ExplicitHeight = 449 ExplicitHeight = 491
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 810 Width = 817
Height = 449 Height = 491
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 810
ExplicitHeight = 449
DesignSize = ( DesignSize = (
810 817
449) 491)
object edtFechaContrato: TcxDBDateEdit object edtFechaContrato: TcxDBDateEdit
Left = 104 Left = 104
Top = 82 Top = 82
@ -42,9 +44,9 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 129 Width = 129
end end
object memObservaciones: TcxDBMemo object memObservaciones: TcxDBMemo
Left = 426 Left = 429
Top = 382 Top = 334
Anchors = [akLeft, akTop, akRight, akBottom] Align = alClient
DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Properties.ScrollBars = ssVertical Properties.ScrollBars = ssVertical
@ -119,7 +121,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 122 Width = 122
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 264 Left = 267
Top = 136 Top = 136
Width = 132 Width = 132
Height = 21 Height = 21
@ -181,7 +183,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
end end
object memPlazoEntrega: TcxDBMemo object memPlazoEntrega: TcxDBMemo
Left = 22 Left = 22
Top = 342 Top = 363
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'PLAZO_ENTREGA' DataBinding.DataField = 'PLAZO_ENTREGA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -232,7 +234,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 27 Width = 27
end end
object cbTipoContrato: TcxDBComboBox object cbTipoContrato: TcxDBComboBox
Left = 297 Left = 298
Top = 82 Top = 82
DataBinding.DataField = 'TIPO_CONTRATO' DataBinding.DataField = 'TIPO_CONTRATO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -280,15 +282,19 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 335 Width = 335
end end
inline frViewClienteContrato1: TfrViewClienteContrato inline frViewClienteContrato1: TfrViewClienteContrato
Left = 426 Left = 429
Top = 28 Top = 28
Width = 357 Width = 366
Height = 318 Height = 270
TabOrder = 10 TabOrder = 10
ReadOnly = False ReadOnly = False
ExplicitLeft = 426 ExplicitLeft = 429
ExplicitTop = 28 ExplicitTop = 28
ExplicitWidth = 366
ExplicitHeight = 270
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 366
Height = 270
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 707 ExplicitWidth = 707
Width = 707 Width = 707
@ -310,12 +316,12 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Width = 707 Width = 707
end end
inherited edtCodigoPostal: TcxDBTextEdit inherited edtCodigoPostal: TcxDBTextEdit
Left = 270 Left = 274
ExplicitLeft = 270 ExplicitLeft = 274
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 160 Left = 164
ExplicitLeft = 160 ExplicitLeft = 164
end end
inherited cxDBTextEdit1: TcxDBTextEdit inherited cxDBTextEdit1: TcxDBTextEdit
ExplicitWidth = 283 ExplicitWidth = 283

5
Source/Modulos/Familias/Controller/View/uIEditorFamilias.pas
View File

@ -6,7 +6,7 @@ uses
uEditorDBBase, uBizFamilias, uFamiliasController; uEditorDBBase, uBizFamilias, uFamiliasController;
type type
IEditorFamilias = interface(IEditorDBBase) IEditorFamilias = interface
['{28CD8E74-C3D5-4862-A8F9-CF0EE3E79FED}'] ['{28CD8E74-C3D5-4862-A8F9-CF0EE3E79FED}']
function GetFamilias: IBizFamilia; function GetFamilias: IBizFamilia;
procedure SetFamilias(const Value: IBizFamilia); procedure SetFamilias(const Value: IBizFamilia);
@ -15,6 +15,9 @@ type
function GetController : IFamiliasController; function GetController : IFamiliasController;
procedure SetController (const Value : IFamiliasController); procedure SetController (const Value : IFamiliasController);
property Controller : IFamiliasController read GetController write SetController; property Controller : IFamiliasController read GetController write SetController;
function ShowModal : Integer;
procedure Release;
end; end;

26
Source/Modulos/Familias/Familias_Group.groupproj
View File

@ -8,6 +8,8 @@
<Projects Include="..\..\Base\Base.dproj" /> <Projects Include="..\..\Base\Base.dproj" />
<Projects Include="..\..\GUIBase\GUIBase.dproj" /> <Projects Include="..\..\GUIBase\GUIBase.dproj" />
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" /> <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
<Projects Include="..\Formas de pago\Controller\FormasPago_controller.dproj" />
<Projects Include="..\Formas de pago\Views\FormasPago_view.dproj" />
<Projects Include="Controller\Familias_controller.dproj" /> <Projects Include="Controller\Familias_controller.dproj" />
<Projects Include="Data\Familias_data.dproj" /> <Projects Include="Data\Familias_data.dproj" />
<Projects Include="Model\Familias_model.dproj" /> <Projects Include="Model\Familias_model.dproj" />
@ -101,14 +103,32 @@
<Target Name="FactuGES_Server:Make"> <Target Name="FactuGES_Server:Make">
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" /> <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
</Target> </Target>
<Target Name="FormasPago_view">
<MSBuild Projects="..\Formas de pago\Views\FormasPago_view.dproj" Targets="" />
</Target>
<Target Name="FormasPago_view:Clean">
<MSBuild Projects="..\Formas de pago\Views\FormasPago_view.dproj" Targets="Clean" />
</Target>
<Target Name="FormasPago_view:Make">
<MSBuild Projects="..\Formas de pago\Views\FormasPago_view.dproj" Targets="Make" />
</Target>
<Target Name="FormasPago_controller">
<MSBuild Projects="..\Formas de pago\Controller\FormasPago_controller.dproj" Targets="" />
</Target>
<Target Name="FormasPago_controller:Clean">
<MSBuild Projects="..\Formas de pago\Controller\FormasPago_controller.dproj" Targets="Clean" />
</Target>
<Target Name="FormasPago_controller:Make">
<MSBuild Projects="..\Formas de pago\Controller\FormasPago_controller.dproj" Targets="Make" />
</Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Familias_model;Familias_data;Familias_controller;Familias_view;Familias_plugin;FactuGES_Server" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Familias_model;Familias_data;Familias_controller;Familias_view;Familias_plugin;FactuGES_Server;FormasPago_view;FormasPago_controller" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Familias_model:Clean;Familias_data:Clean;Familias_controller:Clean;Familias_view:Clean;Familias_plugin:Clean;FactuGES_Server:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Familias_model:Clean;Familias_data:Clean;Familias_controller:Clean;Familias_view:Clean;Familias_plugin:Clean;FactuGES_Server:Clean;FormasPago_view:Clean;FormasPago_controller:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Familias_model:Make;Familias_data:Make;Familias_controller:Make;Familias_view:Make;Familias_plugin:Make;FactuGES_Server:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Familias_model:Make;Familias_data:Make;Familias_controller:Make;Familias_view:Make;Familias_plugin:Make;FactuGES_Server:Make;FormasPago_view:Make;FormasPago_controller:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

2
Source/Modulos/Familias/Views/uEditorFamilias.dfm
View File

@ -17,8 +17,6 @@ object fEditorFamilias: TfEditorFamilias
Position = poScreenCenter Position = poScreenCenter
OnClose = CustomEditorClose OnClose = CustomEditorClose
OnShow = FormShow OnShow = FormShow
InstanceID = 0
ReadOnly = False
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object bAceptar: TButton object bAceptar: TButton

4
Source/Modulos/Familias/Views/uEditorFamilias.pas
View File

@ -28,11 +28,11 @@ interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList, Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList,
uIEditorFamilias, uEditorBase, uGUIBase, ExtCtrls, uIEditorFamilias, uEditorBase, uGUIBase, ExtCtrls, uCustomEditor,
ComCtrls, uBizFamilias, uFamiliasController, uDAInterfaces; ComCtrls, uBizFamilias, uFamiliasController, uDAInterfaces;
type type
TfEditorFamilias = class(TfEditorBase, IEditorFamilias) TfEditorFamilias = class(TCustomEditor, IEditorFamilias)
ActionList1: TActionList; ActionList1: TActionList;
DADataSource: TDADataSource; DADataSource: TDADataSource;
ListaFamilias: TDBLookupListBox; ListaFamilias: TDBLookupListBox;

17
Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
View File

@ -41,7 +41,7 @@ type
function Guardar(APedido : IBizPedidoProveedor): Boolean; function Guardar(APedido : IBizPedidoProveedor): Boolean;
procedure DescartarCambios(APedido : IBizPedidoProveedor); procedure DescartarCambios(APedido : IBizPedidoProveedor);
function Existe(const ID: Integer) : Boolean; function Existe(const ID: Integer) : Boolean;
function Duplicar(APedido: IBizPedidoProveedor): IBizPedidoProveedor; function Duplicar(APedido: IBizPedidoProveedor; ConMismoContrato:Boolean = false): IBizPedidoProveedor;
procedure Preview(APedido : IBizPedidoProveedor; AllItems: Boolean = false); procedure Preview(APedido : IBizPedidoProveedor; AllItems: Boolean = false);
procedure Print(APedido : IBizPedidoProveedor; AllItems: Boolean = false); procedure Print(APedido : IBizPedidoProveedor; AllItems: Boolean = false);
@ -115,7 +115,7 @@ type
const AVerModal : Boolean = False; const AWindowCaption: String = ''; const AVerModal : Boolean = False; const AWindowCaption: String = '';
const AHeaderText: String = ''); const AHeaderText: String = '');
procedure VerDireccionEntrega(APedido : IBizPedidoProveedor); procedure VerDireccionEntrega(APedido : IBizPedidoProveedor);
function Duplicar(APedido: IBizPedidoProveedor): IBizPedidoProveedor; function Duplicar(APedido: IBizPedidoProveedor; ConMismoContrato:Boolean = false): IBizPedidoProveedor;
procedure Preview(APedido : IBizPedidoProveedor; AllItems: Boolean = false); procedure Preview(APedido : IBizPedidoProveedor; AllItems: Boolean = false);
procedure Print(APedido : IBizPedidoProveedor; AllItems: Boolean = false); procedure Print(APedido : IBizPedidoProveedor; AllItems: Boolean = false);
@ -317,8 +317,7 @@ begin
inherited; inherited;
end; end;
function TPedidosProveedorController.Duplicar( function TPedidosProveedorController.Duplicar(APedido: IBizPedidoProveedor; ConMismoContrato:Boolean = false): IBizPedidoProveedor;
APedido: IBizPedidoProveedor): IBizPedidoProveedor;
begin begin
Result := Self._Vacio; Result := Self._Vacio;
ShowHourglassCursor; ShowHourglassCursor;
@ -340,9 +339,13 @@ begin
FECHA_ENTREGA := 0; FECHA_ENTREGA := 0;
INCIDENCIAS_ACTIVAS := 0; INCIDENCIAS_ACTIVAS := 0;
// INCIDENCIAS := Nil; // INCIDENCIAS := Nil;
REF_CON_CLIENTE := '';
ID_CONTRATO_CLIENTE := 0; if not ConMismoContrato then
ID_DIRECCION_CLIENTE := 0; begin
REF_CON_CLIENTE := '';
ID_CONTRATO_CLIENTE := 0;
ID_DIRECCION_CLIENTE := 0;
end;
end; end;
Result.AsignarVendedor; Result.AsignarVendedor;

38
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm
View File

@ -56,9 +56,11 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
ExplicitWidth = 700 ExplicitWidth = 700
end end
inherited TBXTMain2: TTBXToolbar inherited TBXTMain2: TTBXToolbar
Left = 343
DockPos = 343 DockPos = 343
Visible = True Visible = True
ExplicitWidth = 156 ExplicitLeft = 343
ExplicitWidth = 119
object TBXItem39: TTBXItem object TBXItem39: TTBXItem
Action = actRecibirPedido Action = actRecibirPedido
DisplayMode = nbdmImageAndText DisplayMode = nbdmImageAndText
@ -73,9 +75,9 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
end end
inline frViewPedidosProveedor1: TfrViewPedidosProveedor [3] inline frViewPedidosProveedor1: TfrViewPedidosProveedor [3]
Left = 0 Left = 0
Top = 116 Top = 102
Width = 700 Width = 700
Height = 464 Height = 478
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -85,14 +87,14 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
ParentFont = False ParentFont = False
TabOrder = 3 TabOrder = 3
ReadOnly = False ReadOnly = False
ExplicitTop = 116 ExplicitTop = 102
ExplicitWidth = 700 ExplicitWidth = 700
ExplicitHeight = 464 ExplicitHeight = 478
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 700 Width = 700
Height = 336 Height = 350
ExplicitWidth = 700 ExplicitWidth = 700
ExplicitHeight = 336 ExplicitHeight = 350
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.DefaultGroupSummaryItems = < DataController.Summary.DefaultGroupSummaryItems = <
item item
@ -126,18 +128,28 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
Width = 700 Width = 700
ExplicitWidth = 700 ExplicitWidth = 700
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 457 ExplicitWidth = 457
Width = 457 Width = 457
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 240 ExplicitWidth = 240
Width = 240 Width = 240
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 371 Left = 349
ExplicitLeft = 371 Style.LookAndFeel.SkinName = ''
ExplicitWidth = 294 StyleDisabled.LookAndFeel.SkinName = ''
Width = 294 StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 349
end end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@ -154,8 +166,8 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
end end
end end
inherited pnlAgrupaciones: TTBXDockablePanel inherited pnlAgrupaciones: TTBXDockablePanel
Top = 438 Top = 452
ExplicitTop = 438 ExplicitTop = 452
ExplicitWidth = 700 ExplicitWidth = 700
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 700 Width = 700

8
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas
View File

@ -156,10 +156,14 @@ end;
procedure TfEditorPedidosProveedor.DuplicarInterno; procedure TfEditorPedidosProveedor.DuplicarInterno;
var var
APedido : IBizPedidoProveedor; APedido : IBizPedidoProveedor;
begin ConMismoContrato : Boolean;
begin
inherited; inherited;
APedido := FController.Duplicar(Pedidos);
ConMismoContrato := (ShowConfirmMessage('Atención', Format('¿Desea asignar el mismo contrato de cliente %s al nuevo pedidos a proveedor?', [Pedidos.REF_CON_CLIENTE])) = IDYES);
APedido := FController.Duplicar(Pedidos, ConMismoContrato);
try try
FController.Ver(APedido); FController.Ver(APedido);
finally finally

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">8</VersionInfo><VersionInfo Name="Release">3</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.8.3.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.8.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 06 de febrero de 2017 19:05</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">8</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.6.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.8.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 03 de octubre de 2017 12:45</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>

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,8,3,0 FILEVERSION 2,8,6,0
PRODUCTVERSION 2,8,3,0 PRODUCTVERSION 2,8,6,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.8.3.0\0" VALUE "FileVersion", "2.8.6.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.8.3.0\0" VALUE "ProductVersion", "2.8.6.0\0"
VALUE "CompileDate", "viernes, 21 de abril de 2017 18:20\0" VALUE "CompileDate", "miércoles, 25 de octubre de 2017 16:15\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.