Patch level : 12.00 1330

Files correlati     : ca0600a.msk ca3700a.rep ca3.exe ca0.exe

Commento:

Modifiche alla stampa rendiconto
Aggiunto cliente
Aggiunto movomento preventivo
DAta chiusura commesse a fine anno

src/ca/ca0600.cpp

@@ -46,6 +46,7 @@ bool TCms_anal_msk::on_field_event(TOperable_field& o, TField_event e, long joll
 				TRectype & curr = c.curr();
 				const long items = c.items();
 				const int fino_all_anno = select.get_int(101);
+				TDate al(31, 12, fino_all_anno);
 				long chiuse = 0L;
 
 				for (c = 0L; c.pos() < items; ++c)
@@ -55,7 +56,7 @@ bool TCms_anal_msk::on_field_event(TOperable_field& o, TField_event e, long joll
 
 					if (!data_chiusura.ok())
 						data_chiusura = curr.get_date(COMMESSE_DATAFINE);
-					if (data_chiusura.ok() && anno <= fino_all_anno && data_chiusura <= today)
+					if (data_chiusura.ok() && anno <= fino_all_anno && data_chiusura <= al)
 					{
 						curr.put(COMMESSE_CHIUSA, true);
 						curr.rewrite();

src/ca/ca0600a.uml

@@ -361,6 +361,18 @@ STRING F_CMS_RIFER 15
 BEGIN
   PROMPT 2 14 "N. di riferimento "
   FIELD RIFER
+  USE LF_MOVANA SELECT TIPOMOV="P"
+  INPUT NUMREG F_CMS_RIFER
+  DISPLAY "Numero registrazione" NUMREG
+  DISPLAY "Descrizione@50" DESCR
+  DISPLAY "Data@10" DATAREG
+  OUTPUT F_CMS_RIFER NUMREG
+  OUTPUT F_CMS_DATAPREV DATAREG
+  OUTPUT F_CMS_PROVVP DPROVV
+  OUTPUT F_CMS_ANNOP DANNO
+  OUTPUT F_CMS_CODNUMP DCODNUM
+  OUTPUT F_CMS_NDOCP DNDOC
+  CHECKTYPE SEARCH
 END
 
 DATE F_CMS_DATAPREV
@@ -396,7 +408,24 @@ END
 NUMBER F_CMS_NDOCP 7
 BEGIN
   PROMPT 54 16 "N. doc. "
+  USE DOC
+  INPUT PROVV F_CMS_PROVVP
+  INPUT ANNO F_CMS_ANNOP
+  INPUT CODNUM F_CMS_CODNUMP
+  INPUT NDOC F_CMS_NDOCP
+  DISPLAY " " PROVV
+  DISPLAY "Anno" ANNO
+  DISPLAY "Numerazione" CODNUM
+  DISPLAY "Numero" NDOC
+  DISPLAY "Data@10" DATADOC
+  OUTPUT F_CMS_RIFER NUMREGCA
+  OUTPUT F_CMS_DATAPREV DATADOC
+  OUTPUT F_CMS_PROVVP PROVV
+  OUTPUT F_CMS_ANNOP ANNO
+  OUTPUT F_CMS_CODNUMP CODNUM
+  OUTPUT F_CMS_NDOCP NDOC
   FIELD NDOCP
+  CHECKTYPE NORMAL
 END
 
 GROUPBOX DLG_NULL 78 4
@@ -1002,4 +1031,4 @@ END
 
 ENDPAGE
 
-ENDMASK
+ENDMASK

src/ca/ca3700.cpp

@@ -1032,6 +1032,8 @@ void TPrint_rendiconto_ca_recordset::scrive_riga(TLocalisamfile& tmp, const TRec
 		TString80 rif;	//stringa di lavoro su cui viene scritto un doc originale
 		const int rows = original_doc->physical_rows();	//righe del doc attuale
 
+		riferimento.add(format("%s %ld", original_doc->get(DOC_TIPOCF) == "C" ? "Cli." : "For.", original_doc->get_long(DOC_CODCF)));
+
 		for (int i = 1; i <= rows; i++)	//scandisce tutte le righe del doc..
 		{
 			const TRiga_documento& riga = (*original_doc)[i];

src/ca/ca3700a.rep

@@ -125,7 +125,8 @@
    <prescript description="H1.0 PRESCRIPT">CA_FORMAT_CONTO</prescript>
   </field>
   <field x="1" y="10.75" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="18" codval="" id="" pattern="1" hide_zero="" text="Cliente principale:" />
-  <field border="2" x="1" y="12" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="169" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field x="1" y="12.75" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Preventivo:" />
+  <field border="2" x="1" y="14" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="169" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="20" y="10.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="101" pattern="1" hide_zero="" text="">
    <font face="Courier New" bold="1" size="8" />
    <prescript description="H1.101 PRESCRIPT">MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,CODCF</prescript>
@@ -154,6 +155,14 @@
    <modules>NP</modules>
    <source>#CONTSEP</source>
   </field>
+  <field x="11" y="12.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="107" pattern="1" hide_zero="" text="">
+   <font face="Courier New" bold="1" size="8" />
+   <prescript description="H1.107 PRESCRIPT">MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,RIFER</prescript>
+  </field>
+  <field x="30" y="12.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="108" pattern="1" hide_zero="" text="">
+   <font face="Courier New" bold="1" size="8" />
+   <prescript description="H1.108 PRESCRIPT">MESSAGE ISAMREAD,MOVANA,NUMREG=#107,DESCR</prescript>
+  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="2" hidden="" height="2" page_break="" can_break="" pattern="1">
   <groupby>ORDCONT+CONTO</groupby>
@@ -530,4 +539,4 @@
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="3" hidden="" page_break="" can_break="" pattern="1">
   <prescript description="F3 PRESCRIPT">0 #B1.100 !</prescript>
  </section>
-</report>
+</report>