From cd4c15c059ee1d303bf3ca8fe1cfa05349bc1544 Mon Sep 17 00:00:00 2001 From: tspc Date: Sat, 27 Feb 2010 06:16:16 +0000 Subject: [PATCH] Merge bug fixes in release not committed to trunk merge -c 11478 -c 11471 -c 11374 BF2958108 Answer in Workflow Activities keeps adding Yes/NO https://sourceforge.net/tracker/?func=detail&atid=955896&aid=2958108&group_id=176962 BF2957689 Material Receipt -> Create From -> Only same wh not working https://sourceforge.net/tracker/?func=detail&atid=955896&aid=2957689&group_id=176962 BF2815307 Default Tax Error https://sourceforge.net/tracker/?func=detail&atid=879332&aid=2815307&group_id=176962 --- base/src/org/compiere/model/MSetup.java | 8 ++++++++ .../adempiere/webui/apps/form/WCreateFromShipmentUI.java | 2 +- .../src/org/adempiere/webui/apps/wf/WWFActivity.java | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/base/src/org/compiere/model/MSetup.java b/base/src/org/compiere/model/MSetup.java index c63a13eb60..04ddba9ecc 100644 --- a/base/src/org/compiere/model/MSetup.java +++ b/base/src/org/compiere/model/MSetup.java @@ -1030,6 +1030,14 @@ public final class MSetup no = DB.executeUpdate(sqlCmd.toString(), m_trx.getTrxName()); if (no != 1) log.log(Level.SEVERE, "TaxCategory NOT inserted"); + + sqlCmd = new StringBuffer ("INSERT INTO C_TaxCategory_Trl (AD_Language,C_TaxCategory_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy)"); + sqlCmd.append(" SELECT l.AD_Language,t.C_TaxCategory_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, C_TaxCategory t"); + sqlCmd.append(" WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.C_TaxCategory_ID=").append(C_TaxCategory_ID); + sqlCmd.append(" AND NOT EXISTS (SELECT * FROM C_TaxCategory_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.C_TaxCategory_ID=t.C_TaxCategory_ID)"); + no = DB.executeUpdate(sqlCmd.toString(), m_trx.getTrxName()); + if (no < 0) + log.log(Level.SEVERE, "TaxCategory Translation NOT inserted"); // Tax - Zero Rate MTax tax = new MTax (m_ctx, "Standard", Env.ZERO, C_TaxCategory_ID, m_trx.getTrxName()); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java index a5654db63a..4559287e4e 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java @@ -440,7 +440,7 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi orderField.removeAllItems(); orderField.addItem(pp); - ArrayList list = loadOrderData(C_BPartner_ID, forInvoice, false); + ArrayList list = loadOrderData(C_BPartner_ID, forInvoice, sameWarehouseCb.isSelected()); for(KeyNamePair knp : list) orderField.addItem(knp); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java index 47fe61101e..93f0107bea 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java @@ -494,6 +494,7 @@ public class WWFActivity extends ADForm implements EventListener m_column = node.getColumn(); if (m_column != null && m_column.get_ID() != 0) { + fAnswerList.removeAllItems(); int dt = m_column.getAD_Reference_ID(); if (dt == DisplayType.YesNo) {