Merge branch 'master' into develop

This commit is contained in:
2024-03-13 15:14:02 +01:00

View File

@@ -2711,7 +2711,6 @@ public class PvmService {
" movi AS (SELECT dtb_doct.cod_mdep,\n" +
" dtb_docr.cod_anag,\n" +
" dtb_docr.cod_mart,\n" +
" dtb_docr.partita_mag,\n" +
" min(case when dtb_tipi.segno_qta_car > 0 THEN dtb_doct.data_doc ELSE null END) as data_doc,\n" +
" mtb_partita_mag.data_scad,\n" +
" SUM(dtb_tipi.segno_qta_car * dtb_docr.qta_doc) AS qta_car,\n" +
@@ -2732,7 +2731,6 @@ public class PvmService {
" GROUP BY dtb_doct.cod_mdep,\n" +
" dtb_docr.cod_anag,\n" +
" dtb_docr.cod_mart,\n" +
" dtb_docr.partita_mag,\n" +
" mtb_partita_mag.data_scad)\n" +
"SELECT colli.*, movi.qta_car, movi.data_scad as data_scad_acq, movi.suddivisione, mtb_aart.gg_scad_partita, movi.data_doc \n" +
"FROM colli\n" +