diff --git a/MP-MAG/Reports/CartellinoFinitiOdette.rdlc b/MP-MAG/Reports/CartellinoFinitiOdette.rdlc
index c9adcb7b..f1d0ef21 100644
--- a/MP-MAG/Reports/CartellinoFinitiOdette.rdlc
+++ b/MP-MAG/Reports/CartellinoFinitiOdette.rdlc
@@ -683,7 +683,7 @@
=Fields!Campo10_2.Value
@@ -691,12 +691,16 @@
- 6.8cm
+ 6.7cm
9.5cm
- 0.7cm
+ 0.8cm
9.4cm
23
+
+ Middle
0.5pt
0.5pt
0.5pt
@@ -1410,7 +1414,7 @@
1cm
- v 2.1.1
+ v 2.2.1
0
diff --git a/MP-MAG/Reports/CartellinoPedane.rdlc b/MP-MAG/Reports/CartellinoPedane.rdlc
index 674b8ffb..c457af13 100644
--- a/MP-MAG/Reports/CartellinoPedane.rdlc
+++ b/MP-MAG/Reports/CartellinoPedane.rdlc
@@ -6,12 +6,12 @@
- 20.9cm
+ 19cm
- 14.6cm
+ 12.8cm
@@ -23,10 +23,10 @@
- 2.09676cm
+ 1.78833cm
- 2.12642cm
+ 2cm
3.863cm
@@ -38,19 +38,19 @@
1.6474cm
- 2.36316cm
+ 1.77112cm
- 1.43261cm
+ 1.22094cm
- 1.47396cm
+ 1.20938cm
- 1.2cm
+ 1.49105cm
- 2.25833cm
+ 1.57041cm
@@ -167,7 +167,7 @@
- 1.16771cm
+ 1.15cm
@@ -309,7 +309,7 @@
- 2.9cm
+ 2.8cm
@@ -435,7 +435,7 @@
- 1.24741cm
+ 1cm
@@ -582,7 +582,6 @@
- true
true
@@ -625,12 +624,11 @@
- 2cm
+ 1.1cm
- true
true
@@ -673,12 +671,11 @@
- 2cm
+ 1.1cm
- true
true
@@ -721,7 +718,7 @@
- 1.5cm
+ 1.2cm
@@ -733,17 +730,10 @@
Numero colli
-
-
-
-
+
+
+
+
+
+ DescPack
+
+
+
+
+ 0.5pt
+
+ Middle
+ 5pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -937,11 +978,12 @@
true
+
stp_prt_CartellinoPedane
- 13.81512cm
- 20.9cm
+ 12.25cm
+ 18.99999cm
@@ -950,8 +992,8 @@
true
- 13.81512cm
- 20.9cm
+ 12.25cm
+ 19cm
@@ -964,7 +1006,7 @@
- cart.213x150 v301-powered by Steam
+ cart.A5 v401-powered by Steam
- 13.88568cm
- 11.126cm
- 0.21in
+ 12.28333cm
+ 9.72372cm
+ 0.2in
3.65208in
1
@@ -833,7 +833,7 @@
- cart.150x100 v301 - powered by Steam
+ cart.210x148 v402 - powered by Steam
-
+
- textbox2
+ Textbox178
+
- DimGray
2pt
2pt
2pt
@@ -89,31 +89,28 @@
-
+
true
true
- Descr.
+
- Textbox17
+ Textbox179
+
- DimGray
2pt
2pt
2pt
@@ -124,18 +121,255 @@
-
+
true
true
- Lordo
+
+
+
+
+
+
+
+ Textbox180
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox181
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox182
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox183
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox4
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox184
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox186
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.2in
+
+
+
+
+ true
+ true
+
+
+
+
+ Order
@@ -150,7 +384,7 @@
LightGrey
- DimGray
+ LightGrey
2pt
2pt
2pt
@@ -161,7 +395,573 @@
-
+
+ true
+ true
+
+
+
+
+ =Fields!ExtOrdCod.Value
+
+
+
+
+
+
+ ExtOrdCod
+
+
+ Gray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox6
+
+
+ LightGrey
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ 3
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Richiest.
+
+
+
+
+
+
+ Textbox15
+
+
+ LightGrey
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox5
+
+
+ LightGrey
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Prelev.
+
+
+
+
+
+
+ Textbox22
+
+
+ LightGrey
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Caricato
+
+
+
+
+
+
+ Textbox28
+
+
+ LightGrey
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.22in
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!CodArt.Value + " - " + Fields!DescrArt.Value
+
+
+
+
+
+
+ CodArt1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ 5
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!QtyOrd.Value)
+
+
+
+
+
+
+ QtyOrd
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox7
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!Qta.Value)
+
+
+
+
+
+
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum( IIf( Fields!StatusAL.Value = 2, Fields!Qta.Value, CDec(0) ) )
+
+' messo CDec perchè mi dava errore
+
+
+
+
+
+
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.22in
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!OrdDescr.Value
+
+
+
+
+
+
+ OrdDescr
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ 9
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.2in
+
+
+
+
+ true
+ true
+
+
+
+
+ Pedana
+
+
+
+
+
+
+ textbox2
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Descr.
+
+
+
+
+
+
+ Textbox17
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Lordo
+
+
+
+
+
+
+ textbox3
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
true
true
@@ -172,7 +972,6 @@
@@ -187,7 +986,7 @@
LightGrey
- DimGray
+ WhiteSmoke
2pt
2pt
2pt
@@ -198,7 +997,7 @@
-
+
true
true
@@ -209,7 +1008,6 @@
@@ -224,7 +1022,7 @@
LightGrey
- DimGray
+ WhiteSmoke
2pt
2pt
2pt
@@ -235,7 +1033,7 @@
-
+
true
true
@@ -246,7 +1044,6 @@
@@ -259,7 +1056,7 @@
LightGrey
- DimGray
+ WhiteSmoke
2pt
2pt
2pt
@@ -270,44 +1067,7 @@
-
- true
- true
-
-
-
-
- Articolo
-
-
-
-
-
-
- textbox6
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
+
true
true
@@ -318,7 +1078,6 @@
@@ -331,7 +1090,7 @@
LightGrey
- DimGray
+ WhiteSmoke
2pt
2pt
2pt
@@ -342,18 +1101,53 @@
-
+
true
true
- Qta
+ Prelev.
+
+
+
+
+
+
+ Textbox169
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Caricato
@@ -362,13 +1156,13 @@
- textbox8
+ Textbox197
- DimGray
+ WhiteSmoke
2pt
2pt
2pt
@@ -386,7 +1180,6 @@
true
- stp_prt_ReportPackList
true
@@ -408,7 +1201,6 @@
LightGrey
- WhiteSmoke
2pt
2pt
2pt
@@ -442,7 +1234,6 @@
LightGrey
- WhiteSmoke
2pt
2pt
2pt
@@ -478,7 +1269,6 @@
LightGrey
- WhiteSmoke
Middle
2pt
2pt
@@ -515,7 +1305,6 @@
LightGrey
- WhiteSmoke
Middle
2pt
2pt
@@ -552,7 +1341,6 @@
LightGrey
- WhiteSmoke
Middle
2pt
2pt
@@ -587,7 +1375,6 @@
LightGrey
- WhiteSmoke
2pt
2pt
2pt
@@ -598,43 +1385,7 @@
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox27
-
-
- WhiteSmoke
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
+
true
true
@@ -658,7 +1409,40 @@
LightGrey
- WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!Qta.Value)
+
+
+
+
+
+
+
+
2pt
2pt
2pt
@@ -676,12 +1460,12 @@
- =Sum(Fields!Qta.Value)
+ =Sum( iif( Fields!StatusAL.Value = 2, Fields!Qta.Value, 0 ) )
@@ -693,7 +1477,6 @@
LightGrey
- WhiteSmoke
2pt
2pt
2pt
@@ -913,42 +1696,7 @@
-
- true
- true
-
-
-
-
- =Fields!CodArt.Value
-
-
-
-
-
-
- CodArt
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
+
true
true
@@ -981,7 +1729,7 @@
-
+
true
true
@@ -992,7 +1740,40 @@
+
+
+
+
+
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum( iif( Fields!StatusAL.Value = 2, Fields!Qta.Value, 0 ) )
+
@@ -1015,7 +1796,7 @@
- 0.15748in
+ 0.18873in
@@ -1223,7 +2004,7 @@
-
+
true
true
@@ -1237,12 +2018,10 @@
-
+
- Textbox59
+ Textbox29
-
+
UDC
@@ -1302,11 +2083,13 @@
-
+
Qta
@@ -1326,7 +2109,7 @@
- 0.19685in
+ 0.2in
@@ -1337,7 +2120,7 @@
-
+ Totali Packing
+ 2
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox21
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
+
@@ -1506,60 +2257,27 @@
-
+
true
true
- Tot. Packing
-
-
-
-
-
-
- textbox9
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
+ =Sum(Fields!QtyOrd.Value)
- Textbox76
+ QtyOrd1
+
+
+
+
+
+ Textbox76
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =SUM( iif( Fields!StatusAL.Value = 2, Fields!Qta.Value, CDec(0) ) )
+
@@ -1663,34 +2418,38 @@
- After
- true
-
-
-
+
- =Fields!AL.Value
+ =Fields!ExtOrdCod.Value
- =Fields!AL.Value
+ =Fields!ExtOrdCod.Value
After
- true
-
+ After
+
+
+ After
+
+
+ After
+
+
+
- =Fields!Lotto.Value
+ =Fields!AL.Value
- =Fields!Lotto.Value
+ =Fields!AL.Value
@@ -1698,37 +2457,62 @@
After
-
- Detail
+ After
+ true
+
+
+
+
+ =Fields!Lotto.Value
+
+
+
+ =Fields!Lotto.Value
+
+
-
+
+
+ =Fields!Qta.Value = nothing
+
+ After
+
+
+
+ Detail
+
+
+
+
+
+ =Fields!UDC.Value = nothing
+
+ Detail_Collection
+ Output
+ true
+
-
- true
-
- Detail_Collection
- Output
true
+
+ = Count(Fields!UDC.Value) = 0
+
true
- true
-
-
- Before
+
true
true
- stp_prt_ReportPackList
- 1.62625in
- 0.3175cm
- 0.94488in
- 7.15626in
+ stp_prt_ReportPackListFull
+ 1.83458in
+ 0.3401cm
+ 1.85243in
+ 7.15093in
@@ -1834,6 +2618,22 @@
DimGray
+
+ -
+
+
+
+ =Fields!DescStatusPack.Value
+
+
+
+
+
+ true
+
+
+
+
+ Numero Pedane :
+
+
+
+ =CountDistinct(Fields!AL.Value)
+
+
+
+
+
+
+ AL1
+ 0.16948cm
+ 0.30371cm
+ 0.6cm
+ 5.94046cm
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+
+
+
+
+ Completate :
+
+
+
+ =CountDistinct( iif( Fields!StatusAL.Value > 0, Fields!AL.Value, Nothing ) )
+
+' conto Pedane completate
+
+
+
+
+
+
+ AL1
+ 0.16948cm
+ 6.92755cm
+ 0.6cm
+ 5.04cm
+ 1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+
+
+
+
+ Caricate :
+
+
+
+ =CountDistinct( iif( Fields!StatusAL.Value > 1, Fields!AL.Value, Nothing ) )
+
+' Pedane caricate
+
+
+
+
+
+
+ AL1
+ 0.16948cm
+ 12.48835cm
+ 0.6cm
+ 5.26903cm
+ 2
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ 3.5974cm
+ 0.3401cm
+ 0.9566cm
+ 18.15427cm
+ 2
+
+
+
+
true
List1
@@ -1978,9 +2920,9 @@
true
true
true
- stp_prt_ReportPackList
- 2.62375in
- 7.29166in
+ stp_prt_ReportPackListFull
+ 3.68701in
+ 7.29016in
- 6.75937cm
+ 9.47506cm