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

Risolti conflitti

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@497 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-10-31 13:44:56 +00:00
parent c5df9ab8c3
commit 3bb7772bb7
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cg/cg4400.cpp
View File

@ -1456,19 +1456,10 @@ print_action CG4400_application::postprocess_print(int file, int counter)
bool CG4400_application::set_print(int n) bool CG4400_application::set_print(int n)
{ {
TMask m("cg4400a"); TMask m("cg4400a");
<<<<<<< cg4400.cpp
const bool ok = set_ditte(m); const bool ok = set_ditte(m);
=======
int giorni_del_mese;
>>>>>>> 1.17
<<<<<<< cg4400.cpp
if (ok) if (ok)
=======
// bool ok = set_ditte(m);
if (set_ditte(m))
>>>>>>> 1.17
if (_selected.ones() > 0l) if (_selected.ones() > 0l)
{ {
_annoes = m.get_int(ANNO);//in realta' e' l'anno IVA !!! _annoes = m.get_int(ANNO);//in realta' e' l'anno IVA !!!
@ -1488,6 +1479,7 @@ bool CG4400_application::set_print(int n)
// senno' data_da e' letta dal registro // senno' data_da e' letta dal registro
else //stampe definitive else //stampe definitive
{ {
int giorni_del_mese;
if ( (_tipo_stampa == 1) || (_tipo_stampa == 4) ) if ( (_tipo_stampa == 1) || (_tipo_stampa == 4) )
_fino_a_mese = m.get_int(FINO_A_MESE); _fino_a_mese = m.get_int(FINO_A_MESE);
else //stampa su libro unico else //stampa su libro unico
@ -1513,13 +1505,8 @@ bool CG4400_application::set_print(int n)
stampa_registri_IVA(m); stampa_registri_IVA(m);
} }
else warning_box("Nessuna ditta selezionata!"); else warning_box("Nessuna ditta selezionata!");
<<<<<<< cg4400.cpp
return ok;
=======
return FALSE; return FALSE;
// return ok;
>>>>>>> 1.17
} }
void CG4400_application::stampa_registri_IVA(const TMask& m) void CG4400_application::stampa_registri_IVA(const TMask& m)
@ -1544,16 +1531,6 @@ void CG4400_application::stampa_registri_IVA(const TMask& m)
if (!ok) continue; if (!ok) continue;
if (!_stampa_tutti_i_registri) if (!_stampa_tutti_i_registri)
<<<<<<< cg4400.cpp
{
*_cur = 0L;
const long items = _cur->items();
if (items > 0)
print();
if (_tipo_stampa != 3)
aggiorna_reg();
}
=======
{ {
(*_cur) = 0L; (*_cur) = 0L;
const long item = _cur->items(); const long item = _cur->items();
@ -1561,7 +1538,6 @@ void CG4400_application::stampa_registri_IVA(const TMask& m)
print(); print();
if (_tipo_stampa != 3) aggiorna_reg(); if (_tipo_stampa != 3) aggiorna_reg();
} }
>>>>>>> 1.17
else else
{ {
TString16 codtab; TString16 codtab;