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

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
This commit is contained in:
tspc 2010-02-27 06:16:16 +00:00
parent ec4e2f798a
commit cd4c15c059
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/src/org/compiere/model/MSetup.java
View File

@ -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());

2
zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
View File

@ -440,7 +440,7 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi
orderField.removeAllItems();
orderField.addItem(pp);
ArrayList<KeyNamePair> list = loadOrderData(C_BPartner_ID, forInvoice, false);
ArrayList<KeyNamePair> list = loadOrderData(C_BPartner_ID, forInvoice, sameWarehouseCb.isSelected());
for(KeyNamePair knp : list)
orderField.addItem(knp);

1
zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
View File

@ -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)
{