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

Version 3.6.2 poder asignar contratos a pedidos de proveedor e informes que faltan del estudio y hacer que almacenes sea comun

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@687 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2022-09-09 09:36:39 +00:00
parent f115865f81
commit d8b962dbf0
26 changed files with 492 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
Source/Base/Base.dproj
View File

@ -44,13 +44,6 @@
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@ -65,56 +58,56 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Albaranes de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxCoreD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass>

5
Source/Cliente/FactuGES.dproj
View File

@ -52,7 +52,10 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<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">3</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">1</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">3.6.1.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">3.6.1.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">3</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">2</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">3.6.2.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">3.6.2.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>

8
Source/Cliente/FactuGES.rc
View File

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

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">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Albaranes de cliente\Base.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\frx11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\frxe11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\fs11.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Albaranes de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Inventario\Base.dcp" />
<DCCReference Include="..\Modulos\Inventario\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\frx11.dcp" />
<DCCReference Include="..\Modulos\Inventario\frxe11.dcp" />
<DCCReference Include="..\Modulos\Inventario\fs11.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Inventario\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Inventario\rtl.dcp" />
<DCCReference Include="..\Modulos\Inventario\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Inventario\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Inventario\vcl.dcp" />
<DCCReference Include="..\Modulos\Inventario\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Inventario\vcldb.dcp" />
<DCCReference Include="..\Modulos\Inventario\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Inventario\vclx.dcp" />
<DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form>
</DCCReference>

25
Source/Informes/5/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

82
Source/Informes/6/InfContratoCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

35
Source/Informes/6/InfPedidoProveedor.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

31
Source/Informes/6/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

119
Source/Informes/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

6
Source/Modulos/Almacenes/Controller/uAlmacenesController.pas
View File

@ -111,13 +111,13 @@ end;}
function TAlmacenesController.Buscar(const ID: Integer): IBizAlmacen;
begin
Result := (FDataModule as IDataModuleAlmacenes).GetItem(ID);
FiltrarEmpresa(Result);
// FiltrarEmpresa(Result);
end;
function TAlmacenesController.BuscarTodos: IBizAlmacen;
begin
Result := FDataModule.GetItems;
FiltrarEmpresa(Result);
// FiltrarEmpresa(Result);
end;
constructor TAlmacenesController.Create;
@ -373,7 +373,7 @@ var
AAlmacen : IBizAlmacen;
begin
AAlmacen := FDataModule.NewItem;
FiltrarEmpresa(AAlmacen);
// FiltrarEmpresa(AAlmacen);
AAlmacen.DataTable.Active := True;
AAlmacen.Insert;
Result := AAlmacen;

40
Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm
View File

@ -11,10 +11,12 @@ inherited frViewAlmacenes: TfrViewAlmacenes
OptionsBehavior.PullFocusing = True
object cxGridViewID: TcxGridDBColumn
DataBinding.FieldName = 'ID'
Visible = False
OnCustomDrawCell = cxGridViewIDCustomDrawCell
BestFitMaxWidth = 22
MinWidth = 22
Options.HorzSizing = False
VisibleForCustomization = False
Width = 22
IsCaptionAssigned = True
end
@ -58,6 +60,44 @@ inherited frViewAlmacenes: TfrViewAlmacenes
end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited edtFechaFinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
inherited txtFiltroTodo2: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 250
Width = 250
end
end
end
end
inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 38673.842406053240000000

3
Source/Modulos/Almacenes/Views/uViewAlmacenes.pas
View File

@ -13,7 +13,8 @@ uses
dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX,
TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces;
TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView,
uViewBase;
type
IViewAlmacenes = interface(IViewGrid)

79
Source/Modulos/Articulos/Views/uViewArticulo.dfm
View File

