Patch level :2.2 140

Files correlati : Ricompilazione Demo : [ ] Commento :stampa mastrini in corso d'opera.:terminata stampa dei conti movimentati nel periodo selezionato git-svn-id: svn://10.65.10.50/trunk@13221 c028cbd2-c16b-5b4b-a496-9718f37d4682
2005-06-24 16:40:56 +00:00 · 2005-06-24 16:40:56 +00:00 · 3b0f6d38b7
commit 3b0f6d38b7
parent 6301d0f6f6
4 changed files with 74 additions and 48 deletions
--- a/ca/ca3100.uml
+++ b/ca/ca3100.uml
@ -10,13 +10,13 @@ END

 BUTTON DLG_PRINT 10 2
 BEGIN
-  PROMPT -15 -11 "~Stampa"
+  PROMPT -12 -1 "~Stampa"
  MESSAGE EXIT,K_ENTER
 END

 BUTTON DLG_QUIT 10 2
 BEGIN
-  PROMPT -55 -11 ""
+  PROMPT -22 -1 ""
 END

 ENDPAGE
--- a/ca/ca3200.uml
+++ b/ca/ca3200.uml
@ -10,13 +10,13 @@ END

 BUTTON DLG_PRINT 10 2
 BEGIN
-  PROMPT -15 -11 "~Stampa"
+  PROMPT -12 -1 "~Stampa"
  MESSAGE EXIT,K_ENTER
 END

 BUTTON DLG_QUIT 10 2
 BEGIN
-  PROMPT -55 -11 ""
+  PROMPT -22 -1 ""
 END

 ENDPAGE
--- a/ca/ca3200a.rep
+++ b/ca/ca3200a.rep
@ -14,28 +14,28 @@
  <field x="165" type="Numero" align="right" width="3" pattern="1">
   <source>#REPORT.PAGE</source>
  </field>
-  <field x="1" y="1.5" type="Testo" width="4" pattern="1" text="CdC:" />
-  <field x="11" y="1.5" type="Stringa" width="23" pattern="1">
-   <source>CODCCOSTO</source>
+  <field x="1" y="1.5" type="Testo" width="18" pattern="1" text="Centro di Costo:" />
+  <field x="14" y="1.5" type="Stringa" width="23" pattern="1">
+   <source>#COSTO</source>
   <prescript description="H0.0 PRESCRIPT">CA_FORMAT_COSTO</prescript>
  </field>
-  <field x="35" y="1.5" type="Stringa" width="50" pattern="1">
+  <field x="38" y="1.5" type="Stringa" width="50" pattern="1">
   <prescript description="H0.0 PRESCRIPT">MESSAGE ISAMREAD,CDC,CODCOSTO=RMOVANA.CODCCOSTO,DESCRIZ</prescript>
  </field>
  <field x="1" y="3" type="Testo" width="9" pattern="1" text="Commessa:" />
-  <field x="11" y="3" type="Stringa" width="23" pattern="1">
-   <source>CODCMS</source>
+  <field x="14" y="3" type="Stringa" width="23" pattern="1">
+   <source>#COMMESSA</source>
   <prescript description="H0.0 PRESCRIPT">CA_FORMAT_COMMESSA</prescript>
  </field>
-  <field x="35" y="3" type="Stringa" width="50" pattern="1">
+  <field x="38" y="3" type="Stringa" width="50" pattern="1">
   <prescript description="H0.0 PRESCRIPT">MESSAGE ISAMREAD,COMMESSE,CODCMS=RMOVANA.CODCMS,DESCRIZ</prescript>
  </field>
  <field x="1" y="4.5" type="Testo" width="5" pattern="1" text="Fase:" />
-  <field x="11" y="4.5" type="Stringa" width="13" pattern="1">
-   <source>CODFASE</source>
+  <field x="14" y="4.5" type="Stringa" width="13" pattern="1">
+   <source>#FASE</source>
   <prescript description="H0.0 PRESCRIPT">CA_FORMAT_FASE</prescript>
  </field>
-  <field x="35" y="4.5" type="Stringa" width="50" pattern="1">
+  <field x="38" y="4.5" type="Stringa" width="50" pattern="1">
   <prescript description="H0.0 PRESCRIPT">MESSAGE ISAMREAD,FASI,CODFASE=RMOVANA.CODFASE,DESCRIZ</prescript>
  </field>
  <field border="2" x="1" y="6" type="Linea" width="167" height="0" pattern="1" />
