From bd3df154548d5a71902c3b242ed575de85fa4671 Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 23 May 2012 17:03:15 +0000 Subject: [PATCH] =?UTF-8?q?Versi=C3=B3n=202.4.9=20Tareas=20#88:=20Modelos?= =?UTF-8?q?=20de=20cap=C3=ADtulos=20Tareas=20#892:=20Al=20a=C3=B1adir=20un?= =?UTF-8?q?=20articulo=20meter=20todos=20sus=20datos=20(imagen)=20y=20dar?= =?UTF-8?q?=20a=20guardar=20falla.=20(si=20guardo=20sin=20imagen=20y=20lue?= =?UTF-8?q?go=20a=C3=B1ado=20la=20imagen=20funciona)=20Tareas=20#893:=20Po?= =?UTF-8?q?der=20establecer=20las=20familias=20en=20los=20capitulos?= 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.Acana_FactuGES2/trunk@563 f4e31baf-9722-1c47-927c-6f952f962d4b --- Source/Base/Base.res | Bin 4748 -> 384 bytes Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 172184 -> 171984 bytes .../Model/schArticulosClient_Intf.pas | 8 +- .../Articulos/Views/Articulos_view.RES | Bin 5056 -> 384 bytes .../Views/ContratosCliente_view.dproj | 104 ++-- .../Data/PresupuestosCliente_data.RES | Bin 4748 -> 384 bytes .../schPresupuestosClienteClient_Intf.pas | 14 +- .../Views/PresupuestosCliente_view.RES | Bin 4748 -> 384 bytes .../Views/uViewDetallesPresupuestoCliente.dfm | 87 --- .../Views/uViewDetallesPresupuestoCliente.pas | 2 +- .../uGenerarFacturasCliUtils.pas | 2 +- Source/Servidor/FactuGES_Server.dproj | 581 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 10 +- Source/Servidor/FactuGES_Server.res | Bin 23552 -> 23348 bytes 15 files changed, 364 insertions(+), 452 deletions(-) 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/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 4cc7bab4..73bb0b22 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 2,4,8,0 -PRODUCTVERSION 2,4,8,0 +FILEVERSION 2,4,9,0 +PRODUCTVERSION 2,4,9,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.4.8.0\0" + VALUE "FileVersion", "2.4.9.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "2.4.8.0\0" + VALUE "ProductVersion", "2.4.9.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index d4fc0d1a2d53d73267d74a8735b771a2cfdc2567..3de90d26da2d8df936d5ae945fc1bdb018e9a27c 100644 GIT binary patch delta 290 zcmY+9F$%&!5JlgviN+|B!Xjl51PhCtK!RALw6IsfBDXMwg$EGUCehLZ*o&Q|XRx-& z4dRA`1V0SJs5VX-?+QB@9bCuE1uqsTNPrBaW*{t9TSL0iN!8?> n<vzm`JHQaKV+wN2$(eN(wp?~9Do>M9pM>^Uer delta 486 zcmY+9zfQtX6vltO7A%#R4#uEUqtU1nPhf}|WiWAJhel0H6eQ^41cL+YCUpVUK7a#@ zF>a1NgOA_~;JLj;;z@4r{qp@g{d#v_KHUD3^{VVq&-2_Oe`8U^^T5I(%IVu6pU4J9 zsbsj%JS=6%XHWne-#1+1KrTZ*iKOKzmosh^mNO*W4s|K2R5adQq4v#0RsPC&!W(lv(`HRK?#TRbA7r|Ff>*!?D`3e&S%P>iY*GusEg3 zE!UjLx#yCu;0_P+y`ydX@!MF1z1>uPF0zn7EXN|~@R%AxBC(h;u?t;I6aiP_YsuZ^ rMr!6`v=>=MQwnwRd?k%q;!7vqo~Y)=X1au~ZlzRPYSXxQI8kT6O&~;2 diff --git a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas index e992c5f5..3b4a514f 100644 --- a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas +++ b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas @@ -3,7 +3,7 @@ unit schArticulosClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -129,7 +129,7 @@ type end; { TExisteImagenDataTableRules } - TExisteImagenDataTableRules = class(TDADataTableRules, IExisteImagen) + TExisteImagenDataTableRules = class(TIntfObjectDADataTableRules, IExisteImagen) private protected { Property getters and setters } @@ -277,7 +277,7 @@ type end; { TArticulosDataTableRules } - TArticulosDataTableRules = class(TDADataTableRules, IArticulos) + TArticulosDataTableRules = class(TIntfObjectDADataTableRules, IArticulos) private f_IMAGEN: IROStream; procedure IMAGEN_OnChange(Sender: TObject); @@ -540,7 +540,7 @@ type end; { TArticulosParaClienteDataTableRules } - TArticulosParaClienteDataTableRules = class(TDADataTableRules, IArticulosParaCliente) + TArticulosParaClienteDataTableRules = class(TIntfObjectDADataTableRules, IArticulosParaCliente) private f_IMAGEN: IROStream; procedure IMAGEN_OnChange(Sender: TObject); diff --git a/Source/Modulos/Articulos/Views/Articulos_view.RES b/Source/Modulos/Articulos/Views/Articulos_view.RES index ea6f55be3be373bb77635abcf5cb62b4a1d7e3e8..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 64 zcmX@0-oQLTfyse!vYwzEi1HKk5Mg0pWIzQA7$&b0RAQ=On0!u9Y_f@v!DJm_lgTy0 FE&z5P3~vAc literal 5056 zcmbW5&x;&Y5XWnifD(f4!IPI+L`3!=E9BmaF%VEA#@TDLXpF&R6XJUC)cc=I4kFSA z{{!hg%bp}hVRP_qjvmDJ`>A@>-7}euyEfF+`%$mH-*3IwZ-y~5+miKtn3_w^Pn$V^ zQ861nx4C)wN(Q~H#+K|o*@m~&(3=1I%Llk7>S*pvE7;Yjz^+ljNYba;|&8!P>=GYp<9J^QiRC`-*du(Wb zBJI+RemE@Tm2dSSKL$269_p-ia&WJ{$B|EYy#Bt1`fm?B(CB-l8nlXqgY!6fUOzP@ zr|Te|e4cZxgJWuLF8<`}dughP69?9a%ha4}r`jtX-7UCl^he&nV;_S<)Ya!2FlEJu zrr{t12%dXkNqpywX{@?Eb_MKs@29XRNI;2D%DxW zo|xv^jnf#kFIDZr^e=W==PW{#^6Ao{deqzuxId;ujOZ~3;otiwSzBXu3^t3 z&$C~D3=Umz@OQRR9+}nP>x>=u115dAI{rd2#Mbgv81-@e%IA6)a8SDwHm3Di`~F1x z)jhG~04Fd5o4f^Iah!WFIS0|E#)aohzS6onIG_;>-~Ytz3J0A}=DenTZ*cIo-Ves9 zp>qHmo5lV+rntk2He9_1!t%2yZsF;l)>iGc4jkU$0bBWEPmBKKP>uSjxhXIDsSodT z@EG|gFZa>|hHF!PaN};FzIxxlpPKT;87{i(!eu7T%H?}r^yeP=K2c}If`cyKd-3DW z_4ib`jDt-MZ?C~;z1O=EKN(!YbpFJR_c`u>(C=ph9O_Y*Jz5Z>`Zs7T9Mn$y@ay$^ z{gulxYxXwGq@TIGbG$~Hi*qk8?9|WMkNweF@MU18F;AQKZ>jcWAL86`f59r^Yh;+XfGU10gV*5=*FT)q#qz2B_Ik28(#vUlW{{>1m(1wXK3zHQ3+RoHfz^$cuqg(^F;eqz6WUMUE^m$ z9R1u2H_t9ue%}<_JcD5KB$svgjBysd-ql#|toxF$&>h1Qc)Vw6j~u{SeHg>my$i{SJtD^MnJV!{AK!ZgN9Q4bN2bs7?m1Qo zsLwc-c&GZ4_%7jWppm+9C(?(bpCye?f6Mv)ml~{r9)<=EoH5SYSxm8xsWZv%2MjL$ zd)R%{gxqI&lEaJ6!*jggJMcIz?<5?~hn@VA1Kzcrp$;C`m0CzQdy{!G?|FT$$5W3N zaydTsdE#>2dGSt*&wOX~r{!54?~lxS4gM|rOZH6mRCZMCP#!z)bEv-^up_gJ*i*BY zl>1d-%!E}5v+s{C_OF@Qj;!xrv5)P2yJ4TmKCqke`Aq-U;NJ}WpRu*&|7!3r$c7zU zF#m_6?>Cia!`F$75hlhW6Znuj?mK*AD#yu zyD#i}D-7Op{Esw$$7f;tP&`q4$G+Cec!K8`_qihW>`Se?FaOBC5tDo(_GZaJ)xb^O z^u`KAjXqWE17-V8+7DJ3nreye<(O6VtJ+_8T~T|`s6jHk=0ta$cd{CH)9g(@388Rb PtL`asx)+zP{Bh}DvbcG> diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj index bff2ff2a..56c0843d 100644 --- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj +++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj @@ -49,49 +49,56 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorPresupuestoCliente
@@ -149,19 +156,12 @@
frViewElegirArticulosContratosCliente
TFrame - - - - - - -