@ -1,6 +1,6 @@
inherited frViewArticulo: TfrViewArticulo
Width = 451
Height = 304
Width = 814
Height = 450
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@ -10,18 +10,19 @@ inherited frViewArticulo: TfrViewArticulo
object dxLayoutControlArticulo: TdxLayoutControl
Left = 0
Top = 0
Width = 451
Width = 814
Height = 393
Align = alTop
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth]
ExplicitWidth = 451
DesignSize = (
451
814
393)
object PngSpeedButton2: TPngSpeedButton
Left = 546
Left = 752
Top = 28
Width = 23
Height = 22
@ -48,7 +49,7 @@ inherited frViewArticulo: TfrViewArticulo
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
end
object PngSpeedButton1: TPngSpeedButton
Left = 546
Left = 752
Top = 56
Width = 23
Height = 22
@ -98,7 +99,7 @@ inherited frViewArticulo: TfrViewArticulo
end
object eNoComisionable: TcxDBCheckBox
Left = 103
Top = 109
Top = 136
Caption = 'Art'#237'culo no comisionable'
DataBinding.DataField = 'COMISIONABLE'
DataBinding.DataSource = dsViewArticulo
@ -117,11 +118,11 @@ inherited frViewArticulo: TfrViewArticulo
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 3
TabOrder = 4
Width = 144
end
object eImagen: TcxImage
Left = 409
Left = 477
Top = 28
Properties.GraphicClassName = 'TJPEGImage'
Properties.PopupMenuLayout.MenuItems = []
@ -167,8 +168,8 @@ inherited frViewArticulo: TfrViewArticulo
Width = 70
end
inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor
Left = 219
Top = 166
Left = 425
Top = 193
Width = 350
Height = 202
Font.Charset = DEFAULT_CHARSET
@ -179,8 +180,8 @@ inherited frViewArticulo: TfrViewArticulo
ParentFont = False
TabOrder = 12
ReadOnly = False
ExplicitLeft = 219
ExplicitTop = 166
ExplicitLeft = 425
ExplicitTop = 193
inherited dxLayoutControl1: TdxLayoutControl
inherited edtNIFCIF: TcxDBTextEdit
ExplicitWidth = 562
@ -202,7 +203,7 @@ inherited frViewArticulo: TfrViewArticulo
end
object eReferenciaProv: TcxDBTextEdit
Left = 103
Top = 166
Top = 193
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'REFERENCIA_PROV'
DataBinding.DataSource = dsViewArticulo
@ -219,7 +220,7 @@ inherited frViewArticulo: TfrViewArticulo
end
object ePrecioCoste: TcxDBCurrencyEdit
Left = 103
Top = 193
Top = 220
DataBinding.DataField = 'PRECIO_COSTE'
DataBinding.DataSource = dsViewArticulo
Properties.Alignment.Horz = taRightJustify
@ -239,7 +240,7 @@ inherited frViewArticulo: TfrViewArticulo
end
object eDescuento: TcxDBSpinEdit
Left = 103
Top = 220
Top = 247
DataBinding.DataField = 'DESCUENTO'
DataBinding.DataSource = dsViewArticulo
Properties.Alignment.Horz = taRightJustify
@ -262,7 +263,7 @@ inherited frViewArticulo: TfrViewArticulo
end
object ePrecioNeto: TcxDBCurrencyEdit
Left = 103
Top = 247
Top = 274
DataBinding.DataField = 'PRECIO_NETO'
DataBinding.DataSource = dsViewArticulo
Enabled = False
@ -287,7 +288,7 @@ inherited frViewArticulo: TfrViewArticulo
end
object ePrecioPorte: TcxDBCurrencyEdit
Left = 103
Top = 274
Top = 301
DataBinding.DataField = 'PRECIO_PORTE'
DataBinding.DataSource = dsViewArticulo
Properties.Alignment.Horz = taRightJustify
@ -306,7 +307,7 @@ inherited frViewArticulo: TfrViewArticulo
Width = 86
end
object cbNoInventariable: TcxDBCheckBox
Left = 242
Left = 103
Top = 109
Caption = 'Art'#237'culo no inventariable'
DataBinding.DataField = 'INVENTARIABLE'
@ -326,12 +327,12 @@ inherited frViewArticulo: TfrViewArticulo
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 4
TabOrder = 3
Width = 144
end
object ePrecioPVP: TcxDBCurrencyEdit
Left = 103
Top = 301
Top = 328
DataBinding.DataField = 'PRECIO_PVP'
DataBinding.DataSource = dsViewArticulo
Properties.Alignment.Horz = taRightJustify
@ -392,28 +393,20 @@ inherited frViewArticulo: TfrViewArticulo
Control = cbFamilia
ControlOptions.ShowBorder = False
end
object dxLayoutControlArticuloGroup8: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControlArticuloItem1: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = ' '
Visible = False
Control = eNoComisionable
ControlOptions.ShowBorder = False
end
object dxLayoutControlArticuloItem7: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = ' '
ShowCaption = False
Visible = False
Control = cbNoInventariable
ControlOptions.ShowBorder = False
end
object dxLayoutControlArticuloItem7: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = ' '
Control = cbNoInventariable
ControlOptions.ShowBorder = False
end
object dxLayoutControlArticuloItem1: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = ' '
Visible = False
Control = eNoComisionable
ControlOptions.ShowBorder = False
end
end
end

