root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 1168

Browse Source 
Files correlati     : fp0700.cpp , fp0700a.rep , fplib01.cpp
Commento:
Aggiornato reportino di stampa fp0700a.rep: aggiunto prefisso al numero documento cliente.
This commit is contained in:
smen 2022-06-07 18:08:08 +02:00
parent 0b311dfe1f
commit ad5871432b
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/fp/fp0700.cpp
View File

@ -485,15 +485,6 @@ void TPAR_mask::export_paf()
if (!yesno_box(msg)) if (!yesno_box(msg))
break; break;
} }
if (diagn)
{
TProgram_report mov_rep;
mov_rep.load("fp0700a");
mov_rep.recordset()->set_var("#NUM", nreg);
book.add(mov_rep);
}
} }
} }
@ -508,7 +499,9 @@ void TPAR_mask::export_paf()
} }
elab.show_log(); elab.show_log();
if (diagn) if (diagn)
book.preview(); {
print_reg();
}
} }
} }
@ -532,13 +525,27 @@ void TPAR_mask::print_reg()
{ {
const long nreg = sht.get_long_row_cell(r, S_NUMREG); const long nreg = sht.get_long_row_cell(r, S_NUMREG);
TProgram_report mov_rep("fp0700a"); TProgram_report mov_rep("fp0700a");
TISAM_recordset * recset = (TISAM_recordset *)mov_rep.recordset(); TISAM_recordset * recset = (TISAM_recordset *)mov_rep.recordset();
const TRectype & mov = cache().get(LF_MOV, nreg);
recset->set_var("#NUM", nreg, true); recset->set_var("#NUM", nreg, true);
recset->set_var("#TIPODOCSDI", tipo_doc_sdi, true); recset->set_var("#TIPODOCSDI", tipo_doc_sdi, true);
//const TString n = "ACABBONE"; const TCausale & caus = cached_causale(mov.get(MOV_CODCAUS), mov.get_int(MOV_ANNOES));
//recset->set_var("#NUMPREFIX", n, true);
const TString & prefix = caus.reg().prefisso();
if (prefix.full())
{
TString num_prefix;
num_prefix.insert("/");
num_prefix.insert(prefix);
recset->set_var("#NUMPREFIX", num_prefix, true);
}
else
{
recset->set_var("#NUMPREFIX", EMPTY_STRING, true);
}
book.add(mov_rep); book.add(mov_rep);
} }
} }

2
src/fp/fp0700a.rep
View File

@ -55,7 +55,7 @@
<source>"Registro " + 23.REG</source> <source>"Registro " + 23.REG</source>
</field> </field>
<field x="60" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="26" codval="" id="" pattern="1" hide_zero="" text=""> <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 cliente n. " + 23.NUMDOC</source> <source>"Documento cliente n. " + #NUMPREFIX + 23.NUMDOC</source>
</field> </field>
<field x="86" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text=""> <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> <source>"del " + 23.DATADOC</source>

2
src/fp/fplib01.cpp
View File

@ -3469,7 +3469,7 @@ bool TReg_fp::reg_to_paf(const TMovimento_contabile& mov)
{ {
numdoc.insert("/"); numdoc.insert("/");
numdoc.insert(prefisso); numdoc.insert(prefisso);
//set(MOV_NUMDOC, numdoc);
} }
paf0700f.set("P7_NUMERO", numdoc); paf0700f.set("P7_NUMERO", numdoc);
paf0700f.set("P7_GESTIONE", stato_paf()); paf0700f.set("P7_GESTIONE", stato_paf());