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

Merge 0aec556dd146

This commit is contained in:
Heng Sin Low 2013-05-14 06:44:54 +08:00
parent 51cb5127bc f32075be4a
commit ac70fdec1e
9 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/i1.0b-release/oracle/201305101047_IDEMPIERE-919.sql Normal file
View File

@ -0,0 +1,12 @@
-- May 10, 2013 10:43:39 AM COT
-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
UPDATE AD_Column SET AD_Reference_Value_ID=NULL, AD_Reference_ID=19, AD_Val_Rule_ID=123, DefaultValue='-1',Updated=TO_DATE('2013-05-10 10:43:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53973
;
-- May 10, 2013 10:44:19 AM COT
-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
UPDATE AD_Column SET AD_Reference_ID=19, AD_Val_Rule_ID=167,Updated=TO_DATE('2013-05-10 10:44:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53975
;
SELECT register_migration_script('201305101047_IDEMPIERE-919.sql') FROM dual;

12
migration/i1.0b-release/postgresql/201305101047_IDEMPIERE-919.sql Normal file
View File

@ -0,0 +1,12 @@
-- May 10, 2013 10:43:39 AM COT
-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
UPDATE AD_Column SET AD_Reference_Value_ID=NULL, AD_Reference_ID=19, AD_Val_Rule_ID=123, DefaultValue='-1',Updated=TO_TIMESTAMP('2013-05-10 10:43:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53973
;
-- May 10, 2013 10:44:19 AM COT
-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
UPDATE AD_Column SET AD_Reference_ID=19, AD_Val_Rule_ID=167,Updated=TO_TIMESTAMP('2013-05-10 10:44:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53975
;
SELECT register_migration_script('201305101047_IDEMPIERE-919.sql') FROM dual;

2
org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
View File

@ -34,6 +34,8 @@ public class DefaultLookupFactory implements ILookupFactory{
@Override
public Lookup getLookup(GridFieldVO gridFieldVO) {
Lookup lookup = null;
if (gridFieldVO.lookupInfo == null && DisplayType.isLookup(gridFieldVO.displayType)) // IDEMPIERE-913
gridFieldVO.loadLookupInfo();
if (gridFieldVO.displayType == Location) // not cached
{
lookup = new MLocationLookup (gridFieldVO.ctx, gridFieldVO.WindowNo);

3
org.adempiere.base/src/org/compiere/model/GridField.java
View File

@ -208,7 +208,7 @@ public class GridField
* bypass isdisplay validation, used by findwindow
*/
public void loadLookupNoValidate() {
if (m_vo.lookupInfo == null) {
if (m_vo.lookupInfo == null && isLookup()) {
m_vo.loadLookupInfo();
}
if (m_vo.lookupInfo == null) {
@ -234,6 +234,7 @@ public class GridField
*/
public Lookup getLookup()
{
if (m_lookup == null) loadLookupNoValidate(); // IDEMPIERE-913
return m_lookup;
} // getLookup

1
org.adempiere.server/idempiere.html
View File

@ -190,6 +190,7 @@ Start iDempiere via RUN_Adempiere </td>
<td bgcolor="#fbf8f1">
<p><a href="idempiereMonitor">iDempiere Server Management</a>
<!--a href="/jmx-console" target="_blank">JBoss 3.2.3 Management Server Agent</a -->
</br><a href="osgi/system/console">Felix Console</a>
</p>
</td>

2
org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java
View File

@ -369,7 +369,7 @@ public final class VString extends CTextField
String text = super.getText();
if (m_obscure != null && text != null && text.length() > 0)
{
if (text.equals(m_obscure.getObscuredValue()))
if (isReadWrite() && text.equals(m_obscure.getObscuredValue()))
text = m_obscure.getClearValue();
}
return text;

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java
View File

@ -86,7 +86,7 @@ public class Textbox extends org.zkoss.zul.Textbox implements EventListener<Even
String value = super.getValue();
if (m_obscure != null && value != null && value.length() > 0)
{
if (value.equals(m_obscure.getObscuredValue()))
if (!isReadonly() && value.equals(m_obscure.getObscuredValue()))
value = m_obscure.getClearValue();
}
return value;

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
View File

@ -139,9 +139,12 @@ public class WStringEditor extends WEditor implements ContextMenuListener
if (getComponent() instanceof Textbox)
((Textbox)getComponent()).setObscureType(obscureType);
if(!(this instanceof WPasswordEditor)){ // check password field
popupMenu = new WEditorPopupMenu(false, false, isShowPreference());
addTextEditorMenu(popupMenu);
addChangeLogMenu(popupMenu);
}
if (gridField.isAutocomplete()) {
Combobox combo = (Combobox)getComponent();

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
View File

@ -822,7 +822,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
winExportFile = new Window();
winExportFile.setTitle(Msg.getMsg(Env.getCtx(), "Export") + ": " + getTitle());
winExportFile.setWidth("450px");
winExportFile.setHeight("300px");
winExportFile.setHeight("150px");
winExportFile.setClosable(true);
winExportFile.setBorder("normal");
winExportFile.setStyle("position:absolute");
@ -857,7 +857,6 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
vb.appendChild(hb);
vb.appendChild(confirmPanel);
confirmPanel.addActionListener(this);
confirmPanel.setVflex("0");
}
winExportFile.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);