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

Aggiunto supporto per CFVEN a modifica valori

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@23070 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2015-04-29 09:01:25 +00:00
parent a3cbd76437
commit 775faea657
5 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ve/ve4100.cpp
View File

@ -313,7 +313,7 @@ public:
TRicalcolo_mask::TRicalcolo_mask()
: TMask("ve4100"), _cur_file(0), _relation(NULL), _cursor(NULL)
{
const int lf[] = { LF_ANAMAG, LF_UMART, LF_DESLIN, LF_CONDV, LF_RCONDV, LF_CLIFO, LF_CFBAN, 0 };
const int lf[] = { LF_ANAMAG, LF_UMART, LF_DESLIN, LF_CONDV, LF_RCONDV, LF_CLIFO, LF_CFBAN, LF_CFVEN, 0 };
for (int i = 0; lf[i]; i++)
{
TRelation* rel = new TRelation(lf[i]);
@ -517,9 +517,7 @@ TRelation& TRicalcolo_mask::create_relation()
}
break;
case LF_CLIFO:
{
_relation->add(LF_CFVEN, "TIPOCF==TIPOCF|CODCF==CODCF");
}
break;
case LF_CFBAN:
{
@ -527,6 +525,9 @@ TRelation& TRicalcolo_mask::create_relation()
_relation->add(LF_CFVEN, "TIPOCF==TIPOCF|CODCF==CODCF");
}
break;
case LF_CFVEN:
_relation->add(LF_CLIFO, "TIPOCF==TIPOCF|CODCF==CODCF");
break;
default:
break;
}

3
ve/ve4100.uml
View File

@ -20,7 +20,8 @@ BEGIN
ITEM "3|Condizioni di vendita"
ITEM "4|Righe condizioni di vendita"
ITEM "5|Clienti/Fornitori"
ITEM "6|Banche per Clienti/Fornitori"
ITEM "6|Clienti/Fornitori Banche"
ITEM "7|Clienti/Fornitori Vendite"
END
LIST F_KEY 10

10
ve/velib04d.cpp
View File

@ -11,6 +11,7 @@ class TConsegna_mask : public TAutomask
{
bool _ordina_per_codice;
bool _ignora_descrizioni;
bool _check_giac;
const TDocumento* _indoc;
const TDocumento* _outdoc;
@ -98,7 +99,7 @@ bool TConsegna_mask::on_field_event(class TOperable_field& f, TField_event e, lo
if (e == fe_close)
{
const TString& codcausmag = _outdoc->get(DOC_CAUSMAG);
if (codcausmag.full())
if (codcausmag.full() && _check_giac)
{
const TCausale_magazzino& causmag = ::cached_causale_magazzino(codcausmag);
const int segno = causmag.sgn(s_giac);
@ -148,7 +149,9 @@ bool TConsegna_mask::on_field_event(class TOperable_field& f, TField_event e, lo
}
}
}
default:break;
break;
default:
break;
}
if (update_row)
@ -290,7 +293,7 @@ void TConsegna_mask::doc2mask(const TDocumento& indoc, const TDocumento& outdoc,
TConsegna_mask::TConsegna_mask(int header_code, bool per_codice, bool ignora_descrizioni)
: TAutomask("velib04d"), _ordina_per_codice(per_codice), _indoc(NULL), _outdoc(NULL),
_ignora_descrizioni(ignora_descrizioni)
_ignora_descrizioni(ignora_descrizioni), _check_giac(false)
{
TCodgiac_livelli cl;
TSheet_field& s = sfield(F_ROWS);
@ -326,6 +329,7 @@ TConsegna_mask::TConsegna_mask(int header_code, bool per_codice, bool ignora_des
agg.set_prompt(codagg);
}
}
_check_giac = c.get_bool("CHECK_GIAC", "mg");
}
///////////////////////////////////////////////////////////

21
ve/vetbrpd.h Normal file
View File

@ -0,0 +1,21 @@
// campi maschera batbrpd.msk
#define F_CODICE 101
#define F_DESCR 102

21
ve/vetbstg.h Normal file
View File

@ -0,0 +1,21 @@
// campi maschera batbstg.msk
#define F_CODICE 101
#define F_DESCR 102