Modifiche varie per corezione errori di contabilita'

git-svn-id: svn://10.65.10.50/trunk@3555 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
ale 1996-09-09 12:51:25 +00:00
parent c5bd965654
commit e2556e6d78
16 changed files with 243 additions and 151 deletions

View File

@ -1861,7 +1861,7 @@ bool TMastrini_application::preprocess_page(int file, int counter)
set_row (_rw,"@117g%s", (const char*) _importo_str);
}
}
const int righe_rimaste = printer().rows_left();
_stampato = righe_rimaste >= 1;

View File

@ -1332,7 +1332,7 @@ bool TRic_ListaMov::cerca_tipopag_codpag(TString& codpag, int tipopag)
for (int i = 0; !rpg.eof(); rpg.next(), i++)
{
dep.format("%-4s%d", (const char*) codpag, i);
dep.format("%-s%3d", (const char*) codpag, i);
rpg.zero();
rpg.put("CODTAB", dep);
@ -1548,7 +1548,7 @@ void TRic_ListaMov::descrizione_pagamento(TString& descr,int tipopag,TString& ul
for (int i = 0; !rpg.eof(); rpg.next(), i++)
{
dep.format("%-4s%d", (const char*) codpag, i);
dep.format("%-s%3d", (const char*) codpag, i);
rpg.zero();
rpg.put("CODTAB", dep);
@ -3095,20 +3095,20 @@ void TRic_ListaMov::setta_intestazione()
if (_intestaSC)
{
sep << "Ditta " << get_firm();
sep << " " << ragsoc;
sep.left_just(198);
sep1 << "Ditta " << get_firm();
sep1 << " " << ragsoc;
sep1.left_just(198);
set_header (soh++, (const char*) sep);
set_header (soh++, (const char*) sep1);
sep = "";
sep << "Data @< Pag. @#";
sep1 = "";
sep1 << "Data @< Pag. @#";
sep.right_just(193);
sep.overwrite ("LISTA DI CONTROLLO MOVIMENTI DI SALDACONTO");
set_header (soh++, (const char*)sep);
sep.fill('-');
set_header (soh++, (const char *) sep);
sep1.right_just(193);
sep1.overwrite ("LISTA DI CONTROLLO MOVIMENTI DI SALDACONTO");
set_header (soh++, (const char*)sep1);
sep1.fill('-');
set_header (soh++, (const char *) sep1);
}
else
{

View File

@ -6,6 +6,7 @@ BUTTON DLG_SAVEREC 10 2
BEGIN
PROMPT -15 -1 "~Registra"
MESSAGE EXIT,K_SAVE
PICTURE BMP_SAVEREC
END
BUTTON DLG_CANCEL 10 2

View File

@ -6,6 +6,7 @@ BUTTON DLG_SAVEREC 10 2
BEGIN
PROMPT -15 -1 "~Registra"
MESSAGE EXIT,K_SAVE
PICTURE BMP_SAVEREC
END
BUTTON DLG_CANCEL 10 2

View File

@ -34,7 +34,7 @@ bool TDitta_ric::set()
return FALSE;
}
_dittaric = msk->get_int(F_CODDITTA);
_dittaric = msk->get_long(F_CODDITTA);
set_firm(_dittaric);
if (!esegui_controlli())

View File

@ -61,6 +61,7 @@ bool TVar_sc::create()
rp.sheet_mask().set_handler(DLG_DELREC, elimina_partita);
_registrato = FALSE;
_aperti = FALSE;
dispatch_e_menu (BAR_ITEM(1));
@ -77,10 +78,13 @@ bool TVar_sc::destroy()
delete _part;
delete _scad;
delete _pagsca;
// delete _tab_reg;
delete _tpart;
delete _tscad;
delete _tpagsca;
// delete _tab_reg;
if (_aperti)
{
delete _tpart;
delete _tscad;
delete _tpagsca;
}
return TApplication::destroy();
}
@ -99,7 +103,8 @@ void TVar_sc::apri_temp_file()
_tpart = new TIsamtempfile(LF_PARTITE, tmppart, 0);
_tscad = new TIsamtempfile(LF_SCADENZE, tmpscad, 0);
_tpagsca = new TIsamtempfile(LF_PAGSCA, tmppagsca, 0);
_tpagsca = new TIsamtempfile(LF_PAGSCA, tmppagsca, 0);
_aperti = TRUE;
}
void TVar_sc::leggi_record_controllo()

View File

@ -1,126 +1,126 @@
#ifndef __CG6804_H
#define __CG6804_H
#include <mask.h>
#include <relation.h>
#include <tabutil.h>
#include <utility.h>
#include <config.h>
#include <mailbox.h>
#include <prefix.h>
#include <urldefid.h>
#include <msksheet.h>
#include <nditte.h>
#include <mov.h>
#include <rmov.h>
#include <rmoviva.h>
#include <pconti.h>
#include <occas.h>
#include <comuni.h>
class TVar_sc : public TApplication
{
TIsamtempfile* _tpart, *_tscad, *_tpagsca;
TLocalisamfile* _part, *_scad, *_pagsca;
TTable* _tab_reg;
TRectype* _rec_part,* _rec_scad,* _rec_pagsca;
TTransfer_file _tras_file;
TMask* _msk, *_mask;
bool _registrato;
TString _control_rec,_trasf,_std,_numpart,_tmcf;
long _dittaric,_sottoc;
int _gruppo,_conto,_anno,_nriga,_tm_caus;
char _tipocf;
bool _dd_caus,_nd_caus,_movval;
public:
virtual bool create();
virtual bool destroy();
virtual bool menu(MENU_TAG m);
bool main_loop();
void apri_temp_file();
bool esegui_controlli();
bool leggi_trasfer();
bool controlli();
void leggi_record_controllo();
bool video_SC();
void registra_partita(TMask& m);
void registra_scadenze(TMask& m);
void registra_pagamenti(TMask& m);
void setta_campi_maschera(TMask& m);
void setta_parametri_record(const TString& sigla,const TString& flag);
char TipoConto (int g, int c);
void ricerca_localita(TString& com, TString& den, TString& cap, TString& prov);
static bool a_notify(TSheet_field& s, int r, KEY k);
// HANDLER sulla riga di partita
static bool tipocf_handler (TMask_field& f, KEY k);
static bool codcf_handler (TMask_field& f, KEY k);
static bool rifpart_handler (TMask_field& f, KEY k);
static bool datareg_handler (TMask_field& f, KEY k);
static bool codcaus_handler (TMask_field& f, KEY k);
static bool datadoc_handler (TMask_field& f, KEY k);
static bool numdoc_handler (TMask_field& f, KEY k);
static bool contocl_handler (TMask_field& f, KEY k);
static bool tipomov_handler (TMask_field& f, KEY k);
static bool sezione_handler (TMask_field& f, KEY k);
static bool tipopag_handler (TMask_field& f, KEY k);
static bool datapag_handler (TMask_field& f, KEY k);
static bool codval_handler (TMask_field& f, KEY k);
static bool datacam_handler (TMask_field& f, KEY k);
static bool cambio_handler (TMask_field& f, KEY k);
static bool gestione_handler (TMask_field& f, KEY k);
static bool registra_dati_comuni(TMask_field& f, KEY k);
static bool elimina_partita (TMask_field& f, KEY k);
// HANDLER sulla riga di scadenza
static bool nrata_handler (TMask_field& f, KEY k);
static bool codpag_handler (TMask_field& f, KEY k);
static bool tpscad_handler (TMask_field& f, KEY k);
static bool ultclass_handler (TMask_field& f, KEY k);
static bool datascad_handler (TMask_field& f, KEY k);
static bool banca_handler (TMask_field& f, KEY k);
static bool codag_handler (TMask_field& f, KEY k);
static bool datasoll_handler (TMask_field& f, KEY k);
static bool importo_handler (TMask_field& f, KEY k);
static bool impval_handler (TMask_field& f, KEY k);
static bool elimina_scadenza (TMask_field& f, KEY k);
// HANDLER sulla riga di pagamento
static bool rifpartita_handler (TMask_field& f, KEY k);
static bool accsal_handler (TMask_field& f, KEY k);
static bool passat_handler (TMask_field& f, KEY k);
static bool impvalp_handler (TMask_field& f, KEY k);
static bool abbuoni_handler (TMask_field& f, KEY k);
static bool contropartita_handler(TMask_field& f, KEY k);
static bool elimina_pagamenti (TMask_field& f, KEY k);
static bool sezione_abb_handler (TMask_field& f, KEY k);
static bool sezione_dc_handler (TMask_field& f, KEY k);
static bool diffcambio_handler (TMask_field& f, KEY k);
static bool ritenute_handler (TMask_field& f, KEY k);
bool descr_conto(const TString&,int,int,long,TString&);
bool descr_caus (const TString&,TString&);
bool descr_contocl(int,int,TString&);
bool tipo_contocl(int,int,TString&);
bool codvaluta (const TString& codval);
void setta_mask_scad(char t,int g,int c,long s,int anno,const TString& np,int nr,TMask& m);
void setta_mask_pagsca(char t,int g,int c,long s,int anno,const TString& np,int nr,TMask& m);
char sezione(char tipo,int g,int c,long s,int anno,const TString& npart,int nriga,TString& codval,TMask& m);
int tipo_movimento(char tipo,int g,int c,long s,int anno,const TString& npart,int nriga,TMask& m);
void descr_condpag(const TString& codpag,int tipopag,const TString& ultclass,TString& d_condpag);
bool record_partite(char tipo,int g,int c,long s,int anno,TString& npart,int nrigp);
bool record_scadenze(char tipo,int g,int c,long s,int anno,TString& npart,int nrigp,int nrata);
void sgancia_pagamenti(char tipo,int g,int c,long s,int anno,TString& npart,int nriga,int nrata);
bool cancella_partita(TMask_field& f);
bool cancella_scadenza(TMask_field& f);
bool cancella_pagamenti(TMask_field& f);
bool controlla_abbuoni_diffcam(char tipo,int g,int c,long s,int anno,TString& npart,int nriga,int nrata);
TVar_sc();
};
#ifndef __CG6804_H
#define __CG6804_H
#include <mask.h>
#include <relation.h>
#include <tabutil.h>
#include <utility.h>
#include <config.h>
#include <mailbox.h>
#include <prefix.h>
#include <urldefid.h>
#include <msksheet.h>
#include <nditte.h>
#include <mov.h>
#include <rmov.h>
#include <rmoviva.h>
#include <pconti.h>
#include <occas.h>
#include <comuni.h>
class TVar_sc : public TApplication
{
TIsamtempfile* _tpart, *_tscad, *_tpagsca;
TLocalisamfile* _part, *_scad, *_pagsca;
TTable* _tab_reg;
TRectype* _rec_part,* _rec_scad,* _rec_pagsca;
TTransfer_file _tras_file;
TMask* _msk, *_mask;
bool _registrato,_aperti;
TString _control_rec,_trasf,_std,_numpart,_tmcf;
long _dittaric,_sottoc;
int _gruppo,_conto,_anno,_nriga,_tm_caus;
char _tipocf;
bool _dd_caus,_nd_caus,_movval;
public:
virtual bool create();
virtual bool destroy();
virtual bool menu(MENU_TAG m);
bool main_loop();
void apri_temp_file();
bool esegui_controlli();
bool leggi_trasfer();
bool controlli();
void leggi_record_controllo();
bool video_SC();
void registra_partita(TMask& m);
void registra_scadenze(TMask& m);
void registra_pagamenti(TMask& m);
void setta_campi_maschera(TMask& m);
void setta_parametri_record(const TString& sigla,const TString& flag);
char TipoConto (int g, int c);
void ricerca_localita(TString& com, TString& den, TString& cap, TString& prov);
static bool a_notify(TSheet_field& s, int r, KEY k);
// HANDLER sulla riga di partita
static bool tipocf_handler (TMask_field& f, KEY k);
static bool codcf_handler (TMask_field& f, KEY k);
static bool rifpart_handler (TMask_field& f, KEY k);
static bool datareg_handler (TMask_field& f, KEY k);
static bool codcaus_handler (TMask_field& f, KEY k);
static bool datadoc_handler (TMask_field& f, KEY k);
static bool numdoc_handler (TMask_field& f, KEY k);
static bool contocl_handler (TMask_field& f, KEY k);
static bool tipomov_handler (TMask_field& f, KEY k);
static bool sezione_handler (TMask_field& f, KEY k);
static bool tipopag_handler (TMask_field& f, KEY k);
static bool datapag_handler (TMask_field& f, KEY k);
static bool codval_handler (TMask_field& f, KEY k);
static bool datacam_handler (TMask_field& f, KEY k);
static bool cambio_handler (TMask_field& f, KEY k);
static bool gestione_handler (TMask_field& f, KEY k);
static bool registra_dati_comuni(TMask_field& f, KEY k);
static bool elimina_partita (TMask_field& f, KEY k);
// HANDLER sulla riga di scadenza
static bool nrata_handler (TMask_field& f, KEY k);
static bool codpag_handler (TMask_field& f, KEY k);
static bool tpscad_handler (TMask_field& f, KEY k);
static bool ultclass_handler (TMask_field& f, KEY k);
static bool datascad_handler (TMask_field& f, KEY k);
static bool banca_handler (TMask_field& f, KEY k);
static bool codag_handler (TMask_field& f, KEY k);
static bool datasoll_handler (TMask_field& f, KEY k);
static bool importo_handler (TMask_field& f, KEY k);
static bool impval_handler (TMask_field& f, KEY k);
static bool elimina_scadenza (TMask_field& f, KEY k);
// HANDLER sulla riga di pagamento
static bool rifpartita_handler (TMask_field& f, KEY k);
static bool accsal_handler (TMask_field& f, KEY k);
static bool passat_handler (TMask_field& f, KEY k);
static bool impvalp_handler (TMask_field& f, KEY k);
static bool abbuoni_handler (TMask_field& f, KEY k);
static bool contropartita_handler(TMask_field& f, KEY k);
static bool elimina_pagamenti (TMask_field& f, KEY k);
static bool sezione_abb_handler (TMask_field& f, KEY k);
static bool sezione_dc_handler (TMask_field& f, KEY k);
static bool diffcambio_handler (TMask_field& f, KEY k);
static bool ritenute_handler (TMask_field& f, KEY k);
bool descr_conto(const TString&,int,int,long,TString&);
bool descr_caus (const TString&,TString&);
bool descr_contocl(int,int,TString&);
bool tipo_contocl(int,int,TString&);
bool codvaluta (const TString& codval);
void setta_mask_scad(char t,int g,int c,long s,int anno,const TString& np,int nr,TMask& m);
void setta_mask_pagsca(char t,int g,int c,long s,int anno,const TString& np,int nr,TMask& m);
char sezione(char tipo,int g,int c,long s,int anno,const TString& npart,int nriga,TString& codval,TMask& m);
int tipo_movimento(char tipo,int g,int c,long s,int anno,const TString& npart,int nriga,TMask& m);
void descr_condpag(const TString& codpag,int tipopag,const TString& ultclass,TString& d_condpag);
bool record_partite(char tipo,int g,int c,long s,int anno,TString& npart,int nrigp);
bool record_scadenze(char tipo,int g,int c,long s,int anno,TString& npart,int nrigp,int nrata);
void sgancia_pagamenti(char tipo,int g,int c,long s,int anno,TString& npart,int nriga,int nrata);
bool cancella_partita(TMask_field& f);
bool cancella_scadenza(TMask_field& f);
bool cancella_pagamenti(TMask_field& f);
bool controlla_abbuoni_diffcam(char tipo,int g,int c,long s,int anno,TString& npart,int nriga,int nrata);
TVar_sc();
};
#endif //__CG6804_H

View File

@ -6,6 +6,7 @@ BUTTON DLG_SAVEREC 10 2
BEGIN
PROMPT -13 -1 "~Registra"
MESSAGE EXIT,K_SAVE
PICTURE BMP_SAVEREC
END
BUTTON DLG_CANCEL 10 2

View File

@ -6,6 +6,7 @@ BUTTON DLG_SAVEREC 10 2
BEGIN
PROMPT -13 -1 "~Registra"
MESSAGE EXIT,K_SAVE
PICTURE BMP_SAVEREC
END
BUTTON DLG_CANCEL 10 2

View File

@ -5,7 +5,8 @@ TOOLBAR "" 0 20 0 2
BUTTON DLG_SAVEREC 10 2
BEGIN
PROMPT -13 -1 "~Registra"
MESSAGE EXIT,K_SAVE
MESSAGE EXIT,K_SAVE
PICTURE BMP_SAVEREC
END
BUTTON DLG_CANCEL 10 2

View File

@ -3,7 +3,8 @@ TOOLBAR "" 0 20 0 2
BUTTON DLG_OK 8 2
BEGIN
PROMPT -13 -1 "~Conferma"
MESSAGE EXIT,K_SAVE
MESSAGE EXIT,K_SAVE
PICTURE BMP_SAVEREC
END
BUTTON DLG_DELREC 8 2

View File

@ -1897,6 +1897,14 @@ int cg6900 (int argc, char* argv[])
delete a;
}
break;
case 'C':
{
TCanc_file_invio* a = new TCanc_file_invio;
a->run(argc, argv,"Eliminazione file invio");
delete a;
}
break;
default:
break;
}