1
Source/Modulos/Articulos/Views/uViewArticulo.pas
View File

@ -70,7 +70,6 @@ type
dxLayoutControlArticuloGroup12: TdxLayoutGroup;
dxLayoutControlArticuloItem7: TdxLayoutItem;
cbNoInventariable: TcxDBCheckBox;
dxLayoutControlArticuloGroup8: TdxLayoutGroup;
dxLayoutControlArticuloItem9: TdxLayoutItem;
ePrecioPVP: TcxDBCurrencyEdit;
procedure actEliminarExecute(Sender: TObject);

24
Source/Modulos/Contratos de cliente/Views/uEditorElegirContratosCliente.dfm
View File

@ -51,9 +51,9 @@ inherited fEditorElegirContratosCliente: TfEditorElegirContratosCliente
ExplicitTop = 87
ExplicitWidth = 656
inherited tbxMain: TTBXToolbar
Left = 431
ExplicitLeft = 431
ExplicitWidth = 225
Left = 481
ExplicitLeft = 481
ExplicitWidth = 175
inherited TBXItem5: TTBXItem
Visible = False
end
@ -83,10 +83,10 @@ inherited fEditorElegirContratosCliente: TfEditorElegirContratosCliente
ExplicitWidth = 656
end
inherited TBXTMain2: TTBXToolbar
Left = 343
Left = 123
Visible = False
ExplicitLeft = 343
ExplicitWidth = 221
ExplicitLeft = 123
ExplicitWidth = 533
end
end
inherited StatusBar: TJvStatusBar
@ -152,9 +152,21 @@ inherited fEditorElegirContratosCliente: TfEditorElegirContratosCliente
inherited actDuplicar: TAction
Visible = False
end
inherited actExportarExcel: TAction
Enabled = False
Visible = False
end
inherited actGenerarAlbaranCli: TAction
Visible = False
end
inherited actEnviarEMail: TAction
Enabled = False
Visible = False
end
inherited ActDuplicarAPresupuesto: TAction
Enabled = False
Visible = False
end
end
inherited JvAppRegistryStorage: TJvAppRegistryStorage [9]
end

6
Source/Modulos/Inventario/Controller/uInventarioController.pas
View File

@ -180,19 +180,19 @@ end;
function TInventarioController.Buscar(const ID_ALMACEN: Integer): IBizInventario;
begin
Result := (FDataModule as IDataModuleInventario).GetItems(ID_ALMACEN);
FiltrarEmpresa(Result);
// FiltrarEmpresa(Result);
end;
function TInventarioController.BuscarDetalleReservas: IBizDetalleReservas;
begin
Result := FDataModule.GetDetalleReservas;
FiltrarEmpresa(Result);
// FiltrarEmpresa(Result);
end;
function TInventarioController.BuscarTodos: IBizInventario;
begin
Result := FDataModule.GetItems;
FiltrarEmpresa(Result);
// FiltrarEmpresa(Result);
end;
procedure TInventarioController.Copiar(AArticulos: IBizInventario; ADetalles: IDAStronglyTypedDataTable; AInventario: IBizInventario);

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

