Corretto aggiornamento conto di costo dei fornitori nelle righe IVA

git-svn-id: svn://10.65.10.50/trunk@1487 c028cbd2-c16b-5b4b-a496-9718f37d4682

cg/cg2100.h

@@ -166,5 +166,6 @@
 #define S_NSCAB       133 
 #define S_DESCNSABI   134
 #define S_DESPAG      135
+#define S_CODDESC     136
 
 #endif

cg/cg2100b.uml

@@ -236,7 +236,7 @@ END
 
 NUMBER S_ABBATT 15 0
 BEGIN 
-  PROMPT 1 14 "Abbuoni attivi    "
+  PROMPT 2 14 "Abbuoni attivi    "
   HELP ""
   FLAGS "R"
   PICTURE "."
@@ -254,7 +254,7 @@ END
 
 NUMBER S_RITPROF 15 0
 BEGIN 
-  PROMPT 1 16 "Ritenuta prof.    "
+  PROMPT 2 16 "Ritenuta prof.    "
   HELP ""
   FLAGS "R"
   PICTURE "."

cg/cg2100s.uml

@@ -260,9 +260,26 @@ BEGIN
   CHECKTYPE REQUIRED
 END
 
+STRING S_CODDESC 5
+BEGIN
+  PROMPT 2 14 "Descriz. agg. "
+  USE %DPN
+  INPUT CODTAB S_CODDESC
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Descrizione@50" S0
+  OUTPUT S_CODDESC CODTAB
+  OUTPUT S_DESCAGG S0
+  CHECKTYPE NORMAL
+END
+
 STRING S_DESCAGG 50
 BEGIN
-  PROMPT 2 14 "Descrizione agg.      "
+  PROMPT 24 14 ""
+  USE %DPN KEY 2
+  INPUT S0 S_DESCAGG
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice" CODTAB
+  COPY OUTPUT S_CODDESC
   FIELD DESCR
 END
 
@@ -279,7 +296,7 @@ BEGIN
   OUTPUT S_VSABI CODTAB[1,5]
   OUTPUT S_VSCAB CODTAB[6,10]
   OUTPUT S_DESCVSABI S0
-  CHECKTYPE REQUIRED
+  CHECKTYPE NORMAL
   FIELD CODABI
 END
 
@@ -288,7 +305,7 @@ BEGIN
   PROMPT 25 15 "CAB "
   FLAGS "Z"            
   COPY ALL S_VSABI
-  CHECKTYPE REQUIRED
+  CHECKTYPE NORMAL
   FIELD CODCAB
 END
 
@@ -301,7 +318,7 @@ BEGIN
   DISPLAY "ABI@5" CODTAB[1,5]
   DISPLAY "CAB@5" CODTAB[6,10]
   COPY OUTPUT S_VSABI
-  CHECKTYPE REQUIRED
+  CHECKTYPE NORMAL
 END
 
 STRING S_AGENTE 5
@@ -342,7 +359,7 @@ BEGIN
   OUTPUT S_NSCAB CODTAB[6,10]
   OUTPUT S_DESCNSABI S0
   FIELD CODABIPR
-  CHECKTYPE REQUIRED
+  CHECKTYPE NORMAL
 END
 
 NUMBER S_NSCAB 5
@@ -351,7 +368,7 @@ BEGIN
   FLAGS "Z"
   COPY ALL S_NSABI
   FIELD CODCABPR
-  CHECKTYPE REQUIRED
+  CHECKTYPE NORMAL
 END
 
 STRING S_DESCNSABI 50 37
@@ -361,7 +378,7 @@ BEGIN
   INPUT S0 S_DESCNSABI
   COPY DISPLAY S_DESCVSABI
   COPY OUTPUT S_NSABI
-  CHECKTYPE REQUIRED
+  CHECKTYPE NORMAL
 END
 
 ENDPAGE

cg/cg2102.cpp

@@ -1600,9 +1600,11 @@ bool TPrimanota_application::clifo_handler(TMask_field& f, KEY key)
     
     if (clifo.get_char(CLI_TIPOCF) != cf || clifo.get(CLI_CODCF) != f.get())
     {       
+      clifo.setkey(1);
       clifo.put(CLI_TIPOCF, cf);   
       clifo.put(CLI_CODCF, f.get());   
       clifo.read();
+      CHECK(clifo.good(), "Impossibile ritrovare il clifo");
     }  
     if (!suspended_handler(f, key))
       return FALSE;
@@ -1757,10 +1759,10 @@ bool TPrimanota_application::totdoc_handler(TMask_field& f, KEY key)
 
 void TPrimanota_application::add_cgs_rit(bool fiscali)
 {
-  const real imp(_msk[2]->get(fiscali ? F_RITFIS : F_RITSOC));
+  const real imp(curr_mask().get(fiscali ? F_RITFIS : F_RITSOC));
 
   const char tipo = fiscali ? 'F' : 'S';
-  int pos = type2pos(tipo);
+  const int pos = type2pos(tipo);
   if (pos < 0)
   {  
     const int riga = fiscali ? 8 : 9;

cg/cg3100.cpp

@@ -1,13 +1,15 @@
 //
 //Lista movimenti
 //
-#include "cg3.h"
-#include "cg3100.h"
 #include <mask.h>
 #include <printapp.h>
 #include <tabutil.h>
 #include <utility.h>
 #include <urldefid.h>
+
+#include "cg3.h"
+#include "cg3100.h"
+
 #include <mov.h>
 #include <rmov.h>
 #include <rmoviva.h>