From 8fbfb51c0a153d57b74eb0633771fa08bb3f67f0 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Thu, 9 Oct 2014 21:56:12 +0200 Subject: [PATCH] =?UTF-8?q?U=20sestavy=20"Objedn=C3=A1vka"=20lze=20nyn?= =?UTF-8?q?=C3=AD=20nastavit,=20jestli=20se=20bude=20tisknout=20s=20cenami?= =?UTF-8?q?,=20nebo=20bez=20cen.=20closes=20#151?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/info/bukova/isspst/Constants.java | 2 +- .../bukova/isspst/reporting/ParamFiller.java | 11 ++++ .../isspst/ui/reporting/OrderOptionsVM.java | 29 +++++++++ .../WEB-INF/locales/zk-label.properties | 1 + src/main/webapp/WEB-INF/reports/order.jasper | Bin 45211 -> 45870 bytes src/main/webapp/WEB-INF/reports/order.jrxml | 6 ++ .../webapp/WEB-INF/reports/orderItems.jasper | Bin 28943 -> 30683 bytes .../webapp/WEB-INF/reports/orderItems.jrxml | 55 +++++++++++++----- src/main/webapp/app/reporting/order.zul | 8 +++ 9 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 src/main/java/info/bukova/isspst/ui/reporting/OrderOptionsVM.java create mode 100644 src/main/webapp/app/reporting/order.zul diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java index 552ebf7a..36febdb0 100644 --- a/src/main/java/info/bukova/isspst/Constants.java +++ b/src/main/java/info/bukova/isspst/Constants.java @@ -114,7 +114,7 @@ public class Constants { new ReportMapping(MOD_ADDRESSBOOK, new Report("Adresa", "address", false, true)), new ReportMapping(MOD_TRIPBILL, new Report("Žádost", "tripRequirement", false, true)), new ReportMapping(MOD_TRIPBILL, new Report("Vyúčtování", "tripBill", false, true)), - new ReportMapping(MOD_ORDER, new Report("Objednávka", "order", false, true)) + new ReportMapping(MOD_ORDER, new Report("Objednávka", "order", true, true)) }; public final static String REQTYPE_ORDER = "ORDER"; diff --git a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java index 3911a175..4cb8e873 100644 --- a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java +++ b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java @@ -1,5 +1,8 @@ package info.bukova.isspst.reporting; +import java.util.HashMap; +import java.util.Map; + import info.bukova.isspst.data.AuthItem; import info.bukova.isspst.data.Order; import info.bukova.isspst.data.TripBill; @@ -30,7 +33,15 @@ public class ParamFiller { return; } + Map params = new HashMap(); + for (String paramKey : definition.getParams().keySet()) { + if (paramKey.startsWith("SET_")) { + params.put(paramKey, definition.getParam(paramKey)); + } + } + definition.getParams().clear(); + definition.getParams().putAll(params); if ((definition.getDataSet().get(0) instanceof TripBill) && definition.getReport().isSingleRecord()) { diff --git a/src/main/java/info/bukova/isspst/ui/reporting/OrderOptionsVM.java b/src/main/java/info/bukova/isspst/ui/reporting/OrderOptionsVM.java new file mode 100644 index 00000000..789ab185 --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/reporting/OrderOptionsVM.java @@ -0,0 +1,29 @@ +package info.bukova.isspst.ui.reporting; + +import info.bukova.isspst.reporting.ReportDefinition; + +import org.zkoss.bind.annotation.Init; +import org.zkoss.zk.ui.select.annotation.WireVariable; + +public class OrderOptionsVM { + + private boolean printPrices; + @WireVariable + private ReportDefinition reportDefinition; + + @Init + public void init() { + printPrices = true; + reportDefinition.setParam("SET_PRICES", true); + } + + public boolean isPrintPrices() { + return printPrices; + } + + public void setPrintPrices(boolean printPrices) { + this.printPrices = printPrices; + reportDefinition.setParam("SET_PRICES", printPrices); + } + +} diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index bdcb007c..13246e59 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -327,6 +327,7 @@ OrderFormOrdered=Objednáno OrderFormDeliveredDate=Dodáno dne OrderFormInvoiceNumber=Číslo faktury OrderFormInvoiceTotal=Částka faktury +OrderPrintPrices=Tisknout ceny HandleComboKeyFilter=#del HandleComboKey=$#del diff --git a/src/main/webapp/WEB-INF/reports/order.jasper b/src/main/webapp/WEB-INF/reports/order.jasper index 098cdda909ebf90ad3a48d154c1f87fd51258d07..da7328594ac54721edda805fc76c23907d9e6d41 100644 GIT binary patch literal 45870 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 bY4DBLbg!#oC11W%Gy|VOZ7q{;3`PG3L1iWo literal 45211 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

