Patch level : 2.2 82
Files correlati : ca0.exe Ricompilazione Demo : [ ] Commento : Aggiunto il collegamento tra piano dei conti analitica e piano dei conti contabile git-svn-id: svn://10.65.10.50/trunk@12970 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
f0c56484f9
commit
19236f1843
@ -96,7 +96,7 @@ protected:
|
||||
virtual TSimple_anal_msk* create_mask() const { return new TPiano_conti_anal_msk; }
|
||||
|
||||
void rec2row(const TMask& m);
|
||||
int row2rec(const TMask& m);
|
||||
void row2rec(const TMask& m);
|
||||
virtual int read(TMask& m);
|
||||
virtual int write(const TMask& m);
|
||||
virtual int rewrite(const TMask& m);
|
||||
@ -149,7 +149,7 @@ int TAnalisi_app::read(TMask& m)
|
||||
return err;
|
||||
}
|
||||
|
||||
int TAnalisi_app::row2rec(const TMask& m)
|
||||
void TAnalisi_app::row2rec(const TMask& m)
|
||||
{
|
||||
TSheet_field & s = m.sfield(F_SHEET);
|
||||
TMultiple_rectype & r = *_rows;
|
||||
@ -170,28 +170,34 @@ int TAnalisi_app::row2rec(const TMask& m)
|
||||
rec.put(PANAPDC_SOTTOCONTO, str.get());
|
||||
}
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
int TAnalisi_app::write(const TMask& m)
|
||||
{
|
||||
TRelation * r = get_relation();
|
||||
((TSimple_anal_msk &)m).update_tree_field();
|
||||
|
||||
m.autosave(*r);
|
||||
_rows->head() = r->lfile().curr();
|
||||
row2rec(m);
|
||||
const int err = _rows->write();
|
||||
|
||||
r->read();
|
||||
((TSimple_anal_msk &)m).update_tree_field();
|
||||
return err;
|
||||
}
|
||||
|
||||
int TAnalisi_app::rewrite(const TMask& m)
|
||||
{
|
||||
TRelation * r = get_relation();
|
||||
((TSimple_anal_msk &)m).update_tree_field();
|
||||
|
||||
m.autosave(*r);
|
||||
_rows->head() = r->lfile().curr();
|
||||
row2rec(m);
|
||||
|
||||
r->read();
|
||||
const int err = _rows->rewrite();
|
||||
|
||||
((TSimple_anal_msk &)m).update_tree_field();
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -229,8 +229,8 @@ bool ca_test_multilevel_field(TEdit_field& fld, int level)
|
||||
switch (p)
|
||||
{
|
||||
case 'A': ok = (v >= '0' && v <= '9') || (v >= 'A' && v <= 'Z'); break;
|
||||
case '0':
|
||||
case '9': ok = (v >= '0' && v <= '9'); break;
|
||||
case '0': ok = (v >= '0' && v <= '9'); break;
|
||||
case '9': ok = (v == ' ') || (v >= '0' && v <= '9'); break;
|
||||
default : break;
|
||||
}
|
||||
}
|
||||
@ -427,7 +427,7 @@ int ca_create_fields(TMask& msk, int page, int logicnum, int x, int y,
|
||||
TString80 prompt = mci.prompt(i);
|
||||
prompt.left_just(maxdeslen);
|
||||
|
||||
const char* flags = picture[0] == '0' ? "BUZ" : "BU";
|
||||
const char* flags = picture[0] == '0' || picture[0] == '9' ? "BUZ" : "BU";
|
||||
TEdit_field* kfld = NULL;
|
||||
if (mci.is_numeric_picture(i)) // Numeric
|
||||
kfld = &msk.add_number(kid, page, prompt, tab0, y+i, picture.len(), flags);
|
||||
@ -735,8 +735,8 @@ int TSimple_anal_msk::create_key_fields()
|
||||
const short did = get_field_id(0, 2);
|
||||
const int x = compute_offset()+3;
|
||||
const int y = 1;
|
||||
const int n = ca_create_fields(*this, logic, x, y, kid, did, 0x1);
|
||||
const int m = ca_create_fields(*this, logic, x, y, kid, did, 0x2);
|
||||
const int n = ca_create_fields(*this, 0, logic, x, y, kid, did, 0x1);
|
||||
const int m = ca_create_fields(*this, 0, logic, x, y, kid, did, 0x2);
|
||||
return n;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user