From 7235cf28faff98ddb9c85eb91bc58e720dbc8506 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 4 Oct 2009 11:56:19 +0000 Subject: [PATCH] Patch level : 10.0 430 Files correlati : cg0.exe cg1.exe Ricompilazione Demo : [ ] Commento MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug 0001462 Aggiungere secondi riga indirizzo di 35 caratteri nella scheda indirizzi presente nella’anagrafica clienti. La seconda riga indirizzo deve essere inserita nella stampa clienti/fornitori (prospetto vendite) Bug 0001463 il cliente segnala che gli indirizzi di spedizione del cliente 1, se vengono annullati tutti, al nuovo richiamo del cliente ricompaiono come prima. Ho verificato che sul file indsped in realtà quegli indirizzi sono relativi al cliente 17 (e sono i primi del file). Il cliente 17 mi sembra formalmente valido. l'area dati cui fare riferimento è nella cartella ftp://www.aga.it/Ilaria/20090928.zip [^] git-svn-id: svn://10.65.10.50/trunk@19369 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg0200.cpp | 11 +++++++++-- cg/cg0200.h | 1 + cg/cg0200a.uml | 1 + cg/cg0200b.uml | 9 ++++++++- cg/cg0201.cpp | 4 ++-- cg/cg1200.cpp | 33 +++++++++++++++++++-------------- cg/f16.dir | 2 +- cg/f16.trr | 3 ++- 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/cg/cg0200.cpp b/cg/cg0200.cpp index 4d8bf41da..e9ceb02e9 100755 --- a/cg/cg0200.cpp +++ b/cg/cg0200.cpp @@ -659,6 +659,7 @@ int TClifo_application::read(TMask& m) key << '|' << rec.get(IND_COM); const TRectype& com = cache().get(LF_COMUNI, key); riga.add(com.get(COM_DENCOM)); + riga.add(rec.get(IND_INDIR2)); riga.add(rec.get(IND_CODIND)); indsp_sheet().row(i)=riga; @@ -718,11 +719,14 @@ void TClifo_application::ini2mask(TConfig& ini, TMask& m, bool query) riga.add(ini.get(IND_PFAX)); riga.add(ini.get(IND_FAX)); riga.add(ini.get(IND_IVARID)); - TString16 key; + + TString16 key; key << ini.get(IND_STATO); key << '|' << ini.get(IND_COM); const TRectype & com = cache().get(LF_COMUNI, key); riga.add(com.get(COM_DENCOM)); + riga.add(ini.get(IND_INDIR2)); + riga.add(ini.get(IND_CODIND)); indsp_sheet().row(i)=riga; @@ -793,7 +797,8 @@ void TClifo_application::mask2ini(const TMask& m, TConfig& ini) ini.set(IND_PFAX,row.get()); ini.set(IND_FAX,row.get()); ini.set(IND_IVARID,row.get()); - ini.set(IND_CODIND,i+1); + ini.set(IND_INDIR2,row.get()); + ini.set(IND_CODIND,i+1); } for ( ; ; i++) { @@ -913,6 +918,8 @@ void TClifo_application::common_f(const TMask& m) rec.put(IND_PFAX,row.get()); rec.put(IND_FAX,row.get()); rec.put(IND_IVARID,row.get()); + row.get(); + rec.put(IND_INDIR2,row.get()); rec.put(IND_CODIND,i+1); } } diff --git a/cg/cg0200.h b/cg/cg0200.h index 5fab32fe6..043f49869 100755 --- a/cg/cg0200.h +++ b/cg/cg0200.h @@ -190,5 +190,6 @@ #define F_FAXI 111 #define F_IVARIDI 112 #define F_DENCOMI 113 +#define F_INDIR2 114 #endif // __CG0200_H diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml index 532593617..c46d2ca8b 100755 --- a/cg/cg0200a.uml +++ b/cg/cg0200a.uml @@ -1189,6 +1189,7 @@ BEGIN ITEM "Numero fax@30" ITEM "Iva Rid." ITEM "Comune@50" + ITEM "Indirizzo aggiuntivo@35" END NUMBER F_CODINDDOC 3 diff --git a/cg/cg0200b.uml b/cg/cg0200b.uml index 25c259e4a..10e55931d 100755 --- a/cg/cg0200b.uml +++ b/cg/cg0200b.uml @@ -76,7 +76,7 @@ END STRING F_DENCOMI 40 BEGIN PROMPT 33 6 "" -HELP "Nome del comne del ciente/fornitore" +HELP "Nome del comune del ciente/fornitore" USE LF_COMUNI KEY 2 INPUT DENCOM F_DENCOMI DISPLAY "Comune@50" DENCOM @@ -88,6 +88,13 @@ ADD RUN ba4 -0 GROUP 1 END +STRING F_INDIR2 35 +BEGIN +PROMPT 1 7 "Ind.agg. " +HELP "Indirizzo aggiuntivo del cliente/fornitore" +GROUP 1 +END + GROUPBOX DLG_NULL 72 4 BEGIN PROMPT 1 8 "Numeri Telefonici" diff --git a/cg/cg0201.cpp b/cg/cg0201.cpp index eb20f658f..171edbcce 100755 --- a/cg/cg0201.cpp +++ b/cg/cg0201.cpp @@ -7,8 +7,8 @@ TClifoVI::TClifoVI() : TRelation(LF_CLIFO), _oldindirizzi(0), _gesven(FALSE) { - add(LF_CFVEN,"TIPOCF=TIPOCF|CODCF=CODCF"); - add(LF_INDSP,"TIPOCF=TIPOCF|CODCF=CODCF"); + add(LF_CFVEN,"TIPOCF==TIPOCF|CODCF==CODCF"); + add(LF_INDSP,"TIPOCF==TIPOCF|CODCF==CODCF"); } void TClifoVI::destroy_rows() diff --git a/cg/cg1200.cpp b/cg/cg1200.cpp index 9fad44c31..f18f45f4a 100755 --- a/cg/cg1200.cpp +++ b/cg/cg1200.cpp @@ -759,24 +759,29 @@ void TPrintclifo_app::set_vendite(int f, int c) ///////////////////////////////////////// // End of printing CFVEN information // ///////////////////////////////////////// - case LF_INDSP: + case LF_INDSP: ////////////////////////////////////////////////// // Prints INDSP information for each customer // ////////////////////////////////////////////////// - set_row(1,"@9g@pn @17g@s",FLD(LF_INDSP,IND_CODIND,"@@@"), - FLD(LF_INDSP,IND_RAGSOC)); - set_row(2,"@17g@s @s @65g@s @72g#t",FLD(LF_INDSP,IND_INDIR), - FLD(LF_INDSP,IND_CIV),FLD(LF_INDSP,IND_CAP), &_localita); - set_row(3,"@17g#t @60g#t @102g@f",&_telefono,&_fax, - FLD(LF_INDSP,IND_IVARID)); - current_cursor()->save_status(); - if (!current_cursor()->next_match(LF_INDSP)) - for (int i=0;i<_interline;i++) - set_row(i+4,""); - else - set_row(4,""); - current_cursor()->restore_status(); + { + int row = 1; + + set_row(row++,"@9g@pn @17g@s",FLD(LF_INDSP,IND_CODIND,"@@@"), + FLD(LF_INDSP,IND_RAGSOC)); + set_row(row++,"@17g@s @s @65g@s @72g#t",FLD(LF_INDSP,IND_INDIR), + FLD(LF_INDSP,IND_CIV),FLD(LF_INDSP,IND_CAP), &_localita); + set_row(row++,"@17g@s",FLD(LF_INDSP,IND_INDIR2)); + set_row(row++,"@17g#t @60g#t @102g@f",&_telefono,&_fax, + FLD(LF_INDSP,IND_IVARID)); + current_cursor()->save_status(); + if (!current_cursor()->next_match(LF_INDSP)) + for (int i=0;i<_interline;i++) + set_row(i+4,""); + else + set_row(4,""); + current_cursor()->restore_status(); + } ///////////////////////////////////////// // End of printing INDSP information // ///////////////////////////////////////// diff --git a/cg/f16.dir b/cg/f16.dir index 6793fcbbd..662064f8d 100755 --- a/cg/f16.dir +++ b/cg/f16.dir @@ -1,3 +1,3 @@ 16 0 -$indsped|0|0|234|0|Indirizzi di spedizione|NCF|| +$indsped|0|0|269|0|Indirizzi di spedizione|NCF|| diff --git a/cg/f16.trr b/cg/f16.trr index 28352138e..877a14b81 100755 --- a/cg/f16.trr +++ b/cg/f16.trr @@ -1,10 +1,11 @@ 16 -15 +16 TIPOCF|1|1|0|Tipo liente o ornitore CODCF|3|6|0|Codice cliente o fornitore CODIND|2|3|0|Codice progressivo indirizzo RAGSOC|1|50|0|Ragione sociale INDIR|1|35|0|Indirizzo +INDIR2|1|35|0|Indirizzo Paerte aggiuntiva CIV|1|10|0|Numero civico LOCALITA|1|35|0|Localita' CAP|1|5|0|CAP