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..f03e93e5a0 100644 --- a/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java +++ b/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java @@ -196,12 +196,12 @@ 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 { payment.setC_Currency_ID(invoice.getC_Currency_ID()); - payment.setPayAmt(invoice.getGrandTotal(true)); + payment.setPayAmt(invoice.getOpenAmt()); } } else if (C_BPartner_ID != 0) 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)) { 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 0e1d54a139..0307527620 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 @@ -235,6 +235,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 a2b58be502..465dc44fca 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 @@ -292,6 +292,13 @@ public class Scheduler extends AdempiereServer } } + + // IDEMPIERE-2864 + for(File file : fileList) + { + if(file.exists() && !file.delete()) + file.deleteOnExit(); + } } return pi.getSummary(); 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)