From 06686a090ccb983ed2ec9c0a20b172ac613fce16 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 12 May 2008 08:09:40 +0000 Subject: [PATCH] Repaso general git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@365 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Build/Build.fbp5 | 543 +++++++++--------- .../Usuarios/Model/schUsuariosClient_Intf.pas | 24 +- .../Usuarios/Model/schUsuariosServer_Intf.pas | 24 +- Source/Base/Base.res | Bin 4748 -> 384 bytes Source/GUIBase/GUIBase.res | Bin 4748 -> 384 bytes .../Controller/Inventario_controller.dpk | Bin 1312 -> 1311 bytes .../Controller/Inventario_controller.dproj | 62 +- .../Controller/Inventario_controller.rc | 22 + .../Controller/Inventario_controller.res | Bin 32 -> 384 bytes Source/Modulos/Obras/Model/Obras_model.res | Bin 4748 -> 384 bytes .../Obras/Model/schObrasClient_Intf.pas | 4 +- .../PedidosProveedor_controller.cfg | Bin 4178 -> 0 bytes .../Model/schPedidosProveedorClient_Intf.pas | 8 +- .../PedProv_AlbProv_relation.res | Bin 5056 -> 32 bytes Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23200 bytes Source/Servidor/FactuGES_Server.dpr | 6 +- Source/Servidor/FactuGES_Server.dproj | 542 ++++++++--------- Source/Servidor/FactuGES_Server.rc | 2 +- 18 files changed, 623 insertions(+), 614 deletions(-) delete mode 100644 Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.cfg diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index 13177a79..609afff9 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -604,7 +604,7 @@ source_path 0 %source_path%\Servidor\FactuGES_Server.dpr True - 2 + 3 rcBorland @@ -619,15 +619,15 @@ source_path True @@ -12603,6 +12603,261 @@ Comments= + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 1 + + 0 + 0 + False + 0 + %source_path%\Modulos\Inventario\Model\Inventario_model.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 0 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 12 + Release + False + + + True + True + + False + + False + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 1 + + 0 + 0 + False + 0 + %source_path%\Modulos\Inventario\Data\Inventario_data.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [usPackages,usCompiler,usLinker,usVersionInfo] + False + False + + + + False + False + False + False + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + False + + False + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + False + 0 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + False + False + + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + @@ -13409,11 +13664,11 @@ Comments= 1000 False - + 0 - + True True @@ -13426,242 +13681,6 @@ Comments= 0 1000 False - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - False - False - True - False - False - False - False - False - False - False - False - 3081 - - 1 - - 0 - 0 - False - 0 - %source_path%\Modulos\Inventario\Model\Inventario_model.dpk - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 0 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - - - - - 0 - - True - False - False - True - True - 0 - 1252 - 12 - Release - False - - - True - True - - False - - False - False - False - False - True - False - False - False - False - False - False - False - False - 3081 - - 1 - - 0 - 0 - False - 0 - %source_path%\Modulos\Inventario\Data\Inventario_data.dpk - True - 0 - - - rcBorland - 1000 - - False - False - False - False - [usPackages,usCompiler,usLinker,usVersionInfo] - False - False - - - - False - False - False - False - True - True - False - False - %package_path% - - - - False - %modules_dcp_path% - False - - False - - False - True - False - False - True - 4194304 - False - False - False - True - %library_path% - 0 - False - 0 - 1048576 - 16384 - - True - True - %output_path% - False - - False - fa8 - False - False - - True - True - False - False - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - False - True - - @@ -13687,7 +13706,7 @@ Comments= False False False - False + True True False False @@ -13697,7 +13716,7 @@ Comments= False False False - 3081 + 3082 1 @@ -13720,7 +13739,16 @@ Comments= [usPackages,usCompiler,usLinker,usVersionInfo] False False - @@ -14190,7 +14218,7 @@ Comments= 0 Relaciones - False + True True False True @@ -14218,7 +14246,7 @@ Comments= False - True + False True False @@ -14349,7 +14377,7 @@ Comments= False - True + False True False @@ -14477,7 +14505,7 @@ Comments= True 0 1252 - 11 + 12 Release False @@ -14540,7 +14568,7 @@ Comments= False False False - True + False True True False @@ -14568,8 +14596,7 @@ Comments= False False True - - + %library_path% 0 True 0 @@ -14616,7 +14643,7 @@ Comments= False - True + False True False @@ -14750,7 +14777,7 @@ Comments= False - True + False True False @@ -14884,7 +14911,7 @@ Comments= False - True + False True False @@ -15016,7 +15043,7 @@ Comments= False - True + False True False @@ -15147,7 +15174,7 @@ Comments= False - True + False True False @@ -15278,7 +15305,7 @@ Comments= False - True + False True False diff --git a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas index 315413be..19b37c90 100644 --- a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas +++ b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas @@ -9,12 +9,12 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_USUARIOS = '{CFE175CF-EB6D-4BF8-91B4-F0140B57453E}'; - RID_USUARIOS_EVENTOS = '{6013DEA6-697A-4A8C-8D92-51677BB6F39F}'; - RID_USUARIOS_LOGON = '{C666C96E-401A-4FB5-A0E2-F3DB7BAB5F3D}'; - RID_PERMISOS = '{02CCB513-8F98-406C-ADAC-21C189AABA29}'; - RID_PERMISOSEX = '{B8D57BF7-0B57-4A0B-8F9E-12E87D0B6B60}'; - RID_PERFILES = '{0AF2374A-D201-4B82-BB13-07265E1BAEBE}'; + RID_USUARIOS = '{18238182-68F3-4CCD-8B76-C307A41B5EF7}'; + RID_USUARIOS_EVENTOS = '{D4A4F285-457C-44C7-A76D-3D5A9FBAB6C7}'; + RID_USUARIOS_LOGON = '{44400882-287E-4EFC-8C03-AF919EF4868D}'; + RID_PERMISOS = '{CCB894E4-E131-4989-9CAA-08EADFD0186A}'; + RID_PERMISOSEX = '{555705FA-FCF2-48B2-B2D8-DC488D48C451}'; + RID_PERFILES = '{0AED66D4-81D4-4E48-8BCB-8FEA425DCE37}'; { Data table names } nme_USUARIOS = 'USUARIOS'; @@ -129,7 +129,7 @@ const type { IUSUARIOS } IUSUARIOS = interface(IDAStronglyTypedDataTable) - ['{12D98238-4C08-4CB7-BAD1-1E2827ADE7A7}'] + ['{5F277EA3-FF65-43CC-B1A8-50D00B3E3822}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -296,7 +296,7 @@ type { IUSUARIOS_EVENTOS } IUSUARIOS_EVENTOS = interface(IDAStronglyTypedDataTable) - ['{54DEE63E-4D88-43D8-8D34-1F51030428DE}'] + ['{7FC08ED8-B62A-4453-A226-24B40BB04CCC}'] { Property getters and setters } function GetAPLICACIONValue: String; procedure SetAPLICACIONValue(const aValue: String); @@ -427,7 +427,7 @@ type { IUSUARIOS_LOGON } IUSUARIOS_LOGON = interface(IDAStronglyTypedDataTable) - ['{D98BF482-EFA8-49ED-894A-E7774859C830}'] + ['{845645BA-5BAD-44ED-84C2-74D3F81E0083}'] { Property getters and setters } function GetLOGONIDValue: String; procedure SetLOGONIDValue(const aValue: String); @@ -510,7 +510,7 @@ type { IPERMISOS } IPERMISOS = interface(IDAStronglyTypedDataTable) - ['{076A52A0-4BD5-4617-80DB-69BB4B4C4E4E}'] + ['{1D5F033A-E579-4522-8956-ECC91BA8C7FB}'] { Property getters and setters } function GetID_USUARIOValue: Integer; procedure SetID_USUARIOValue(const aValue: Integer); @@ -581,7 +581,7 @@ type { IPERMISOSEX } IPERMISOSEX = interface(IDAStronglyTypedDataTable) - ['{5778D823-11A3-4B43-8336-FB2ACBBCFCE5}'] + ['{F66BA47E-0FBC-4722-8B77-30EFAEEA322D}'] { Property getters and setters } function GetID_USUARIOValue: Integer; procedure SetID_USUARIOValue(const aValue: Integer); @@ -664,7 +664,7 @@ type { IPERFILES } IPERFILES = interface(IDAStronglyTypedDataTable) - ['{44741F58-0B27-462C-BA49-A6944FFA7BAC}'] + ['{A0CEAB90-971B-4ED8-B5FE-878458800586}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas b/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas index aa60aab4..34ccc4e0 100644 --- a/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas +++ b/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas @@ -9,17 +9,17 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_USUARIOSDelta = '{D0217428-91FB-4128-8A0D-AF4A8A742D5A}'; - RID_USUARIOS_EVENTOSDelta = '{16B87039-04DC-47AD-81D6-E8648C69A484}'; - RID_USUARIOS_LOGONDelta = '{856F2E25-24EE-43BB-94F5-70DD65E4FD02}'; - RID_PERMISOSDelta = '{DB34A951-27E2-4A70-843F-9C41FF29179D}'; - RID_PERMISOSEXDelta = '{F40FC2C9-2DFF-4B12-8EE6-DAD609901516}'; - RID_PERFILESDelta = '{07C28883-A52C-4111-ABBE-14E908E7C705}'; + RID_USUARIOSDelta = '{688C2060-89DB-41D0-A50A-C2BDE4B94D1A}'; + RID_USUARIOS_EVENTOSDelta = '{4E223C46-38E2-40E2-BE89-AC621F603773}'; + RID_USUARIOS_LOGONDelta = '{BE97DDD1-B35B-4F26-AABC-CEEC3086C437}'; + RID_PERMISOSDelta = '{5C7AFB8C-8585-4A61-ACF8-10F7D370098B}'; + RID_PERMISOSEXDelta = '{C226534A-2B76-4384-AC0D-33760634C8CE}'; + RID_PERFILESDelta = '{F37D69E0-A239-418E-87B6-9354DEDD1956}'; type { IUSUARIOSDelta } IUSUARIOSDelta = interface(IUSUARIOS) - ['{D0217428-91FB-4128-8A0D-AF4A8A742D5A}'] + ['{688C2060-89DB-41D0-A50A-C2BDE4B94D1A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldUSERNAMEValue : String; @@ -185,7 +185,7 @@ type { IUSUARIOS_EVENTOSDelta } IUSUARIOS_EVENTOSDelta = interface(IUSUARIOS_EVENTOS) - ['{16B87039-04DC-47AD-81D6-E8648C69A484}'] + ['{4E223C46-38E2-40E2-BE89-AC621F603773}'] { Property getters and setters } function GetOldAPLICACIONValue : String; function GetOldID_USUARIOValue : Integer; @@ -316,7 +316,7 @@ type { IUSUARIOS_LOGONDelta } IUSUARIOS_LOGONDelta = interface(IUSUARIOS_LOGON) - ['{856F2E25-24EE-43BB-94F5-70DD65E4FD02}'] + ['{BE97DDD1-B35B-4F26-AABC-CEEC3086C437}'] { Property getters and setters } function GetOldLOGONIDValue : String; function GetOldID_USUARIOValue : Integer; @@ -398,7 +398,7 @@ type { IPERMISOSDelta } IPERMISOSDelta = interface(IPERMISOS) - ['{DB34A951-27E2-4A70-843F-9C41FF29179D}'] + ['{5C7AFB8C-8585-4A61-ACF8-10F7D370098B}'] { Property getters and setters } function GetOldID_USUARIOValue : Integer; function GetOldMODULOValue : String; @@ -468,7 +468,7 @@ type { IPERMISOSEXDelta } IPERMISOSEXDelta = interface(IPERMISOSEX) - ['{F40FC2C9-2DFF-4B12-8EE6-DAD609901516}'] + ['{C226534A-2B76-4384-AC0D-33760634C8CE}'] { Property getters and setters } function GetOldID_USUARIOValue : Integer; function GetOldMODULOValue : String; @@ -550,7 +550,7 @@ type { IPERFILESDelta } IPERFILESDelta = interface(IPERFILES) - ['{07C28883-A52C-4111-ABBE-14E908E7C705}'] + ['{F37D69E0-A239-418E-87B6-9354DEDD1956}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldUSERNAMEValue : String; diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Modulos/Inventario/Controller/Inventario_controller.dpk b/Source/Modulos/Inventario/Controller/Inventario_controller.dpk index 11c0309a790331dfb42f92bb032eb33a6ec1afe4..b9db5723cf3a4b3978d5a941082f802ba7531103 100644 GIT binary patch delta 7 OcmZ3$HJ@vPJSzYSIRYpE delta 9 QcmbQwwSa4bJS!su01k-)DF6Tf diff --git a/Source/Modulos/Inventario/Controller/Inventario_controller.dproj b/Source/Modulos/Inventario/Controller/Inventario_controller.dproj index 7fd59e3f..92d74205 100644 --- a/Source/Modulos/Inventario/Controller/Inventario_controller.dproj +++ b/Source/Modulos/Inventario/Controller/Inventario_controller.dproj @@ -39,61 +39,22 @@ Delphi.Personality Package - - False - True - False - - - True - False - False - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - Inventario_controller.dpk - - +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0Inventario_controller.dpk MainSource - - - - - - - - + + + + + + + + +
dmInventarioUtils
TDataModule @@ -107,10 +68,9 @@ -