@ -60,6 +60,7 @@ type
function ExtraerSeleccionados(APedido: IBizPedidoProveedor) : IBizPedidoProveedor;
function ElegirPedidos(APedido: IBizPedidoProveedor; AMensaje: String; AMultiSelect: Boolean): IBizPedidoProveedor;
procedure RecuperarProveedor(APedido: IBizPedidoProveedor);
Procedure AsignarContrato(APedido: IBizPedidoProveedor; const ID_CONTRATO: Integer; AReferencia, ANombreCliente: String);
end;
TPedidosProveedorController = class(TControllerBase, IPedidosProveedorController)
@ -133,6 +134,7 @@ type
function ExtraerSeleccionados(APedido: IBizPedidoProveedor) : IBizPedidoProveedor;
function ElegirPedidos(APedido: IBizPedidoProveedor; AMensaje: String; AMultiSelect: Boolean): IBizPedidoProveedor;
Procedure AsignarContrato(APedido: IBizPedidoProveedor; const ID_CONTRATO: Integer; AReferencia, ANombreCliente: String);
function DarListaAnosPedidos: TStringList;
procedure FiltrarAno(APedido: IBizPedidoProveedor; ADynWhereDataTable: WideString; const Ano: String);
@ -159,6 +161,29 @@ begin
APedido.Insert;
end;
procedure TPedidosProveedorController.AsignarContrato(APedido: IBizPedidoProveedor; const ID_CONTRATO: Integer; AReferencia, ANombreCliente: String);
begin
//Asignaremos el ID de contrato a capón así como la refencia, con el fin de no tener que añadir relación con modulo contratos, evitando redundancia ciclica
if not Assigned(APedido) then
raise Exception.Create ('Pedido no asignado (CambiarSituacion)');
if not APedido.DataTable.Active then
APedido.DataTable.Active := True;
ShowHourglassCursor;
APedido.DataTable.DisableControls;
try
APedido.Edit;
APedido.ID_CONTRATO_CLIENTE := ID_CONTRATO;
APedido.REF_CON_CLIENTE := AReferencia;
APedido.NOMBRE_CLIENTE := ANombreCliente;
// APedido.Post;
finally
APedido.DataTable.EnableControls;
HideHourglassCursor;
end;
end;
procedure TPedidosProveedorController.AsignarDataModule;
begin
FDataModule := TDataModulePedidosProveedor.Create(Nil);

46
Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj
View File

