commit/iDempiere: 2 new changesets

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/9f1c5bb116e7/
changeset: 9f1c5bb116e7
branch: development
user: globalqss
date: 2013-03-20 19:42:31
summary: IDEMPIERE-782 iDempiere log button on About window not working
affected #: 1 file

diff -r d9cab33fa405b2b03c2a521dee57f2400a04db58 -r 9f1c5bb116e7ccaf4b12c0e5cd1672e25b1457ef org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
@@ -35,6 +35,7 @@
import org.adempiere.webui.component.Tabs;
import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.component.Window;
+import org.adempiere.webui.event.DialogEvents;
import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.FeedbackManager;
import org.compiere.Adempiere;
@@ -68,9 +69,9 @@
*/
public class AboutWindow extends Window implements EventListener<Event> {
/**
- *
+ *
*/
- private static final long serialVersionUID = -2600883713422452076L;
+ private static final long serialVersionUID = 6573804051552633150L;

private Checkbox bErrorsOnly;
private Listbox logTable;
@@ -479,18 +480,23 @@

private void downloadAdempiereLogFile() {
String path = Ini.getAdempiereHome() + File.separator + "log";
- FolderBrowser fileBrowser = new FolderBrowser(path, false);
- String selected = fileBrowser.getPath();
- if (selected != null && selected.trim().length() > 0) {
- File file = new File(selected);
- if (file.exists() && file.isFile() && file.canRead()) {
- try {
- AMedia media = new AMedia(file, "text/plain", null);
- Filedownload.save(media);
- } catch (FileNotFoundException e) {
+ final FolderBrowser fileBrowser = new FolderBrowser(path, false);
+ fileBrowser.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
+ @Override
+ public void onEvent(Event event) throws Exception {
+ String selected = fileBrowser.getPath();
+ if (selected != null && selected.trim().length() > 0) {
+ File file = new File(selected);
+ if (file.exists() && file.isFile() && file.canRead()) {
+ try {
+ AMedia media = new AMedia(file, "text/plain", null);
+ Filedownload.save(media);
+ } catch (FileNotFoundException e) {
+ }
+ }
}
}
- }
+ });
}

private void downloadLog() {


https://bitbucket.org/idempiere/idempiere/commits/df7dd0313999/
changeset: df7dd0313999
branch: development
user: globalqss
date: 2013-03-20 19:43:12
summary: IDEMPIERE-781 Column of type FilePath not working
affected #: 1 file

diff -r 9f1c5bb116e7ccaf4b12c0e5cd1672e25b1457ef -r df7dd03139999b305af41a4a02726fc53be333ec org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java
@@ -16,11 +16,13 @@

import org.adempiere.webui.component.FilenameBox;
import org.adempiere.webui.component.FolderBrowser;
+import org.adempiere.webui.event.DialogEvents;
import org.adempiere.webui.event.ValueChangeEvent;
import org.adempiere.webui.theme.ThemeManager;
import org.compiere.model.GridField;
import org.compiere.util.CLogger;
import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;

/**
@@ -41,7 +43,6 @@
{
super(new FilenameBox(), gridField);
getComponent().setButtonImage(ThemeManager.getThemeResource("images/Open16.png"));
- getComponent().addEventListener(Events.ON_CLICK, this);
getComponent().getButton().setUpload("false");
}

@@ -98,7 +99,6 @@
else if (Events.ON_CLICK.equals(event.getName()))
{
cmd_file();
- newValue = getComponent().getText();
}
else
{
@@ -111,6 +111,16 @@
if (oldValue == null && newValue == null) {
return;
}
+ processNewValue(newValue);
+ }
+
+ protected void processNewValue(String newValue) {
+ if (oldValue != null && newValue != null && oldValue.equals(newValue)) {
+ return;
+ }
+ if (oldValue == null && newValue == null) {
+ return;
+ }
ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue);
fireValueChange(changeEvent);
}
@@ -120,10 +130,16 @@
*/
private void cmd_file()
{
- FolderBrowser directoryDialog = new FolderBrowser(true);
- String directory = directoryDialog.getPath();
- getComponent().setText(directory);
- getComponent().getTextbox().focus();
+ final FolderBrowser directoryDialog = new FolderBrowser(true);
+ directoryDialog.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
+ @Override
+ public void onEvent(Event event) throws Exception {
+ String directory = directoryDialog.getPath();
+ getComponent().setText(directory);
+ getComponent().getTextbox().focus();
+ processNewValue(getComponent().getText());
+ }
+ });
} // cmd_file

public String[] getEvents()

Repository URL: https://bitbucket.org/idempiere/idempiere/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/bf483820c6ea/
changeset: bf483820c6ea
branch: development
user: hengsin
date: 2013-03-21 09:37:11
summary: IDEMPIERE-763 Maximum size for File Upload.
affected #: 11 files

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 migration/i1.0a-release/oracle/201303210824_IDEMPIERE-763.sql
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201303210824_IDEMPIERE-763.sql
@@ -0,0 +1,8 @@
+-- Mar 21, 2013 4:18:58 PM MYT
+-- IDEMPIERE-763 Maximum size for File Upload
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,EntityType,ConfigurationLevel,Value,Description,AD_SysConfig_UU,Created,Updated,AD_Client_ID,AD_Org_ID,CreatedBy,IsActive,UpdatedBy,Name) VALUES (200028,'D','S','5120','It specifies the maximum allowed size, in kilobytes, to upload a file from the client. A zero or negative value indicates that there is no limit.','6f5a2d67-123a-411e-a218-1c328e963cc4',TO_DATE('2013-03-21 16:18:55','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-03-21 16:18:55','YYYY-MM-DD HH24:MI:SS'),0,0,100,'Y',100,'ZK_MAX_UPLOAD_SIZE')
+;
+
+SELECT register_migration_script('201303210824_IDEMPIERE-763.sql') FROM dual
+;
+

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 migration/i1.0a-release/postgresql/201303210824_IDEMPIERE-763.sql
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201303210824_IDEMPIERE-763.sql
@@ -0,0 +1,8 @@
+-- Mar 21, 2013 4:18:58 PM MYT
+-- IDEMPIERE-763 Maximum size for File Upload
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,EntityType,ConfigurationLevel,Value,Description,AD_SysConfig_UU,Created,Updated,AD_Client_ID,AD_Org_ID,CreatedBy,IsActive,UpdatedBy,Name) VALUES (200028,'D','S','5120','It specifies the maximum allowed size, in kilobytes, to upload a file from the client. A zero or negative value indicates that there is no limit.','6f5a2d67-123a-411e-a218-1c328e963cc4',TO_TIMESTAMP('2013-03-21 16:18:55','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-03-21 16:18:55','YYYY-MM-DD HH24:MI:SS'),0,0,100,'Y',100,'ZK_MAX_UPLOAD_SIZE')
+;
+
+SELECT register_migration_script('201303210824_IDEMPIERE-763.sql') FROM dual
+;
+

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
@@ -528,4 +528,16 @@

Executions.sendRedirect("index.zul");
}
+
+ /**
+ * @return string for setupload
+ */
+ public static String getUploadSetting() {
+ StringBuilder uploadSetting = new StringBuilder("true,native");
+ int size = MSysConfig.getIntValue(MSysConfig.ZK_MAX_UPLOAD_SIZE, 0);
+ if (size > 0) {
+ uploadSetting.append(",maxsize=").append(size);
+ }
+ return uploadSetting.toString();
+ }
}

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
@@ -22,6 +22,7 @@

