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

Patch level : 12.0 394

Browse Source 
Files correlati     : cg4.exe

Corretto in funzionamento per fatture per cassa
Corretta stampa registri per l'ultima registrazione stampata 2 volte in certe condizioni

git-svn-id: svn://10.65.10.50/branches/R_10_00@23823 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2017-05-18 05:18:44 +00:00
parent 4674d19582
commit b956d15022
4 changed files with 4531 additions and 4512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cg/cg4301.cpp
View File

@ -1184,7 +1184,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
#ifdef DBG #ifdef DBG
const long nr = _mov->get_long(MOV_NUMREG); const long nr = _mov->get_long(MOV_NUMREG);
if (nr == 29252) if (tipomov == vendita && iva_cass)
int i = 1 ; int i = 1 ;
#endif #endif
@ -1461,6 +1461,8 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
if (nr == 29252) if (nr == 29252)
int i = 1 ; int i = 1 ;
if (iva_cass && tm == vendita)
int i = 1;
#endif #endif
if ((soloiva && if ((soloiva &&
@ -1678,7 +1680,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
id.put(RMI_IMPONIBILE, val_imp); id.put(RMI_IMPONIBILE, val_imp);
id.put(RMI_IMPOSTA, val_iva); id.put(RMI_IMPOSTA, val_iva);
if (is_detr_diff == 0) // detraibile if (is_detr_diff == 0 && (tipomov_pag == tm_pagamento || tipomov_pag == tm_pagamento_insoluto)) // detraibile
{ {
if (tipomov == vendita) if (tipomov == vendita)
{ {

9029
src/cg/cg4400.cpp
View File

File diff suppressed because it is too large Load Diff

1
src/cg/cg4400.h
View File

@ -68,6 +68,7 @@ class TStampa_registri_app : public TPrintapp
TString _cofi,_cap,_paiva,_ragsoc,_comunefis,_provfis,_viafis; TString _cofi,_cap,_paiva,_ragsoc,_comunefis,_provfis,_viafis;
TString _tabname; TString _tabname;
TFilename _t; TFilename _t;
bool _isviaggio;
messaggio _scelta; messaggio _scelta;
tipo_stampa _tipo_stampa; tipo_stampa _tipo_stampa;

7
src/cg/cglib03.cpp
View File

@ -214,9 +214,10 @@ bool is_IVAxCassa(const TRectype& mov)
return false; return false;
const TDate data_reg = mov.get(MOV_DATAREG); const TDate data_reg = mov.get(MOV_DATAREG);
const TDate data_doc = mov.get(MOV_DATADOC); // const TDate data_doc = mov.get(MOV_DATADOC);
const TDate data_rif = data_doc.ok() && data_doc < data_reg ? data_doc : data_reg; // const TDate data_rif = data_doc.ok() && data_doc < data_reg ? data_doc : data_reg;
if (!gestione_IVAxCassa(data_rif)) // if (!gestione_IVAxCassa(data_rif))
if (!gestione_IVAxCassa(data_reg))
return false; return false;
const TRectype& clifo = cache().get_rec(LF_CLIFO, mov.get(MOV_TIPO), mov.get(MOV_CODCF)); const TRectype& clifo = cache().get_rec(LF_CLIFO, mov.get(MOV_TIPO), mov.get(MOV_CODCF));