buildbot success in on ofbizTrunkFramework

2018-09-03 Thread buildbot
The Buildbot has detected a restored build on builder ofbizTrunkFramework while 
building . Full details are available at:
https://ci.apache.org/builders/ofbizTrunkFramework/builds/382

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: lares_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' 
triggered this build
Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1839965
Blamelist: nmalin

Build succeeded!

Sincerely,
 -The Buildbot





svn commit: r1839965 - in /ofbiz/ofbiz-framework/trunk/applications: datamodel/entitydef/product-entitymodel.xml workeffort/entitydef/entitymodel_view.xml

2018-09-03 Thread nmalin
Author: nmalin
Date: Mon Sep  3 14:18:30 2018
New Revision: 1839965

URL: http://svn.apache.org/viewvc?rev=1839965=rev
Log:
Fixed: Warning in console logs related to entity definitions
(OFBIZ-10540)
I introduced two waring on log with the commit OFBIZ-10514 (Refactoring 
ContactMechWorker.get[Entity]ContactMechValueMap)
Thanks to Deepak Nigam to raise and correct it

Modified:

ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml

ofbiz/ofbiz-framework/trunk/applications/workeffort/entitydef/entitymodel_view.xml

Modified: 
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1839965=1839964=1839965=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
 Mon Sep  3 14:18:30 2018
@@ -1060,7 +1060,7 @@ under the License.
 
 
 
-
+
 
 
 

Modified: 
ofbiz/ofbiz-framework/trunk/applications/workeffort/entitydef/entitymodel_view.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=1839965=1839964=1839965=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/workeffort/entitydef/entitymodel_view.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/workeffort/entitydef/entitymodel_view.xml
 Mon Sep  3 14:18:30 2018
@@ -952,7 +952,6 @@ under the License.
 
 
 
-
 
 
 




svn propchange: r1839551 - svn:log

2018-09-03 Thread jleroux
Author: jleroux
Revision: 1839551
Modified property: svn:log

Modified: svn:log at Mon Sep  3 11:38:46 2018
--
--- svn:log (original)
+++ svn:log Mon Sep  3 11:38:46 2018
@@ -1,4 +1,4 @@
-Improved:
+Improved: Improve NL labels in OrderUiLabels.xml
 (OFBIZ-10543)
 
 Improve Dutch labels in Order component to enable adoption increase.



svn propchange: r1839927 - svn:log

2018-09-03 Thread swapnilmmane
Author: swapnilmmane
Revision: 1839927
Modified property: svn:log

Modified: svn:log at Mon Sep  3 11:10:43 2018
--
--- svn:log (original)
+++ svn:log Mon Sep  3 11:10:43 2018
@@ -1 +1 @@
-Removed the extra full stop from the sentence
+Improved: Removed the extra full stop from the sentence



svn commit: r1839936 - in /ofbiz/site/template/page: business-users.tpl.php developers.tpl.php

2018-09-03 Thread swapnilmmane
Author: swapnilmmane
Date: Mon Sep  3 10:56:40 2018
New Revision: 1839936

URL: http://svn.apache.org/viewvc?rev=1839936=rev
Log:
Improved: Changed URL from //localhost:8443/accounting to 
https://localhost:8443/accounting.

This changes was done in html files at r#1833497 but missed in tpl.php files.

Modified:
ofbiz/site/template/page/business-users.tpl.php
ofbiz/site/template/page/developers.tpl.php

Modified: ofbiz/site/template/page/business-users.tpl.php
URL: 
http://svn.apache.org/viewvc/ofbiz/site/template/page/business-users.tpl.php?rev=1839936=1839935=1839936=diff
==
--- ofbiz/site/template/page/business-users.tpl.php (original)
+++ ofbiz/site/template/page/business-users.tpl.php Mon Sep  3 10:56:40 2018
@@ -197,7 +197,7 @@
 
 NOTE: It is completely normal for the command line 
window to remain active while OFBiz is running (e.g at 91%).
 To log into OFBiz, navigate with your browser to 
-//localhost:8443/accounting
+https://localhost:8443/accounting;>https://localhost:8443/accounting
 and login with username "admin" and password 
"ofbiz"
 NOTE: These commands will build OFBiz and include demo 
data. For further details of how to build OFBiz without any demo data and a 
full list of all available commands, please take a look at the readme.md 
file
 

Modified: ofbiz/site/template/page/developers.tpl.php
URL: 
http://svn.apache.org/viewvc/ofbiz/site/template/page/developers.tpl.php?rev=1839936=1839935=1839936=diff
==
--- ofbiz/site/template/page/developers.tpl.php (original)
+++ ofbiz/site/template/page/developers.tpl.php Mon Sep  3 10:56:40 2018
@@ -86,7 +86,7 @@
 gradlew ofbiz
 
 To log into OFBiz, navigate with your browser to 
