From cead731ced1f704ad2aed9725f72bfe3baababe2 Mon Sep 17 00:00:00 2001 From: angelo Date: Mon, 3 Nov 1997 11:38:54 +0000 Subject: [PATCH] Modificato programma di apertura es. IVA: riportato nuovo flag di agricoltore minimo, presente sui parametri liquidazione. git-svn-id: svn://10.65.10.50/trunk@5516 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4501.cpp | 10 ++++++++- cg/cg4501.h | 59 ++++++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/cg/cg4501.cpp b/cg/cg4501.cpp index fbdf5247c..752bc68e5 100755 --- a/cg/cg4501.cpp +++ b/cg/cg4501.cpp @@ -73,6 +73,7 @@ bool TAp_iva::apertura_iva() newrec = TabLia.curr(); newrec.put("CODTAB", format("%05ld%04d", get_firm(), _annoiva)); newrec.put("S7", _frequenza); + newrec.put("B2", _is_minagr); newrec.zero("R0"); TabLia.write(newrec); } @@ -225,12 +226,16 @@ bool TAp_iva::menu(MENU_TAG m) _annop = conf.get("AnLiIv"); int aivap = atoi(_annop); int anno = aivap+1; + _is_minagr = FALSE; TabLia.zero(); TString16 chiave; chiave.format("%05ld%04d", get_firm(), anno); TabLia.put("CODTAB",chiave); if (TabLia.read() == NOERR) - msk.set(F_FREQUENZA, TabLia.get("S7")); + { + msk.set(F_FREQUENZA, TabLia.get("S7")); + _is_minagr = TabLia.get_bool("B2"); + } else { TabLia.zero(); @@ -238,7 +243,10 @@ bool TAp_iva::menu(MENU_TAG m) chiave.format("%05ld%04d", get_firm(), aivap); TabLia.put("CODTAB", chiave); if (TabLia.read() == NOERR) + { msk.set(F_FREQUENZA, TabLia.get("S7")); + _is_minagr = TabLia.get_bool("B2"); + } else { nditte.zero(); diff --git a/cg/cg4501.h b/cg/cg4501.h index 9899e67ab..65217b686 100755 --- a/cg/cg4501.h +++ b/cg/cg4501.h @@ -1,30 +1,31 @@ -#include -#include -#include -#include -#include -#include -#include - -class TAp_iva : public TApplication -{ - TTable* _reg, * _lia, * _lbu; - TLocalisamfile* _nditte; - int _annoiva; - TString _annop; - long _ditta; - char _frequenza; - -protected: - static bool mask_annoiva(TMask_field&, KEY); - -public: - virtual bool create(); - virtual bool destroy(); - virtual bool menu(MENU_TAG m); - - bool setta(); - bool apertura_iva(); - - TAp_iva() {} +#include +#include +#include +#include +#include +#include +#include + +class TAp_iva : public TApplication +{ + TTable* _reg, * _lia, * _lbu; + TLocalisamfile* _nditte; + int _annoiva; + TString _annop; + long _ditta; + char _frequenza; + bool _is_minagr; + +protected: + static bool mask_annoiva(TMask_field&, KEY); + +public: + virtual bool create(); + virtual bool destroy(); + virtual bool menu(MENU_TAG m); + + bool setta(); + bool apertura_iva(); + + TAp_iva() {} }; \ No newline at end of file