[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a95a68264f41 changeset: 26796:a95a68264f41 user: RM packaging bot openbravo.com> date: Thu May 28 21:02:06 2015 + summary: CI: update AD_MODULE to version 26793 details: https://code.openbravo.com/erp/devel/pi/rev/2971dc0bd036 changeset: 26797:2971dc0bd036 user: RM packaging bot openbravo.com> date: Thu May 28 21:17:31 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java |3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java |3 +- 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_MESSAGE.xml | 12 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/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 25 ++ 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 +- m
[OpenbravoERP-commits] devel/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/3b83abdfcfff changeset: 26792:3b83abdfcfff user: RM packaging bot openbravo.com> date: Wed May 27 23:08:18 2015 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/1c6069a0eafa changeset: 26793:1c6069a0eafa user: Naroa Iriarte openbravo.com> date: Thu May 28 16:19:09 2015 +0200 summary: Fixed issue 29857: When there are not linked items it appears "Loading" When there are no linked items, the linked items category section shows the message "Loading data..." instead of the message "No items to show". The problem was that the fact of not having any item category was not correctly handled. In the initWidget function, when the linkedItemCategoryListGrid is created, in the function "dataArrived" there was a condition which called the function that showed the correct message "No items to show" when the startRow was '0' and when de endRow was '-1', the problem was that in this case of not having any linked Item category, the endRow and the startRow where both '0', so, the correct message was never shown and it always shows the message "Loading data...". To fix this, the condition has been changed, now it is taking into account the length of the data, and if it is '0' that means that there are not linked items so, the message "No items to show" is shown. details: https://code.openbravo.com/erp/devel/main/rev/a95a68264f41 changeset: 26794:a95a68264f41 user: RM packaging bot openbravo.com> date: Thu May 28 21:02:06 2015 + summary: CI: update AD_MODULE to version 26793 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.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 2 +- 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.o
[OpenbravoERP-commits] devel/pi: Fixed issue 29867: Now grid multiple selection is not ...
details: https://code.openbravo.com/erp/devel/pi/rev/4f48ce65dacf
changeset: 26795:4f48ce65dacf
user: David Baz Fayos openbravo.com>
date: Thu May 28 19:51:06 2015 +0200
summary: Fixed issue 29867: Now grid multiple selection is not lost on refresh
If the selected items are in different pages, only the items belonging to the
land
page once the grid get refreshed will be shown. A message notifying this loss
will
be shown (in the message bar if this is empty or as a popup if there is a
message
already been displayed, to avoid loss its information if we come from a process
execution)
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 12
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 25 ++
2 files changed, 37 insertions(+), 0 deletions(-)
diffs (71 lines):
diff -r aed0c66779e9 -r 4f48ce65dacf
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Thu May 28 12:58:25 2015 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Thu May 28 19:51:06 2015 +0200
@@ -1605,6 +1605,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -r aed0c66779e9 -r 4f48ce65dacf
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Thu May 28 12:58:25 2015 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Thu May 28 19:51:06 2015 +0200
@@ -1785,6 +1785,12 @@
this.selectedRecordEndInterval = this.selectedRecordInitInterval +
this.data.resultSize;
}
this.notRemoveFilter = true;
+ if (this.getSelectedRecords().length > 1) {
+this.selectedRecordsBeforeRefresh = [];
+for (i = 0; i < this.getSelectedRecords().length; i++) {
+
this.selectedRecordsBeforeRefresh.push(this.getSelectedRecords()[i][OB.Constants.ID]);
+}
+ }
} else {
visibleRows = this.getVisibleRows();
if (visibleRows && visibleRows[0] > 0) {
@@ -1833,6 +1839,7 @@
criteria = originalCriteria;
}
filterDataCallback = function () {
+ var i, gridRecord, recordIndexes = [];
if (me.refreshingWithScrolledGrid) {
// move the scroll to part of the grid that contains the data that was
just received to
// prevent unneded requests (see
https://issues.openbravo.com/view.php?id=25811)
@@ -1846,6 +1853,24 @@
delete me.selectedRecordInitInterval;
delete me.selectedRecordEndInterval;
delete me.selectedRecordId;
+
+ if (me.selectedRecordsBeforeRefresh) {
+for (i = 0; i < me.selectedRecordsBeforeRefresh.length; i++) {
+ gridRecord = me.data.find(OB.Constants.ID,
me.selectedRecordsBeforeRefresh[i]);
+ if (gridRecord !== null) {
+recordIndexes.push(me.getRecordIndex(gridRecord));
+ }
+}
+me.selectRecords(recordIndexes);
+if (me.selectedRecordsBeforeRefresh.length !== recordIndexes.length) {
+ if (me.view.messageBar.isVisible()) {
+isc.warn(OB.I18N.getLabel('OBUIAPP_NumOfSeledtedItemsChange',
[me.selectedRecordsBeforeRefresh.length, recordIndexes.length]));
+ } else {
+me.view.messageBar.setMessage(isc.OBMessageBar.TYPE_WARNING, null,
OB.I18N.getLabel('OBUIAPP_NumOfSeledtedItemsChange',
[me.selectedRecordsBeforeRefresh.length, recordIndexes.length]));
+ }
+}
+delete me.selectedRecordsBeforeRefresh;
+ }
};
this.filterData(criteria, filterDataCallback, context);
// Set the refreshingWithRecordSelected and refreshingWithScrolledGrid
flags to true when needed after
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 30007: Payment schedule amount incorrectly...
details: https://code.openbravo.com/erp/devel/pi/rev/aed0c66779e9
changeset: 26794:aed0c66779e9
user: Alvaro Ferraz openbravo.com>
date: Thu May 28 12:58:25 2015 +0200
summary: Fixes issue 30007: Payment schedule amount incorrectly calculated.
Payment schedule amount incorrectly calculated when adding a payment from
reconcile window to a sales order.
FIN_TransactionProcess and PaidStatusEventHandler have been changed in order to
set invoicepaid=true only when FIN_PaymentScheduleDetail has a related
InvoicePaymentSchedule.
FIN_PaymentProcess.java has also been changed, in order to check
invoicePaidAmounts only if FIN_PaymentScheduleDetail has a related
InvoicePaymentSchedule.
In case of a payment to a order without an invoice, updatePaymentAmounts will
be called only once.
Name of preference in UpdatePaymentPlan modulescript has been update to run it
again and fix wrong data created by the issue.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
|3 ++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
|3 ++-
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlanData.class
|0
src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql
|4 ++--
src/org/openbravo/event/PaidStatusEventHandler.java
|5 +++--
5 files changed, 9 insertions(+), 6 deletions(-)
diffs (71 lines):
diff -r 1c6069a0eafa -r aed0c66779e9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Thu May 28 16:19:09 2015 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Thu May 28 12:58:25 2015 +0200
@@ -392,7 +392,8 @@
.invoicePaymentStatus(payment)));
paymentScheduleDetail.setInvoicePaid(false);
// Payment = 0 when the payment is generated by a invoice that
consume credit
-if (invoicePaidAmounts
+if ((invoicePaidAmounts &&
paymentScheduleDetail.getInvoicePaymentSchedule() != null)
+|| (paymentScheduleDetail.getOrderPaymentSchedule() !=
null)
|| (payment.getAmount().compareTo(new BigDecimal("0.00"))
== 0)) {
if (paymentScheduleDetail.getInvoicePaymentSchedule() !=
null) {
// BP SO_CreditUsed
diff -r 1c6069a0eafa -r aed0c66779e9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
Thu May 28 16:19:09 2015 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
Thu May 28 12:58:25 2015 +0200
@@ -137,7 +137,8 @@
for (FIN_PaymentScheduleDetail psd :
pd.getFINPaymentScheduleDetailList()) {
invoicePaidold = psd.isInvoicePaid();
if (!invoicePaidold) {
-if
((FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus( {
+if
(FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus())
+&& psd.getInvoicePaymentSchedule() != null) {
psd.setInvoicePaid(true);
}
if (psd.isInvoicePaid()) {
diff -r 1c6069a0eafa -r aed0c66779e9
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlanData.class
Binary file
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlanData.class
has changed
diff -r 1c6069a0eafa -r aed0c66779e9
src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql
---
a/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql
Thu May 28 16:19:09 2015 +0200
+++
b/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql
Thu May 28 12:58:25 2015 +0200
@@ -54,7 +54,7 @@
SELECT count(*) as exist
FROM DUAL
WHERE EXISTS (SELECT 1 FROM ad_preference
- WHERE attribute = 'PaymentPlanUpdatedV2')
+ WHERE attribute = 'PaymentPlanUpdatedV3')
]]>
@@ -66,7 +66,7 @@
ad_preference_id, ad_client_id, ad_org_id, isactive,
createdby, created, updatedby, updated,attribute
) VALUES (
- get_uuid(), '0', '0', 'Y', '0', NOW(), '0',
NOW(),'PaymentPlanUpdatedV2')
+ get_uuid(), '0', '0', 'Y', '0', NOW(), '0',
NOW(),'PaymentPlanUpdatedV3')
]]>
diff -r 1c6069a0eafa -r aed0c66
[OpenbravoERP-commits] devel/pi: Fixed issue 29857: When there are not linked items it ...
details: https://code.openbravo.com/erp/devel/pi/rev/1c6069a0eafa
changeset: 26793:1c6069a0eafa
user: Naroa Iriarte openbravo.com>
date: Thu May 28 16:19:09 2015 +0200
summary: Fixed issue 29857: When there are not linked items it appears
"Loading"
When there are no linked items, the linked items category section shows the
message "Loading data..."
instead of the message "No items to show".
The problem was that the fact of not having any item category was not correctly
handled.
In the initWidget function, when the linkedItemCategoryListGrid is created, in
the function "dataArrived"
there was a condition which called the function that showed the correct message
"No items to show" when the
startRow was '0' and when de endRow was '-1', the problem was that in this case
of not having any linked Item
category, the endRow and the startRow where both '0', so, the correct message
was never shown and it always shows
the message "Loading data...".
To fix this, the condition has been changed, now it is taking into account the
length of the data, and if it
is '0' that means that there are not linked items so, the message "No items to
show" is shown.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
| 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 3b83abdfcfff -r 1c6069a0eafa
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
Wed May 27 23:08:18 2015 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
Thu May 28 16:19:09 2015 +0200
@@ -330,7 +330,7 @@
this.emptyMessage = this.emptyDataMessage;
},
dataArrived: function (startRow, endRow) {
-if (startRow === 0 && endRow === -1) {
+if (this.data && this.data.getLength && this.data.getLength() === 0) {
this.showNoRowsMessage();
}
return this.Super('dataArrived', arguments);
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