@ -25,6 +25,7 @@
<Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
<Projects Include="..\Gestion de documentos\Controller\GestorDocumentos_controller.dproj" />
<Projects Include="..\Gestion de documentos\Data\GestorDocumentos_data.dproj" />
<Projects Include="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" />
<Projects Include="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" />
<Projects Include="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" />
<Projects Include="Controller\PedidosProveedor_controller.dproj" />
@ -138,6 +139,24 @@
<Target Name="PedidosProveedor_controller:Make">
<MSBuild Projects="Controller\PedidosProveedor_controller.dproj" Targets="Make" />
</Target>
<Target Name="AlbaranesProveedor_controller">
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="" />
</Target>
<Target Name="AlbaranesProveedor_controller:Clean">
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Clean" />
</Target>
<Target Name="AlbaranesProveedor_controller:Make">
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Make" />
</Target>
<Target Name="PedProv_AlbProv_relation">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="" />
</Target>
<Target Name="PedProv_AlbProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PedProv_AlbProv_relation:Make">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="PedidosProveedor_view">
<MSBuild Projects="Views\PedidosProveedor_view.dproj" Targets="" />
</Target>
@ -273,32 +292,23 @@
<Target Name="Contactos_data:Make">
<MSBuild Projects="..\Contactos\Data\Contactos_data.dproj" Targets="Make" />
</Target>
<Target Name="PedProv_AlbProv_relation">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="" />
<Target Name="ConCli_AlbCli_relation">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" Targets="" />
</Target>
<Target Name="PedProv_AlbProv_relation:Clean">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Clean" />
<Target Name="ConCli_AlbCli_relation:Clean">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" Targets="Clean" />
</Target>
<Target Name="PedProv_AlbProv_relation:Make">
<MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Make" />
</Target>
<Target Name="AlbaranesProveedor_controller">
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="" />
</Target>
<Target Name="AlbaranesProveedor_controller:Clean">
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Clean" />
</Target>
<Target Name="AlbaranesProveedor_controller:Make">
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Make" />
<Target Name="ConCli_AlbCli_relation:Make">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;ContratosCliente_controller;AlbaranesCliente_data;GestorDocumentos_data;GestorDocumentos_controller;AlbaranesCliente_view;FacturasCliente_view;ConCli_PedProv_relation;Contactos_controller;Contactos_model;Contactos_data;PedProv_AlbProv_relation;AlbaranesProveedor_controller" />
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;AlbaranesProveedor_controller;PedProv_AlbProv_relation;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;ContratosCliente_controller;AlbaranesCliente_data;GestorDocumentos_data;GestorDocumentos_controller;AlbaranesCliente_view;FacturasCliente_view;ConCli_PedProv_relation;Contactos_controller;Contactos_model;Contactos_data;ConCli_AlbCli_relation" />
</Target>
<Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;ContratosCliente_controller:Clean;AlbaranesCliente_data:Clean;GestorDocumentos_data:Clean;GestorDocumentos_controller:Clean;AlbaranesCliente_view:Clean;FacturasCliente_view:Clean;ConCli_PedProv_relation:Clean;Contactos_controller:Clean;Contactos_model:Clean;Contactos_data:Clean;PedProv_AlbProv_relation:Clean;AlbaranesProveedor_controller:Clean" />
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;AlbaranesProveedor_controller:Clean;PedProv_AlbProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;ContratosCliente_controller:Clean;AlbaranesCliente_data:Clean;GestorDocumentos_data:Clean;GestorDocumentos_controller:Clean;AlbaranesCliente_view:Clean;FacturasCliente_view:Clean;ConCli_PedProv_relation:Clean;Contactos_controller:Clean;Contactos_model:Clean;Contactos_data:Clean;ConCli_AlbCli_relation:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;ContratosCliente_controller:Make;AlbaranesCliente_data:Make;GestorDocumentos_data:Make;GestorDocumentos_controller:Make;AlbaranesCliente_view:Make;FacturasCliente_view:Make;ConCli_PedProv_relation:Make;Contactos_controller:Make;Contactos_model:Make;Contactos_data:Make;PedProv_AlbProv_relation:Make;AlbaranesProveedor_controller:Make" />
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;AlbaranesProveedor_controller:Make;PedProv_AlbProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;ContratosCliente_controller:Make;AlbaranesCliente_data:Make;GestorDocumentos_data:Make;GestorDocumentos_controller:Make;AlbaranesCliente_view:Make;FacturasCliente_view:Make;ConCli_PedProv_relation:Make;Contactos_controller:Make;Contactos_model:Make;Contactos_data:Make;ConCli_AlbCli_relation:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

2
Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
View File

@ -480,7 +480,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 43591.572818969910000000
ReportOptions.LastChange = 44812.496929317130000000
ScriptLanguage = 'PascalScript'
ShowProgress = False
StoreInDFM = False

10
Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas
View File

@ -44,7 +44,7 @@ implementation
{$R *.dfm}
uses
uDataModuleServer, schPedidosProveedorClient_Intf;
uSistemaFunc, uDataModuleServer, schPedidosProveedorClient_Intf;
const
rptInforme = 'InfPedidoProveedor.fr3';
@ -119,6 +119,8 @@ var
AStream: TMemoryStream;
dsMaster: IDADataset;
dsDetail: IDADataset;
AInforme: Variant;
begin
AStream := TMemoryStream.Create;
@ -134,7 +136,11 @@ begin
DABINAdapter.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1);
DABINAdapter.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);
frxReport.LoadFromFile(DarRutaInformes + rptInforme, True);
AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString);
if VarIsNull(AInforme) then
raise Exception.Create (('Error Servidor: _GenerarContrato, no encuentra informe ' + rptInforme));
frxReport.LoadFromFile(AInforme, True);
frxReport.PrepareReport(False);
finally

60
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm
View File

