[OpenbravoERP-commits] devel/pi: Related to 40174: Upload data: product into discount, ...
details: https://code.openbravo.com/erp/devel/pi/rev/c865aacf9fd9 changeset: 35524:c865aacf9fd9 user: Martin Taal openbravo.com> date: Fri Mar 08 23:47:30 2019 +0100 summary: Related to 40174: Upload data: product into discount, business partner set, import Update label after sync-terminology diffstat: src-db/database/sourcedata/AD_FIELD.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b0a72059ba2f -r c865aacf9fd9 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 08 22:55:10 2019 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 08 23:47:30 2019 +0100 @@ -313120,7 +313120,7 @@ - + ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Related to 40174: Upload data: product into discount, ...
details: https://code.openbravo.com/erp/devel/pi/rev/b0a72059ba2f changeset: 35523:b0a72059ba2f user: Martin Taal openbravo.com> date: Fri Mar 08 22:55:10 2019 +0100 summary: Related to 40174: Upload data: product into discount, business partner set, import bp into bp set, set bp-set in discount, load in webpos Implement bp select list, upload of bps into bp-select list, upload of product in discount. New backoffice button and popups, with servlets to support upload and return of upload results. diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 288 ++ modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT.xml |26 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml |23 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java |14 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/DefaultsUploadDataActionHandler.java |52 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ImportBPSet.java | 135 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ImportProductInDiscount.java | 119 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ProcessUploadedFile.java | 258 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-bp-select-button.js |49 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-bp-select-popup.js |57 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-popup.js | 344 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-product-button.js |31 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/toolbar/iconButton-import.png | Bin modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-upload-styles.css |35 + src-db/database/model/tables/C_BP_SET.xml |52 + src-db/database/model/tables/C_BP_SET_LINE.xml |73 + src-db/database/model/tables/M_OFFER.xml | 4 + src-db/database/model/tables/M_OFFER_BP_SET.xml |65 + src-db/database/sourcedata/AD_COLUMN.xml | 1269 +- src-db/database/sourcedata/AD_ELEMENT.xml |49 + src-db/database/sourcedata/AD_FIELD.xml | 586 src-db/database/sourcedata/AD_MENU.xml |14 + src-db/database/sourcedata/AD_TAB.xml |91 +
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/329f6e7d18a9
changeset: 35521:329f6e7d18a9
user: Asier Martirena openbravo.com>
date: Fri Mar 08 10:14:41 2019 +0100
summary: Fixed issue 40339: The getNextCancelDocNo method is public now
details: https://code.openbravo.com/erp/devel/pi/rev/05cecb4beb70
changeset: 35522:05cecb4beb70
user: Asier Martirena openbravo.com>
date: Fri Mar 08 10:33:14 2019 +0100
summary: Related to issue 40209: The PLM Status is shown for not stocked
products
diffstat:
src-db/database/sourcedata/AD_FIELD.xml| 1 -
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diffs (23 lines):
diff -r db677cb3304b -r 05cecb4beb70 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 08 13:59:19 2019 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 08 10:33:14 2019 +0100
@@ -191263,7 +191263,6 @@
-
diff -r db677cb3304b -r 05cecb4beb70
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
--- a/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
Fri Mar 08 13:59:19 2019 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
Fri Mar 08 10:33:14 2019 +0100
@@ -1536,7 +1536,7 @@
* Document number of the cancelled order.
* @return The new document number for the order which cancels the old order.
*/
- private static String getNextCancelDocNo(String documentNo) {
+ public static String getNextCancelDocNo(String documentNo) {
String newDocNo = "";
String[] splittedDocNo = documentNo.split(HYPHEN);
if (splittedDocNo.length > 1) {
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 40272: code review improvements
details: https://code.openbravo.com/erp/devel/pi/rev/db677cb3304b
changeset: 35520:db677cb3304b
user: Carlos Aristu openbravo.com>
date: Fri Mar 08 13:59:19 2019 +0100
summary: related to issue 40272: code review improvements
Directly show the code in case it does not match with any existing support
status
diffstat:
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
diffs (26 lines):
diff -r e77b49e6d86d -r db677cb3304b
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.javaFri Mar
08 10:08:46 2019 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.javaFri Mar
08 13:59:19 2019 +0100
@@ -1991,13 +1991,19 @@
}
private String getSupportStatus(String supportCode, boolean detailed) {
-org.openbravo.model.ad.domain.List refValue = OBDal.getInstance()
+Optional optRefValue =
OBDal.getInstance()
.get(Reference.class, SUPPORT_STATUS_REF)
.getADListList()
.stream()
.filter(l -> supportCode.equals(l.getSearchKey()))
-.findAny()
-.get();
+.findAny();
+
+if (!optRefValue.isPresent()) {
+ // Unknown support status code, can't get its corresponding label
+ return supportCode;
+}
+
+org.openbravo.model.ad.domain.List refValue = optRefValue.get();
Optional trlListValue = refValue.getADListTrlList()
.stream()
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 40308: rearranged openbravo core posi...
details: https://code.openbravo.com/erp/devel/pi/rev/e77b49e6d86d changeset: 35519:e77b49e6d86d user: Asier Lostalé openbravo.com> date: Fri Mar 08 10:08:46 2019 +0100 summary: related to issue 40308: rearranged openbravo core position Having OpenbravoCore project on top of WebContent libraries, which includes openbravo-core.jar, allows to debug it and changed code to prevail over the one already compiled in the jar. diffstat: .classpath.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dc2f40d0a65e -r e77b49e6d86d .classpath.template --- a/.classpath.template Fri Mar 08 08:48:27 2019 +0100 +++ b/.classpath.template Fri Mar 08 10:08:46 2019 +0100 @@ -1,7 +1,7 @@ + - ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to bug 38791: minor cleanup
details: https://code.openbravo.com/erp/devel/pi/rev/dc2f40d0a65e
changeset: 35518:dc2f40d0a65e
user: Asier Lostalé openbravo.com>
date: Fri Mar 08 08:48:27 2019 +0100
summary: related to bug 38791: minor cleanup
Removed dead code: "null instanceof X" is false.
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
| 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 21de8b565a4b -r dc2f40d0a65e
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Thu Mar 07 13:02:14 2019 +0100
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Fri Mar 08 08:48:27 2019 +0100
@@ -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-2018 Openbravo SLU
+ * All portions are Copyright (C) 2009-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -636,13 +636,12 @@
: json.get(key);
if (refListCols.contains(key)) {
keyValue = refLists.get(key).get(keyValue);
- } else if (keyValue instanceof Number && keyValue != null) {
+ } else if (keyValue instanceof Number) {
// if the CSV decimal separator property is defined, used it over
the character
// defined in Format.xml
keyValue = keyValue.toString()
.replace(".",
prefDecimalSeparator != null ? prefDecimalSeparator :
decimalSeparator);
-
} else if (dateCols.contains(key) && keyValue != null
&& !keyValue.toString().equals("null")) {
Date date =
JsonUtils.createDateFormat().parse(keyValue.toString());
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
