[OpenbravoERP-commits] devel/pi: Fixes issue 30138: Error when generating credit and ad...
details: https://code.openbravo.com/erp/devel/pi/rev/3eaa0f22f0db
changeset: 26898:3eaa0f22f0db
user: Alvaro Ferraz alvaro.ferraz at openbravo.com
date: Wed Jun 10 16:55:01 2015 +0200
summary: Fixes issue 30138: Error when generating credit and adding a
negative line
Add Payment was raising an error if credit used was greater than total amount.
Now, this comprobation will only be done if some record has been selected in
Credit To Use grid.
diffstat:
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
| 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r aab70f0c1a50 -r 3eaa0f22f0db
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Wed Jun 10 22:46:44 2015 +
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Wed Jun 10 16:55:01 2015 +0200
@@ -1137,7 +1137,7 @@
return clientSideValidationFail();
}
- if ((total.compareTo(creditTotalItem) 0) (overpaymentField.isVisible()
overpaymentAction === 'CR')) {
+ if (creditTotalItem.compareTo(BigDecimal.prototype.ZERO) !== 0
(total.compareTo(creditTotalItem) 0) (overpaymentField.isVisible()
overpaymentAction === 'CR')) {
view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('APRM_MORECREDITAMOUNT'));
return clientSideValidationFail();
}
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes Issue 29739. Adds Indexes for isProcess and IsCo...
details: https://code.openbravo.com/erp/devel/pi/rev/2a66cd73cfe8 changeset: 26901:2a66cd73cfe8 user: David Miguelez david.miguelez at openbravo.com date: Thu Jun 11 18:28:02 2015 +0200 summary: Fixes Issue 29739. Adds Indexes for isProcess and IsCostCalculated columns to improve performance in Costing Background Process Queries. diffstat: src-db/database/model/tables/M_TRANSACTION.xml | 6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (23 lines): diff -r aba1a9d25e4d -r 2a66cd73cfe8 src-db/database/model/tables/M_TRANSACTION.xml --- a/src-db/database/model/tables/M_TRANSACTION.xmlThu Jun 11 17:13:36 2015 +0200 +++ b/src-db/database/model/tables/M_TRANSACTION.xmlThu Jun 11 18:28:02 2015 +0200 @@ -182,6 +182,9 @@ foreign-key foreignTable=M_PRODUCTIONLINE name=M_TRANSACTION_M_PRODUCTIONLINE reference local=M_PRODUCTIONLINE_ID foreign=M_PRODUCTIONLINE_ID/ /foreign-key + index name=M_TRANSACTION_CALCULATED unique=false +index-column name=ISCOSTCALCULATED/ + /index index name=M_TRANSACTION_INOUTLINE unique=false index-column name=M_INOUTLINE_ID/ /index @@ -197,6 +200,9 @@ index name=M_TRANSACTION_MOVEMENTLINE unique=false index-column name=M_MOVEMENTLINE_ID/ /index + index name=M_TRANSACTION_PROCESSED unique=false +index-column name=ISPROCESSED/ + /index index name=M_TRANSACTION_PRODUCTIONLINE unique=false index-column name=M_PRODUCTIONLINE_ID/ /index -- ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/0e8c70499208 changeset: 26894:0e8c70499208 user: Alvaro Ferraz alvaro.ferraz at openbravo.com date: Wed Jun 03 18:12:35 2015 +0200 summary: Fixes issue 28886: Error in Refund Payment from Match Statement ob-aprm-addPayment.js has been changed to check if Overpayment Action field is visible in order to raise APRM_ZEROAMOUNTPAYMENTTRANSACTION or not. AddPaymentActionHandler.java has been changed to do a commit at the end of createNewPayment method and avoid error when retrieving the created payment later. details: https://code.openbravo.com/erp/devel/main/rev/2a75107a6f00 changeset: 26895:2a75107a6f00 user: Víctor Martínez Romanos victor.martinez at openbravo.com date: Wed Jun 10 18:04:18 2015 +0200 summary: Related to issue 28886: Applied JS Beautify details: https://code.openbravo.com/erp/devel/main/rev/4775fc0c799b changeset: 26896:4775fc0c799b user: Carlos Aristu carlos.aristu at openbravo.com date: Wed Jun 10 18:23:19 2015 +0200 summary: Fixes issue 30119: ScrollableResults object should be closed details: https://code.openbravo.com/erp/devel/main/rev/aab70f0c1a50 changeset: 26897:aab70f0c1a50 user: RM packaging bot staff.rm at openbravo.com date: Wed Jun 10 22:46:44 2015 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/3eaa0f22f0db changeset: 26898:3eaa0f22f0db user: Alvaro Ferraz alvaro.ferraz at openbravo.com date: Wed Jun 10 16:55:01 2015 +0200 summary: Fixes issue 30138: Error when generating credit and adding a negative line Add Payment was raising an error if credit used was greater than total amount. Now, this comprobation will only be done if some record has been selected in Credit To Use grid. details: https://code.openbravo.com/erp/devel/main/rev/559a6242635c changeset: 26899:559a6242635c user: RM packaging bot staff.rm at openbravo.com date: Thu Jun 11 20:23:04 2015 + summary: CI: update AD_MODULE to version 26898 diffstat: 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/actionHandler/AddPaymentActionHandler.java |5 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js |6 +- 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.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.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.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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/559a6242635c changeset: 26902:559a6242635c user: RM packaging bot staff.rm at openbravo.com date: Thu Jun 11 20:23:04 2015 + summary: CI: update AD_MODULE to version 26898 details: https://code.openbravo.com/erp/devel/pi/rev/a14340555783 changeset: 26903:a14340555783 user: RM packaging bot staff.rm at openbravo.com date: Thu Jun 11 20:40:59 2015 + summary: CI: merge back from main diffstat: 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.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.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.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.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.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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.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.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/f6e2f6a4c29b
changeset: 26899:f6e2f6a4c29b
user: Martin Taal martin.taal at openbravo.com
date: Thu Jun 11 12:37:01 2015 +0200
summary: Related to issue Related to issue 29766: Retail Operations Buffer:
store all transactions in operations table before processing
Added comments, removed not needed flush, apparently there is a case that the
executorservice queue is null, handle this
details: https://code.openbravo.com/erp/devel/pi/rev/aba1a9d25e4d
changeset: 26900:aba1a9d25e4d
user: Martin Taal martin.taal at openbravo.com
date: Thu Jun 11 17:13:36 2015 +0200
summary: Merged heads
diffstat:
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
| 2 +-
src/org/openbravo/service/importprocess/ImportEntryManager.java
| 12 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (55 lines):
diff -r aab70f0c1a50 -r aba1a9d25e4d
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Wed Jun 10 22:46:44 2015 +
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Thu Jun 11 17:13:36 2015 +0200
@@ -1137,7 +1137,7 @@
return clientSideValidationFail();
}
- if ((total.compareTo(creditTotalItem) 0) (overpaymentField.isVisible()
overpaymentAction === 'CR')) {
+ if (creditTotalItem.compareTo(BigDecimal.prototype.ZERO) !== 0
(total.compareTo(creditTotalItem) 0) (overpaymentField.isVisible()
overpaymentAction === 'CR')) {
view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('APRM_MORECREDITAMOUNT'));
return clientSideValidationFail();
}
diff -r aab70f0c1a50 -r aba1a9d25e4d
src/org/openbravo/service/importprocess/ImportEntryManager.java
--- a/src/org/openbravo/service/importprocess/ImportEntryManager.java Wed Jun
10 22:46:44 2015 +
+++ b/src/org/openbravo/service/importprocess/ImportEntryManager.java Thu Jun
11 17:13:36 2015 +0200
@@ -188,7 +188,7 @@
}
public long getNumberOfQueuedTasks() {
-return executorService.getQueue().size();
+return executorService.getQueue() == null ? 0 :
executorService.getQueue().size();
}
public long getNumberOfActiveTasks() {
@@ -238,9 +238,6 @@
* Note will commit the session/connection using {@link
OBDal#commitAndClose()}
*/
public void createImportEntry(String id, String typeOfData, String json) {
-// make sure that everything is flushed to the db before checking import
entry
-// content
-OBDal.getInstance().flush();
OBContext.setAdminMode(true);
try {
// check if it is not there already or already archived
@@ -398,7 +395,9 @@
final OBContext prevOBContext = OBContext.getOBContext();
OBContext.setOBContext(0, 0, 0, 0);
try {
- // no need to do client/org checks on these actions, as in error, do the
least possible
+ // do not do org/client check as the error can be related to org/client
access
+ // so prevent this check to be done to even be able to save org/client
access
+ // checks
OBContext.setAdminMode(false);
ImportEntry importEntry = OBDal.getInstance().get(ImportEntry.class,
importEntryId);
if (importEntry != null
!Processed.equals(importEntry.getImportStatus())) {
@@ -475,7 +474,8 @@
try {
// too busy, don't process, but wait
-if (manager.executorService.getQueue().size()
(manager.maxTaskQueueSize - 1)) {
+if (manager.executorService.getQueue() != null
+ manager.executorService.getQueue().size()
(manager.maxTaskQueueSize - 1)) {
doWait();
// woken, re-start from beginning of loop
continue;
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
