diff --git a/src/cg/cg2100.cpp b/src/cg/cg2100.cpp index df0a3efde..ecd10ae5f 100755 --- a/src/cg/cg2100.cpp +++ b/src/cg/cg2100.cpp @@ -2449,7 +2449,9 @@ int TPrimanota_application::save_fppro() const TDate data_documento(msk.get(F_DATADOC)); const TString& numero_docext = msk.get(F_NUMDOCEXT); const TString& numero_doc = msk.get(F_NUMDOC); - const TString& tot_doc = msk.get(F_TOTALE); + real tot_doc = msk.get_real(F_TOTALE); + real ritenute = msk.get_real(F_RITFIS); + tot_doc += ritenute; TToken_string fppro_keys(msk.get(F_PROKEY), ';'); const TString& keyprginvio = fppro_keys.get(); const TString& keyheaderfatt = fppro_keys.get(); diff --git a/src/cg/cg2102.cpp b/src/cg/cg2102.cpp index 8d48a4d59..f93bfb3f7 100755 --- a/src/cg/cg2102.cpp +++ b/src/cg/cg2102.cpp @@ -4011,22 +4011,26 @@ bool TPro_msk::load_fppro_mask(TMask* msk, KEY k) const bool show_all = msk->get_bool(F_SHOWALL); if (numreg != "0" && !show_all) continue; + TToken_string& row = sf.row(-1); + TToken_string keys(fp_db().sq_get("PZ_KEYPRGINVIO"), ';'); + keys.add(fp_db().sq_get("PZ_KEYHEADERFATT")); keys.add(fp_db().sq_get("PZ_KEYBODYFATT")); + row.add("", 0); row.add(fp_db().sq_get("P7_TIPODOC")); row.add(TDate(fp_db().sq_get_date("P1_DATAORARIC"))); row.add(TDate(fp_db().sq_get_date("PZ_DATA"))); row.add(fp_db().sq_get("PQ_IMPTOTDOC")); - row.add(fp_db().sq_get("P7_IMPORTORIT")); + row.add(fppro_db().set_keys(keys).get_ritenute()); row.add(fp_db().sq_get("PZ_NUMERO")); row.add(fp_db().sq_get("P2_FISCIVAPAESE")); row.add(fp_db().sq_get("P2_FISCIVACOD")); row.add(fp_db().sq_get("P2_CODFISCALE")); row.add(fp_db().sq_get("PZ_TIPOPROT")); row.add(fp_db().sq_get("PZ_NUMPROT")); - TString fppro_keys; - fppro_keys << fp_db().sq_get("PZ_KEYPRGINVIO") << ";" << fp_db().sq_get("PZ_KEYHEADERFATT") << ";" << fp_db().sq_get("PZ_KEYBODYFATT"); - row.add(fppro_keys); + row.add(keys); + + } sf.force_update(); sf.show(); @@ -4240,7 +4244,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, P7_IMPORTORIT, PZ_NUMERO, PZ_NUMREGCONT, PZ_TIPOPROT, PZ_NUMPROT, P2_FISCIVAPAESE, P2_FISCIVACOD, P2_CODFISCALE, PZ_KEYPRGINVIO, PZ_KEYHEADERFATT, PZ_KEYBODYFATT\n" << + 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" <<