*.url Aggiornato uso url

mglib.h    Tolti #include inutili
mglib*.cpp Risolti conflitti


git-svn-id: svn://10.65.10.50/trunk@6596 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1998-05-04 09:59:49 +00:00
parent 2e968de2c9
commit c66824e678
8 changed files with 21 additions and 172 deletions

View File

@ -3,28 +3,3 @@
#define QFIRMNAME "A.G.A. Informatica Srl"
#include <default.url>
MENU TASK_MENUBAR
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(1)
MENU MENU_BAR(1)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(2)
MENU MENU_BAR(2)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(3)
MENU MENU_BAR(3)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"

View File

@ -3,28 +3,3 @@
#define QFIRMNAME "A.G.A. Informatica Srl"
#include <default.url>
MENU TASK_MENUBAR
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(1)
MENU MENU_BAR(1)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(2)
MENU MENU_BAR(2)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(3)
MENU MENU_BAR(3)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"

View File

@ -3,28 +3,3 @@
#define QFIRMNAME "A.G.A. Informatica Srl"
#include <default.url>
MENU TASK_MENUBAR
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(1)
MENU MENU_BAR(1)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(2)
MENU MENU_BAR(2)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(3)
MENU MENU_BAR(3)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"

View File

@ -1,30 +1,6 @@
#define APPNAME campo
#define QAPPNAME "campo"
#define QFIRMNAME "A.G.A. Informatica Srl"
#include <default.url>
MENU TASK_MENUBAR
SUBMENU MENU_FILE "~File"
MENU M_FONT
ITEM M_FONT_SELECT "~Font"
ITEM MENU_ITEM(2) "~Colori"
ITEM MENU_ITEM(3) "~Editor"
MENUBAR MENU_BAR(1)
MENU MENU_BAR(1)
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(2)
MENU MENU_BAR(2)
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(3)
MENU MENU_BAR(3)
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(4)
MENU MENU_BAR(4)
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(5)
MENU MENU_BAR(5)
SUBMENU MENU_FILE "~File"

View File

@ -1,30 +1,6 @@
#define APPNAME campo
#define QAPPNAME "campo"
#define QFIRMNAME "A.G.A. Informatica Srl"
#include <default.url>
MENU TASK_MENUBAR
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(1)
MENU MENU_BAR(1)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(2)
MENU MENU_BAR(2)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"
MENUBAR MENU_BAR(3)
MENU MENU_BAR(3)
SUBMENU MENU_FILE "~File"
ITEM BAR_ITEM(1) "~Parametri"

View File

@ -8,16 +8,8 @@
#include <multirec.h>
#endif
#ifndef __RECARRAY_H
#include <recarray.h>
#endif
#ifndef __VARREC_H
#include <varrec.h>
#endif
#ifndef __MSKSHEET_H
#include <msksheet.h>
class TSheet_field;
#endif
#ifndef __FORM_H
@ -48,6 +40,10 @@
#include "stomag.h"
#endif
#ifndef __MOVMAG_H
#include "movmag.h"
#endif
#ifndef __RMOVMAG_H
#include "rmovmag.h"
#endif
@ -519,7 +515,7 @@ public:
void put_contratto(const char * codcontr,const char *tipocf,const char *codcf);
void put_offerta(const char * codoff);
// ricerca il codice
bool ricerca(const char * cod,const real & qta=0) ;
bool ricerca(const char * cod, const real& qta = ZERO);
TCondizione_vendita(TConfig * _ditta = NULL, TLocalisamfile * anamag = NULL, TLocalisamfile * umart = NULL);
virtual ~TCondizione_vendita() {}

View File

@ -2,6 +2,7 @@
// oggetto movimento di magazzino
// funzione di ricostruzione saldi
#include <msksheet.h>
#include <prefix.h>
#include <tabutil.h>
@ -126,7 +127,7 @@ bool TStateset::is_empty() const
bool TStateset::is_member(int e) const
{
return ((e< MAXSTATES && e>=0)? _container[e] : FALSE );
return ((e< MAXSTATES && e>=0) ? (_container[e] != 0) : FALSE );
}
int TStateset::get_first()
@ -677,13 +678,11 @@ const bool TCodice_livelli::enabled(int levnum) const
return (_lev_enabled && levnum<=MANY_MAG_LEV && levnum>0 && levnum<=_last_level);
}
const int TCodice_livelli::code_start(int levnum) const
{
return packed_length(levnum-1)+1;
}
const int TCodice_livelli::code_length(int levnum) const
{
/*
@ -695,7 +694,6 @@ const int TCodice_livelli::code_length(int levnum) const
return enabled() ? _code_length[levnum-1] : 0;
}
const int TCodice_livelli::packed_length(int levnum) const
{
int start=0;
@ -704,7 +702,6 @@ const int TCodice_livelli::packed_length(int levnum) const
return start;
}
const TString & TCodice_livelli::name(int levnum) const
{
if (levnum<=MANY_MAG_LEV && levnum>0)
@ -733,7 +730,8 @@ TString TCodice_livelli::unpack_grpcode(const TString& pc, const int levnum) con
start+= _code_length[i-1];
if (start>=pc.len())
return("");
else {
else
{
if (levnum < 1 || levnum > _last_level )
return("");
return(pc.mid(start,levnum == _last_level ? -1 : _code_length[levnum-1]));
@ -780,8 +778,6 @@ TCodice_livelli::~TCodice_livelli()
delete _gruppi;
}
void TCodart_livelli::init()
{
TConfig mgconfig(CONFIG_DITTA, "mg");

View File

@ -2,28 +2,13 @@
// oggetto TArticolo_giacenza, multirecord dell'articolo di magazzino
// oggetto TMov_Mag , multirecord del movimento di magazzino
// funzione di ricostruzione saldi
#include <relapp.h>
#include <utility.h>
#include <tabutil.h>
#include <msksheet.h>
#include <recarray.h>
#include <assoc.h>
#include <checks.h>
#include <defmask.h>
#include <varrec.h>
#include <progind.h>
#include <mask.h>
#include <progind.h>
#include <tabutil.h>
#include "mglib.h"
#include "anamag.h"
#include "mag.h"
#include "movmag.h"
#include "rmovmag.h"
#ifndef __CGLIB01_H
#include "..\cg\cglib01.h"
#endif
#include "..\ve\veconf.h"
// libreria per i movimenti
@ -37,11 +22,6 @@ char * Nome_valorizz[]=
"FIFO Ragionieristico", "LIFO Ragionieristico"
} ;
HIDDEN TString16 _mg_null_str;
const TString & TArticolo::get_str(const char* fieldname) const
{
if (*fieldname != '#')
@ -84,7 +64,7 @@ const TString & TArticolo::get_str(const char* fieldname) const
default:
break;
}
return _mg_null_str;
return EMPTY_STRING;
}
void TArticolo::set_body_key(TRectype & rowrec)
@ -266,7 +246,7 @@ const TString & TArticolo_giacenza::get_str(const char* fieldname) const
return TArticolo::get_str(fieldname);
break;
}
return _mg_null_str;
return EMPTY_STRING;
}
void TArticolo_giacenza::set_body_key(TRectype & rowrec)
@ -1502,8 +1482,8 @@ bool rebuild_balances(const TString16 annoes/*, bool reset_giac*/)
TRelation rel(LF_MOVMAG);
rel.lfile().set_curr(m_m);
bool ok = TRUE;
int ok=TRUE;
TLocalisamfile mag(LF_MAG);
// Il flag di reset delle giacenze viene impostato in base alla chiusura dell'esercizio