import javax.activation.DataSource;

+import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.component.AttachmentItem;
import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.ConfirmPanel;
@@ -201,7 +202,7 @@

Button btn = new Button();
btn.setImage(ThemeManager.getThemeResource("images/Attachment24.png"));
- btn.setUpload("true");
+ btn.setUpload(AdempiereWebUI.getUploadSetting());
btn.addEventListener(Events.ON_UPLOAD, this);
btn.setTooltiptext(Msg.getMsg(Env.getCtx(), "Attachment"));
confirmPanel.addComponentsLeft(btn);

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
@@ -31,6 +31,7 @@
import java.util.ArrayList;
import java.util.logging.Level;

+import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Label;
@@ -173,7 +174,7 @@

bFile.setLabel(Msg.getMsg(Env.getCtx(), "FileImportFile"));
bFile.setTooltiptext(Msg.getMsg(Env.getCtx(), "FileImportFileInfo"));
- bFile.setUpload("true");
+ bFile.setUpload(AdempiereWebUI.getUploadSetting());
bFile.addEventListener(Events.ON_UPLOAD, this);

fCharset.setMold("select");

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FilenameBox.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FilenameBox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FilenameBox.java
@@ -12,6 +12,7 @@
*****************************************************************************/
package org.adempiere.webui.component;

+import org.adempiere.webui.AdempiereWebUI;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;

@@ -30,7 +31,7 @@
public FilenameBox()
{
super();
- btn.setUpload("true");
+ btn.setUpload(AdempiereWebUI.getUploadSetting());
}

/**
@@ -40,7 +41,7 @@
{
super();
setText(fileName);
- btn.setUpload("true");
+ btn.setUpload(AdempiereWebUI.getUploadSetting());
}

/* (non-Javadoc)

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
@@ -21,6 +21,7 @@
import java.io.InputStream;
import java.util.logging.Level;

+import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.component.FilenameBox;
import org.adempiere.webui.event.ValueChangeEvent;
import org.adempiere.webui.theme.ThemeManager;
@@ -49,7 +50,7 @@

super(new FilenameBox(), gridField);
getComponent().setButtonImage(ThemeManager.getThemeResource("images/Open16.png"));

getComponent().addEventListener(Events.ON_UPLOAD, this);
- getComponent().getButton().setUpload("true,native");
+ getComponent().getButton().setUpload(AdempiereWebUI.getUploadSetting());
getComponent().getButton().setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
}


diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
@@ -255,7 +255,7 @@
bLoad.setSclass("action-button");
bLoad.setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load"));
- bLoad.setUpload("true");
+ bLoad.setUpload(AdempiereWebUI.getUploadSetting());
bLoad.addEventListener(Events.ON_UPLOAD, this);

bDelete.setImage(ThemeManager.getThemeResource("images/Delete24.png"));

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
@@ -187,7 +187,7 @@
hb = new Hbox();
bFile.setLabel(Msg.getMsg(Env.getCtx(), "FileImportFile"));
bFile.setTooltiptext(Msg.getMsg(Env.getCtx(), "FileImportFileInfo"));
- bFile.setUpload("true");
+ bFile.setUpload(AdempiereWebUI.getUploadSetting());
bFile.addEventListener(Events.ON_UPLOAD, this);
hb.appendChild(bFile);
vb.appendChild(hb);

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
@@ -28,6 +28,7 @@

import javax.activation.DataSource;

+import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.component.AttachmentItem;
import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.Column;
@@ -313,7 +314,7 @@

Button btn = new Button();
btn.setImage(ThemeManager.getThemeResource("images/Attachment24.png"));
- btn.setUpload("true");
+ btn.setUpload(AdempiereWebUI.getUploadSetting());
btn.addEventListener(Events.ON_UPLOAD, this);
btn.setTooltiptext(Msg.getMsg(Env.getCtx(), "Attachment"));
confirmPanel.addComponentsLeft(btn);

diff -r d9b34c34df0e2912ce3c98f4229a83c56676f545 -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
@@ -21,6 +21,7 @@
import java.sql.SQLException;
import java.util.logging.Level;

+import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.Panel;
import org.adempiere.webui.component.Window;
@@ -151,7 +152,7 @@
bLoad.setImage(ThemeManager.getThemeResource("images/Import24.png"));
bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load"));
bLoad.addEventListener(Events.ON_UPLOAD, this);
- bLoad.setUpload("true");
+ bLoad.setUpload(AdempiereWebUI.getUploadSetting());

bDelete.setImage(ThemeManager.getThemeResource("images/Delete24.png"));
bDelete.setTooltiptext(Msg.getMsg(Env.getCtx(), "Delete"));


https://bitbucket.org/idempiere/idempiere/commits/a613fe4d5fe4/
changeset: a613fe4d5fe4
branch: development
user: hengsin
date: 2013-03-21 09:37:30
summary: IDEMPIERE-763 Maximum size for File Upload.
affected #: 1 file

diff -r bf483820c6eac6beb92f288bf54bdd1d9e0c35c5 -r a613fe4d5fe47b6985ae9652529a783c979a2ae4 org.adempiere.base/src/org/compiere/model/MSysConfig.java
--- a/org.adempiere.base/src/org/compiere/model/MSysConfig.java
+++ b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
@@ -113,6 +113,7 @@
public static final String SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE = "SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE";
public static final String SHIPPING_SAVE_REQUEST_RESPONSE_LOG = "SHIPPING_SAVE_REQUEST_RESPONSE_LOG";
public static final String DOCACTIONBUTTON_SHOWACTIONNAME = "DOCACTIONBUTTON_SHOWACTIONNAME";
+ public static final String ZK_MAX_UPLOAD_SIZE = "ZK_MAX_UPLOAD_SIZE";

/**
* Standard Constructor
@@ -656,4 +657,4 @@
+"]";
}

-} // MSysConfig
\ No newline at end of file
+} // MSysConfig;
\ No newline at end of file

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/0a0c66f9a3d6/
Changeset: 0a0c66f9a3d6
Branch: development
User: hengsin
Date: 2013-03-22 08:55:04
Summary: IDEMPIERE-92 Implement Selenium testing framework. Added context click support. Improvement to AdempiereIdGenerator for better determination of _zk_locator. Modify LogEventInterceptor to help the writing of fitnesse selenium script.
Affected #: 5 files

diff -r 102a00c7d26f3765d7656ac29b6d2f184095ecc6 -r 0a0c66f9a3d637b3693358b6176bdd17401865ae org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
@@ -68,32 +68,41 @@

if (id == null || id.length() == 0) {
locatorBuilder.append("@").append(getWidgetName(comp.getWidgetClass()));
- }
-
- Component parent = comp.getParent();
- while(parent != null) {
- //only include id space owner to ease converting test case to use zk id selector instead of uuid
- if (parent instanceof IdSpace) {
- id = parent.getId();
- if (id != null && id.length() > 0) {
- if (id.indexOf(" ") > 0) {
- String widgetName = getWidgetName(parent.getWidgetClass());
- locatorBuilder.insert(0, "@"+widgetName+"[id=\'"+id+"\'] ");
+ Component parent = comp.getParent();
+ while(parent != null) {
+ String parentLocator = parent.getWidgetAttribute(ZK_LOCATOR_ATTRIBUTE);
+ if (parentLocator != null && parentLocator.trim().length() > 0) {
+ locatorBuilder.insert(0, parentLocator+ " ");
+ break;
+ }
+ parent = parent.getParent();
+ }
+ } else {
+ Component parent = comp.getParent();
+ while(parent != null) {
+ //only include id space owner to ease converting test case to use zk id selector instead of uuid
+ if (parent instanceof IdSpace) {
+ id = parent.getId();
+ if (id != null && id.length() > 0) {
+ if (id.indexOf(" ") > 0) {
+ String widgetName = getWidgetName(parent.getWidgetClass());
+ locatorBuilder.insert(0, "@"+widgetName+"[id=\'"+id+"\'] ");
+ } else {
+ locatorBuilder.insert(0, "$"+id+" ");
+ }
} else {
- locatorBuilder.insert(0, "$"+id+" ");
- }
- } else {
- String attribute = parent.getWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME);
- if (attribute != null && attribute.length() > 0) {
- String widgetName = getWidgetName(parent.getWidgetClass());
- id = widgetName+"0"+attribute;
- locatorBuilder.insert(0, "@"+widgetName+"["+AdempiereWebUI.WIDGET_INSTANCE_NAME+"=\'"+attribute+"\'] ");
- } else {
- locatorBuilder.insert(0, "@"+getWidgetName(parent.getWidgetClass())+" ");
+ String attribute = parent.getWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME);
+ if (attribute != null && attribute.length() > 0) {
+ String widgetName = getWidgetName(parent.getWidgetClass());
+ id = widgetName+"0"+attribute;
+ locatorBuilder.insert(0, "@"+widgetName+"["+AdempiereWebUI.WIDGET_INSTANCE_NAME+"=\'"+attribute+"\'] ");
+ } else {
+ locatorBuilder.insert(0, "@"+getWidgetName(parent.getWidgetClass())+" ");
+ }
}
}
+ parent = parent.getParent();
}
- parent = parent.getParent();
}

comp.setWidgetAttribute(ZK_LOCATOR_ATTRIBUTE, locatorBuilder.toString());
@@ -154,31 +163,40 @@

if (id == null || id.length() == 0) {
locatorBuilder.append("@").append(getWidgetName(comp.getWidgetClass()));
- }
-
- Component parent = comp.getParent();
- while(parent != null) {
- //only include id space owner to ease converting test case to use zk id selector instead of uuid
- if (parent instanceof IdSpace) {
- id = parent.getId();
- if (id != null && id.length() > 0) {
- if (id.indexOf(" ") > 0) {
- String widgetName = getWidgetName(parent.getWidgetClass());
- locatorBuilder.insert(0, "@"+widgetName+"[id=\'"+id+"\'] ");
+ Component parent = comp.getParent();
+ while(parent != null) {
+ String parentLocator = parent.getWidgetAttribute(ZK_LOCATOR_ATTRIBUTE);
+ if (parentLocator != null && parentLocator.trim().length() > 0) {
+ locatorBuilder.insert(0, parentLocator+ " ");
+ break;
+ }
+ parent = parent.getParent();
+ }
+ } else {
+ Component parent = comp.getParent();
+ while(parent != null) {
+ //only include id space owner to ease converting test case to use zk id selector instead of uuid
+ if (parent instanceof IdSpace) {
+ id = parent.getId();
+ if (id != null && id.length() > 0) {
+ if (id.indexOf(" ") > 0) {
+ String widgetName = getWidgetName(parent.getWidgetClass());
+ locatorBuilder.insert(0, "@"+widgetName+"[id=\'"+id+"\'] ");
+ } else {
+ locatorBuilder.insert(0, "$"+id+" ");
+ }
} else {
- locatorBuilder.insert(0, "$"+id+" ");
- }
- } else {
- String attribute = parent.getWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME);
- if (attribute != null && attribute.length() > 0) {
- String widgetName = getWidgetName(parent.getWidgetClass());
- locatorBuilder.insert(0, "@"+widgetName+"["+AdempiereWebUI.WIDGET_INSTANCE_NAME+"=\'"+attribute+"\'] ");
- } else {
- locatorBuilder.insert(0, "@"+getWidgetName(parent.getWidgetClass())+" ");
+ String attribute = parent.getWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME);
+ if (attribute != null && attribute.length() > 0) {
+ String widgetName = getWidgetName(parent.getWidgetClass());
+ locatorBuilder.insert(0, "@"+widgetName+"["+AdempiereWebUI.WIDGET_INSTANCE_NAME+"=\'"+attribute+"\'] ");
+ } else {
+ locatorBuilder.insert(0, "@"+getWidgetName(parent.getWidgetClass())+" ");
+ }
}
}
+ parent = parent.getParent();
}
- parent = parent.getParent();
}

comp.setWidgetAttribute(ZK_LOCATOR_ATTRIBUTE, locatorBuilder.toString());

diff -r 102a00c7d26f3765d7656ac29b6d2f184095ecc6 -r 0a0c66f9a3d637b3693358b6176bdd17401865ae org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UiLifeCycleListener.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UiLifeCycleListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UiLifeCycleListener.java
@@ -35,6 +35,7 @@
*/
@Override
public void afterComponentAttached(Component comp, Page page) {
+ AdempiereIdGenerator.updateZkLocatorAttribute(comp);
}

