From 5be093d48a4bf6c4e7e4e1ab89a2b842ed436a5d Mon Sep 17 00:00:00 2001 From: luca83 Date: Tue, 26 Jan 2010 16:45:01 +0000 Subject: [PATCH] Patch level : 10.0 patcg 591 Files correlati : lv1 lv2 lv1200c.rep Ricompilazione Demo : [ ] Commento : Aggiunto il report raggruppato per cliente MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corretto l'utilizzo dei campi virtuali nelle query Corretto l'estrazione dell'unitĂ  di misura nella fatturazione a Kg git-svn-id: svn://10.65.10.50/trunk@19991 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv1200.cpp | 8 +-- lv/lv1200c.rep | 132 +++++++++++++++++++++++++++++++++++++++++++++++++ lv/lv2500.cpp | 2 +- 3 files changed, 137 insertions(+), 5 deletions(-) create mode 100755 lv/lv1200c.rep diff --git a/lv/lv1200.cpp b/lv/lv1200.cpp index d8bda00a9..799be9940 100755 --- a/lv/lv1200.cpp +++ b/lv/lv1200.cpp @@ -176,10 +176,10 @@ void TStampa_a_kg_app::prepara_recordset(TStampa_a_kg_rep & rep) const query << "&&(TIPORIGA==\"21\")&&(33.TIPOCF=\"C\")"; switch(raggruppa) { - case 1: query << "&&(BETWEEN(33.CODCF,#DACODCF,#ACODCF))\nBY 33.CODCF CODART\n"; break; - case 2: query << "&&(BETWEEN(33.G1:CODITI,#DAITI,#AITI)\nBY 33.G1:CODITI CODART\n"; break; - case 3: query << "&&(BETWEEN(33.CODAG,#DAAUT,#AAUT)\nBY 33.CODAG CODART\n"; break; - default: query << "\nBY CODART\n"; break; + case 1: query << "&&(BETWEEN(33.CODCF,#DACODCF,#ACODCF))\nBY 33.CODCF CODART\n"; break; + case 2: query << "&&(BETWEEN(33.CODITI,#DAITI,#AITI))\nBY 33.CODITI CODART\n"; break; + case 3: query << "&&(BETWEEN(33.CODAG,#DAAUT,#AAUT))\nBY 33.CODAG CODART\n"; break; + default: query << "\nBY CODART\n"; break; } query << "JOIN DOC INTO CODNUM==CODNUM ANNO==ANNO PROVV==PROVV NDOC==NDOC\n" << "JOIN ANAMAG INTO CODART==CODART\n" diff --git a/lv/lv1200c.rep b/lv/lv1200c.rep new file mode 100755 index 000000000..0b3156176 --- /dev/null +++ b/lv/lv1200c.rep @@ -0,0 +1,132 @@ + + + Stampa a kg per autista + +
+
+ + + + + + MESSAGE _TODAY + + + + MESSAGE _PAGENO + + + + #DADATA + MESSAGE _TODAY + + + + #ADATA + MESSAGE _TODAY + +
+
+ DOC.CODCF + 0 #F2.101 ! +0 #F2.102 ! +0 #F2.103 ! + + + MESSAGE ISAMREAD,TABMOD,COD='AUT'!CODTAB=#99,S0 + + + MESSAGE ISAMREAD,20,TIPOCF='C'!CODCF=#99,RAGSOC + MESSAGE RESET,F3.101 +MESSAGE RESET,F2.101 +MESSAGE RESET,F3.102 +MESSAGE RESET,F2.102 +MESSAGE RESET,F3.103 +MESSAGE RESET,F2.103 + + + + + RDOC.CODART + + + ANAMAG.DESCR + + + + DOC.CODAG + + + RDOC.QTA + + + RDOC.IMPORTO + +
+
+ CODART + MESSAGE RESET,F3.101 +MESSAGE RESET,F3.102 +MESSAGE RESET,F3.103 +
+
+
+ + + + + +
+
+
+ +
+
+ + + + + + +
+
+ MESSAGE RESET,F3.101 +MESSAGE RESET,F3.102 +MESSAGE RESET,F3.103 + + B1.201 + + + B1.202 + + + +
+ USE RDOC +JOIN DOC INTO CODNUM==CODNUM ANNO==ANNO PROVV==PROVV NDOC==NDOC + \ No newline at end of file diff --git a/lv/lv2500.cpp b/lv/lv2500.cpp index 8f7eec591..f69603f05 100755 --- a/lv/lv2500.cpp +++ b/lv/lv2500.cpp @@ -525,7 +525,7 @@ void TFatturazione_lavanderie::post_process(TLista_documenti& doc_out, TLista_do } //leggo l'unità di misura dell'articolo e la quantità convertita all'unità di misura dell'articolo - const TString4 umart = artlav.um()[0].get(UMART_UM); + const TString4 umart = artlav.um()[1].get(UMART_UM); const real qta = artlav.convert_to_um(rout.get_real(RDOC_QTA), umart, umri, false); //se l'articolo non è espresso in kg, allora: