date:20171111

svn propchange: r1814944 - svn:log

2017-11-11 Thread deepak

Author: deepak
Revision: 1814944
Modified property: svn:log

Modified: svn:log at Sat Nov 11 12:28:04 2017
--
--- svn:log (original)
+++ svn:log Sat Nov 11 12:28:04 2017
@@ -1 +1 @@
-Improved: Removed unused our-users.html files, if needed we will add this in 
future.
+Improved: Removed unused our-users.html files, if needed we will add this in 
future.Also removed some unused images as well

svn commit: r1814944 - in /ofbiz/site: images/awards/ images/clients/ our-users.html template/page/our-users.tpl.php

2017-11-11 Thread deepak

Author: deepak
Date: Sat Nov 11 11:54:24 2017
New Revision: 1814944

URL: http://svn.apache.org/viewvc?rev=1814944&view=rev
Log:
Improved: Removed unused our-users.html files, if needed we will add this in 
future.

Removed:
ofbiz/site/images/awards/
ofbiz/site/images/clients/
ofbiz/site/our-users.html
ofbiz/site/template/page/our-users.tpl.php

svn commit: r1814936 - in /ofbiz/branches/release16.11: ./ applications/product/config/ProductPromoUiLabels.xml

2017-11-11 Thread jleroux

Author: jleroux
Date: Sat Nov 11 10:16:05 2017
New Revision: 1814936

URL: http://svn.apache.org/viewvc?rev=1814936&view=rev
Log:
"Applied fix from trunk framework for revision: 1814934" 

r1814934 | jleroux | 2017-11-11 11:15:23 +0100 (sam., 11 nov. 2017) | 9 lines

Fixed: Duplicated dollar symbols should be removed from uiLabels.
(OFBIZ-9968)

For example: In 'ProductPromoUiLabels.xml' file 
'ProductPromoCondition.PPIP_PRODUCT_TOTAL', 
'ProductPromoCondition.PPIP_PRODUCT_AMOUNT' etc. 
uilabels contain duplicated dollar symbols 

Thanks: Sonal Patwari



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

ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml

Propchange: ofbiz/branches/release16.11/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 11 10:16:05 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
+/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
 
/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/product/config/ProductPromoUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml?rev=1814936&r1=1814935&r2=1814936&view=diff
==
--- 
ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml
 (original)
+++ 
ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml
 Sat Nov 11 10:16:05 2017
@@ -77,9 +77,9 @@
 å¤§äºçäº
 
 
-spend ${quantityOperator} $${condValue}
-è±è´¹ ${quantityOperator} $${condValue}
-è±è²» ${quantityOperator} 
$${condValue}
+spend ${quantityOperator} ${condValue}
+è±è´¹ ${quantityOperator} ${condValue}
+è±è²» ${quantityOperator} ${condValue}
 
 
 Applied to party classification - 
${partyClassificationsIncluded}
@@ -88,14 +88,14 @@
 Not applied to party classification - 
${partyClassificationsExcluded}
 
 
-buy ${quantityOperator} $${condValue} of 
qualifying products
-è´ä¹° ${quantityOperator} $${condValue} çåæ 
¼äº§å
-è³¼è²· ${quantityOperator} $${condValue} 
çåæ ¼ç¢å
+buy ${quantityOperator} ${condValue} of 
qualifying products
+è´ä¹° ${quantityOperator} ${condValue} çåæ 
¼äº§å
+è³¼è²· ${quantityOperator} ${condValue} 
çåæ ¼ç¢å
 
 
-for each $${condValue} or more of qualifying 
products
-å¯¹äºæ¯ä¸ª $${condValue} ææ´å¤çåæ 
¼äº§å
-å°äºæ¯å $${condValue} ææ´å¤çåæ 
¼ç¢å
+for each ${condValue} or more of qualifying 
products
+

svn commit: r1814934 - /ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml

2017-11-11 Thread jleroux

Author: jleroux
Date: Sat Nov 11 10:15:23 2017
New Revision: 1814934

URL: http://svn.apache.org/viewvc?rev=1814934&view=rev
Log:
Fixed: Duplicated dollar symbols should be removed from uiLabels.
(OFBIZ-9968)

