diff --git a/base/src/org/compiere/acct/Doc.java b/base/src/org/compiere/acct/Doc.java
index 2c278e8812..90250aaa75 100644
--- a/base/src/org/compiere/acct/Doc.java
+++ b/base/src/org/compiere/acct/Doc.java
@@ -117,7 +117,7 @@ import org.eevolution.model.MPPCostCollector;
  *	
  *  </pre>
  *  @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
  * 				<li>FR [ 2520591 ] Support multiples calendar for Org 
  *				@see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962 
  *  @version  $Id: Doc.java,v 1.6 2006/07/30 00:53:33 jjanke Exp $
diff --git a/base/src/org/compiere/acct/Doc_Bank.java b/base/src/org/compiere/acct/Doc_Bank.java
index 57a70a416c..28f1c7a3a5 100644
--- a/base/src/org/compiere/acct/Doc_Bank.java
+++ b/base/src/org/compiere/acct/Doc_Bank.java
@@ -39,7 +39,7 @@ import org.compiere.util.Env;
  *  
  *  FR [ 1840016 ] Avoid usage of clearing accounts - subject to C_AcctSchema.IsPostIfClearingEqual 
  *  Avoid posting if both accounts BankAsset and BankInTransit are equal
- *  @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
  * 				<li>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/process/InvoiceCalculateTax.java b/base/src/org/eevolution/process/InvoiceCalculateTax.java
index 13f54836d1..e73b627597 100644
--- a/base/src/org/eevolution/process/InvoiceCalculateTax.java
+++ b/base/src/org/eevolution/process/InvoiceCalculateTax.java
@@ -28,7 +28,9 @@ import org.compiere.process.SvrProcess;
 
 /**
  * Re-calculate Invoice Tax (and unpost the document)
- * @author Victor Perez
+ *  @author victor.perez@e-evolution.com, e-Evolution http://www.e-evolution.com
+ * 				<li>FR [ 2520591 ] Support multiples calendar for Org 
+ * 				@see http://sourceforge.net/tracker2/?func=detail&atid=879335&aid=2520591&group_id=176962
  * @author Teo Sarca, www.arhipac.ro
  */
 public class InvoiceCalculateTax extends SvrProcess
@@ -72,7 +74,7 @@ public class InvoiceCalculateTax extends SvrProcess
 	{
 		//
 		// Delete accounting /UnPost
-		MPeriod.testPeriodOpen(invoice.getCtx(), invoice.getDateAcct(), invoice.getC_DocType_ID());
+		MPeriod.testPeriodOpen(invoice.getCtx(), invoice.getDateAcct(), invoice.getC_DocType_ID(), invoice.getAD_Org_ID());
 		MFactAcct.deleteEx(MInvoice.Table_ID, invoice.get_ID(), invoice.get_TrxName());
 		//
 		// Update Invoice