diff --git a/src/ca/ca2100.cpp b/src/ca/ca2100.cpp index 6bc0e3fb5..feb491c68 100755 --- a/src/ca/ca2100.cpp +++ b/src/ca/ca2100.cpp @@ -10,7 +10,7 @@ #include "ca2100a.h" #include "calib01.h" -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "../ve/velib.h" #include "../mg/umart.h" #include @@ -1560,12 +1560,11 @@ int TMovanal_app::write(const TMask& m) _rel->lfile().put(MOVANA_DNDOC, rec.get(MOV_DNDOC)); } write_rows(m); -// if (ci) -// write_doc(m); + const int err = _rel->write(); - if (ci && err == NOERR) - write_doc(m); - // link_ci(m); + + if (ci && err == NOERR) + write_doc(m); return err; } @@ -1586,12 +1585,11 @@ int TMovanal_app::rewrite(const TMask& m) rec.get(MOV_DNDOC)); } write_rows(m); - // if (ci) - // write_doc(m); + const int err = _rel->rewrite(); + if (ci && err == NOERR) write_doc(m); - //link_ci(m); return err; } diff --git a/src/ca/ca2100a.h b/src/ca/ca2100a.h index 5fffe28ae..75cf1234e 100755 --- a/src/ca/ca2100a.h +++ b/src/ca/ca2100a.h @@ -21,6 +21,8 @@ #define F_CODCF 222 #define F_RAGSOCCF 223 #define F_DATAFCOMP 224 +#define NP_CONTSEP 225 +#define NP_DESCONTSEP 226 #define F_NUMREG2 301 #define F_ANNOES2 302 diff --git a/src/ca/ca2100a.uml b/src/ca/ca2100a.uml index f8734e254..b039b6fcd 100755 --- a/src/ca/ca2100a.uml +++ b/src/ca/ca2100a.uml @@ -213,6 +213,34 @@ BEGIN GROUP 5 END +STRING NP_CONTSEP 6 +BEGIN + PROMPT 2 18 "Cont. separata " + USE &NPENT + INPUT CODTAB NP_CONTSEP + DISPLAY "Codice@6" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT NP_CONTSEP CODTAB + OUTPUT NP_DESCONTSEP S0 + CHECKTYPE NORMAL + FIELD CONTSEP + MODULE NP + GROUP 5 +END + +STRING NP_DESCONTSEP 50 +BEGIN + PROMPT 25 18 "" + USE &NPENT KEY 2 + INPUT S0 NP_DESCONTSEP + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice@6" CODTAB + COPY OUTPUT NP_CONTSEP + CHECKTYPE NORMAL + MODULE NP + GROUP 5 +END + BOOLEAN F_BLOCCATO BEGIN PROMPT 2 20 "Movimento bloccato" diff --git a/src/ca/ca2200.cpp b/src/ca/ca2200.cpp index bfa634335..c0a4b76e5 100755 --- a/src/ca/ca2200.cpp +++ b/src/ca/ca2200.cpp @@ -4,7 +4,7 @@ #include #include -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "calib01.h" #include "calib02.h" diff --git a/src/ca/ca2300.cpp b/src/ca/ca2300.cpp index b1e220d0a..027f480e4 100755 --- a/src/ca/ca2300.cpp +++ b/src/ca/ca2300.cpp @@ -6,7 +6,7 @@ #include "ca2.h" #include "ca2300a.h" -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "movana.h" #include "rmovana.h" diff --git a/src/ca/ca3200.cpp b/src/ca/ca3200.cpp index 65fb60b67..9aa08aa24 100755 --- a/src/ca/ca3200.cpp +++ b/src/ca/ca3200.cpp @@ -4,7 +4,7 @@ #include #include -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "commesse.h" #include "pconana.h" diff --git a/src/ca/ca3300.cpp b/src/ca/ca3300.cpp index 7c72f1914..352367ed0 100755 --- a/src/ca/ca3300.cpp +++ b/src/ca/ca3300.cpp @@ -11,7 +11,7 @@ #include "rmovana.h" #include "pconana.h" #include "saldana.h" -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "ca3.h" #include "calib01.h" diff --git a/src/ca/ca3400.cpp b/src/ca/ca3400.cpp index 7ce84c57c..dad5dc115 100755 --- a/src/ca/ca3400.cpp +++ b/src/ca/ca3400.cpp @@ -14,7 +14,7 @@ #include "ca3.h" #include "calib01.h" -#include "../cg/cglib01.h" +#include "../cg/cglib.h" class TCode_generator { diff --git a/src/ca/ca3600.cpp b/src/ca/ca3600.cpp index 99433a93f..57cef33c1 100755 --- a/src/ca/ca3600.cpp +++ b/src/ca/ca3600.cpp @@ -11,8 +11,7 @@ #include #include "..\cg\cgsaldac.h" -#include "..\cg\cg2101.h" -#include "..\cg\cg2103.h" +#include "..\cg\cglib.h" #include "pconana.h" #include "movana.h" @@ -715,6 +714,7 @@ void TPag_per_cms_recordset::find_commesse(const long nreg, const TRectype& riga //crea un movimento p.n. con il numero reg che viene passato al metodo (nreg relativo.. //..ad un movimento della fattura originaria) TMovimentoPN pn; + pn.curr().put(MOV_NUMREG, nreg); if (pn.read() == NOERR) { diff --git a/src/ca/ca3700.cpp b/src/ca/ca3700.cpp index 424cfbe52..f15945c86 100755 --- a/src/ca/ca3700.cpp +++ b/src/ca/ca3700.cpp @@ -9,8 +9,7 @@ #include #include #include -#include "../cg/cg2103.h" -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "../ve/velib04.h" #include "..\cg\cgsaldac.h" diff --git a/src/ca/ca3800.cpp b/src/ca/ca3800.cpp index 08398792d..ff008eceb 100755 --- a/src/ca/ca3800.cpp +++ b/src/ca/ca3800.cpp @@ -1,6 +1,7 @@ #include #include +#include "../cg/cglib.h" #include "ca3.h" #include "ca3883.h" #include "ca3883a.h" diff --git a/src/ca/ca3883.cpp b/src/ca/ca3883.cpp index 3a9149fbe..efaa24902 100755 --- a/src/ca/ca3883.cpp +++ b/src/ca/ca3883.cpp @@ -2,6 +2,7 @@ #include "../ve/velib.h" #include "../ve/velib04.h" +#include "../cg/cglib.h" #include "calib01.h" #include "calib02.h" diff --git a/src/ca/ca3883.h b/src/ca/ca3883.h index abdaaaa1a..e8a4e370d 100755 --- a/src/ca/ca3883.h +++ b/src/ca/ca3883.h @@ -4,7 +4,7 @@ #include #include -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "ca3883a.h" diff --git a/src/ca/cacnv.cpp b/src/ca/cacnv.cpp index 445230249..6ce262096 100755 --- a/src/ca/cacnv.cpp +++ b/src/ca/cacnv.cpp @@ -7,7 +7,7 @@ #include #include -#include "../cg/cg2101.h" +#include "../cg/cglib.h" #include "calib01.h" #include "../ve/velib04.h" diff --git a/src/ca/f107.dir b/src/ca/f107.dir index 705111b8f..33dfe1681 100755 --- a/src/ca/f107.dir +++ b/src/ca/f107.dir @@ -1,3 +1,3 @@ 107 0 -$movana|0|0|178|0|Movimenti di Analitica||| +$movana|0|0|184|0|Movimenti di Analitica||| diff --git a/src/ca/f107.trr b/src/ca/f107.trr index 9f34ffa9d..bd3387c08 100755 --- a/src/ca/f107.trr +++ b/src/ca/f107.trr @@ -1,5 +1,5 @@ 107 -24 +25 ANNOES|9|4|0|Codice esercizio NUMREG|3|7|0|Numero di operazione DATAREG|5|8|0|Data operazione @@ -24,6 +24,7 @@ DNDOC|3|7|0|Documento originale NDOC DATAFCOMP|5|8|0|Data finale competenza (solo Preventivi e Variazioni) AUTOFCOMP|8|1|0|Data fine competenza calcolata in base a fine commessa TRASFERITO|8|1|0|Movimento trasferito dalla Contabilità Generale +CONTSEP|1|6|0|Contabilità separata 3 NUMREG| DATACOMP+NUMREG|X diff --git a/src/ca/movana.h b/src/ca/movana.h index 34f54e4af..b2faf6b7e 100755 --- a/src/ca/movana.h +++ b/src/ca/movana.h @@ -22,5 +22,6 @@ #define MOVANA_DATAFCOMP "DATAFCOMP" #define MOVANA_AUTOFCOMP "AUTOFCOMP" #define MOVANA_TRASFERITO "TRASFERITO" +#define MOVANA_CONTSEP "CONTSEP" #endif \ No newline at end of file