For example: In 'ProductPromoUiLabels.xml' file 
'ProductPromoCondition.PPIP_PRODUCT_TOTAL', 
'ProductPromoCondition.PPIP_PRODUCT_AMOUNT' etc. 
uilabels contain duplicated dollar symbols 

Thanks: Sonal Patwari

Modified:

ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml

Modified: 
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml?rev=1814934&r1=1814933&r2=1814934&view=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml
 Sat Nov 11 10:15:23 2017
@@ -77,9 +77,9 @@
 å¤§äºçäº
 
 
-spend ${quantityOperator} $${condValue}
-è±è´¹ ${quantityOperator} $${condValue}
-è±è²» ${quantityOperator} 
$${condValue}
+spend ${quantityOperator} ${condValue}
+è±è´¹ ${quantityOperator} ${condValue}
+è±è²» ${quantityOperator} ${condValue}
 
 
 Applied to party classification - 
${partyClassificationsIncluded}
@@ -88,14 +88,14 @@
 Not applied to party classification - 
${partyClassificationsExcluded}
 
 
-buy ${quantityOperator} $${condValue} of 
qualifying products
-è´ä¹° ${quantityOperator} $${condValue} çåæ 
¼äº§å
-è³¼è²· ${quantityOperator} $${condValue} 
çåæ ¼ç¢å
+buy ${quantityOperator} ${condValue} of 
qualifying products
+è´ä¹° ${quantityOperator} ${condValue} çåæ 
¼äº§å
+è³¼è²· ${quantityOperator} ${condValue} 
çåæ ¼ç¢å
 
 
-for each $${condValue} or more of qualifying 
products
-å¯¹äºæ¯ä¸ª $${condValue} ææ´å¤çåæ 
¼äº§å
-å°äºæ¯å $${condValue} ææ´å¤çåæ 
¼ç¢å
+for each ${condValue} or more of qualifying 
products
+å¯¹äºæ¯ä¸ª ${condValue} ææ´å¤çåæ 
¼äº§å
+å°äºæ¯å ${condValue} ææ´å¤çåæ 
¼ç¢å
 
 
 buy ${condValue} of qualifying products
@@ -138,14 +138,14 @@
 å¾å° ${quantity} æææ£ ${amount}%
 
 
-get ${quantity} at $${amount} off
-å¾å° ${quantity} æ $${amount} æ£é¤
-å¾å° ${quantity} æ $${amount} 
æ£é¤
+get ${quantity} at ${amount} off
+å¾å° ${quantity} æ ${amount} æ£é¤
+å¾å° ${quantity} æ ${amount} æ£é¤
 
 
-get ${quantity} for $${amount}
-å¾å° ${quantity} æ $${amount} è®¡ç®
-å¾å° ${quantity} æ $${amount} 
è¨ç®
+get ${quantity} for ${amount}
+å¾å° ${quantity} æ ${amount} è®¡ç®
+å¾å° ${quantity} æ ${amount} è¨ç®
 
 
 get ${amount}% off your order
@@ -153,8 +153,8 @@
 å¾å° ${amount}% å¾ä½ çè¨å®æ£é¤
 
 
-get $${amount} off your order
-å¾å° $${amount} ä»ä½ çè®¢åæ£é¤
-å¾å° $${amount} å¾ä½ çè¨å®æ£é¤
+get ${amount} off your order
+å¾å° ${amount} ä»ä½ çè®¢åæ£é¤
+å¾å° ${amount} å¾ä½ çè¨å®æ£é¤
 
 
\ No newline at end of file

buildbot success in on ofbiz-trunk-framework

2017-11-11 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/692

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] 1814928
Blamelist: deepak

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r1814929 - in /ofbiz/branches/release16.11: ./ applications/marketing/servicedef/services.xml applications/marketing/widget/ContactListForms.xml

2017-11-11 Thread deepak

Author: deepak
Date: Sat Nov 11 08:49:28 2017
New Revision: 1814929

URL: http://svn.apache.org/viewvc?rev=1814929&view=rev
Log:
Applied fix from trunk for revision: 1814928 
===

Fixed: Party Id field missing while creating contact list party in the 
marketing component (OFBIZ-9698)
Thanks Rubia Elza Joshep for reporting the issue.

Modified:
ofbiz/branches/release16.11/   (props changed)
ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml

ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml

Propchange: ofbiz/branches/release16.11/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 11 08:49:28 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
+/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
 
