From 03ee03c6ad2e9d1c0efc4e6b7b6286271842a31f Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 3 May 2010 13:43:00 +0000
Subject: [PATCH] Patch level         :10.0 Files correlati     :
 Ricompilazione Demo : [ ] Commento            : Adolf programmen rifiniten!

git-svn-id: svn://10.65.10.50/trunk@20416 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ps/ps0398100.cpp  |  2 +-
 ps/ps1001300.cpp  |  2 +-
 ps/ps1001300a.uml | 31 +++++++++++++++++++++++++------
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/ps/ps0398100.cpp b/ps/ps0398100.cpp
index 350d9b71a..e7f9a237a 100755
--- a/ps/ps0398100.cpp
+++ b/ps/ps0398100.cpp
@@ -243,7 +243,7 @@ bool TTrasferimento_ordini::elabora()
 
 bool TTrasferimento_ordini::create()
 {
-    //se non ha la CG non puņ proseguire
+    //se non ha la VE non puņ proseguire
   if (!has_module(VEAUT))
     return error_box(TR("Modulo non autorizzato"));
 
diff --git a/ps/ps1001300.cpp b/ps/ps1001300.cpp
index 6709c297f..2b529fc4f 100755
--- a/ps/ps1001300.cpp
+++ b/ps/ps1001300.cpp
@@ -388,7 +388,7 @@ bool TVariazione_budget_mask::on_field_event(TOperable_field& o, TField_event e,
     if (e == fe_button)
     {
       TString datafinecms = get(F_DATAPRORCMS);
-      if (!datafinecms.ok())
+      if (!datafinecms.full())
         datafinecms = get(F_DATAFINECMS);
       TSheet_field& sf_righe = sfield(F_RIGHE);
       FOR_EACH_SHEET_ROW(sf_righe, i, riga) if (riga->get_char(0) > ' ')  //solo le righe checked!!
diff --git a/ps/ps1001300a.uml b/ps/ps1001300a.uml
index 6986cfb40..365bc420b 100755
--- a/ps/ps1001300a.uml
+++ b/ps/ps1001300a.uml
@@ -292,21 +292,40 @@ END
 NUMBER S_GR 3
 BEGIN
   PROMPT 1 4 "Conto      "
+  USE LF_PCON SELECT CONTO=""
+  INPUT GRUPPO S_GR
+  DISPLAY "Gruppo" GRUPPO
+  DISPLAY "Descrizione@50" DESCR
+  OUTPUT S_GR GRUPPO
+  OUTPUT S_CONTO_DESCR DESCR
+  CHECKTYPE NORMAL
   FLAGS "DZ"
+  GROUP 1
 END
 
 NUMBER S_CO 3
 BEGIN
-  PROMPT 16 4 ""
+  PROMPT 18 4 ""
+  USE LF_PCON SELECT ((CONTO!="")&&(SOTTOCONTO=""))
+  COPY INPUT S_GR
+  INPUT CONTO S_CO
+  DISPLAY "Gruppo" GRUPPO
+  DISPLAY "Conto" CONTO
+  DISPLAY "Descrizione@50" DESCR
+  OUTPUT S_GR GRUPPO
+  OUTPUT S_CO CONTO
+  OUTPUT S_CONTO_DESCR DESCR
+  CHECKTYPE NORMAL
+  VALIDATE REQIF_FUNC 1 S_SO
   FLAGS "DZ"
+  GROUP 1
 END
 
 NUMBER S_SO 6
 BEGIN
-  PROMPT 21 4 ""
+  PROMPT 24 4 ""
   USE LF_PCON SELECT SOTTOCONTO!=""
-  INPUT GRUPPO S_GR
-  INPUT CONTO S_CO
+  COPY INPUT S_CO
   INPUT SOTTOCONTO S_SO
   DISPLAY "Gruppo" GRUPPO
   DISPLAY "Conto" CONTO
@@ -321,9 +340,9 @@ BEGIN
   GROUP 1
 END
 
-STRING S_CONTO_DESCR 50 40
+STRING S_CONTO_DESCR 50 36
 BEGIN
-  PROMPT 30 4 ""
+  PROMPT 34 4 ""
   USE LF_PCON KEY 2
   INPUT DESCR S_CONTO_DESCR
   DISPLAY "Descrizione@50" DESCR