From 26ab71c9b4240800879514ea67ff4d16f6101dfa Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Tue, 14 Jun 2022 12:46:20 +0200
Subject: [PATCH] Patch level         : 12.0 Files correlati     : fp, cg
 Commento: recupero dati fattura collegata da FPPRO per le integrazioni

---
 src/cg/cg2100.cpp | 17 +++++++++++------
 src/cg/cg2102.h   |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/cg/cg2100.cpp b/src/cg/cg2100.cpp
index 70c340ad1..de5549e4a 100755
--- a/src/cg/cg2100.cpp
+++ b/src/cg/cg2100.cpp
@@ -60,7 +60,7 @@ public:
 
 TPrimanota_application::TPrimanota_application()
 : _rel(nullptr), _mode(0), _iva(nessuna_iva), _causale(nullptr), _giornale(nullptr),
-  _lastreg(0), _last_dreg(TODAY), _last_dcom(TODAY), _automatico(nullptr), _swap_mask(false), _is_set_fpcheck(false), _f1_liq(false), // _f1_ini(false),
+  _lastreg(0), _last_dreg(TODAY), _last_dcom(TODAY), _automatico(nullptr), _swap_mask(false), _is_set_fpcheck(false),  // _f1_ini(false), _f1_liq(false),
 	_skip_giornale_check(false), _skip_bollato_check(false), _pro_mask(nullptr)
 {
   memset(_msk, 0, sizeof(_msk));
@@ -245,23 +245,24 @@ TMask* TPrimanota_application::load_mask(int n)
   return m;
 }
 
+/*
 void TPrimanota_application::check_f1_ini()
 {
 	for (int i = 0; i < argc(); i++)
 	{
 		TString arg(argv(i));
 
-/*		if (arg.find("-f1") != -1)
+		if (arg.find("-f1") != -1)
 		{
 			_f1_ini = true;
 		}
-*/
 		if (arg.find("-liq") != -1)
 		{
 			_f1_liq = true;
 		}
 	}
 }
+*/
 
 bool TPrimanota_application::user_create()
 {
@@ -289,7 +290,7 @@ bool TPrimanota_application::user_create()
  
   load_mask(0);                                   
   load_colors();
-  check_f1_ini();
+//  check_f1_ini();
 
   return true;
 }
@@ -2328,6 +2329,9 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
 	else
 	{
 		_as400 = false;
+		msk.set(F_DIFFERITA, ini.get(MOV_MESELIQ));
+		if (msk.find_by_id(F_COLFPPRO) != nullptr)
+			msk.set(F_COLFPPRO, ini.get(MOV_KEYFPPRO).full(), 0x3);
 		if (ini.set_paragraph("24,1"))
 			_as400 = !ini.exist(RMV_ROWTYPE) && ini.get_int(RMV_NUMRIG) == 1;
 
@@ -2342,6 +2346,7 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
 			if (msk.id2pos(F_CODIVA) >= 0)
 				msk.set(F_CODIVA, ini.get("CODIVA"));
 
+
 			add_cgs_tot(msk);
 
 			TSheet_field& is = ivas();
@@ -2505,14 +2510,13 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
 			pagamento().set_sheet(pag);
 		}
 	}
-	if (msk.find_by_id(F_COLFPPRO) != nullptr)
-		msk.set(F_COLFPPRO, "X", 0x3);
 	if (msk.find_by_id(FS_RECALC) != nullptr && scad_from_ini)
 	{
 		msk.set(FS_RECALC, "");
 		set_scad_f1(msk);
     insert_part_scad(ini);
 	}
+	/*
 	if (_f1_liq && msk.find_by_id(F_DIFFERITA) != nullptr) 
 	{
 		TDate datadoc(msk.get(F_DATADOC)); datadoc.set_day(1);
@@ -2520,6 +2524,7 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
 
 		msk.set(F_DIFFERITA, datadoc < datareg && (double)datadoc.year() == real(msk.get(F_ANNOIVA)));
 	}
+	*/
 }
 
 void TPrimanota_application::set_scad_f1(TMask& m)
diff --git a/src/cg/cg2102.h b/src/cg/cg2102.h
index 09df840b8..ca3e73fc6 100755
--- a/src/cg/cg2102.h
+++ b/src/cg/cg2102.h
@@ -162,7 +162,7 @@ class TPrimanota_application : public TRelation_application
   bool _is_set_fpcheck;
   int _last_date;
 //	bool _f1_ini;
-  bool _f1_liq;
+//  bool _f1_liq;
   TString _num_doc_rif_partite;
   friend class TPro_msk;
 
@@ -303,7 +303,7 @@ protected:                              // TApplication
   bool force_mask_swap(const TCausale& old_caus, const TCausale& new_caus);
 
 protected:                              // TRelation_application
-  void check_f1_ini();	// setto variabili se ho f1 o liq nei parametri (ini da fp)
+ // void check_f1_ini();	// setto variabili se ho f1 o liq nei parametri (ini da fp)
   virtual bool user_create();
   virtual bool user_destroy();
   bool iva_mask(const TMask & m) const { return m.source_file() == "cg2100c.msk"; }