Patch level : 10.0 637

Files correlati     : lv3.exe
Ricompilazione Demo : [ ]
Commento            :

Aggiornato calcolo conguaglio sui buoni di consegna.


git-svn-id: svn://10.65.10.50/trunk@20112 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2010-02-13 07:53:02 +00:00
parent 577377ae94
commit 0c2c76d65a
2 changed files with 36 additions and 21 deletions

View File

@ -718,9 +718,9 @@ bool TGestione_bolle_msk::lv_codart_handler(TMask_field& f, KEY k)
{ {
const real congor = rcont.get_real(LVRCONDV_QTACONG); const real congor = rcont.get_real(LVRCONDV_QTACONG);
const real congat = conat - ritat + congor; const real congat = conat - conor - ritat + ritor + congor;
rdoc.put(RDOC_QTAGG5, congat); //conguaglio dopo modifica manuale msk.set(FR_QTAGG5, congat);
} }
} }
@ -1191,29 +1191,37 @@ void TGestione_bolle_app::elimina_vuote( const TMask& m)
void TGestione_bolle_app::salva_conguaglio( const TMask& m) void TGestione_bolle_app::salva_conguaglio( const TMask& m)
{ {
TDocumento_mask& mask = (TDocumento_mask&) m; if (ini_get_bool(CONFIG_DITTA, "lv", "Aggcong"))
TDocumento& d = mask.doc(); {
TDocumento_mask& mask = (TDocumento_mask&) m;
TDocumento& d = mask.doc();
TSheet_field& sheet = mask.sfield(F_SHEET); TSheet_field& sheet = mask.sfield(F_SHEET);
const long codcf = mask.get_long(F_CODCF); const long codcf = mask.get_long(F_CODCF);
const int indsped = mask.get_int(F_CODINDSP); const int indsped = mask.get_int(F_CODINDSP);
TDate datadoc = mask.get_date(F_DATADOC); TDate datadoc = mask.get_date(F_DATADOC);
const TLaundry_contract cont(codcf, indsped, datadoc); const TLaundry_contract cont(codcf, indsped, datadoc);
const int codcont = cont.get_int(LVCONDV_CODCONT); const int codcont = cont.get_int(LVCONDV_CODCONT);
TLocalisamfile rcondv(LF_LVRCONDV); TLocalisamfile rcondv(LF_LVRCONDV);
FOR_EACH_DOC_ROW_BACK(d, r, row) FOR_EACH_DOC_ROW_BACK(d, r, row)
{ {
TRiga_documento& rdoc = (TRiga_documento&)*row; TRiga_documento& rdoc = (TRiga_documento&)*row;
rcondv.put(LVRCONDV_CODCF,codcf); rcondv.put(LVRCONDV_CODCF,codcf);
rcondv.put(LVRCONDV_CODCONT, codcont); rcondv.put(LVRCONDV_CODCONT, codcont);
rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART)); rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART));
if (rcondv.read() == NOERR) if (rcondv.read() == NOERR)
rcondv.put(LVRCONDV_QTACONG, rdoc.get_real(RDOC_QTAGG5)); rcondv.put(LVRCONDV_QTACONG, rdoc.get_real(RDOC_QTAGG5));
} const real ritat = rdoc.get_real(RDOC_QTAGG1);
rcondv.rewrite(); const real conat = rdoc.get_real(RDOC_QTA);
rdoc.put(RDOC_QTAGG4, ritat);
rdoc.put(RDOC_QTAGG3, conat);
}
rcondv.rewrite();
}
} }
//ridefinisco il metodo write delle TMotore_application //ridefinisco il metodo write delle TMotore_application

View File

@ -431,6 +431,13 @@ BEGIN
FLAGS "D" FLAGS "D"
END END
NUMBER FR_QTAGG5 6 0
BEGIN
PROMPT 60 20 "Cong. "
FLAGS "H"
FIELD QTAGG5
END
ENDPAGE ENDPAGE
PAGE "Analitica" 0 2 0 0 PAGE "Analitica" 0 2 0 0