[OpenbravoERP-commits] devel/pi: Fixes issue 24744: Product characteristics filter uses...
details: https://code.openbravo.com/erp/devel/pi/rev/f71255ba7557
changeset: 21190:f71255ba7557
user: Augusto Mauch augusto.mauch at openbravo.com
date: Wed Sep 25 10:20:15 2013 +0200
summary: Fixes issue 24744: Product characteristics filter uses proper icon
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
|2 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/productCharacteristicsFilter_ico.png
|0
2 files changed, 1 insertions(+), 1 deletions(-)
diffs (14 lines):
diff -r 684d905cbcc1 -r f71255ba7557
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
Tue Sep 24 20:09:32 2013 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
Wed Sep 25 10:20:15 2013 +0200
@@ -395,7 +395,7 @@
filterDialogConstructor: isc.OBCharacteristicsFilterDialog,
pickerIconDefaults: {
name: 'showDateRange',
-src:
'../web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/productCharacteristicsFilter_ico.png',
+src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/productCharacteristicsFilter_ico.png',
width: 21,
height: 21,
showOver: false,
diff -r 684d905cbcc1 -r f71255ba7557
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/productCharacteristicsFilter_ico.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/productCharacteristicsFilter_ico.png
has changed
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes Issue 0024692: Double request to the datasource ...
details: https://code.openbravo.com/erp/devel/pi/rev/327a7d8af6ce
changeset: 21191:327a7d8af6ce
user: Shankar Balachandran shankar.balachandran at openbravo.com
date: Wed Sep 25 13:28:36 2013 +0530
summary: Fixes Issue 0024692: Double request to the datasource is done when a
numeric field is in the first position of the grid
The filter in blur event needs to be applied only if the value is not undefined.
In case there is value in the filter and then the value is cleared,
still the filter will be applied because the value returned will be null and
not undefined.
Also the additional datasource call will be avoided as in that case, the value
is undefined.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
| 6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diffs (16 lines):
diff -r f71255ba7557 -r 327a7d8af6ce
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
Wed Sep 25 10:20:15 2013 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
Wed Sep 25 13:28:36 2013 +0530
@@ -593,7 +593,11 @@
// If the filter has not been applied yet, apply it when it loses the focus
blur: function () {
-if (this.form this.form.getFocusItem() !== this) {
+var undef;
+//do not apply the filter if the value is undefined. Can happen in cases
where a record is opened directly and creates an additional datasource call.
+//Refer issue https://issues.openbravo.com/view.php?id=24692
+//if there was an existing value in filter and it is removed, the
getValue() returns null, so the filter will be removed to show all values.
+if (this.getValue() !== undef) {
this.form.grid.performAction();
}
return this.Super('blur', arguments);
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed bug 24740: filter list reference columns in HQL ...
details: https://code.openbravo.com/erp/devel/pi/rev/8ab8b14e8472
changeset: 21192:8ab8b14e8472
user: Asier Lostalé asier.lostale at openbravo.com
date: Wed Sep 25 12:33:35 2013 +0200
summary: fixed bug 24740: filter list reference columns in HQL defined
selectors
Taking into account this case both in the view generation and in the
DataSource
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
| 33 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 18 +++-
2 files changed, 45 insertions(+), 6 deletions(-)
diffs (87 lines):
diff -r 327a7d8af6ce -r 8ab8b14e8472
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
Wed Sep 25 13:28:36 2013 +0530
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
Wed Sep 25 12:33:35 2013 +0200
@@ -45,6 +45,7 @@
import org.openbravo.base.model.domaintype.DomainType;
import org.openbravo.base.model.domaintype.ForeignKeyDomainType;
import org.openbravo.base.model.domaintype.LongDomainType;
+import org.openbravo.base.model.domaintype.StringEnumerateDomainType;
import org.openbravo.base.model.domaintype.UniqueIdDomainType;
import org.openbravo.client.application.ParameterUtils;
import org.openbravo.client.kernel.RequestContext;
@@ -361,8 +362,38 @@
} else if (domainType instanceof ForeignKeyDomainType) {
// Assume left part definition is full object reference from HQL select
whereClause = field.getClauseLeftPart() + .id = ' + value + ';
+} else if (domainType instanceof StringEnumerateDomainType) {
+ // For enumerations value can be in two formats:
+ // 1- VAL: in this case the expression should be property='VAL'
+ // 2- [VAL1, VAL2] (JSONArray): the expression should be property in
('VAL1', 'VAL2')
+ JSONArray values = null;
+ if (value.startsWith([)) {
+try {
+ values = new JSONArray(value);
+} catch (JSONException ignore) {
+ // It is not a JSONArray: assuming format 1
+}
+ }
+
+ if (values == null) {
+// format 1
+whereClause = field.getClauseLeftPart() + = ' + value + ';
+ } else {
+// format 2
+whereClause = field.getClauseLeftPart() + IN (;
+for (int i = 0; i values.length(); i++) {
+ if (i 0) {
+whereClause += , ;
+ }
+ try {
+whereClause += ' + values.getString(i) + ';
+ } catch (JSONException e) {
+log.error(Error parsing values as JSONArray: + value, e);
+ }
+}
+whereClause += );
+ }
} else {
-
if (iStartsWith.equals(operator)) {
whereClause = lower( + field.getClauseLeftPart() + ) LIKE '
+ value.toLowerCase().replaceAll( , %) + %';
diff -r 327a7d8af6ce -r 8ab8b14e8472
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Wed Sep 25 13:28:36 2013 +0530
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Wed Sep 25 12:33:35 2013 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009-2012 Openbravo SLU
+ * All portions are Copyright (C) 2009-2013 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -846,11 +846,19 @@
column = OBDal.getInstance().get(Column.class,
property.getColumnId());
}
}
+
+// getting the preference based on property column or directly set in
field
+org.openbravo.model.ad.domain.Reference reference = null;
if (column != null column.getReferenceSearchKey() != null) {
- SetString allowedValues =
DataSourceProperty.getAllowedValues(column
- .getReferenceSearchKey());
- ListRefListEntry entries =
DataSourceProperty.createValueMap(allowedValues, column
- .getReferenceSearchKey().getId());
+ reference = column.getReferenceSearchKey();
+} else if (selectorField.getReference() != null) {
+ reference = selectorField.getReference();
+}
+
+if (reference != null) {
+ SetString allowedValues =
DataSourceProperty.getAllowedValues(reference);
+
[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/d40d287ea91a changeset: 21188:d40d287ea91a user: Asier Lostalé asier.lostale at openbravo.com date: Tue Jul 30 10:36:44 2013 +0200 summary: fixed bug 24421, fixed bug 24326: ADCachedStructures thread safe issues -getTab now completely initializes all tabs in the window -it is now synchronized Added test cases to check it details: https://code.openbravo.com/erp/devel/main/rev/684d905cbcc1 changeset: 21189:684d905cbcc1 user: RM packaging bot staff.rm at openbravo.com date: Tue Sep 24 20:09:32 2013 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/f71255ba7557 changeset: 21190:f71255ba7557 user: Augusto Mauch augusto.mauch at openbravo.com date: Wed Sep 25 10:20:15 2013 +0200 summary: Fixes issue 24744: Product characteristics filter uses proper icon details: https://code.openbravo.com/erp/devel/main/rev/327a7d8af6ce changeset: 21191:327a7d8af6ce user: Shankar Balachandran shankar.balachandran at openbravo.com date: Wed Sep 25 13:28:36 2013 +0530 summary: Fixes Issue 0024692: Double request to the datasource is done when a numeric field is in the first position of the grid The filter in blur event needs to be applied only if the value is not undefined. In case there is value in the filter and then the value is cleared, still the filter will be applied because the value returned will be null and not undefined. Also the additional datasource call will be avoided as in that case, the value is undefined. details: https://code.openbravo.com/erp/devel/main/rev/8ab8b14e8472 changeset: 21192:8ab8b14e8472 user: Asier Lostalé asier.lostale at openbravo.com date: Wed Sep 25 12:33:35 2013 +0200 summary: fixed bug 24740: filter list reference columns in HQL defined selectors Taking into account this case both in the view generation and in the DataSource details: https://code.openbravo.com/erp/devel/main/rev/a06bf757c7ec changeset: 21193:a06bf757c7ec user: RM packaging bot staff.rm at openbravo.com date: Wed Sep 25 19:37:54 2013 +0200 summary: CI: update AD_MODULE to version 21192 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/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 100 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js |2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/productCharacteristicsFilter_ico.png |0 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
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a06bf757c7ec changeset: 21193:a06bf757c7ec user: RM packaging bot staff.rm at openbravo.com date: Wed Sep 25 19:37:54 2013 +0200 summary: CI: update AD_MODULE to version 21192 details: https://code.openbravo.com/erp/devel/pi/rev/83c0e902a8f6 changeset: 21194:83c0e902a8f6 user: RM packaging bot staff.rm at openbravo.com date: Wed Sep 25 19:55:16 2013 +0200 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.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 +-
[OpenbravoERP-commits] devel/pi: Fixes issue 24139: Available quantity
details: https://code.openbravo.com/erp/devel/pi/rev/26448a5e9156 changeset: 21195:26448a5e9156 user: Javier Etxarri javier.echarri at openbravo.com date: Wed Sep 25 23:37:41 2013 +0200 summary: Fixes issue 24139: Available quantity wrongly updated when voiding a goods shipment of a reactivated order diffstat: src-db/database/model/functions/M_INOUT_POST.xml | 26 ++- 1 files changed, 20 insertions(+), 6 deletions(-) diffs (43 lines): diff -r 83c0e902a8f6 -r 26448a5e9156 src-db/database/model/functions/M_INOUT_POST.xml --- a/src-db/database/model/functions/M_INOUT_POST.xml Wed Sep 25 19:55:16 2013 +0200 +++ b/src-db/database/model/functions/M_INOUT_POST.xml Wed Sep 25 23:37:41 2013 +0200 @@ -47,6 +47,7 @@ v_Message VARCHAR2(2000):=''; v_Message_aux VARCHAR2(2000):=''; v_Record_ID VARCHAR2(32); + v_DocStatus VARCHAR2(60); v_User VARCHAR2(32); v_PUser VARCHAR2(32); v_is_included NUMBER:=0; @@ -590,12 +591,25 @@ -- stocked product IF(Cur_InOutLine.M_Product_ID IS NOT NULL AND v_IsStocked=1) THEN -- Update OrderLine (if C-, Qty is negative) -UPDATE C_ORDERLINE - SET QtyReserved=QtyReserved - v_QtyPO - v_QtySO, - QtyDelivered=QtyDelivered + v_QtySO, - Updated=now(), - UpdatedBy=v_User -WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID; +SELECT DOCSTATUS into v_DocStatus +FROM C_ORDER +WHERE C_ORDER_ID = (SELECT C_ORDER_ID +FROM C_ORDERLINE +WHERE C_ORDERLINE_ID=Cur_InOutLine.C_OrderLine_ID); +IF (v_DocStatus = 'DR') THEN + UPDATE C_ORDERLINE +SET QtyDelivered=QtyDelivered + v_QtySO, +Updated=now(), +UpdatedBy=v_User + WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID; +ELSE + UPDATE C_ORDERLINE +SET QtyReserved=QtyReserved - v_QtyPO - v_QtySO, +QtyDelivered=QtyDelivered + v_QtySO, +Updated=now(), +UpdatedBy=v_User + WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID; +END IF; -- Products not stocked ELSE -- Update OrderLine (if C-, Qty is negative) -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 23826: New payment should be created when
details: https://code.openbravo.com/erp/devel/pi/rev/8f46be1e44a2
changeset: 21196:8f46be1e44a2
user: Javier Etxarri javier.echarri at openbravo.com
date: Thu Sep 26 00:32:02 2013 +0200
summary: Fixes issue 23826: New payment should be created when
using GL Journal defined as Template
diffstat:
src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 26448a5e9156 -r 8f46be1e44a2
src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java
--- a/src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java Wed Sep
25 23:37:41 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java Thu Sep
26 00:32:02 2013 +0200
@@ -130,7 +130,7 @@
dataLines[j].cSalesregionId, dataLines[j].mProductId,
dataLines[j].cBpartnerId,
dataLines[j].aAssetId, dataLines[j].cCostcenterId,
dataLines[j].openItems,
dataLines[j].finFinancialAccountId,
dataLines[j].finPaymentmethodId,
-dataLines[j].cGlitemId, dataLines[j].paymentdate,
dataLines[j].finPaymentId) == 0)
+dataLines[j].cGlitemId, dataLines[j].paymentdate, null) == 0)
log4j.warn(Save: GLJournalLine record + j + not inserted.
Sequence =
+ strLineSequence);
} catch (ServletException ex) {
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 24014: Export to excel in general ledger when
details: https://code.openbravo.com/erp/devel/pi/rev/19a6d9616141
changeset: 21197:19a6d9616141
user: Javier Etxarri javier.echarri at openbravo.com
date: Thu Sep 26 01:34:23 2013 +0200
summary: Fixes issue 24014: Export to excel in general ledger when
the maximum of rows in exceeded is not showing a message
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 12
++
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 4 ++-
2 files changed, 15 insertions(+), 1 deletions(-)
diffs (36 lines):
diff -r 8f46be1e44a2 -r 19a6d9616141 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Sep 26 00:32:02 2013 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Sep 26 01:34:23 2013 +0200
@@ -15970,6 +15970,18 @@
!--078F6ABDBDBA48F2887C3108397A2262--
ISINCLUDEINI18N![CDATA[N]]/ISINCLUDEINI18N
!--078F6ABDBDBA48F2887C3108397A2262--/AD_MESSAGE
+!--07E2974F9F1746279DD0D051734948DF--AD_MESSAGE
+!--07E2974F9F1746279DD0D051734948DF--
AD_MESSAGE_ID![CDATA[07E2974F9F1746279DD0D051734948DF]]/AD_MESSAGE_ID
+!--07E2974F9F1746279DD0D051734948DF--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--07E2974F9F1746279DD0D051734948DF-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--07E2974F9F1746279DD0D051734948DF-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--07E2974F9F1746279DD0D051734948DF--
VALUE![CDATA[numberOfRowsExceeded]]/VALUE
+!--07E2974F9F1746279DD0D051734948DF-- MSGTEXT![CDATA[The maximum number
of rows permitted on a worksheet been exceeded]]/MSGTEXT
+!--07E2974F9F1746279DD0D051734948DF-- MSGTYPE![CDATA[I]]/MSGTYPE
+!--07E2974F9F1746279DD0D051734948DF--
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--07E2974F9F1746279DD0D051734948DF--
ISINCLUDEINI18N![CDATA[N]]/ISINCLUDEINI18N
+!--07E2974F9F1746279DD0D051734948DF--/AD_MESSAGE
+
!--07E963D65B7F47BE81150448C5019E0D--AD_MESSAGE
!--07E963D65B7F47BE81150448C5019E0D--
AD_MESSAGE_ID![CDATA[07E963D65B7F47BE81150448C5019E0D]]/AD_MESSAGE_ID
!--07E963D65B7F47BE81150448C5019E0D--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
diff -r 8f46be1e44a2 -r 19a6d9616141
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Thu Sep
26 00:32:02 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Thu Sep
26 01:34:23 2013 +0200
@@ -664,7 +664,9 @@
Utility.messageBD(this, ProcessStatus-W, vars.getLanguage()),
Utility.messageBD(this, NoDataFound, vars.getLanguage()));
} else {
-
+ if (data.length 65532) {
+throw new IOException(Utility.messageBD(this, numberOfRowsExceeded,
vars.getLanguage()));
+ }
String strReportName =
@basedesign@/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml;
HashMapString, Object parameters = new HashMapString, Object();
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 24156: Create Shipments from Order:
details: https://code.openbravo.com/erp/devel/pi/rev/30de8abef686
changeset: 21198:30de8abef686
user: Javier Etxarri javier.echarri at openbravo.com
date: Thu Sep 26 02:19:19 2013 +0200
summary: Fixes issue 24156: Create Shipments from Order:
Organization filter incorrect
diffstat:
src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java | 13
++---
1 files changed, 9 insertions(+), 4 deletions(-)
diffs (24 lines):
diff -r 19a6d9616141 -r 30de8abef686
src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java Thu Sep
26 01:34:23 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java Thu Sep
26 02:19:19 2013 +0200
@@ -125,11 +125,16 @@
} else {
xmlDocument = xmlEngine.readXmlTemplate(
org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual).createXmlDocument();
- data = GenerateShipmentsmanualData.select(this, vars.getLanguage(),
+ data = GenerateShipmentsmanualData.select(
+ this,
+ vars.getLanguage(),
Utility.getContext(this, vars, #User_Client,
GenerateShipmentsmanual),
- Utility.getContext(this, vars, #User_Org,
GenerateShipmentsmanual), strC_BPartner_ID,
- strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, 1),
- Tree.getMembers(this, strTreeOrg, strAD_Org_ID));
+ Utility.getContext(this, vars, #User_Org,
GenerateShipmentsmanual),
+ strC_BPartner_ID,
+ strDateFrom,
+ DateTimeData.nDaysAfter(this, strDateTo, 1),
+ (strAD_Org_ID == null || strAD_Org_ID.isEmpty()) ?
Tree.getMembers(this, strTreeOrg,
+ strAD_Org_ID) : ' + strAD_Org_ID + ');
}
ToolBar toolbar = new ToolBar(this, vars.getLanguage(),
GenerateShipmentsmanual, false, ,
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
