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

IDEMPIERE-2389 Print format and View Report selection on process dialog 

NPE: when click save at process (not report) parameter
This commit is contained in:
hieplq 2015-04-08 21:25:33 +07:00
parent 47690cd929
commit 1d255b8c1e
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java
View File

@ -558,7 +558,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
freportType.setValue(instance.getReportType()); freportType.setValue(instance.getReportType());
} }
if (instance != null) if (instance != null && chbIsSummary != null)
chbIsSummary.setSelected(instance.getIsSummary()); chbIsSummary.setSelected(instance.getIsSummary());
} }
@ -630,22 +630,8 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
} }
getParameterPanel().saveParameters(); getParameterPanel().saveParameters();
Object value = fPrintFormat.getValue(); saveReportOptionToInstance(savedParams.get(i));
if (value == null){
savedParams.get(i).setAD_PrintFormat_ID(0);
}else{
savedParams.get(i).setAD_PrintFormat_ID((Integer)value);
}
value = fLanguageType.getValue();
if (value == null){
savedParams.get(i).setAD_Language_ID(0);
}else{
savedParams.get(i).setAD_Language_ID((Integer)value);
}
savedParams.get(i).setReportType(freportType.getSelectedItem().getValue().toString());
savedParams.get(i).setIsSummary(chbIsSummary.isSelected());
savedParams.get(i).saveEx(); savedParams.get(i).saveEx();
} }
} }
@ -657,9 +643,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
instance = new MPInstance(Env.getCtx(), instance = new MPInstance(Env.getCtx(),
getProcessInfo().getAD_Process_ID(), getProcessInfo().getRecord_ID()); getProcessInfo().getAD_Process_ID(), getProcessInfo().getRecord_ID());
instance.setName(saveName); instance.setName(saveName);
instance.setAD_PrintFormat_ID((Integer) fPrintFormat.getValue()); saveReportOptionToInstance(instance);
instance.setReportType(freportType.getSelectedItem().getValue().toString());
instance.setIsSummary(chbIsSummary.isSelected());
instance.saveEx(); instance.saveEx();
getProcessInfo().setAD_PInstance_ID(instance.getAD_PInstance_ID()); getProcessInfo().setAD_PInstance_ID(instance.getAD_PInstance_ID());
// Get Parameters // Get Parameters
@ -677,6 +661,30 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
fSavedName.setSelectedItem(getComboItem(saveName)); fSavedName.setSelectedItem(getComboItem(saveName));
} }
protected void saveReportOptionToInstance (MPInstance instance){
if (!isReport())
return;
Object value = fPrintFormat.getValue();
if (value == null){
instance.setAD_PrintFormat_ID(0);
}else{
instance.setAD_PrintFormat_ID((Integer)value);
}
if (fLanguageType != null){
value = fLanguageType.getValue();
if (value == null){
instance.setAD_Language_ID(0);
}else{
instance.setAD_Language_ID((Integer)value);
}
}
instance.setReportType(freportType.getSelectedItem().getValue().toString());
instance.setIsSummary(chbIsSummary.isSelected());
}
public Comboitem getComboItem( String value) { public Comboitem getComboItem( String value) {
Comboitem item = null; Comboitem item = null;
for (int i = 0; i < fSavedName.getItems().size(); i++) { for (int i = 0; i < fSavedName.getItems().size(); i++) {