buildbot success in on ofbizTrunkFrameworkPlugins

[buildbot]

The Buildbot has detected a restored build on builder 
ofbizTrunkFrameworkPlugins while building . Full details are available at:
https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/108

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: downstream
Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1824437
Blamelist: nmalin

Build succeeded!

Sincerely,
 -The Buildbot

buildbot success in on ofbizTrunkFramework

[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/94

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r1824437 - /ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupForms.xml

[nmalin]

Author: nmalin
Date: Fri Feb 16 09:10:44 2018
New Revision: 1824437

URL: http://svn.apache.org/viewvc?rev=1824437=rev
Log:
Fixed: correct just a type introduce by editor auto-saving just before commit

Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupForms.xml

Modified: 
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1824437=1824436=1824437=diff
==
--- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupForms.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupForms.xml 
Fri Feb 16 09:10:44 2018
@@ -403,7 +403,7 @@ under the License.
 
 
 
-
+
 
 
 

svn commit: r1824436 - in /ofbiz/ofbiz-framework/trunk/applications: accounting/config/ accounting/servicedef/ accounting/webapp/accounting/WEB-INF/ accounting/widget/ datamodel/data/seed/ datamodel/e

[nmalin]

Author: nmalin
Date: Fri Feb 16 09:04:06 2018
New Revision: 1824436

URL: http://svn.apache.org/viewvc?rev=1824436=rev
Log:
Implemented: Add PartyPrefDocTypeTpl entity to link official template document 
to organisational party (OFBIZ-10186) 
With this entity we can link a customScreen with an organisational party for a 
document type like salesinvoice, product quote and so on.
I added screen, form and menu to manage them on the organisation party 
configuration page accounting/control/ListCompanies
Currently this isn't useful alone but needed for issues OFBIZ-10215, 
OFBIZ-10216, OFBIZ-10217 that will be completed soon

Modified:

ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml

ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_admin.xml

ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml

ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupForms.xml

ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml

ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml

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

Modified: 
ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1824436=1824435=1824436=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml
 Fri Feb 16 09:04:06 2018
@@ -542,6 +542,10 @@
 添加会员总账账户
 增加團體總帳科目
 
+
+Add document type template
+Ajouter un modèle pour le type de 
document
+
 
 إضافة عضو لمجموعة 
الدفعات
 Zahlungsgruppen-Mitglied hinzufügen
@@ -4550,6 +4554,10 @@
 描述
 描述
 
+
+Doc. Type template
+Modèle de type de doc.
+
 
 تعديل الدفعة
 Datum splatnosti
@@ -15436,6 +15444,18 @@
 现存数量合计
 現存數量合計
 
+
+Template for invoice
+Modèle pour facture
+
+
+Template for order
+Modèle pour commande
+
+
+Template for quote
+Modèle pour devis
+
 
 لقد تم رصد العملية 
سابقا
 Buchung wurde bereits ausgeführt

Modified: 
ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_admin.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_admin.xml?rev=1824436=1824435=1824436=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_admin.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_admin.xml
 Fri Feb 16 09:04:06 2018
@@ -60,6 +60,19 @@ under the License.
 
 
 
+
+Create a documentType preference for a party 
(organization)
+
+
+
+
+
+
+Expire a documentType preference for a party 
(organization)
+
+
+
+
 
 Get accounting preferences for a party 
(organization)

Modified: 
ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1824436=1824435=1824436=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
 Fri Feb 16 09:04:06 2018
@@ -1541,13 +1541,25 @@ under the License.
 
 
 
-
 
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -2743,6 +2755,7 @@ under the License.
 
 
 
+
 
 
 

Modified: 
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1824436=1824435=1824436=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml 
(original)

svn commit: r1824434 - /ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy

[jleroux]

Author: jleroux
Date: Fri Feb 16 08:53:20 2018
New Revision: 1824434

URL: http://svn.apache.org/viewvc?rev=1824434=rev
Log:
Improved: Fix Default or Empty Catch block in Java and Groovy files
(OFBIZ-8341)

Improves this "catch NumberFormatException", better message and return

Thanks: Michael Brohl for review

Modified:

ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy

Modified: 
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy?rev=1824434=1824433=1824434=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
 Fri Feb 16 08:53:20 2018
@@ -217,9 +217,9 @@ if (productIdToReceive) {
 try {
 quantity = Double.parseDouble(productQtyToReceive)
 } catch (NumberFormatException nfe) {
-// Ignore the quantity update if there's a problem parsing it
 Debug.logError(nfe, "Caught an exception : " + nfe.toString(), 
module)
-request.setAttribute("_ERROR_MESSAGE", "An exception occured 
please check the log")
+request.setAttribute("_ERROR_MESSAGE", "The quantity to update 
seems non-numeric")
+return
 }
 }