90ALg{uFiiv4fAjY@cK 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 diff --git a/src/main/webapp/WEB-INF/reports/order.jrxml b/src/main/webapp/WEB-INF/reports/order.jrxml index e7a6a7bc..e69d7983 100644 --- a/src/main/webapp/WEB-INF/reports/order.jrxml +++ b/src/main/webapp/WEB-INF/reports/order.jrxml @@ -7,6 +7,9 @@ + + + @@ -265,6 +268,9 @@ + + + diff --git a/src/main/webapp/WEB-INF/reports/orderItems.jasper b/src/main/webapp/WEB-INF/reports/orderItems.jasper index 6de758180741725e1de3a9eef1f9e89ce58bce0b..be4b810a0f8c9230d6c7658195d2f7493180fe28 100644 GIT binary patch literal 30683 zcmeHQd3@B>wLkZlkPOKHA#4Jo5k$jc!X~1)Wre|PP67y&h9Mb}kz^*$`~t+Cy0&Vo zbwv@YRY6;;Rtwf@#l5w*b*Znu+PZXk+KP4QqD8Ckd+xozZStGR(9h@n_oDM#&fU&E z%RT3wd+(3$zDL7SNh*&=&5G29iqj*hzGyNT?Mo!hR7Eu26^lnJmPue(0!jWI`Km#A z4OHBb=4}{gS>F>~+(4sswx&pLw6%Z3hS(O9 zN>%2bNW81E)lA0XUC1~>XH3@gL{h0U=v*?kB9w{!$&hG=3-Yu)nN z=JwXQaHy)GeMMckHPqbHzC2VLqTu?3X(oCbBS~~J#C_@M?~T_a`r~GZG2yq?zDNg9 zvr|{bI?e9YR1)ioCz8>Y2ueoGSR%ff#>7(fJ&A}}Bg@q%5@s~X8B?wOy}gm-KvQ%x zvPV}_nGISQGrJkKG#crQCadC|R;iJ(R9npKiRv;TD(Z=DFcqTJRGdi0qHz!$?INj9 z))4FJ2G+y*MdDbE1Q6A1PNHg{pX3ZySBIO4KC8Boo4cd&rUY}aZJ;mOKt<~#9UHrn zAVa4~hc|%sm8lJt9=WJga#6`-k9UG^qZGAjW65X-qh-?ktOZT9R2lA%+Xd?4{k^Cs zsOnL4VD{(RFhwK@TSI|Ppqq-CDU-_AWNm3#n0tn-TzhA9L!`gQY&8dZq9#orqM*!% zVg;R1GZO33=!{TrtyV{m9I6(T5%rXANF;kBW__f?Oe6;!2?xnzy;9#=qozrtlw$Oo zu^#9V;~iin=?7<}LNw4wD2K^{dAB$Dx(F=7P8s1l`pVm!PeP z^z?&f^Ro6zeb6lEj`B#dnlMJS_VvWfs-B+2 z=4fXFjgcH=z`DLF<(UFA%gofSin&y{=emOgNO4BOxeuCk&knT!l@y<4`vG-cbf zk(={KgeX51J2T1xMYK5|mm){FL|tZFFV!{V$3-?J!VYIwXVmxHG#)B4Fn{YV}t!zv? z+M;kvUmy6WOuG*_I;re{+sSeW$*Hq+eHSU6Sc4UPnSFiS=v zo6SlIfgEecrP^I+v~p$?OlIWTj)YFBgqBEWCmb1*#<=t%6gQ(?(Il!2Y=F^b_e^$I zzqdkA_`Mv;-3?oCCh|mjs(Rr3uxM*^5AsRU`n52t^h*6&>aAC583+08WTOWki>Xxs3KU zxf;kpi3_9&nuGb}Ds?>;G2wo0?C;}RG5i$vDM`?{!edNEx{{H;Zj)wYW!JKBiU4y0t zd%hlYM%n9Rwo4s@#ee*u1dZH+p^;nRu2W)&fhOzd>l$bV4KkCn4Kg9J zE%yXy3p-AsczrCHGFNs(t=I=xP2+S59GfV7pibG7)M}cf;cVP%r8C@&UT=WmMJc)5~&zZ2H1LH){-)lQM03)-$FEOGf$*KB(~r;0L#sjjt(C2 znAI4z#=3oV*!fK{=%-29i3(@m<>6bUAgw{SRpk~ALX&XEqwXg2Hbw`uDChSkI^{?J zH5|^*ny0gd=4m5xYhf#fZeg61!wpwl*gyxlKs?-rqZ^{g(_xLfquoT)jpi_wYH^WT zH}2<-F%qQ>G|u+aq<2!&4P(s??@$vWnH$vfx@lbLm^JMFN#AY2@#s+H{Gohk?ZUZA zp@9;YtY{+SF!Euvw**YnAiuvKVrH38>1Hj*)E|zLcBjW$&NP)PV@)K-$rA3=Gl&)sLM!Up+nVuzi>`l8Hs3Wi8X zqUCTvjW{7obM14X%m{XHU$~wAv`_d-mIG1|Wn2~GMw&&_pU4*FR2KIlL=OK9iYC?l?L%RMR zNV;=A8)c<*spzmZPijDn5B6QT(>9}r3Yxk6YP$@NBGMoBpb<=|_Nq1@w#;k=vLiIC zI?C>h1_sT@`c{kyQgSscpkZ>FJOQJG7Q99B$#uafpLMP)?a?65RS{Or^SMPByn@D1 zZEZuHN%<{_o(kFSbYHtGZSNqv%e5S5VR?cqe$sXM7vFo~z4wnh}tW~MagHwGJMHN#C;Y=kEp;Ok1p&oc~o`_GMVNy|RU0ZugI8;;DDtX16(vo;-{q*5mzi8_CYx4bbe)HR= zYb?%NT+Trf&*19hrOQVWRjQ99x)VH-=uYrRqD}y6UP%cF2D~)bqGOc^U8_ zs!H`Csyo3$RCj`hs5)T~Q3q^l>IaLc&7Iwm&a#eZd_a<7@KDIH%a`!WKvb@d>(T;v z^9x^l=Zm$s<)7Gi$Jz5I)t~<#(CVvPoxEJ)Lo1c)Lo0WJhgR+c53O_pI^Y$+OEih> zo2HeqER*2<9pu@UGmW;i%~ei^)sv?6h}vX-cUfnm^T}H`ZOkN^UxEU^`33&`^_?r^>a=KX z|670gyxn8=eZFMpb=OU<{fV3GoGpj3@mrivUUvA9UZwhw-ksnfy*t4}dYym{q_|1j zO7Boaa;}^TD?OqPk*JEYr>=PNo>Wf)e9Co|jonNZT(u6Amu+@aO~X5_m2{X^`&rLp zvd6&KkX3SH-nDf|%F#L6$t4^Oj&%%*FAmFwGi>LESdUyJ=a?BkYjm?uy(PN!$gO8w za_)$El1bCD#@gUD%c;6GcOEOlEOS`YKw@FVb&M04;yFw1<&kxX(R-g=aAt(2ho?9F z7E5G*)snHyl42HwdsF}^Cs%n8FBl{KD|KQ+0mOpZYnxX#Ng>?j-wPBOlau~kenS2^ zH9MZ&^-|>M#jA%cJ3CV^9#FmD4&6UQ!;^Aq_{WDlbIY{HX8inu?t7kocgC{AGBvzA zQ^QU?ju*MhbLQJcpS=3~pKl4?JY~hXvr;9sSQ+={+Yd7}JjN0jdB>C>M=Sipsr|p6 z(YkAM*K?0#Y0V{C8)~C7CdMEH?~a z%$YRXPAPk=`?ciOF|Rzbuev_Ge`n2ynHv6S zP7RAUbMEnVhy3~ckN(y%aK!F6cb(c4%FER7^O+i+0@ZfU@ zTi@IRz(2GDXpd{p&A4oq6?+laClVWZ5w{__DcVy_Bcts6$^CzAv0kjL zjp~Nc=hf?tZP?5hHLGca13{8pq|-|Xyy?(dy~8qFB;JAbd!Cs)(_`idmWf6=&B&D> z1~0%?00+#iYb&3_zNR`4*4o||MeWT(y4i^~>QxfAL3mBDGw>d`v}7zqxssFU7h+|( zEJQ7}NXW55Sqfo|gYCNPg}Su%8fcQ8rwtnv%vj%`91g9it<(OEJ+NVak>MxJQ`ZC~uc*PY=A^ zoA>ppPrN<;vF*RAd+4R<4Yyd%5SKWY3sjjjEF4<0)Ltx7{JOY>Uf%HW?NzFe zZ|_d<`1bAuk8iINcy!?=ZQuS4e%r1(YhM|*T2o1qMy_{dT}P3T(7{q|5!U734$jHfJa73kF>#)x!B{_*k?k1s#|U(4Fvd}a#0Wz$Qx;K$yNIiI|I=)+!>>cd`lf``5C1P^<4f<+^n zy&vYtUe5NeO{h`ngvv8%cz--*Vy{F;)atf(Vy<^2{k$xB{wv$}{}mJS)z-wk55~=; zz_i)Zrp>9CGbbAx)0{qEHkPDgmz|AQ{%*%>U;0Vp*XKMw^7WN#YTr6=Hi}}9M_q;u zW}{9W%tlXwn~k0XHyf>lbT*1%{}CHUrxOZn9A;t@P>;nz?iXSrIWWg3Am?TdSI9W( zsK>QauPdJR*}ysbzBKu)^9~6;luq-ZqaI=+<0dZ?d}yvxeQ54Z@X*|y;Gwxr7)0|4 z7Llww_b+W!WRRmar8d2XNmc3@gk_6jL$uv*;yYzI;GG$fzK*nHBFcyK1b`&&c2<6Zx8 z)!7Iw!+>nwBrYY~Xcj`>vp4_M>-Syp=)Sq5cJ+Rx@liLSxo8dwv6wNEmt%d1tx|o6 z?N0Cz+nwMcwoU*Yq)b}2L>z08#=0}&SruZe51}VvWtQn&fqOq9d%SzL0-K{#(WF(c zyvw!++j@4@q`Q_A*)Mr_^7rrC|HY}FTwJiP>?fz3mrnMfO}JRfWS5tEAF``dAF{g> zJY;t#c*w33(0MP}>zT|scxar>8H>jGkUnrmevdnh`nip>j~Q9=M$N4mro*DmH64~6w;Fc*J8?if-?{Vts(a?0 zdwF=$S+5>8zu}Bb4X@0tVYHp2j^Dlc)89AI;$#U!>e;^I4$s&WpLT? zQFFt;rv7Ztsh>af^0QYr{Vr3F*XGvni#hlBffd77J+rQ3@_$9w9K2(o>4i)Uugk6B zT%5o0>2jUj`FpJ7naL*&e|Y~(haUOpIS)5Jm8D6@UN7uCHDb`ZQC+y*V|U9{5&7ayH(~g41h~IMp}< ztIqQwyfQM?k&N}>e4ptY-2|#O6rCLs)mE#D#at4{dn6rmDrsc~esWtgo4#XkU~y9f zN3C(p8kNi#ic%|dUXE;K5CR>}J2C6xn_RTxaFve~$+(`9aX|>PDpAT3W>unO9RJ3% zO*230v*N79m}$?>alum7;ON0HY@X|kD!$dbS6qHb9x>NYON zgczsQ96F8hnIO1YotCL47oVKUvdlJIbq*#I%TSR#Q^-6|L3h=7mPL1+p?4|;ubBDd zy2C8}9SfDnbw$Lk#nFr5@_=!DA_=|e?K2@%tBDWv4Wxh?4*6hz1CAVz*N24Upp|BW zh8zS&#xZ8%7$7X4y)iLe*DSTX4;#+IsZRbw5_Pqel-R<*b*9wEm7dF}%vgQxI_WmT;$bzvMq;YhQ)P|n}} z@YFZj>0VP^O&dO|;jU91Lr$I1Q-O}e)i)44#Y=SY#;VhF)Y~PTgEv2U%9iS~wN-6Z z?XAtr!!>p8wzKy~eh{Kn+ILT-7DBBx;ZRFkL!F02mDw1!EL^odWhU`m2iv}TY967{ zZD_8kYVcsHlu)v(A%Vk%QBS$?x?H$U^|8Hrc@s8NySsXj!*9zLE2qU%k=3=fP-9*D z>gFa-6{SuUyq>o@5%*$Y30-}2xUs6Oy}qiZtvS5PjYQUyJF;_7WarBl9@NI@KGrl; zwYIi5G*{K)RFF#&#!2ktadPQ)H6-|>5uPe0=_;0o8`_svF@?f@SeD6}n2*TFi=mO; zrC2oXi6-?IIXsn))s@zV8tR}jt<4Sic8nXbtmk7?r}1GNW=apvN_y(H*-_Wng5zM= zT%)iu<5O1jQ`vGd?*vH<(0n;F2cl@E2iZc_5UMvq; zuQ=&#KM!oN*N7w&mqt?E7>b7#{^s!~$FF-akBoXO?Lvx`)Zv>wW;f;=IE34|rSGJZ zr3uX29KfAF&X9+`8O0`vIs7mjrvw&M$j2f)&RsZ%8_U&AmeU(qzxot~Ysderp=J)U zthL$S`#l&7bjiyVEMDnmpygpwAnL%e^p2A1h^7vZj!~7u;(W0|L20U zZerRf*HftdnA#O2(ku(T@+lV4{Fs6R~)Qiq5iEFxcb3#!Rp( zD!(v-xv#6No;KxhO0~vmFyj`8kv1OgjTfahl(Ew-=CBzwmGCkKA=Wb=xiqnlaHv+SmaramYYC}W5rNIWAEGY;ZN7n6~PCG6kg+hH!G zjRQq`L``$U^2R0`ZLYAKkB*@)e(mz669b3LhRGchwh72PuyzOGou7O8Ig;4kjT?;A z3_o-^VS$b1u-sc=mJY(QAoubL%OWWfYI6yrGIwYk3v+M77so*E1Sl*ee<1(` z3OX2HB1;7FT9-H4q#d5#tb6^RyACOZjugr*0qt`oX=h}Loj`ex&*u0`<;fBU^HHVz zrsWM-pE+0D%c?o_2$c3UHJ=&-Je>Fn6X8Wzpq>X@cf!nD>0%=rB{n?n=QIh1`h;Ht**$qIGO_;jXeR)hHug(CTdTMBvawhRDwpFo zb_iXVbYPUeGxf`tzH-8!maKjH-s9^ZtJ;}ixyksdYq`mTp`)#X*O&dZb@G8>c>BPz zztDM~UK87~>7$PJlmC?o!z**c(7P<_kKw@whT)!ut9~)(?%&)PKB4N{#j`RV@iDH? z2}5yi4*E3Zz%cyIo$p`x%-hCsi(i}Ya_JjOFUmy29hop3XK(UlF3UfEIb>01LDxIj zb{D^Y(p&p~{`kaQsY@^0x-`==s&Pk74W})mdYG5i@CCtL@7!_eq~D#qGj@E(H|x&K z)Z<;QhV5n4aYFY3ZYT`k&^vb7U^^eY&13}eIURPIS~2^~dcYiO5BMG)zCdh+ZS4;t zE6Vc;d#v(|=}0D0DSU&W#`$7058fBzn-RR^f_c#3l<}@lx_VRb;Vd~O8bKX02+EK_ z3Aee0Ro*uN^KfHL^>_a^;gf|0JK7aVfC|4m$1s&=v0JP6tFn8XfMe`TU zn=^0jy!M6j<{dNd*g_IQMjSGJ6qt|x;bS^_Uvwf_NO^)L*ekj^{)|u`2SddWUzF9A zAr94JuM#ZwROg9m3p#jEL#{xTph<(0?U<;*Xl*S!<9pH8!GD3zWjSCc@+NR>#fJL@ z3;i0iW6L1)pwix`zM#p2a?~_8=}^0nUlLR26fBA&mDd>rO&MI!64B|y;TTRP?^)5W=C4wTu|`_-rvwJeSbj} zS=YE-lBZUv1x;1O^;+G6g?O-b^DS7Yw(|)Ztunb5pam5vSRDMak&wG$1!DfpW- zjH12qT+m1bv6hzSIMg5x>VbfTcV@);`x<=21!K{|>miV!ND z6Qp5OFq{mU7o-?U^|UZZ!`0KGAQh>n0tHrr65gFPhSqwA?j&ekPcN(>w{FLo;rhcn0nd}q^atuJ4n;i z)9FDvTs`#!X}Wrf2k8hpl3VKw!eNz9$sne2^2rR+O!c%WNVC+_mLSbmPiI0{`E0ZL z>OdRsL4i1S^r!GmeZ==WLtvJmIpwa;ne%3a?61t&B4%?7kF6;|rRn8ofL7 z&=I;>4zE=K4N!pYfVNvOm*ol2PK-}F!N=qT=q{)CE?X0z@1PrgMkYY_U|dkv zB|!H&$a~F7fbMsCYul3mJ>WoXLlU4LU~tn&rdf~x?GgGkNq~Nsn;*n1mjYTyKSJ+) zHhSot-~oCR+;iED06m6Lj*Uiu9!I;m79c>cp`Uu}576(>f#@cA>J_8Rxbl#XGNQ)1EjX&hYdIJ>Jp71Hk^#Zu{If?i52q(7oDu0Gnl0o*TN?XF&DS{$VRp|^|ZPxOwb4jp_iq`!dN zKn&y4QM9j!-lg||G)5D-wgCYycUNi;An(%$Mf3=Lhzt@h-oI7p?B6P+zZKCp>BA!W z73Uf6;I8&sRpXyiiNeSJxQITXIRgK>2)1-psx4iWYD-ro&o3&iO-F^aAG5*$eFnve z^x^x3osi=pMmu*?Aj9YM1zO{1N5D*|wDj&N=;EL-L>}kOho+^YUMLD6Zx&aZdw@tW z$b|<A1sFz!Uzh1AT{=Am8C5$U8g)d53=>@9+-f9ln9Q!!wX~_yzI~uRz}66UaL}0(pl& zAn))7lxd57JXcUXOShs~FF zSbTYhy_a`bdwGYgmv>ltd54{scUXCOhmDtaSa{q6U@*KZTr08C69>IGobcnBduZ-V z@dKLAm!tV|3}24r%VNHqz?YNwQpJ}VzSQw$3132dIfXBcd}-#(seEbW%W}S~ z!B6@!Jfsff?gq_zK{bTpX*111TXShE&4V8@pDv>XbR`{4*P^x?=@`0&7SZi=EZs%N z(f3gM19Ut+L?_Ur@F@kIgUF1eJxVFrEtxrM4}E3k>^*eR%%k?urA}|SA4K>p6!0pd zQ{b^SpbY#ZRfBkuu<-z0kIkG_`n4a@l?LslZ{mMujHC`xMxA0FMMW)b5G$xlbVJMx z_IEXVixqq6Ss?PTM&yyb^ayLvtkNHQAZr2H>w&Zb@`MKx0puwUqyvy=Jdh|LKk-1i z0C~;>VR3uj1K9}3FFcT5Kwj`b5)Sd^VP=LEB@pin5D%d^N`ZJL$kq?yZ36K&gLqp& zya5pJOc3uZ5C%TK)|{I)VYrc(bR)moOTXeVVpi#Yc_1l3UiCow0r`ywvKf%ydLRRU zyzYUx2AM-(VhDUHr3-=nML_>zpnnO_zZB?y6-d58Zvx@BkSiZ=f8e1u?_?m2kH;7b zMC0VUaR*HPO~Dn>V9Ys)w&8aNeoU%I@%t%$ui(cuy@%hYQ1;>YO~4N;L1I3BRrq1) zORU8Y-((aw;CCl}I3XmS!0!e8UdIn7e#CyX8^CWoeuw8jM1OAFDem|Yy}K%Z5B(L- z+g#6AxSqH2bDql6?}Eo%@U<@ZsV;ck%m-=BZu)31{T(eFgSW-I=^uOPPk5W*d7JEc z8-cg}-Sp4B^lsx$`of(?AL6acs+0cUNqYrvc6;>fkLZ(Cd+1*PcE|#sK0_tW%T5|r z`tRLB>=wh&$c;$oeR#9GLF+wlZFoCNB90DIy(evv=WV9v z?O@N_NY~r!`@nl;;Pw-L`|K)6*VT}=>mfBaKvlLwa&E@;R!Glnw2SV91nq?Cd>CnWG=aTk3G zDf~=edL^C^LOd;oi5K7=z6`(bbx|zdf;YEMl!*7mSg~J>6aN+yjewYB6pKTQ@#0Wp zqL^kJE)F-26y?S|F$Xc~!2j!&t%pjlMDc&7S0b2MuXLThdS#_~^ooJDUdb0fy+VRZ zudFwvS6qm-WoW%(#Q(4KN*qguSWK6SljsU@GF=Ht-zMs4JHE_$hge3tL=!>|&GevX z#jL)K_KMS>F{|i#Xu&Ju%g~bb^p@zrw6hD^&`lqR9%w)>eJ;)r!$ndA#U?R9Y!;Km zSz@|4Ta=6Q#eA_6<-t0;xZ8y-wif{E2cTDbpjQt;uO5M3Jqo>g9D4Nx^y(St z)w9s6pFyvlhhDt^y?PaTHRAvEDowBcQ+p*!GV7JD(^s#oG>={}(AF#Y;-^D5gIeqv$=Ogg!9F(x=8a`W%ux+?XVS#vx*YaVRXuG%+2LU2c?% z`Nj;f&^Ss|85N=yQr>LL7h&TVvDR25))~i(jm8NgZd8dIjB0U{Q7`T^mWaEIQ^bQt zgVCXMr5cEvv;kZmKHy$HPw@$3%0RGj=@TK$$$ delta 8482 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 diff --git a/src/main/webapp/WEB-INF/reports/orderItems.jrxml b/src/main/webapp/WEB-INF/reports/orderItems.jrxml index 3c5a9067..bc277510 100644 --- a/src/main/webapp/WEB-INF/reports/orderItems.jrxml +++ b/src/main/webapp/WEB-INF/reports/orderItems.jrxml @@ -1,8 +1,11 @@ - - + + + + + @@ -36,12 +39,16 @@ - + + + - + + + @@ -78,7 +85,9 @@ - + + + @@ -107,14 +116,18 @@ - + + + - + + + @@ -160,7 +173,9 @@ - + + + @@ -176,30 +191,42 @@ - + + + - + + + - + + + - + + + - + + + - + + + diff --git a/src/main/webapp/app/reporting/order.zul b/src/main/webapp/app/reporting/order.zul new file mode 100644 index 00000000..cdc8e29c --- /dev/null +++ b/src/main/webapp/app/reporting/order.zul @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file