From 182663090e8f250a3e8e9afc9d772e31e710c6b8 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Mon, 11 Nov 2024 00:35:44 +0100 Subject: [PATCH] Patch level : 01.00 1368 Files correlati : ca3.exe Commento: Corretta la selezione per conto nella stampa mastrini analitica --- src/ca/ca3200.cpp | 40 ++++++++++++++++++++++++++++---- src/ca/ca3700.cpp | 2 +- src/ps/CRPA/CUSTOM/cust crpa.7z | Bin 7152 -> 0 bytes 3 files changed, 36 insertions(+), 6 deletions(-) delete mode 100644 src/ps/CRPA/CUSTOM/cust crpa.7z diff --git a/src/ca/ca3200.cpp b/src/ca/ca3200.cpp index c47d5ceb5..a88a756a3 100755 --- a/src/ca/ca3200.cpp +++ b/src/ca/ca3200.cpp @@ -186,30 +186,48 @@ bool TPrint_mastrini_ca_recordset::valid_record(const TRelation& rel) const //..poi le righe (devono comparire solo le righe con cdc/cms/fsc che appaiono nello sheet) const TRectype& rmov = rel.curr(LF_RMOVANA); - if (_codcosto.not_empty()) + if (_codcosto.full()) { const TString& cos = rmov.get(RMOVANA_CODCCOSTO); + if (cos != _codcosto) return false; } - if (_codcms.not_empty()) + if (_codcms.full()) { const TString& cms = rmov.get(RMOVANA_CODCMS); + if (cms != _codcms) return false; } - if (_codfas.not_empty()) + if (_codfas.full()) { const TString& fas = rmov.get(RMOVANA_CODFASE); + if (fas != _codfas) return false; } - if (_contsep.not_empty()) + if (_contsep.full()) { const TString& contsep = mov.get(MOVANA_CONTSEP); + if (contsep != _contsep) return false; } + if (_daconto.full()) + { + const TString & conto = rmov.get(RMOVANA_CODCONTO); + + if (conto < _daconto) + return false; + } + if (_aconto.full()) + { + const TString & conto = rmov.get(RMOVANA_CODCONTO); + + if (conto > _aconto) + return false; + } return true; } @@ -249,6 +267,18 @@ void TPrint_mastrini_ca_recordset::set_custom_filter(TCursor& cur) const end << 'z'; arec.put(RMOVANA_CODCCOSTO, end); } + if (_codfas.full()) + { + darec.put(RMOVANA_CODFASE, _codfas); + arec.put(RMOVANA_CODFASE, _codfas); + } + else + { + TString end; + + end << 'z'; + arec.put(RMOVANA_CODFASE, end); + } TDate d = _dadata; @@ -786,4 +816,4 @@ int ca3200(int argc, char* argv[]) TPrint_mastrini_ca a; a.run(argc, argv, TR("Stampa mastrini")); return 0; -} \ No newline at end of file +} diff --git a/src/ca/ca3700.cpp b/src/ca/ca3700.cpp index 033130dd4..537a98abe 100755 --- a/src/ca/ca3700.cpp +++ b/src/ca/ca3700.cpp @@ -2014,7 +2014,7 @@ const TVariant& TCSV_rendiconto_ca_recordset::get_var(const char* name) const { if (strcmp(name, "#CONTSEP") == 0) return get_tmp_var() = _contsep; - TCSV_recordset::get_var(name); + return TCSV_recordset::get_var(name); } //////////////////////////////////////////////////////// diff --git a/src/ps/CRPA/CUSTOM/cust crpa.7z b/src/ps/CRPA/CUSTOM/cust crpa.7z deleted file mode 100644 index ec102bed91d4166b6f27a6cbaa13bb1b756f5034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7152 zcmVveUL?$=_ z{f;wCuoOSW@NtXfbu9{IGlN>Ca39-6QZEs*gOrD(BFA(GosNXorDOdq$}k$!Fc9dw zzUuf0dv@T!-XcM(i=Ve@L#@eM=}~IlYJVSt9)LT$f4Hp&8DrRa)gHwr=bi;(-%K`V z>m#P{eHP2HyRm&pH~B^FVXPFM0&fPqgh&4T`+3!k+f(hxW2ubuNfI3R(4dlRt~1&V zGVHhlu>3FE5;fr1q3$btG&w~J*mY~ktAv#ZI9l|@$*Hocg<%~)q8Zx;x&i}#X5Aq6w`>HP|y+iFf) z3KHDA4@w9$2@Z-^)}6l)T~WElN_f91f$L?d<)Lu8b4efoghPfh5$d^a?l_@W1s+@3 zB#&vu5-cHCwi(!l=)OrH%gmxGKWbce=UZRXOL+1?ZhJb1qeumcRsb+Xo>KkB$VD|1 z@?CY2M-AisvgCq<;$TV8+)DvcoUQ$+`{i3hbyx&Q(4zOU7FAo?b9N{Humuo>2WmMz z)@7H*e-!(`$mUiX&-?s1&s9?`Vh$e#@C->qQH^NHx8rJr_NkcUh;{$e^0O-JrKWl4G)iW=D???RtBS;Ht%OwKtr*T=jOaV++56bPa z%|nak>y)=(EQ_Gn`74Ds!xz;FS-GiNvF-ME*4PA6nwMUG`|X)s@kvzuE)`Bf0EEYA znIVSeacIl!i)Po8uvf(vpbrXM2WbV2`ZN<5pfQUR;<>NmoJG;IL$sN$pmcd7`w0nh zPu~6!lhC7RnNYaEO54qS0XivXfoM}AvL&7micJX2kv!69XY@}C=Q;@=`YD9(m>f(< zu_Y&^!24Mc&syk>ZJsCgibGQ(M64j8-c(8wNajOK!$lO&06O6e+sOH(H!wW6n%XZv z`p1FKC+f?Z;qgACXc!-9*22Ic&c$~oSPiRPCi@R(&EIuCzFGK&5eJiklmsP3B@$DF zpJjRU8;&OB&YVYw1>w{Z#xrH6D(JGwd>X1BesxB@IAPT%a;09PCwi&fkH(z1=Qz&_ zLH<};><8`=d1)TwEJ)z6=ote}^1gB~%>Cr^%6nL&b%n%J{}=2XK>L>-!xGUm95Cka zkejaYeAQGnZ8Oi!{{AwM5KzzKpl7s5j~Msopbs}M>&Gfr4shZN(+g& zrJI6+lO=H9d+eI2z4cUy))H$|=u@T!f9+KU_3VecNd#sQVz6zs@Cpf=B*q-&08#g; zRRG$VwgcR%q#*4%1CvqO8ujz0M0O?Fu--YFAUvtYsYM@!{a)EsOs|bbR-9jZ19iiW zmjhztUsduegKI^2$${+Gq)z77n^jk7yV7!xu!hF($w?h`F&ttJ4}S6C4}+-5Es+XB z+dNjwv{S_7ok~@{k$>t-FnjL#>3Tl;?>uLia!FCu;Bud`nDa2x4-W6rR4#f(Q>D8U z&zk#z)(hziB`*u|f%lHo@*!%P%we1)kiu^4lv&Y{y~ex}O^VvRu``qn#8U2MTg+fQ zE9NTfvs`&@;-+@8Apyxi%b916>08oHIbPED<^VIFIS)D~`9$}^((aTilxgD0j@+*< zfnpSkCnDP<9hdZZpEk7VnhbAh6@KgiSPfg8a<|%a{z>^@I@l7i=!{X7)19x{Tk-*b zf8FzeqE`zENy&~l05&*4g%lrjzmW;kXn6IC zBP`20cI00PaJQBiT=gt8%Z@OKL>Z_G7%}>`=t{xdJIFOk16)6&s&~I%@yD^GJH25% zg)I@WUD?Oi1M(VQT+t@&%&C0Lp}3Y^JL>`tF@T6?gu^v{WxbYm-z$JVh;ji9py>HI~Tp^L11*$ z6etb|3<2h|nnQyhK=nuNLfv)DgV9-Xd-OB>NJ^1h!Mu*Not~iLi;A zri7ju#_H7vJ`jSFzc*QCw{^#~so?8Q8TtwejC&Xr2#lhtv88OXw-n6yc~SO!koDNs7j=)d<9hH$S}O30?H z@GJrh(Rd>Nun8S%*!HoJ9VL6yj;c-lkY^9peg3omV8W#aYRyw+e+uivOx#iAu-;cm z2W7KVf&<4{Nq6xdY*)xqS}qBU9hIMP11+y*CC62lL?8lewW7s|HkR+E`9g!r=LfSa zTsAX;5cJ8yK=bMKcnU(5VqG(&-hW?T_@`p~pL8?QvrQ;~AKc43K)`J;q|LoW+$K<1 zA355J{>9~?p0j=z(U+494Z-YOaQCB!pTi)tBwC(LZdzTGqP|j#l)UOmf6;N`JEB}P zTbHy@1AHSU;&A^M(c%-4A1V%3$=j3Ebb#ai#t$5-ZR5{C(-i5e0aguaQa(Iq@vAh) zs%Y61M>KouqzM_!gXlIIdA1xf+yWL+OZr|e+%v9{0`OaW_)zLPS^r@19{(?+ zD7w9rJ}hPzk)0M3t#H z*}NR4K*{K`6rb@rHz&LvZ;}O%z6diUaV`^Iw9*^WXcY~()hwT~H3m!2?<{$E*y3j< zuI5rVElH-Z5OeJu@5D8#FOMOStYZFQzR=M6k=UzY328l ziM~Le>=u1~Fn*Kh*gT!$JboiP059~TgnZBv(*ep{s5Ni+G)bS_EfD5Cc6ov1+m9{fFjhXm$sA+Ud`ODw-Z^D7x#dBlPex4 z+}QC#4VnfXqcVlMOcw7dr?eW-UMKC84Vn>5!j~i>$ycW41RS@vQ&GYeE|0L~**+@k z2)>1U@guApY#Fk(+pD$HNZm7|qIW4dU{R_6Q7C_*XNZ9v3tZ`_k>UdzoOp#US4(io z`r%AngLyepz|;proq_y_T_t3V)WNOZiZCnFQMWIjMk#|GWzMCXZ%9cWA3!me)o% z*Lmyr+Abx6E4a@xOYnBjbF{=UCjO#M@do}v81fwwq*>nOpylR4{N-}I9s#LY4NMC* zpjuu3NoKs0_l$;R%p~q3Fl^f%D}5|txK01cfU`H2i$wX=Mea?9?O%%NTWW-6^17Va z4=8##>y(wqlyd5GOPZZLS|GewvOqCzs_9>|)M!?q1&9Y|!xRamF$WovURbYbga*6E zaOJNNLLd<(zKJkqCvATjiA_8gV62wsyX1KH4xcD#GwRk^tT`ifcMQa%6oZt8T0kl7 z#o>&uXwTxgI~_)zJ2~wM?HVy%c6ycKC~T7fL<1kP;5N^8bVdZOsu}>W3MvDoXEQoZ zr@I_1N6BG%_)1+zN3UdH7y|<4_~P@;L@Z#Bi3Jo7(q$wY8wfFB(>x%Q8V{YbJLe4R z;{jtA!)Mz(-S-M78Bx$!Sm7;o0r=H5UXUr z&XP|*`qZP2>lvi09A1w&Vd-KphIw18B7P%ecBN;{OutV5OxC(C}=%+Y-6{Bd>WhdrMjFi z`&DxyK=O-ZrPnQO;VC5H;W(En)_>zu12q~}_QAJA6&pxUE^&WT;#}>+8>UvwJfXg8r zFaNxUho)DJ;4h)s%R-^{1(Sx%3IU9^J>MM|)Q!{nyF(ncmwi6ul4MJoxmBXI|25ghFz1=XN+iRuo z%px_-L479VhjkI#QSY3(h)*Q7(R{}n$9KziSj`;Bv$$8)9qy<@TjBNR8|6f#p;UTn z=Ehce@5PI3Q?;~CbZJ19Q}=%P*HrS%sP?#)8wZ~|jGng&NOkL!X2IcQDuSrypS&7dsCb7M?SkTgOnN2(;who52tiiAWuuek}=WRQ}FKU`Z zyqun4;d+f9UB&v{;otRF&g|FB^LeoPiixD%Olv@YEm%m^(7fK=c8q4Qbn+THz(&`o zw-q1SKfGlTZ}z?V1N;)-<)?NWIBp&??oCBG*lWA}SHHOu{5@U@F>{`kU9WF2*e0f) zwNck}qthY4#*ncMZ?C`8&<4u4r1g_WsGzebUlEg@-Sh=#I!c=4Av0p)z7f@`(^k31q z{7cpdk#{Yem7{#b)!dihb7%<7YceL{J#4pL*8@ZVksq@yNLiVi$q76sn^p2Y*F}DH z8S4kS7QM-8lQa)CkOOq*ge{lhEX@UsP&G+dk| z5D=T%3}j4SfAu8vUg;bYb?Lc+(z$D{`=hYIS?Mr8lvV9ZVCixbsGD9T$t#6C(ZA#1 zEe9aQ6%q4wjLn-P$tJG0I}^>INYEK$@^ipa@Kdi+ry5JlzQckSsBp%qGwZlWm59!7363%P3{k>g_FXz=XxeVBhQS!}5 zO)3;>*L26Uyl+*C;|9f6uzA1o*=b-xs@Sr^>F@dlg>nZs#t*Y^nGjy^z*m{DOW=HE zr&^`sY~z2xZ3Gz)_z~8WcLuv)w^k12t1C1Q7YWfk|M@H#Vh?grVUDhmy zuK?*(WNcc;7pSYuGrtda97zbZY-bu{IYthRuj$i>ERu@C#PL@x8oq;Hn+4T@2?+MV z*!JjQpXxP5LA7`=GPe$YFX$rxIz{^tuB&; z6u|E07=YJj2bAdrqi)y@m>EZJ^@BBE@TlH~=jhvwzfA+(ygGFpf?3dJF41TsVKq#` zGfz&lH<+`a(Buhaz?|_#LPYiloTfk{0W9LN*AL8s=3Kw(-*K%d%-Tun}iw@v0)DKEqO!fwFe%I`wLgCzz< zj}Ci*_QIz285U$~#^$G$n=5feJxY>z)I2l8t?ggzx<^MHUk{*H*Wllm#VG=qVE zhNu`Ra)`lrf=j{3z{}x2>RP$be>;o`=~li=dv_=m+;ZN>0-g+QQ~+1{W79Qb<92|e ztM*!HolHSwaqo2j0ke>C3{EF$P-=Cil=noyQCcw$L0oaEu0TOrZU*OcEHR=;_K3z} zzl{=z!tFN)Q?cegJ+UJoY#`CKqsnahq=?ffP1qXNcD?>@ia)7M{0`IXZU3T(dq*XE zS_m=rksA6M@Qv~#!$c`%(rnTda$MHz!5zsPdW3rguPm_oHaIA;8(DVP^3 zmJ{#5+NpEThqu?ElnfS0qNHGLnK3r_(H0VGf|_zW5qAh17f{(+xeYA*Py38Rmb&Hf zl1m;;`aQ-XwY!)>+lbRYR=-8-GG5UIS&J|*e7TqopCZ=*7{{!bt{5kRRC3r_fK?s+)9cFadbsS!VG7t19A@Ro0$u9$VO_8PrO z3dFg;-q3~q(2)K(TM!^Ka~wV5Tc5b15@yLx5yK%t z5!GDG*^AMDKLiFNd1hm8^JxDPV2oPGi_0C{hWdv*M#EeE2?nf>Ud>Jjjh~>xfzoDv z>IS6jBYpzFo#Z!7#F%qBS!6A&0621TUnjT(_uw`{Ui0pmc31ImgMS!%Zzx^Vszrn0p`FSguu+>?JTUT}xdc zi&dK>6nxO2+kSsZz^bwCxyCIPr zen#qncO@*#{y@Hsv2xMeDcXiU)Wrgz<#by`=IDkY7_QR3<^x3yQ%<@{^@I{{Qdz-K z2J1B>-C4uvxGGdug(ZC;%}99{Y@@~U^Beol*fr=G=y8#=K|m~hA(L?nl_bXoY1F7^ zujEKly<^Uod05cnrWSQZ_|hEvD1Sby@fl68bS5((e~FuiU(n=S*p4HX{%>Ot;K>Lv z#yse##)co`$we}Iq@@}2vuYeCr@JRqK4PZibv4fGVfzq#{Q>em51>~FwUo(G8lPee z^L_PjY*y(c$qRYjiZKDaFrRVqgR{!sW5=$w{aVqYoLw5*dqhD?@b+bt%_UrWrFv70B|8Ibkl z(u2EHi9vFHb=|xgsn5>-1enpa5j$uknD^vB;5B$V&Xad;s)Ix`XC#aYfAMhM&hl@( z8KJA=-jKOadWyYGTEGmuar##bGcq9OES3-@EEY!;t#CESq(T5Losjzet%TJ`(+L0L znXU7ctE`k!o<_e1B`}CfWVA>!GVtODvKAhN~XC2MQxF7}d9+b)>Wbu;?hUW9bX^yj@a7 zyzjFN#{G|T8aQI}l{4AEM_4x7xv&@&^z|$p)0)xACEsVeIo270lzhL`1K}-kLR97% znzXiUU1F3IY;%c^CcmqQSdx=$836*NdVh&Nt|WDbhN~&y?#eQ1GwT@r`NOgRQQfK& zrx2f{w(&b}2K6Vj-m${WWb{D@nm6pz^O>m4*WR?b?$WXw8+9btL*?!0h4I>w#`xm% zv{5o#nmyE8Och&W%M%{`&=K8I^ZPlw2QQd`%^`9*G79R9OVkJ@3NK3o_8DP2U8MdZ z9E)Ecbojr~!(&pd(XS8CZy1eP|64EfGH+^gxG;RgE>%q`uq>A@(NqvS_7J4oSSLzj(9XoS z$s}q({w+yFH(vfNmr1mJ>kJBZ8+0W%Jt&F0Y6-EPr%n48fyV2)2Bfe}rer##0!7p5 mpce+4KLH7E00#>J00AQd0RaVF01yBG41k6T0dKj+oB#mQ+p)0#