diff --git a/src/ci/ci1300.cpp b/src/ci/ci1300.cpp
index 6330dc452..630853f6a 100755
--- a/src/ci/ci1300.cpp
+++ b/src/ci/ci1300.cpp
@@ -44,7 +44,7 @@ size_t TRil_ore_ris_report::get_usr_words(TString_array& words) const
const char* const name[] =
{
- "LOGO_BENEF", NULL
+ "LOGO_LAVORO", "LOGO_BENEF", NULL
};
((TRil_ore_ris_report*)this)->_first_msg = words.items(); // Calcola il primo numero disponibile
@@ -68,7 +68,7 @@ bool TRil_ore_ris_report::execute_usr_word(unsigned int opcode, TVariant_stack&
case 0:
{
TToken_string key("C");
- TString id("LOGO");
+ TString id("LOGO_LAV");
id << _codtpl;
stack.push(id);
@@ -79,6 +79,20 @@ bool TRil_ore_ris_report::execute_usr_word(unsigned int opcode, TVariant_stack&
execute_usr_word(21, stack);
}
break;
+ case 1:
+ {
+ TToken_string key("C");
+ TString id("LOGO_BENEF");
+
+ id << _codtpl;
+ stack.push(id);
+ key.add(_codcf);
+ stack.push(CLI_OGGETTI);
+ stack.push(key);
+ stack.push(LF_CLIFO);
+ execute_usr_word(21, stack);
+ }
+ break;
default: ok = false;
break;
}
diff --git a/src/ci/ci1300ab.rep b/src/ci/ci1300ab.rep
index 42abba825..784cc4e04 100644
--- a/src/ci/ci1300ab.rep
+++ b/src/ci/ci1300ab.rep
@@ -52,6 +52,9 @@
+
+
+
@@ -83,6 +86,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99,7 +133,7 @@
#RISOATT
-
+
"!INTEST"
GET_FIRM_DATA
@@ -164,11 +198,12 @@ GET_FIRM_DATA
- LOGO_BENEF
+ LOGO_LAVORO
#THIS !
- LOGO #THIS !
+ LOGO_BENEF
+#THIS !
@@ -346,48 +381,60 @@ GET_FIRM_DATA
-
+
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ci/ci1300bb.rep b/src/ci/ci1300bb.rep
index f8649ea29..e1186560b 100644
--- a/src/ci/ci1300bb.rep
+++ b/src/ci/ci1300bb.rep
@@ -76,9 +76,9 @@
#RISOATT
-
+
- "!INTEST"
+ "!INTEST"
GET_FIRM_DATA
@@ -120,10 +120,12 @@ GET_FIRM_DATA
- LOGO_BENEF #THIS !
+ LOGO_lAVORO
+#THIS !
- LOGO #THIS !
+ LOGO_BENEF
+#THIS !