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

hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2014-05-28 12:13:16 -05:00
parent 9973ea483e c7e4d2cbeb
commit dcc35ca737
7 changed files with 115 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
migration/i2.0/oracle/201405221012_Ticket_1003710.sql Normal file
View File

@ -0,0 +1,43 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- May 22, 2014 6:03:29 PM MYT
-- 1003710 Performance issue - Change column reference from table to search
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:03:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55318
;
-- May 22, 2014 6:04:22 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:04:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201503
;
-- May 22, 2014 6:04:56 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:04:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55303
;
-- May 22, 2014 6:06:00 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:06:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56355
;
-- May 22, 2014 6:08:12 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:08:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55322
;
-- May 22, 2014 6:08:58 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:08:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55323
;
-- May 22, 2014 6:09:41 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:09:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=52007
;
-- May 22, 2014 6:10:08 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:10:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55305
;
-- May 22, 2014 6:11:15 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_DATE('2014-05-22 18:11:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=52008
;
SELECT register_migration_script('201405221012_Ticket_1003710.sql') FROM dual
;

10
migration/i2.0/oracle/201405262306_IDEMPIERE-1967.sql Normal file
View File

@ -0,0 +1,10 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- May 26, 2014 11:06:10 PM COT
-- IDEMPIERE-1967 Bank transfer process should allow for document number to be optional
UPDATE AD_Process_Para SET IsMandatory='N',Updated=TO_DATE('2014-05-26 22:47:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53251
;
SELECT register_migration_script('201405262306_IDEMPIERE-1967.sql') FROM dual
;

40
migration/i2.0/postgresql/201405221012_Ticket_1003710.sql Normal file
View File

@ -0,0 +1,40 @@
-- May 22, 2014 6:03:29 PM MYT
-- 1003710 Performance issue - Change column reference from table to search
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:03:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55318
;
-- May 22, 2014 6:04:22 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:04:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201503
;
-- May 22, 2014 6:04:56 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:04:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55303
;
-- May 22, 2014 6:06:00 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:06:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56355
;
-- May 22, 2014 6:08:12 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:08:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55322
;
-- May 22, 2014 6:08:58 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:08:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55323
;
-- May 22, 2014 6:09:41 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:09:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=52007
;
-- May 22, 2014 6:10:08 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:10:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55305
;
-- May 22, 2014 6:11:15 PM MYT
UPDATE AD_Column SET AD_Reference_ID=30,Updated=TO_TIMESTAMP('2014-05-22 18:11:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=52008
;
SELECT register_migration_script('201405221012_Ticket_1003710.sql') FROM dual
;

7
migration/i2.0/postgresql/201405262306_IDEMPIERE-1967.sql Normal file
View File

@ -0,0 +1,7 @@
-- May 26, 2014 11:06:10 PM COT
-- IDEMPIERE-1967 Bank transfer process should allow for document number to be optional
UPDATE AD_Process_Para SET IsMandatory='N',Updated=TO_TIMESTAMP('2014-05-26 22:47:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53251
;
SELECT register_migration_script('201405262306_IDEMPIERE-1967.sql') FROM dual
;

10
org.adempiere.base/src/org/eevolution/process/BankTransfer.java
View File

@ -26,6 +26,8 @@ import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess; import org.compiere.process.SvrProcess;
import org.compiere.util.AdempiereUserError; import org.compiere.util.AdempiereUserError;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Util;
/** /**
* Bank Transfer. Generate two Payments entry * Bank Transfer. Generate two Payments entry
@ -98,12 +100,12 @@ public class BankTransfer extends SvrProcess
+ " - Description="+p_Description+ " - Statement Date="+p_StatementDate+ + " - Description="+p_Description+ " - Statement Date="+p_StatementDate+
" - Date Account="+p_DateAcct); " - Date Account="+p_DateAcct);
if (Env.getAD_Org_ID(getCtx()) == 0)
throw new AdempiereUserError(Msg.getMsg(getCtx(), "Org0NotAllowed"));
if (p_To_C_BankAccount_ID == 0 || p_From_C_BankAccount_ID == 0) if (p_To_C_BankAccount_ID == 0 || p_From_C_BankAccount_ID == 0)
throw new IllegalArgumentException("Banks required"); throw new IllegalArgumentException("Banks required");
if (p_DocumentNo == null || p_DocumentNo.length() == 0)
throw new IllegalArgumentException("Document No required");
if (p_To_C_BankAccount_ID == p_From_C_BankAccount_ID) if (p_To_C_BankAccount_ID == p_From_C_BankAccount_ID)
throw new AdempiereUserError ("Banks From and To must be different"); throw new AdempiereUserError ("Banks From and To must be different");
@ -145,6 +147,7 @@ public class BankTransfer extends SvrProcess
MPayment paymentBankFrom = new MPayment(getCtx(), 0 , get_TrxName()); MPayment paymentBankFrom = new MPayment(getCtx(), 0 , get_TrxName());
paymentBankFrom.setC_BankAccount_ID(mBankFrom.getC_BankAccount_ID()); paymentBankFrom.setC_BankAccount_ID(mBankFrom.getC_BankAccount_ID());
if (!Util.isEmpty(p_DocumentNo, true))
paymentBankFrom.setDocumentNo(p_DocumentNo); paymentBankFrom.setDocumentNo(p_DocumentNo);
paymentBankFrom.setDateAcct(p_DateAcct); paymentBankFrom.setDateAcct(p_DateAcct);
paymentBankFrom.setDateTrx(p_StatementDate); paymentBankFrom.setDateTrx(p_StatementDate);
@ -171,6 +174,7 @@ public class BankTransfer extends SvrProcess
MPayment paymentBankTo = new MPayment(getCtx(), 0 , get_TrxName()); MPayment paymentBankTo = new MPayment(getCtx(), 0 , get_TrxName());
paymentBankTo.setC_BankAccount_ID(mBankTo.getC_BankAccount_ID()); paymentBankTo.setC_BankAccount_ID(mBankTo.getC_BankAccount_ID());
if (!Util.isEmpty(p_DocumentNo, true))
paymentBankTo.setDocumentNo(p_DocumentNo); paymentBankTo.setDocumentNo(p_DocumentNo);
paymentBankTo.setDateAcct(p_DateAcct); paymentBankTo.setDateAcct(p_DateAcct);
paymentBankTo.setDateTrx(p_StatementDate); paymentBankTo.setDateTrx(p_StatementDate);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
View File

@ -841,7 +841,7 @@ public class InfoProductWindow extends InfoWindow {
@Override @Override
protected void prepareTable(ColumnInfo[] layout, String from, String where, protected void prepareTable(ColumnInfo[] layout, String from, String where,
String orderBy) { String orderBy) {
if (getSelectedWarehouseId() > 0) if (Util.isEmpty(orderBy) && getSelectedWarehouseId() > 0)
{ {
orderBy = "QtyAvailable DESC"; orderBy = "QtyAvailable DESC";
} }

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
View File

@ -398,6 +398,11 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
{ {
if (infoColumn.getAD_Reference_ID() == DisplayType.List) if (infoColumn.getAD_Reference_ID() == DisplayType.List)
{ {
WEditor editor = null;
editor = WebEditorFactory.getEditor(gridFields.get(i), true);
editor.setMandatory(false);
editor.setReadWrite(false);
editorMap.put(infoColumn.getSelectClause(), editor);
columnInfo = new ColumnInfo(infoColumn.get_Translation("Name"), infoColumn.getSelectClause(), ValueNamePair.class, (String)null); columnInfo = new ColumnInfo(infoColumn.get_Translation("Name"), infoColumn.getSelectClause(), ValueNamePair.class, (String)null);
} }
else else