details: /erp/devel/pi/rev/67254b289f54
changeset: 9695:67254b289f54
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Jan 10 18:16:10 2011 +0100
summary: CI: update AD_MODULE to version 9678
details: /erp/devel/pi/rev/f69329bb98d9
changeset: 9696:f69329bb98d9
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Tue Jan 11 10:44:49 2011 +0100
summary: CI: merge back from main to pi
diffstat:
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
| 6 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
|
10 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 4 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 27 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 84 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
|
67 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-tabset.js
|
216 +++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 615 +--------
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
| 214 +++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 11 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 29 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 26 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/system/progress-indicator-icon.gif
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
| 9 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-toolbar-styles.css
| 10 +
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java
|
5 +
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 22 +-
modules/org.openbravo.client.querylist/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.querylist/ob-querylist-styles.css
| 25 +-
modules/org.openbravo.client.querylist/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.querylist/ob-querylist-styles.js
| 37 +
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
| 3 +-
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
| 2 -
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
| 3 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 10 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 12 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/SmartClientComponentProvider.java
| 2 +
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.js
| 4 -
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 100 +
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 22 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
referencedata/sampledata/F_B_International_Group.xml
| 12 +-
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_TAB.xml
| 43 +
src/org/openbravo/base/secureApp/PopUp_Response.html
| 33 +-
54 files changed, 1028 insertions(+), 703 deletions(-)
diffs (truncated from 3121 to 300 lines):
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Mon Jan 10 14:04:41 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Tue Jan 11 10:44:49 2011 +0100
@@ -6,7 +6,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.9570]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.9678]]></VERSION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss
Weld]]></DESCRIPTION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss
Weld framework: Java Contexts and Dependency Injection for the Java EE platform
(CDI). For more information see http://seamframework.org/Weld]]></HELP>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Jan 11 10:44:49 2011 +0100
@@ -7,7 +7,7 @@
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.9570]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.9678]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Tue Jan 11 10:44:49 2011 +0100
@@ -6,7 +6,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface
Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.9570]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.9678]]></VERSION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the
main application components for the openbravo user interface]]></DESCRIPTION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main
application components for the openbravo user interface. The main layout
incorporates a navigation bar and a main view area.]]></HELP>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Jan 11 10:44:49 2011 +0100
@@ -7,7 +7,7 @@
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.0]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.9678]]></STARTVERSION>
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON
Datasource]]></DEPENDANT_MODULE_NAME>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.9570]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.9678]]></STARTVERSION>
<!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
<!--60A170212F36499D83B8AD38D01F46B3-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.9570]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.9678]]></STARTVERSION>
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.9570]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.9678]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Tue Jan 11 10:44:49 2011 +0100
@@ -102,6 +102,10 @@
globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/ob-external-page.js", false));
globalResources.add(createStaticResource(
+ "web/org.openbravo.client.application/js/ob-standard-window.js",
false));
+ globalResources.add(createStaticResource(
+ "web/org.openbravo.client.application/js/ob-standard-view-tabset.js",
false));
+ globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/ob-standard-view.js", false));
globalResources.add(createStaticResource("web/org.openbravo.client.application/js/ob-popup.js",
false));
@@ -127,6 +131,8 @@
"web/org.openbravo.client.application/js/ob-user-profile-widget.js",
false));
globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/ob-help-about-widget.js",
false));
+ globalResources.add(createStaticResource(
+ "web/org.openbravo.client.application/js/ob-action-button.js", false));
// Styling
globalResources.add(createStyleSheetResource(
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Tue Jan 11 10:44:49 2011 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -44,9 +44,13 @@
</#list>
],
- customToolbarButtons: [
+ actionToolbarButtons: [
<#list tabComponent.buttonFields as field>
- {id: '${field.id?js_string}', title: '${field.label?js_string}'}<#if
field_has_next>,</#if>
+ {id: '${field.id?js_string}',
+ title: '${field.label?js_string}',
+ obManualURL: '${field.url}',
+ command: '${field.command}'
+ }<#if field_has_next>,</#if>
</#list>],
<#if tabComponent.childTabs?size > 0>
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Tue Jan 11 10:44:49 2011 +0100
@@ -159,6 +159,7 @@
HashMap<String, List<String>> columnsInValidation = new HashMap<String,
List<String>>();
computeListOfColumnsSortedByValidationDependencies(tab, allColumns,
columnsInValidation,
changeEventCols);
+ boolean forceComboReload = (mode.equals("CHANGE") && changedColumn ==
null);
// Computation of the Auxiliary Input values
OBCriteria<AuxiliaryInput> auxInC =
OBDal.getInstance().createCriteria(AuxiliaryInput.class);
@@ -216,7 +217,8 @@
value = uiDef.getFieldProperties(field, false);
}
} else if (mode.equals("EDIT")
- || (mode.equals("CHANGE") &&
changeEventCols.contains(changedColumn))) {
+ || (mode.equals("CHANGE") && (forceComboReload || changeEventCols
+ .contains(changedColumn)))) {
// On EDIT mode, the values are computed through the UIDefinition
(the values have been
// previously set in the RequestContext)
// This is also done this way on CHANGE mode where a combo reload
is needed
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Tue Jan 11 10:44:49 2011 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -34,10 +34,12 @@
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.data.Sqlc;
+import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.datamodel.Column;
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.model.ad.ui.TabTrl;
+import org.openbravo.utils.FormatUtilities;
/**
* Represents the Openbravo Tab (form and grid combination).
@@ -83,6 +85,10 @@
final ButtonField buttonField = new ButtonField();
buttonField.setId(fld.getId());
buttonField.setLabel(OBViewUtil.getLabel(fld));
+ buttonField.setUrl(Utility.getTabURL(fld.getTab().getId(), "E",
false));
+ buttonField.setCommand("BUTTON"
+ + FormatUtilities.replace(fld.getColumn().getDBColumnName())
+ + fld.getColumn().getProcess().getId());
buttonFields.add(buttonField);
}
}
@@ -243,6 +249,25 @@
public class ButtonField {
private String id;
private String label;
+ private String url;
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getCommand() {
+ return command;
+ }
+
+ public void setCommand(String command) {
+ this.command = command;
+ }
+
+ private String command;
public String getLabel() {
return label;
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
Tue Jan 11 10:44:49 2011 +0100
@@ -0,0 +1,84 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+
+OB.ActionButton = {};
+
+OB.ActionButton.closeProcessPopup = function(msg) {
+ if (msg && msg.text && OB.ActionButton.calledFromView) {
+ var msgType;
+ switch (msg.type) {
+ case 'Success':
+ msgType = OBMessageBar.TYPE_SUCCESS;
+ break;
+ case 'Error':
+ msgType = OBMessageBar.TYPE_ERROR;
+ break;
+ case 'Warning':
+ msgType = OBMessageBar.TYPE_WARNING;
+ break;
+ default:
+ msgType = OBMessageBar.TYPE_INFO;
+ }
+ OB.ActionButton.calledFromView.messageBar.setMessage(msgType, msg.title,
+ msg.text);
+ }
+
+ OB.ActionButton.calledFromView = null;
+}
+
+isc.ClassFactory.defineClass('OBToolbarActionButton', isc.OBToolbarTextButton);
+
+isc.OBToolbarTextButton.addProperties( {
+ action : function() {
+ this.runProcess();
+ },
+
+ runProcess : function() {
+ var theView = this.view;
+ var selectedRecord = theView.viewGrid.getSelectedRecord();
+ if (!selectedRecord) {
+ isc.warn('No record selected');
+ return;
+ }
+
+ var popupParams = {
+ viewId : 'OBPopupClassicWindow',
+ obManualURL : this.obManualURL, // "TablesandColumns/Table_Edition.html",
+ processId : this.id,
+ id : this.id,
+ command : this.command, // "BUTTONImportTable173",
+ tabTitle : this.title
+ };
+
+ var allProperties = theView.getContextInfo(false, true);
+ var sessionProperties = theView.getContextInfo(true, true);
+
+ OB.ActionButton.calledFromView = theView;
+
+ for ( var param in allProperties) {
+ if (allProperties.hasOwnProperty(param)) {
+ popupParams.command += '&' + param + '=' + allProperties[param];
+ }
+ }
+
+ theView.setContextInfo(sessionProperties, function() {
+ OB.Layout.ViewManager.openView('OBPopupClassicWindow', popupParams);
+ });
+ }
+});
diff -r a9aebdc69412 -r f69329bb98d9
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Mon Jan 10 14:04:41 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Tue Jan 11 10:44:49 2011 +0100
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