-//localhost:8443/accounting
+https://localhost:8443/accounting;>https://localhost:8443/accounting
 and login with username "admin" and password 
"ofbiz"
 Stopping OFBiz
 To stop OFBiz running locally, open a command line terminal window and 
navigate to the OFBiz directory and;




svn commit: r1839934 - in /ofbiz/site/template/page: about-ofbiz.tpl.php mailing-lists.tpl.php

2018-09-03 Thread swapnilmmane
Author: swapnilmmane
Date: Mon Sep  3 10:44:22 2018
New Revision: 1839934

URL: http://svn.apache.org/viewvc?rev=1839934=rev
Log:
Improved: Removed the extra full stop from the sentence
This changes was done in html files at rev#1839927 but missed in tpl.php files.

Thanks: Deepak Dixit for spotting and sharing the appropriate way to update the 
code base of the OFBiz site repository.

Modified:
ofbiz/site/template/page/about-ofbiz.tpl.php
ofbiz/site/template/page/mailing-lists.tpl.php

Modified: ofbiz/site/template/page/about-ofbiz.tpl.php
URL: 
http://svn.apache.org/viewvc/ofbiz/site/template/page/about-ofbiz.tpl.php?rev=1839934=1839933=1839934=diff
==
--- ofbiz/site/template/page/about-ofbiz.tpl.php (original)
+++ ofbiz/site/template/page/about-ofbiz.tpl.php Mon Sep  3 10:44:22 2018
@@ -46,7 +46,7 @@
  Developer Mailing List
 The developer list is strictly for topics related to the 
design and development of the OFBiz Project itself.
 Please don't ask questions relevant to User Mailing List in this 
Mailing List.
- If you are not sure to which list to post to then use the User Mailing 
List..
+ If you are not sure to which list to post to then use the User Mailing 
List.
 Developer List 

   
  Commit Mailing List

Modified: ofbiz/site/template/page/mailing-lists.tpl.php
URL: 
http://svn.apache.org/viewvc/ofbiz/site/template/page/mailing-lists.tpl.php?rev=1839934=1839933=1839934=diff
==
--- ofbiz/site/template/page/mailing-lists.tpl.php (original)
+++ ofbiz/site/template/page/mailing-lists.tpl.php Mon Sep  3 10:44:22 2018
@@ -48,7 +48,7 @@
Developer Mailing List
The developer list is strictly for topics related to the 
design and development of the OFBiz Project itself.
   Please don't ask questions relevant 
to User Mailing List in this Mailing List.
-   If you are not sure to which list to post to then use the User 
Mailing List..
+   If you are not sure to which list to post to then use the User 
Mailing List.
   Developer List
 
 




buildbot failure in on ofbizTrunkFramework

2018-09-03 Thread buildbot
The Buildbot has detected a new failure on builder ofbizTrunkFramework while 
building . Full details are available at:
https://ci.apache.org/builders/ofbizTrunkFramework/builds/381

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: orcus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' 
triggered this build
Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1839926
Blamelist: pgil

BUILD FAILED: failed shell_2

Sincerely,
 -The Buildbot





svn commit: r1839927 - in /ofbiz/site: about-ofbiz.html mailing-lists.html

2018-09-03 Thread swapnilmmane
Author: swapnilmmane
Date: Mon Sep  3 09:46:50 2018
New Revision: 1839927

URL: http://svn.apache.org/viewvc?rev=1839927=rev
Log:
Removed the extra full stop from the sentence

Modified:
ofbiz/site/about-ofbiz.html
ofbiz/site/mailing-lists.html

Modified: ofbiz/site/about-ofbiz.html
URL: 
http://svn.apache.org/viewvc/ofbiz/site/about-ofbiz.html?rev=1839927=1839926=1839927=diff
==
--- ofbiz/site/about-ofbiz.html (original)
+++ ofbiz/site/about-ofbiz.html Mon Sep  3 09:46:50 2018
@@ -144,7 +144,7 @@
  Developer Mailing List
 The developer list is strictly for topics related to the 
design and development of the OFBiz Project itself.
 Please don't ask questions relevant to User Mailing List in this 
Mailing List.
- If you are not sure to which list to post to then use the User Mailing 
List..
+ If you are not sure to which list to post to then use the User Mailing 
List.
 Developer List 

   
  Commit Mailing List

