Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml =================================================================== diff -u -r29996 -r30112 --- ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml (.../monthReportBranche.jrxml) (revision 29996) +++ ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml (.../monthReportBranche.jrxml) (revision 30112) @@ -337,8 +337,8 @@ - 0)?$V{amountMeasure}:$V{moneyMeasure}]]> - 0)?"###0":$P{amountFormatParam}]]> + + @@ -360,8 +360,8 @@ - 0)?$V{amountMeasure}/2:$V{moneyMeasure}/2]]> - 0)?"###0":$P{amountFormatParam}]]> + + Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml =================================================================== diff -u -r29890 -r30112 --- ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml (.../monthReportGroupByDisposableGoodsType.jrxml) (revision 29890) +++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml (.../monthReportGroupByDisposableGoodsType.jrxml) (revision 30112) @@ -241,8 +241,8 @@ - 0)?($V{amountMeasure}-$V{sumOfDisAmountMeasure}):($V{moneyMeasure}-$V{sumOfDgsMeasure})]]> - 0)?"###0":$P{amountFormatParam}]]> + + Index: ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jasper =================================================================== diff -u -r29890 -r30112 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jasper =================================================================== diff -u -r29890 -r30112 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml =================================================================== diff -u -r29890 -r30112 --- ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml (.../monthReport.jrxml) (revision 29890) +++ ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml (.../monthReport.jrxml) (revision 30112) @@ -278,8 +278,8 @@ - 0)?$V{amountMeasure}:$V{moneyMeasure}]]> - 0)?"###0":$P{amountFormatParam}]]> + + @@ -293,8 +293,8 @@ - 0)?$V{amountMeasure}:$V{moneyMeasure}]]> - 0)?"###0":$P{amountFormatParam}]]> + + Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper =================================================================== diff -u -r29890 -r30112 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper =================================================================== diff -u -r29996 -r30112 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReport.jasper =================================================================== diff -u -r29890 -r30112 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml =================================================================== diff -u -r29890 -r30112 --- ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml (.../monthReportGroupBySterilizationMode.jrxml) (revision 29890) +++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml (.../monthReportGroupBySterilizationMode.jrxml) (revision 30112) @@ -278,8 +278,8 @@ - 0)?$V{amountMeasure}:$V{moneyMeasure}]]> - 0)?"###0":$P{amountFormatParam}]]> + + @@ -293,8 +293,8 @@ - 0)?$V{amountMeasure}:$V{moneyMeasure}]]> - 0)?"###0":$P{amountFormatParam}]]> + + Index: ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml =================================================================== diff -u -r29890 -r30112 --- ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml (.../monthIntegralReport.jrxml) (revision 29890) +++ ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml (.../monthIntegralReport.jrxml) (revision 30112) @@ -332,8 +332,8 @@ - 0)?$V{amountMeasure}:$V{moneyMeasure}]]> - 0)?"###0":$P{amountFormatParam}]]> + + @@ -347,8 +347,8 @@ - 0)?$V{amountMeasure}:$V{moneyMeasure}]]> - 0)?"###0":$P{amountFormatParam}]]> + +