diff --git a/src/ps/Dinamica/CUSTOM/orf_datacons.rep b/src/ps/Dinamica/CUSTOM/orf_datacons.rep
index a9c605869..e1af10741 100644
--- a/src/ps/Dinamica/CUSTOM/orf_datacons.rep
+++ b/src/ps/Dinamica/CUSTOM/orf_datacons.rep
@@ -50,127 +50,115 @@
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="" hidden="" page_break="" can_break="" pattern="1" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="1" hidden="" page_break="" can_break="" pattern="1">
-  <field x="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="2" hide_zero="" text="">
-   <font face="Arial" bold="1" size="8" />
-   <source>33.TIPODOC</source>
+  <field deactivated="" type="Stringa" hidden="1" link="" dynamic_height="" shade_offset="" width="2" codval="" id="101" pattern="1" hide_zero="" text="">
+   <source>PROVV</source>
   </field>
-  <field x="5" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="2" hide_zero="" text="">
-   <font face="Arial" bold="1" size="8" />
+  <field x="2.5" deactivated="" type="Numero" hidden="1" align="right" link="" dynamic_height="" shade_offset="" width="4" codval="" id="102" pattern="1" hide_zero="" text="">
+   <source>ANNO</source>
+  </field>
+  <field x="7" deactivated="" type="Stringa" hidden="1" link="" dynamic_height="" shade_offset="" width="4" codval="" id="103" pattern="1" hide_zero="" text="">
+   <source>CODNUM</source>
+  </field>
+  <field x="12" deactivated="" type="Numero" hidden="1" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="104" pattern="1" hide_zero="" text="">
    <source>NDOC</source>
   </field>