View File

@ -37,7 +37,8 @@
#include <pagsca.h>
#include "cg6901.h"
#include "cg6903.h"
#include "cg6903.h"
#include "cg6905.h"
#include "cglib04.h"
class TInv_cont : public TApplication

39
cg/cg6905.cpp Executable file
View File

@ -0,0 +1,39 @@
#include "cg6905.h"
bool TCanc_file_invio::create()
{
TApplication::create();
dispatch_e_menu (BAR_ITEM(1));
return TRUE;
}
bool TCanc_file_invio::destroy()
{
return TApplication::destroy();
}
bool TCanc_file_invio::set()
{
TString marker;
_tras_file.remove_all(FALSE);
marker = firm2dir(0);
marker << "\\marker";
fremove(marker);
message_box("Eliminazione file di lavoro dell' invio terminata");
return FALSE;
}
bool TCanc_file_invio::menu(MENU_TAG m)
{
if (m == BAR_ITEM(1))
return set();
return FALSE;
}

21
cg/cg6905.h Executable file
View File

@ -0,0 +1,21 @@
// Ripristino flag invio PN e IVA
#include <applicat.h>
#include <isam.h>
#include <urldefid.h>
#include "cglib04.h"
class TCanc_file_invio : public TApplication
{
TTransfer_file _tras_file;
public:
virtual bool create();
virtual bool destroy();
virtual bool menu(MENU_TAG m);
bool set();
TCanc_file_invio() {}
};

