root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :10.0 378

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
aggiunte alcune features per conversione CM->GC/CA
aggiunto totale di commessa alla stampa mastrini
sistemato campo sul ricalcolo saldi
agganciata la gestione delle ripartizioni al menu GC


git-svn-id: svn://10.65.10.50/trunk@19121 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-07-16 14:29:13 +00:00
parent 6021703d11
commit 1a8ff1f3e4
5 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ca/ca0800.cpp
View File

@ -289,7 +289,9 @@ class TRiparti_app : public TRelation_application
void spezza_campo(const TString& str, TToken_string& row, int first) const;
void read_rows();
protected:
protected:
virtual const char * extra_modules() const {return "cm";} //funziona anche con autorizzazione CM
virtual bool user_create();
virtual bool user_destroy();
virtual int write(const TMask& m);

2
ca/ca2300a.uml
View File

@ -42,7 +42,7 @@ END
NUMBER F_FIRST_ANNO 4
BEGIN
PROMPT 3 7 "Primo esercizio interessato "
FLAGS "D"
FLAGS "L"
END
ENDPAGE

21
ca/ca3200a.rep
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report libraries="ve1300" name="ca3200a" orientation="2" lpi="8" class="ca3200a">
<description>Mastrini CA</description>
<font face="Courier New" size="8" />
@ -170,7 +170,22 @@ THEN
</field>
</section>
<section type="Foot" />
<section type="Foot" level="1" />
<section type="Foot" level="1">
<field border="1" x="1" y="0.5" type="Linea" width="168" height="0" pattern="1" />
<field x="91" y="1" type="Testo" width="20" pattern="1" text="TOTALI COMMESSA">
<font face="Courier New" bold="1" size="8" />
</field>
<field x="110" y="1" type="Valuta" align="right" width="16" id="101" pattern="1" text="###.###.###,@@">
<font face="Courier New" bold="1" size="8" />
</field>
<field x="126" y="1" type="Valuta" align="right" width="16" id="102" pattern="1" text="###.###.###,@@">
<font face="Courier New" bold="1" size="8" />
</field>
<field x="143" y="1" type="Valuta" align="right" width="16" id="103" pattern="1" text="###.###.###,@@">
<font face="Courier New" bold="1" size="8" />
<source>#101-#102</source>
</field>
</section>
<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="89" y="1" type="Testo" width="22" pattern="1" text="Totali periodo:">
@ -181,9 +196,11 @@ THEN
</field>
<field x="111" y="1" type="Valuta" align="right" width="15" id="101" pattern="1" text="###.###.###,@@">
<font face="Courier New" bold="1" size="8" />
<postscript description="F2.101 POSTSCRIPT">MESSAGE ADD,F1.101</postscript>
</field>
<field x="127" y="1" type="Valuta" align="right" width="15" id="102" pattern="1" text="###.###.###,@@">
<font face="Courier New" bold="1" size="8" />
<postscript description="F2.102 POSTSCRIPT">MESSAGE ADD,F1.102</postscript>
</field>
<field x="111" y="2.5" type="Valuta" align="right" width="15" id="201" pattern="1" text="###.###.###,@@">
<font face="Courier New" bold="1" size="8" />

1
ca/cacmmenu.men
View File

@ -18,6 +18,7 @@ Item_02 = "Commesse", "ca0 -5", "SF"
Item_03 = "Fasi", "ca0 -6", "SF"
Item_04 = "Stampa Commesse", "ca1 -5", "F"
Item_05 = "Stampa Fasi", "ca1 -6", "F"
Item_06 = "Tabelle di ripartizione", "ca0 -7", "F"
[CMMENU_040]
Caption = "Stampe"

21
ca/cacnv.cpp
View File

@ -2,6 +2,7 @@
#include <progind.h>
#include <recset.h>
#include <causali.h>
#include <pconti.h>
#include "../cg/cg2101.h"
@ -123,6 +124,7 @@ protected:
bool test_configuration();
void ripartisci(TRectype& recpcon);
void check_phase(const TRectype& analriga);
void set_caus_anal(const TString& codcaus) const;
public:
bool convert_clerks();
@ -401,6 +403,22 @@ void TConversione_cm2ca::check_phase(const TRectype& analriga)
}
}
void TConversione_cm2ca::set_caus_anal(const TString& codcaus) const
{
TLocalisamfile causali(LF_CAUSALI);
causali.put(CAU_CODCAUS, codcaus);
int err = causali.read();
if (err == NOERR)
{
const bool is_anal = causali.get_bool(CAU_MOVIND);
if (!is_anal)
{
causali.put(CAU_MOVIND, "X");
causali.rewrite();
}
}
}
void TConversione_cm2ca::create_new_movana(long numreg_cg, bool definitiva, TAssoc_array& cg_lines_to_anal)
{
TLocalisamfile f(LF_MOVANA);
@ -420,6 +438,9 @@ void TConversione_cm2ca::create_new_movana(long numreg_cg, bool definitiva, TAss
analmov.put(MOVANA_TIPODOC, mov_head.get(MOV_TIPODOC));
analmov.put(MOVANA_DESCR, mov_head.get(MOV_DESCR));
analmov.put(MOVANA_CODCAUS, mov_head.get(MOV_CODCAUS));
//deve anche mettere il flag di analitica alla causale!
set_caus_anal(mov_head.get(MOV_CODCAUS));
if (definitiva)
analmov.put(MOVANA_TRASFERITO, " ");
else