() {
+ @Override
+ public void onEvent(Event event) throws Exception {
+ hideBusyMask();
+ onRefresh(true, false);
+ }
+ });
+ showBusyMask();
+ LayoutUtils.openOverlappedWindow(getComponent(), form, "middle_center");
+ form.focus();
+ }
+ else {
+ SessionManager.getAppDesktop().showWindow(form);
+ }
+ }
+ else
+ {
+ ProcessModalDialog dialog = new ProcessModalDialog(this, curWindowNo, wButton.getProcess_ID(), table_ID, record_ID, startWOasking);
+
+ if (dialog.isValid())
+ {
+ dialog.setWidth("500px");
+ dialog.setBorder("normal");
+ showBusyMask();
+ getComponent().getParent().appendChild(dialog);
+ LayoutUtils.openOverlappedWindow(getComponent(), dialog, "middle_center");
+ dialog.focus();
+ }
+ else
+ {
+ onRefresh(true, false);
+ }
+ }
+ }
+
+ /**
+ * @param event
+ * @see ActionListener#actionPerformed(ActionEvent)
+ */
+ public void actionPerformed(final ActionEvent event)
+ {
+ Runnable runnable = new Runnable() {
+ public void run() {
+ String error = processButtonCallout((IProcessButton) event.getSource());
+ if (error != null && error.trim().length() > 0)
+ {
+ breadCrumb.setStatusLine(error, true);
+ return;
+ }
+ actionButton((IProcessButton) event.getSource());
+ }
+ };
+ BusyDialogTemplate template = new BusyDialogTemplate(runnable);
+ template.run();
+ }
+
+ /**************************************************************************
+ * Process Callout(s).
+ *
+ * The Callout is in the string of
+ * "class.method;class.method;"
+ * If there is no class name, i.e. only a method name, the class is regarded
+ * as CalloutSystem.
+ * The class needs to comply with the Interface Callout.
+ *
+ * @param field field
+ * @return error message or ""
+ * @see org.compiere.model.Callout
+ */
+ private String processButtonCallout (IProcessButton button)
+ {
+ IADTabpanel adtab = findADTabpanel(button);
+ if (adtab != null) {
+ GridField field = adtab.getGridTab().getField(button.getColumnName());
+ if (field != null)
+ return adtab.getGridTab().processCallout(field);
+ else
+ return "";
+ } else {
+ return "";
+ }
+ } // processButtonCallout
+
+ public IADTabpanel findADTabpanel(IProcessButton button) {
+ IADTabpanel adtab = null;
+ if (button.getADTabpanel() != null)
+ return button.getADTabpanel();
+
+ Component c = button instanceof WEditor ? ((WEditor)button).getComponent() : (Component)button;
+ while (c != null) {
+ if (c instanceof IADTabpanel) {
+ adtab = (IADTabpanel) c;
+ break;
+ }
+ c = c.getParent();
+ }
+ return adtab;
+ }
+
+ /**
+ *
+ * @return IADTab
+ */
+ public IADTabbox getADTab() {
+ return adTabbox;
+ }
+
+ /**
+ * @param pi
+ */
+ public void executeASync(ProcessInfo pi) {
+ }
+
+ /**
+ * @param pi
+ */
+ private void onModalClose(ProcessInfo pi) {
+ boolean notPrint = pi != null
+ && pi.getAD_Process_ID() != adTabbox.getSelectedGridTab().getAD_Process_ID()
+ && pi.isReportingProcess() == false;
+ //
+ // Process Result
+
+ if (Executions.getCurrent() != null)
+ {
+ if (notPrint) // refresh if not print
+ {
+ updateUI(pi);
+ }
+ }
+ else
+ {
+ try {
+ //acquire desktop, 2 second timeout
+ Executions.activate(getComponent().getDesktop(), 2000);
+ try {
+ if (notPrint) // refresh if not print
+ {
+ updateUI(pi);
+ }
+ } catch(Error ex){
+ throw ex;
+ } finally{
+ //release full control of desktop
+ Executions.deactivate(getComponent().getDesktop());
+ }
+ } catch (Exception e) {
+ logger.log(Level.WARNING, "Failed to update UI upon unlock.", e);
+ }
+ }
+ }
+
+ private void updateUI(ProcessInfo pi) {
+ // Timeout
+ if (pi.isTimeout()) // set temporarily to R/O
+ Env.setContext(ctx, curWindowNo, "Processed", "Y");
+ // Update Status Line
+ String summary = pi.getSummary();
+ if (summary != null && summary.indexOf('@') != -1)
+ pi.setSummary(Msg.parseTranslation(Env.getCtx(), summary));
+
+ // Get Log Info
+ ProcessInfoUtil.setLogFromDB(pi);
+ ProcessInfoLog m_logs[] = pi.getLogs();
+ breadCrumb.setStatusLine(pi.getSummary(), pi.isError(),m_logs);
+ if (m_logs != null) {
+ ProcessInfoDialog dialog = new ProcessInfoDialog(AEnv.getDialogHeader(ctx, curWindowNo),Env.getHeader(ctx, curWindowNo), m_logs);
+ dialog.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener() {
+ @Override
+ public void onEvent(Event event) throws Exception {
+ hideBusyMask();
+ }
+ });
+ showBusyMask();
+ getComponent().getParent().appendChild(dialog);
+ LayoutUtils.openOverlappedWindow(this.getComponent(),dialog,"middle_center");
+ }
+
+ }
+
+ /**
+ *
+ * @return toolbar instance
+ */
+ public ADWindowToolbar getToolbar() {
+ return toolbar;
+ }
+
+ /**
+ * @return active grid tab
+ */
+ public GridTab getActiveGridTab() {
+ return adTabbox.getSelectedGridTab();
+ }
+
+ /**
+ * @return windowNo
+ */
+ public int getWindowNo() {
+ return curWindowNo;
+ }
+
+ /**
+ * @see ToolbarListener#onCustomize()
+ */
+ public void onCustomize() {
+ ADTabpanel tabPanel = (ADTabpanel) getADTab().getSelectedTabpanel();
+ Columns columns = tabPanel.getGridView().getListbox().getColumns();
+ List columnList = columns.getChildren();
+ GridField[] fields = tabPanel.getGridView().getFields();
+ Map columnsWidth = new HashMap();
+ ArrayList gridFieldIds = new ArrayList();
+ for (int i = 0; i < fields.length; i++) {
+ Column column = (Column) columnList.get(i+1);
+ String width = column.getWidth();
+ columnsWidth.put(fields[i].getAD_Field_ID(), width);
+ gridFieldIds.add(fields[i].getAD_Field_ID());
+
+ }
+ CustomizeGridViewDialog.showCustomize(0, adTabbox.getSelectedGridTab().getAD_Tab_ID(), columnsWidth,gridFieldIds,tabPanel.getGridView());
+ }
+
+ /**
+ * @see org.adempiere.webui.event.ToolbarListener#onProcess()
+ */
+ @Override
+ public void onProcess() {
+ ProcessButtonPopup popup = new ProcessButtonPopup();
+ popup.setWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "processButtonPopup");
+ ADTabpanel adtab = (ADTabpanel) adTabbox.getSelectedTabpanel();
+ popup.render(adtab.getToolbarButtons());
+
+ LayoutUtils.openPopupWindow(toolbar.getButton("Process"), popup, "after_start");
+ }
+}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/DefaultCreateFromFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/DefaultCreateFromFactory.java
index d745d5960f..ee71e674c7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/DefaultCreateFromFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/DefaultCreateFromFactory.java
@@ -32,30 +32,21 @@ public class DefaultCreateFromFactory implements ICreateFromFactory
{
@Override
- public ICreateFrom create(GridTab mTab, String columnName)
+ public ICreateFrom create(GridTab mTab)
{
String tableName = mTab.getTableName();
- if (columnName.equals("CreateFrom"))
- {
- if (tableName.equals(I_C_Invoice.Table_Name))
- return new WCreateFromInvoiceUI(mTab);
- else if (tableName.equals(I_C_BankStatement.Table_Name))
-// return new WCreateFromStatementUI(mTab);
- return new WCreateFromStatementBatchUI(mTab);
- else if (tableName.equals(I_M_InOut.Table_Name))
- return new WCreateFromShipmentUI(mTab);
- else if (tableName.equals(I_M_RMA.Table_Name))
- return new WCreateFromRMAUI(mTab);
- else if (tableName.equals(I_M_PackageMPS.Table_Name))
- return new WCreateFromPackageShipmentUI(mTab);
- else if (tableName.equals(I_X_DepositBatch.Table_Name))
- return new WCreateFromDepositBatchUI(mTab);
- }
- else if (columnName.equalsIgnoreCase("X_CreateFromBatch"))
- {
- if (tableName.equals(I_C_BankStatement.Table_Name))
- return new WCreateFromBatchStatementUI(mTab);
- }
+ if (tableName.equals(I_C_Invoice.Table_Name))
+ return new WCreateFromInvoiceUI(mTab);
+ else if (tableName.equals(I_C_BankStatement.Table_Name))
+ return new WCreateFromStatementUI(mTab);
+ else if (tableName.equals(I_M_InOut.Table_Name))
+ return new WCreateFromShipmentUI(mTab);
+ else if (tableName.equals(I_M_RMA.Table_Name))
+ return new WCreateFromRMAUI(mTab);
+ else if (tableName.equals(I_M_PackageMPS.Table_Name))
+ return new WCreateFromPackageShipmentUI(mTab);
+ else if (tableName.equals(I_X_DepositBatch.Table_Name))
+ return new WCreateFromDepositBatchUI(mTab);
return null;
}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java
index 2b11a32429..6527b5b55c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java
@@ -22,13 +22,13 @@ import org.compiere.model.GridTab;
public class WCreateFromFactory
{
- public static ICreateFrom create (GridTab mTab, String columnName)
+ public static ICreateFrom create (GridTab mTab)
{
ICreateFrom createFrom = null;
List factories = Service.locator().list(ICreateFromFactory.class).getServices();
for (ICreateFromFactory factory : factories)
{
- createFrom = factory.create(mTab, columnName);
+ createFrom = factory.create(mTab);
if (createFrom != null)
break;
}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java
new file mode 100644
index 0000000000..b6380228ef
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java
@@ -0,0 +1,269 @@
+/******************************************************************************
+ * Copyright (C) 2013 Elaine Tan *
+ * Copyright (C) 2013 Trek Global
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms version 2 of the GNU General Public License as published *
+ * by the Free Software Foundation. This program is distributed in the hope *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
+ * See the GNU General Public License for more details. *
+ * You should have received a copy of the GNU General Public License along *
+ * with this program; if not, write to the Free Software Foundation, Inc., *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
+ *****************************************************************************/
+package org.adempiere.webui.apps.form;
+
+import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.ListModelTable;
+import org.adempiere.webui.component.ListboxFactory;
+import org.adempiere.webui.component.Panel;
+import org.adempiere.webui.component.WAppsAction;
+import org.adempiere.webui.component.WListbox;
+import org.adempiere.webui.event.DialogEvents;
+import org.adempiere.webui.event.WTableModelEvent;
+import org.adempiere.webui.event.WTableModelListener;
+import org.adempiere.webui.panel.ADForm;
+import org.adempiere.webui.panel.StatusBarPanel;
+import org.adempiere.webui.window.FDialog;
+import org.compiere.apps.form.CreateFromForm;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Trx;
+import org.compiere.util.TrxRunnable;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.util.Clients;
+import org.zkoss.zul.Borderlayout;
+import org.zkoss.zul.Center;
+import org.zkoss.zul.North;
+import org.zkoss.zul.Separator;
+import org.zkoss.zul.South;
+
+/**
+ *
+ * @author Elaine
+ *
+ */
+public class WCreateFromForm extends ADForm implements EventListener, WTableModelListener, DialogEvents
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3703236565441597403L;
+ private CreateFromForm form;
+
+ private Panel parameterPanel = new Panel();
+ private ConfirmPanel confirmPanel = new ConfirmPanel(true);
+ private StatusBarPanel statusBar = new StatusBarPanel();
+ private WListbox dataTable = ListboxFactory.newDataTable();
+
+ private boolean isCancel;
+
+ public static final String SELECT_ALL = "SelectAll";
+
+ public WCreateFromForm(CreateFromForm createFrom)
+ {
+ super();
+ this.form = createFrom;
+ }
+
+ protected void initForm()
+ {
+ try
+ {
+ zkInit();
+ confirmPanel.addActionListener(this);
+
+ statusBar.setStatusDB("");
+ tableChanged(null);
+ }
+ catch(Exception e)
+ {
+
+ }
+ }
+
+ protected void zkInit() throws Exception
+ {
+ Borderlayout contentPane = new Borderlayout();
+ appendChild(contentPane);
+
+ North north = new North();
+ contentPane.appendChild(north);
+ north.appendChild(parameterPanel);
+
+ Center center = new Center();
+ contentPane.appendChild(center);
+ center.appendChild(dataTable);
+
+ WAppsAction selectAllAction = new WAppsAction (SELECT_ALL, null, null);
+ Button selectAllButton = selectAllAction.getButton();
+ confirmPanel.addComponentsLeft(selectAllButton);
+ selectAllButton.addActionListener(this);
+
+ South south = new South();
+ contentPane.appendChild(south);
+ Panel southPanel = new Panel();
+ south.appendChild(southPanel);
+ southPanel.appendChild(new Separator());
+ southPanel.appendChild(confirmPanel);
+
+ southPanel.appendChild(new Separator());
+ southPanel.appendChild(statusBar);
+
+ setWidth("750px");
+ setHeight("550px");
+ setSizable(true);
+ setBorder("normal");
+ contentPane.setWidth("100%");
+ contentPane.setHeight("100%");
+ }
+
+ public void onEvent(Event e) throws Exception
+ {
+ // OK - Save
+ if (e.getTarget().getId().equals(ConfirmPanel.A_OK))
+ {
+ isCancel = false;
+ try
+ {
+ Trx.run(new TrxRunnable()
+ {
+ public void run(String trxName)
+ {
+ save(trxName);
+ }
+ });
+ dispose();
+ }
+ catch (Exception ex)
+ {
+ FDialog.error(getWindowNo(), this, "Error", ex.getLocalizedMessage());
+ }
+ }
+ // Cancel
+ else if (e.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
+ {
+ isCancel = true;
+ dispose();
+ }
+ // Select All
+ // Trifon
+ else if (e.getTarget().getId().equals(SELECT_ALL)) {
+ ListModelTable model = dataTable.getModel();
+ int rows = model.getSize();
+ for (int i = 0; i < rows; i++)
+ {
+ model.setValueAt(new Boolean(true), i, 0);
+ }
+ //refresh
+ dataTable.setModel(model);
+ info();
+ }
+ }
+
+ public void tableChanged (WTableModelEvent e)
+ {
+ int type = -1;
+ if (e != null)
+ {
+ type = e.getType();
+ if (type != WTableModelEvent.CONTENTS_CHANGED)
+ return;
+ }
+ info();
+ }
+
+ public boolean save(String trxName)
+ {
+ ListModelTable model = dataTable.getModel();
+ int rows = model.getSize();
+ if (rows == 0)
+ return false;
+
+ return form.save(dataTable, trxName, getGridTab());
+ }
+
+ public void info()
+ {
+ ListModelTable model = dataTable.getModel();
+ int rows = model.getRowCount();
+ int count = 0;
+ for (int i = 0; i < rows; i++)
+ {
+ if (((Boolean) model.getValueAt(i, 0)).booleanValue())
+ count++;
+ }
+ setStatusLine(count, null);
+
+ form.info(dataTable, statusBar);
+ }
+
+ public void setStatusLine(int selectedRowCount, String text)
+ {
+ StringBuilder sb = new StringBuilder(String.valueOf(selectedRowCount));
+ if (text != null && text.trim().length() > 0) {
+ sb.append(" - ").append(text);
+ }
+ statusBar.setStatusLine(sb.toString());
+ //
+ confirmPanel.getOKButton().setEnabled(selectedRowCount > 0);
+ }
+
+ public WListbox getWListbox()
+ {
+ return dataTable;
+ }
+
+ public Panel getParameterPanel()
+ {
+ return parameterPanel;
+ }
+
+ public ConfirmPanel getConfirmPanel()
+ {
+ return confirmPanel;
+ }
+
+ public boolean isCancel()
+ {
+ return isCancel;
+ }
+
+ public void postQueryEvent()
+ {
+ Clients.showBusy(Msg.getMsg(Env.getCtx(), "Processing"));
+ Events.echoEvent("onExecuteQuery", this, null);
+ }
+
+ /**
+ * Dont call this directly, use internally to handle execute query event
+ */
+ public void onExecuteQuery()
+ {
+ try
+ {
+ form.executeQuery();
+ }
+ finally
+ {
+ Clients.clearBusy();
+ }
+ }
+
+ @Override
+ public Mode getWindowMode() {
+ return Mode.HIGHLIGHTED;
+ }
+
+ @Override
+ public boolean setVisible(boolean visible) {
+ boolean ok = super.setVisible(visible);
+ if (visible && getProcessInfo() != null)
+ form.initForm();
+ return ok;
+ }
+}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementBatchUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementBatchUI.java
deleted file mode 100644
index e0b9e0d8f7..0000000000
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementBatchUI.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2013 Elaine Tan *
- * Copyright (C) 2013 Trek Global
- * This program is free software; you can redistribute it and/or modify it *
- * under the terms version 2 of the GNU General Public License as published *
- * by the Free Software Foundation. This program is distributed in the hope *
- * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
- * See the GNU General Public License for more details. *
- * You should have received a copy of the GNU General Public License along *
- * with this program; if not, write to the Free Software Foundation, Inc., *
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
- *****************************************************************************/
-package org.adempiere.webui.apps.form;
-
-import static org.compiere.model.SystemIDs.COLUMN_C_BANKSTATEMENT_C_BANKACCOUNT_ID;
-
-import java.sql.Timestamp;
-import java.util.Vector;
-import java.util.logging.Level;
-
-import org.adempiere.webui.apps.AEnv;
-import org.adempiere.webui.component.Button;
-import org.adempiere.webui.component.Column;
-import org.adempiere.webui.component.Columns;
-import org.adempiere.webui.component.ConfirmPanel;
-import org.adempiere.webui.component.Grid;
-import org.adempiere.webui.component.GridFactory;
-import org.adempiere.webui.component.Label;
-import org.adempiere.webui.component.ListModelTable;
-import org.adempiere.webui.component.Panel;
-import org.adempiere.webui.component.Row;
-import org.adempiere.webui.component.Rows;
-import org.adempiere.webui.editor.WDateEditor;
-import org.adempiere.webui.editor.WEditor;
-import org.adempiere.webui.editor.WNumberEditor;
-import org.adempiere.webui.editor.WSearchEditor;
-import org.adempiere.webui.editor.WStringEditor;
-import org.adempiere.webui.editor.WTableDirEditor;
-import org.adempiere.webui.window.FDialog;
-import org.compiere.grid.CreateFromStatementBatch;
-import org.compiere.model.GridTab;
-import org.compiere.model.MBankStatement;
-import org.compiere.model.MColumn;
-import org.compiere.model.MLookup;
-import org.compiere.model.MLookupFactory;
-import org.compiere.model.MPayment;
-import org.compiere.util.CLogger;
-import org.compiere.util.DisplayType;
-import org.compiere.util.Env;
-import org.compiere.util.Msg;
-import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zk.ui.event.EventListener;
-import org.zkoss.zk.ui.event.Events;
-import org.zkoss.zul.Borderlayout;
-import org.zkoss.zul.Center;
-import org.zkoss.zul.Hbox;
-
-/**
- *
- * @author Elaine
- *
- */
-public class WCreateFromStatementBatchUI extends CreateFromStatementBatch implements EventListener
-{
- private WCreateFromWindow window;
-
- public WCreateFromStatementBatchUI(GridTab tab)
- {
- super(tab);
- log.info(getGridTab().toString());
-
- window = new WCreateFromWindow(this, getGridTab().getWindowNo());
-
- p_WindowNo = getGridTab().getWindowNo();
-
- try
- {
- if (!dynInit())
- return;
- zkInit();
- setInitOK(true);
- }
- catch(Exception e)
- {
- log.log(Level.SEVERE, "", e);
- setInitOK(false);
- }
- AEnv.showWindow(window);
- }
-
- /** Window No */
- private int p_WindowNo;
-
- /** Logger */
- private CLogger log = CLogger.getCLogger(getClass());
-
- protected Label bankAccountLabel = new Label();
- protected WTableDirEditor bankAccountField;
-
- protected Label documentNoLabel = new Label(Msg.translate(Env.getCtx(), "DocumentNo"));
- protected WStringEditor documentNoField = new WStringEditor();
-
- protected Label documentTypeLabel = new Label();
- protected WTableDirEditor documentTypeField;
-
- protected Label authorizationLabel = new Label();
- protected WStringEditor authorizationField = new WStringEditor();
-
- protected Label tenderTypeLabel = new Label();
- protected WTableDirEditor tenderTypeField;
-
- protected Label amtFromLabel = new Label(Msg.translate(Env.getCtx(), "PayAmt"));
- protected WNumberEditor amtFromField = new WNumberEditor("AmtFrom", false, false, true, DisplayType.Amount, Msg.translate(Env.getCtx(), "AmtFrom"));
- protected Label amtToLabel = new Label("-");
- protected WNumberEditor amtToField = new WNumberEditor("AmtTo", false, false, true, DisplayType.Amount, Msg.translate(Env.getCtx(), "AmtTo"));
-
- protected Label BPartner_idLabel = new Label(Msg.translate(Env.getCtx(), "BPartner"));
- protected WEditor bPartnerLookup;
-
- protected Label dateFromLabel = new Label(Msg.translate(Env.getCtx(), "DateTrx"));
- protected WDateEditor dateFromField = new WDateEditor("DateFrom", false, false, true, Msg.translate(Env.getCtx(), "DateFrom"));
- protected Label dateToLabel = new Label("-");
- protected WDateEditor dateToField = new WDateEditor("DateTo", false, false, true, Msg.translate(Env.getCtx(), "DateTo"));
-
- /**
- * Dynamic Init
- * @throws Exception if Lookups cannot be initialized
- * @return true if initialized
- */
- public boolean dynInit() throws Exception
- {
- log.config("");
-
- super.dynInit();
-
- //Refresh button
- Button refreshButton = window.getConfirmPanel().createButton(ConfirmPanel.A_REFRESH);
- refreshButton.addEventListener(Events.ON_CLICK, this);
- window.getConfirmPanel().addButton(refreshButton);
-
- if (getGridTab().getValue("C_BankStatement_ID") == null)
- {
- FDialog.error(0, window, "SaveErrorRowNotFound");
- return false;
- }
-
- window.setTitle(getTitle());
-
- int AD_Column_ID = COLUMN_C_BANKSTATEMENT_C_BANKACCOUNT_ID; // C_BankStatement.C_BankAccount_ID
- MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
- bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup);
- // Set Default
- int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID");
- bankAccountField.setValue(new Integer(C_BankAccount_ID));
- // initial Loading
- authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null);
- authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this);
-
- lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_C_DocType_ID), DisplayType.TableDir);
- documentTypeField = new WTableDirEditor (MPayment.COLUMNNAME_C_DocType_ID,false,false,true,lookup);
- documentTypeField.getComponent().addEventListener(Events.ON_CHANGE, this);
-
- lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_TenderType), DisplayType.List);
- tenderTypeField = new WTableDirEditor (MPayment.COLUMNNAME_TenderType,false,false,true,lookup);
- tenderTypeField.getComponent().addEventListener(Events.ON_CHANGE, this);
-
- lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, 3499, DisplayType.Search);
- bPartnerLookup = new WSearchEditor ("C_BPartner_ID", false, false, true, lookup);
-
- Timestamp date = Env.getContextAsDate(Env.getCtx(), p_WindowNo, MBankStatement.COLUMNNAME_StatementDate);
- dateToField.setValue(date);
-
- loadBankAccount();
-
- return true;
- } // dynInit
-
- protected void zkInit() throws Exception
- {
- bankAccountLabel.setText(Msg.translate(Env.getCtx(), "C_BankAccount_ID"));
- authorizationLabel.setText(Msg.translate(Env.getCtx(), "R_AuthCode"));
-
- documentTypeLabel.setText(Msg.translate(Env.getCtx(), "C_DocType_ID"));
- tenderTypeLabel.setText(Msg.translate(Env.getCtx(), "TenderType"));
-
- dateFromField.getComponent().setTooltiptext(Msg.translate(Env.getCtx(), "DateFrom"));
- dateToField.getComponent().setTooltiptext(Msg.translate(Env.getCtx(), "DateTo"));
-
- amtFromField.getComponent().setTooltiptext(Msg.translate(Env.getCtx(), "AmtFrom"));
- amtToField.getComponent().setTooltiptext(Msg.translate(Env.getCtx(), "AmtTo"));
-
- Borderlayout parameterLayout = new Borderlayout();
- parameterLayout.setHeight("130px");
- parameterLayout.setWidth("100%");
- Panel parameterPanel = window.getParameterPanel();
- parameterPanel.appendChild(parameterLayout);
-
- Grid parameterBankLayout = GridFactory.newGridLayout();
- Panel parameterBankPanel = new Panel();
- parameterBankPanel.appendChild(parameterBankLayout);
-
- Center center = new Center();
- parameterLayout.appendChild(center);
- center.appendChild(parameterBankPanel);
-
- Columns columns = new Columns();
- parameterBankLayout.appendChild(columns);
- Column column = new Column();
- columns.appendChild(column);
- column = new Column();
- column.setWidth("15%");
- columns.appendChild(column);
- column.setWidth("35%");
- column = new Column();
- column.setWidth("15%");
- columns.appendChild(column);
- column = new Column();
- column.setWidth("35%");
- columns.appendChild(column);
-
- Rows rows = (Rows) parameterBankLayout.newRows();
- Row row = rows.newRow();
- row.appendChild(bankAccountLabel.rightAlign());
- row.appendChild(bankAccountField.getComponent());
- row.appendChild(documentNoLabel.rightAlign());
- row.appendChild(documentNoField.getComponent());
-
- row = rows.newRow();
- row.appendChild(documentTypeLabel.rightAlign());
- row.appendChild(documentTypeField.getComponent());
- row.appendChild(authorizationLabel.rightAlign());
- row.appendChild(authorizationField.getComponent());
-
- row = rows.newRow();
- row.appendChild(tenderTypeLabel.rightAlign());
- row.appendChild(tenderTypeField.getComponent());
-
- row.appendChild(amtFromLabel.rightAlign());
- Hbox hbox = new Hbox();
- hbox.appendChild(amtFromField.getComponent());
- hbox.appendChild(amtToLabel.rightAlign());
- hbox.appendChild(amtToField.getComponent());
- row.appendChild(hbox);
-
- row = rows.newRow();
- row.appendChild(BPartner_idLabel.rightAlign());
- row.appendChild(bPartnerLookup.getComponent());
- row.appendChild(dateFromLabel.rightAlign());
-
- hbox = new Hbox();
- hbox.appendChild(dateFromField.getComponent());
- hbox.appendChild(dateToLabel.rightAlign());
- hbox.appendChild(dateToField.getComponent());
- row.appendChild(hbox);
- }
-
- /**
- * Action Listener
- * @param e event
- * @throws Exception
- */
- public void onEvent(Event e) throws Exception
- {
- log.config("Action=" + e.getTarget().getId());
- if(e.getTarget().equals(window.getConfirmPanel().getButton(ConfirmPanel.A_REFRESH)))
- {
- loadBankAccount();
- window.tableChanged(null);
- }
- }
-
- protected void loadBankAccount()
- {
- loadTableOIS(getBankAccountData(bankAccountField.getValue(), bPartnerLookup.getValue(),
- documentNoField.getValue().toString(), dateFromField.getValue(), dateToField.getValue(),
- amtFromField.getValue(), amtToField.getValue(),
- documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getValue().toString()));
- }
-
- protected void loadTableOIS (Vector data)
- {
- window.getWListbox().clear();
-
- // Remove previous listeners
- window.getWListbox().getModel().removeTableModelListener(window);
- // Set Model
- ListModelTable model = new ListModelTable(data);
- model.addTableModelListener(window);
- window.getWListbox().setData(model, getOISColumnNames());
- //
-
- configureMiniTable(window.getWListbox());
- }
-
- public void showWindow()
- {
- window.setVisible(true);
- }
-
- public void closeWindow()
- {
- window.dispose();
- }
-
- @Override
- public Object getWindow()
- {
- return window;
- }
-}
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
index ec1a025f62..64ad256cf6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
@@ -1,6 +1,6 @@
/******************************************************************************
- * Copyright (C) 2009 Low Heng Sin *
- * Copyright (C) 2009 Idalica Corporation *
+ * Copyright (C) 2013 Elaine Tan *
+ * Copyright (C) 2013 Trek Global
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
@@ -21,6 +21,8 @@ import java.util.logging.Level;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.Column;
+import org.adempiere.webui.component.Columns;
import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.GridFactory;
@@ -38,7 +40,6 @@ import org.adempiere.webui.editor.WTableDirEditor;
import org.adempiere.webui.window.FDialog;
import org.compiere.grid.CreateFromStatement;
import org.compiere.model.GridTab;
-import org.compiere.model.MBankAccount;
import org.compiere.model.MBankStatement;
import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
@@ -55,6 +56,11 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Hbox;
+/**
+ *
+ * @author Elaine
+ *
+ */
public class WCreateFromStatementUI extends CreateFromStatement implements EventListener
{
private WCreateFromWindow window;
@@ -88,7 +94,7 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
/** Logger */
private CLogger log = CLogger.getCLogger(getClass());
-
+
protected Label bankAccountLabel = new Label();
protected WTableDirEditor bankAccountField;
@@ -164,8 +170,6 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
Timestamp date = Env.getContextAsDate(Env.getCtx(), p_WindowNo, MBankStatement.COLUMNNAME_StatementDate);
dateToField.setValue(date);
-
- bankAccount = new MBankAccount(Env.getCtx(), C_BankAccount_ID, null);
loadBankAccount();
@@ -187,7 +191,7 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
amtToField.getComponent().setTooltiptext(Msg.translate(Env.getCtx(), "AmtTo"));
Borderlayout parameterLayout = new Borderlayout();
- parameterLayout.setHeight("110px");
+ parameterLayout.setHeight("130px");
parameterLayout.setWidth("100%");
Panel parameterPanel = window.getParameterPanel();
parameterPanel.appendChild(parameterLayout);
@@ -200,6 +204,21 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
parameterLayout.appendChild(center);
center.appendChild(parameterBankPanel);
+ Columns columns = new Columns();
+ parameterBankLayout.appendChild(columns);
+ Column column = new Column();
+ columns.appendChild(column);
+ column = new Column();
+ column.setWidth("15%");
+ columns.appendChild(column);
+ column.setWidth("35%");
+ column = new Column();
+ column.setWidth("15%");
+ columns.appendChild(column);
+ column = new Column();
+ column.setWidth("35%");
+ columns.appendChild(column);
+
Rows rows = (Rows) parameterBankLayout.newRows();
Row row = rows.newRow();
row.appendChild(bankAccountLabel.rightAlign());
@@ -253,9 +272,10 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
protected void loadBankAccount()
{
- loadTableOIS(getBankData(documentNoField.getValue().toString(), bPartnerLookup.getValue(), dateFromField.getValue(), dateToField.getValue(),
- amtFromField.getValue(), amtToField.getValue(), documentTypeField.getValue(), tenderTypeField.getValue(),
- authorizationField.getValue().toString()));
+ loadTableOIS(getBankAccountData(bankAccountField.getValue(), bPartnerLookup.getValue(),
+ documentNoField.getValue().toString(), dateFromField.getValue(), dateToField.getValue(),
+ amtFromField.getValue(), amtToField.getValue(),
+ documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getValue().toString()));
}
protected void loadTableOIS (Vector data)
@@ -284,7 +304,8 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
}
@Override
- public Object getWindow() {
+ public Object getWindow()
+ {
return window;
}
-}
+}
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromBatchStatementUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java
similarity index 84%
rename from org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromBatchStatementUI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java
index 20f2dc3582..91c2ea78f3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromBatchStatementUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java
@@ -19,7 +19,6 @@ import java.sql.Timestamp;
import java.util.Vector;
import java.util.logging.Level;
-import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.Column;
import org.adempiere.webui.component.Columns;
@@ -37,9 +36,10 @@ import org.adempiere.webui.editor.WNumberEditor;
import org.adempiere.webui.editor.WSearchEditor;
import org.adempiere.webui.editor.WStringEditor;
import org.adempiere.webui.editor.WTableDirEditor;
+import org.adempiere.webui.panel.ADForm;
+import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.window.FDialog;
-import org.compiere.grid.CreateFromBatchStatement;
-import org.compiere.model.GridTab;
+import org.compiere.apps.form.StatementCreateFromBatch;
import org.compiere.model.MBankStatement;
import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
@@ -61,32 +61,28 @@ import org.zkoss.zul.Hbox;
* @author Elaine
*
*/
-public class WCreateFromBatchStatementUI extends CreateFromBatchStatement implements EventListener
+public class WStatementCreateFromBatch extends StatementCreateFromBatch implements IFormController, EventListener
{
- private WCreateFromWindow window;
+ private WCreateFromForm form;
- public WCreateFromBatchStatementUI(GridTab tab)
+ public WStatementCreateFromBatch()
+ {
+ form = new WCreateFromForm(this);
+ p_WindowNo = form.getWindowNo();
+ }
+
+ public void initForm()
{
- super(tab);
- log.info(getGridTab().toString());
-
- window = new WCreateFromWindow(this, getGridTab().getWindowNo());
-
- p_WindowNo = getGridTab().getWindowNo();
-
try
{
if (!dynInit())
return;
zkInit();
- setInitOK(true);
}
catch(Exception e)
{
log.log(Level.SEVERE, "", e);
- setInitOK(false);
}
- AEnv.showWindow(window);
}
/** Window No */
@@ -130,22 +126,22 @@ public class WCreateFromBatchStatementUI extends CreateFromBatchStatement implem
*/
public boolean dynInit() throws Exception
{
- log.config("");
-
super.dynInit();
+ log.config("");
+
//Refresh button
- Button refreshButton = window.getConfirmPanel().createButton(ConfirmPanel.A_REFRESH);
+ Button refreshButton = form.getConfirmPanel().createButton(ConfirmPanel.A_REFRESH);
refreshButton.addEventListener(Events.ON_CLICK, this);
- window.getConfirmPanel().addButton(refreshButton);
-
- if (getGridTab().getValue("C_BankStatement_ID") == null)
+ form.getConfirmPanel().addButton(refreshButton);
+
+ if (form.getGridTab() != null && form.getGridTab().getValue("C_BankStatement_ID") == null)
{
- FDialog.error(0, window, "SaveErrorRowNotFound");
+ FDialog.error(0, form, "SaveErrorRowNotFound");
return false;
}
- window.setTitle(getTitle());
+ form.setTitle(getTitle());
int AD_Column_ID = COLUMN_C_BANKSTATEMENT_C_BANKACCOUNT_ID; // C_BankStatement.C_BankAccount_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
@@ -171,7 +167,7 @@ public class WCreateFromBatchStatementUI extends CreateFromBatchStatement implem
Timestamp date = Env.getContextAsDate(Env.getCtx(), p_WindowNo, MBankStatement.COLUMNNAME_StatementDate);
dateToField.setValue(date);
- loadBankAccount();
+ form.postQueryEvent();
return true;
} // dynInit
@@ -193,7 +189,7 @@ public class WCreateFromBatchStatementUI extends CreateFromBatchStatement implem
Borderlayout parameterLayout = new Borderlayout();
parameterLayout.setHeight("130px");
parameterLayout.setWidth("100%");
- Panel parameterPanel = window.getParameterPanel();
+ Panel parameterPanel = form.getParameterPanel();
parameterPanel.appendChild(parameterLayout);
Grid parameterBankLayout = GridFactory.newGridLayout();
@@ -263,48 +259,39 @@ public class WCreateFromBatchStatementUI extends CreateFromBatchStatement implem
public void onEvent(Event e) throws Exception
{
log.config("Action=" + e.getTarget().getId());
- if(e.getTarget().equals(window.getConfirmPanel().getButton(ConfirmPanel.A_REFRESH)))
+ if(e.getTarget().equals(form.getConfirmPanel().getButton(ConfirmPanel.A_REFRESH)))
{
- loadBankAccount();
- window.tableChanged(null);
+ form.postQueryEvent();
+ form.tableChanged(null);
}
}
- protected void loadBankAccount()
+ public void executeQuery()
{
loadTableOIS(getBankAccountData(bankAccountField.getValue(), bPartnerLookup.getValue(),
documentNoField.getValue().toString(), dateFromField.getValue(), dateToField.getValue(),
amtFromField.getValue(), amtToField.getValue(),
- documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getValue().toString()));
+ documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getValue().toString(),
+ form.getGridTab()));
}
protected void loadTableOIS (Vector data)
{
- window.getWListbox().clear();
+ form.getWListbox().clear();
// Remove previous listeners
- window.getWListbox().getModel().removeTableModelListener(window);
+ form.getWListbox().getModel().removeTableModelListener(form);
// Set Model
ListModelTable model = new ListModelTable(data);
- model.addTableModelListener(window);
- window.getWListbox().setData(model, getOISColumnNames());
+ model.addTableModelListener(form);
+ form.getWListbox().setData(model, getOISColumnNames());
//
- configureMiniTable(window.getWListbox());
+ configureMiniTable(form.getWListbox());
}
- public void showWindow()
+ public ADForm getForm()
{
- window.setVisible(true);
- }
-
- public void closeWindow()
- {
- window.dispose();
- }
-
- @Override
- public Object getWindow() {
- return window;
+ return form;
}
}
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
index c59b70f6fa..91a41af1b1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
@@ -98,6 +98,8 @@ public class DashboardController implements EventListener {
private DashboardRunnable dashboardRunnable;
private ScheduledFuture dashboardFuture;
+ private final static int DEFAULT_DASHBOARD_WIDTH = 95;
+
public DashboardController() {
dashboardLayout = new Anchorlayout();
dashboardLayout.setSclass("dashboard-layout");
@@ -141,9 +143,9 @@ public class DashboardController implements EventListener {
dps = MDashboardPreference.getForSession(isShowInDashboard, AD_User_ID, AD_Role_ID); // based on user and role
noOfCols = MDashboardPreference.getForSessionColumnCount(isShowInDashboard, AD_User_ID, AD_Role_ID);
- int dashboardWidth = isShowInDashboard ? 95 : 100;
+ int dashboardWidth = isShowInDashboard ? DEFAULT_DASHBOARD_WIDTH : 100;
width = noOfCols <= 0 ? dashboardWidth : dashboardWidth / noOfCols;
- int useWidth = 0;
+ int extraWidth = 100 - (noOfCols <= 0 ? dashboardWidth : width * noOfCols) - (100 - dashboardWidth - 1);
for (final MDashboardPreference dp : dps)
{
MDashboardContent dc = new MDashboardContent(dp.getCtx(), dp.getPA_DashboardContent_ID(), dp.get_TrxName());
@@ -151,19 +153,12 @@ public class DashboardController implements EventListener {
int columnNo = dp.getColumnNo();
if(dashboardColumnLayout == null || currentColumnNo != columnNo)
{
- int anchorWidth = width;
- if (columnNo == noOfCols) {
- anchorWidth = 100 - useWidth;
- } else {
- useWidth = useWidth + width;
- }
-
dashboardColumnLayout = new Vlayout();
dashboardColumnLayout.setAttribute("ColumnNo", columnNo);
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", false);
Anchorchildren dashboardColumn = new Anchorchildren();
- dashboardColumn.setAnchor(anchorWidth + "%" + " 100%");
+ dashboardColumn.setAnchor(width + "%" + " 100%");
dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout);
@@ -381,9 +376,9 @@ public class DashboardController implements EventListener {
dashboardColumnLayout = new Vlayout();
dashboardColumnLayout.setAttribute("ColumnNo", "0");
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
- dashboardColumnLayout.setAttribute("IsAdditionalColumn", false);
+ dashboardColumnLayout.setAttribute("IsAdditionalColumn", true);
Anchorchildren dashboardColumn = new Anchorchildren();
- dashboardColumn.setAnchor((width-2) + "%" + " 100%");
+ dashboardColumn.setAnchor((width-5) + "%" + " 100%");
dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout);
@@ -400,7 +395,7 @@ public class DashboardController implements EventListener {
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", true);
Anchorchildren dashboardColumn = new Anchorchildren();
- dashboardColumn.setAnchor("1% 100%");
+ dashboardColumn.setAnchor(extraWidth + "% 100%");
dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout);
@@ -593,10 +588,12 @@ public class DashboardController implements EventListener {
layout.setAttribute("IsAdditionalColumn", false);
int noOfCols = columnList.size();
- int width = noOfCols <= 0 ? 100 : (100-1) / noOfCols;
+ int dashboardWidth = DEFAULT_DASHBOARD_WIDTH;
+ int width = noOfCols <= 0 ? dashboardWidth : dashboardWidth / noOfCols;
+ int extraWidth = 100 - (noOfCols <= 0 ? dashboardWidth : width * noOfCols) - (100 - dashboardWidth - 1);
for (Anchorchildren column : columnList)
- column.setAnchor((width-2) + "%" + " 100%");
+ column.setAnchor(width + "%" + " 100%");
// additional column
Vlayout dashboardColumnLayout = new Vlayout();
@@ -604,7 +601,7 @@ public class DashboardController implements EventListener {
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", true);
Anchorchildren dashboardColumn = new Anchorchildren();
- dashboardColumn.setAnchor("1% 100%");
+ dashboardColumn.setAnchor(extraWidth + "% 100%");
dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
index bb2adfa8f4..62249cf9a8 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
@@ -24,6 +24,7 @@ import org.adempiere.webui.component.Window;
import org.adempiere.webui.exception.ApplicationException;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.ADClassNameMap;
+import org.compiere.model.GridTab;
import org.compiere.model.MForm;
import org.compiere.process.ProcessInfo;
import org.compiere.util.CLogger;
@@ -46,7 +47,7 @@ public abstract class ADForm extends Window implements EventListener
private static final long serialVersionUID = -5183711788893823434L;
/** The class' logging enabler */
protected static final CLogger logger;
-
+
static
{
logger = CLogger.getCLogger(ADForm.class);
@@ -286,6 +287,11 @@ public abstract class ADForm extends Window implements EventListener
* @return The created form
*/
public static ADForm openForm (int adFormID)
+ {
+ return openForm(adFormID, null);
+ }
+
+ public static ADForm openForm (int adFormID, GridTab gridTab)
{
Object obj = null;
ADForm form;
@@ -337,6 +343,7 @@ public abstract class ADForm extends Window implements EventListener
if (obj instanceof ADForm)
{
form = (ADForm)obj;
+ form.gridTab = gridTab;
form.init(adFormID, name);
return form;
}
@@ -344,6 +351,7 @@ public abstract class ADForm extends Window implements EventListener
{
IFormController customForm = (IFormController)obj;
form = customForm.getForm();
+ form.gridTab = gridTab;
form.setICustomForm(customForm);
form.init(adFormID, name);
return form;
@@ -405,4 +413,11 @@ public abstract class ADForm extends Window implements EventListener
public Mode getWindowMode() {
return Mode.EMBEDDED;
}
+
+ private GridTab gridTab;
+
+ public GridTab getGridTab()
+ {
+ return gridTab;
+ }
}
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/CreateFromForm.java b/org.adempiere.ui/src/org/compiere/apps/form/CreateFromForm.java
new file mode 100644
index 0000000000..e50bc87179
--- /dev/null
+++ b/org.adempiere.ui/src/org/compiere/apps/form/CreateFromForm.java
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * Copyright (C) 2013 Elaine Tan *
+ * Copyright (C) 2013 Trek Global
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms version 2 of the GNU General Public License as published *
+ * by the Free Software Foundation. This program is distributed in the hope *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
+ * See the GNU General Public License for more details. *
+ * You should have received a copy of the GNU General Public License along *
+ * with this program; if not, write to the Free Software Foundation, Inc., *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
+ *****************************************************************************/
+package org.compiere.apps.form;
+
+import org.compiere.apps.IStatusBar;
+import org.compiere.minigrid.IMiniTable;
+import org.compiere.model.GridTab;
+import org.compiere.util.CLogger;
+
+/**
+ *
+ * @author Elaine
+ *
+ */
+public abstract class CreateFromForm
+{
+ /** Logger */
+ protected CLogger log = CLogger.getCLogger(getClass());
+
+ private String title;
+
+ public abstract void initForm();
+
+ public abstract boolean dynInit() throws Exception;
+
+ public abstract void info(IMiniTable miniTable, IStatusBar statusBar);
+
+ public abstract boolean save(IMiniTable miniTable, String trxName, GridTab gridTab);
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public abstract void executeQuery();
+}
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromBatchStatement.java b/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java
similarity index 59%
rename from org.adempiere.ui/src/org/compiere/grid/CreateFromBatchStatement.java
rename to org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java
index 5e7b888362..a253ab30fa 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromBatchStatement.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java
@@ -11,22 +11,26 @@
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
-package org.compiere.grid;
+package org.compiere.apps.form;
import java.math.BigDecimal;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
+import java.text.DecimalFormat;
import java.util.Vector;
import java.util.logging.Level;
+import org.compiere.apps.IStatusBar;
import org.compiere.minigrid.IMiniTable;
import org.compiere.model.GridTab;
import org.compiere.model.MBankStatement;
import org.compiere.model.MBankStatementLine;
import org.compiere.model.MPayment;
+import org.compiere.util.CLogger;
import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
@@ -36,24 +40,142 @@ import org.compiere.util.Msg;
* @author Elaine
*
*/
-public abstract class CreateFromBatchStatement extends CreateFromBatch
+public abstract class StatementCreateFromBatch extends CreateFromForm
{
- public CreateFromBatchStatement(GridTab mTab)
- {
- super(mTab);
- log.info(mTab.toString());
- }
-
+ /** Logger */
+ protected CLogger log = CLogger.getCLogger(getClass());
+
public boolean dynInit() throws Exception
{
log.config("");
- setTitle(Msg.getElement(Env.getCtx(), "C_BankStatement_ID") + " .. " + Msg.translate(Env.getCtx(), "X_CreateFromBatch"));
-
+ setTitle(Msg.getElement(Env.getCtx(), "C_BankStatement_ID") + " .. " + Msg.getElement(Env.getCtx(), "X_CreateFromBatch"));
+
return true;
}
+
+ public String getSQLWhere(Object BPartner, String DocumentNo, Object DateFrom, Object DateTo,
+ Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode)
+ {
+ StringBuilder sql = new StringBuilder();
+ sql.append("WHERE p.Processed='Y' AND p.IsReconciled='N'");
+ sql.append(" AND p.DocStatus IN ('CO','CL','RE','VO') AND p.PayAmt<>0");
+ sql.append(" AND p.C_BankAccount_ID = ?");
+ sql.append(" AND NOT EXISTS (SELECT * FROM C_BankStatementLine l WHERE p.C_Payment_ID=l.C_Payment_ID AND l.StmtAmt <> 0)");
+
+ if(DocType != null)
+ sql.append(" AND p.C_DocType_ID=?");
+ if(TenderType != null && TenderType.toString().length() > 0)
+ sql.append(" AND p.TenderType=?");
+ if(BPartner != null)
+ sql.append(" AND p.C_BPartner_ID=?");
+
+ if(DocumentNo.length() > 0)
+ sql.append(" AND UPPER(p.DocumentNo) LIKE ?");
+ if(AuthCode.length() > 0)
+ sql.append(" AND p.R_AuthCode LIKE ?");
+
+ if(AmtFrom != null || AmtTo != null)
+ {
+ BigDecimal from = (BigDecimal) AmtFrom;
+ BigDecimal to = (BigDecimal) AmtTo;
+ if(from == null && to != null)
+ sql.append(" AND p.PayAmt <= ?");
+ else if(from != null && to == null)
+ sql.append(" AND p.PayAmt >= ?");
+ else if(from != null && to != null)
+ sql.append(" AND p.PayAmt BETWEEN ? AND ?");
+ }
+
+ if(DateFrom != null || DateTo != null)
+ {
+ Timestamp from = (Timestamp) DateFrom;
+ Timestamp to = (Timestamp) DateTo;
+ if(from == null && to != null)
+ sql.append(" AND TRUNC(p.DateTrx) <= ?");
+ else if(from != null && to == null)
+ sql.append(" AND TRUNC(p.DateTrx) >= ?");
+ else if(from != null && to != null)
+ sql.append(" AND TRUNC(p.DateTrx) BETWEEN ? AND ?");
+ }
+
+ log.fine(sql.toString());
+ return sql.toString();
+ }
+
+ void setParameters(PreparedStatement pstmt, Object BankAccount, Object BPartner, String DocumentNo, Object DateFrom, Object DateTo,
+ Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode, GridTab gridTab)
+ throws SQLException
+ {
+ // Get StatementDate
+ Timestamp ts = (Timestamp) gridTab.getValue("StatementDate");
+ if (ts == null)
+ ts = new Timestamp(System.currentTimeMillis());
+
+ int index = 1;
+
+ pstmt.setTimestamp(index++, ts);
+ pstmt.setInt(index++, BankAccount != null ? (Integer) BankAccount : (Integer) gridTab.getValue("C_BankAccount_ID"));
+
+ if(DocType != null)
+ pstmt.setInt(index++, (Integer) DocType);
+
+ if(TenderType != null && TenderType.toString().length() > 0)
+ pstmt.setString(index++, (String) TenderType);
+
+ if(BPartner != null)
+ pstmt.setInt(index++, (Integer) BPartner);
+
+ if(DocumentNo.length() > 0)
+ pstmt.setString(index++, getSQLText(DocumentNo));
+
+ if(AuthCode.length() > 0)
+ pstmt.setString(index++, getSQLText(AuthCode));
+
+ if(AmtFrom != null || AmtTo != null)
+ {
+ BigDecimal from = (BigDecimal) AmtFrom;
+ BigDecimal to = (BigDecimal) AmtTo;
+ log.fine("Amt From=" + from + ", To=" + to);
+ if(from == null && to != null)
+ pstmt.setBigDecimal(index++, to);
+ else if(from != null && to == null)
+ pstmt.setBigDecimal(index++, from);
+ else if(from != null && to != null)
+ {
+ pstmt.setBigDecimal(index++, from);
+ pstmt.setBigDecimal(index++, to);
+ }
+ }
+
+ if(DateFrom != null || DateTo != null)
+ {
+ Timestamp from = (Timestamp) DateFrom;
+ Timestamp to = (Timestamp) DateTo;
+ log.fine("Date From=" + from + ", To=" + to);
+ if(from == null && to != null)
+ pstmt.setTimestamp(index++, to);
+ else if(from != null && to == null)
+ pstmt.setTimestamp(index++, from);
+ else if(from != null && to != null)
+ {
+ pstmt.setTimestamp(index++, from);
+ pstmt.setTimestamp(index++, to);
+ }
+ }
+ }
+
+ private String getSQLText(String text)
+ {
+ String s = text.toUpperCase();
+ if(!s.endsWith("%"))
+ s += "%";
+ log.fine( "String=" + s);
+ return s;
+ }
protected Vector> getBankAccountData(Object BankAccount, Object BPartner, String DocumentNo,
- Object DateFrom, Object DateTo, Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode)
+ Object DateFrom, Object DateTo, Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode,
+ GridTab gridTab)
{
log.config ("C_BankAccount_ID=" + BankAccount);
@@ -80,7 +202,7 @@ public abstract class CreateFromBatchStatement extends CreateFromBatch
try
{
pstmt = DB.prepareStatement(sql.toString(), null);
- setParameters(pstmt, BankAccount, BPartner, DocumentNo, DateFrom, DateTo, AmtFrom, AmtTo, DocType, TenderType, AuthCode);
+ setParameters(pstmt, BankAccount, BPartner, DocumentNo, DateFrom, DateTo, AmtFrom, AmtTo, DocType, TenderType, AuthCode, gridTab);
rs = pstmt.executeQuery();
while(rs.next())
{
@@ -121,10 +243,10 @@ public abstract class CreateFromBatchStatement extends CreateFromBatch
miniTable.autoSize();
}
- public boolean save(IMiniTable miniTable, String trxName)
+ public boolean save(IMiniTable miniTable, String trxName, GridTab gridTab)
{
// fixed values
- int C_BankStatement_ID = ((Integer)getGridTab().getValue("C_BankStatement_ID")).intValue();
+ int C_BankStatement_ID = ((Integer) gridTab.getValue("C_BankStatement_ID")).intValue();
MBankStatement bs = new MBankStatement (Env.getCtx(), C_BankStatement_ID, null);
log.config(bs.toString());
@@ -144,7 +266,7 @@ public abstract class CreateFromBatchStatement extends CreateFromBatch
sql.append(" AND p.C_BankAccount_ID=?");
sql.append(" AND NOT EXISTS (SELECT * FROM C_BankStatementLine l WHERE p.C_Payment_ID=l.C_Payment_ID AND l.StmtAmt <> 0)");
- Timestamp ts = (Timestamp) getGridTab().getValue("StatementDate");
+ Timestamp ts = (Timestamp) gridTab.getValue("StatementDate");
if(ts == null)
ts = new Timestamp(System.currentTimeMillis());
@@ -215,4 +337,21 @@ public abstract class CreateFromBatchStatement extends CreateFromBatch
return columnNames;
}
+
+ public void info(IMiniTable miniTable, IStatusBar statusBar)
+ {
+ DecimalFormat format = DisplayType.getNumberFormat(DisplayType.Amount);
+ BigDecimal total = new BigDecimal(0);
+ int rows = miniTable.getRowCount();
+ int count = 0;
+ for(int i = 0; i < rows; i++)
+ {
+ if(((Boolean) miniTable.getValueAt(i, 0)).booleanValue())
+ {
+ total = total.add((BigDecimal) miniTable.getValueAt(i, 4));
+ count++;
+ }
+ }
+ statusBar.setStatusLine(String.valueOf(count) + " - " + Msg.getMsg(Env.getCtx(), "Sum") + " " + format.format(total));
+ }
}
\ No newline at end of file
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
index 1e51c91601..dfd247f600 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
@@ -1,6 +1,6 @@
/******************************************************************************
- * Copyright (C) 2009 Low Heng Sin *
- * Copyright (C) 2009 Idalica Corporation *
+ * Copyright (C) 2013 Elaine Tan *
+ * Copyright (C) 2013 Trek Global
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
@@ -18,221 +18,63 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
-import java.text.DecimalFormat;
import java.util.Vector;
import java.util.logging.Level;
-import org.compiere.apps.IStatusBar;
import org.compiere.minigrid.IMiniTable;
import org.compiere.model.GridTab;
-import org.compiere.model.MBankAccount;
import org.compiere.model.MBankStatement;
import org.compiere.model.MBankStatementLine;
import org.compiere.model.MPayment;
import org.compiere.util.DB;
-import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
/**
- * Create Transactions for Bank Statements
+ *
+ * @author Elaine
*
- * @author Jorg Janke
- * @version $Id: VCreateFromStatement.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
- * @author Victor Perez, e-Evolucion
- * RF [1811114] http://sourceforge.net/tracker/index.php?func=detail&aid=1811114&group_id=176962&atid=879335
- * @author Teo Sarca, www.arhipac.ro
- * BF [ 2007837 ] VCreateFrom.save() should run in trx
*/
-public abstract class CreateFromStatement extends CreateFrom
+public abstract class CreateFromStatement extends CreateFromBatch
{
- public MBankAccount bankAccount;
-
- /**
- * Protected Constructor
- * @param mTab MTab
- */
- public CreateFromStatement(GridTab mTab)
+ public CreateFromStatement(GridTab mTab)
{
super(mTab);
log.info(mTab.toString());
- } // VCreateFromInvoice
+ }
- /**
- * Dynamic Init
- * @return true if initialized
- */
public boolean dynInit() throws Exception
{
log.config("");
- setTitle(Msg.translate(Env.getCtx(), "C_BankStatement_ID") + " .. " + Msg.translate(Env.getCtx(), "CreateFrom"));
+ setTitle(Msg.getElement(Env.getCtx(), "C_BankStatement_ID") + " .. " + Msg.translate(Env.getCtx(), "CreateFrom"));
return true;
- } // dynInit
+ }
- /**************************************************************************
- * Construct SQL Where Clause and define parameters
- * (setParameters needs to set parameters)
- * Includes first AND
- * @return sql where clause
- */
- public String getSQLWhere(String DocumentNo, Object BPartner, Object DateFrom, Object DateTo,
- Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode)
- {
- StringBuilder sql = new StringBuilder("WHERE p.Processed='Y' AND p.IsReconciled='N'"
- + " AND p.DocStatus IN ('CO','CL','RE','VO') AND p.PayAmt<>0"
- + " AND p.C_BankAccount_ID = ?");
-
- sql.append( " AND NOT EXISTS (SELECT * FROM C_BankStatementLine l "
- // Voided Bank Statements have 0 StmtAmt
- + "WHERE p.C_Payment_ID=l.C_Payment_ID AND l.StmtAmt <> 0)");
-
- if (DocumentNo.length() > 0)
- sql.append(" AND UPPER(p.DocumentNo) LIKE ?");
- //
- if (BPartner != null)
- sql.append(" AND p.C_BPartner_ID=?");
- //
- if (DateFrom != null || DateTo != null)
- {
- Timestamp from = (Timestamp) DateFrom;
- Timestamp to = (Timestamp) DateTo;
- if (from == null && to != null)
- sql.append(" AND TRUNC(p.DateTrx) <= ?");
- else if (from != null && to == null)
- sql.append(" AND TRUNC(p.DateTrx) >= ?");
- else if (from != null && to != null)
- sql.append(" AND TRUNC(p.DateTrx) BETWEEN ? AND ?");
- }
- //
- if (AmtFrom != null || AmtTo != null)
- {
- BigDecimal from = (BigDecimal) AmtFrom;
- BigDecimal to = (BigDecimal) AmtTo;
- if (from == null && to != null)
- sql.append(" AND p.PayAmt <= ?");
- else if (from != null && to == null)
- sql.append(" AND p.PayAmt >= ?");
- else if (from != null && to != null)
- sql.append(" AND p.PayAmt BETWEEN ? AND ?");
- }
-
- if(DocType!=null)
- sql.append(" AND p.C_DocType_ID=?");
- if(TenderType != null && TenderType.toString().length() > 0)
- sql.append(" AND p.TenderType=?");
- if(AuthCode.length() > 0 )
- sql.append(" AND p.R_AuthCode LIKE ?");
-
- log.fine(sql.toString());
- return sql.toString();
- } // getSQLWhere
-
- /**
- * Set Parameters for Query.
- * (as defined in getSQLWhere)
- * @param pstmt statement
- * @param forCount for counting records
- * @throws SQLException
- */
- void setParameters(PreparedStatement pstmt, boolean forCount,
- String DocumentNo, Object BPartner, Object DateFrom, Object DateTo,
- Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode)
- throws SQLException
- {
- int index = 1;
-
- pstmt.setInt(index++, bankAccount.getC_BankAccount_ID());
-
- if (DocumentNo.length() > 0)
- pstmt.setString(index++, getSQLText(DocumentNo));
- //
- if (BPartner != null)
- {
- Integer bp = (Integer) BPartner;
- pstmt.setInt(index++, bp.intValue());
- log.fine("BPartner=" + bp);
- }
- //
- if (DateFrom != null || DateTo != null)
- {
- Timestamp from = (Timestamp) DateFrom;
- Timestamp to = (Timestamp) DateTo;
- log.fine("Date From=" + from + ", To=" + to);
- if (from == null && to != null)
- pstmt.setTimestamp(index++, to);
- else if (from != null && to == null)
- pstmt.setTimestamp(index++, from);
- else if (from != null && to != null)
- {
- pstmt.setTimestamp(index++, from);
- pstmt.setTimestamp(index++, to);
- }
- }
- //
- if (AmtFrom != null || AmtTo != null)
- {
- BigDecimal from = (BigDecimal) AmtFrom;
- BigDecimal to = (BigDecimal) AmtTo;
- log.fine("Amt From=" + from + ", To=" + to);
- if (from == null && to != null)
- pstmt.setBigDecimal(index++, to);
- else if (from != null && to == null)
- pstmt.setBigDecimal(index++, from);
- else if (from != null && to != null)
- {
- pstmt.setBigDecimal(index++, from);
- pstmt.setBigDecimal(index++, to);
- }
- }
- if(DocType!=null)
- pstmt.setInt(index++, (Integer) DocType);
- if(TenderType!=null && TenderType.toString().length() > 0 )
- pstmt.setString(index++, (String) TenderType);
- if(AuthCode.length() > 0 )
- pstmt.setString(index++, getSQLText(AuthCode));
-
- } // setParameters
-
- /**
- * Get SQL WHERE parameter
- * @param f field
- * @return Upper case text with % at the end
- */
- private String getSQLText (String text)
- {
- String s = text.toUpperCase();
- if (!s.endsWith("%"))
- s += "%";
- log.fine( "String=" + s);
- return s;
- } // getSQLText
-
- protected Vector> getBankData(String DocumentNo, Object BPartner, Object DateFrom, Object DateTo,
- Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode)
+ protected Vector> getBankAccountData(Object BankAccount, Object BPartner, String DocumentNo,
+ Object DateFrom, Object DateTo, Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode)
{
Vector> data = new Vector>();
- String sql = "SELECT p.DateTrx,p.C_Payment_ID,p.DocumentNo, p.C_Currency_ID,c.ISO_Code, p.PayAmt,"
- + "currencyConvert(p.PayAmt,p.C_Currency_ID,ba.C_Currency_ID,pay.DateAcct,p.C_ConversionType_ID,p.AD_Client_ID,p.AD_Org_ID),"
- + " bp.Name "
- + "FROM C_BankAccount ba"
- + " INNER JOIN C_Payment_v p ON (p.C_BankAccount_ID=ba.C_BankAccount_ID)"
- + " INNER JOIN C_Payment pay ON (p.C_Payment_ID=pay.C_Payment_ID)"
- + " INNER JOIN C_Currency c ON (p.C_Currency_ID=c.C_Currency_ID)"
- + " LEFT OUTER JOIN C_BPartner bp ON (p.C_BPartner_ID=bp.C_BPartner_ID) ";
-
- sql = sql + getSQLWhere(DocumentNo, BPartner, DateFrom, DateTo, AmtFrom, AmtTo, DocType, TenderType, AuthCode) + " ORDER BY p.DateTrx";
+ StringBuilder sql = new StringBuilder();
+ sql.append("SELECT p.DateTrx,p.C_Payment_ID,p.DocumentNo, p.C_Currency_ID,c.ISO_Code, p.PayAmt,");
+ sql.append("currencyConvert(p.PayAmt,p.C_Currency_ID,ba.C_Currency_ID,?,null,p.AD_Client_ID,p.AD_Org_ID), bp.Name ");
+ sql.append("FROM C_BankAccount ba");
+ sql.append(" INNER JOIN C_Payment_v p ON (p.C_BankAccount_ID=ba.C_BankAccount_ID)");
+ sql.append(" INNER JOIN C_Currency c ON (p.C_Currency_ID=c.C_Currency_ID)");
+ sql.append(" LEFT OUTER JOIN C_BPartner bp ON (p.C_BPartner_ID=bp.C_BPartner_ID) ");
+ sql.append(getSQLWhere(BPartner, DocumentNo, DateFrom, DateTo, AmtFrom, AmtTo, DocType, TenderType, AuthCode));
+ sql.append(" ORDER BY p.DateTrx");
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement(sql.toString(), null);
- setParameters(pstmt, false, DocumentNo, BPartner, DateFrom, DateTo, AmtFrom, AmtTo, DocType, TenderType, AuthCode);
+ setParameters(pstmt, BankAccount, BPartner, DocumentNo, DateFrom, DateTo, AmtFrom, AmtTo, DocType, TenderType, AuthCode);
rs = pstmt.executeQuery();
- while (rs.next())
+ while(rs.next())
{
Vector