From e69a078e1ffeae8163617c4eeccba6f82b11ea30 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Fri, 21 May 2010 14:40:15 +0000 Subject: [PATCH] Merged revisions 3224-3234 via svnmerge from file:///home/developper/svn/phpcompta/branches/rel510 ........ r3225 | danydb | 2010-05-16 22:59:32 +0200 (Sun, 16 May 2010) | 2 lines Fix bug when you choose illimited in preference you can't get your follow-up list ........ r3226 | danydb | 2010-05-17 23:12:34 +0200 (Mon, 17 May 2010) | 2 lines Add compute Suspend and reactivate the strict mode if used ........ r3227 | danydb | 2010-05-18 01:32:48 +0200 (Tue, 18 May 2010) | 2 lines Fix bug with the date ........ r3228 | danydb | 2010-05-18 01:38:02 +0200 (Tue, 18 May 2010) | 2 lines Fix bug with period ........ r3229 | danydb | 2010-05-18 01:40:01 +0200 (Tue, 18 May 2010) | 2 lines typo ........ r3232 | danydb | 2010-05-21 12:38:51 +0200 (Fri, 21 May 2010) | 1 line In parameter -> company, empty field were fills with previous value ........ r3233 | danydb | 2010-05-21 12:48:23 +0200 (Fri, 21 May 2010) | 1 line In calendar, we can several actions for the same day ........ r3234 | danydb | 2010-05-21 16:38:33 +0200 (Fri, 21 May 2010) | 1 line For search accounting, we replace input id QUERY by ACC_QUERY, because it conflicts with the search of card in quick_writing.inc.php ........ --- html/ajax_poste.php | 4 ++-- html/image/loading.gif | Bin 12043 -> 8546 bytes html/js/accounting_item.js | 8 ++++---- html/parametre.php | 8 ++++++++ include/class_acc_ledger.php | 4 ++-- include/class_action.php | 5 +++-- include/class_calendar.php | 3 ++- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/html/ajax_poste.php b/html/ajax_poste.php index 07198e9ff..d4195a443 100644 --- a/html/ajax_poste.php +++ b/html/ajax_poste.php @@ -28,7 +28,7 @@ - param c : control for storing the pcm_val -> javascript account - param l : control for storing the pcm_lib -> javascript label - param ctl : the node to update (ipopup) - - param q : the query -> javascript query + - param q : the acc_query -> javascript query * - ctl (to return) * * @@ -68,7 +68,7 @@ case "sf": $ipopup=$ctl; $attr=sprintf('this.ctl=\'%s\';',$ipopup); $ctl.='_content'; - $it=new IText('query'); + $it=new IText('acc_query'); $it->size=30; $it->value=(isset($q))?$q:''; $str_poste=$it->input(); diff --git a/html/image/loading.gif b/html/image/loading.gif index ac06a66bd2e8c2bd6d40cd36ebcf2b5c257c8f22..648ab17097d4f68284b67f9b6c04112057f6ad75 100644 GIT binary patch literal 8546 zcmd_vc{J4f{|E5Tm@&pA%NUF$%NRp(Z|ZitmKMtlL&zFwxky4paxi;MO;Weyy1&oRa__0{?~i-Fe|>L%bvjOecs)El=lRw*&{I>l&jirG z6aXYdbS%s-SKJ&;i0fEgTU}mS&4}wri0W8)xtwvSANb~v+@G6Fh?W+*+NQ*vKdM3@ z;1|e!fbqfs7@)%WV$OdHz}DzYgQELtFFI@fv{Q<6bh+wWc+>6015cGl-tH5=H(#BQ z!|`fsPeGB?hb&bKOKj``qc=<=^W4GNlZAIYQ{iNc9fH&_wd7~C+oQ+fZTb(t*N?oY z7%`c!M*94AF*pd#<>tVJiKIk{#kj?Z(ob9xNuWkkfTW1@E5a!mX|Xx+7@l;V{K8^N zkyt_LO}8@9@;enLDn+Vl?m5(=AJk!dPBf`!h-?i_{b^GXfhNElhxuf z!!}Wbi!3`RC#Q(fvJyLjrf0iPkm!5N3y-#z=e8%So@mQ3xSiLTu68bp^7(rv^7VTb zhC?QRx0oJZHriJVp2N+y7Q6*`l-kNsBaLG4MvmqcyQFh0^@_cnYQY;d-kau}>G`td zzT(>QQSf%PmDAwWc42b@&NO~|JMJ|*h3{M<;8h>J!;v1m8pq5rrUPo%!lS(mOX6TL zH$=%oHV^HNpDQxX;6ukoIGAP)xcT^xncScA^4;6&RT`d<+e}-ffk6;NXz)>BujDP?$pe)r}NYJ=cxma4{lb-rwJ*& zgS=NJk;ym$Gk`6eq7zj70Ozgec5k*JI*6ry$gYaF)sL3h5z(*4CDiDM z^xAfkA{Z<}O`sjBBtU*58zsxTj^`9yQZNzH2waNUx=iR!)w_UI*r9i*(hSD$EGye& z(qCZp;b`u>)9JyVj@KAIbNy|>I^U_uVXqtzTKuE^)3)5Yu#S-1=iba4YcuKqZ1g*% zv{6;rWCKN5`S_k+V4r?6uwSnn{_T~Gb{B)k0&l%>-=lgJ;KjkagBJ&HjYDOC_XRJW zlh(hwvijxd;Ke}|8A<)%xxu@G9>CM9h-O&o6oc0XF?{ob```Ho_?lL{CrL$u#?0|* zb?e7=3r|6!A%(oTdGW46Mdl&Z3i-W2AAb_9F@n5k#+pJZz>A3tAl zF(MbzKipT6D>(j=5gHzo48Xm0!~8D9i0dOTJUkeL;q}}b1vz>728E?1MP;P&;#)VX z@77cjgk!G)61q~p*XjW&B0?0>4cQ!&{ivt!?qK)OKu>SKUKi+Pc;d+vtMmD^u0TqP zfG(=70Y!w3cf&{@R#x>_{h-bSyImpgm$|h_jjRVjNOAtNRo%=;omP6aBwT<&#%@8w zwNU1A2Jwo<(pw9*pKMQ5vM(ria#ZM2Jr1NdD*<@cA zqJj0#di^#U=Si-+7>Ut4>gzGls3W@njEe7)P-|GUW#K87^^KZ{-9p-0nZa-_Y4gN= zS2PA)`wNX5&i_#Jw&ZaoaWbw`qLuqVt1O00AP70{MN$shc4fpy_(=b}D&e3%1bxZID#cyq;Dg!^Z)W?7etq=dfZ%_mIXbuivI7GMbP1B;WX+}iUD6q#PEHc- zD+U#EbUt4OX@Xdn->t?3b$~iSh@egoE0{`PifsS|S#!b&WGbBlCK@Oeq{+cL&%t`s zumbe@-+>7L|36Ku12grrHjG*CL$WrzmEuu29T%yeB+1eMgiLY`4lzQ=1j@*h1pF@e zO9~Lhc>`koMZ`l>)3EqN0I#>1J0S<)KCc^dAuvHwUrGXjkdQJgE3c@$b^DIN-P(Iq z_el?{AJjDK$;TE0R08^{f1tFkTwkxh98n4bnSk({Q*nwXPTyCI{Sl4P|695maGSBTw?Q(;DH*9@_g_M1^8kwhry(u9b5xy?NTyjD#no zT)I>5aU@mM!pRuRpXR_I<5YSw9BCUVvGmH=abzq47jx;xm7S~@~zPmpQ{pOyDS%n{TCJy~Snwe?8N z#YnO7nv$id>a6{b#%fF78b~etA$W%wYSt->F58A{I9@Cm(A|uOA?xAi^+_ykBR*d; zOVHPMr`A61L(Xz&m=ptm@}S(#O-9N_C_Sa%lANDXl?sLabN>FXB4=gip0oE>nXDMz zCa5BrK;lJZ?TSm?Y$relv~Z_GLJbfyK^*1&0Ti@YNk;T-2;bn9gtZ`oq2SG#q?QY!EG9HmJss<} zxe7! z*YTWjbI6o+C;NoKq*;w*9wdLf{#NMpIaWAEN1FlR6H)aftBHR_o|pd=t^K)8e%mwt zXPp=RBj=<~$ql0ZV!iaM^&F1#Jka^|dPYXm{d*hEIhcv^ad$b^3)ZcVkA1S9G1u{; zXTE=Cv2UUGmEJmY(n`mBZuY5ZsEUU|6rUQ!ok53AH*ZnmQYCAJe0cZvId}e4+PHDhs>_EC!5UNI@F8uIb;$<9f!&dtgTAGc38 z4NL#w04t2r=O4S>r7xQ{s^@2W_tbcG>;imCEt5Td525C%m02ak-m1ONr_}(_1awKjMKIW>o(9Mf+q)k1v^{<``0~l?w`?M;OSlt8`k3~1 z6Z;hj{MEZj^n=#vqf{(Z;=H8lw3dc95BOo3$5Xy8j!Ru)Ilqia3ErqEIa-M-v?>Ck zj}&oeY!_H#7ExTu)RVOGqQRoWv1L}&fo+fP$-5M)7~o_FcmpEeHzD66bTb5~8FV$15=69` z%*ln1UfY=ugTwhMGsJ#Eq0HwrRN3m@Z9TbA3f|qZzW9uARM^Lr{0#azoxmmTl9gSj zZNBQ(*9!dF5B;#d$^f4W#wH_i@w;`Q86UfeFcZ&wa%t?GbagsCHs5D<#}QK&cJ!xG*i7wjy~Q4r{*0@I@7 zxvp;!g9%$}P^|{bLI>q0JGezqSxP!4E(|~v%1d;9guM2e1X4gqBE96H=&To+m=F#23(hk*~g|q`7 zl=3GdjKu^!0Vtmon?G`+n1h`qN=5JA*v`vroac^WwzT_pMj&DBa0T-af>P`WC+I9x z7L0TEuy9?344D(>0YQQ5aek2=2=?=Dq=V6|k55_8^yF%Q+fSDkL{65}=U{JcT$djD zMLKD)_esxCKS7>e2gDH2w*$#wsL#&@$`MBgkv=~)BOt3AqQ7s}+&Y^{ zrcT58)PYxH!B`$)4fGKEJJQ?IwtJYT5zq9k(NR;X+8D3bV+4RNs)|6eaOz6YlbUWM zL#UQ{TZ^Qt({>gO6xd!5`S}uLNadOiGgopOuHNjr0oBvW;H~oDJ@~JMmI(7#um=P# zr$02kR9SK%1*qNF_)|ozqH1BZa)|svk_`0YUKQNy<2YPS?{9WM#cV>3F%Rb03TbvA z|A?et=L$3I=rkU!eM%IiDfco4$!(-rIX^tiX)Rj2cRcI3VjVgjfc|an%}se1h8;)x znL1@)JlT}Qk)9c7bwQUMt>(N6agFDxVrnaq50N68UA5T|sn;Ty<_+XT5P691!j5); zg>jw?H(WO^Bqb{l@%1Ap2L3Nh^D-OPe_-7Dd&Wt{d8E(GYrirtFZxuER+i~QU=yOy%7YfwbE&7NQEn8AKa z{IeHGf~^~AZimV>Owu<&27qbamWFU?_V&AcX|3d3dPIV1B>15;c1eZHPAg8)NS@z~ zGpe|DC0NpIjH!1D`-@E<`rp?WAVt_$h9K2jy7K7=!^=Ar%B@Zw4*kh$n^dZW2ccN_ z9f}uW!xpT!fc|OhWXmTALpeeSLCxsDy)UTQAKO<1eoU5qGKQO=ld4zA9jtd#KZaA zcF;`;k88Q6Lq){lT4jat6a34Z?cf!P7UuviS?y~nQ) zBOo%O-fCUMnE2b6Q$UkB=1jE0+T#yJ;`G|jXAkpexy!9Xc%p7CO1F6RRmS% zVv$b(oUYJSueB!xzFB*=>8uA!&c6V4RZZB_zA2J;RH`tZNsVK(qY&z7lmQl(a|ujx zgIVDE0U7lx!xhd6ImfO?lnf(I50@X2Ol2P!3&XyQvA?7kc6`J;Qk^p$YPp+yRUWN$ z>P(=>yBDLkH@Prm#lT4Sf1*sjYGY249F|OzX|9_V(2Cx}&gIt$zN_P?dibbd0KgN7 zhDL)GZ6Iq`WS+^%Yjfr{r*snW_*w^=*Pp@_xI}13M zZ|vsaVh*n4;K02xl!N>D#!wE9-QZ9T?&cd4IXI4Qyy1YGIJmHH%;MlC{?|dAdyVz| zSGzwMnVff+aIQKe#07`ljCe{aY35Hs0GG9Y*hVg^D%UbYM(PG(P|Q zy~F&aZ{8}N4^)(NaFE0!;DBw61KdIZEe=V9h)XynB&DP!C8q|bCtk_EmW#i9Bdg$g z=GBa1oOnbma119HaR(5^bMsw;a4RwD8x@*A?$Hd*?Re+A! zS3>dWb#*AE8OYp=#97F^BKVzQFD||M@b3BhKNRNYly}%CSMh=?T;WL_$R1u4MoDY3 zYzu*kmeI@b&BlgCOG&ym4xM#mqNEwxP8C%>gu1hEp}4Y>bhDp$Ma7NeA$&9XSGoiA zM%A-VnPg*Q)(HOEbKRNxSwHTr>$D5=z)4eHh)xFcawP=W(urJdUAL4vq7*cB+zAzm zqdUnTe_l9JiJk8KAxmsK^rizQp<5xssZ@&_ZKI?m8|Tm*C-%#`H@-_(+v4Rck}{rn z@xp9C_7Yyy%=CZ`s9{AmEPWbSo|3NHA6Zd;X8V|+FJ(u6b4#{2FJU5C#Dqm z8+`cj@RrS+k#MDjo|o*U#aFKt-yq+vym-H`xaoZ2>Zgd7F{0(eM&15W=106GedD15zpCOf6-O-SW@ z)Auv}%QEq6L3vyKHG332Hz+3#ci)Oe?mO+j7xWg)7_PgwW#^q&$z=ja8{ROI^SeLo_kR4&f6~;+t#`K}bq$T6OtKzbZsUC8kR)ZF8a^Aq^vG3@MpHDKDIk zB=`i~@b-kSU$&Siygk_X%YZZ7#KH&)$l-1*x{e)kPyqU}to+#fbR!un13q%-HMt>U zC3;u*iLE8zPMKCH|Dz4J7MV383~%z~wae3o&D#99@+8f)VI(jHoV9*!CUT!5|jo?nZ$)M@D*}%D^ch&ui;R|U?Ygrrb5xVXL zg=LWO7L85H(pO)Nzbq58ejYL+dZ}6X@Gs#f;~ivgZc2!5SbUl`XKPnFL@ZZIm+?nS zh5fj5GRIkgVsP2FlOLasN^T0h)KlIhOq-LL#BbYdMQ&pz`jiUz<)E@ZL6|^yQ}46W z#MAb?hnb?)IS$-vIaF^`C9C7~G{7RXFQ~Q=+}ec(eu)~zpLb@&MGl)bZa9w!m^rO1 zc4aeAClM`9zU?O0A{TFJd!lK|>kh7Vi)ooA%8TIAxbB9_ln%@WHFifb+*=!~7obNM zs1*whHdJpAS9l{`t7qIN#Nk#gXOGCf6)c&%BP*wSu=B)ra2$zefIWfI0|a@id^!(l71Lxf2_) z-&jh0zJx9dIGyEJRL6OcvBo~jMF@Oe-?}I(LIck1EEr>Nh@NkLS=DRJ@qn59{g<=; z#mhoo{I?F9WNsR(WcDU8?$Gr=WZ)w#PsoBFSZdr->oYO6kE5<;lj-N{l&snD30HAK zXPVVmYhP0hM~SS~?41F)eA;@KJYBlbf&)`rkgqFW>YzgYn6TaU6wk*@ki%PAwy)it)RXk@wrRzV!TUs*^7z|DDgG+Ygk#K4s zPIad9@??-qr*mwG=0z-FgpvjZ75Em(TRsg2IxF@7XzH_Hcn!osHSubXlr6L!10D4| zLPbr@{KFpL?daeMghZyq6nJtfAw46FF*_kEgFYnM?S-PBnMOsV7CjtVS6>%^u5GAq zVrXuGw$*etCiiyr_jUt|OTurdN`c|ivu4V1s9LhcC1?)OW@+(#|N6#C``Y?u?*8&_ z&$iW<5z(=6Ajm??M1wzTjS(c&@WEP=@X(OUzmECPdxK-XQy=N4GQhc{c){YN6ol3? zraD){Ik!AR+cP@W6nxx7wBn+@Fi5_jrQ={`Z`R|<(x+UBe6}bEvZdtko#kOubEQg; z4{=j#FAvrLKQ-!qw?TV+FR3k!;WsUGIk2>QuAAupKC z5yd3x|Alv{#xk`g_nF2k!vsIt2Tt41BcfmbY&Q~-t?8fb4t&QqC3@VtVH>5Cpn3jH zRl`Klp&UZ{Fc1i;wWknzRxDGb+AL;`7_vCxeBa`Jc3Qn{d#4#Uh5=sTq+tRFRoEY} z<$X_R=9()wd*(yp;is#6AKIEAZRxkhiMdUpi8pVy9a!`2LjB*>6Wc>m@LzYu4eNCV($-41+=RH@&^ox`O0Kj>T^i(Tb zZyQ}Za6n)Xgv`hU4vLJ5eu}4cbYx0!NK7(KNlj16OrU=b0jCx?ySgia)XL#d^Ef1g zoK#fs#D<0@#@gmaVh4FEy1k>9p}%6f1$R8SP=W(HMNepjhf4XlN&tdc{Bt7{u= z@Y_d!Ketc~cI*G*>Z~aESCrI3Ak1{Ot=ZPbuw122f|GI}PaGE%|J0 z8&!m!T(~0h-P!z2HUDfH%MORBW;^2jfS-E7nR$7F;QqTDn(;O1q%DCv5bjTA056Uh zYMKJF!J0esoTIUvRfMjh-GaTU37ThjUP`+<5k*uttE6TCDO|nL2C-NQPn&8Dhtj$R z!)r_D5%$-m>ZPNib8314{hAOO#UO-Dkz(0k>7BK!n(tSPB6bn4Q>NohdPnOBm-{xb zvH5S)>K=n9D#ZF9i=4ylY71FEFLj*1kl^mTH=P?Fe#d>Cugw}7eI(zU^WdVQ75sX-wEt!4q3u0AAhz;X}%MAO@^9l)|M&k*WHuU zi)ITr4jH3Gd}R4@hqpM*#-b06H0P2pO4EGFkL~{d!4|2)PGiGwZ2b`={zrL{zWy(4 zHPf*SJKTQg8@cZ`yk4I10m8xpmtNuTgUCSqd;~<}E)K-;PTq3VL1INb2I~t1lB?kzHC;J3D z(ZO@`@|p6B;DyC`FH1`pU*)2e!J74CaA*Y3D8nxm=td5yizVxY*f%5LbdYb-t1$gW)OlE=&uliAL& z-^`MG@+Q<=VRy=md)m!jOz@?AJ%i1zJeg)TtAJ7x<4;1DT(g<{L3>pZf#ZEG(B*dN zL+*nqJF%9NQ51@A+C^{pP_DR|-y%7(HcrvARzSC;KtYM1wa>h87Z1NSOFRg=J%FpC92{n{aEE1ct-P&U8d#mfD0`_?HB&$Lj^_8z zl~cuRwHvI==_y@q{$o)Kahw1}MTy7kkQaQ?)VB%1PUoirE(T088fOidtthn?{dfSX za9ep6TrV?96}@PVj^FU6;+$f^1C7f!vH(18hM7SEQ|9l(gx3n*hl?MgG5-g7Ie)0f zR`o~xA;EXLq5hG8elO1dtso~^dp}!ES3q_=_CJvdk{ykX=v`UN&_&VzMjmCEM6MG? zgc7+}t|d+*Kw-XqbC6f-6?Uo>Q#Q8=k>khjeg97WQ1qFKwWXr%^WZD?US6=rw0a(p zxcCGp{wWZk0!q)wvhySEdYeKH=Z(NS-YBjbTSRM(G+ z9R;(dimtw5Tj6$M)h36DbESboV_F?wca&zZWXzJwZdTFjyI`4OD0ZVO|_&F3)`G#)) z^BBt_U4xa_rtgQ{R!vk@OZX1xrCX&(&py6K8s9sacDj+hL6SsgmKiaJgK{?e>gKYkN@>+&?#eD(Xae~;U*O6E$6MmQ|FJT zF3Mbl+Ru#Ao=23>V#E$Ng@&D8$e@j|A+a*;07y=DRxlL3qzP~jWxa&H2*UJ+%}1Fp zhfBCbEz!$xwyNU;(1EbK;v9*Robp1)L40@bZ~8>5Yg(+vX+14mjeqQvDDhW?OA3I0 zOH!`?grs!vnAkYNZY+ayl+ z-`lPAXBN{b8#FuufT{0m(F{pYwiStVvH;GDaS{DJqiew`=L}E2y-_hXZk4?Mm{z|{ zqMl~CUzh8NoRus7Z9RdGQn(Rbg1d|H7QQe(n>XL!p^bV{$wiaj=Zj4-Qsay}r!FFp z-ro7G9K?~vcpDn`z_y>L|6uJXxw~Sk<)zJR`(UuO&7+uG^{PB0+gW0-n5i;dk-G)W zZg&oZCX4N!zXh~0kFUmmeO_A-daXpFpLZuc%!I6%-~Bm2AXq3NxT}kXWW+FWu$P=zTj@eLT z8^*zB|7vq5rN+Ny>E{1mOX{snDhsyS=l)xPNO`T3eAg4N(+nOl~t7# z5ilsCv8nM-QoHc-=_FDINu=f@q1Dy3j1!YJ6>s3v=-D?53=_mgQWG-)hVSgP#3JK6 zJCnM4ei!v*L@5W#X-1vOV~?OTx`$I{750aY8$L7#NJv3p-6}X=K34JDC;A(7+x8JL zET)POW!6s0DCiSM!WOcEog<3lHr{P) zEFERe%P7ID<6w9_i@MLcYv#++bcNAX@6^IlmPY+Hc1n9h9H2r%@rdr5*;ekbuN6ZP zbl}sHfxq9l4m%}^?s}*Btu@Iv+s3(hj+;`G`D0rZoFK>4OXm((jmMB}sj%dvw_CkB zte0#C4pPJ%9{L&PeXpXO2VKkmK(+D6X)&Oimf?!$W2=wdmY zzsU6YT0uAd>VRQ@k^?7=65!JZ%`;wVUk)-ZW?W-4A_vp(ks2Q+JX`Q(Z-MR*!TZa3u4RXj5Z#`k&xy$pg?NT*wazGgVA zOw}CJnT`4`yx~aWbJC#A6#!gJ*4Ix~%o3y(qTy-l<;r=gC{r8(jiTmdS zibUl2hB(tD#xs`2CcH{2C$Fumjbwn=*Egb6z>hjfmNps}`sV@N$srx7WMdGARv@vt zAz|)q&HN0Cc&cbMdSz{OBe}clQBMi7|F!R+mDU3__y;mr(MWQ6c&eE0&YRr#f>)L# z9G}~DX`3$*%7W04jF4NVS`{iMUtQSke0I{C^sFh>Ljx%;@x<3YmTWqT%#=tJ8eYmV zz%e~AhQeS>s0wYRTi+Is$1C8vZNg%@f>sQUZ`BI~ugaywXjnchMP0#u+f+e~x*r#O zxa#jagdu-p4bwzawme1uXjwvtUlfAb`4)^tfqK7b(CmrjPXYBGx8$) zFM0JYF%q(+p6$(H4d?Qx&bifGD&;jC_RTcA0s*&%T>Q{DzhP>Tn`6XQzU(Cb#<*+v zLLVsEcSkeiPDrx@Dq5AG(g9~)o-kt}1EI0fjG{XRQ{FW3-7~n*NK`)_-A)t8+9`;~ zusQS|_@7hjJ<#;$%))jA3&~^{c=K@=WKiD_B`p7$M>pO_T>Q%(>F+X%b%xt3EFAIx zJ@$VQNi~V23cw~H{h;bhsXD;Uosd2$Rcaq!7kQ2|kYR5orYDUQS}z|9^3CkK zh~bUo3x46e$ia$0fVG;fmGX0YPCT9|5{Gt-@q&T%4WW><^bDwvxxX4Hzo7707;S=O zbZL1)G`zZ|nxd+l+Iq+3?22U4MM2HQjaPY!2ul9ad$lx1 zeBgWcx^t-}uYJ zBMAKDy^34AIb)0{To9}j*(g-1P)$$ONQB+W&oQ_dGcWK!$Qt@k-tTrCR;g&+bU+4Z z@czbjB^OMJDSn5_ZnY`UMw?Ijl{@Qmf z^#jXD>{m(*8A^+V%4gSi0rja`Mc>D2Wjzq;xHuYfUJh5Aj?Fy&B+XKwz_|?nozV-Y zjGkzAhZw1AJT~YNDR>(w+zs$YKEbjwd4^2n`%8$>yGnA)aJcr%Vg3iB-ZcMFMk)UT zjH3QzG$ApTBxy!w)~TfVBuVp6B~3|Xd=-=MPe$oUT%t*o_Wnj`iGSfKr9ByBQ>T=+ zcf5`6=&ZDduC0+Lt*oza*6eI-(Obd$9=$F@4h{Q`TB$zBn<&m-m1`y^E_Oxr6f=uC zS1zyUxX7~c2A}mbtYTqFC32ngBqc8QT#7pP6jVHMlkW;1Z$NKry+T)cxx;|^{Xpk2 z_DV^L5I?&0P(>T>gNH?h3QZ_rtRU6uOY!BY!`R!bMjxg=a<>Ob^gW>zi`eLi%#Ho{ z>49HZg*%y+oCqhrSn(xQkK4;RNF6v! zi-aG6^E&xz)M$@dRkiDJr89mZ^QG|v5E__RUBtWZL@h5^e^(nMbO zvMk?EZ1;)CSx#?vk||U@lowD*VTX!^^mZ?JUxFL7GMYi6n0!$cetyih26a?E%>Atp z*4L+&+VUAe&#Ng3VM1RPjHaJ>jIm7dNTTfyXbBO+{qWs&Adi;x{y*YN+ znQMp;GZgnrP~gn8omd7lEU4T?`~p11?=x+Y4MXW{ouxs++`c2Iiy-s;*9&raF)LM@ zXG&N*6b{D}<`ofXfp&w?eKJNPUWe%<3hwxdq;Ye%G?d(A?b#FDJs+5u25}`wa1L z@RzUP-Xvto;9$m3Mxun;VrwiXyi#J8zV)q$>(b0^b%vo-AcTPq&0=PV?v6NN64CtN z!vDV8pksM+4&0r7^Da<|D(Ub(CQfn^=~xB-XmUM`L+VDf%m7X-cs0;c98pG438dSY zO?KmnNr>maT^}pkkBUu!=bMa^PBYbV&JW&r@@VWyueSB#1N?mH?Ol-DY7Y}Gg?=gU5+w$6hcip7^{fZ9m5hbb*vd z*Vf6?n{3zDHfwhGw%T@f_cMkDwT3H@W8;2B)rsD|2#}9%1tCe}%sX+4VUIRfVG704 zpm?6;b^_~im-`7lBxn4A-yD}Dz@0M~d@cPo7`BDR6&%p_I3C)Jy(YK2BAQBbu6a|o ztyL&`$S90478%7vE=}ANlL2V9kgvW#n$|t%l(M^sx2xW)Mr*$+iH{Osglov*H4qoX zWiIC>7bDxLq(U^VE;PNUji&ffT_z^%5y!gfTv6E1Y5ztb8?ilC*^@YF*TFC<|H>5tW1vMQ z$H+z9kO6ro4Ph6bbG5!Ew9ZNkMCYAwavv2HxKXiE*_-saDW%y?K@9Fr%(v$(gKS>1 z5x)>%Q=PNJDDuZ&hIJ3FwMXODI9I~0e@SgfFpB*!koFr@5A62Go;~XIJ~q6v6nGtO zC*z>VlF`dtt_(Dyn~mZ$CKsM?0js0d%yE97RfI{7!njr<@6%hbBmSf9Jy!k#$a?xn z;UQ-K7bcxloa8W)ry{~1{>-IaRv~@omH#D|GXIfF?S9Xt3gW+~($i2HhKq=_jE*5C zQ%jg0DLz6-n>;C*0s(5EqT-TgA+(9m|L$phOA|c-(cRPiTRJ6)I^v_4Pl~5AqM6K$8T{aSRf$3(e z&AhNwK*G!Tn3hR9hZ}`?a{b z)*^JgN8ESvEcfP6io{fiC zr|rhsUtA~EPEi+Kx1y%x?ecS<#@LgcU(E0k6s8~ZQW-Eb)OVdR4FLUsEJoM?xHzXS zT0xfI_;LF40f1oC2pf{Op)Tv8>4Y#$g5pMem@n7i3<%Bal<5mHTuP96VJWckKKgR` z@=8pRGHquphVP$8r9pprt@*c`d>&nl^+MgXv!MO2tru;jdE5XH2y4CijdVaz2DU); z%%f*tFnn&0+A|2=D8jJ004oyBJPD2qz@PrKBb^X2haxz@&zX%msfZpe#u2d6|D`Nep>?Lwz&@ys?o;-_qJd z=<3euC2yxy1M7~GXeF9f1-t@!42?jp};MG zCjRMQoW#Z8MfGHkurX%v>R!;mv5lFZ(`|*RajsZ1(R3swPEF)xD@MXs&r*$vi$#Gq zH0dmbcJ#t<=#vOX%3>>?F>>99X@Xs`ml+daXLVTlS`9JJvFxx6r`VmIX0t0WswQXb zXu3a9jtiiW+ghvgzEt~h+|s14;_JdMy0$kBjT|K}cCWe$=#*yB)z%|Mtc!bRR=BGg zO>uR%gj<5CU%DA>f{0&FsON`n9xS1i$HEVVM_BGDW_85g2zlDU4Kvx&03p<(N$E7? zTPc_L5rv!*Yr*Rmo@>+B&noCC_{HNdt0OliJ6e3sJ@~e$2GjN!x4s#EXQNX^!He>R z0qhJ$+}t0iBthu*tKdftGBfQ>F9vYH?E)Q?STX{cZJEux6j*8qlGJ?5ktja_MNWSJ zO6dJE>C)*mox+X{|LOq$Z^u&}-2mkUr|@ay;;+`l)2f8{;Mw}Dgw7D93|Vs(i?wji z8|~Z@V>?(RNJmd#iK^Ck#kmjO@eglNQ64p2P|9GTwZePj$-&A%fUU-J8&!Lhj}KFn zcTB8R{AtVNoL~h58yZ6)dHDrUKg&Q3P+9pa>j+vXoV3?d#E`an#u{QnQ#-r`-PYbi zmxdtSJV9Zev>*fyk}&HR5Tpuvv_wH>TZOC{8G=KbHW4IGKeWR4KJ|Y2xWkYJ2cH1Q zWM~B?C~H&;Dy$z?l3cy2&K8|)#EZc@!)Q#@4Ga?fLQa_O*?ramnskSqzha0=M9#>? zvR@Xcyft!$%g-BYw|yWDpqE-?_8eFrXl?X7%3vfq1K(BV$|NIKT?F(-i+)hfeCrX^ zDNrG!TYlV&z!hITn;S{1b7N&Js!6fg=b@4fG5%<0Y_Rw_uijIg)t@oa3hn8tfj#kW zf;I*_q>yHw9!?BbZ}h7tDrzQ(Y&~s>Pd4&@Bl`?vE=VyiKcGX`p=srjx2v6NR6gLI ztJ!?6a_ZV!uYkRwYs@bDiTib>-*v33jnqnCAF9VXEraGd!rW{q9=AEk%o1zei#^3R z_JQBHWFMe;w%3cNLX)4EzD$V-S^Rt_L4P#oMB|6cSN|8Fh9!MXEAfOR!y#giv`3id zrx74Z)!fI#(S)=8yjz`L4|0zSe%|*fxlu+C%A#PI3{1l^5^|kB^1dPP$Mfzmlcu#W zwh1bicfpt%mTm@pPG!v(VH-WtQW8QUl03@N$8xtM)yaKh{d5)|6+|tij=1Rn^_E{2n1gC+sIQw4e<$`Dgd6t#11RXJ!eJN4kGVN2`y|SZY_bQH+-uPz9 zideo7f^sk>Y$!H=f@3t}p_)YXrd&2@--mWvXx}UVcF;F`QaHGP`NlB5&=^H^-eYHBuby@#cIhJ!tHwVozp^Ot-p>$WhMdcil7S&OTN$ zdz~&cSC8XA>kZ6TJF^%l`0UB`azkdsr%(82G1be!5*A1D<)ocG_C-)#u8 zg0z{ejJU55!Y?&^*`BFEEeFdM)(Z)6kUP-=h8bE-iOD|we{Qe;oM)4wvr z1(a}q^X|nOcZYwGA5fwA7#zv!{g$3Jg_D;}#`qeZs7`NBxbOMHWZr==p4X)yXjXJ1 zKpxJcjWo}-TG==!s<-NUC$5nH!bDM4hSWP(m8+U+dbx50%|VS;D|N(_XhGMkXwhA~ zRoA)&ueh=8`lO@lBW=9~*4=|5SpP~1-qN;Oq1PGnxG~&Q@P)Ycjmh42mhZH#i_@bq zL5U4`HKoXOktF&2`N{^R?YsDU=M;lo3IR2d4I60(Qj~Z3z~!kNUp4RrZ^mHR@AzQ-T;M#R>q6!n6Dfc5eG2NBJ%Zy!Irf1R$>(){z?zca-f zf;9Q<;puM=iZ7)6qgej!o8sReFE(R&I!JzeE!n5Xz*|_ba2!0mH;26s#gp87Wr8vB zLawqEEeMTl)?chWqM;nxxH(BsEPHMJdCoBW%vzWm^YBRRF~tj;$3_Nz##T-^gty&8 zC+CRZX!lsJc%L&*3?=VkOdKLZfMJ$|aE+||yuz55aY_EE5*e-*5O7`gi@Jt*VpLgu zM`LYgOHX?%F4;)$eo$TFXu`{}f{Af#$D7QzGjr1=)ORGEpFV(8dwRW}v)h~h&=&Nm z%jTfw=<~kiF(TQQQlgf3uD`suyxjnuUIy*paJ2`IZl-fmh9W~mzM3} z5jl5b5Gq+>)vDt+!=1&WE3*7#6)tO-ucg@C>>uKJC3;?DIx1i^n=0uiiyTFvS~eg{ cE>-kP;bgH^rRBT+>f-4#gAQ*606^@&0GVL~8~^|S diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js index e384b16f1..e537fa79b 100644 --- a/html/js/accounting_item.js +++ b/html/js/accounting_item.js @@ -57,7 +57,7 @@ function PcmnUpdate(p_value,p_lib,p_parent,p_type,p_dossier) * - account the tag which will contains the number * - label the tag which will contains the label * - bracket if the value must be surrounded by [ ] - * - query for the initial query + * - acc_query for the initial query *\see ajax_poste.php */ function search_poste(obj) { @@ -76,7 +76,7 @@ function search_poste(obj) { if( obj.no_overwrite) {queryString+="&nover";} if( obj.bracket) {queryString+="&bracket";} if ( ! obj.noquery) { - if( obj.query) {queryString+="&q="+obj.query;} + if( obj.acc_query) {queryString+="&q="+obj.acc_query;} else { if ($(obj).account) { var e=$(obj).account; @@ -113,7 +113,7 @@ function search_get_poste(obj) { if ( obj.elements['jrn'] ) { queryString+="&j="+$F('jrn');} if ( obj.elements['account']) { queryString+="&c="+$F('account');} if ( obj.elements['label']) { queryString+="&l="+$F('label');} - if( obj.elements['query']) {queryString+="&q="+$F('query');} + if( obj.elements['acc_query']) {queryString+="&q="+$F('acc_query');} if (obj.ctl ) {queryString+="&ctl="+obj.ctl;} if( obj.elements['nosearch']) {queryString+="&nq";} if( obj.elements['nover']) {queryString+="&nover";} @@ -160,4 +160,4 @@ function result_poste_search(req) { */ function errorPoste() { alert('Ajax failed'); -} \ No newline at end of file +} diff --git a/html/parametre.php b/html/parametre.php index f1d7e1777..c6bbb377c 100644 --- a/html/parametre.php +++ b/html/parametre.php @@ -285,13 +285,21 @@ if ( $p_action=='company') { echo dossier::hidden(); echo ""; echo "".td(_('Nom société')).$all->input("p_name",$my->MY_NAME).""; + $all->value=''; echo "".td(_("Téléphone")).$all->input("p_tel",$my->MY_TEL).""; + $all->value=''; echo "".td(_("Fax")).$all->input("p_fax",$my->MY_FAX).""; + $all->value=''; echo "".td(_("Rue ")).$all->input("p_street",$my->MY_STREET).""; + $all->value=''; echo "".td(_("Numéro")).$all->input("p_no",$my->MY_NUMBER).""; + $all->value=''; echo "".td(_("Code Postal")).$all->input("p_cp",$my->MY_CP).""; + $all->value=''; echo "".td(_("Commune")).$all->input("p_Commune",$my->MY_COMMUNE).""; + $all->value=''; echo "".td(_("Pays")).$all->input("p_pays",$my->MY_PAYS).""; + $all->value=''; echo "".td(_("Numéro de Tva")).$all->input("p_tva",$my->MY_TVA).""; if ( $User->check_action(PARCA)==0) $compta->setReadonly(true); echo "".td(_("Utilisation de la compta. analytique")).$compta->input("p_compta",$array).""; diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index c13af3624..d8abf1a3b 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -1005,7 +1005,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj if ($this->check_periode() == true) { $lPeriode->p_id=$period; } else { - $lPeriode->find_periode($e_date); + $lPeriode->find_periode($date); } $ret=""; $ret.="
"; @@ -1027,7 +1027,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj $ret.=HtmlInput::hidden('date',$date); $ret.=HtmlInput::hidden('desc',$desc); - $ret.=HtmlInput::hidden('period',$period); + $ret.=HtmlInput::hidden('period',$lPeriode->p_id); $ret.=HtmlInput::hidden('e_pj',$e_pj); $ret.=HtmlInput::hidden('e_pj_suggest',$e_pj_suggest); $mt=microtime(true); diff --git a/include/class_action.php b/include/class_action.php index 2f0f375bf..6bcf2ea17 100644 --- a/include/class_action.php +++ b/include/class_action.php @@ -774,7 +774,8 @@ class Action $step=$_SESSION['g_pagesize']; $page=(isset($_GET['offset']))?$_GET['page']:1; $offset=(isset($_GET['offset']))?Database::escape_string($_GET['offset']):0; - $limit=" LIMIT $step OFFSET $offset "; + if ( $step != -1 ) $limit=" LIMIT $step OFFSET $offset "; + else $limit=''; $bar=jrn_navigation_bar($offset,$max_line,$step,$page); $Res=$this->db->exec_sql($sql.$limit); @@ -796,7 +797,7 @@ class Action // if there are no records return a message if ( sizeof ($a_row) == 0 or $a_row == false ) { - $r='
'; + $r='
'; $r.='
Aucun enregistrement trouvé'; $r.="
"; return $r; diff --git a/include/class_calendar.php b/include/class_calendar.php index bf5b23f0a..4504d3e04 100644 --- a/include/class_calendar.php +++ b/include/class_calendar.php @@ -51,7 +51,8 @@ class Calendar { $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user'])); for ($i=0;$i'; + $p_array[$ind]=(isset($p_array[$ind]))?$p_array[$ind]:''; + $p_array[$ind].=''; $p_array[$ind].="".h($array[$i]['ag_title_fmt']).''; $p_array[$ind].="";