@ -29,7 +29,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 14
TabOrder = 15
ReadOnly = False
ExplicitLeft = 577
ExplicitTop = 28
@ -114,7 +114,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 12
TabOrder = 13
Width = 158
end
object edtFechaEntrega: TcxDBDateEdit
@ -169,7 +169,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 13
TabOrder = 14
ReadOnly = False
ExplicitLeft = 22
ExplicitTop = 456
@ -188,14 +188,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 287
ExplicitWidth = 287
end
inherited cbLista: TcxDBLookupComboBox
ExplicitWidth = 425
Width = 425
end
inherited bModificar: TBitBtn
Left = 318
Left = 529
Top = 159
ExplicitLeft = 318
ExplicitLeft = 529
ExplicitTop = 159
end
inherited txtDireccion: TStaticText
@ -212,6 +208,18 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
ExplicitWidth = 551
Width = 551
end
inherited cbUbicacion: TcxDBComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 183
Width = 183
end
inherited eNumBultos: TcxDBSpinEdit
Left = 588
ExplicitLeft = 588
end
end
inherited ActionList1: TActionList
Left = 32
@ -282,7 +290,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 11
TabOrder = 12
Width = 158
end
object eReferenciaContratoCli: TcxTextEdit
@ -308,12 +316,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 20
end
object Button1: TButton
Left = 415
Left = 447
Top = 190
Width = 132
Width = 100
Height = 23
Action = actVerContratoCli
TabOrder = 8
TabOrder = 9
end
inline frViewTienda1: TfrViewTienda
Left = 577
@ -328,7 +336,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 15
TabOrder = 16
ReadOnly = False
ExplicitLeft = 577
ExplicitTop = 279
@ -352,7 +360,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 10
TabOrder = 11
ReadOnly = False
ExplicitLeft = 158
ExplicitTop = 246
@ -439,9 +447,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 9
TabOrder = 10
Width = 250
end
object Button2: TButton
Left = 341
Top = 190
Width = 100
Height = 23
Action = actAsignarContratoCli
TabOrder = 8
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
@ -524,6 +540,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Control = eReferenciaContratoCli
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item17: TdxLayoutItem
ShowCaption = False
Control = Button2
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item12: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahRight
@ -624,10 +645,15 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Left = 120
Top = 8
object actVerContratoCli: TAction
Caption = 'Ver contrato de cliente...'
Caption = 'Ver contrato'
OnExecute = actVerContratoCliExecute
OnUpdate = actVerContratoCliUpdate
end
object actAsignarContratoCli: TAction
Caption = 'Asignar contrato'
OnExecute = actAsignarContratoCliExecute
OnUpdate = actAsignarContratoCliUpdate
end
end
object dsVendedor: TDADataSource
Left = 88

64
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas
View File

