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

GEstione maschere ridotte per clifo

Browse Source 
Corretta generazione contropartite per incasso immediato


git-svn-id: svn://10.65.10.50/trunk@687 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-11-22 18:07:38 +00:00
parent 545d10bdd9
commit 59f5181b11
4 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cg/cg0200.cpp
View File

@ -30,6 +30,7 @@ class TClifo_application : public TRelation_application
bool _lbcn, _gesven; bool _lbcn, _gesven;
bool _savenew; bool _savenew;
bool _ignoreven;
protected: protected:
bool user_create(); bool user_create();
@ -355,9 +356,12 @@ bool TClifo_application::change_config(const char* val, const char* old, const c
const TFixed_string var(val); const TFixed_string var(val);
if (var == "GesVen") if (var == "GesVen")
{ {
_gesven = *nuo > ' '; if (!_ignoreven)
init = TRUE; {
_gesven = *nuo > ' ';
init = TRUE;
}
} }
else else
if (var == "GsLbCn") if (var == "GsLbCn")
@ -380,8 +384,9 @@ void TClifo_application::init_pages(TMask& m)
// Se non e' abilitata la gestione delle vendite disabilita le // Se non e' abilitata la gestione delle vendite disabilita le
// maschere dalla 4 in poi // maschere dalla 4 in poi
for (int j = 3; j < 8;j++) if (!_ignoreven)
m.enable_page(j, _gesven); for (int j = 3; j < 8;j++)
m.enable_page(j, _gesven);
} }
void TClifo_application::init_query_mode(TMask& m) void TClifo_application::init_query_mode(TMask& m)
@ -597,7 +602,9 @@ bool TClifo_application::user_create() // initvar e arrmask
_pcon = new TLocalisamfile(LF_PCON); _pcon = new TLocalisamfile(LF_PCON);
_comuni = new TLocalisamfile(LF_COMUNI); _comuni = new TLocalisamfile(LF_COMUNI);
_msk = new TMask("cg0200a") ; _ignoreven = argc() > 2;
const int max = _ignoreven ? 3 : -1;
_msk = new TMask("cg0200a", 0, max) ;
_msk->set_handler(F_OCCASIONALE, occas_handler); _msk->set_handler(F_OCCASIONALE, occas_handler);
_msk->set_handler(F_RAGSOCA, autoexit_rsoc_handler); _msk->set_handler(F_RAGSOCA, autoexit_rsoc_handler);
@ -608,11 +615,13 @@ bool TClifo_application::user_create() // initvar e arrmask
_msk->set_handler(F_TIPOPERS, tipo_handler); _msk->set_handler(F_TIPOPERS, tipo_handler);
_msk->set_handler(F_ALLEG, alleg_handler); _msk->set_handler(F_ALLEG, alleg_handler);
_msk->set_handler(F_CODALLEG, codalleg_handler); _msk->set_handler(F_CODALLEG, codalleg_handler);
if (!_ignoreven)
_msk->set_handler(F_SHEET_G_VEN, indsp_handler); {
_msk->set_handler(F_SHEET_G_VEN, indsp_handler);
TSheet_field& ind = (TSheet_field&) _msk->field(F_SHEET_G_VEN); TSheet_field& ind = (TSheet_field&) _msk->field(F_SHEET_G_VEN);
ind.set_notify(indsp_notify); ind.set_notify(indsp_notify);
}
_mov->setkey(3); _mov->setkey(3);
TConfig config(CONFIG_STUDIO); TConfig config(CONFIG_STUDIO);
@ -620,7 +629,7 @@ bool TClifo_application::user_create() // initvar e arrmask
TConfig conf(CONFIG_DITTA, "cg"); TConfig conf(CONFIG_DITTA, "cg");
_lbcn = conf.get_bool("GsLbCn"); _lbcn = conf.get_bool("GsLbCn");
_gesven = conf.get_bool("GesVen"); _gesven = _ignoreven ? FALSE : conf.get_bool("GesVen");
init_pages(*_msk); init_pages(*_msk);
return TRUE; return TRUE;

4
cg/cg0200.h
View File

@ -124,8 +124,8 @@
#define F_CODVETT3 219 #define F_CODVETT3 219
#define F_RAGSOCALLEG 220 #define F_RAGSOCALLEG 220
#define F_CODCASS 221 #define F_CODCASS 221
#define F_CODFASS 222 #define F_CODFASS 222
#define F_TEMP 223 #define F_TEMP 223
#define DLG_RIC 300 #define DLG_RIC 300
#define DLG_CST 301 #define DLG_CST 301

14
cg/cg2100.cpp
View File

@ -879,9 +879,12 @@ void TPrimanota_application::genera_incasso(const char* causimm)
clifo_id = I_SOTTOCONTO; break; clifo_id = I_SOTTOCONTO; break;
} }
r.put("SOTTOCONTO", m.get(clifo_id)); r.put("SOTTOCONTO", m.get(clifo_id));
r.put("DESCR", m.get(F_DESCR)); r.put("DESCR", m.get(F_DESCR));
r.put("RCONTR", 2); r.put("TIPOCC", " ");
r.put("GRUPPOC", m.get(I_GRUPPO2));
r.put("CONTOC", m.get(I_CONTO2));
r.put("SOTTOCONTC", m.get(I_SOTTOCONTO2));
r.put("ROWTYPE", " "); r.put("ROWTYPE", " ");
for (int i = 2; i < 5; i++) for (int i = 2; i < 5; i++)
@ -904,7 +907,12 @@ void TPrimanota_application::genera_incasso(const char* causimm)
r.put("SOTTOCONTO", m.get(sid+4)); r.put("SOTTOCONTO", m.get(sid+4));
if (i == 2) if (i == 2)
r.put("DESCR", caus.desc_agg(2)); r.put("DESCR", caus.desc_agg(2));
r.put("RCONTR", 1);
r.put("TIPOCC", m.get(F_CLIFO));
r.put("GRUPPOC", m.get(F_GRUPPOCLIFO));
r.put("CONTOC", m.get(F_CONTOCLIFO));
r.put("SOTTOCONTC", m.get(clifo_id));
r.put("ROWTYPE", " "); r.put("ROWTYPE", " ");
} }

1
cg/cg3200.cpp
View File

@ -644,7 +644,6 @@ bool TMastrini_application::preprocess_page(int file, int counter)
TString datasuccstring,dataregrmovstring; TString datasuccstring,dataregrmovstring;
int gruppof,contof; int gruppof,contof;
long sottocf; long sottocf;
long record;
TString provvis = ""; TString provvis = "";
int annoes; int annoes;