From 3db207440b56f4334c467b557c3f96691503ed9d Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 6 Feb 2004 15:35:58 +0000
Subject: [PATCH] Patch level         : 2.0 680 Files correlati     : cg2.exe
 Ricompilazione Demo : [ ] Commento            :

Segiranno segmalazioni da doppio 1


git-svn-id: svn://10.65.10.50/trunk@11752 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg2102.cpp | 16 ++++++++--------
 cg/cg2105.cpp |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp
index 9f5a234ee..edebbf84c 100755
--- a/cg/cg2102.cpp
+++ b/cg/cg2102.cpp
@@ -83,13 +83,13 @@ real TPrimanota_application::scorpora(real& imponibile, const real& percent)
   const int dec = TCurrency::get_firm_dec();
   if (dec == 0)  // Gestione Lire
   {
-    imposta = abs(imponibile) * percent / (percent + 100.0); 
+    imposta = abs(imponibile) * percent / (percent + CENTO); 
     imposta.ceil();
     if (imponibile.sign() < 0) imposta = -imposta; 
   }
   else
   {              // Gestione Euro
-    imposta = imponibile * percent / (percent + 100.0); 
+    imposta = imponibile * percent / (percent + CENTO); 
     imposta.round(dec);
   }
   imponibile -= imposta;
@@ -296,7 +296,7 @@ TImporto TPrimanota_application::get_cgs_imp(int n) const
   return importo;
 }
 
-// Certified 90%
+// Certified 100%
 bool TPrimanota_application::add_cgs_imp(int n, const TImporto& imp)
 {
   TImporto tot(get_cgs_imp(n));
@@ -306,7 +306,7 @@ bool TPrimanota_application::add_cgs_imp(int n, const TImporto& imp)
   return tot.is_zero();
 }
 
-// Certified 90%
+// Certified 100%
 bool TPrimanota_application::sub_cgs_imp(int n, const TImporto& imp)
 {
   TImporto tot(get_cgs_imp(n));
@@ -985,13 +985,13 @@ int TPrimanota_application::crea_somma_spese(TImporto& imp)
 
 void TPrimanota_application::update_saldo_riga(int r)
 {
-  TSheet_field& sheet = cgs();
+  TMask& m = curr_mask();
+  TSheet_field& sheet = m.sfield(F_SHEETCG);
   TToken_string row = sheet.row(r);
   TBill bill; bill.get(row, 2, 0x1);
 
   if (bill.ok())
   {
-    TMask& m = curr_mask();
     const int annoes = m.get_int(F_ANNOES);
 
     // Legge il saldo finale del conto
@@ -3080,7 +3080,7 @@ bool TPrimanota_application::activate_numrif(TMask& m, bool init_pag)
   }
 
   // Gestione pagina 3
-  const bool page = shown && !m.get(F_NUMRIF).blank();
+  const bool page = shown && is_fattura() && !m.get(F_NUMRIF).blank();
   if (page != m.page_enabled(2))
   {
     m.enable_page(2, page);                 
@@ -3088,7 +3088,7 @@ bool TPrimanota_application::activate_numrif(TMask& m, bool init_pag)
     {
       if (m.edit_mode())
       {
-        const TString16 dt(m.get(F_DATADOC));
+        const TString& dt = m.get(F_DATADOC);
         set_pagamento(NULL, dt);          // Reset pagamento
         set_totale_pagamento(TRUE);
       }
diff --git a/cg/cg2105.cpp b/cg/cg2105.cpp
index 3a5a54ff5..620bf148b 100755
--- a/cg/cg2105.cpp
+++ b/cg/cg2105.cpp
@@ -613,7 +613,7 @@ void TGame_mask::append_conto(TString& s) const
   case 'F':
     s << TR("Fornitore"); break;
   default:
-    s << TR("Conto ") << conto().gruppo() << ' ' << conto().conto(); break;
+    s << TR("Conto") << ' ' << conto().gruppo() << ' ' << conto().conto(); break;
   }    
   s << ' ' << conto().sottoconto();  
 }
@@ -1886,7 +1886,7 @@ bool TGame_mask::edit_pagamento(TPartita& p, int nriga, int nrata, int nrigp) co
 #endif          
   }       
   
-//  delete pm; pm = NULL;  // commentata in quanto statica
+  // delete pm; pm = NULL;  // commentata in quanto statica
 
 #ifdef __EXTRA__
   xvt_statbar_set(TR("Estratto conto"), TRUE);