@ -82,6 +82,9 @@ type
cbVendedor: TcxDBLookupComboBox;
dxLayoutControl1Group7: TdxLayoutGroup;
dsVendedor: TDADataSource;
actAsignarContratoCli: TAction;
dxLayoutControl1Item17: TdxLayoutItem;
Button2: TButton;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure bFormasPagoClick(Sender: TObject);
@ -89,6 +92,8 @@ type
procedure actVerContratoCliUpdate(Sender: TObject);
procedure frViewProveedorPedidoButton1Click(Sender: TObject);
procedure frViewProveedorPedidoButton2Click(Sender: TObject);
procedure actAsignarContratoCliExecute(Sender: TObject);
procedure actAsignarContratoCliUpdate(Sender: TObject);
protected
FPedido : IBizPedidoProveedor;
FController : IPedidosProveedorController;
@ -102,6 +107,9 @@ type
function GetPedido: IBizPedidoProveedor;
procedure SetPedido(const Value: IBizPedidoProveedor); virtual;
function GetContratoCliAsociado: IBizContratoCliente;
procedure SetContratoCliAsociado(const Value: IBizContratoCliente);
function GetController : IPedidosProveedorController;
procedure SetController (const Value : IPedidosProveedorController);
function GetViewProveedorPedido: TfrViewDatosYSeleccionProveedor;
@ -109,6 +117,7 @@ type
public
property Pedido: IBizPedidoProveedor read GetPedido write SetPedido;
property ContratoCliAsociado: IBizContratoCliente read GetContratoCliAsociado write SetContratoCliAsociado;
property Controller : IPedidosProveedorController read GetController write SetController;
property ViewProveedorPedido: TfrViewDatosYSeleccionProveedor read GetViewProveedorPedido;
end;
@ -119,6 +128,29 @@ implementation
{ TfrViewPedidoProveedor }
procedure TfrViewPedidoProveedor.actAsignarContratoCliExecute(Sender: TObject);
var
AContrato : IBizContratoCliente;
begin
inherited;
AContrato := FContratoCliController.ElegirContratos(FContratoCliController.BuscarTodos,
'Elija el contrato de cliente que desea utilizar para dar de alta el albarán.', False);
if Assigned(AContrato) then
begin
FController.AsignarContrato(Pedido, AContrato.ID, AContrato.REFERENCIA, AContrato.NOMBRE_CLIENTE);
ContratoCliAsociado := AContrato;
end;
end;
procedure TfrViewPedidoProveedor.actAsignarContratoCliUpdate(Sender: TObject);
begin
inherited;
//Lo modificamos para que el pedido de proveedor este asociado al contrato de cliente
if (Sender as TAction).Enabled then
(Sender as TAction).Enabled := not Assigned(FContratoCliAsociado)
end;
procedure TfrViewPedidoProveedor.actVerContratoCliExecute(Sender: TObject);
begin
inherited;
@ -130,8 +162,7 @@ procedure TfrViewPedidoProveedor.actVerContratoCliUpdate(Sender: TObject);
begin
inherited;
//Lo modificamos para que el pedido de proveedor este asociado al contrato de cliente
if (Sender as TAction).Enabled then
(Sender as TAction).Enabled := Assigned(FContratoCliAsociado)
(Sender as TAction).Enabled := Assigned(FContratoCliAsociado)
end;
procedure TfrViewPedidoProveedor.bFormasPagoClick(Sender: TObject);
@ -188,6 +219,11 @@ begin
frViewProveedorPedido.actAnadirContacto.Execute;
end;
function TfrViewPedidoProveedor.GetContratoCliAsociado: IBizContratoCliente;
begin
Result := FContratoCliAsociado;
end;
function TfrViewPedidoProveedor.GetController: IPedidosProveedorController;
begin
Result := FController;
@ -203,6 +239,19 @@ begin
Result := FViewProveedorPedido;
end;
procedure TfrViewPedidoProveedor.SetContratoCliAsociado(const Value: IBizContratoCliente);
begin
FContratoCliAsociado := Value;
if Assigned(FContratoCliAsociado) then
begin
if not FContratoCliAsociado.DataTable.Active then
FContratoCliAsociado.DataTable.Active := True;
eReferenciaContratoCli.Text := FContratoCliAsociado.REFERENCIA
end
else
eReferenciaContratoCli.Text := '';
end;
procedure TfrViewPedidoProveedor.SetController(const Value: IPedidosProveedorController);
begin
FController := Value;
@ -229,16 +278,7 @@ begin
FContratoCliAsociado := NIL;
if (FPedido.ID_CONTRATO_CLIENTE > 0) then
begin
FContratoCliAsociado := FContratoCliController.Buscar(FPedido.ID_CONTRATO_CLIENTE);
if Assigned(FContratoCliAsociado) then
begin
FContratoCliAsociado.DataTable.Active := True;
eReferenciaContratoCli.Text := FContratoCliAsociado.REFERENCIA
end
else
eReferenciaContratoCli.Text := '';
end
ContratoCliAsociado := FContratoCliController.Buscar(FPedido.ID_CONTRATO_CLIENTE)
else
eReferenciaContratoCli.Text := 'No hay contrato asociado';
end

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -28,7 +28,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/>
<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">3</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">1</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">3.6.1.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">3.6.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 24 de junio de 2022 12:51</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">3</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">2</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">3.6.2.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">3.6.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 23 de agosto de 2022 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><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
FILEVERSION 3,6,1,0
PRODUCTVERSION 3,6,1,0
FILEVERSION 3,6,2,0
PRODUCTVERSION 3,6,2,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "3.6.1.0\0"
VALUE "FileVersion", "3.6.2.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "3.6.1.0\0"
VALUE "CompileDate", "martes, 23 de agosto de 2022 12:45\0"
VALUE "ProductVersion", "3.6.2.0\0"
VALUE "CompileDate", "viernes, 09 de septiembre de 2022 11:04\0"
END
END
BLOCK "VarFileInfo"

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.