From 9da0257b0121f02128829785bc051e7450bd33b8 Mon Sep 17 00:00:00 2001 From: luca Date: Thu, 15 Apr 2004 08:58:36 +0000 Subject: [PATCH] Patch level :2.1 26 Files correlati :cg3.exe Ricompilazione Demo : [ ] Commento : Bug 26 La stampa dei mastrini a 198 crt e 132 va rivista per la sistemazione delle colonne movimenti provvisori e competenza con l'allineamento delle contropartite. git-svn-id: svn://10.65.10.50/trunk@11974 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg3200.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cg/cg3200.cpp b/cg/cg3200.cpp index a3765071f..4989e2453 100755 --- a/cg/cg3200.cpp +++ b/cg/cg3200.cpp @@ -2802,16 +2802,16 @@ void TMastrini_application::crea_intestazione() { sep.fill('_'); //Stampa 132 - (sep(132)) set_header (6, (const char *) sep); - set_header (7,"%s@19g%s@117g%s@132g%s", - TR("Operazione"), TR("Documento"), TR("Contro"), TR("A")); + set_header (7,"%s@19g%s@117g%s@126g%s@132g%s", + TR("Operazione"), TR("Documento"), TR("Contro"), TR("Nr"), TR("A")); if (_stampa_mov_prov) set_header(7,"@130gM"); set_header (8, TR("Data")); if (_stampanum < 3) set_header (8,"@11g%s", TR("Numero")); - set_header (8,"@19g%s@30g%s@38g%s@61g%s@95g%s@111g%s@117g%s@127g%s@132g%s", + set_header (8,"@19g%s@30g%s@38g%s@61g%s@95g%s@111g%s@117g%s@126g%s@132g%s", TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"), - TR("Dare"), TR("Avere"), TR("Partita"), TR("Prot."), TR("C")); + TR("Dare"), TR("Avere"), TR("Partita"), TR("Pro"), TR("C")); if (_stampa_mov_prov) set_header(8,"@130g%s", TR("P")); sep.fill('_'); @@ -2825,13 +2825,13 @@ void TMastrini_application::crea_intestazione() { set_header (7,"%s@23g%s@183g%s@190g%s@197g%s", TR("Operazione"), TR("Documento"), - TR("Reg"), TR("Numero"), TR("A")); + TR("Reg"), TR("Nr"), TR("A")); } else { set_header (7,"%s@23g%s@169g%s@183g%s@190g%s@197g%s", TR("Operazione"), TR("Documento"), TR("Contro"), - TR("Reg"), TR("Numero"), TR("A")); + TR("Reg"), TR("Nr"), TR("A")); } if (_stampa_mov_prov) set_header(7,"@195g%s", TR("M")); @@ -2844,17 +2844,17 @@ void TMastrini_application::crea_intestazione() case 1: set_header (8,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@152g%s@169g%s@183g%s@189g%s@197g%s", TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"), TR("Dare"), TR("Avere"), - TR("Saldo progre."), TR("Saldo movim."), TR("Partita"), TR("Iva"), TR("Protoc."), TR("C")); + TR("Saldo progre."), TR("Saldo movim."), TR("Partita"), TR("Iva"), TR("Prot"), TR("C")); break; case 2: set_header (8,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@152g%s@169g%s@183g%s@189g%s@197g%s", TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"), TR("Dare"), TR("Avere"), - TR("Saldo scalare"), TR("Saldo movim."), TR("Partita"), TR("Iva"), TR("Protoc."), TR("C")); + TR("Saldo scalare"), TR("Saldo movim."), TR("Partita"), TR("Iva"), TR("Prot"), TR("C")); break; case 3: set_header (8,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@183g%s@189g%s@197g%s", TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"), TR("Dare"), TR("Avere"), - TR("Contropartita"), TR("Iva"), TR("Protoc."), TR("C")); + TR("Contropartita"), TR("Iva"), TR("Prot"), TR("C")); break; default: break; @@ -3039,12 +3039,12 @@ int TMastrini_application::crea_intestazione(int start_riga) set_row(r-1,"@195gM"); set_row (r,"Data"); if (_stampanum < 3) - set_row (r,"@11gnumero"); + set_row (r,"@11gNumero"); set_row (r,FR("@23gData@34gNumero@42gCod.Causale@70gDescrizione@112gDare@127gAvere")); if (_stampa_saldo_des == 2) - set_row (r++,FR("@135gContropartita@183gIva@189gProtoc.@197gC")); + set_row (r++,FR("@135gContropartita@183gIva@189gProt@197gC")); else - set_row (r++,FR("@135gSaldo progre.@152gSaldo movim.@169gPartita@183gIva@189gProtoc.@197gC")); + set_row (r++,FR("@135gSaldo progre.@152gSaldo movim.@169gPartita@183gIva@189gProt@197gC")); if (_stampa_mov_prov) set_row (r-1,"@195gP"); sep1.fill('_');