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

Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

Browse Source
This commit is contained in:
Alessandro Bonazzi 2020-09-01 15:21:35 +02:00
commit 493f2c4a33
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cg/cg0200.cpp
View File

@ -941,24 +941,23 @@ int TClifo_application::read(TMask& m)
riga.add(rec.get(IND_TEL)); riga.add(rec.get(IND_TEL));
riga.add(rec.get(IND_PFAX)); riga.add(rec.get(IND_PFAX));
riga.add(rec.get(IND_FAX)); riga.add(rec.get(IND_FAX));
riga.add(rec.get(IND_IVARID)); riga.add(rec.get(IND_IVARID));
TString8 key; TString8 key;
key << rec.get(IND_STATO); key << rec.get(IND_STATO);
key << '|' << rec.get(IND_COM); key << '|' << rec.get(IND_COM);
const TRectype & com = cache().get(LF_COMUNI, key); const TRectype& com = cache().get(LF_COMUNI, key);
riga.add(com.get(COM_DENCOM)); riga.add(com.get(COM_DENCOM));
riga.add(rec.get(IND_INDIR2)); riga.add(rec.get(IND_INDIR2));
riga.add(rec.get(IND_PADESTIN)); riga.add(rec.get(IND_PADESTIN));
riga.add(rec.get(IND_PARIFAMM)); riga.add(rec.get(IND_PARIFAMM));
riga.add(rec.get(IND_CODIND)); riga.add(rec.get(IND_CODIND));
indsp_sheet().row(i)=riga; indsp_sheet().row(i)=riga;
// Load the sheets of CODINDDOC, CODINDSP, CODINDEFF. // Load the sheets of CODINDDOC, CODINDSP, CODINDEFF.
riga.cut(0); riga.cut(0);
riga.add(rec.get(IND_CODIND)); riga.add(rec.get(IND_CODIND));
@ -1370,12 +1369,12 @@ void TClifo_application::common_f(const TMask& m)
rec.put(IND_PFAX,row.get()); rec.put(IND_PFAX,row.get());
rec.put(IND_FAX,row.get()); rec.put(IND_FAX,row.get());
rec.put(IND_IVARID,row.get()); rec.put(IND_IVARID,row.get());
row.get(); row.get();
rec.put(IND_INDIR2, row.get()); rec.put(IND_INDIR2,row.get());
rec.put(IND_PADESTIN, row.get()); rec.put(IND_PADESTIN, row.get());
rec.put(IND_PARIFAMM, row.get()); rec.put(IND_PARIFAMM, row.get());
rec.put(IND_CODIND,i+1); rec.put(IND_CODIND,i+1);
} }
TToken_string data; TToken_string data;
TString8 first, second; TString8 first, second;

4
src/cg/cg0200a.uml
View File

@ -1329,8 +1329,8 @@ BEGIN
ITEM "Iva Rid." ITEM "Iva Rid."
ITEM "Comune@50" ITEM "Comune@50"
ITEM "Indirizzo aggiuntivo@35" ITEM "Indirizzo aggiuntivo@35"
ITEM "Destinatario" ITEM "Codice Destinatario@15"
ITEM "Riferimento amministrazione" ITEM "Riferimento Amministrazione@20"
END END
GROUPBOX DLG_NULL 76 3 GROUPBOX DLG_NULL 76 3

4
src/cg/cg0200b.uml
View File

@ -137,7 +137,7 @@ END
STRING F_PADESTINI 7 STRING F_PADESTINI 7
BEGIN BEGIN
PROMPT 2 15 "Destinatario " PROMPT 2 15 "Codice Destinatario (SdI)"
FLAGS "" FLAGS ""
MODULES PA,FP MODULES PA,FP
HELP "Codice ufficio dell destinatario della fattura elettronica" HELP "Codice ufficio dell destinatario della fattura elettronica"
@ -145,7 +145,7 @@ END
STRING F_PARIFAMMI 20 STRING F_PARIFAMMI 20
BEGIN BEGIN
PROMPT 2 17 "Riferimento amministrazione " PROMPT 2 17 "Codice riferimento amministrazione"
FLAGS "U" FLAGS "U"
MODULES PA,FP MODULES PA,FP
HELP "Codice del cedente presso l'amministrazione" HELP "Codice del cedente presso l'amministrazione"

3
src/cg/cglib.h
View File

@ -1470,10 +1470,9 @@ protected:
virtual int write_rewrite(TBaseisamfile& f, bool re = false) const; virtual int write_rewrite(TBaseisamfile& f, bool re = false) const;
void init(); void init();
const TAnagrafica & anagr(); const TAnagrafica & anagr();
const TOccasionale * occasionale() const{ return new TOccasionale(_occasionale); }
public:
public: public:
const TOccasionale * occasionale() const { return new TOccasionale(_occasionale); }
bool read_lettera(const TDate & data, bool extended = false); bool read_lettera(const TDate & data, bool extended = false);
bool is_occasionale() const { return get_bool(CLI_OCCAS); } bool is_occasionale() const { return get_bool(CLI_OCCAS); }
TRectype& vendite() const; TRectype& vendite() const;

4
src/fp/fplib01.cpp
View File

@ -218,7 +218,7 @@ bool get_coddest(const char tipocf, const long codcf, TString& coddest, TString&
indsp.put(IND_CODCF, codcf); indsp.put(IND_CODCF, codcf);
indsp.put(IND_CODIND, cod_ind_sped); indsp.put(IND_CODIND, cod_ind_sped);
indsp.read(); indsp.read();
coddest = indsp.get(IND_CODDEST); coddest = indsp.get(IND_PADESTIN);
} }
if(coddest.empty()) if(coddest.empty())
coddest = clifo.vendite().get("PADESTIN"); coddest = clifo.vendite().get("PADESTIN");
@ -1564,7 +1564,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
indsp.put(IND_CODCF, doc.get(DOC_CODCF)); indsp.put(IND_CODCF, doc.get(DOC_CODCF));
indsp.put(IND_CODIND, doc.get(DOC_CODINDSP)); indsp.put(IND_CODIND, doc.get(DOC_CODINDSP));
indsp.read(); indsp.read();
rifamm = indsp.get(IND_RIFAMM); rifamm = indsp.get(IND_PARIFAMM);
if(rifamm.blank()) if(rifamm.blank())
rifamm = doc.clifor().vendite().get(CFV_PARIFAMM); rifamm = doc.clifor().vendite().get(CFV_PARIFAMM);
} }