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

Patch level : 12.0 1166

Browse Source 
Files correlati     : cg2.exe fp0.exe
Commento:
Aggiunto il prefisso da registro per i tipi documento da TD16 a TD19 in prima nota stampa registri e invio regolarizzazioni.
This commit is contained in:
smen 2022-06-07 15:09:51 +02:00
parent 8f090f36a1
commit 0b311dfe1f
6 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cg/cg2100.cpp
View File

@ -684,7 +684,6 @@ void TPrimanota_application::init_mask(TMask& m)
m.show(F_ADJUST_IVA, _quadratura);
const TDate dr = m.get(F_DATAREG);
m.show(F_IVAXCASSA, gestione_IVAxCassa(dr));
m.show(F_REVCHARGE, cc.iva() == iva_acquisti && cc.reverse_charge_pubb());
m.show(F_MOVCOLL, (cc.iva() == iva_acquisti && cc.reverse_charge_pubb()) ||

4
src/cg/cg2102.cpp
View File

@ -2330,7 +2330,7 @@ bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
const TString & prefisso = c.reg().prefisso();
if (c.is_reg_autof() && prefisso.full())
if (prefisso.full())
{
m.show(F_PREFISSO);
m.show(F_SLASH);
@ -2366,7 +2366,7 @@ bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
{
const TString & prefisso = c.reg().prefisso();
if (c.is_reg_autof() && prefisso.full())
if (prefisso.full())
{
m.show(F_PREFISSO);
m.show(F_SLASH);

2
src/cg/cglib01.cpp
View File

@ -258,7 +258,7 @@ const bool TCausale::is_reg_autof() const
{
const TString & tipodoc = tipodocsdi();
ok &= (tipodoc <= "TD16") && (tipodoc <= "TD19");
ok &= (tipodoc <= "TD17") && (tipodoc <= "TD19") ;
}
return ok;
}

23
src/fp/fp0700.cpp
View File

@ -204,8 +204,10 @@ void TPAR_mask::fill()
const TRectype& mov = rec.cursor()->curr();
const TCli_for & cli = cached_clifor(mov.get_char(MOV_TIPO), mov.get_long(MOV_CODCF));
bool sent = false;
const TCausale& caus = cached_causale(rec.get_string(MOV_CODCAUS), rec.get_int(MOV_ANNOES));
const TCausale& caus = cached_causale(mov);
const TString& tipodocsdi = caus.tipodocsdi();
const TString & prefisso = caus.reg().prefisso();
if (chiave_paf_mov(mov, tipodocsdi, hfatt, bfatt))
{
@ -219,14 +221,26 @@ void TPAR_mask::fill()
else if (filter_selected.not_empty())
continue;
}
int r = regs.set_row_cell(S_SELECTED, sent);
regs.set_row_cell(S_ANNO, rec.get_int(MOV_ANNOES), r);
regs.set_row_cell(S_NUMREG, rec.get_string(MOV_NUMREG), r);
regs.set_row_cell(S_DATAREG, rec.get_date(MOV_DATAREG), r);
regs.set_row_cell(S_TIPODOC,tipodocsdi, r);
regs.set_row_cell(S_NUMDOC, rec.get_string(MOV_NUMDOC), r);
if (prefisso.empty())
{
regs.set_row_cell(S_NUMDOC, rec.get_string(MOV_NUMDOC), r);
}
else
{
const TString & numdoc = rec.get_string(MOV_NUMDOC);
TString prefix_numdoc = prefisso;
prefix_numdoc << "/" << numdoc;
regs.set_row_cell(S_NUMDOC, prefix_numdoc, r);
}
regs.set_row_cell(S_DATADOC, rec.get_date(MOV_DATADOC), r);
regs.set_row_cell(S_CLIENTE, rec.get_long(MOV_CODCF), r);
regs.set_row_cell(S_RAGSOC, cli.get(CLI_RAGSOC), r);
@ -522,6 +536,9 @@ void TPAR_mask::print_reg()
recset->set_var("#NUM", nreg, true);
recset->set_var("#TIPODOCSDI", tipo_doc_sdi, true);
//const TString n = "ACABBONE";
//recset->set_var("#NUMPREFIX", n, true);
book.add(mov_rep);
}
}

2
src/fp/fp0700a.uml
View File

@ -241,7 +241,7 @@ BEGIN
ITEM "TD20|TD20 Autofattura"
END
STRING S_NUMDOC 7
STRING S_NUMDOC 10
BEGIN
PROMPT 21 4 "Numero Doc. "
FLAGS "D"

14
src/fp/fplib01.cpp
View File

@ -3463,15 +3463,13 @@ bool TReg_fp::reg_to_paf(const TMovimento_contabile& mov)
const TCausale & caus = cached_causale(mov);
if (caus.is_reg_autof())
const TString & prefisso = caus.reg().prefisso();
if (prefisso.full())
{
const TString & prefisso = caus.reg().prefisso();
if (prefisso.full())
{
numdoc.insert("/");
numdoc.insert(prefisso);
}
numdoc.insert("/");
numdoc.insert(prefisso);
//set(MOV_NUMDOC, numdoc);
}
paf0700f.set("P7_NUMERO", numdoc);
paf0700f.set("P7_GESTIONE", stato_paf());