root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0

Browse Source 
Files correlati     : fp, cg
Commento:
recupero dati fattura collegata da FPPRO per le integrazioni
This commit is contained in:
Alessandro Bonazzi 2022-06-14 12:46:20 +02:00
parent afa9e56967
commit 26ab71c9b4
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cg/cg2100.cpp
View File

@ -60,7 +60,7 @@ public:
TPrimanota_application::TPrimanota_application() TPrimanota_application::TPrimanota_application()
: _rel(nullptr), _mode(0), _iva(nessuna_iva), _causale(nullptr), _giornale(nullptr), : _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) _skip_giornale_check(false), _skip_bollato_check(false), _pro_mask(nullptr)
{ {
memset(_msk, 0, sizeof(_msk)); memset(_msk, 0, sizeof(_msk));
@ -245,23 +245,24 @@ TMask* TPrimanota_application::load_mask(int n)
return m; return m;
} }
/*
void TPrimanota_application::check_f1_ini() void TPrimanota_application::check_f1_ini()
{ {
for (int i = 0; i < argc(); i++) for (int i = 0; i < argc(); i++)
{ {
TString arg(argv(i)); TString arg(argv(i));
/* if (arg.find("-f1") != -1) if (arg.find("-f1") != -1)
{ {
_f1_ini = true; _f1_ini = true;
} }
*/
if (arg.find("-liq") != -1) if (arg.find("-liq") != -1)
{ {
_f1_liq = true; _f1_liq = true;
} }
} }
} }
*/
bool TPrimanota_application::user_create() bool TPrimanota_application::user_create()
{ {
@ -289,7 +290,7 @@ bool TPrimanota_application::user_create()
load_mask(0); load_mask(0);
load_colors(); load_colors();
check_f1_ini(); // check_f1_ini();
return true; return true;
} }
@ -2328,6 +2329,9 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
else else
{ {
_as400 = false; _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")) if (ini.set_paragraph("24,1"))
_as400 = !ini.exist(RMV_ROWTYPE) && ini.get_int(RMV_NUMRIG) == 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) if (msk.id2pos(F_CODIVA) >= 0)
msk.set(F_CODIVA, ini.get("CODIVA")); msk.set(F_CODIVA, ini.get("CODIVA"));
add_cgs_tot(msk); add_cgs_tot(msk);
TSheet_field& is = ivas(); TSheet_field& is = ivas();
@ -2505,14 +2510,13 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
pagamento().set_sheet(pag); 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) if (msk.find_by_id(FS_RECALC) != nullptr && scad_from_ini)
{ {
msk.set(FS_RECALC, ""); msk.set(FS_RECALC, "");
set_scad_f1(msk); set_scad_f1(msk);
insert_part_scad(ini); insert_part_scad(ini);
} }
/*
if (_f1_liq && msk.find_by_id(F_DIFFERITA) != nullptr) if (_f1_liq && msk.find_by_id(F_DIFFERITA) != nullptr)
{ {
TDate datadoc(msk.get(F_DATADOC)); datadoc.set_day(1); 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))); msk.set(F_DIFFERITA, datadoc < datareg && (double)datadoc.year() == real(msk.get(F_ANNOIVA)));
} }
*/
} }
void TPrimanota_application::set_scad_f1(TMask& m) void TPrimanota_application::set_scad_f1(TMask& m)

4
src/cg/cg2102.h
View File

@ -162,7 +162,7 @@ class TPrimanota_application : public TRelation_application
bool _is_set_fpcheck; bool _is_set_fpcheck;
int _last_date; int _last_date;
// bool _f1_ini; // bool _f1_ini;
bool _f1_liq; // bool _f1_liq;
TString _num_doc_rif_partite; TString _num_doc_rif_partite;
friend class TPro_msk; friend class TPro_msk;
@ -303,7 +303,7 @@ protected: // TApplication
bool force_mask_swap(const TCausale& old_caus, const TCausale& new_caus); bool force_mask_swap(const TCausale& old_caus, const TCausale& new_caus);
protected: // TRelation_application 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_create();
virtual bool user_destroy(); virtual bool user_destroy();
bool iva_mask(const TMask & m) const { return m.source_file() == "cg2100c.msk"; } bool iva_mask(const TMask & m) const { return m.source_file() == "cg2100c.msk"; }