diff --git a/ce/ce4400.cpp b/ce/ce4400.cpp index 165f8863d..fb17206ab 100755 --- a/ce/ce4400.cpp +++ b/ce/ce4400.cpp @@ -91,7 +91,8 @@ static long get_new_numreg() } static void fill_head(TRectype& head, const TDate& datacomp, const TDate& datareg, - const long numreg, const TString& codcaus, const bool definitivo) + const long numreg, const TString& codcaus, const bool definitivo, + const TString& numdoc, const TString& tipodoc, const TDate& datadoc) { TEsercizi_contabili esc; const int codes = esc.date2esc(datacomp); @@ -100,6 +101,11 @@ static void fill_head(TRectype& head, const TDate& datacomp, const TDate& datare head.put(MOV_DATAREG, datareg); head.put(MOV_DATACOMP, datacomp); head.put(MOV_CODCAUS, codcaus); + //campi dei soli movimenti di vendita/eliminazione + head.put(MOV_NUMDOC, numdoc); + head.put(MOV_TIPODOC, tipodoc); + head.put(MOV_DATADOC, datadoc); + if (!definitivo) head.put(MOV_PROVVIS, 'C'); } @@ -498,6 +504,11 @@ void TPlus_minus::genera_mov_elim_ven(TConfig& config_ditta_ce, const TDate& dat const real impven = movce.get_real(MOVCE_IMPVEN); const bool eliminazione = impven == ZERO; + //estremi documento di vendita + const TString& numdoc = movce.get(MOVCE_NDOC); + const TString& tipodoc = movce.get(MOVCE_TPDOC); + const TDate& datadoc = movce.get_date(MOVCE_DTDOC); + if (eliminazione) codcaus = config_ditta_ce.get("COAUEL"); else @@ -515,7 +526,7 @@ void TPlus_minus::genera_mov_elim_ven(TConfig& config_ditta_ce, const TDate& dat TMovimentoPN_CE pn; TRectype& head = pn.curr(); - fill_head(head, datacomp, datareg, numreg, codcaus, definitivo); + fill_head(head, datacomp, datareg, numreg, codcaus, definitivo, numdoc, tipodoc, datadoc); head.put(MOV_DESCR, movce.get(MOVCE_DESC)); numreg ++; //incrementa il numreg per l'eventuale testata successiva @@ -724,7 +735,7 @@ void TTrasf_mov_ce_cg::genera_mov(TArray& righe_mov, const TDate& datareg, const TMovimentoPN_CE pn; TRectype& head = pn.curr(); - fill_head(head, datacomp, datareg, numreg, codcaus, definitivo); + fill_head(head, datacomp, datareg, numreg, codcaus, definitivo, "", "", NULLDATE); head.put(MOV_DESCR, TR("Rilevazione quote amm. cespiti per categoria")); //Procedura di inserimento delle righe del movimento diff --git a/ce/ce4400a.uml b/ce/ce4400a.uml index ae9f87026..e84708e1c 100755 --- a/ce/ce4400a.uml +++ b/ce/ce4400a.uml @@ -135,7 +135,7 @@ BEGIN PROMPT 2 11 "Data registrazione " FLAGS "A" CHECKTYPE REQUIRED - VALIDATE DATE_CMP_FUNC >= DATACALC + VALIDATE DATE_CMP_FUNC >= F_DATACALC WARNING "La data di registrazione non puo' essere inferiore alla data di calcolo" END