/* (non-Javadoc)
@@ -49,10 +50,7 @@
*/
@Override
public void afterComponentMoved(Component parent, Component child, Component prevparent) {
- String locator = child.getWidgetAttribute(AdempiereIdGenerator.ZK_LOCATOR_ATTRIBUTE);
- if (locator != null) {
- AdempiereIdGenerator.updateZkLocatorAttribute(child);
- }
+ AdempiereIdGenerator.updateZkLocatorAttribute(child);
}

/* (non-Javadoc)

diff -r 102a00c7d26f3765d7656ac29b6d2f184095ecc6 -r 0a0c66f9a3d637b3693358b6176bdd17401865ae org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
@@ -571,6 +571,7 @@
if (popupMenu != null)
{
popupMenu.addMenuListener((ContextMenuListener)editor);
+ popupMenu.setId(field.getColumnName()+"-popup");
this.appendChild(popupMenu);
if (!field.isFieldOnly())
{
@@ -585,9 +586,7 @@
{
popupMenu.addContextElement((XulElement) editor.getComponent());
}
- }
-
- popupMenu.setId(field.getColumnName()+"-popup");
+ }
}
}
}

diff -r 102a00c7d26f3765d7656ac29b6d2f184095ecc6 -r 0a0c66f9a3d637b3693358b6176bdd17401865ae org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java
@@ -34,8 +34,9 @@
* @see org.zkoss.zk.ui.util.EventInterceptor#beforeProcessEvent(org.zkoss.zk.ui.event.Event)
*/
@Override
- public Event beforeProcessEvent(Event event) {
- System.out.println("beforeProcessEvent, event="+event.getName()+",target="+event.getTarget());
+ public Event beforeProcessEvent(Event event) {
+ String locator = event.getTarget() != null ? event.getTarget().getWidgetAttribute("_zk_locator") : "";
+ System.out.println("beforeProcessEvent, event="+event.getName()+",target="+event.getTarget()+",locator="+locator);
return event;
}


diff -r 102a00c7d26f3765d7656ac29b6d2f184095ecc6 -r 0a0c66f9a3d637b3693358b6176bdd17401865ae org.idempiere.ui.zk.selenium/src/fitlibrary/zk/ZkFixture.java
--- a/org.idempiere.ui.zk.selenium/src/fitlibrary/zk/ZkFixture.java
+++ b/org.idempiere.ui.zk.selenium/src/fitlibrary/zk/ZkFixture.java
@@ -9,6 +9,7 @@
import org.idempiere.ui.zk.selenium.Zk;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;

import fitlibrary.annotation.SimpleAction;
import fitlibrary.spider.AbstractSpiderFixture;
@@ -219,6 +220,14 @@
return widget.eval(webDriver, command);
}