View File

@ -2916,8 +2916,12 @@ void TTransfer_file::new_key(TString& key, int tipo, TString& buffer)
n_key << "3";
n_key << key.mid(2,6);
n_key << key.mid(8,2);
n_key << buffer.mid(26,2);
n_key << buffer.mid(28,7);
n_key << buffer.mid(26,2);
TString app; // Modifica del 06-09-96 relativa all'allineamento
app = buffer.mid(28,7);
app.trim(); // del numero di riferimento partita che per i file
app.format("%-7s", (const char*) app); // temporanei deve essere sempre a sinistra
n_key << app; // indipendentemente da quello che c'e' sul trasfer
n_key << buffer.mid(35,2);
n_key << key.mid(10,3);
@ -3395,7 +3399,7 @@ void TTransfer_file::scrivi_SC(long nrec)
delete _tpagsca;
delete _deppagsca;
}
//Scarica su file temp il contenuto del trasfer
bool TTransfer_file::fcopytemp_PC(const char* orig, const char* dest)
{
@ -3529,6 +3533,14 @@ bool TTransfer_file::fcopytemp_PC(const char* orig, const char* dest)
ok = fwrite((char*)(const char*)buffer, 1, letti, o) == letti;
fclose(o);
}
if (trec == "B1" || trec == "B2" || trec == "B3")
{
TString app = buffer.mid(19,7);
app.trim(); // Modifica del 06-09-96 relativa all'allineamento
app.format("%-7s", (const char*) app); // del numero di riferimento partita che per i file
buffer.overwrite(app,19); // temporanei deve essere sempre a sinistra
} // indipendentemente da quello che c'e' sul trasfer
if (trec == "W1")
write_testata_causali(buffer);