@ -52,9 +52,9 @@ MESSAGE RESET,F1.102</prescript>
  <font italic="1" face="Courier New" size="8" />
  <prescript description="H2 PRESCRIPT">MESSAGE RESET,F2.101
 MESSAGE RESET,F2.102
-MESSAGE RESET,F2.103
-MESSAGE RESET,F2.104
-MESSAGE RESET,F2.105</prescript>
+MESSAGE RESET,F2.201
+MESSAGE RESET,F2.202
+</prescript>
  <field type="Testo" width="6" pattern="1" text="Conto:">
   <font italic="1" face="Courier New" bold="1" size="8" />
  </field>
@ -74,11 +74,26 @@ MESSAGE RESET,F2.105</prescript>
  <field x="73" y="1.5" type="Testo" width="7" pattern="1" text="Causale" />
  <field x="115" y="1.5" type="Testo" align="right" width="4" pattern="1" text="Dare" />
  <field x="130" y="1.5" type="Testo" align="right" width="5" pattern="1" text="Avere" />
-  <field x="139" y="1.5" type="Testo" align="right" width="14" pattern="1" text="Saldo scalare" />
+  <field x="138" y="1.5" type="Testo" align="right" width="14" pattern="1" text="Saldo" />
  <field border="1" x="1" y="2.5" type="Linea" width="168" height="0" pattern="1" />
-  <field x="95" y="3" type="Testo" width="25" pattern="1" text="Progressivo precedente" />
-  <field x="132" y="3" type="Valuta" align="right" width="15" pattern="1" hide_zero="1" text="###.###.###,@@" />
+  <field x="80" y="3" type="Testo" width="25" pattern="1" text="Progressivo precedente" />
  <field x="1" y="1.5" type="Testo" align="center" width="10" id="121" pattern="1" text="Data" />
+  <field x="104" y="3" type="Valuta" align="right" width="15" id="201" pattern="1" hide_zero="1" text="###.###.###,@@">
+   <source>SALDOINI:DARE</source>
+   <postscript description="H2.201 POSTSCRIPT">MESSAGE COPY,B1.103
+</postscript>
+  </field>
+  <field x="120" y="3" type="Valuta" align="right" width="15" id="202" pattern="1" hide_zero="1" text="###.###.###,@@">
+   <source>SALDOINI:AVERE</source>
+   <prescript description="H2.202 PRESCRIPT">#THIS @
+DUP
+0 &#3E; IF
+  -1 *
+  "B1.103" +!
+ELSE
+  DROP
+THEN</prescript>
+  </field>
 </section>
 <section type="Head" level="3">
  <groupby>DATACOMP</groupby>
@ -117,9 +132,15 @@ MESSAGE RESET,F2.105</prescript>
 "A" =
 IF
 0 #THIS !
+ELSE
+#THIS @
+"B1.103"
+!
 THEN
+
 </prescript>
-   <postscript description="B1.101 POSTSCRIPT">MESSAGE ADD,F2.101</postscript>
+   <postscript description="B1.101 POSTSCRIPT">MESSAGE ADD,F2.101
+</postscript>
  </field>
  <field x="120" type="Valuta" align="right" width="15" id="102" pattern="1" hide_zero="1" text="###.###.###,@@">
   <source>IMPORTO</source>
@ -127,26 +148,28 @@ THEN
 "D" =
 IF
 0 #THIS !
+ELSE
+#THIS @
+-1 *
+"B1.103"
+!
 THEN
 </prescript>
   <postscript description="B1.102 POSTSCRIPT">MESSAGE ADD,F2.102
 </postscript>
  </field>
-  <field x="136" type="Valuta" align="right" width="15" id="103" pattern="1" hide_zero="1" text="###.###.###,@@">
-   <prescript description="B1.103 PRESCRIPT">"RMOVANA.SEZIONE" @
-"D" =
-IF
-0 #THIS !
-THEN
-</prescript>
-   <postscript description="B1.103 POSTSCRIPT">MESSAGE ADD,F2.103</postscript>
+  <field x="137" type="Valuta" align="right" width="15" id="103" pattern="1" hide_zero="1" text="###.###.###,@@">
+   <postscript description="B1.103 POSTSCRIPT">MESSAGE COPY,F3.103</postscript>
  </field>
 </section>
 <section type="Foot" />
 <section type="Foot" level="1" />
- <section type="Foot" level="2" height="3">
+ <section type="Foot" level="2" height="4">
  <field border="1" x="1" y="0.5" type="Linea" width="168" height="0" pattern="1" />
