diff --git a/ve/velib.h b/ve/velib.h
index 2d6c997d2..444a026d1 100755
--- a/ve/velib.h
+++ b/ve/velib.h
@@ -848,6 +848,20 @@ public:
 	TStati(char iniziale, char finale) { _iniziale = iniziale; _finale = finale;}
 };
 
+class TColor_rule : public TExpr_documento
+{
+  COLOR _back, _fore, _def_back, _def_fore;
+  TString _desc, _key;
+
+public:
+  const TString& description() const { return _desc; }
+  const TString& key() const { return _key; }
+  void default_colors(COLOR& back, COLOR& fore) const { back = _def_back; fore = _def_fore; }
+  void colors(COLOR& back, COLOR& fore) const { back = _back; fore = _fore; }
+  void set_colors(COLOR back, COLOR fore) { _back = back; _fore = fore; }
+  
+  TColor_rule(const char* desc, const char* expr, TTypeexp type, COLOR back, COLOR fore);
+};
 
 class TDocumento_mask : public TVariable_mask	// velib06
 {
@@ -893,7 +907,6 @@ protected:
 public:
 	virtual bool is_omaggio_enabled() { return true;}
   void update_progs(bool stop_run = false);
-	TAssoc_array & maskrighe() {return _maskriga;}
   virtual bool on_key(KEY key);
   virtual bool stop_run(KEY key);
 
@@ -919,15 +932,15 @@ public:
   virtual void user_set_row_handler(TMask& rm, short field, int index);
 
 	void reset_masks(const TString& tipo_doc);
-	TVariable_mask* riga_mask(int numriga);
+	virtual TVariable_mask * riga_mask(int numriga);
 
 	TDocumento& doc() { return _doc; }
 	const TDocumento& doc() const { return _doc; }
 	TCond_vendita & condv() const;
 
 	void occ2mask();
-	void cli2mask(bool force_load = false);
-	void doc2mask(bool reload_clifo = true, bool force_load = false);
+	void cli2mask();
+	virtual void doc2mask(bool reload_clifo = true, bool force_load = false, bool update = true);
 	void mask2doc();
 
 	void update_giacenza();
@@ -950,7 +963,7 @@ public:
 	static bool ragsoc_search_handler( TMask_field& f, KEY key );
 	static bool datadocrif_handler(TMask_field& f, KEY key);
 
-	void highlight_row(int row, bool dirty = true, bool update = true);
+	virtual void highlight_row(int row, bool dirty = true, bool update = true);
 	void highlight();
 
 	bool is_calculated_page(int p) const { return _calculated_pages[p]; }