Modified: ofbiz/site/mailing-lists.html
URL: 
http://svn.apache.org/viewvc/ofbiz/site/mailing-lists.html?rev=1839927=1839926=1839927=diff
==
--- ofbiz/site/mailing-lists.html (original)
+++ ofbiz/site/mailing-lists.html Mon Sep  3 09:46:50 2018
@@ -146,7 +146,7 @@
Developer Mailing List
The developer list is strictly for topics related to the 
design and development of the OFBiz Project itself.
   Please don't ask questions relevant 
to User Mailing List in this Mailing List.
-   If you are not sure to which list to post to then use the User 
Mailing List..
+   If you are not sure to which list to post to then use the User 
Mailing List.
   Developer List
 
 




svn commit: r1839926 - /ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java

2018-09-03 Thread pgil
Author: pgil
Date: Mon Sep  3 09:33:21 2018
New Revision: 1839926

URL: http://svn.apache.org/viewvc?rev=1839926=rev
Log:
Implemented: Refactor EntityUtil findBy methods using Stream API
(OFBIZ-10537)

Fixed variable name to make it more meaningful

Modified:

ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java

Modified: 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java?rev=1839926=1839925=1839926=diff
==
--- 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
 Mon Sep  3 09:33:21 2018
@@ -465,11 +465,11 @@ public final class EntityUtil {
 return null;
 }
 
-Stream tStream = genericValueList.stream().map(genericValue -> 
UtilGenerics.cast(genericValue.get(fieldName)));
+Stream fieldListStream = genericValueList.stream().map(genericValue 
-> UtilGenerics.cast(genericValue.get(fieldName)));
 if (distinct) {
-return tStream.distinct().collect(toList());
+return fieldListStream.distinct().collect(toList());
 } else {
-return tStream.collect(toList());
+return fieldListStream.collect(toList());
 }
 }
 




svn commit: r1839914 - in /ofbiz/ofbiz-framework/trunk/applications: datamodel/entitydef/ order/config/ order/groovyScripts/entry/ order/servicedef/ order/src/main/java/org/apache/ofbiz/order/order/ o

2018-09-03 Thread jleroux
Author: jleroux
Date: Mon Sep  3 08:15:08 2018
New Revision: 1839914

URL: http://svn.apache.org/viewvc?rev=1839914=rev
Log:
Implemented: 'Reserve After Date' for order items
(OFBIZ-10534)

While creating orders from the backend, we have the option to set parameters 
like 'Ship After Date' and 'Ship Before Date' to manage the fulfilment cycle 
more efficiently. 

Inventory gets reserved for the product based on a FIFO basis. Sometimes the 
fulfilment time for the order is high and inventory unnecessarily gets locked 
for some time period.
 
We can introduce a new parameter (at order item level) 'Reserve After Date' 
which will indicate the date only after which reservation can happen. 
In this way, we can manage the stock availability more efficiently.
 
This issue relates to OFBIZ-10518

Thanks: Deepak Nigam  for the effort, Deepak Dixit for a review and suggestions

Modified:

ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml
ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml

ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy
ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services.xml

ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java

ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java

ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java

ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java

ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java

ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java

ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl

ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl

ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderHeaderInfo.ftl

ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl

Modified: 
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1839914=1839913=1839914=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml
 Mon Sep  3 08:15:08 2018
@@ -547,6 +547,7 @@ under the License.
   
   
   
+  
   Used to 
cancel all orders from suppliers when its in past
   Used to specify 
the override or actual glAccountId used for the adjustment, avoids problems if 
configuration changes after initial posting, etc.
   
@@ -2973,6 +2974,5 @@ under the License.
 
 
 
-
  
  

Modified: 
ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml?rev=1839914=1839913=1839914=diff
==
--- ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml Mon 
Sep  3 08:15:08 2018
@@ -12023,6 +12023,22 @@
 要求使用促销代码。
 要求使用促銷代碼.
 
+
+ Reserve After Date
+ Réserver après cette date
+
+
+ Default Reserve After Date
+ Date de réservation par défaut
+
+
+ Reserve After Date
+ Réserver après cette date
+
+
+ Default Reserve After Date
+ Date de réservation par défaut
+
 
 الموافقة للمسترجع
 Retoure annehmen

Modified: 
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy?rev=1839914=1839913=1839914=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy
 Mon Sep  3 08:15:08 2018
@@ -115,6 +115,7 @@ context.giftMessage = cart.getGiftMessag
 context.isGift = cart.getIsGift()
 

svn commit: r1839912 [1/2] - /ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml

2018-09-03 Thread jleroux
Author: jleroux
Date: Mon Sep  3 08:05:49 2018
New Revision: 1839912

URL: http://svn.apache.org/viewvc?rev=1839912=rev
Log:
Improved: Improve NL labels in ProductUiLabels.xml
(OFBIZ-10544)