-  <field x="11.07" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="2" hide_zero="" text="">
-   <source>33.DATADOC</source>
-  </field>
-  <field x="19.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="2" codval="" id="" pattern="2" hide_zero="" text="">
-   <source>TIPORIGA</source>
-  </field>
-  <field x="22" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="2" hide_zero="" text="">
-   <source>RDOC.CODART</source>
-  </field>
-  <field x="30" deactivated="" type="Stringa" hidden="" link="" dynamic_height="1" shade_offset="" width="33" codval="" height="8" id="" pattern="2" hide_zero="" text="">
-   <font face="Arial Narrow" size="8" />
-   <prescript description="B1.0 PRESCRIPT">MESSAGE_DESCRIGA</prescript>
-  </field>
-  <field x="39.5" deactivated="1" type="Prezzo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="2" hide_zero="" text="#########,@@">
-   <source>34.QTAGG1</source>
-  </field>
-  <field x="64" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="2.5" codval="" id="" pattern="2" hide_zero="" text="">
-   <source>RDOC.UMQTA</source>
-  </field>
-  <field x="66.5" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="100" pattern="2" hide_zero="" text="">
-   <source>RDOC.QTA</source>
-   <postscript description="B1.100 POSTSCRIPT">MESSAGE ADD,F4.100
-MESSAGE ADD,F3.100</postscript>
-  </field>
-  <field x="30.5" deactivated="1" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="110" pattern="2" hide_zero="" text="">
-   <source>RDOC.QTAEVASA</source>
-   <postscript description="B1.110 POSTSCRIPT">MESSAGE ADD,F4.110
-MESSAGE ADD,F3.110</postscript>
-  </field>
-  <field x="51.5" deactivated="1" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="120" pattern="2" hide_zero="" text="">
-   <prescript description="B1.120 PRESCRIPT">#100 @
-#110 @
--
-#THIS !</prescript>
-   <postscript description="B1.120 POSTSCRIPT">MESSAGE ADD,F4.120
-MESSAGE ADD,F3.120</postscript>
-  </field>
-  <field x="60.5" y="1.25" deactivated="1" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="121" pattern="2" hide_zero="" text="">
-   <prescript description="B1.121 PRESCRIPT">#101 @
-#111 @
--
-#THIS !</prescript>
-   <postscript description="B1.121 POSTSCRIPT">MESSAGE ADD,F4.120
-MESSAGE ADD,F3.120</postscript>
-  </field>
-  <field x="75.5" deactivated="" type="Prezzo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="150" pattern="2" hide_zero="" text="#########,@@">
-   <source>34.PREZZO</source>
-  </field>
-  <field x="86" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="198" pattern="2" hide_zero="" text="###.###.###,@@">
-   <source>34.IMPNS</source>
-   <prescript description="B1.198 PRESCRIPT">MESSAGE ADD,F3.198</prescript>
-  </field>
-  <field x="96.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="33.CODVAL" id="199" pattern="2" hide_zero="" text="###.###.###,@@">
-   <source>34.IMPOSTA</source>
-   <prescript description="B1.199 PRESCRIPT">MESSAGE ADD,F3.199</prescript>
-  </field>
-  <field x="107" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="200" pattern="2" hide_zero="" text="###.###.###,@@">
-   <source>IF(34.TIPORIGA='04',#198+#199,34.IMPLS)
-</source>
-   <prescript description="B1.200 PRESCRIPT">MESSAGE ADD,F3.200</prescript>
-  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="11" hidden="" page_break="" can_break="" pattern="1" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="11" hidden="" page_break="" can_break="" pattern="1">
-  <sql>USE 34 KEY 4
-SELECT TIPORIGA!='05'
-JOIN DOC INTO PROVV=PROVV ANNO=ANNO CODNUM=CODNUM NDOC=NDOC
-FROM DAPROVV=#PARENT.PROVV DAANNO=#PARENT.ANNO DACODNUM=#PARENT.CODNUM DANDOC=#PARENT.NDOC
-TO DAPROVV=#PARENT.PROVV DAANNO=#PARENT.ANNO DACODNUM=#PARENT.CODNUM DANDOC=#PARENT.NDOC
-</sql>
-  <field x="22" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="9" codval="" id="" pattern="2" hide_zero="" text="">
-   <source>CODNUM+' \ '+NDOC</source>
+  <sql>USE 34 SELECT TIPORIGA!='05'
+FROM PROVV=#101 ANNO=#102 CODNUM=#103 NDOC=#104
+TO PROVV=#101 ANNO=#102 CODNUM=#103 NDOC=#104</sql>
+  <field x="30.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="1" shade_offset="" width="33" codval="" height="8" id="" pattern="2" hide_zero="" text="">
+   <font face="Arial Narrow" size="8" />
+   <prescript description="">MESSAGE_DESCRIGA</prescript>
   </field>
-  <field x="31.07" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="2" hide_zero="" text="">
-   <source>DOC.DATADOC</source>
-  </field>
-  <field x="39.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="" pattern="2" hide_zero="" text="Reg. CG:">
+  <field x="1" y="0.25" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="2" hide_zero="" text="">
    <font face="Arial" bold="1" size="8" />
+   <source>33.TIPODOC</source>
   </field>
-  <field x="45.5" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="7" codval="" id="" pattern="2" hide_zero="" text="">
+  <field x="5" y="0.25" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="2" hide_zero="" text="">
    <font face="Arial" bold="1" size="8" />
-   <source>DOC.NUMREG</source>
+   <source>NDOC</source>
   </field>
-  <field x="53.46" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="6.5" codval="" id="" pattern="2" hide_zero="" text="Reg. CA:">
-   <font face="Arial" bold="1" size="8" />
+  <field x="11.07" y="0.25" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="2" hide_zero="" text="">
+   <source>33.DATADOC</source>
   </field>
-  <field x="59.5" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="7" codval="" id="" pattern="2" hide_zero="" text="">
-   <font face="Arial" bold="1" size="8" />
-   <source>33.NUMREGCA</source>
+  <field x="19.5" y="0.25" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="2" codval="" id="" pattern="2" hide_zero="" text="">
+   <source>TIPORIGA</source>
   </field>
-  <field x="66.5" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="" pattern="2" hide_zero="" text="">
-   <source>QTA</source>
+  <field x="22" y="0.25" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="2" hide_zero="" text="">
+   <source>RDOC.CODART</source>
   </field>
-  <field x="75.5" deactivated="" type="Prezzo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="2" hide_zero="" text="#########,@@">
+  <field x="39.5" y="0.25" deactivated="1" type="Prezzo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="2" hide_zero="" text="#########,@@">
+   <source>34.QTAGG1</source>
+  </field>
+  <field x="64" y="0.25" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="2.5" codval="" id="" pattern="2" hide_zero="" text="">
+   <source>RDOC.UMQTA</source>
+  </field>
+  <field x="66.5" y="0.25" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="100" pattern="2" hide_zero="" text="">
+   <source>RDOC.QTA</source>
+   <postscript description="">MESSAGE ADD,F4.100
+MESSAGE ADD,F3.100</postscript>
+  </field>
+  <field x="1" y="2" deactivated="" type="Stringa" hidden="1" link="" dynamic_height="" shade_offset="" width="2" codval="" id="101" pattern="1" hide_zero="" text="">
+   <source>RDOC.PROVV</source>
+  </field>
+  <field x="3.5" y="2" deactivated="" type="Numero" hidden="1" align="right" link="" dynamic_height="" shade_offset="" width="4" codval="" id="102" pattern="1" hide_zero="" text="">
+   <source>RDOC.ANNO</source>
+  </field>
+  <field x="8" y="2" deactivated="" type="Stringa" hidden="1" link="" dynamic_height="" shade_offset="" width="4" codval="" id="103" pattern="1" hide_zero="" text="">
+   <source>RDOC.CODNUM</source>
+  </field>
+  <field x="13" y="2" deactivated="" type="Numero" hidden="1" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="104" pattern="1" hide_zero="" text="">
+   <source>RDOC.NDOC</source>
+  </field>
+  <field x="20" y="2" deactivated="" type="Numero" hidden="1" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="105" pattern="1" hide_zero="" text="">
+   <source>RDOC.IDRIGA</source>
+  </field>
+  <field x="30.5" y="0.25" deactivated="1" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="110" pattern="2" hide_zero="" text="">
+   <source>RDOC.QTAEVASA</source>
+   <postscript description="">MESSAGE ADD,F4.110
+MESSAGE ADD,F3.110</postscript>
+  </field>
+  <field x="51.5" y="0.25" deactivated="1" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="120" pattern="2" hide_zero="" text="">
+   <prescript description="">#100 @
+#110 @
+-
+#THIS !</prescript>
+   <postscript description="">MESSAGE ADD,F4.120
+MESSAGE ADD,F3.120</postscript>
+  </field>
+  <field x="60.5" y="1.5" deactivated="1" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="8.5" codval="" id="121" pattern="2" hide_zero="" text="">
+   <prescript description="">#101 @
+#111 @
+-
+#THIS !</prescript>
+   <postscript description="">MESSAGE ADD,F4.120
+MESSAGE ADD,F3.120</postscript>
+  </field>
+  <field x="75.5" y="0.25" deactivated="" type="Prezzo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="150" pattern="2" hide_zero="" text="#########,@@">
    <source>34.PREZZO</source>
   </field>
-  <field x="86" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="2" hide_zero="" text="###.###.###,@@">
+  <field x="86" y="0.25" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="198" pattern="2" hide_zero="" text="###.###.###,@@">
    <source>34.IMPNS</source>
+   <prescript description="">MESSAGE ADD,F3.198</prescript>
   </field>
-  <field x="96.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="2" hide_zero="" text="###.###.###,@@">
+  <field x="96.5" y="0.25" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="199" pattern="2" hide_zero="" text="###.###.###,@@">
    <source>34.IMPOSTA</source>
+   <prescript description="">MESSAGE ADD,F3.199</prescript>
   </field>
-  <field x="107" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="2" hide_zero="" text="###.###.###,@@">
-   <source>34.IMPLS</source>
+  <field x="107" y="0.25" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="10" codval="" id="200" pattern="2" hide_zero="" text="###.###.###,@@">
+   <source>IF(34.TIPORIGA='04',#198+#199,34.IMPLS)
+</source>
+   <prescript description="">MESSAGE ADD,F3.200</prescript>
   </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="111" hidden="" page_break="" can_break="" pattern="1" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="111" hidden="" page_break="" can_break="" pattern="1">
   <sql>USE 34 KEY 4
 JOIN DOC INTO PROVV=PROVV ANNO=ANNO CODNUM=CODNUM NDOC=NDOC
-FROM DAPROVV=#PARENT.PROVV DAANNO=#PARENT.ANNO DACODNUM=#PARENT.CODNUM DANDOC=#PARENT.NDOC DAIDRIGA=#PARENT.IDRIGA
-TO DAPROVV=#PARENT.PROVV DAANNO=#PARENT.ANNO DACODNUM=#PARENT.CODNUM DANDOC=#PARENT.NDOC DAIDRIGA=#PARENT.IDRIGA
-</sql>
+FROM DAPROVV=#101 DAANNO=#102 DACODNUM=#103 DANDOC=#104 DAIDRIGA=#105
+TO DAPROVV=#101 DAANNO=#102 DACODNUM=#103 DANDOC=#104 DAIDRIGA=#105</sql>
   <field x="22" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="9" codval="" id="" pattern="2" hide_zero="" text="">
    <source>CODNUM+' \ '+NDOC</source>
   </field>