root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 4.0

Browse Source 
Files correlati     : ve0, ve6
Ricompilazione Demo : [ ]
Commento            :
Adeguato utilizzo nuovi alberi in evasione ordini.
Migliorate alcune indentazioni fuori standard


git-svn-id: svn://10.65.10.50/trunk@16000 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-01-17 11:12:05 +00:00
parent baa150a7a6
commit a916cf8b8d
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ve/ve2401.cpp
View File

@ -46,7 +46,7 @@ protected:
public:
bool restart() const { return _restart.full(); }
static void restart_with(const char* cod) { _restart = cod; }
static void restart_with(const TString& cod) { _restart = cod; }
TCodart_mask();
};
@ -151,17 +151,17 @@ bool TCodart_mask::build_children()
// Non usare qui un TString& children, altrimenti cambia sul piu' bello!
const TString80 children = cache().get("GSA", code, "S1");
// Affetto la stringona S1 in sottocodici da 3 caratteri l'uno
for (int i = 0; i < 9; i++)
{
const TString& subcode = children.mid(i*3, 3);
const TString4 subcode = children.mid(i*3, 3);
if (subcode.full())
create_level(i+2, subcode);
else
break;
}
force_update();
return id2pos(102) > 0;
}

8
ve/velib03.cpp
View File

@ -878,16 +878,14 @@ int TDocumento::write_rewrite(TBaseisamfile & f, bool re) const
if (!doc_bloccato)
{
if (tipo().spese_aut() && !get_bool("SPESEUPD"))
if (tipo().spese_aut() && !get_bool(DOC_SPESEUPD))
{
char name[8] = "CODSP0";
TString_array spese;
const TRectype & ven_rec = clifor().vendite();
for (int i = 1; i <= 4; i++)
{
name[5] = '0' + i;
const TString& s = ven_rec.get(name);
TString8 name; name.format("CODSP%d", i);
const TString& s = ven_rec.get(name);
if (s.full())
spese.add(s);
}

4
ve/velib04a.cpp
View File

@ -1,8 +1,8 @@
#include "velib04.h"
#include <dongle.h>
#include <modaut.h>
#include "velib04.h"
///////////////////////////////////////////////////////////
// TFatturazione bolle
///////////////////////////////////////////////////////////

4
ve/velib04d.cpp
View File

@ -2,8 +2,6 @@
#include "velib04d.h"
#include <automask.h>
#include <doc.h>
#include <rdoc.h>
///////////////////////////////////////////////////////////
// TConsegna ordini mask
@ -518,7 +516,7 @@ bool TConsegna_ordini::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o
// Crea una nuova riga merce senza articolo e con sola descrizione, qta ed um
TRiga_documento& outrec = outdoc.insert_row(i+1, tiporiga);
TString descr;
descr << "Scarto " << codart;
descr << TR("Scarto") << ' ' << codart;
outrec.put(RDOC_DESCR, descr);
TToken_string& ska = *(TToken_string*)obj;
outrec.put(RDOC_UMQTA, ska.get(0));

17
ve/velib06.cpp
View File

@ -2010,10 +2010,10 @@ TImage* TDocument_tree::image(bool selected) const
return get_res_image(BMP_STOP);
}
else
{
if (multiple_selection())
{
const bool sel = node_selected();
if (sel)
{
if (selected)
@ -2022,6 +2022,7 @@ TImage* TDocument_tree::image(bool selected) const
return get_res_image(BMP_DIRSEL);
}
}
}
return TTree::image(selected);
}
@ -2728,7 +2729,7 @@ void TElabora_mask::update_ndoc_filter(bool is_tipo_elaborazione)
if (is_tipo_elaborazione)
{
const TString16 num_fin(e->codice_numerazione_finale());
const TString4 num_fin(e->codice_numerazione_finale());
set(F_CODNUM_ELAB, num_fin);
field(F_CODNUM_ELAB).check();
set(F_TIPODOC_ELAB, tipo_fin);
@ -2759,8 +2760,13 @@ void TElabora_mask::update_ndoc_filter(bool is_tipo_elaborazione)
TTree_field& tf = tfield(F_ROWS);
if (!field(F_TIPODOC_ELAB).empty() && e != NULL)
{
if (aggiungi_doc_att && _art_filter.not_empty())
_tree.set_cursor(get(F_TIPOCF_ELAB)[0], get_long(F_CODCF_ELAB), get_int(F_ANNO_ELAB), filter, article_filter);
else
_tree.set_cursor(get(F_TIPOCF_ELAB)[0], get_long(F_CODCF_ELAB), get_int(F_ANNO_ELAB), filter);
tf.set_tree(&_tree);
TToken_string header(256, '\n');
TToken_string header(256, '\n');
header.add("Anno Num. N. Data Cli/For Ragione Sociale");
header.add(" Codice Articolo Descrizione Riga ");
if (aggiungi_doc_att && e->tipo() == _consegna_ordini)
@ -2768,11 +2774,6 @@ void TElabora_mask::update_ndoc_filter(bool is_tipo_elaborazione)
else
header << " Quantità";
tf.set_header(header);
if (aggiungi_doc_att && _art_filter.not_empty())
_tree.set_cursor(get(F_TIPOCF_ELAB)[0], get_long(F_CODCF_ELAB), get_int(F_ANNO_ELAB), filter, article_filter);
else
_tree.set_cursor(get(F_TIPOCF_ELAB)[0], get_long(F_CODCF_ELAB), get_int(F_ANNO_ELAB), filter);
if (aggiungi_doc_att) // GF20059
{