From 0ee8f9c3d09654a79535300ab83199c6220e1d96 Mon Sep 17 00:00:00 2001 From: angelo Date: Fri, 23 Sep 1994 08:40:01 +0000 Subject: [PATCH] Abilitata gestione stampa dati vendite per fornitori. git-svn-id: svn://10.65.10.50/trunk@282 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg0200.cpp | 24 +----------------------- cg/cg0200.h | 3 ++- cg/cg1200.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/cg/cg0200.cpp b/cg/cg0200.cpp index f79cef28a..da4394d5c 100755 --- a/cg/cg0200.cpp +++ b/cg/cg0200.cpp @@ -219,26 +219,6 @@ bool CG0200_application::tipo_handler(TMask_field& f, KEY key) return TRUE; } -HIDDEN bool tipocf_handler(TMask_field& f, KEY key) -{ - TMask& m = f.mask(); - const bool cf = (f.get() == "F"); - - if (key == K_TAB) - { - if (cf || !gest_vend()) // If it's a FORNICATOR disable pages - for (int j=3; j<8;j++) - m.disable_page(j); -else // If it's a CUSTOMER enable pages -{ - for (int j=3; j<8;j++) - m.enable_page(j); -} -} -return TRUE; -} - - bool CG0200_application::percip_handler(TMask_field& f, KEY key) { TMask& m = f.mask(); @@ -361,13 +341,12 @@ void CG0200_application::init_pages(TMask& m) { TConfig conf(CONFIG_DITTA, "cg"); - const bool tipocf=(m.get(F_TIPOCF) == "F"); _lbcn = (conf.get("GsLbCn") == "X"); m.send_key(K_SHIFT + K_CTRL + (_lbcn ? 's' : 'h'), -5); // Se non e' abilitata la gestione delle vendite disabilita le // maschere dalla 4 in poi - if (!gest_vend() || tipocf) + if (!gest_vend()) { for (int j=3; j<8;j++) m.disable_page(j); @@ -592,7 +571,6 @@ bool CG0200_application::user_create() // initvar e arrmask _pcon = new TLocalisamfile(LF_PCON); _comuni = new TLocalisamfile(LF_COMUNI); _msk = new TMask("cg0200a") ; - _msk->set_handler(F_TIPOCF,tipocf_handler); _msk->set_handler(F_OCCASIONALE, occas_handler); _msk->set_handler(F_COFI, autoexit_handler); _msk->set_handler(F_PAIV, autoexit_handler); diff --git a/cg/cg0200.h b/cg/cg0200.h index 3f08b77e9..3dd5ab66d 100755 --- a/cg/cg0200.h +++ b/cg/cg0200.h @@ -74,7 +74,8 @@ #define F_CODPORTO 169 #define F_RAGGDOC 170 #define F_NCOPIE 171 -#define F_CODCFASS 172 +#define F_CODFASS 172 +#define F_CODCASS 220 #define F_ASSFIS 173 #define F_FATTSOSP 174 #define F_VSNRPROT 175 diff --git a/cg/cg1200.cpp b/cg/cg1200.cpp index 9afb6f9de..be3c39b6d 100755 --- a/cg/cg1200.cpp +++ b/cg/cg1200.cpp @@ -223,10 +223,10 @@ bool gest_vend() bool rdbtype_handler(TMask_field& f, KEY k) { - if (k == K_TAB || k == K_SPACE) + if (k == K_TAB) //every time that change focus or value, check flag to enable button { - if ((atoi(f.get()) == 1) && gest_vend()) + if (gest_vend()) f.mask().enable(BUT_CG12_VENDITE); else f.mask().disable(BUT_CG12_VENDITE); @@ -396,12 +396,12 @@ void CG1200_App::set_vendite(int f, int c) // Prints CFVEN information // ///////////////////////////////// set_header(1, "Ditta %ld %s @102gData @<@125gPag @#", firm, (const char*) s); - set_header(2, "Dati Clienti per Vendite"); + set_header(2, "Dati Clienti/Fornitori per Vendite"); set_header(3, (const char *)(TString(132).fill('-'))); set_header(4," Codice Ragione sociale"); - set_header(5,"@9gNote Cliente @25gLegale per contenz. @46gCat.Finanziaria @63gCat.Vendita @76gAss.Fiscale @93gZona @101gAgente @112gProvvigione"); + set_header(5,"@9gNote Cli/For @25gLegale per contenz. @46gCat.Finanziaria @63gCat.Vendita @76gAss.Fiscale @93gZona @101gAgente @112gProvvigione"); set_header(6,"@9gCod.Listino @25gCod. Magazzino @46gSpese da Addeb. @63gBolli Tr. @76gBolli R.B. @93gSpese incasso @112gBolli sup. 50.000"); - set_header(7,"@9gFornitore ass. @25gCod. Meccanografico @46gGest. Contratto @63gRid. Iva @76gUltimo sollecito @93gUltimo estr. conto @112gTitolo onorifico"); + set_header(7,"@9gCli/For ass. @25gCod. Meccanografico @46gGest. Contratto @63gRid. Iva @76gUltimo sollecito @93gUltimo estr. conto @112gTitolo onorifico"); set_header(8,"@9gSconto cliente @25gSconto di riga @46gSconto incond. @63gFatt. Sosp. @76gVs. Lettera Esenzione @112gNs. Lettera Esenz."); set_header(9,"@9gCod. ABI p.e. @25gCod. CAB p.e. @46gInd. Effetti @63gEmiss. Eff. @76gImporto Minimo @93gEffetti non acc. @112gScadenza effetti"); set_header(10,"@9gInd.Documento @25gInd. Spedizione @46gNote Documento @63gCod.Mezzo @76gPorto @93gVettori");