From 572e2ffc349fac3b1699fd1f3cace4ba830017f3 Mon Sep 17 00:00:00 2001 From: rajitgill Date: Fri, 20 Mar 2009 17:48:18 +0000 Subject: [PATCH] Patch level :10.0 Files correlati :lv2.exe,lv2500.msk Ricompilazione Demo : [ ] Commento : Modifiche sulla fatturazione git-svn-id: svn://10.65.10.50/trunk@18579 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ...ALISI DELLA FATTURAZIONE LAVANDERIE.doc | Bin 0 -> 33280 bytes lv/f168.dir | 2 +- lv/f168.trr | 7 +- lv/lv0300a.uml | 21 +++++- lv/lv2500.cpp | 63 ++++++++++++++---- lv/lv2500a.h | 3 +- lv/lv2500a.uml | 38 +++++++++-- lv/lvcondv.h | 3 + 8 files changed, 110 insertions(+), 27 deletions(-) create mode 100755 lv/ANALISI DELLA FATTURAZIONE LAVANDERIE.doc diff --git a/lv/ANALISI DELLA FATTURAZIONE LAVANDERIE.doc b/lv/ANALISI DELLA FATTURAZIONE LAVANDERIE.doc new file mode 100755 index 0000000000000000000000000000000000000000..c0478c162aff39205f55009b5a8d6a839e3df42b GIT binary patch literal 33280 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 literal 0 HcmV?d00001 diff --git a/lv/f168.dir b/lv/f168.dir index 615756319..fedc7e928 100755 --- a/lv/f168.dir +++ b/lv/f168.dir @@ -1,3 +1,3 @@ 168 0 -$lvcondv|||170|0|Tabella testate di contratto||| +$lvcondv|||205|0|Tabella testate di contratto||| diff --git a/lv/f168.trr b/lv/f168.trr index 640035899..a4e6e0d07 100755 --- a/lv/f168.trr +++ b/lv/f168.trr @@ -1,5 +1,5 @@ 168 -44 +45 CODCONT|3|6|0|Codice Contratto STATUS|1|2|0|Stato del contratto, chiuso, confermato, da confermare PROPOSTA|8|1|0|Proposta di contratto @@ -9,7 +9,7 @@ DATASC|5|8|0|Data di scadenza del contratto CODINDSP|2|3|0|Codice indirizzo di spedizione DTSTAGIN|5|8|0|Data di inizio stagionalità DTSTAGSC|5|8|0|Data di scadenza stagionalità -FATTSOSP|8|1|0|Fatturazione sospesa o escluso da fatturazione +FATTSOSP|8|1|0|Escluso da fatturazione STRCONS|8|1|0|Stampa riepilogo consegne TIPOLIS|2|1|0|Tipo listino STPRZBOL|8|1|0|Visualizza i prezzi in bolla @@ -42,7 +42,8 @@ NUMUT|2|5|0|Numero utente NUMETI|2|5|0|Numero etichette RITAUDTTMP|8|1|0|Ritiro automatico dotazione temporanea DTFIXDDT|5|8|0|Data fissa per creazione DDT da sporco -ELART|8|1|0|Elenco articoli +PREZROT|4|18|3|Prezzo rotti +IMPCANFIS|4|18|3|Importo per canone fisso COMMENTI|11|10|0|Commenti e note 1 CODCF+CODCONT| diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml index 15ccc99ab..e106496d0 100755 --- a/lv/lv0300a.uml +++ b/lv/lv0300a.uml @@ -552,10 +552,25 @@ BEGIN FIELD Perarr END -NUMBER F_VALFIX 10 +STRING F_CODARTFIX 20 BEGIN - PROMPT 2 16 "Codice per forfait a valore fisso " - FIELD Valfix + PROMPT 2 16 "Codice articolo per forfait a valore fisso " + FIELD Codartfix + KEY 1 + FLAG "UG" + USE LF_ANAMAG + INPUT CODART F_CODARTFIX + DISPLAY "Codice@20" CODART + DISPLAY "Descrizione@50" DESCR + OUTPUT F_CODARTFIX CODART +END + +LISTBOX F_TIPOPR 1 8 +BEGIN + PROMPT 2 17 "Tipo di prezzo" + ITEM "0|Prezzo da contratto" + ITEM "1|Prezzo da bolla" + FIELD Tipopr END GROUPBOX DLG_NULL 78 4 diff --git a/lv/lv2500.cpp b/lv/lv2500.cpp index 0d6e1043b..1fbcf6da2 100755 --- a/lv/lv2500.cpp +++ b/lv/lv2500.cpp @@ -1,4 +1,5 @@ #include +#include #include "lvlib.h" #include "lv2500a.h" @@ -51,7 +52,28 @@ bool TFatturazione_lavanderie::da_raggruppare(const TRiga_documento & rin) const TRectype & rcont = contr.row(codart); const int tipoforf = rcont.get_int(LVRCONDV_TIPOFORF); - return tipoforf > 1; + // return tipoforf > 1; // Test originale + if (tipoforf > 1) + return true; + + // Da qui in poi e' sottinteso tipoforf == 1 + if (ini_get_int(CONFIG_DITTA, "lv", "TipoPr") == 1) + return false; + + // Test GUY + const TString8 causale = rin.get(RDOC_CODAGG1); + const TRectype& cau = cache().get("&CAU", causale); + if (cau.get_bool("B1")) + { + const TCausale_magazzino& con = cached_causale_magazzino(cau.get("S2")); + if (con.sgn(s_dottm)) // Causale di incremento sotazione temporanea + return true; + } + + if (cau.get_bool("B4")) // Causale di rotto + return true; + + return false; } @@ -152,23 +174,36 @@ void TFatturazione_lavanderie::add_rows(TRiga_documento & rout, TRiga_documento { const TString8 causale = rin.get(RDOC_CODAGG1); const TRectype& cau = cache().get("&CAU", causale); - //movimento o meno la dotazione temporanea/odierna a seconda di cosa prevede la causale - - if (cau.get_bool("B0")) + const TCausale_magazzino& rit = cached_causale_magazzino(cau.get("S1")); + const TCausale_magazzino& con = cached_causale_magazzino(cau.get("S2")); //movimento o meno la dotazione temporanea/odierna a seconda di cosa prevede la causale + + const long clifo = rin.doc().get_long(DOC_CODCF); + const int indsped = rin.doc().get_int(DOC_CODINDSP); + TLaundry_contract contr(clifo, indsped, _data_elab); + + if (cau.get_bool("B4") && contr.get_int(LVCONDV_ADDCAPROT)) // Guardo se è una causale di rotto e se è abilitato nella testata del contratto la fatturazione dei rotti { - const TCausale_magazzino& rit = cached_causale_magazzino(cau.get("S1")); - const real qta = rit.sgn(s_consmese) * rin.get_real(RDOC_QTA); - - rout.add(RDOC_QTA, qta); - + const real qta = rit.sgn(s_consmese) * rin.get_real(RDOC_QTA); + rout.put(RDOC_PREZZO,contr.get_int(LVCONDV_PREZROT)); + rout.add(RDOC_QTA, qta); } - if (cau.get_bool("B1")) + else { - const TCausale_magazzino& con = cached_causale_magazzino(cau.get("S2")); - const real qta = con.sgn(s_consmese) * rin.get_real(RDOC_QTA); + if (cau.get_bool("B0")) + { + const real qta = rit.sgn(s_consmese) * rin.get_real(RDOC_QTA); + rout.add(RDOC_QTA, qta); - rout.add(RDOC_QTA, qta); + } + if (cau.get_bool("B1")) + { + const real qta = con.sgn(s_consmese) * rin.get_real(RDOC_QTA); + rout.add(RDOC_QTA, qta); + } } + + + } void TFatturazione_lavanderie::create_row(TDocumento& doc_out, const TRiga_documento & rin) @@ -235,7 +270,7 @@ void TFatturazione_lav_app::main_loop() while (msk.run()!=K_QUIT) { TString query; - query << "USE DOC KEY 3 SELECT (TIPOCF==\"C\")&&(BETWEEN(DATADOC,#DADATA,#ADATA))\n" + query << "USE DOC KEY 3 SELECT (TIPOCF==\"C\")&&(BETWEEN(DATADOC,#DADATA,#ADATA))&&(STATO=2)&&(TIPODOC==\"B01\")\n" << "BY TIPOCF CODCF DATADOC\n" << "FROM " << "DATADOC=#DADATA PROVV=D ANNO=#ANNO\n" << "TO " << " DATADOC=#ADATA PROVV=D ANNO=#ANNO\n"; diff --git a/lv/lv2500a.h b/lv/lv2500a.h index 7c040d363..2dcd48a90 100755 --- a/lv/lv2500a.h +++ b/lv/lv2500a.h @@ -4,7 +4,8 @@ #define F_COD_ELAB 104 #define F_DESC_ELAB 105 #define F_PERFAT 106 - +#define F_CODCATC 107 +#define F_CODZONA 108 diff --git a/lv/lv2500a.uml b/lv/lv2500a.uml index 2f0c18dac..5f3e7a02f 100755 --- a/lv/lv2500a.uml +++ b/lv/lv2500a.uml @@ -10,13 +10,13 @@ PAGE "Fatturazione" -1 -1 40 5 DATE F_DADATA BEGIN PROMPT 2 1 "Fattura dal " - CHECKTYPE REQUIRED + FLAGS "H" END DATE F_ADATA BEGIN PROMPT 45 1 "al " - CHECKTYPE REQUIRED + FLAGS "H" END DATE F_DATAFAT @@ -26,9 +26,37 @@ BEGIN CHECKTYPE REQUIRED END +STRING F_CODCATC 2 +BEGIN + PROMPT 43 3 "Codice Categoria economica " + FIELD LF_CFVEN->CODCATC + USE CCO + INPUT CODTAB F_CODCATC + DISPLAY "Codice contabile" CODTAB + DISPLAY "Descrizione@30" S0 + OUTPUT F_CODCATC CODTAB + HELP "Codice categoria contabile del C/F" + CHECKTYPE NORMAL +END + +STRING F_CODZONA 2 +BEGIN + PROMPT 2 4 "Codice Zona " + FIELD LF_CFVEN->CODZONA + GROUP 7 + USE ZON + INPUT CODTAB F_CODZONA + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CODZONA CODTAB + HELP "Codice della zona dell'agente" + CHECKTYPE NORMAL +END + + STRING F_COD_ELAB 8 BEGIN - PROMPT 2 3 "Codice " + PROMPT 2 5 "Codice " FLAG "U" USE %ELD SELECT I0==2 INPUT CODTAB F_COD_ELAB @@ -42,7 +70,7 @@ END STRING F_DESC_ELAB 50 BEGIN - PROMPT 2 4 "Descrizione " + PROMPT 2 6 "Descrizione " USE %ELD KEY 2 SELECT I0==2 INPUT S0 F_DESC_ELAB DISPLAY "Descrizione@50" S0 @@ -54,7 +82,7 @@ END RADIOBUTTON F_PERFAT 1 70 BEGIN - PROMPT 2 5 "@bPeriodicità di fatturazione " + PROMPT 2 7 "@bPeriodicità di fatturazione " ITEM "0|Giornaliera" ITEM "1|Settimanale" ITEM "2|Quindicinale" diff --git a/lv/lvcondv.h b/lv/lvcondv.h index 820efee3e..08c6fea2e 100755 --- a/lv/lvcondv.h +++ b/lv/lvcondv.h @@ -44,6 +44,9 @@ #define LVCONDV_NUMETI "MUNETI" #define LVCONDV_RITAUDTTMP "RITAUDTTMP" #define LVCONDV_DTFIXDDT "DTFIXDDT" +#define LVCONDV_PREZROT "PREZROT" +#define LVCONDV_IMCANFIS "IMCANFIS" #define LVCONDV_COMMENTI "COMMENTI" + #endif \ No newline at end of file