details: /erp/devel/pi/rev/72e872c1dee2
changeset: 10832:72e872c1dee2
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 18 22:35:48 2011 +0100
summary: Update AD_MODULE version to 3.0RC4
details: /erp/devel/pi/rev/37f2d5f6122e
changeset: 10833:37f2d5f6122e
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 18 22:35:50 2011 +0100
summary: Added tag 3.0RC4 for changeset 72e872c1dee2
details: /erp/devel/pi/rev/45b3d2257377
changeset: 10834:45b3d2257377
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 18 22:35:51 2011 +0100
summary: Added signature for changeset 37f2d5f6122e
details: /erp/devel/pi/rev/3e72d9acbfea
changeset: 10835:3e72d9acbfea
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Feb 22 20:41:13 2011 +0100
summary: Merge 3.0RC4 temporary head
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 3 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 52 ++++-
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
| 2 +
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 4 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
| 12 +
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 4 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/I18NComponent.java
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 4 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_URL.xml
| 4 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 4 +-
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
| 4 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 12 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
| 111
+++++++--
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
|
28 +-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/checked.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/checked_Disabled.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/checked_Down.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/checked_Over.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unchecked.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unchecked_Disabled.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unchecked_Down.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unchecked_Over.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unsetcheck.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unsetcheck_Disabled.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unsetcheck_Down.png
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/org.openbravo.client.application/images/form/unsetcheck_Over.png
| 0
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 24 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 14 +-
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/tables/AD_PROCESS_REQUEST.xml
| 2 +-
src-db/database/model/tables/AD_SESSION.xml
| 3 +
src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml
| 8 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src/org/openbravo/base/secureApp/UserLock.java
| 10 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
| 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.java
| 21 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml
| 3 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
| 5 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html
| 15 +-
src/org/openbravo/erpCommon/ad_process/UpdateAuditTrail.java
| 19 +-
src/org/openbravo/erpCommon/info/ImageInfoBLOB.html
| 15 +-
71 files changed, 332 insertions(+), 173 deletions(-)
diffs (truncated from 1737 to 300 lines):
diff -r 89c1ea78187e -r 3e72d9acbfea .hgsigs
--- a/.hgsigs Fri Feb 18 21:55:31 2011 +0100
+++ b/.hgsigs Tue Feb 22 20:41:13 2011 +0100
@@ -28,3 +28,4 @@
fc3f70cc2bdf7e75c70d3bf666095a1209ec3866 0
iEYEABECAAYFAk1eRLQACgkQCX/oGf+2qkMMZACggDjqUw55cVl55yCVQEgrZVOGkNgAoNjG3YTrO7AMo8D2GFGNIxzbmDI5
b430637e3b9d96852ea55b4eaa8278c99a004584 0
iEYEABECAAYFAk1eSPQACgkQCX/oGf+2qkMc8wCfYXVRLMPbYeKhcUDJ1jjbGe/8E0kAnj3k1eojsxsUfLzurS6JsgaXVZ5c
668651fe8a81bcb9a55c3073d6a8f59d91d70b26 0
iEYEABECAAYFAk1eS8gACgkQCX/oGf+2qkOW4ACbB0zLCbzqWAECmpERhBOmSp+hrfAAoPfnoksz58TTrITz6vIdNLlOykKX
+37f2d5f6122e0b7d404f15af699bbf517c8620f1 0
iEYEABECAAYFAk1e5jYACgkQCX/oGf+2qkNdOwCg+BZzm0X320yJPlglOs6S3meDeesAoI+GDdOqlwP0J3ZJxtwS2LYiC68K
diff -r 89c1ea78187e -r 3e72d9acbfea .hgtags
--- a/.hgtags Fri Feb 18 21:55:31 2011 +0100
+++ b/.hgtags Tue Feb 22 20:41:13 2011 +0100
@@ -38,3 +38,4 @@
8f4f11533d545d7ae35b689fccd6451ddee68dc7 3.0RC1
bdc0773576839de5e0f134020d57f5040bbf70e4 3.0RC2
379b55d7906ebbfe04b0d864a8b2543f437f7781 3.0RC3
+72e872c1dee28e32260afb806938f730c73b6c8e 3.0RC4
diff -r 89c1ea78187e -r 3e72d9acbfea
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 22 20:41:13 2011 +0100
@@ -6,7 +6,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10809]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10810]]></VERSION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your
finances with an ERP does not have to be difficult. Enjoy a radically improved
user experience that combines the power of an enterprise grade financial
application with the simplicity and ease of a web 2.0 personal accounting
service.]]></DESCRIPTION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and
Receivables Management simplifies and automates the business processes around
the management of financial accounts, from the receipt and issue of payment, to
the reconciliation of those events with bank statements.
If you would like to help shape this module you are welcome to take part in
the forum discussions or register feature requests or issues in the
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and
Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with
document sequence numbers reset in case of applying dataset second time.
Fixed issue 15305.]]></UPDATEINFO>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document
types and default algorithm for bank statement auto
matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION_LABEL><![CDATA[RC4]]></VERSION_LABEL>
<!--A918E3331C404B889D69AA9BFAFB23AC-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
diff -r 89c1ea78187e -r 3e72d9acbfea
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 22 20:41:13 2011 +0100
@@ -7,7 +7,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10809]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10810]]></STARTVERSION>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Selector]]></DEPENDANT_MODULE_NAME>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10809]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10810]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 89c1ea78187e -r 3e72d9acbfea
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Tue Feb 22 20:41:13 2011 +0100
@@ -98,12 +98,12 @@
if (reconciliation != null) {
OBContext.setAdminMode();
try {
+ getSnapShot(reconciliation);
reconciledItems =
reconciliation.getFINReconciliationLineVList().size();
} finally {
OBContext.restorePreviousMode();
}
}
- getSnapShot(reconciliation);
if (MatchTransactionDao.getUnMatchedBankStatementLines(account).size()
== 0
&& reconciledItems == 0) {
OBError message = Utility.translateError(this, vars,
vars.getLanguage(), Utility
@@ -114,6 +114,7 @@
if (reconciliation == null) {
reconciliation = MatchTransactionDao.addNewReconciliation(this, vars,
strFinancialAccountId);
+ getSnapShot(reconciliation);
} else {
updateReconciliation(vars, reconciliation.getId(),
strFinancialAccountId, strTabId, false);
}
diff -r 89c1ea78187e -r 3e72d9acbfea
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Tue Feb 22 20:41:13 2011 +0100
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Expression;
import org.hibernate.criterion.Restrictions;
@@ -934,20 +935,57 @@
Currency.class, strCurrencyId)));
}
- List<String> finAccs = new ArrayList<String>();
if (strPaymentMethodId != null && !strPaymentMethodId.isEmpty()) {
- for (FinAccPaymentMethod finAccPayMethod :
getObject(FIN_PaymentMethod.class,
- strPaymentMethodId).getFinancialMgmtFinAccPaymentMethodList()) {
- finAccs.add(finAccPayMethod.getAccount().getId());
- }
- if (finAccs.isEmpty()) {
+ List<FinAccPaymentMethod> finAccsMethods =
getObject(FIN_PaymentMethod.class,
+ strPaymentMethodId).getFinancialMgmtFinAccPaymentMethodList();
+
+ if (finAccsMethods.isEmpty()) {
return (new ArrayList<FIN_FinancialAccount>());
}
- obc.add(Expression.in("id", finAccs));
+ ExpressionForFinAccPayMethod exp = new ExpressionForFinAccPayMethod();
+
+ for (FinAccPaymentMethod finAccPayMethod : finAccsMethods) {
+ exp.addFinAccPaymentMethod(finAccPayMethod);
+ }
+
+ obc.add(exp.getCriterion()); // compoundexp will be always != null
because
+ // finAccsMethods.isEmpty() == false
}
return obc.list();
}
+ private static class ExpressionForFinAccPayMethod {
+
+ private int MAX = 999;
+
+ private Criterion compoundexp = null;
+ List<String> finAccs = new ArrayList<String>();
+
+ public void addFinAccPaymentMethod(FinAccPaymentMethod finAccPayMethod) {
+ finAccs.add(finAccPayMethod.getAccount().getId());
+ if (finAccs.size() >= MAX) {
+ refresh();
+ }
+ }
+
+ public Criterion getCriterion() {
+ if (finAccs.size() > 0) {
+ refresh();
+ }
+ return compoundexp;
+ }
+
+ private void refresh() {
+ // finAccs.size() must be > 0
+ if (compoundexp == null) {
+ compoundexp = Expression.in("id", finAccs);
+ } else {
+ compoundexp = Expression.or(compoundexp, Expression.in("id", finAccs));
+ }
+ finAccs = new ArrayList<String>();
+ }
+ }
+
public FinAccPaymentMethod
getFinancialAccountPaymentMethod(FIN_FinancialAccount account,
FIN_PaymentMethod paymentMethod) {
final OBCriteria<FinAccPaymentMethod> obc =
OBDal.getInstance().createCriteria(
diff -r 89c1ea78187e -r 3e72d9acbfea
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Tue Feb 22 20:41:13 2011 +0100
@@ -531,6 +531,8 @@
var dad = top.opener;
if (typeof dad.loadGrid === "function" || typeof dad.loadGrid ===
"object") {
top.opener.loadGrid();
+ } else if (typeof dad.updateGridDataAfterFilter === "function" ||
typeof dad.updateGridDataAfterFilter === "object") {
+ top.opener.updateGridDataAfterFilter();
}
}
}
\ No newline at end of file
diff -r 89c1ea78187e -r 3e72d9acbfea
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
Fri Feb 18 21:55:31 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 22 20:41:13 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.10809]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10810]]></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>
@@ -22,7 +22,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D-->
<ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
<!--C70732EA90A14EC0916078B85CC33D2D--> <UPDATEINFO><![CDATA[Bug
fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION_LABEL><![CDATA[RC4]]></VERSION_LABEL>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
diff -r 89c1ea78187e -r 3e72d9acbfea
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
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 22 20:41:13 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.10809]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10810]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 89c1ea78187e -r 3e72d9acbfea
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
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 22 20:41:13 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.10809]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10810]]></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>
@@ -22,7 +22,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <UPDATEINFO><![CDATA[Styling
bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION_LABEL><![CDATA[RC4]]></VERSION_LABEL>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
diff -r 89c1ea78187e -r 3e72d9acbfea
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
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 22 20:41:13 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.10809]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10810]]></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.10809]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10810]]></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.10809]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10810]]></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.10809]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10810]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 89c1ea78187e -r 3e72d9acbfea
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
Tue Feb 22 20:41:13 2011 +0100
@@ -135,6 +135,18 @@
}
}
+ /**
+ * Returns the result of evaluating the given JavaScript expression.
+ *
+ * @param parameters
+ * Map of Strings with the request map parameters.
+ * @param session
+ * optional HttpSession object.
+ * @param expression
+ * String with the JavaScript expression to be evaluated.
+ * @return an Object with the result of the expression evaluation.
+ * @throws ScriptException
+ */
public static Object getJSExpressionResult(Map<String, String> parameters,
HttpSession session,
String expression) throws ScriptException {
final ScriptEngineManager manager = new ScriptEngineManager();
diff -r 89c1ea78187e -r 3e72d9acbfea
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 22 20:41:13 2011 +0100
@@ -6,7 +6,7 @@
<!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->
<VERSION><![CDATA[1.0.10809]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->
<VERSION><![CDATA[1.0.10810]]></VERSION>
<!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the
HTML Widget superclass that allows to create widget classes that embed the html
code.]]></DESCRIPTION>
<!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you
can define your own widget classes just setting up your own html code or the
html code provided by third parties.]]></HELP>
<!--D393BE6F22BB44B7B728259B34FC795A-->
<URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
@@ -21,7 +21,7 @@
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
