root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correzioni per trasformazione da saldacon a cgsaldac

Browse Source 
pagament   cgpagame
                                 classpim   cgpim


git-svn-id: svn://10.65.10.50/trunk@4725 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-06-20 08:52:24 +00:00
parent 7a33c15e88
commit 616dafeedf
18 changed files with 121 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cg/cg0400.cpp
View File

@ -4,13 +4,13 @@
#include <mask.h>
#include <printapp.h>
#include <tabutil.h>
#include <utility.h>
//#include <utility.h>
#include <prefix.h>
#include "cg0.h"
#include "cg0400.h"
#include "classpim.h"
#include "cgpim.h"
#include <anagr.h>
#include <comuni.h>
@ -202,7 +202,7 @@ const char* TProgressivi_iva::desc_iva(const TString& cod)
else
{
TTable tab_iva("%IVA");
TString codtab(format("%-4s", (const char*)cod));
TString16 codtab; codtab.format("%-4s", (const char*)cod);
tab_iva.zero();
tab_iva.put("CODTAB", codtab);
@ -1006,7 +1006,10 @@ int TProgressivi_iva::stampa_intestazione_ditta()
r++;
riga = "Data @< Pag. @#";
riga.right_just(127);
riga.overwrite (format ("Partita iva %s Codice fiscale %s", (const char*)_paiva, (const char*)_cofi));
TString80 dep; dep.format ("Partita iva %s Codice fiscale %s",
(const char*)_paiva, (const char*)_cofi);
riga.overwrite (dep);
set_header (r, "%s", (const char*) riga);
r+=3;

7
cg/cg2100.cpp
View File

@ -1,20 +1,17 @@
#include <config.h>
#include <mailbox.h>
#include <msksheet.h>
#include <urldefid.h>
#include <execp.h>
#include <utility.h>
#include "pagament.h"
#include "cgpagame.h"
#include "cg2100.h"
#include "cg2102.h"
#include "cg21sld.h"
// Nomi dei campi
#include <mov.h>
#include <rmov.h>
#include <rmoviva.h>
#include <scadenze.h>
#include <clifo.h>
#include <rcausali.h>

5
cg/cg2101.cpp
View File

@ -7,11 +7,6 @@
#include "cg2101.h"
#include "cg2103.h"
#include <mov.h>
#include <rmov.h>
#include <rmoviva.h>
#include <utility.h>
///////////////////////////////////////////////////////////
// Movimento di prima nota
///////////////////////////////////////////////////////////

13
cg/cg2101.h
View File

@ -9,6 +9,19 @@
#include <relation.h>
#endif
#ifndef __MOV_H
#include <mov.h>
#endif
#ifndef __RMOV_H
#include <rmov.h>
#endif
#ifndef __RMOVIVA_H
#include <rmoviva.h>
#endif
#ifndef __CGLIB01_H
class TRegistro;
#endif

4
cg/cg2102.cpp
View File

@ -1,6 +1,6 @@
#include <colors.h>
#include <msksheet.h>
#include <progind.h>
#include <tabutil.h>
#include <urldefid.h>
#include <utility.h>
@ -8,8 +8,6 @@
#include "cg2102.h"
#include "cg21sld.h"
#include <mov.h>
#include <rmov.h>
#include <clifo.h>
///////////////////////////////////////////////////////////

8
cg/cg2102.h
View File

@ -5,12 +5,12 @@
#include <relapp.h>
#endif
#ifndef __PAGAMENT_H
#include "pagament.h"
#ifndef __CGPAGAME_H
#include "cgpagame.h"
#endif
#ifndef __SALDACON_H
#include "saldacon.h"
#ifndef __CGSALDAC_H
#include "cgsaldac.h"
#endif
#ifndef __CGLIB02_H

12
cg/cg2104.cpp
View File

@ -3,19 +3,17 @@
// fv 24/8/94
// --------------------------------------------------------------------------
#include "pagament.h"
#include "saldacon.h"
#include "utility.h"
#include <msksheet.h>
#include <utility.h>
#include "cgpagame.h"
#include "cgsaldac.h"
#include "cg2102.h"
#include "cg2100.h"
#include "cg21sld.h"
#include <clifo.h>
#include <mov.h>
#include <partite.h>
#include <scadenze.h>
#include <pagsca.h>
#include <defmask.h>
TPagamento& TPrimanota_application::pagamento() const

6
cg/cg2105.cpp
View File

@ -1,10 +1,11 @@
#include <defmask.h> // Serve per DLG_NEWREC
#include <msksheet.h>
#include <colors.h> // COlori righe
#include "cg2100p.h" // Campi maschere partite e pagamenti
#ifdef __EXTRA__
#include "saldacon.h"
#include "cgsaldac.h"
#include "sc0100p.h"
#else
#include "cg2100.h" // Campi maschere prima nota
@ -14,9 +15,6 @@
#include <causali.h> // Archivio causali
#include <clifo.h> // Archivio clienti/fornitori
#include <mov.h> // Archivio movimenti di prima nota
#include <pagsca.h> // Archivio pagamenti
#include <partite.h> // Archivio partite
#include <scadenze.h> // Archivio scadenze
///////////////////////////////////////////////////////////
// Definizione Maschera partite

3
cg/cg2106.cpp
View File

@ -290,9 +290,6 @@ void TPrimanota_application::set_colors()
// Gestione cambiamento prorata
///////////////////////////////////////////////////////////
#include <rmov.h>
#include <rmoviva.h>
bool TPrimanota_application::test_prorata()
{
if (iva() != iva_acquisti || !cgs().shown())

3
cg/cg2200.cpp
View File

@ -10,9 +10,6 @@
#include "cglib02.h"
#include <causali.h>
#include <mov.h>
#include <rmov.h>
#include <rmoviva.h>
TString& add_plural(TString& s, long num, const char* name)
{

19
cg/cg6400.cpp
View File

@ -2,23 +2,21 @@
#include <direct.h>
#include <applicat.h>
#include <colors.h>
#include <isam.h>
#include <archives.h>
#include <config.h>
#include <mask.h>
#include <prefix.h>
#include <printapp.h>
#include <progind.h>
#include <tabutil.h>
#include <urldefid.h>
#include <utility.h>
#include <progind.h>
#include <nditte.h>
#include "cglib04.h"
#include "cg6400.h"
#include "saldacon.h"
#include "cglib04.h"
#include "cgsaldac.h"
class TRic_archivi : public TApplication
{
@ -36,7 +34,6 @@ class TRic_archivi : public TApplication
TLocalisamfile* _scad;
TLocalisamfile* _pagsca;
TLocalisamfile* _tab;
TArchive _arc;
TString80 TEMP;
@ -762,14 +759,14 @@ void TRic_archivi::ditta_ricevente()
long TRic_archivi::leggi_tabella_tras()
{
TString dep;
TString dep(16);
long ditta = 0;
bool agg_fatatt,agg_fatpas;
TTable tab_tra ("%TRA");
tab_tra.zero();
dep = format("%10s%05ld", (const char*) _nomeid, _dittainv);
dep.format("%10s%05ld", (const char*) _nomeid, _dittainv);
tab_tra.put("CODTAB", (const char*) dep);
if (tab_tra.read() == NOERR)
{
@ -923,11 +920,11 @@ bool TRic_archivi::set_flag()
void TRic_archivi::aggiorna_tabella()
{
TString dep;
TString dep(16);
TTable tab_tra ("%TRA");
tab_tra.zero();
dep = format("%10s%05ld", (const char*) _nomeid, _dittainv);
dep.format("%10s%05ld", (const char*) _nomeid, _dittainv);
tab_tra.put("CODTAB", (const char*) dep);
if (tab_tra.read() == NOERR)
{

87
cg/cg6600.cpp
View File

@ -1,39 +1,32 @@
// Ricezione dati da sistema
#include <mask.h>
#include <printapp.h>
#include <relation.h>
#include <tabutil.h>
#include <utility.h>
#include <applicat.h>
#include <config.h>
#include <urldefid.h>
#include <mailbox.h>
#include <execp.h>
#include <mask.h>
#include <tabutil.h>
#include <prefix.h>
#include <scanner.h>
#include <lffiles.h>
#include <progind.h>
#include <nditte.h>
#include <mov.h>
#include <rmov.h>
#include <rmoviva.h>
#include <pconti.h>
#include <comuni.h>
#include <clifo.h>
#include <rcausali.h>
#include <causali.h>
#include <occas.h>
#include <partite.h>
#include <scadenze.h>
#include <pagsca.h>
#include <urldefid.h>
#include <utility.h>
#include "cglib04.h"
#include "cglib01.h"
#include "cglib02.h"
#include "saldacon.h"
#include "cglib04.h"
#include "cgsaldac.h"
#include "cg6600.h"
#include <comuni.h>
#include <causali.h>
#include <clifo.h>
#include <mov.h>
#include <nditte.h>
#include <rcausali.h>
#include <rmov.h>
#include <rmoviva.h>
#include <occas.h>
#include <pconti.h>
class TRic_tab : public TApplication
{
@ -426,9 +419,9 @@ void TRic_tab::ricevi_causali(TString& key, char uselab)
if (flag == 'N')
{
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%3s",(const char*) codcaus);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -462,9 +455,9 @@ void TRic_tab::ricevi_causali(TString& key, char uselab)
}
leggi_record_controllo();
TString chiave;
chiave.format("%3s",(const char*) codcaus);
TString sigla (format("%c", uselab));
TString16 chiave;
chiave.format("%3s", (const char*)codcaus);
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -505,9 +498,9 @@ void TRic_tab::scrivi_righe_causali(TString& codcaus, char uselab)
_rcaus->write();
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%3s",(const char*) codcaus);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -548,9 +541,9 @@ void TRic_tab::ricevi_clifo(TString& key, char uselab)
if (flag == 'N')
{
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%c%06ld", tipocf,codcf);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -597,9 +590,9 @@ void TRic_tab::ricevi_clifo(TString& key, char uselab)
}
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%c%06ld", tipocf, codcf);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -651,9 +644,9 @@ void TRic_tab::ricevi_pcon(TString& key, char uselab)
if (flag == 'N')
{
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%03d%03d%06ld", g, c, s);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -701,9 +694,9 @@ void TRic_tab::ricevi_pcon(TString& key, char uselab)
_pcon->write();
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%03d%03d%06ld", g, c, s);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -1095,9 +1088,9 @@ void TRic_tab::ricevi_movPN(TString& key, char uselab)
}
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%07ld", nreg);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -1130,7 +1123,7 @@ bool TRic_tab::occasionali(TString& ocfpi)
}
prog++;
chiave = format("%3s%13ld", (const char*) "RIC", prog);
chiave.format("%3s%13ld", (const char*) "RIC", prog);
esiste = FALSE;
ocfpi = chiave;
@ -1152,7 +1145,7 @@ bool TRic_tab::occasionali(TString& ocfpi)
prog = atol(cfpi.mid(3,13));
}
prog++;
chiave = format("%3s%13ld", (const char*) "RIC", prog);
chiave.format("%3s%13ld", (const char*) "RIC", prog);
ocfpi = chiave;
_occas->readat(rec);
}
@ -1277,9 +1270,9 @@ void TRic_tab::ricevi_movIVA(TString& key, char uselab)
}
leggi_record_controllo();
TString chiave;
TString16 chiave;
chiave.format("%07ld", nreg);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);
@ -1556,7 +1549,7 @@ void TRic_tab::ricevi_movSC(TString& key, char uselab)
leggi_record_controllo();
TString chiave;
chiave.format("%c%03d%03d%06ld%04d%7s%04d", tipocf,gruppo,conto,codcf,anno,(const char*)numpart,nriga);
TString sigla (format("%c", uselab));
TString16 sigla; sigla << uselab;
str = _record.overwrite(sigla,240);
str = _record.overwrite(chiave,241);
_tras_file.write_control_rec(str,1024);

14
cg/pagament.cpp → cg/cgpagame.cpp
View File

@ -1,7 +1,9 @@
#include <applicat.h>
#include <msksheet.h>
#include <tabutil.h>
#include <utility.h>
#include "pagament.h"
#include <xvtility.h>
#include "cgpagame.h"
#include "cg2100.h"
#include <mov.h>
@ -1588,6 +1590,8 @@ int TPagamento::remove(TTable& r)
void TPagamento::set_rate_auto()
{
TWait_cursor hourglass;
// vedi rate esistenti e tipo prima rata
// deve fare riferimento ad un tipo pagamento esistente
// e sensato
@ -1596,7 +1600,6 @@ void TPagamento::set_rate_auto()
return;
int first = _tpr > 3 ? 1 : 0;
main_app().begin_wait();
set_inizio(_datadoc);
for (int v = 0; v < (in_valuta() ? 2 : 1); v++)
@ -1659,7 +1662,6 @@ void TPagamento::set_rate_auto()
// risistema rate per scadenze fisse
adjust_fixed_scad();
main_app().end_wait();
}
const real& TPagamento::importo_da_dividere(bool v) const
@ -1753,7 +1755,7 @@ void TPagamento::init_total(const real& ib, const real& im, const real& sp, bool
void TPagamento::set_sheet(TSheet_field& sf, int sscad)
{
main_app().begin_wait();
TWait_cursor hourglass;
if (_rate.items() == 0)
{
@ -1830,8 +1832,6 @@ void TPagamento::set_sheet(TSheet_field& sf, int sscad)
{
sf.enable_cell(0, 1, abilita); // percentuale
}
main_app().end_wait();
}
void TPagamento::adjust_fixed_scad()

18
cg/pagament.h → cg/cgpagame.h
View File

@ -1,16 +1,20 @@
#ifndef __PAGAMENT_H
#define __PAGAMENT_H
#ifndef __CGPAGAME_H
#define __CGPAGAME_H
#ifndef __MSKSHEET_H
#include <msksheet.h>
#ifndef __DATE_H
#include <date.h>
#endif
#ifndef __RELATION_H
#include <relation.h>
#ifndef __REAL_H
#include <real.h>
#endif
#ifndef __MSKSHEET_H
class TSheet_field;
#endif
#ifndef __TABUTIL_H
#include <tabutil.h>
class TTable;
#endif
// Error codes for pagation

8
cg/classpim.cpp → cg/cgpim.cpp
View File

@ -1,8 +1,10 @@
// classpim.cpp
// funzione per classificare i PIM e sommare tutto cio' che contengono
#include "classpim.h"
#include <stdlib.h>
#include <isam.h>
// funzione per classificare i PIM e sommare tutto cio' che contengono
#include "cgpim.h"
bool classify_pim(TRectype& pimr, real& imp, real& iva, tiporec& t, bool tipost)
{
static int last_checked = -1;

6
cg/classpim.h → cg/cgpim.h
View File

@ -1,11 +1,11 @@
// classpim.h
// funzioni ed enum per classificare i pim
#ifndef __CLASSPIM_H
#define __CLASSPIM_H
#ifndef __CGPIM_H
#define __CGPIM_H
#ifndef __ISAM_H
#include <isam.h>
class TRectype;
#endif
#ifndef __REAL_H

4
cg/saldacon.cpp → cg/cgsaldac.cpp
View File

@ -2,12 +2,10 @@
#include <mask.h>
#include <relation.h>
#include "saldacon.h"
#include "cgsaldac.h"
#include <mov.h>
#include <rmov.h>
#include <scadenze.h>
#include <pagsca.h>
///////////////////////////////////////////////////////////
// TTree_rectype

13
cg/saldacon.h → cg/cgsaldac.h
View File

@ -1,5 +1,5 @@
#ifndef __SALDACON_H
#define __SALDACON_H
#ifndef __CGSALDAC_H
#define __CGSALDAC_H
#ifndef __RECARRAY_H
#include <recarray.h>
@ -13,6 +13,15 @@
#include <partite.h>
#endif
#ifndef __SCADENZE_H
#include <scadenze.h>
#endif
#ifndef __PAGSCA_H
#include <pagsca.h>
#endif
class TTree_rectype : public TRectype
{
protected: