From 667ee9b0e8ef7d1be4ff273a1dd25665c4d8e457 Mon Sep 17 00:00:00 2001
From: AlexBonazzi <alexbonazzi5652@gmail.com>
Date: Fri, 13 Jul 2018 16:28:11 +0200
Subject: [PATCH] Patch level         : 12.0 602 Files correlati     : cg3.exe
 cg0200a.msk

Corretto calcolo IVA CEE/Ritenute nel caso di note di credito

Modificata maschera clienti/fornitori
---
 src/cg/cg0200a.uml | 10 +++++-----
 src/cg/cg3100.cpp  |  9 +++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/cg/cg0200a.uml b/src/cg/cg0200a.uml
index 18fe9f65d..3a18d9692 100755
--- a/src/cg/cg0200a.uml
+++ b/src/cg/cg0200a.uml
@@ -433,25 +433,25 @@ END
 
 TEXT DLG_NULL
 BEGIN
-  PROMPT 62 15 "Collegamenti esterni"
+  PROMPT 62 17 "Collegamenti esterni"
 END
 
 GOLEM DLG_OGGETTI 10 2
 BEGIN
-  PROMPT 64 17 ""
+  PROMPT 64 18 ""
   FIELD OGGETTI  
   FLAGS "M"
 END
 
 DATE DLG_INIFATTEL
 BEGIN
-  PROMPT 2 19 "Inizio Fatt.elettronica "
+  PROMPT 2 20 "Inizio Fatt.elettronica "
   FIELD INIFATTEL
 END
 
 DATE DLG_INIREVCHG
 BEGIN
-  PROMPT 42 19 "Inizio reverse charge "
+  PROMPT 42 20 "Inizio reverse charge "
   FIELD INIREVCHG
 END
 
@@ -650,7 +650,7 @@ DATE F_SPEDDATARISP
 BEGIN
   PROMPT 40 12 "In data "
   FIELD LF_CFPRI->DATARISP
-END
+END 
 
 GROUPBOX DLG_NULL 76 7
 BEGIN
diff --git a/src/cg/cg3100.cpp b/src/cg/cg3100.cpp
index 600230428..6410da46e 100755
--- a/src/cg/cg3100.cpp
+++ b/src/cg/cg3100.cpp
@@ -1078,8 +1078,17 @@ bool TListaMov_application::preprocess_page(int file,int counter)
         _tipodoc     = curmov.get(MOV_TIPODOC);      
         _codval      = curmov.get(MOV_CODVALI); 
         _totdoc      = curmov.get_real(MOV_TOTDOC);
+
+				if (_numr == 97613l)
+					int i = 1;
+
         _ritenute    = curmov.get_real(MOV_RITFIS) + curmov.get_real(MOV_RITSOC);
 
+				const TString& tipodoc = curmov.get(MOV_TIPODOC);
+				
+				if (tipodoc == "NC")
+					_ritenute = -_ritenute;
+
         if (_tipo_elenco != _tipo_clifo_prec && _tipo_clifo_prec != "") 
           printer().formfeed();