From c97bb898296d0a814384b74411a3f3352846dce6 Mon Sep 17 00:00:00 2001 From: "Hesham S. Ahmed" Date: Thu, 3 Jan 2013 21:20:59 +0300 Subject: [PATCH 1/2] IDEMPIERE-543 RedHat Init Script does not stop iDempiere Server --- .../utils.unix/unix/idempiere_RedHat.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh index 1084a9a2d3..17f73ebf93 100644 --- a/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh +++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh @@ -84,14 +84,14 @@ stop () { source $ENVFILE echo "Trying direct kill with signal -15" # Adempiere didn't finish - try direct kill with signal 15, then signal 9 - kill -15 `ps ax | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " "` + kill -15 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " "` sleep 5 getidempierestatus if [ $IDEMPIERESTATUS -ne 0 ] ; then echo_success else echo "Trying direct kill with signal -9" - kill -9 `ps ax | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " "` + kill -9 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " "` sleep 5 getidempierestatus if [ $IDEMPIERESTATUS -ne 0 ] ; then From 5d5cb4112ffb760f88fcf6d8db4761c1401da501 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 9 Jan 2013 19:31:13 -0500 Subject: [PATCH 2/2] IDEMPIERE-512 Elements in the window Accounting Fact Reconciliation ,is looking bad / Thanks to Richard Morales --- .../webui/apps/form/WFactReconcile.java | 65 ++++++++++++------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java index 38b93ee994..1f1a953948 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java @@ -109,7 +109,7 @@ implements IFormController, EventListener, WTableModelListener, ValueChan private Button bGenerate = cp.createButton(ConfirmPanel.A_PROCESS); private Button bReset = cp.createButton(ConfirmPanel.A_RESET); private Button bZoom = cp.createButton(ConfirmPanel.A_ZOOM); - private Borderlayout commandLayout = new Borderlayout(); + private Grid commandLayout = GridFactory.newGridLayout(); private Button bRefresh = cp.createButton(ConfirmPanel.A_REFRESH); private Label labelDateAcct = new Label(); private WDateEditor fieldDateAcct = new WDateEditor(); @@ -173,28 +173,35 @@ implements IFormController, EventListener, WTableModelListener, ValueChan Rows rows = null; Row row = null; - parameterLayout.setWidth("800px"); + parameterLayout.setWidth("90%"); rows = parameterLayout.newRows(); row = rows.newRow(); - row.appendChild(labelAcctSchema.rightAlign()); - row.appendChild(fieldAcctSchema.getComponent()); - row.appendChild(labelOrg.rightAlign()); - row.appendChild(fieldOrg.getComponent()); + row.appendCellChild(labelAcctSchema.rightAlign()); + fieldAcctSchema.getComponent().setHflex("true"); + row.appendCellChild(fieldAcctSchema.getComponent(), 2); + row.appendCellChild(labelOrg.rightAlign()); + fieldOrg.getComponent().setHflex("true"); + row.appendCellChild(fieldOrg.getComponent(), 2); row = rows.newRow(); - row.appendChild(labelAccount.rightAlign()); - row.appendChild(fieldAccount); - row.appendChild(labelReconciled); - row.appendChild(isReconciled); + row.appendCellChild(labelAccount.rightAlign()); + fieldAccount.setHflex("true"); + row.appendCellChild(fieldAccount, 2); + row.appendCellChild(labelReconciled); + row.appendCellChild(isReconciled, 2); row = rows.newRow(); - row.appendChild(labelBPartner.rightAlign()); - row.appendChild(fieldBPartner.getComponent()); - row.appendChild(labelProduct.rightAlign()); - row.appendChild(fieldProduct.getComponent()); + row.appendCellChild(labelBPartner.rightAlign()); + fieldBPartner.getComponent().setHflex("true"); + row.appendCellChild(fieldBPartner.getComponent(), 2); + row.appendCellChild(labelProduct.rightAlign()); + fieldProduct.getComponent().setHflex("true"); + row.appendCellChild(fieldProduct.getComponent(), 2); row = rows.newRow(); - row.appendChild(labelDateAcct.rightAlign()); - row.appendChild(fieldDateAcct.getComponent()); - row.appendChild(labelDateAcct2.rightAlign()); - row.appendChild(fieldDateAcct2.getComponent()); + row.appendCellChild(labelDateAcct.rightAlign()); + fieldDateAcct.getComponent().setHflex("true"); + row.appendCellChild(fieldDateAcct.getComponent(), 2); + row.appendCellChild(labelDateAcct2.rightAlign()); + fieldDateAcct2.getComponent().setHflex("true"); + row.appendCellChild(fieldDateAcct2.getComponent(), 2); row = rows.newRow(); row.appendChild(bRefresh); @@ -212,12 +219,22 @@ implements IFormController, EventListener, WTableModelListener, ValueChan mainLayout.appendChild(south); south.appendChild(commandPanel); commandPanel.appendChild(commandLayout); - commandPanel.appendChild(bZoom); - commandPanel.appendChild(differenceLabel); - commandPanel.appendChild(differenceField); - commandPanel.appendChild(bGenerate); - commandPanel.appendChild(bReset); - commandPanel.appendChild(bCancel); + commandLayout.setWidth("90%"); + rows = commandLayout.newRows(); + row = rows.newRow(); + row.appendCellChild(bZoom, 2); + bZoom.setHflex("true"); + bZoom.setWidth("100%"); + row.appendCellChild(differenceLabel.rightAlign()); + differenceLabel.setHflex("true"); + row.appendCellChild(differenceField, 2); + differenceField.setHflex("true"); + row.appendCellChild(bGenerate, 2); + bGenerate.setHflex("true"); + row.appendCellChild(bReset, 2); + bReset.setHflex("true"); + row.appendCellChild(bCancel); + bCancel.setHflex("true"); } /**