diff --git a/src/cg/cg2100.h b/src/cg/cg2100.h index ac890e3ab..930adb00a 100755 --- a/src/cg/cg2100.h +++ b/src/cg/cg2100.h @@ -224,11 +224,12 @@ #define F_IMPTOTDOCS 105 #define F_RITENUTE 106 #define F_NUMEROS 107 -#define F_FISCIVAPAESES 108 -#define F_FISCIVACODS 109 -#define F_CODFISCALES 110 -#define F_TIPOPROTS 111 -#define F_PROGRESSS 112 -#define F_KEYFPPROS 113 +#define F_RAGXML 108 +#define F_FISCIVAPAESES 109 +#define F_FISCIVACODS 110 +#define F_CODFISCALES 111 +#define F_TIPOPROTS 112 +#define F_PROGRESSS 113 +#define F_KEYFPPROS 114 #endif diff --git a/src/cg/cg2102.cpp b/src/cg/cg2102.cpp index fb293e2d0..10fc57055 100755 --- a/src/cg/cg2102.cpp +++ b/src/cg/cg2102.cpp @@ -4035,6 +4035,7 @@ bool TPro_msk::load_fppro_mask(TMask* msk, KEY k) row.add(fp_db().sq_get("PQ_IMPTOTDOC")); row.add(fppro_db().set_keys(keys).get_ritenute()); row.add(fp_db().sq_get("PZ_NUMERO")); + row.add(fp_db().sq_get("P2_ANADENOMIN")); row.add(fp_db().sq_get("P2_FISCIVAPAESE")); row.add(fp_db().sq_get("P2_FISCIVACOD")); row.add(fp_db().sq_get("P2_CODFISCALE")); @@ -4248,12 +4249,7 @@ TString& TPro_msk::query_fppro(const TString& codforn, const TString& stato_piva } static TString query; - query.cut(0) << "SELECT PZ_CLIFOR, PZ_DATA, CAST(P1_DATAORARIC AS DATE) AS P1_DATAORARIC, P7_TIPODOC, PQ_IMPTOTDOC, PZ_NUMERO, PZ_NUMREGCONT, PZ_TIPOPROT, PZ_NUMPROT, P2_FISCIVAPAESE, P2_FISCIVACOD, P2_CODFISCALE, PZ_KEYPRGINVIO, PZ_KEYHEADERFATT, PZ_KEYBODYFATT\n" << - "FROM PAA0200F\n" << "JOIN FPPRO00F\n" << " ON P2_KEYPRGINVIO = PZ_KEYPRGINVIO AND P2_KEYHEADERFATT = PZ_KEYHEADERFATT AND P2_KEYBODYFATT = PZ_KEYBODYFATT\n" << - "JOIN PAA0100F\n" << " ON P2_KEYPRGINVIO = P1_KEYPRGINVIO AND P2_KEYHEADERFATT = P1_KEYHEADERFATT AND P2_KEYBODYFATT = P1_KEYBODYFATT\n" << - "JOIN PAA2700F\n" << "ON P2_KEYPRGINVIO = PQ_KEYPRGINVIO AND P2_KEYHEADERFATT = PQ_KEYHEADERFATT AND P2_KEYBODYFATT = PQ_KEYBODYFATT\n" << - "JOIN PAA0700F\n" << "ON P7_KEYPRGINVIO = PQ_KEYPRGINVIO AND P7_KEYHEADERFATT = PQ_KEYHEADERFATT AND P7_KEYBODYFATT = PQ_KEYBODYFATT\n" << - "WHERE "; + query.cut(0) << query_string() << "WHERE "; if (!id_fornitore.empty()) { @@ -4291,7 +4287,7 @@ TString& TPro_msk::query_string() { static TString query; query.cut(0) << "SELECT PZ_CLIFOR, PZ_DATA, CAST(P1_DATAORARIC AS DATE) AS P1_DATAORARIC, P7_TIPODOC, PQ_IMPTOTDOC, PZ_NUMERO, PZ_NUMREGCONT, PZ_TIPOPROT, " << - "PZ_NUMPROT, P2_FISCIVAPAESE, P2_FISCIVACOD, P2_CODFISCALE, PZ_KEYPRGINVIO, PZ_KEYHEADERFATT, PZ_KEYBODYFATT\n" << + "PZ_NUMPROT, P2_ANADENOMIN, P2_FISCIVAPAESE, P2_FISCIVACOD, P2_CODFISCALE, PZ_KEYPRGINVIO, PZ_KEYHEADERFATT, PZ_KEYBODYFATT\n" << "FROM PAA0200F \nJOIN FPPRO00F\n" << " ON P2_KEYPRGINVIO = PZ_KEYPRGINVIO AND P2_KEYHEADERFATT = PZ_KEYHEADERFATT AND P2_KEYBODYFATT = PZ_KEYBODYFATT\n" << "JOIN PAA0100F \nON P2_KEYPRGINVIO = P1_KEYPRGINVIO AND P2_KEYHEADERFATT = P1_KEYHEADERFATT AND P2_KEYBODYFATT = P1_KEYBODYFATT\n" << "JOIN PAA2700F \nON P2_KEYPRGINVIO = PQ_KEYPRGINVIO AND P2_KEYHEADERFATT = PQ_KEYHEADERFATT AND P2_KEYBODYFATT = PQ_KEYBODYFATT\n" << diff --git a/src/cg/cg2FPPRO.uml b/src/cg/cg2FPPRO.uml index e5c69926e..bf2e444c2 100644 --- a/src/cg/cg2FPPRO.uml +++ b/src/cg/cg2FPPRO.uml @@ -97,6 +97,7 @@ BEGIN ITEM "Totale\nDocumento@7" ITEM "Ritenute\nfiscali@6" ITEM "Numero@14" + ITEM "Ragione sociale@40" ITEM "Paese@4" ITEM "P. IVA@10" ITEM "Cod. Fiscale@14" @@ -184,6 +185,13 @@ BEGIN FLAGS "D" END +STRING F_RAGXML 50 + BEGIN + PROMPT 1 8 "" + FLAGS "D" + HELP "Ragione sociale scritta nell'xml" +END + STRING F_FISCIVAPAESES 2 BEGIN PROMPT 1 6 "FISCIVAPAESE"