Patch level : 4.0 649

Ricompilazione Demo : [ ]
Commento            :

Riportata la versione 3.1 patch 848


git-svn-id: svn://10.65.10.50/trunk@15018 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2007-03-07 16:06:56 +00:00
parent c1621b5169
commit 2f61a3b274

View File

@ -1314,36 +1314,6 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
doc.insert_row(r + 1, m.get( F_LBTIPORIGA ));
}
break;
case K_CTRL + K_INS:
{
const TRectype& ven_rec = doc.clifor().vendite();
TString8 s = ven_rec.get(CFV_CODMAG);
if (s.full())
{
s.left_just(3);
s << ven_rec.get(CFV_CODDEP);
}
else
{
s = m.get(F_CAUSMAG);
if (s.full())
{
s = cache().get("%CAU", s, "S10");
if (s.blank())
{
s = m._std_mag;
s.left_just(3);
s << m._std_dep;
}
}
}
TRiga_documento& riga = doc[r + 1];
riga.put(RDOC_CODMAG, s);
riga.autoload(ss);
ss.check_row(r);
riga.tipo().set_defaults(ss, r + 1);
}
break;
case K_CTRL + K_INS:
{
TRiga_documento & riga = doc[r + 1];
@ -1351,7 +1321,7 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
TString16 s(ven_rec.get(CFV_CODMAG));
const TTipo_riga_documento & t = riga.tipo();
if (s.not_empty())
if (s.full())
{
s.left_just(3);
s << ven_rec.get(CFV_CODDEP);
@ -1359,7 +1329,7 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
else
{
s = m.get(F_CAUSMAG);
if (!s.blank())
if (s.full())
{
const TRectype & c=cache().get("%CAU", s);
if (!c.empty() && !c.get("S10").blank())
@ -1374,10 +1344,8 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
}
riga.put("CODMAG", s);
riga.autoload(ss);
ss.check_row(r);
t.set_defaults(ss, r + 1);
ss.check_row(r);
t.set_defaults(ss, r + 1);
}
break;
case K_TAB: // ingresso nella riga