From 4fa0ede4cca019cd11406d135ed03cd3f6398156 Mon Sep 17 00:00:00 2001
From: AlexBonazzi <alexbonazzi5652@gmail.com>
Date: Fri, 13 Sep 2019 19:55:34 +0200
Subject: [PATCH] Patch level         : 12.0 872 Files correlati     : cg1.exe
 cg1500a.uml Commento            : Stampa bilancio con provvisori

---
 src/cg/cg1500.cpp  | 27 +++++++++++++++++++++------
 src/cg/cg1500a.uml |  6 +++---
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/cg/cg1500.cpp b/src/cg/cg1500.cpp
index 508874304..eccd76725 100755
--- a/src/cg/cg1500.cpp
+++ b/src/cg/cg1500.cpp
@@ -3908,17 +3908,32 @@ int TStampa_bilanci::stampa_intestazione_ditta()
   riga.right_just(_stampa_width-10);
 
   //_stampa_mov_provv(1=normale,2=globale,3=solo provvisori)
-  const char* tipoprovv = "";
-  if (_stampa_mov_prov > 0x1)
-    tipoprovv = TR("GLOBALE");
-  if (!(_stampa_mov_prov & 0x1))
-    tipoprovv = TR("PROVVISORIO");
   //l'uso della overwrite e' una vera vaccata!
   riga.overwrite (format("%s %s %s %s", TR("Partita iva"), (const char*)_paiva, TR("Codice fiscale"), (const char*)_cofi));
-  riga.overwrite (tipoprovv, 85);
   
   set_header (r++, "%s", (const char*) riga);
 
+	if (_stampa_mov_prov > 0x1)
+	{
+		TString tipoprovv;
+
+		if ((_stampa_mov_prov & 0x1))
+			tipoprovv << TR("Movimenti : Normali");
+		if (_stampa_mov_prov > 0x1)
+			tipoprovv << TR(" Provvisori :");
+		if (_stampa_mov_prov & 0x2)
+			tipoprovv << TR(" Manuali");
+		if (_stampa_mov_prov & 0x4)
+			tipoprovv << TR(" Competenza costi/ricavi");
+		if (_stampa_mov_prov & 0x8)
+			tipoprovv << TR(" Cespiti");
+
+		riga.cut(0);
+		riga.overwrite(tipoprovv, (_stampa_width - tipoprovv.len()) /2);
+
+		set_header(r++, "%s", (const char*)riga);
+	}
+
   return r; 
 }
 
diff --git a/src/cg/cg1500a.uml b/src/cg/cg1500a.uml
index fe1e4d761..705faaed8 100755
--- a/src/cg/cg1500a.uml
+++ b/src/cg/cg1500a.uml
@@ -173,17 +173,17 @@ END
 
 BOOLEAN F_PROVVM
 BEGIN
-	PROMPT 30 11 "Provv.Manuali"
+	PROMPT 29 11 "Provvisori : Manuali"
 END
 
 BOOLEAN F_PROVVB
 BEGIN
-	PROMPT 50 11 "Provv.Bilancio"
+	PROMPT 52 11 "Comp. costi/ricavi"
 END
 
 BOOLEAN F_PROVVC
 BEGIN
-	PROMPT 70 11 "Provv.Cespiti"
+	PROMPT 73 11 "Cespiti"
 END
 
 LIST F_MODULO 1 12