svn commit: r1816796 - in /ofbiz/branches/release16.11: ./ applications/order/minilang/order/OrderServices.xml

2017-11-30 Thread jleroux 
Author: jleroux
Date: Fri Dec  1 04:50:34 2017
New Revision: 1816796

URL: http://svn.apache.org/viewvc?rev=1816796=rev
Log:
"Applied fix from trunk framework for revision: 1816795  " 

r1816795 | jleroux | 2017-12-01 05:49:34 +0100 (ven., 01 déc. 2017) | 14 lines

Fixed: In 'updateOrderContactMech' service, A check should be added to call 
'removeOrderContactMech'.
(OFBIZ-9967)

In case, user don't create orderContactMech while creating an order and wish to 
create orderContactMech after the creation then, 'updateOrderContactMech' 
throws error of 'oldContactMechId' parameter missing in 'removeOrderContactMech'
 service.

Adds a 'if-not-empty' check for 'oldContactMechId' field i.e, if 
'oldContactMechId' is available then only 'removeOrderContactMech' service 
should be called in 'updateOrderContactMech' service.

Thanks: Sonal Patwari



Modified:
ofbiz/branches/release16.11/   (props changed)

ofbiz/branches/release16.11/applications/order/minilang/order/OrderServices.xml

Propchange: ofbiz/branches/release16.11/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  1 04:50:34 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373,
 1816461,1816635
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373,
 1816461,1816635,1816795
 
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: 
ofbiz/branches/release16.11/applications/order/minilang/order/OrderServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/minilang/order/OrderServices.xml?rev=1816796=1816795=1816796=diff
==
--- 
ofbiz/branches/release16.11/applications/order/minilang/order/OrderServices.xml 
(original)
+++ 
ofbiz/branches/release16.11/applications/order/minilang/order/OrderServices.xml 
Fri Dec  1 04:50:34 2017
@@ -708,8 +708,10 @@ under the License.
 
 
 
-
-
+
+
+
+

svn commit: r1816795 - /ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml

2017-11-30 Thread jleroux 
Author: jleroux
Date: Fri Dec  1 04:49:34 2017
New Revision: 1816795

URL: http://svn.apache.org/viewvc?rev=1816795=rev
Log:
Fixed: In 'updateOrderContactMech' service, A check should be added to call 
'removeOrderContactMech'.
(OFBIZ-9967)

In case, user don't create orderContactMech while creating an order and wish to 
create orderContactMech after the creation then, 'updateOrderContactMech' 
throws error of 'oldContactMechId' parameter missing in 'removeOrderContactMech'
 service.

Adds a 'if-not-empty' check for 'oldContactMechId' field i.e, if 
'oldContactMechId' is available then only 'removeOrderContactMech' service 
should be called in 'updateOrderContactMech' service.

Thanks: Sonal Patwari

Modified:

ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml

Modified: 
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml?rev=1816795=1816794=1816795=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml 
(original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml 
Fri Dec  1 04:49:34 2017
@@ -708,8 +708,10 @@ under the License.
 
 
 
-
-
+
+
+
+

buildbot success in on ofbiz-trunk-framework

2017-11-30 Thread buildbot 
The Buildbot has detected a restored build on builder ofbiz-trunk-framework 
while building . Full details are available at:
https://ci.apache.org/builders/ofbiz-trunk-framework/builds/751

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 
'on-ofbiz-framework-commit' triggered this build
Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1816706
Blamelist: jleroux

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r1816706 - /ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js

2017-11-30 Thread jleroux 
Author: jleroux
Date: Thu Nov 30 10:53:13 2017
New Revision: 1816706

URL: http://svn.apache.org/viewvc?rev=1816706=rev
Log:
No functional change, better use console.error() here

Modified:

ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js

Modified: 
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js?rev=1816706=1816705=1816706=diff
==
--- 
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
 Thu Nov 30 10:53:13 2017
@@ -25,7 +25,7 @@ $.ajax({
 data: "localeName=" + timezone,
 error: function(error) {
 if (error != "") {
-console.log("Error while setting user locale: ", error);
+console.error("Error while setting user locale: ", error);
 }
 }
 });