From 27180a89ad22ab2ad3b7b63f8bcf6cba60fbf775 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Sun, 29 Jan 2017 10:39:02 +0000 Subject: [PATCH] Patch level : 12.0 336 Files correlati : cg2.exe cg5100a.msk Corretta proposta numero di protocollo in prima nota ( alla seconda registrazione non aggiornava il numero). Sistemata la posizione di ampi nei parametri ditta. git-svn-id: svn://10.65.10.50/branches/R_10_00@23560 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/cg/cg2100.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/cg/cg2100.cpp b/src/cg/cg2100.cpp index 927df7dc0..3213544fe 100755 --- a/src/cg/cg2100.cpp +++ b/src/cg/cg2100.cpp @@ -305,7 +305,7 @@ bool TPrimanota_application::read_caus(const char* cod, int year) if (_mode == MODE_QUERY || m == NULL) return true; - const bool ins = m->insert_mode(); + const bool ins = check_insert_mode(); m->efield(F_NUMDOC).check_type(nob ? CHECK_REQUIRED : CHECK_NORMAL); // Num. doc. obbligatorio m->efield(F_DATADOC).check_type(dob ? CHECK_REQUIRED : CHECK_NORMAL); // Data doc. obbligatoria @@ -340,22 +340,11 @@ bool TPrimanota_application::read_caus(const char* cod, int year) if (!av) m->reset(F_DATA74TER); TRegistro& r = c.reg(); - const bool reg_vendite = r.iva() == iva_vendite && !r.corrispettivi(); - - if (ins) - { - const TString4 codreg = c.reg().name(); - const int regyear = c.reg().year(); - TRegistro r(codreg, regyear); - const long protiva = r.protocol() + 1; - - m->set(F_PROTIVA, protiva, true); // Aggiorna protocollo IVA - } - const bool show_notevar = iva == iva_vendite || iva == iva_acquisti; TSheet_field& ivasheet = m->sfield(F_SHEETIVA); - ivasheet.enable_column(IVA_NOTAVARECF, show_notevar); + + ivasheet.enable_column(IVA_NOTAVARECF, show_notevar); ivasheet.sheet_mask().enable(IVA_NOTAVARECF, show_notevar); } @@ -916,6 +905,18 @@ void TPrimanota_application::init_insert_mode(TMask& m) tmp.fremove(); } + if (iva() != nessuna_iva) + { + message_box("ok"); + TRegistro& reg = causale().reg(); + const TString4 codreg = reg.name(); + const int regyear = reg.year(); + TRegistro r(codreg, regyear); + const long protiva = r.protocol() + 1; + + m.set(F_PROTIVA, protiva, true); // Aggiorna protocollo IVA + } + } void TPrimanota_application::init_modify_mode(TMask& m)