From 3ccab681eca3e9518d03914c23fcb64dc98ba014 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 21 Feb 1996 16:56:30 +0000 Subject: [PATCH] Aggiunti # nei flags git-svn-id: svn://10.65.10.50/trunk@2627 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg2100c.uml | 2 +- cg/cg2100n.uml | 2 +- cg/cg2105.cpp | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cg/cg2100c.uml b/cg/cg2100c.uml index 6004ce6d9..27ddd9e4d 100755 --- a/cg/cg2100c.uml +++ b/cg/cg2100c.uml @@ -498,7 +498,7 @@ STRING F_NUMRIF 7 BEGIN PROMPT 68 16 "/ " FIELD LF_PARTITE->NUMPART - FLAGS "U" + FLAGS "U#" END STRING F_VALUTAINTRA 3 diff --git a/cg/cg2100n.uml b/cg/cg2100n.uml index 4f0f53c13..9dccd5719 100755 --- a/cg/cg2100n.uml +++ b/cg/cg2100n.uml @@ -23,7 +23,7 @@ END STRING P_NUMERO 7 BEGIN PROMPT 22 2 "Numero " - FLAGS "U" + FLAGS "U#" CHECKTYPE REQUIRED WARNING "Inserire il numero di riferimento partita" END diff --git a/cg/cg2105.cpp b/cg/cg2105.cpp index 89015b23c..b5345d184 100755 --- a/cg/cg2105.cpp +++ b/cg/cg2105.cpp @@ -135,6 +135,7 @@ TPay_mask::TPay_mask(const TGame_mask& parent, int mod) #ifdef __EXTRA__ enable(E_SEZIONE, insert_mode()); + hide(E_CODPAG); hide(E_DESPAG); set_handler(E_TOTALE, TSaldaconto_app::totale_handler); if (app().gestione_valuta()) @@ -150,10 +151,14 @@ TPay_mask::TPay_mask(const TGame_mask& parent, int mod) hide(S_RESIDUOPAG); hide(-2); // I campi relativi alla contropartita non vengono gestiti + hide(E_IMPOSTE); set_handler(E_DESCR, descr_handler); set_handler(S_DESCAGG, descr_handler); + const char a = TPartita::allineamento_richiesto(parent.conto().tipo()); + field(E_NUMRIF).set_justify(a == 'R'); + disable(E_ANNORIF); disable(E_NUMRIF); #endif @@ -1137,13 +1142,6 @@ int TGame_mask::nuovo_pagamento(TPartita& partita, int nriga, int rata, tipo_mov { #ifdef __EXTRA__ const int nrigp = nuova_riga(partita, tm); - if (nriga > 0 && nriga != TPartita::UNASSIGNED) - { - const TRiga_partite& fattura = partita.riga(nriga); - const TValuta val(fattura); - TRiga_partite& somma = partita.riga(nrigp); - val.put(somma); - } #else int nrigp = partita.mov2rig(_numreg, _numrig); // Cerca riga partita relativa alla riga rmov if (nrigp <= 0) // Devo creare una nuova riga di partita