+ @SimpleAction(wiki = "|''<i>context click</i>''|zk locator|", tooltip = "Open context menu")
+ public void contextClick(String locator) {
+ Widget widget = new Widget(locator);
+ WebElement element = widget.findElement(webDriver);
+ Actions actions = new Actions(webDriver);
+ actions.contextClick(element).build().perform();
+ }
+
/**
* Causes the currently executing thread to sleep for the specified number
* of milliseconds, subject to the precision and accuracy of system timers


https://bitbucket.org/idempiere/idempiere/commits/3b60eee091ab/
Changeset: 3b60eee091ab
Branch: development
User: hengsin
Date: 2013-03-22 08:56:57
Summary: Merge 1c913e23f51a
Affected #: 4 files

diff -r 0a0c66f9a3d637b3693358b6176bdd17401865ae -r 3b60eee091ab6f5fa2424c6b4fb1cf0c4c478521 org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
--- a/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
+++ b/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
@@ -23,6 +23,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
+import java.util.logging.Level;

import org.adempiere.exceptions.DBException;
import org.compiere.model.MColumn;
@@ -48,6 +49,9 @@

private String tableName;

+ /** Logger */
+ private static CLogger log = CLogger.getCLogger(UUIDGenerator.class);
+
/**
* @see org.compiere.process.SvrProcess#prepare()
*/
@@ -94,7 +98,7 @@
String columnName = PO.getUUIDColumnName(cTableName);
int AD_Column_ID = DB.getSQLValue(null, "SELECT AD_Column_ID FROM AD_Column Where AD_Table_ID = ? AND ColumnName = ?", AD_Table_ID, columnName);
if (AD_Column_ID <= 0) {
- System.out.println("Adding UUID to " + cTableName);
+ if (log.isLoggable(Level.INFO)) log.info("Adding UUID to " + cTableName);
count++;
//create column
MColumn mColumn = new MColumn(getCtx(), 0, null);
@@ -142,6 +146,10 @@
} else {
compositeKeys = Arrays.asList(table.getKeyColumns());
}
+ if ((compositeKeys == null || compositeKeys.size() == 0) && keyColumn == null) {
+ log.warning("Cannot update orphan table " + table.getTableName() + " (not ID neither parents)");
+ return;
+ }
if (compositeKeys == null) {
sql.append(keyColumn);
} else {

diff -r 0a0c66f9a3d637b3693358b6176bdd17401865ae -r 3b60eee091ab6f5fa2424c6b4fb1cf0c4c478521 org.adempiere.base/src/org/compiere/print/PrintData.java
--- a/org.adempiere.base/src/org/compiere/print/PrintData.java
+++ b/org.adempiere.base/src/org/compiere/print/PrintData.java
@@ -291,7 +291,7 @@
*/
public int getRowIndex()
{
- return m_matrix.getRowCount();
+ return m_matrix.getRowIndex();
} // getRowIndex

/**

diff -r 0a0c66f9a3d637b3693358b6176bdd17401865ae -r 3b60eee091ab6f5fa2424c6b4fb1cf0c4c478521 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
@@ -54,6 +54,7 @@
import org.compiere.model.MAcctSchema;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MColumn;
+import org.compiere.model.MFactAcct;
import org.compiere.model.X_AD_CtxHelp;
import org.compiere.model.X_C_AcctSchema_Element;
import org.compiere.report.core.RModel;
@@ -95,13 +96,13 @@

public class WAcctViewer extends Window implements EventListener<Event>
{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3440375640756094077L;
+
private static final String TITLE = "Posting";

- /**
- *
- */
- private static final long serialVersionUID = -223185724918504685L;
-
private static final int PAGE_SIZE = 1000;

/** State Info */
@@ -522,6 +523,7 @@
resultCenter.appendChild(table);
table.setHflex("1");
table.setVflex("1");
+ table.addEventListener(Events.ON_DOUBLE_CLICK, this);

pagingPanel = new South();
resultPanel.appendChild(pagingPanel);
@@ -758,6 +760,9 @@
ListModelTable model = new ListModelTable(list);
table.setModel(model);
}
+ else if (Events.ON_DOUBLE_CLICK.equals(e.getName()) && source instanceof Listbox && source == table) {
+ actionZoomFactAcct();
+ }
} // onEvent

private void actionExport() {
@@ -1309,6 +1314,20 @@
}
//