/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/marketing/servicedef/services.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml?rev=1814929&r1=1814928&r2=1814929&view=diff
==
--- ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml 
(original)
+++ ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml 
Sat Nov 11 08:49:28 2017
@@ -135,7 +135,8 @@ under the License.
 
location="component://marketing/minilang/marketing/contact/ContactListServices.xml"
 invoke="updateContactListParty" auth="true">
 Update Party to ContactList Join
 
-
+
+
 
 
 

Modified: 
ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml?rev=1814929&r1=1814928&r2=1814929&view=diff
==
--- 
ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml 
(original)
+++ 
ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml 
Sat Nov 11 08:49:28 2017
@@ -147,11 +147,11 @@ under the License.
 
 
 
-
-
+
+
+
+
 
-
-
 
 
 
@@ -167,8 +167,8 @@ under the License.
 
 
 
-
-
+
+

svn commit: r1814928 - in /ofbiz/ofbiz-framework/trunk/applications/marketing: servicedef/services.xml widget/ContactListForms.xml

2017-11-11 Thread deepak

Author: deepak
Date: Sat Nov 11 08:47:12 2017
New Revision: 1814928

URL: http://svn.apache.org/viewvc?rev=1814928&view=rev
Log:
Fixed: Party Id field missing while creating contact list party in the 
marketing component (OFBIZ-9698)
Thanks Rubia Elza Joshep for reporting the issue.

Modified:
ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml

ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml

Modified: 
ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml?rev=1814928&r1=1814927&r2=1814928&view=diff
==
--- ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml 
Sat Nov 11 08:47:12 2017
@@ -191,7 +191,8 @@ under the License.
 
location="component://marketing/minilang/marketing/contact/ContactListServices.xml"
 invoke="updateContactListParty" auth="true">
 Update Party to ContactList Join
 
-
+
+
 
 
 

Modified: 
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml?rev=1814928&r1=1814927&r2=1814928&view=diff
==
--- 
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml 
(original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml 
Sat Nov 11 08:47:12 2017
@@ -147,11 +147,11 @@ under the License.
 
 
 
-
-
+
+
+
+
 
-
-
 
 
 
@@ -167,8 +167,8 @@ under the License.
 
 
 
-
-
+
+

svn commit: r1814927 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl

2017-11-11 Thread deepak

Author: deepak
Date: Sat Nov 11 08:33:29 2017
New Revision: 1814927

URL: http://svn.apache.org/viewvc?rev=1814927&view=rev
Log:
Fixed: Fixed typo introdued at r#1814924

Modified:

ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl

Modified: 
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1814927&r1=1814926&r2=1814927&view=diff
==
--- 
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
 Sat Nov 11 08:33:29 2017
@@ -48,7 +48,7 @@ under the License.
 
 <#macro renderHyperlinkField>
 
-<#macro renderTextField name className alert value="" textSize="" maxlength="" 
id="" event="" action="" disabled="" clientAutocomplete"" ajaxUrl="" 
ajaxEnabled="" mask="" tabindex="" readonly="" placeholder="" 
delegatorName="default">
+<#macro renderTextField name className alert value="" textSize="" maxlength="" 
id="" event="" action="" disabled="" clientAutocomplete="" ajaxUrl="" 
ajaxEnabled="" mask="" tabindex="" readonly="" placeholder="" 
delegatorName="default">
   
 <@renderClass className alert />
 <#if value?has_content> value="${value}"<#rt/>

svn propchange: r1814944 - svn:log

svn commit: r1814944 - in /ofbiz/site: images/awards/ images/clients/ our-users.html template/page/our-users.tpl.php

svn commit: r1814936 - in /ofbiz/branches/release16.11: ./ applications/product/config/ProductPromoUiLabels.xml

svn commit: r1814934 - /ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml

buildbot success in on ofbiz-trunk-framework

svn commit: r1814929 - in /ofbiz/branches/release16.11: ./ applications/marketing/servicedef/services.xml applications/marketing/widget/ContactListForms.xml

svn commit: r1814928 - in /ofbiz/ofbiz-framework/trunk/applications/marketing: servicedef/services.xml widget/ContactListForms.xml

svn commit: r1814927 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl

8 matches

Site Navigation

Mail list logo

Footer information