From 3583b93e12314fb594c401f300a43c45ef7f8621 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 10 Mar 2006 12:31:12 +0000
Subject: [PATCH] Patch level         :2.2 382 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :stampa del pagato da testare!

git-svn-id: svn://10.65.10.50/trunk@13842 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca3600.cpp | 6 +++---
 ca/ca3600.uml | 2 ++
 ca/camenu.men | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ca/ca3600.cpp b/ca/ca3600.cpp
index 1560038a2..752250af8 100755
--- a/ca/ca3600.cpp
+++ b/ca/ca3600.cpp
@@ -155,7 +155,7 @@ TPag_per_cms_mask::TPag_per_cms_mask()
 
 void TPag_per_cms_mask::config_loader(TSheet_field& sf, const char* paragrafo)
 {
-	TFilename configname = "ca3600.ini";	//carica file configurazione conti
+	TFilename configname = "ca3600a.ini";	//carica file configurazione conti
 	configname.custom_path();
 	TConfig configfile(configname, paragrafo);
 
@@ -171,7 +171,7 @@ void TPag_per_cms_mask::config_loader(TSheet_field& sf, const char* paragrafo)
 
 void TPag_per_cms_mask::config_setter(TSheet_field& sf, const char* paragrafo)
 {
-	TFilename configname = "ca3600.ini";	//carica file configurazione conti
+	TFilename configname = "ca3600a.ini";	//carica file configurazione conti
 	configname.custom_path();
 	TConfig configfile(configname, paragrafo);
   
@@ -336,7 +336,7 @@ void TPag_per_cms_recordset::crea_trr(const TFilename& trr) const
 
 void TPag_per_cms_recordset::lettura_conti(TAssoc_array& assoc, const char tipoconto)
 {
-  TConfig conti("ca3600.ini","Pdcc"); //paragrafo da scandire nell'ini (solo conti contabili!!)
+  TConfig conti("ca3600a.ini","Pdcc"); //paragrafo da scandire nell'ini (solo conti contabili!!)
   TAssoc_array& vars = conti.list_variables();
 
   FOR_EACH_ASSOC_STRING(vars, h, k, val)  //riempie l'assoc con i soli valori del paragrafo dell'ini
diff --git a/ca/ca3600.uml b/ca/ca3600.uml
index fa5defb4f..d25d37223 100755
--- a/ca/ca3600.uml
+++ b/ca/ca3600.uml
@@ -158,6 +158,7 @@ BEGIN
   ITEM "Sottoconto"
   ITEM "Descrizione@50"
   GROUP 5
+  DEFAULT NOPROFILE
 END
 
 /*TEXT -1	***per ora solo Pdcc***
@@ -175,6 +176,7 @@ BEGIN
   ITEM "Cdc4"
   ITEM "Cdc5"
   GROUP 6
+  DEFAULT NOPROFILE
 END*/
 
 BUTTON DLG_SAVEREC 12 2
diff --git a/ca/camenu.men b/ca/camenu.men
index 1a4c37b2f..e9c3627c9 100755
--- a/ca/camenu.men
+++ b/ca/camenu.men
@@ -62,7 +62,8 @@ Item_01 = "Tabelle", "", "F"
 Item_02 = "Movimenti", "ca3 -0", "F"
 Item_03 = "Mastrini", "ca3 -1", "F"
 Item_04 = "Bilancio", "ca3 -2", "F"
-Item_05 = "Rendiconto", "ca3 -6", "F"
+Item_05 = "Pagato", "ca3 -5", "F"
+Item_06 = "Rendiconto", "ca3 -6", "F"
 
 [CAMENU_050]
 Caption = "Servizi"