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

Patch level : 12.0 no-patch

Browse Source 
Files correlati     : 
Commento            : Caricate modifiche vecchie
mr0500: sostituito PO con VE
ps0430600: sistemati char
ps0713400: aggiunta ricerca in base al nuovo STATOPAIV del cli/fo
ps0920500: sistemata get
xvtdb: allineata TXvt_recordset::get_date allo standard ANSI

git-svn-id: svn://10.65.10.50/branches/R_10_00@24435 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2018-03-14 14:58:51 +00:00
parent 925975ce44
commit 20ea50b8a9
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mr/mr0500.cpp
View File

@ -110,7 +110,7 @@ public:
TRilprod_mask::TRilprod_mask() : TAutomask("mr0500a")
{
enable(F_DATALOG, main_app().has_module(POAUT, CHK_DONGLE));
enable(F_DATALOG, main_app().has_module(VEAUT, CHK_DONGLE));
sfield(F_TEMPI).set_append(false);
}

11
src/ps/ps0430600.cpp
View File

@ -361,10 +361,17 @@ bool TTessan_app::elabPayment(int anno, TString userPath)
// Movimento attuale
TRectype rowMovOld = curMovOld.curr();
if(rowMovOld.get("TIPO") != "C") continue; // Non riesco a metterlo nel filtro
if(rowMovOld.get("CODCAUS") != 'V01' && rowMovOld.get("CODCAUS") == 'V02') continue;
if(rowMovOld.get("CODCAUS") != "V01" && rowMovOld.get("CODCAUS") != "V02") continue;
for(int i = 0; i < numCli; i++)
{
#ifdef DBG
if (rowMovOld.get_long("CODCF") == clienti[i].codcf && clienti[i].codcf == 1669)
{
TString asd = clienti[i].importoPagato.string();
bool tolla = true;
}
#endif // DBG
if(clienti[i].codcf == rowMovOld.get_long("CODCF") && clienti[i].p98 > 0 && clienti[i].importoPagato > 0) // Trova più spesso il cliente diverso dal codice all'inizio
{
// Aggiungo il documento al file
@ -409,7 +416,7 @@ bool TTessan_app::elabPayment(int anno, TString userPath)
// Movimento attuale
TRectype rowMovNew = curMovNew.curr();
if(rowMovNew.get("TIPO") != "C") continue; // Non riesco a metterlo nel filtro
if(rowMovNew.get("CODCAUS") != 'V01' && rowMovNew.get("CODCAUS") == 'V02') continue;
if(rowMovNew.get("CODCAUS") != "V01" && rowMovNew.get("CODCAUS") != "V02") continue;
for(int i = 0; i < numCli; i++)
{

12
src/ps/ps0713400.cpp
View File

@ -106,7 +106,17 @@ long TImporta_fatven_app::find_cliente(TLocalisamfile& clifo, const TString& pai
clifo.zero();
clifo.put(CLI_TIPOCF, 'C');
clifo.put(CLI_PAIV, paiv);
if (clifo.read() == NOERR)
int res = clifo.read();
// Se è un cliente aggiornato con C.ISO IT
if(res == _iskeynotfound)
{
clifo.zero();
clifo.put(CLI_TIPOCF, 'C');
clifo.put(CLI_PAIV, paiv);
clifo.put(CLI_STATOPAIV, "IT");
res = clifo.read();
}
if (res == NOERR)
return clifo.get_long(CLI_CODCF);
if (paiv.len() == 16)
{

2
src/ps/ps0920500.cpp
View File

@ -888,7 +888,7 @@ bool TClosure_msk::on_field_event(TOperable_field& o, TField_event e , long joll
const real peso = art.get(ANAMAG_PESO);
const int id = o.dlg() < S_PALET2 ? S_PALET1 : S_PALET2;
sm.set(id+2, sm.get_int(id)*ppp + sm.get_int(id+1)*pps);
sm.set(id+3, real(peso * sm.get_int(id+2)));
sm.set(id+3, real(peso * sm.get_real(id+2)));
if (e == fe_modify && !_dirty && is_running())
enable(DLG_SAVEREC, _dirty = true);

4
src/xvtdb/xvtdb.cpp
View File

@ -522,8 +522,8 @@ const char* TXvt_recordset::get_date(const char * field)
try
{
SADateTime app = _RCS(_recset)->Field(field).asDateTime();
static char date[10];
sprintf_s(date, (size_t)10, "%d-%d-%d", app.GetDay(), app.GetMonth(), app.GetYear());
static char date[8];
sprintf_s(date, sizeof(date), "%d%d%d", app.GetYear(), app.GetMonth(), app.GetDay());
return date;
}
catch (SAException &x)