Improves Dutch labels in Product component to enable adoption increase.

Thanks: Pierre Smits

Modified:
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml



svn commit: r1839912 [2/2] - /ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml

2018-09-03 Thread jleroux


Modified: 
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml?rev=1839912=1839911=1839912=diff
==
--- ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml 
Mon Sep  3 08:05:49 2018
@@ -80,6 +80,7 @@
 
 
 Create Sales Agreement
+Contract aanmaken
 
 
 Aktuelle Lieferkosten
@@ -13003,6 +13004,7 @@
 
 Verträge
 Agreements
+Contracten
 合同
 合約
 
@@ -13013,6 +13015,7 @@
 Accords
 Contratti
 契約
+Contracten
 Договора
 สัญญา
 Hợp đồng
@@ -13022,6 +13025,7 @@
 
 Product agreement use
 Accord produit utilisé
+Contractgebruik
 
 
 Gang
@@ -13030,6 +13034,7 @@
 Allée
 Corridoio
 通路
+Gang
 Coridor
 Проход
 ทางเดินระหว่างชั้นวางสินค้า
@@ -13044,6 +13049,7 @@
 Autoriser l'entreprise
 Permetti Az
 会社を許可
+Onderneming toestaan
 Permiti Az
 Разрешить Со
 ยอมรับบริษัท
@@ -13058,6 +13064,7 @@
 Autoriser l'adresse de l'entreprise
 Permetti Indirizzo Azienda
 会社住所を許可
+Ondernemingsadres toestaan
 Permiti Adresa Firma
 Разрешить адрес 
компании
 ยอมรับที่อยู่บริษัท
@@ -13072,6 +13079,7 @@
 Utilisé avec l'autorisation de l'adresse de 
l'entreprise
 Usato quando permesso indirizzo azienda
 許可会社住所を使用
+Toestaan bij adres
 Folosit cand este permisa adresa firmei
 Использовано с разреш. 
адресом компании
 ใช้กับยอมรับที่อยู่บริษัท
@@ -13086,6 +13094,7 @@
 Autoriser USPS
 Permetti USPS
 USPSを許可
+USPS toestaan
 Permis USPS
 Разрешить USPS
 ยอมรับ USPS
@@ -13100,6 +13109,7 @@
 Autoriser l'adresse USPS (Boîte postale, 
etc.)
 Permetti Indirizzo USPS (PO Box, RR, etc)
 USPS住所を許可 
(郵便番号、返金率等)
+USPS toestaan
 Permiti Adresa USPS (PO Box, RR, etc)
 Разрешить адрес USPS (П/ч, RR, и 
т.п.)
 Allow USPS Addr (PO Box, RR, etc)
@@ -13112,7 +13122,7 @@
 Customers who bought this item also 
bought:
 Clienti che hanno comprato questo prodotto hanno 
comprato anche:
 このアイテムを購入した人が他に購å…
¥ã—たもの
-Klanten die dit product kochten hebben ook 
gekocht:
+Klanten hebben ook gekocht:
 Khách hàng khi mua sản phẩm này thường 
hay quan tâm đến:
 购买了本商品的客户还买了:
 購買了本商品的客戶還買了:
@@ -13124,6 +13134,7 @@
 Remplacement
 Alternare
 代替
+Alternatief
 Alternare
 Альтернативное
 ทางเลือก
@@ -13153,6 +13164,7 @@
 Montant
 Importo
 金額
+Bedrag
 Valoare
 Количество
 จำนวน
@@ -13173,6 +13185,7 @@
 Type d'unité de mesure de montant [Réf.]
 Udm Importo
 金額単位種類ID
+Bedrag UoM soort
 Udm Valoare
 Количество чего?
 รหัสประเภ
ทหน่วยวัดจำนวน
@@ -13187,6 +13200,7 @@
 Et applique les caractéristiques à l'article 
référencé
 E Applica Caratteristiche al Prodotto con 
Codice
 また、IDで製品に機能を適用
+Kenmerken aan product toepassen
 Si Aplica Caracteristicile la Produsul cu 
Cod
 и применить особенности к 
продукту с кодом
 และใช้ลักษณะไปยังสินค้าด้วยรหัส
@@ -13202,6 +13216,7 @@
 E recipiente
 およびコンテナ
 Si recipient
+EN container
 И контейнер
 และภาชนะใส่ของ
 VÀ chứa
@@ -13215,6 +13230,7 @@
 Et quantité disponible
 E Quantità Disponibile
 および手持数量
+EN QoH
 Si Cantitate Disponibila
 И имеющееся количество