-  <field x="84" y="1" type="Testo" width="17" pattern="1" text="Totali periodo:">
+  <field x="82" y="1" type="Testo" width="22" pattern="1" text="Totali periodo:">
+   <font face="Courier New" bold="1" size="8" />
+  </field>
+  <field x="82" y="2.5" type="Testo" width="22" pattern="1" text="Totali progressivi:">
   <font face="Courier New" bold="1" size="8" />
  </field>
  <field x="104" y="1" type="Valuta" align="right" width="15" id="101" pattern="1" text="###.###.###,@@">
@ -155,15 +178,26 @@ THEN
  <field x="120" y="1" type="Valuta" align="right" width="15" id="102" pattern="1" text="###.###.###,@@">
   <font face="Courier New" bold="1" size="8" />
  </field>
-  <field x="138" y="1" type="Valuta" align="right" width="15" id="103" pattern="1" text="###.###.###,@@">
+  <field x="104" y="2.5" type="Valuta" align="right" width="15" id="201" pattern="1" text="###.###.###,@@">
   <font face="Courier New" bold="1" size="8" />
+   <source>#101+#H2.201</source>
+  </field>
+  <field x="120" y="2.5" type="Valuta" align="right" width="15" id="202" pattern="1" text="###.###.###,@@">
+   <font face="Courier New" bold="1" size="8" />
+   <source>#102+#H2.202</source>
+  </field>
+  <field x="137" y="2.5" type="Valuta" align="right" width="15" id="203" pattern="1" text="###.###.###,@@">
+   <font face="Courier New" bold="1" size="8" />
+   <source>#201-#202</source>
  </field>
 </section>
- <section type="Foot" level="3" height="2">
+ <section type="Foot" level="3" height="2.5">
  <font italic="1" face="Courier New" size="8" />
-  <field x="110" y="0.5" type="Testo" width="9" pattern="1" text="Saldo al" />
-  <field x="132" y="0.5" type="Valuta" align="right" width="15" pattern="1" hide_zero="1" text="###.###.###,@@" />
-  <field x="120" y="0.5" type="Data" width="11" id="131" pattern="1" />
+  <field x="154" y="0.5" type="Testo" width="2" pattern="1" text="al" />
+  <field x="137" y="0.5" type="Valuta" align="right" width="15" id="103" pattern="1" hide_zero="1" text="###.###.###,@@">
+   <font italic="1" face="Courier New" bold="1" size="8" />
+  </field>
+  <field x="157" y="0.5" type="Data" width="11" id="131" pattern="1" />
 </section>
 <sql>USE RMOVANA KEY 2
 JOIN MOVANA INTO NUMREG==NUMREG</sql>
--- a/ca/calib02.cpp
+++ b/ca/calib02.cpp
@ -168,7 +168,7 @@ TImporto TAnal_balance::saldo_fine_anno(const char* conto, const char* costo,
    if (commessa && *commessa)
    {
      if (select.not_empty()) select << "&&";
-      select << "(CODCMS=='" << commessa << "')";
+      select << "(COMMESSA=='" << commessa << "')";
    }
    if (fase && *fase)
    {
@ -232,14 +232,6 @@ bool TAnal_balance::saldo_movimenti(const char* conto, const char* costo,

  TString query, select;

-  if (dataini.ok())
-    select << "(ANSI(107.DATACOMP)>=" << dataini.date2ansi() << ")";
-  if (al.ok())
-  {
-    if (select.not_empty())
-      select << "&&";
-    select << "(ANSI(107.DATACOMP)<=" << al.date2ansi() << ")";
-  }
  if (costo && *costo)
  {
    if (select.not_empty())
@ -266,12 +258,12 @@ bool TAnal_balance::saldo_movimenti(const char* conto, const char* costo,

  query << "FROM CODCONTO=" << conto;
  if (dataini.ok())
-    query << " DATAREG=" << TDate(dataini-90L).string();
+    query << " DATACOMP=" << dataini.string();
  query << "\n";

  query << "TO CODCONTO=" << conto;
  if (al.ok())
-    query << " DATAREG=" << al.string();
+    query << " DATACOMP=" << al.string();
  query << "\n";
  
  TISAM_recordset rmovana(query);
@ -292,7 +284,7 @@ bool TAnal_balance::saldo_movimenti(const char* conto, const char* costo,
    if ((ntipomov & tipo) == 0)
      continue;

-    const TDate data = rmovana.get("107.DATACOMP").as_date();
+    const TDate data = rmovana.get(RMOVANA_DATACOMP).as_date();
    const TImporto imp(rmovana.get(RMOVANA_SEZIONE).as_string()[0], 
                       rmovana.get(RMOVANA_IMPORTO).as_real());
    if (data >= dal)