diff --git a/base/src/org/adempiere/exceptions/PeriodClosedException.java b/base/src/org/adempiere/exceptions/PeriodClosedException.java
index dc016c164c..2fa89a09d1 100644
--- a/base/src/org/adempiere/exceptions/PeriodClosedException.java
+++ b/base/src/org/adempiere/exceptions/PeriodClosedException.java
@@ -22,7 +22,7 @@ import java.sql.Timestamp;
* {@link org.compiere.model.MPeriod#testPeriodOpen(java.util.Properties, Timestamp, int, int)} and
* {@link org.compiere.model.MPeriod#testPeriodOpen(java.util.Properties, Timestamp, String, int)} methods.
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
*
FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
*
diff --git a/base/src/org/compiere/model/MAllocationHdr.java b/base/src/org/compiere/model/MAllocationHdr.java
index 57dfcd3da0..2ff03c3a38 100644
--- a/base/src/org/compiere/model/MAllocationHdr.java
+++ b/base/src/org/compiere/model/MAllocationHdr.java
@@ -41,7 +41,7 @@ import org.compiere.util.Msg;
*
* @author Jorg Janke
* @version $Id: MAllocationHdr.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1866214 ]
* @see http://sourceforge.net/tracker/index.php?func=detail&aid=1866214&group_id=176962&atid=879335
* FR [ 2520591 ] Support multiples calendar for Org
diff --git a/base/src/org/compiere/model/MBankStatement.java b/base/src/org/compiere/model/MBankStatement.java
index 354f16f4cc..1e4096e882 100644
--- a/base/src/org/compiere/model/MBankStatement.java
+++ b/base/src/org/compiere/model/MBankStatement.java
@@ -35,7 +35,7 @@ import org.compiere.util.Msg;
* Bank Statement Model
*
* @author Eldir Tomassen/Jorg Janke
-* @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+* @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* BF [ 1933645 ] Wrong balance Bank Statement
* @see http://sourceforge.net/tracker/?func=detail&atid=879332&aid=1933645&group_id=176962
* FR [ 2520591 ] Support multiples calendar for Org
diff --git a/base/src/org/compiere/model/MCash.java b/base/src/org/compiere/model/MCash.java
index 7a7aac53fc..73232f3c64 100644
--- a/base/src/org/compiere/model/MCash.java
+++ b/base/src/org/compiere/model/MCash.java
@@ -37,7 +37,7 @@ import org.compiere.util.TimeUtil;
*
* @author Jorg Janke
* @version $Id: MCash.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1866214 ]
* @see http://sourceforge.net/tracker/index.php?func=detail&aid=1866214&group_id=176962&atid=879335
* FR [ 2520591 ] Support multiples calendar for Org
diff --git a/base/src/org/compiere/model/MInOut.java b/base/src/org/compiere/model/MInOut.java
index 066f7ca9dd..0a98c9e6d3 100644
--- a/base/src/org/compiere/model/MInOut.java
+++ b/base/src/org/compiere/model/MInOut.java
@@ -43,7 +43,7 @@ import org.compiere.util.Msg;
* Modifications: Added the RMA functionality (Ashley Ramdass)
* @author Karsten Thiemann, Schaeffer AG
* Bug [ 1759431 ] Problems with VCreateFrom
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1948157 ] Is necessary the reference for document reverse
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
diff --git a/base/src/org/compiere/model/MInventory.java b/base/src/org/compiere/model/MInventory.java
index b6f0b7a982..7bc335ba1f 100644
--- a/base/src/org/compiere/model/MInventory.java
+++ b/base/src/org/compiere/model/MInventory.java
@@ -38,7 +38,7 @@ import org.compiere.util.Msg;
*
* @author Jorg Janke
* @version $Id: MInventory.java,v 1.3 2006/07/30 00:51:05 jjanke Exp $
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1948157 ] Is necessary the reference for document reverse
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
diff --git a/base/src/org/compiere/model/MInvoice.java b/base/src/org/compiere/model/MInvoice.java
index 12eec0853e..92606f135e 100644
--- a/base/src/org/compiere/model/MInvoice.java
+++ b/base/src/org/compiere/model/MInvoice.java
@@ -46,7 +46,7 @@ import org.eevolution.model.MPPProductBOMLine;
*
* @author Jorg Janke
* @version $Id: MInvoice.java,v 1.2 2006/07/30 00:51:02 jjanke Exp $
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* @see http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1948157&group_id=176962
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
diff --git a/base/src/org/compiere/model/MJournal.java b/base/src/org/compiere/model/MJournal.java
index 324e22d457..4d47feae34 100644
--- a/base/src/org/compiere/model/MJournal.java
+++ b/base/src/org/compiere/model/MJournal.java
@@ -39,7 +39,7 @@ import org.compiere.util.Msg;
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* BF [ 1619150 ] Usability/Consistency: reversed gl journal description
* BF [ 1775358 ] GL Journal DateAcct/C_Period_ID issue
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1948157 ] Is necessary the reference for document reverse
* @see http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1948157&group_id=176962
* FR: [ 2214883 ] Remove SQL code and Replace for Query
diff --git a/base/src/org/compiere/model/MJournalBatch.java b/base/src/org/compiere/model/MJournalBatch.java
index f8afddc524..a397ce3767 100644
--- a/base/src/org/compiere/model/MJournalBatch.java
+++ b/base/src/org/compiere/model/MJournalBatch.java
@@ -36,7 +36,7 @@ import org.compiere.util.Msg;
* Journal Batch Model
*
* @author Jorg Janke
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1948157 ] Is necessary the reference for document reverse
* @see http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1948157&group_id=176962
* FR [ 2520591 ] Support multiples calendar for Org
diff --git a/base/src/org/compiere/model/MMatchInv.java b/base/src/org/compiere/model/MMatchInv.java
index cd155a8bc8..14a7fa33b7 100644
--- a/base/src/org/compiere/model/MMatchInv.java
+++ b/base/src/org/compiere/model/MMatchInv.java
@@ -40,7 +40,7 @@ import org.compiere.util.Env;
*
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* BF [ 1926113 ] MMatchInv.getNewerDateAcct() should work in trx
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
* @author Bayu Cahya, Sistematika
diff --git a/base/src/org/compiere/model/MMatchPO.java b/base/src/org/compiere/model/MMatchPO.java
index cd28a18564..1fe3fbd1bd 100644
--- a/base/src/org/compiere/model/MMatchPO.java
+++ b/base/src/org/compiere/model/MMatchPO.java
@@ -47,7 +47,7 @@ import org.compiere.util.Env;
* @author Armen Rizal, Goodwill Consulting
* BF [ 2215840 ] MatchPO Bug Collection
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
*/
diff --git a/base/src/org/compiere/model/MMovement.java b/base/src/org/compiere/model/MMovement.java
index 55bcb55a6b..384faf9251 100644
--- a/base/src/org/compiere/model/MMovement.java
+++ b/base/src/org/compiere/model/MMovement.java
@@ -37,7 +37,7 @@ import org.eevolution.model.MDDOrderLine;
* Inventory Movement Model
*
* @author Jorg Janke
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1948157 ] Is necessary the reference for document reverse
* @see http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1948157&group_id=176962
* FR [ 2520591 ] Support multiples calendar for Org
diff --git a/base/src/org/compiere/model/MMovementConfirm.java b/base/src/org/compiere/model/MMovementConfirm.java
index 341e194ab8..58a0f98843 100644
--- a/base/src/org/compiere/model/MMovementConfirm.java
+++ b/base/src/org/compiere/model/MMovementConfirm.java
@@ -36,7 +36,7 @@ import org.compiere.util.Msg;
*
* @author Jorg Janke
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
* @version $Id: MMovementConfirm.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
diff --git a/base/src/org/compiere/model/MOrder.java b/base/src/org/compiere/model/MOrder.java
index 12ae8edaae..618d5d1cfc 100644
--- a/base/src/org/compiere/model/MOrder.java
+++ b/base/src/org/compiere/model/MOrder.java
@@ -48,7 +48,7 @@ import org.eevolution.model.MPPProductBOMLine;
*
* @author Jorg Janke
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
* @version $Id: MOrder.java,v 1.5 2006/10/06 00:42:24 jjanke Exp $
diff --git a/base/src/org/compiere/model/MPayment.java b/base/src/org/compiere/model/MPayment.java
index 36d4134186..ae03887c4a 100644
--- a/base/src/org/compiere/model/MPayment.java
+++ b/base/src/org/compiere/model/MPayment.java
@@ -62,7 +62,7 @@ import org.compiere.util.ValueNamePair;
* When Payment is posed, the Allocation is made
*
* @author Jorg Janke
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 1948157 ] Is necessary the reference for document reverse
* @see http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1948157&group_id=176962
* FR [ 1866214 ]
diff --git a/base/src/org/compiere/model/MPeriod.java b/base/src/org/compiere/model/MPeriod.java
index 53287759d9..463e24324d 100644
--- a/base/src/org/compiere/model/MPeriod.java
+++ b/base/src/org/compiere/model/MPeriod.java
@@ -45,7 +45,7 @@ import org.compiere.util.TimeUtil;
* BF [ 1779438 ] Minor auto period control bug
* BF [ 1893486 ] Auto Period Control return that period is always open
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
*/
diff --git a/base/src/org/compiere/model/MRequisition.java b/base/src/org/compiere/model/MRequisition.java
index d9b70e12b4..45e062f35e 100644
--- a/base/src/org/compiere/model/MRequisition.java
+++ b/base/src/org/compiere/model/MRequisition.java
@@ -36,7 +36,7 @@ import org.compiere.util.Msg;
*
* @author Jorg Janke
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
* @version $Id: MRequisition.java,v 1.2 2006/07/30 00:51:05 jjanke Exp $
diff --git a/base/src/org/compiere/model/MTimeExpense.java b/base/src/org/compiere/model/MTimeExpense.java
index 5086481b16..3269d2550a 100644
--- a/base/src/org/compiere/model/MTimeExpense.java
+++ b/base/src/org/compiere/model/MTimeExpense.java
@@ -37,7 +37,7 @@ import org.compiere.util.Msg;
*
* @author Jorg Janke
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
* @version $Id: MTimeExpense.java,v 1.4 2006/07/30 00:51:03 jjanke Exp $
diff --git a/base/src/org/compiere/report/FinStatement.java b/base/src/org/compiere/report/FinStatement.java
index 045b72212f..d2cc936e9e 100644
--- a/base/src/org/compiere/report/FinStatement.java
+++ b/base/src/org/compiere/report/FinStatement.java
@@ -45,7 +45,7 @@ import org.compiere.util.Msg;
* - Remove update balance option to resolved Feature Request [ 1557707 ] and
* bug [1619917]
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
*/
diff --git a/base/src/org/compiere/report/TrialBalance.java b/base/src/org/compiere/report/TrialBalance.java
index 54090323d0..52888fd2f4 100644
--- a/base/src/org/compiere/report/TrialBalance.java
+++ b/base/src/org/compiere/report/TrialBalance.java
@@ -38,7 +38,7 @@ import org.compiere.util.Language;
*
* @author Jorg Janke
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
* @version $Id: TrialBalance.java,v 1.2 2006/07/30 00:51:05 jjanke Exp $
diff --git a/base/src/org/eevolution/model/MDDOrder.java b/base/src/org/eevolution/model/MDDOrder.java
index 19ed2b915c..e591ef4f72 100644
--- a/base/src/org/eevolution/model/MDDOrder.java
+++ b/base/src/org/eevolution/model/MDDOrder.java
@@ -56,7 +56,7 @@ import org.compiere.util.Util;
* They are set in the process() method.
* Use DocAction and C_DocTypeTarget_ID instead.
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* Original contributor of Distribution Functionality
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
diff --git a/base/src/org/eevolution/model/MHRProcess.java b/base/src/org/eevolution/model/MHRProcess.java
index b3dcba07fb..706b85b391 100644
--- a/base/src/org/eevolution/model/MHRProcess.java
+++ b/base/src/org/eevolution/model/MHRProcess.java
@@ -48,9 +48,9 @@ import org.compiere.util.Util;
/**
* HR Process Model
*
- * @author oscar.gomez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author oscar.gomez@e-evolution.com, e-Evolution http://www.e-evolution.com
* Original contributor of Payroll Functionality
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
* @author Cristina Ghita, www.arhipac.ro
diff --git a/base/src/org/eevolution/model/MHRYear.java b/base/src/org/eevolution/model/MHRYear.java
index bf44b00f63..6699810f2e 100644
--- a/base/src/org/eevolution/model/MHRYear.java
+++ b/base/src/org/eevolution/model/MHRYear.java
@@ -29,9 +29,9 @@ import org.compiere.util.TimeUtil;
/**
* MHRYear Year for a Payroll
*
- * @author oscar.gomez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author oscar.gomez@e-evolution.com, e-Evolution http://www.e-evolution.com
* Original contributor of Payroll Functionality
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
diff --git a/base/src/org/eevolution/model/MPPCostCollector.java b/base/src/org/eevolution/model/MPPCostCollector.java
index 172db9941d..fa9445a823 100644
--- a/base/src/org/eevolution/model/MPPCostCollector.java
+++ b/base/src/org/eevolution/model/MPPCostCollector.java
@@ -61,7 +61,7 @@ import org.eevolution.exceptions.ActivityProcessedException;
/**
* PP Cost Collector Model
*
- * @author victor.perez@-evolution.com, e-Evolution http://www.e-evolution.com
+ * @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
* Original contributor of Manufacturing Standard Cost
* FR [ 2520591 ] Support multiples calendar for Org
* @see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962