midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in dantam/idempiere.se (pull request #7)

This commit is contained in:
Carlos Ruiz 2012-05-24 12:21:08 -05:00
parent e066da2b0d 2355c11e05
commit 28304d3b8b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base.process/META-INF/MANIFEST.MF
View File

@ -5,7 +5,8 @@ Bundle-SymbolicName: org.adempiere.base.process
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.adempiere.base;bundle-version="1.0.0" Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
Export-Package: org.adempiere.process Export-Package: org.adempiere.process,
org.compiere.process
Import-Package: javax.mail;version="1.4.0", Import-Package: javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0", javax.mail.internet;version="1.4.0",
javax.servlet;version="2.5.0", javax.servlet;version="2.5.0",

7
org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java
View File

@ -29,6 +29,8 @@ import org.compiere.util.CLogger;
* <li> https://sourceforge.net/tracker/?func=detail&aid=2875989&group_id=176962&atid=879332 * <li> https://sourceforge.net/tracker/?func=detail&aid=2875989&group_id=176962&atid=879332
* <li> BF2947615 The document recplicacion not working * <li> BF2947615 The document recplicacion not working
* <li> https://sourceforge.net/tracker/?func=detail&aid=2947615&group_id=176962&atid=879332 * <li> https://sourceforge.net/tracker/?func=detail&aid=2947615&group_id=176962&atid=879332
* <li> IDEMPIERE-218 Replication not working in ZK
* <li> http://jira.idempiere.com/browse/IDEMPIERE-218
*/ */
public class MReplicationStrategy extends X_AD_ReplicationStrategy { public class MReplicationStrategy extends X_AD_ReplicationStrategy {
@ -60,7 +62,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
public List <X_AD_ReplicationTable> getReplicationTables() { public List <X_AD_ReplicationTable> getReplicationTables() {
final String whereClause = I_AD_ReplicationTable.COLUMNNAME_AD_ReplicationStrategy_ID+"=?"; // #1 final String whereClause = I_AD_ReplicationTable.COLUMNNAME_AD_ReplicationStrategy_ID+"=?"; // #1
return new Query(getCtx(), I_AD_ReplicationTable.Table_Name, whereClause, get_TrxName()) return new Query(getCtx(), I_AD_ReplicationTable.Table_Name, whereClause, get_TrxName())
.setClient_ID()
.setParameters(getAD_ReplicationStrategy_ID()) .setParameters(getAD_ReplicationStrategy_ID())
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.setApplyAccessFilter(false) .setApplyAccessFilter(false)
@ -74,7 +75,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
public List<X_AD_ReplicationDocument> getReplicationDocuments() { public List<X_AD_ReplicationDocument> getReplicationDocuments() {
final String whereClause = I_AD_ReplicationDocument.COLUMNNAME_AD_ReplicationStrategy_ID+"=?"; // #1 final String whereClause = I_AD_ReplicationDocument.COLUMNNAME_AD_ReplicationStrategy_ID+"=?"; // #1
return new Query(getCtx(),I_AD_ReplicationDocument.Table_Name,whereClause,get_TrxName()) return new Query(getCtx(),I_AD_ReplicationDocument.Table_Name,whereClause,get_TrxName())
.setClient_ID()
.setParameters(getAD_ReplicationStrategy_ID()) .setParameters(getAD_ReplicationStrategy_ID())
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.setApplyAccessFilter(false) .setApplyAccessFilter(false)
@ -92,7 +92,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
final String whereClause = I_AD_ReplicationTable.COLUMNNAME_AD_ReplicationStrategy_ID + "=? AND " final String whereClause = I_AD_ReplicationTable.COLUMNNAME_AD_ReplicationStrategy_ID + "=? AND "
+ I_AD_ReplicationTable.COLUMNNAME_AD_Table_ID + "=?"; + I_AD_ReplicationTable.COLUMNNAME_AD_Table_ID + "=?";
return new Query(ctx, I_AD_ReplicationTable.Table_Name, whereClause, null) return new Query(ctx, I_AD_ReplicationTable.Table_Name, whereClause, null)
.setClient_ID()
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.setApplyAccessFilter(false) .setApplyAccessFilter(false)
.setParameters(AD_ReplicationStrategy_ID, AD_Table_ID) .setParameters(AD_ReplicationStrategy_ID, AD_Table_ID)
@ -110,7 +109,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
final String whereClause = I_AD_ReplicationDocument.COLUMNNAME_AD_ReplicationStrategy_ID + "=? AND " final String whereClause = I_AD_ReplicationDocument.COLUMNNAME_AD_ReplicationStrategy_ID + "=? AND "
+ I_AD_ReplicationDocument.COLUMNNAME_AD_Table_ID + "=?"; + I_AD_ReplicationDocument.COLUMNNAME_AD_Table_ID + "=?";
return new Query(ctx, I_AD_ReplicationDocument.Table_Name, whereClause, null) return new Query(ctx, I_AD_ReplicationDocument.Table_Name, whereClause, null)
.setClient_ID()
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.setApplyAccessFilter(false) .setApplyAccessFilter(false)
.setParameters(AD_ReplicationStrategy_ID, AD_Table_ID) .setParameters(AD_ReplicationStrategy_ID, AD_Table_ID)
@ -129,7 +127,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
+ I_AD_ReplicationDocument.COLUMNNAME_AD_Table_ID + "=? AND " + I_AD_ReplicationDocument.COLUMNNAME_AD_Table_ID + "=? AND "
+ I_AD_ReplicationDocument.COLUMNNAME_C_DocType_ID + "=?"; + I_AD_ReplicationDocument.COLUMNNAME_C_DocType_ID + "=?";
return new Query(ctx, X_AD_ReplicationDocument.Table_Name, whereClause, null) return new Query(ctx, X_AD_ReplicationDocument.Table_Name, whereClause, null)
.setClient_ID()
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.setApplyAccessFilter(false) .setApplyAccessFilter(false)
.setParameters(AD_ReplicationStrategy_ID, AD_Table_ID, C_DocType_ID) .setParameters(AD_ReplicationStrategy_ID, AD_Table_ID, C_DocType_ID)