diff --git a/src/cg/cgtbreg.uml b/src/cg/cgtbreg.uml
index 22b980f38..0df272077 100755
--- a/src/cg/cgtbreg.uml
+++ b/src/cg/cgtbreg.uml
@@ -455,10 +455,9 @@ END
 
 STRING F_PREFISSO 2
 BEGIN
-  PROMPT 48 11 "Prefisso "
+  PROMPT 48 13 "Prefisso "
   FIELD S5
   FLAGS "U"
-  GROUP GRP_VENDITE GRP_ACQUISTI GRP_RIEPIVA
 END
 
 CURRENCY F_PROG_AVERE 18
diff --git a/src/fp/fp0700a.rep b/src/fp/fp0700a.rep
index 5b12d8252..36d5f6624 100644
--- a/src/fp/fp0700a.rep
+++ b/src/fp/fp0700a.rep
@@ -17,62 +17,68 @@
   <field x="29" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"del " + 23.DATAREG</source>
   </field>
-  <field x="60" y="3" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="30" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="60" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="35" codval="" id="" pattern="1" hide_zero="" text="">
+   <source>"Doc. originale fornitore n. " + 23.IDDOCSDI</source>
+  </field>
+  <field x="86" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
+   <source>"del " + 23.DATADOCSDI</source>
+  </field>
+  <field x="60" y="4" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="30" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"Partita IVA " + 20.STATOPAIV + 20.PAIV</source>
   </field>
-  <field x="3" y="4" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="3" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"Data Ricezione " + 100@.DATAREG</source>
   </field>
-  <field x="60" y="4" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="60" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
    <source>20.RAGSOC</source>
   </field>
-  <field x="3" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="3" y="6" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"Tipo Documento " +  CAUS.TIPODOCSDI</source>
    <alt_source>#TIPODOCSDI</alt_source>
   </field>
-  <field x="60" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="60" y="6" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
    <source>20.INDCF + " n. " + 20.CIVCF</source>
   </field>
-  <field x="60" y="6" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="60" y="7" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="">
    <source>20.CAPCF</source>
   </field>
-  <field x="67" y="6" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="40" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="67" y="7" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="40" codval="" id="" pattern="1" hide_zero="" text="">
    <source>13.DENCOM + " " + 13.PROVCOM</source>
   </field>
-  <field x="3" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="3" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"Protocollo IVA debito  n. " + 23.PROTIVA</source>
   </field>
-  <field x="28" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="28" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"del " + 23.DATAREG</source>
   </field>
-  <field x="43" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="43" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"Registro " + 23.REG</source>
   </field>
-  <field x="60" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="26" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>"Documento cliente    n. " + 23.PROTIVA</source>
-  </field>
-  <field x="86" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>"del " + 23.DATADOC</source>
-  </field>
-  <field x="3" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>"Protocollo IVA credito n. " + 100@.PROTIVA</source>
-  </field>
-  <field x="28" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>"del " + 100@.DATAREG</source>
-  </field>
-  <field x="43" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>"Registro " +100@.REG</source>
-  </field>
   <field x="60" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="26" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>"Documento fornitore n. " + 100@.NUMDOC </source>
+   <source>"Documento cliente    n. " + 23.NUMDOC</source>
   </field>
   <field x="86" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
+   <source>"del " + 23.DATADOC</source>
+  </field>
+  <field x="3" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
+   <source>"Protocollo IVA credito n. " + 100@.PROTIVA</source>
+  </field>
+  <field x="28" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
+   <source>"del " + 100@.DATAREG</source>
+  </field>
+  <field x="43" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
+   <source>"Registro " +100@.REG</source>
+  </field>
+  <field x="60" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="26" codval="" id="" pattern="1" hide_zero="" text="">
+   <source>"Documento fornitore n. " + 100@.NUMDOC </source>
+  </field>
+  <field x="86" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
    <source>"del " + 100@.DATADOC</source>
   </field>
-  <field x="3" y="11" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="" text="Totale Documento">
+  <field x="3" y="12" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="" text="Totale Documento">
    <font face="Arial" bold="1" size="8" />
   </field>
-  <field x="16" y="11" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="1" text="###.###.###,@@">
+  <field x="16" y="12" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="1" text="###.###.###,@@">
    <source>23.TOTDOC</source>
   </field>
   <field x="17" y="14" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale">
diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp
index e78ce2a4b..1311e9582 100644
--- a/src/fp/fplib01.cpp
+++ b/src/fp/fplib01.cpp
@@ -3451,7 +3451,7 @@ bool TReg_fp::reg_to_paf(const TMovimento_contabile& mov)
 	paf0700f.set("P7_TIPODOC", _tipo_doc_sdi);
 	paf0700f.set("P7_DIVISA", "EUR"); // Fisso su euro in quanto effettuiamo il cambio
 	paf0700f.set("P7_DATA", mov.get_date(MOV_DATAREG)); // sembra sempre la data di registrazione visto che è na data di ricezione
-	TString numdoc = mov.get(MOV_NUMDOCEXT);
+	TString numdoc = mov.get(MOV_NUMDOC);
 
 	if (numdoc.blank())
 		numdoc = mov.get(MOV_PROTIVA);