From 76f6ef316c9764bd2e45504616354880ea36599a Mon Sep 17 00:00:00 2001 From: david Date: Tue, 26 Aug 2008 11:11:43 +0000 Subject: [PATCH] =?UTF-8?q?Correcci=C3=B3n=20de=20errores=20de=20dependenc?= =?UTF-8?q?ias=20al=20compilar.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@537 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/ApplicationBase/ApplicationBase.res | Bin 4748 -> 384 bytes .../Model/AlbaranesProveedor_model.dpk | 2 +- .../Model/AlbaranesProveedor_model.dproj | 11 +- .../Model/AlbaranesProveedor_model.res | Bin 4748 -> 384 bytes .../Model/uBizAlbaranesProveedor.pas | 2 +- .../uViewDireccionEntregaAlbaranProv.pas | 2 +- .../Modulos/Contactos/Views/uViewContacto.dfm | 4 +- .../Controller/uInventarioController.pas | 3 - .../Inventario/Model/uBizInventario.pas | 3 + .../Views/PedidosProveedor_view.dproj | 116 +++++++++--------- .../Views/uViewDireccionEntregaPedidoProv.pas | 2 +- Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23204 bytes Source/Servidor/FactuGES_Server.rc | 2 +- 13 files changed, 73 insertions(+), 74 deletions(-) diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.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/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk index baea91b5..3d2dbfdc 100644 --- a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk +++ b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk @@ -27,7 +27,7 @@ package AlbaranesProveedor_model; requires Base, Contactos_model, - Inventario_controller; + Inventario_model; contains uIDataModuleAlbaranesProveedor in 'Data\uIDataModuleAlbaranesProveedor.pas', diff --git a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj index 35e394bd..879596e4 100644 --- a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj +++ b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj @@ -42,12 +42,6 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - RemObjects Pascal Script - RemObjects SDK 3.0 Integration EurekaLog 5.1.9 AlbaranesProveedor_model.dpk @@ -79,6 +73,11 @@ + + + + + diff --git a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.res b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.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/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas index 8131c2c5..a5e5250c 100644 --- a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas @@ -86,7 +86,7 @@ implementation uses SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios, - uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uInventarioController; + uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uBizInventario; { TBizAlbaranProveedor } diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas index 2476c422..33eb1a6f 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas @@ -80,7 +80,7 @@ implementation {$R *.dfm} uses - uEditorRegistryUtils, uCustomView, uInventarioController; + uEditorRegistryUtils, uCustomView, uBizInventario; procedure TfrViewDireccionEntregaAlbaranProv.actListaExecute(Sender: TObject); begin diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm index bc26b013..8afc79ac 100644 --- a/Source/Modulos/Contactos/Views/uViewContacto.dfm +++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm @@ -152,8 +152,8 @@ inherited frViewContacto: TfrViewContacto DataBinding.DataSource = dsContacto Properties.ImmediatePost = True Properties.ImmediateUpdateText = True - Properties.PostPopupValueOnTab = True - Properties.OnInitPopup = cbPoblacionPropertiesInitPopup + Properties.PostPopupValueOnTab = True + Properties.OnInitPopup = cbPoblacionPropertiesInitPopup Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard diff --git a/Source/Modulos/Inventario/Controller/uInventarioController.pas b/Source/Modulos/Inventario/Controller/uInventarioController.pas index 11e732aa..e7b31569 100644 --- a/Source/Modulos/Inventario/Controller/uInventarioController.pas +++ b/Source/Modulos/Inventario/Controller/uInventarioController.pas @@ -10,9 +10,6 @@ uses uBizPresupuestosCliente, uPedidosProveedorController, uBizPedidosProveedor, uBizArticulos, uBizAlmacenes, uBizObras; -const - CTE_INV_ALMACEN = 'ALMACEN'; - CTE_INV_OBRA = 'OBRA'; type IInventarioController = interface(IControllerBase) diff --git a/Source/Modulos/Inventario/Model/uBizInventario.pas b/Source/Modulos/Inventario/Model/uBizInventario.pas index 3fcce694..b632c5fa 100644 --- a/Source/Modulos/Inventario/Model/uBizInventario.pas +++ b/Source/Modulos/Inventario/Model/uBizInventario.pas @@ -10,6 +10,9 @@ const BIZ_CLIENT_INVENTARIO = 'Client.Inventario'; BIZ_CLIENT_DETALLE_RESERVAS_INV = 'Client.DetallesReservasInv'; + CTE_INV_ALMACEN = 'ALMACEN'; + CTE_INV_OBRA = 'OBRA'; + CTE_TIPO_ENTRADA = 'E'; CTE_TIPO_SALIDA = 'S'; diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj index ba4bafb1..2276782b 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj +++ b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj @@ -49,64 +49,64 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorDireccionEntregaPedidoProveedor
TfEditorDireccionEntregaPedidoProveedor diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas index 6fc8a9a1..d31111dc 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas @@ -86,7 +86,7 @@ implementation {$R *.dfm} uses - uEditorRegistryUtils, uCustomView, uEditorElegirPersonaContactoPedido, uInventarioController; + uEditorRegistryUtils, uCustomView, uEditorElegirPersonaContactoPedido, uBizInventario; procedure TfrViewDireccionEntregaPedidoProv.actListaAlmacenesExecute(Sender: TObject); begin diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 117cef7d8bdf638c4b34ca52bcd98011dcf6f3f2..21faae1c6b979d047b7bd902b365d5c0ba3ea695 100644 GIT binary patch delta 79 zcmZ3mm2t^d#tnBO7*|Zb8zB!Q|3*YJvQ3VRRAziMxi+$zIgLSi^6yAl;arA9h9ZU% hhE#@P1|0?k1|tTu$(m7`oJI^*3?@Jx!{o>)cL0EN7tsI! delta 75 zcmZ3om2tsV#tnBO7?(`G8zB!Q|3*YJvP_PQRAziIxi+$zIfX%K^6yAl!5oHChCGH; ehGGUC1_cHq2GhyfQJU-)3|0(=42F|qquc=@3m0Gj diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index cd614ae6..47ff2e74 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.2.5.0\0" VALUE "ProductVersion", "1.2.5.0\0" - VALUE "CompileDate", "lunes, 25 de agosto de 2008 18:11\0" + VALUE "CompileDate", "martes, 26 de agosto de 2008 12:42\0" END END BLOCK "VarFileInfo"