From ce07ca20dbe1e4204a92759260df08a276d7c3b1 Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Thu, 17 Sep 2015 17:42:12 +0530 Subject: [PATCH 1/5] IDEMPIERE-246: Fix issue of wrong parameter passed. --- .../src/org/compiere/process/RollUpCosts.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java b/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java index 54a1256187..85b3597029 100644 --- a/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java +++ b/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java @@ -97,7 +97,7 @@ public class RollUpCosts extends SvrProcess { { StringBuilder sql = new StringBuilder("SELECT M_ProductBOM_ID FROM M_Product_BOM WHERE M_Product_ID = ? ") .append(" AND AD_Client_ID = ").append(client_id); - int[] prodbomids = DB.getIDsEx(get_TrxName(), sql.toString(), client_id); + int[] prodbomids = DB.getIDsEx(get_TrxName(), sql.toString(), p_id); for (int prodbomid : prodbomids) { if ( !processed.contains(p_id)) { From 383c35dc4a1955a7c6f7ef035ac12348c6ea1bcf Mon Sep 17 00:00:00 2001 From: tsvikruha Date: Sat, 3 Oct 2015 08:26:46 -0500 Subject: [PATCH 2/5] IDEMPIERE-2864 Alert Processor vs Attachment File system can't send EMails properly --- .../src/org/compiere/model/AttachmentFileSystem.java | 3 ++- .../main/server/org/compiere/server/AlertProcessor.java | 7 +++++++ .../src/main/server/org/compiere/server/Scheduler.java | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java b/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java index d3c0f4447b..9ed901f58c 100644 --- a/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java +++ b/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java @@ -93,11 +93,12 @@ public class AttachmentFileSystem implements IAttachmentStore { in.transferTo(0, in.size(), out); in.close(); out.close(); + /* IDEMPIERE-2864 if(entryFile.exists()){ if(!entryFile.delete()){ entryFile.deleteOnExit(); } - } + }*/ entryFile = destFile; } catch (IOException e) { diff --git a/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java index e91090108b..1b64755bab 100644 --- a/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java +++ b/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java @@ -228,6 +228,13 @@ public class AlertProcessor extends AdempiereServer Collection users = alert.getRecipientUsers(); int countMail = notifyUsers(users, alert.getAlertSubject(), message.toString(), attachments); + // IDEMPIERE-2864 + for(File attachment : attachments) + { + if(attachment.exists() && !attachment.delete()) + attachment.deleteOnExit(); + } + m_summary.append(alert.getName()).append(" (EMails+Notes=").append(countMail).append(") - "); return valid; } // processAlert diff --git a/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java b/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java index 539cfec5fc..7f6a0aedf5 100644 --- a/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java +++ b/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java @@ -277,6 +277,13 @@ public class Scheduler extends AdempiereServer } } + + // IDEMPIERE-2864 + for(File file : fileList) + { + if(file.exists() && !file.delete()) + file.deleteOnExit(); + } } return pi.getSummary(); From 5bf390ecc99915faf1495021f889c653173abfe0 Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Tue, 22 Sep 2015 18:51:54 +0530 Subject: [PATCH 3/5] IDEMPIERE-2665: Set value of C_AcctSchema_ID in ctx. --- .../src/org/adempiere/webui/apps/form/WFactReconcile.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java index 5f179cfd25..46390cfb0e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java @@ -253,6 +253,7 @@ implements IFormController, EventListener, WTableModelListener, ValueChan fieldAcctSchema.setValue(MClient.get(Env.getCtx()).getAcctSchema().getC_AcctSchema_ID()); fieldAcctSchema.addValueChangeListener(this); m_C_AcctSchema_ID = (Integer)fieldAcctSchema.getValue(); + Env.setContext(Env.getCtx(), form.getWindowNo(), "C_AcctSchema_ID", m_C_AcctSchema_ID); // Organization AD_Column_ID = FactReconcile.col_AD_Org_ID; //C_Period.AD_Org_ID (needed to allow org 0) From 13a13bd93b3254f8e677926efd31238e19720158 Mon Sep 17 00:00:00 2001 From: michal_zilincar Date: Mon, 21 Sep 2015 21:01:36 +0200 Subject: [PATCH 4/5] IDEMPIERE-2865 Over/Underpayment doesnt calculated properly from Bank Statment/Create Payment process --- .../src/org/compiere/process/BankStatementPayment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java b/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java index 6b7a3243c1..0b9168ab12 100644 --- a/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java +++ b/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java @@ -196,7 +196,7 @@ public class BankStatementPayment extends SvrProcess payment.setPayAmt(PayAmt); else // payment is likely to be negative payment.setPayAmt(PayAmt.negate()); - payment.setOverUnderAmt(invoice.getGrandTotal(true).subtract(payment.getPayAmt())); + payment.setOverUnderAmt(invoice.getOpenAmt().subtract(payment.getPayAmt())); } else // set Pay Amout from Invoice { From 3f7ac44fec9b4cd331c91312840d99fbfdc80b0d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 3 Oct 2015 18:11:06 -0500 Subject: [PATCH 5/5] IDEMPIERE-2865 Over/Underpayment doesnt calculated properly from Bank Statment/Create Payment process / additional case for full payment --- .../src/org/compiere/process/BankStatementPayment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java b/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java index 0b9168ab12..f03e93e5a0 100644 --- a/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java +++ b/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java @@ -201,7 +201,7 @@ public class BankStatementPayment extends SvrProcess else // set Pay Amout from Invoice { payment.setC_Currency_ID(invoice.getC_Currency_ID()); - payment.setPayAmt(invoice.getGrandTotal(true)); + payment.setPayAmt(invoice.getOpenAmt()); } } else if (C_BPartner_ID != 0)