details: /erp/devel/main/rev/e5576d879f40
changeset: 10814:e5576d879f40
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 18 22:18:14 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/00177c2cb1a4
changeset: 10815:00177c2cb1a4
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Feb 21 08:20:10 2011 +0100
summary: Removed openbravo context from Openbravo twitter widgets
details: /erp/devel/main/rev/9886039e3754
changeset: 10816:9886039e3754
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Mon Feb 21 10:19:14 2011 +0100
summary: Fixed issue 15961: need to refresh Transactions tab comming from
AddPaymentFromTransactions
details: /erp/devel/main/rev/ea2cb5051c39
changeset: 10817:ea2cb5051c39
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Feb 21 15:22:44 2011 +0100
summary: Added default Chrome input type file button to 'Image Selector'
window
details: /erp/devel/main/rev/95270558f5be
changeset: 10818:95270558f5be
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Feb 21 15:23:15 2011 +0100
summary: Added default Chrome input type file button to 'Instance Activation'
window
details: /erp/devel/main/rev/80a7075c7784
changeset: 10819:80a7075c7784
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 16:59:34 2011 +0100
summary: Fixes issue 0016001: error in add payment process when there are
more than 1000 financial accounts
It has been splitted the long IN expresion in several IN expressions joined by
OR to not go over 1000 values inside the IN expression
details: /erp/devel/main/rev/6ded4aab750f
changeset: 10820:6ded4aab750f
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 17:32:41 2011 +0100
summary: Fixes issue 16011 Create Lines From Goods Receipt should load
quantities (main and secondary) directly from the order
It has been reviewed the SQL sentenced that retrieves the order lines to
calculate the pending quantity to receipt in the secondary uom to calculate it
based on the same quantity of the secondary uom in the order
details: /erp/devel/main/rev/989d59afa3bb
changeset: 10821:989d59afa3bb
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 17:50:06 2011 +0100
summary: Fixes issue 0015940: When you create a lot of organizations assigned
to a role, the processes do not work
It has been modified the type of the OB_CONTEXT column to CLOB
details: /erp/devel/main/rev/7265d977ebe5
changeset: 10822:7265d977ebe5
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 17:58:56 2011 +0100
summary: Fixes issue 0015939: Inactive process plans are used when running
manufacturing plan
It has been modified the view MA_PROCESSPLAN_TOTALIZED to take only into
account active records
details: /erp/devel/main/rev/4e5067b53ec1
changeset: 10823:4e5067b53ec1
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 18:08:21 2011 +0100
summary: Fixes issue 0015935: Inhomogeneous behavior when searching in Copy
From Settlement
It has been added the code to refresh also the description button and it has
been made the description field a little bit higher to make it look what it is:
a multiline field
details: /erp/devel/main/rev/91f6db342f9b
changeset: 10824:91f6db342f9b
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 18:09:24 2011 +0100
summary: Fixes issue 0015935: Inhomogeneous behavior when searching in Copy
From Settlement
It has been fixed the behavior of searching by % to make it behave the same way
as other search windows and selectors
details: /erp/devel/main/rev/e35308a9b04c
changeset: 10825:e35308a9b04c
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Feb 21 18:33:26 2011 +0100
summary: [OBUISEL] Fix to prevent NPE. Added JavaDoc.
details: /erp/devel/main/rev/d35faee28cf2
changeset: 10826:d35faee28cf2
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Feb 21 18:39:38 2011 +0100
summary: [OBUIAPP] Added javadoc to ParameterUtils.getJSExpressionResult
public method.
details: /erp/devel/main/rev/9113294f841e
changeset: 10827:9113294f841e
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Feb 21 19:01:40 2011 +0100
summary: Fixes bug 16022: Reconciliation window: null pointer exception
details: /erp/devel/main/rev/1fa684afd40d
changeset: 10828:1fa684afd40d
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Feb 22 10:39:04 2011 +0100
summary: [OBUISEL] Use ParameterUtils.getJSExpressionResult method instead of
reimplementing it.
details: /erp/devel/main/rev/488ad4e73d37
changeset: 10829:488ad4e73d37
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 22 11:55:08 2011 +0100
summary: Fix translation behaviour in 3.0 components
details: /erp/devel/main/rev/b66bc76040aa
changeset: 10830:b66bc76040aa
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Feb 22 12:04:26 2011 +0100
summary: Fixed issue 16019: Added icons for filter checkboxes
details: /erp/devel/main/rev/c4cc11a0a6b2
changeset: 10831:c4cc11a0a6b2
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Feb 22 12:11:53 2011 +0100
summary: related to issue 15864: fixed message for update audit trail
details: /erp/devel/main/rev/811e1c898389
changeset: 10832:811e1c898389
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 22 15:17:15 2011 +0100
summary: Fixed issue 15958. Now RemoveTriggerChanges will be exported to the
configuration scripts.
details: /erp/devel/main/rev/87f91199fb30
changeset: 10833:87f91199fb30
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Feb 22 16:59:44 2011 +0100
summary: Fixed bug 16024: Slow login
details: /erp/devel/main/rev/4222233f95c7
changeset: 10834:4222233f95c7
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 22 18:12:05 2011 +0100
summary: Related to issue 15958. Do not remove triggers which are changed in
the database, but not removed
details: /erp/devel/main/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
details: /erp/devel/main/rev/a6cc49512176
changeset: 10836:a6cc49512176
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Feb 22 21:55:56 2011 +0100
summary: CI: update AD_MODULE to version 10835
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
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
| 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/ParameterUtils.java
| 12 +
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.kernel/src/org/openbravo/client/kernel/I18NComponent.java
| 2 +-
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.widgets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
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
| 2 +-
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
| 2 +-
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
| 2 +-
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.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
| 2 +-
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
| 2 +-
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
| 2 +-
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
| 2 +-
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
| 2 +-
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
| 2 +-
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, 313 insertions(+), 154 deletions(-)
diffs (truncated from 1566 to 300 lines):
diff -r 89c1ea78187e -r a6cc49512176 .hgsigs
--- a/.hgsigs Fri Feb 18 21:55:31 2011 +0100
+++ b/.hgsigs Tue Feb 22 21:55:56 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 a6cc49512176 .hgtags
--- a/.hgtags Fri Feb 18 21:55:31 2011 +0100
+++ b/.hgtags Tue Feb 22 21:55:56 2011 +0100
@@ -38,3 +38,4 @@
8f4f11533d545d7ae35b689fccd6451ddee68dc7 3.0RC1
bdc0773576839de5e0f134020d57f5040bbf70e4 3.0RC2
379b55d7906ebbfe04b0d864a8b2543f437f7781 3.0RC3
+72e872c1dee28e32260afb806938f730c73b6c8e 3.0RC4
diff -r 89c1ea78187e -r a6cc49512176
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 21:55:56 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.10835]]></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>
diff -r 89c1ea78187e -r a6cc49512176
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 21:55:56 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.10835]]></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.10835]]></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 a6cc49512176
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 21:55:56 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 a6cc49512176
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 21:55:56 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 a6cc49512176
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 21:55:56 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 a6cc49512176
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 21:55:56 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.10835]]></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 89c1ea78187e -r a6cc49512176
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 21:55:56 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.10835]]></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 a6cc49512176
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 21:55:56 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.10835]]></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 89c1ea78187e -r a6cc49512176
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 21:55:56 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.10835]]></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.10835]]></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.10835]]></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.10835]]></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 a6cc49512176
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 21:55:56 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 a6cc49512176
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 21:55:56 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.10835]]></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>
diff -r 89c1ea78187e -r a6cc49512176
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 22 21:55:56 2011 +0100
@@ -7,7 +7,7 @@
<!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--DCE798FBC5B648F7A3C81A6941720A57-->
<AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
<!--DCE798FBC5B648F7A3C81A6941720A57-->
<AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->
<STARTVERSION><![CDATA[2.1.10809]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->
<STARTVERSION><![CDATA[2.1.10835]]></STARTVERSION>
<!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My
Openbravo Tab]]></DEPENDANT_MODULE_NAME>
<!--DCE798FBC5B648F7A3C81A6941720A57-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 89c1ea78187e -r a6cc49512176
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 22 21:55:56 2011 +0100
@@ -6,7 +6,7 @@
<!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client
Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->
<VERSION><![CDATA[2.1.10809]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->
<VERSION><![CDATA[2.1.10835]]></VERSION>
<!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides
framework functionality for the Openbravo User Interface]]></DESCRIPTION>
<!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface
client kernel is a generation framework for generating client (browser)
components used in Openbravo. Its components are mainly used by other modules
to provide customizable and extendable user interfaces.]]></HELP>
<!--4B828F4D03264080AA1D2057B13F613C-->
<URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
diff -r 89c1ea78187e -r a6cc49512176
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 21:55:31 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 22 21:55:56 2011 +0100
@@ -7,7 +7,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