+ private void actionZoomFactAcct() {
+ int selected = table.getSelectedIndex();
+ if(selected == -1) return;
+
+ int factAcctIdColumn = m_rmodel.getColumnIndex("Fact_Acct_ID");
+ ListModelTable model = (ListModelTable) table.getListModel();
+ Integer faint = (Integer) model.getDataAt(selected, factAcctIdColumn);
+ if (faint != null) {
+ int fact_acct_ID = faint.intValue();
+
+ AEnv.zoom(MFactAcct.Table_ID, fact_acct_ID);
+ }
+ }
+
@Override
public void onPageAttached(Page newpage, Page oldpage) {
super.onPageAttached(newpage, oldpage);

diff -r 0a0c66f9a3d637b3693358b6176bdd17401865ae -r 3b60eee091ab6f5fa2424c6b4fb1cf0c4c478521 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
@@ -561,6 +561,7 @@

rm.addColumn(new RColumn(ctx, "AD_Table_ID", DisplayType.TableDir));
rm.addColumn(new RColumn(ctx, "Record_ID", DisplayType.ID));
+ rm.addColumn(new RColumn(ctx, "Fact_Acct_ID", DisplayType.ID));
if (displayDocumentInfo)
{
rm.addColumn(new RColumn(ctx, "Description", DisplayType.String));

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/f9df75e4dd96/
Changeset: f9df75e4dd96
Branch: development
User: richard1988
Date: 2013-03-22 21:25:58
Summary: IDEMPIERE-783 search fields in Window Process Audit
Affected #: 2 files

diff -r 600ad7020ccb39737666f80fda99ba1e5d0805e5 -r f9df75e4dd96d8475a04829c079922d641c5ff39 migration/i1.0a-release/oracle/201303201719_IDEMPIERE-783.sql
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201303201719_IDEMPIERE-783.sql
@@ -0,0 +1,11 @@
+-- Mar 20, 2013 5:15:40 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_DATE('2013-03-20 17:15:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2781
+;
+
+-- Mar 20, 2013 5:15:32 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_DATE('2013-03-20 17:15:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5951
+;
+
+SELECT register_migration_script('201303201719_IDEMPIERE-783.sql') FROM dual;

diff -r 600ad7020ccb39737666f80fda99ba1e5d0805e5 -r f9df75e4dd96d8475a04829c079922d641c5ff39 migration/i1.0a-release/postgresql/201303201719_IDEMPIERE-783.sql
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201303201719_IDEMPIERE-783.sql
@@ -0,0 +1,11 @@
+-- Mar 20, 2013 5:14:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_TIMESTAMP('2013-03-20 17:14:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2781
+;
+
+-- Mar 20, 2013 5:14:43 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_TIMESTAMP('2013-03-20 17:14:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5951
+;
+
+SELECT register_migration_script('201303201719_IDEMPIERE-783.sql') FROM dual;


https://bitbucket.org/idempiere/idempiere/commits/ebd7e04c796d/
Changeset: ebd7e04c796d
Branch: development
User: globalqss
Date: 2013-03-22 21:26:28
Summary: IDEMPIERE-783 search fields in Window Process Audit / peer review
Affected #: 2 files

diff -r f9df75e4dd96d8475a04829c079922d641c5ff39 -r ebd7e04c796da1ba967d037f67b5381f8f188ec7 migration/i1.0a-release/oracle/201303201719_IDEMPIERE-783.sql
--- a/migration/i1.0a-release/oracle/201303201719_IDEMPIERE-783.sql
+++ b/migration/i1.0a-release/oracle/201303201719_IDEMPIERE-783.sql
@@ -1,11 +1,22 @@
-- Mar 20, 2013 5:15:40 PM COT
--- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+-- IDEMPIERE-783 search fields in Window Process Audit
UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_DATE('2013-03-20 17:15:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2781
;

-- Mar 20, 2013 5:15:32 PM COT
--- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_DATE('2013-03-20 17:15:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5951
;

+-- Mar 22, 2013 3:19:07 PM COT
+UPDATE AD_Column SET SeqNo=3,Updated=TO_DATE('2013-03-22 15:19:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2809
+;
+
+-- Mar 22, 2013 3:19:13 PM COT
+UPDATE AD_Column SET SeqNo=2,Updated=TO_DATE('2013-03-22 15:19:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4023
+;
+
+-- Mar 22, 2013 3:19:19 PM COT
+UPDATE AD_Column SET SeqNo=1,Updated=TO_DATE('2013-03-22 15:19:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2809
+;
+
SELECT register_migration_script('201303201719_IDEMPIERE-783.sql') FROM dual;

diff -r f9df75e4dd96d8475a04829c079922d641c5ff39 -r ebd7e04c796da1ba967d037f67b5381f8f188ec7 migration/i1.0a-release/postgresql/201303201719_IDEMPIERE-783.sql
--- a/migration/i1.0a-release/postgresql/201303201719_IDEMPIERE-783.sql
+++ b/migration/i1.0a-release/postgresql/201303201719_IDEMPIERE-783.sql
@@ -1,11 +1,22 @@
-- Mar 20, 2013 5:14:16 PM COT
--- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+-- IDEMPIERE-783 search fields in Window Process Audit
UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_TIMESTAMP('2013-03-20 17:14:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2781
;

-- Mar 20, 2013 5:14:43 PM COT
--- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_TIMESTAMP('2013-03-20 17:14:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5951
;

+-- Mar 22, 2013 3:19:07 PM COT
+UPDATE AD_Column SET SeqNo=3,Updated=TO_TIMESTAMP('2013-03-22 15:19:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2809
+;
+
+-- Mar 22, 2013 3:19:13 PM COT
+UPDATE AD_Column SET SeqNo=2,Updated=TO_TIMESTAMP('2013-03-22 15:19:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4023
+;
+
+-- Mar 22, 2013 3:19:19 PM COT
+UPDATE AD_Column SET SeqNo=1,Updated=TO_TIMESTAMP('2013-03-22 15:19:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2809
+;
+
SELECT register_migration_script('201303201719_IDEMPIERE-783.sql') FROM dual;

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/898d11a63779/
Changeset: 898d11a63779
Branch: development
User: globalqss
Date: 2013-03-23 02:22:01
Summary: Fix on ant scripts on migration - thanks to Alex Yang for the tip at
https://groups.google.com/d/msg/idempiere/y5YH7DExTAo/7csdvQr8m2EJ
Affected #: 2 files

diff -r 08dda45617d168d616936cd9d4bba5188aa5e492 -r 898d11a63779ead36c073b43116304c79da4bdb7 migration/i1.0a-release/oracle/build.xml
--- a/migration/i1.0a-release/oracle/build.xml
+++ b/migration/i1.0a-release/oracle/build.xml
@@ -1,13 +1,13 @@
<project name="migrate-db-oracle" default="run-scripts" basedir="."><property file="../../oracle.properties" /><path id="lib.path">
- <fileset dir="../../../tools/lib">
+ <fileset dir="../../../db/ddlutils/lib"><include name="**/*.jar" /></fileset></path><taskdef resource="net/sf/antcontrib/antlib.xml"><classpath>
- <fileset dir="../../../tools/lib">
+ <fileset dir="../../../db/ddlutils/lib"><include name="**/*.jar" /></fileset></classpath>

diff -r 08dda45617d168d616936cd9d4bba5188aa5e492 -r 898d11a63779ead36c073b43116304c79da4bdb7 migration/i1.0a-release/postgresql/build.xml
--- a/migration/i1.0a-release/postgresql/build.xml
+++ b/migration/i1.0a-release/postgresql/build.xml
@@ -1,13 +1,13 @@
<project name="migrate-db-postgre" default="run-scripts" basedir="."><property file="../../postgresql.properties" /><path id="lib.path">
- <fileset dir="../../../tools/lib">
+ <fileset dir="../../../db/ddlutils/lib"><include name="**/*.jar" /></fileset></path><taskdef resource="net/sf/antcontrib/antlib.xml"><classpath>
- <fileset dir="../../../tools/lib">
+ <fileset dir="../../../db/ddlutils/lib"><include name="**/*.jar" /></fileset></classpath>


https://bitbucket.org/idempiere/idempiere/commits/8e9ec64a664d/
Changeset: 8e9ec64a664d
Branch: development
User: globalqss
Date: 2013-03-23 02:25:40
Summary: Fix problems in scripts 201303191132_TICKET-1001025.sql
Affected #: 2 files

diff -r 898d11a63779ead36c073b43116304c79da4bdb7 -r 8e9ec64a664d15ff98fbcc8de25a940025b7d4fe migration/i1.0a-release/oracle/201303191132_TICKET-1001025.sql
--- a/migration/i1.0a-release/oracle/201303191132_TICKET-1001025.sql
+++ b/migration/i1.0a-release/oracle/201303191132_TICKET-1001025.sql
@@ -24578,7 +24578,9 @@
;

UPDATE AD_Column SET AD_Reference_Value_ID=134, AD_Reference_ID=18, IsToolbarButton='N',Updated=TO_DATE('2012-12-19 16:58:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210189
-;-- Dec 15, 2012 5:03:29 PM IST
+;
+
+-- Dec 15, 2012 5:03:29 PM IST
-- Adding more information on view
INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',0,805,205005,'D','N','N','N','N',131089,'N',12,'N',2822,'c073ea3e-5f63-4267-9e69-8c28e248d626','N','N','CumulatedAmt','Total Amount','Sum of all amounts','Accumulated Amt',100,TO_DATE('2012-12-15 17:03:28','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-12-15 17:03:28','YYYY-MM-DD HH24:MI:SS'),100,0)
;
@@ -40638,7 +40640,9 @@
;

UPDATE AD_Column SET AD_Reference_Value_ID=276, AD_Reference_ID=18, IsToolbarButton='N',Updated=TO_DATE('2012-12-21 12:17:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210196
-;-- Dec 21, 2012 12:39:02 PM IST
+;
+
+-- Dec 21, 2012 12:39:02 PM IST
-- Adding more information on view
INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',0,619,206660,'D','N','N','N','N',10,'N',19,'N',558,'baae1635-99d1-4c4f-bff8-338b1e7e1bee','N','N','C_Order_ID','Order','The Order is a control document. The Order is complete when the quantity ordered is the same as the quantity shipped and invoiced. When you close an order, unshipped (backordered) quantities are cancelled.','Order',100,TO_DATE('2012-12-21 12:38:51','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-12-21 12:38:51','YYYY-MM-DD HH24:MI:SS'),100,0)
;
@@ -49330,7 +49334,9 @@
;

UPDATE AD_Column SET AD_Reference_Value_ID=134, AD_Reference_ID=18, IsToolbarButton='N',Updated=TO_DATE('2012-12-21 17:57:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210205
-;-- Dec 21, 2012 6:09:34 PM IST
+;
+
+-- Dec 21, 2012 6:09:34 PM IST
-- Adding more information on view
INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',0,520,207365,'D','N','N','N','N',10,'N',19,'N',201912,'85f1578f-89b7-43ed-9399-8a52e64556d5','N','N','c_bp_c_taxgroup_id','c_bp_c_taxgroup_id',100,TO_DATE('2012-12-21 18:09:32','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-12-21 18:09:32','YYYY-MM-DD HH24:MI:SS'),100,0)
;
@@ -62021,4 +62027,4 @@
;

SELECT register_migration_script('201303191132_TICKET-1001025.sql') FROM dual
-;

\ No newline at end of file

+;

diff -r 898d11a63779ead36c073b43116304c79da4bdb7 -r 8e9ec64a664d15ff98fbcc8de25a940025b7d4fe migration/i1.0a-release/postgresql/201303191132_TICKET-1001025.sql
--- a/migration/i1.0a-release/postgresql/201303191132_TICKET-1001025.sql
+++ b/migration/i1.0a-release/postgresql/201303191132_TICKET-1001025.sql
@@ -24578,7 +24578,9 @@
;

UPDATE AD_Column SET AD_Reference_Value_ID=134, AD_Reference_ID=18, IsToolbarButton='N',Updated=TO_TIMESTAMP('2012-12-19 16:58:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210189
-;-- Dec 15, 2012 5:03:29 PM IST
+;
+
+-- Dec 15, 2012 5:03:29 PM IST
-- Adding more information on view
INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',0,805,205005,'D','N','N','N','N',131089,'N',12,'N',2822,'c073ea3e-5f63-4267-9e69-8c28e248d626','N','N','CumulatedAmt','Total Amount','Sum of all amounts','Accumulated Amt',100,TO_TIMESTAMP('2012-12-15 17:03:28','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-12-15 17:03:28','YYYY-MM-DD HH24:MI:SS'),100,0)
;
@@ -40638,7 +40640,9 @@
;

UPDATE AD_Column SET AD_Reference_Value_ID=276, AD_Reference_ID=18, IsToolbarButton='N',Updated=TO_TIMESTAMP('2012-12-21 12:17:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210196
-;-- Dec 21, 2012 12:39:02 PM IST
+;
+
+-- Dec 21, 2012 12:39:02 PM IST
-- Adding more information on view
INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',0,619,206660,'D','N','N','N','N',10,'N',19,'N',558,'baae1635-99d1-4c4f-bff8-338b1e7e1bee','N','N','C_Order_ID','Order','The Order is a control document. The Order is complete when the quantity ordered is the same as the quantity shipped and invoiced. When you close an order, unshipped (backordered) quantities are cancelled.','Order',100,TO_TIMESTAMP('2012-12-21 12:38:51','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-12-21 12:38:51','YYYY-MM-DD HH24:MI:SS'),100,0)
;
@@ -49330,7 +49334,9 @@
;

UPDATE AD_Column SET AD_Reference_Value_ID=134, AD_Reference_ID=18, IsToolbarButton='N',Updated=TO_TIMESTAMP('2012-12-21 17:57:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210205
-;-- Dec 21, 2012 6:09:34 PM IST
+;
+
+-- Dec 21, 2012 6:09:34 PM IST
-- Adding more information on view
INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',0,520,207365,'D','N','N','N','N',10,'N',19,'N',201912,'85f1578f-89b7-43ed-9399-8a52e64556d5','N','N','c_bp_c_taxgroup_id','c_bp_c_taxgroup_id',100,TO_TIMESTAMP('2012-12-21 18:09:32','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-12-21 18:09:32','YYYY-MM-DD HH24:MI:SS'),100,0)
;
@@ -62021,4 +62027,4 @@
;

SELECT register_migration_script('201303191132_TICKET-1001025.sql') FROM dual
-;

\ No newline at end of file

+;

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/eed0b6f161fe/
Changeset: eed0b6f161fe
Branch: development
User: globalqss
Date: 2013-03-23 16:24:18
Summary: IDEMPIERE-794 Ticket #1001025 - Expand the views to provide more information / Adding IsDefault to some views is causing problems - i.e. setting defaults for BP and orderline
Affected #: 1 file

diff -r 8e9ec64a664d15ff98fbcc8de25a940025b7d4fe -r eed0b6f161fe9a1d4eb0da4c1fec406965da1b42 org.adempiere.base/src/org/compiere/util/Login.java
--- a/org.adempiere.base/src/org/compiere/util/Login.java
+++ b/org.adempiere.base/src/org/compiere/util/Login.java
@@ -956,7 +956,7 @@
sql = "SELECT t.TableName, c.ColumnName "
+ "FROM AD_Column c "
+ " INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) "
- + "WHERE c.IsKey='Y' AND t.IsActive='Y'"
+ + "WHERE c.IsKey='Y' AND t.IsActive='Y' AND t.IsView='N'"
+ " AND EXISTS (SELECT * FROM AD_Column cc "
+ " WHERE ColumnName = 'IsDefault' AND t.AD_Table_ID=cc.AD_Table_ID AND cc.IsActive='Y')";
pstmt = DB.prepareStatement(sql, null);


https://bitbucket.org/idempiere/idempiere/commits/51dbb56edd32/
Changeset: 51dbb56edd32
Branch: development
User: globalqss
Date: 2013-03-23 16:26:24
Summary: IDEMPIERE-661 OrderLineCreateProduction not passing accounting data from SO to Production
Affected #: 2 files

diff -r eed0b6f161fe9a1d4eb0da4c1fec406965da1b42 -r 51dbb56edd3243421d9cd79a67f24886ca8d8828 migration/i1.0a-release/oracle/201303231025_IDEMPIERE-661.sql
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201303231025_IDEMPIERE-661.sql
@@ -0,0 +1,76 @@
+-- Mar 23, 2013 9:42:46 AM COT
+-- IDEMPIERE-661 OrderLineCreateProduction not passing accounting data from SO to Production
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=100,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59754
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=130,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59756
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=140, IsDisplayed='Y', XPosition=5,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59749
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=150, IsDisplayed='Y', XPosition=6,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59736
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=200, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=210, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=220, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=230, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=240,Updated=TO_DATE('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59748
+;
+
+-- Mar 23, 2013 9:52:07 AM COT
+UPDATE AD_Field SET IsReadOnly='Y',Updated=TO_DATE('2013-03-23 09:52:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62018
+;
+
+-- Mar 23, 2013 9:52:21 AM COT
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2013-03-23 09:52:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61941
+;
+
+-- Mar 23, 2013 9:52:33 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_DATE('2013-03-23 09:52:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62018
+;
+
+-- Mar 23, 2013 9:52:39 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_DATE('2013-03-23 09:52:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Mar 23, 2013 9:52:49 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_DATE('2013-03-23 09:52:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Mar 23, 2013 9:52:54 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_DATE('2013-03-23 09:52:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Mar 23, 2013 9:53:00 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_DATE('2013-03-23 09:53:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Mar 23, 2013 9:53:08 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_DATE('2013-03-23 09:53:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Mar 23, 2013 9:53:17 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_DATE('2013-03-23 09:53:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59748
+;
+
+SELECT register_migration_script('201303231025_IDEMPIERE-661.sql') FROM dual
+;
+

diff -r eed0b6f161fe9a1d4eb0da4c1fec406965da1b42 -r 51dbb56edd3243421d9cd79a67f24886ca8d8828 migration/i1.0a-release/postgresql/201303231025_IDEMPIERE-661.sql
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201303231025_IDEMPIERE-661.sql
@@ -0,0 +1,76 @@
+-- Mar 23, 2013 9:42:46 AM COT
+-- IDEMPIERE-661 OrderLineCreateProduction not passing accounting data from SO to Production
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=100,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59754
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=130,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59756
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=140, IsDisplayed='Y', XPosition=5,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59749
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET ColumnSpan=1, SeqNo=150, IsDisplayed='Y', XPosition=6,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59736
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=200, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=210, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=220, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=230, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Mar 23, 2013 9:42:46 AM COT
+UPDATE AD_Field SET SeqNo=240,Updated=TO_TIMESTAMP('2013-03-23 09:42:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59748
+;
+
+-- Mar 23, 2013 9:52:07 AM COT
+UPDATE AD_Field SET IsReadOnly='Y',Updated=TO_TIMESTAMP('2013-03-23 09:52:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62018
+;
+
+-- Mar 23, 2013 9:52:21 AM COT
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2013-03-23 09:52:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61941
+;
+
+-- Mar 23, 2013 9:52:33 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_TIMESTAMP('2013-03-23 09:52:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62018
+;
+
+-- Mar 23, 2013 9:52:39 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_TIMESTAMP('2013-03-23 09:52:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Mar 23, 2013 9:52:49 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_TIMESTAMP('2013-03-23 09:52:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Mar 23, 2013 9:52:54 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_TIMESTAMP('2013-03-23 09:52:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Mar 23, 2013 9:53:00 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_TIMESTAMP('2013-03-23 09:53:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Mar 23, 2013 9:53:08 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_TIMESTAMP('2013-03-23 09:53:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Mar 23, 2013 9:53:17 AM COT
+UPDATE AD_Field SET AD_FieldGroup_ID=104,Updated=TO_TIMESTAMP('2013-03-23 09:53:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59748
+;
+
+SELECT register_migration_script('201303231025_IDEMPIERE-661.sql') FROM dual
+;

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/2b8f69cc4328/
Changeset: 2b8f69cc4328
Branch: development
User: hengsin
Date: 2013-03-27 09:21:44
Summary: IDEMPIERE-801 Tab body mask doesn't block focus.
Affected #: 7 files

diff -r a446ddf6da7c657e3ace8232adcf83465e78fff8 -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java
@@ -219,10 +219,10 @@

this.setClosable(true);
adwindowContent = findADWindowContent(ref);
- if (adwindowContent != null) {
- adwindowContent.showBusyMask();
+ if (adwindowContent != null) {
ZkCssHelper.appendStyle(this, "position: absolute;");
adwindowContent.getComponent().getParent().appendChild(this);
+ adwindowContent.showBusyMask(this);
LayoutUtils.openOverlappedWindow(ref, this, "after_start");
} else {
AEnv.showCenterScreen(this);

diff -r a446ddf6da7c657e3ace8232adcf83465e78fff8 -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -104,6 +104,7 @@
import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.compiere.util.WebDoc;
+import org.zkoss.zk.au.out.AuScript;
import org.zkoss.zk.ui.AbstractComponent;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
@@ -908,8 +909,8 @@
hideBusyMask();
}
});
- showBusyMask();
getComponent().getParent().appendChild(win);
+ showBusyMask(win);
LayoutUtils.openOverlappedWindow(getComponent(), win, "middle_center");
}

@@ -951,8 +952,8 @@
focusToActivePanel();
}
});
- showBusyMask();
- getComponent().getParent().appendChild(chat);
+ getComponent().getParent().appendChild(chat);
+ showBusyMask(chat);
LayoutUtils.openOverlappedWindow(getComponent(), chat, "middle_center");
chat.showWindow();
}
@@ -1726,8 +1727,8 @@
});
}

- showBusyMask();
- getComponent().getParent().appendChild(findWindow);
+ getComponent().getParent().appendChild(findWindow);
+ showBusyMask(findWindow);
LayoutUtils.openEmbeddedWindow(toolbar, findWindow, "after_start");
}

@@ -2190,9 +2191,9 @@
hideBusyMask();
focusToActivePanel();
}
- });
- showBusyMask();
+ });
getComponent().getParent().appendChild(messagePanel);
+ showBusyMask(messagePanel);
LayoutUtils.openOverlappedWindow(getComponent(), messagePanel, "middle_center");
}
//
@@ -2223,9 +2224,9 @@
ProcessModalDialog dialog = new ProcessModalDialog(AbstractADWindowContent.this, getWindowNo(), AD_Process_ID,table_ID, record_ID, true);
if (dialog.isValid()) {
dialog.setWidth("500px");
- dialog.setBorder("normal");
- showBusyMask();
+ dialog.setBorder("normal");
getComponent().getParent().appendChild(dialog);
+ showBusyMask(dialog);
LayoutUtils.openOverlappedWindow(getComponent(), dialog, "middle_center");
dialog.focus();
}
@@ -2474,9 +2475,9 @@
boolean isProcessMandatory = true;
executeButtonProcess(wButton, startWOasking, table_ID, recordIdParam, isProcessMandatory);
}
- });
- showBusyMask();
+ });
getComponent().getParent().appendChild(win);
+ showBusyMask(win);
LayoutUtils.openOverlappedWindow(getComponent(), win, "middle_center");
win.focus();
return;
@@ -2506,9 +2507,9 @@
window.setZindex(1000);
window.setMaximizable(true);
window.setSizable(true);
- ZkCssHelper.appendStyle(window, "position: absolute; ");
- showBusyMask();
+ ZkCssHelper.appendStyle(window, "position: absolute; ");
getComponent().getParent().appendChild(window);
+ showBusyMask(window);
cf.showWindow();
LayoutUtils.openOverlappedWindow(getComponent(), window, "middle_center");
window.focus();
@@ -2601,11 +2602,22 @@
public void hideBusyMask() {
if (mask != null && mask.getParent() != null) {
mask.detach();
+ StringBuilder script = new StringBuilder("var w=zk.Widget.$('#");
+ script.append(getComponent().getParent().getUuid()).append("');w.busy=false;");
+ Clients.response(new AuScript(script.toString()));
}
}

- public void showBusyMask() {
+ public void showBusyMask(Window window) {
getComponent().getParent().appendChild(getMask());
+ StringBuilder script = new StringBuilder("var w=zk.Widget.$('#");
+ script.append(getComponent().getParent().getUuid()).append("');");
+ if (window != null) {
+ script.append("var d=zk.Widget.$('#").append(window.getUuid()).append("');w.busy=d;");
+ } else {
+ script.append("w.busy=true;");
+ }
+ Clients.response(new AuScript(script.toString()));
}

private void executeButtonProcess(final IProcessButton wButton,
@@ -2677,7 +2689,7 @@
onRefresh(true, false);
}
});
- showBusyMask();
+ showBusyMask(form);
LayoutUtils.openOverlappedWindow(getComponent(), form, "middle_center");
form.focus();
}
@@ -2692,9 +2704,9 @@
if (dialog.isValid())
{
dialog.setWidth("500px");
- dialog.setBorder("normal");
- showBusyMask();
+ dialog.setBorder("normal");
getComponent().getParent().appendChild(dialog);
+ showBusyMask(dialog);
LayoutUtils.openOverlappedWindow(getComponent(), dialog, "middle_center");
dialog.focus();
}
@@ -2842,9 +2854,9 @@

public void onEvent(Event event) throws Exception {

hideBusyMask();
}
- });
- showBusyMask();
- getComponent().getParent().appendChild(dialog);
+ });
+ getComponent().getParent().appendChild(dialog);
+ showBusyMask(dialog);
LayoutUtils.openOverlappedWindow(this.getComponent(),dialog,"middle_center");
}


diff -r a446ddf6da7c657e3ace8232adcf83465e78fff8 -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WBinaryEditor.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WBinaryEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WBinaryEditor.java
@@ -162,9 +162,9 @@
});
adwindow = ADWindow.findADWindow(getComponent());
if (adwindow != null) {
- ADWindowContent content = adwindow.getADWindowContent();
- content.showBusyMask();
+ ADWindowContent content = adwindow.getADWindowContent();
content.getComponent().getParent().appendChild(dialog);
+ content.showBusyMask(dialog);
LayoutUtils.openOverlappedWindow(content.getComponent().getParent(), dialog, "middle_center");
} else {
AEnv.showWindow(dialog);

diff -r a446ddf6da7c657e3ace8232adcf83465e78fff8 -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
@@ -248,7 +248,7 @@
if (adwindowContent != null)
{
adwindowContent.getComponent().getParent().appendChild(dialog);
- adwindowContent.showBusyMask();
+ adwindowContent.showBusyMask(dialog);
LayoutUtils.openOverlappedWindow(adwindowContent.getComponent().getParent(), dialog, "middle_center");
}
else

diff -r a446ddf6da7c657e3ace8232adcf83465e78fff8 -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
@@ -133,9 +133,9 @@
vb.appendChild(confirmPanel);
confirmPanel.addActionListener(this);
}
-
- panel.showBusyMask();
+
panel.getComponent().getParent().appendChild(winExportFile);
+ panel.showBusyMask(winExportFile);
LayoutUtils.openOverlappedWindow(panel.getComponent(), winExportFile, "middle_center");
winExportFile.addEventListener(DialogEvents.ON_WINDOW_CLOSE, this);
}

diff -r a446ddf6da7c657e3ace8232adcf83465e78fff8 -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
@@ -195,9 +195,9 @@
vb.appendChild(confirmPanel);
confirmPanel.addActionListener(this);
}
-
- panel.showBusyMask();
+
panel.getComponent().getParent().appendChild(winImportFile);
+ panel.showBusyMask(winImportFile);
LayoutUtils.openOverlappedWindow(panel.getComponent(), winImportFile, "middle_center");
winImportFile.addEventListener(DialogEvents.ON_WINDOW_CLOSE, this);
}

diff -r a446ddf6da7c657e3ace8232adcf83465e78fff8 -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a org.adempiere.ui.zk/js/window.js
--- a/org.adempiere.ui.zk/js/window.js
+++ b/org.adempiere.ui.zk/js/window.js
@@ -3,3 +3,38 @@
var window = zk(windowid);
window.position(ref.$n(), position);
}
+
+zk.override(zk.Widget.prototype, "canActivate",
+ function () {
+ var b = this.$canActivate.apply(this, arguments);
+ if (b) {
+ if (zk.currentModal) {
+ return true;
+ }
+ var wgt = this;
+ while (wgt) {
+ if (wgt.busy) {
+ if (wgt.busy.className == 'zul.wnd.Window') {
+ if (zUtl.isAncestor(wgt.busy, this)) {
+ return true;
+ } else {
+ wgt.busy.focus(0);
+ return false;
+ }
+ } else {
+ jq.focusOut();
+ }
+ return false;
+ }
+ if (wgt.className == 'zul.wnd.Window') {
+ if (wgt.getMode() == 'overlapped') {
+ return true;
+ }
+ }
+ wgt = wgt.parent;
+ }
+ return true;
+ } else {
+ return false;
+ }
+ });


https://bitbucket.org/idempiere/idempiere/commits/f6a0d2d04c21/
Changeset: f6a0d2d04c21
Branch: development
User: hengsin
Date: 2013-03-27 09:24:11
Summary: Merge 50217fceb554
Affected #: 1 file

diff -r 2b8f69cc43280ebef5064e46f07a5254c1abd21a -r f6a0d2d04c216023d43016cf9c8980f2193bc701 org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
org.adempiere.report.jasper.library;bundle-version="1.0.0"
Import-Package: org.osgi.framework
Service-Component: OSGI-INF/jrviewerprovider.xml
+Bundle-ActivationPolicy: lazy

[commits...@bitbucket.org]

2 new commits in iDempiere:

https://bitbucket.org/idempiere/idempiere/commits/fb2c0f31ac4c/
Changeset: fb2c0f31ac4c
Branch: development
User: hengsin
Date: 2013-03-27 14:30:12
Summary: IDEMPIERE-739 Detail tab list not get refreshed corresponding to master page change.
Affected #: 1 file

diff -r f6a0d2d04c216023d43016cf9c8980f2193bc701 -r fb2c0f31ac4c124448c74e40f9f5cd8d1f3b887e org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
@@ -1458,6 +1458,8 @@
if (!tabPanel.isGridView()) {
tabPanel.switchRowPresentation();
}
+ } else if (tabPanel != null && !tabPanel.getGridTab().isCurrent()) {
+ tabPanel.activate(true);
}
}



https://bitbucket.org/idempiere/idempiere/commits/75f5fcb0da70/
Changeset: 75f5fcb0da70
Branch: development
User: hengsin
Date: 2013-03-27 14:36:27
Summary: Merge fb2c0f31ac4c
Affected #: 1 file

diff -r 0d2f3eabb830b9a96d80ab00fdb138ad61273a46 -r 75f5fcb0da70b9eba631d150f25706fdba716126 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
@@ -1458,6 +1458,8 @@
if (!tabPanel.isGridView()) {
tabPanel.switchRowPresentation();
}
+ } else if (tabPanel != null && !tabPanel.getGridTab().isCurrent()) {
+ tabPanel.activate(true);