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

Merge 1999418eaf79

This commit is contained in:
Heng Sin Low 2013-01-11 11:55:36 +08:00
parent 2147514216 5d5cb4112f
commit a63999e429
2 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh
View File

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

65
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java
View File

@ -109,7 +109,7 @@ implements IFormController, EventListener<Event>, 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<Event>, 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<Event>, 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");
}
/**