svn commit: r1587173 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1587173 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Apr 14 10:16:37 2014 New Revision: 1587173 URL: http://svn.apache.org/r1587173 Log: Merges trunk HEAD in SEO branch Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData_IL.xml - copied unchanged from r1587167, ofbiz/trunk/framework/common/data/GeoData_IL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData_MY.xml - copied unchanged from r1587167, ofbiz/trunk/framework/common/data/GeoData_MY.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData_TH.xml - copied unchanged from r1587167, ofbiz/trunk/framework/common/data/GeoData_TH.xml Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/general.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/widget/EbayStoreForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderTestData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1583264-1587167 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml Mon Apr 14 10:16:37 2014 @@ -2165,7 +2165,7 @@ <value xml:lang="de">Anzahl Tage für Auftragskondition : ${orderTermDays}</value> <value xml:lang="en">Order Term Days : ${orderTermDays}</value> <value xml:lang="es">DÃas de los términos del pedido : ${orderTermDays}</value> - <value xml:lang="fr">Jours des termes de la commande : ${orderTermDays}</value> + <value xml:lang="fr">Jours de condition de réglement de la commande : ${orderTermDays}</value> <value xml:lang="it">Temini Giorni Ordine : ${orderTermDays}</value> <value xml:lang="ja">注ææ¡ä»¶æ¥æ°: ${orderTermDays}</value> <value xml:lang="pt_BR">Dias para o prazo do pedido: ${orderTermDays}</value> @@ -2189,7 +2189,7 @@ <value xml:lang="de">Auftragskonditions-Typ wird benötigt. </value> <value xml:lang="en">Order Term Type is required. </value> <value xml:lang="es">El tipo de término del pedido es requerido.</value> - <value xml:lang="fr">Le type de terme de la commande est exigé. </value> + <value xml:lang="fr">Le type condition de réglement de la commande est exigé. </value> <value xml:lang="it">Tipo Termine Ordine è richiesto. </value> <value xml:lang="ja">注ææ¡ä»¶ç¨®é¡ãå¿ è¦ã§ãã</value> <value xml:lang="pt_BR">Tipo de prazo de pedido é obrigatório. </value> @@ -2204,7 +2204,7 @@ <value xml:lang="de">Wert der Auftragskondition : ${orderTermValue}</value> <value xml:lang="en">Order Term Value : ${orderTermValue}</value> <value xml:lang="es">Valor de los términos del pedido : ${orderTermValue}</value> - <value xml:lang="fr">Valeur des termes de la commande : ${orderTermValue}</value> + <value xml:lang="fr">Valeur de condition de réglement de la commande : ${orderTermValue}</value> <value xml:lang="it">Valore Termine Ordine : ${orderTermValue}</value> <value xml:lang="ja">注ææ¡ä»¶å¤: ${orderTermValue}</value> <value xml:lang="pt_BR">Valor para o prazo do pedido: ${orderTermValue}</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml Mon Apr 14 10:16:37 2014 @@ -8522,7 +8522,7 @@ <value xml:lang="de">Konditionstyp</value> <value xml:lang="en">Term Type</value> <value xml:lang="es">Tipo</value> - <value xml:lang="fr">Type de besoin</value> + <value xml:lang="fr">Type de condition de réglement</value> <value xml:lang="it">Tipo Termine</value> <value xml:lang="ja">æ¡ä»¶ç¨®é¡</value> <value xml:lang="nl">Soort conditie</value> @@ -8539,7 +8539,7 @@ <value xml:lang="de">Kondition Wert</value> <value xml:lang="en">Term Value</value> <value xml:lang="es">Valor</value> - <value xml:lang="fr">Valeur de besoin</value> + <value xml:lang="fr">Valeur de condition de réglement</value> <value xml:lang="it">Valore Termine</value> <value xml:lang="ja">æ¡ä»¶å¤</value> <value xml:lang="nl">Conditie-waarde</value> @@ -8556,7 +8556,7 @@ <value xml:lang="de">Auftragskonditionen</value> <value xml:lang="en">Order Terms</value> <value xml:lang="es">Condiciones del pedido</value> - <value xml:lang="fr">Conditions de commande</value> + <value xml:lang="fr">Conditions de réglement de commande</value> <value xml:lang="it">Condizioni d'ordine</value> <value xml:lang="ja">注ææ¡ä»¶</value> <value xml:lang="nl">Bestelvoorwaarden</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon Apr 14 10:16:37 2014 @@ -322,7 +322,7 @@ under the License. <div class="form-row"> <label for="countryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label> <div class="form-field"> - <select name="shipToCountryGeoId" id="countryGeoId" class="required" style="width: 70%"> + <select name="shipToCountryGeoId" id="countryGeoId" class="required"> <#if countryGeoId?exists> <option value="${countryGeoId}">${countryGeoId}</option> </#if> @@ -333,7 +333,7 @@ under the License. <div class="form-row"> <label for="stateProvinceGeoId">${uiLabelMap.PartyState}* <span id="advice-required-stateProvinceGeoId" style="display: none" class="custom-advice">(required)</span></label> <div class="form-field"> - <select name="shipToStateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%"> + <select name="shipToStateProvinceGeoId" id="stateProvinceGeoId"> <#if stateProvinceGeoId?has_content> <option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option> <#else> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Mon Apr 14 10:16:37 2014 @@ -567,7 +567,11 @@ public class DateTimeConverters implemen df = UtilDateTime.toDateFormat(formatString, timeZone, locale); } try { - return new java.sql.Date(df.parse(trimStr).getTime()); + java.util.Date parsedDate = df.parse(trimStr); + Calendar cal = UtilDateTime.toCalendar(parsedDate, timeZone, locale); + cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + cal.set(Calendar.MILLISECOND, 0); + return new java.sql.Date(cal.getTimeInMillis()); } catch (ParseException e) { throw new ConversionException(e); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java Mon Apr 14 10:16:37 2014 @@ -676,19 +676,22 @@ public class UtilHttp { public static TimeZone getTimeZone(HttpServletRequest request) { HttpSession session = request.getSession(); - TimeZone timeZone = (TimeZone) session.getAttribute("timeZone"); - if (timeZone == null) { - String tzId = null; - Map<String, String> userLogin = UtilGenerics.cast(session.getAttribute("userLogin")); - if (userLogin != null) { - tzId = userLogin.get("lastTimeZone"); + TimeZone timeZone = null; + Map<String, String> userLogin = UtilGenerics.cast(session.getAttribute("userLogin")); + if (userLogin != null) { + String tzId = userLogin.get("lastTimeZone"); + if (tzId != null) { + timeZone = TimeZone.getTimeZone(tzId); } - timeZone = UtilDateTime.toTimeZone(tzId); - session.setAttribute("timeZone", timeZone); } + if (timeZone == null) { + timeZone = TimeZone.getDefault(); + } + session.setAttribute("timeZone", timeZone); return timeZone; } + /** * Get the currency string from the session. * @param session HttpSession object to use for lookup Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java Mon Apr 14 10:16:37 2014 @@ -34,10 +34,13 @@ import org.ofbiz.base.test.GenericTestCa import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.TimeDuration; +import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilXml; import org.w3c.dom.Document; +import com.ibm.icu.util.Calendar; + @SourceMonitored public class ObjectTypeTests extends GenericTestCaseBase { public static final String module = ObjectTypeTests.class.getName(); @@ -53,7 +56,7 @@ public class ObjectTypeTests extends Gen private final Timestamp tstmp = new Timestamp(781L); private final Timestamp ntstmp; private final java.util.Date utlDt = new java.util.Date(781); - private final java.sql.Date sqlDt = new java.sql.Date(-129600000); + private final java.sql.Date sqlDt; private final java.sql.Time sqlTm = new java.sql.Time(2096000); private final List<Object> list; private final Map<String, Object> map; @@ -72,6 +75,10 @@ public class ObjectTypeTests extends Gen map.put("two", "2"); map.put("three", "3"); set = new LinkedHashSet<Object>(list); + Calendar cal = UtilDateTime.getCalendarInstance(localeData.goodTimeZone, localeData.goodLocale); + cal.set(1969, Calendar.DECEMBER, 31, 0, 0, 0); + cal.set(Calendar.MILLISECOND, 0); + sqlDt = new java.sql.Date(cal.getTimeInMillis()); } public static class LocaleData { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/general.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/general.properties?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/general.properties (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/general.properties Mon Apr 14 10:16:37 2014 @@ -132,5 +132,5 @@ mail.spam.value=YES multitenant=N # -- Y if you use a cluster. Most of the time this should not be needed. Setting distributed-cache-clear-enabled="true" is enough -# -- to guarantee no sequenceIds duplicates. See OFBIZ-2353 for details -cluster=N +# -- to guarantee no sequenceIds duplicates. See OFBIZ-2353 and look for "DCC" in wiki for details +clustered=N Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml Mon Apr 14 10:16:37 2014 @@ -361,4 +361,7 @@ under the License. <CountryAddressFormat geoId="ITA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> <CountryAddressFormat geoId="CHE" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> <CountryAddressFormat geoId="FRA" geoAssocTypeId="" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="MYS" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="THA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="ISR" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> </entity-engine-xml> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/ofbiz-component.xml?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/ofbiz-component.xml Mon Apr 14 10:16:37 2014 @@ -46,14 +46,18 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_ES.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_FR.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IE.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IL.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IN.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IT.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_JP.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MX.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MY.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_NL.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_PL.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_TH.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_UK.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_US.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/LanguageData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/UnitData.xml"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java Mon Apr 14 10:16:37 2014 @@ -79,6 +79,11 @@ public final class SetCalendar extends M return elementModified; } + // Fix for some Java versions that throw an exception when the String includes a "+". + private static int parseInt(String intStr) { + return Integer.parseInt(intStr.replace("+", "")); + } + private final FlexibleStringExpander daysFse; private final FlexibleStringExpander defaultFse; private final FlexibleMapAccessor<Object> fieldFma; @@ -194,25 +199,25 @@ public final class SetCalendar extends M } fromStamp = (Timestamp) MiniLangUtil.convertType(newValue, java.sql.Timestamp.class, locale, timeZone, UtilDateTime.DATE_TIME_FORMAT); if (!this.yearsFse.isEmpty()) { - years= Integer.parseInt(this.yearsFse.expandString(methodContext.getEnvMap())); + years= parseInt(this.yearsFse.expandString(methodContext.getEnvMap())); } if (!this.monthsFse.isEmpty()) { - months = Integer.parseInt(this.monthsFse.expandString(methodContext.getEnvMap())); + months = parseInt(this.monthsFse.expandString(methodContext.getEnvMap())); } if (!this.daysFse.isEmpty()) { - days = Integer.parseInt(this.daysFse.expandString(methodContext.getEnvMap())); + days = parseInt(this.daysFse.expandString(methodContext.getEnvMap())); } if (!this.hoursFse.isEmpty()) { - hours = Integer.parseInt(this.hoursFse.expandString(methodContext.getEnvMap())); + hours = parseInt(this.hoursFse.expandString(methodContext.getEnvMap())); } if (!this.minutesFse.isEmpty()) { - minutes = Integer.parseInt(this.minutesFse.expandString(methodContext.getEnvMap())); + minutes = parseInt(this.minutesFse.expandString(methodContext.getEnvMap())); } if (!this.secondsFse.isEmpty()) { - seconds = Integer.parseInt(this.secondsFse.expandString(methodContext.getEnvMap())); + seconds = parseInt(this.secondsFse.expandString(methodContext.getEnvMap())); } if (!this.millisFse.isEmpty()) { - millis = Integer.parseInt(this.millisFse.expandString(methodContext.getEnvMap())); + millis = parseInt(this.millisFse.expandString(methodContext.getEnvMap())); } } catch (Exception e) { throw new MiniLangRuntimeException("Exception thrown while parsing attributes: " + e.getMessage(), this); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl Mon Apr 14 10:16:37 2014 @@ -50,7 +50,7 @@ under the License. <#macro renderHiddenField name value id event action></#macro> <#macro renderIgnoredField></#macro> -<#macro renderFieldTitle style title id="" fieldHelpText=""><@renderField title />,</#macro> +<#macro renderFieldTitle style title id="" fieldHelpText="" for=""><@renderField title />,</#macro> <#macro renderSingleFormFieldTitle></#macro> <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit></#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl Mon Apr 14 10:16:37 2014 @@ -73,7 +73,7 @@ under the License. <#macro renderHiddenField name value id event action></#macro> <#macro renderIgnoredField></#macro> -<#macro renderFieldTitle style title id fieldHelpText="">${title?default("")?replace(" ", " ")}</#macro> +<#macro renderFieldTitle style title id fieldHelpText="" for="">${title?default("")?replace(" ", " ")}</#macro> <#macro renderSingleFormFieldTitle title>${title?default("")}</#macro> <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name viewIndexField viewSizeField viewIndex viewSize useRowSubmit></#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl Mon Apr 14 10:16:37 2014 @@ -50,7 +50,7 @@ under the License. <#macro renderHiddenField name value id event action></#macro> <#macro renderIgnoredField></#macro> -<#macro renderFieldTitle style title id fieldHelpText=""><@renderField title /></#macro> +<#macro renderFieldTitle style title id fieldHelpText="" for=""><@renderField title /></#macro> <#macro renderSingleFormFieldTitle></#macro> <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit></#macro> @@ -116,4 +116,4 @@ under the License. <#macro renderSortField style title linkUrl ajaxEnabled tooltip=""><@renderFieldTitle style title /></#macro> <#macro formatBoundaryComment boundaryType widgetType widgetName></#macro> <#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description><@renderField description /></#macro> -<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc alternate linkUrl targetWindow description><@renderField description /></#macro> \ No newline at end of file +<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc alternate linkUrl targetWindow description><@renderField description /></#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl Mon Apr 14 10:16:37 2014 @@ -58,7 +58,7 @@ under the License. <#macro renderHiddenField name value id event action></#macro> <#macro renderIgnoredField></#macro> -<#macro renderFieldTitle style title id fieldHelpText=""></#macro> +<#macro renderFieldTitle style title id fieldHelpText="" for=""></#macro> <#macro renderSingleFormFieldTitle title></#macro> <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name viewIndexField viewSizeField viewIndex viewSize useRowSubmit></#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/widget/EbayStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/widget/EbayStoreForms.xml Mon Apr 14 10:16:37 2014 @@ -17,7 +17,6 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. -value="${bsh:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/> --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderTestData.xml Mon Apr 14 10:16:37 2014 @@ -97,7 +97,7 @@ under the License. <OrderRole orderId="Demo1001" partyId="DemoSupplier" roleTypeId="SUPPLIER_AGENT"/> <OrderItemShipGroup orderId="Demo1001" shipGroupSeqId="00001" shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" contactMechId="9200" maySplit="N" isGift="N" estimatedDeliveryDate="2009-08-13 17:43:53.0"/> <OrderItemShipGroupAssoc orderId="Demo1001" orderItemSeqId="00001" shipGroupSeqId="00001" quantity="2.000000"/> - + <OrderStatus orderStatusId="9009" statusId="ORDER_CREATED" orderId="Demo1001" statusDatetime="2009-08-13 17:45:50.419" statusUserLogin="admin"/> <OrderStatus orderStatusId="9010" statusId="ITEM_CREATED" orderId="Demo1001" orderItemSeqId="00001" statusDatetime="2009-08-13 17:45:50.419" statusUserLogin="admin"/> <OrderStatus orderStatusId="9011" statusId="ITEM_APPROVED" orderId="Demo1001" orderItemSeqId="00001" statusDatetime="2009-08-13 17:46:15.144" statusUserLogin="admin"/> @@ -105,7 +105,7 @@ under the License. <OrderStatus orderStatusId="9013" statusId="ITEM_COMPLETED" orderId="Demo1001" orderItemSeqId="00001" statusDatetime="2009-08-13 17:47:47.292" statusUserLogin="admin"/> <OrderStatus orderStatusId="9014" statusId="ORDER_COMPLETED" orderId="Demo1001" statusDatetime="2009-08-13 17:47:47.344" statusUserLogin="admin"/> <OrderContactMech orderId="Demo1001" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9200"/> - + <Shipment shipmentId="9997" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_RECEIVED" primaryOrderId="Demo1001" primaryShipGroupSeqId="00001" estimatedShipCost="0.00" destinationFacilityId="WebStoreWarehouse" destinationContactMechId="9200" destinationTelecomNumberId="9201" partyIdFrom="DemoSupplier" createdDate="2008-06-10 12:59:26.8"/> <ShipmentItem shipmentId="9997" shipmentItemSeqId="00001" productId="GZ-2644" quantity="2.000000"/> <ShipmentRouteSegment shipmentId="9997" shipmentRouteSegmentId="00001" destFacilityId="WebStoreWarehouse" destContactMechId="9200" destTelecomNumberId="9201" carrierPartyId="_NA_" shipmentMethodTypeId="NO_SHIPPING" carrierServiceStatusId="SHRSCS_NOT_STARTED"/> @@ -118,7 +118,7 @@ under the License. <AcctgTrans acctgTransId="9000" acctgTransTypeId="SHIPMENT_RECEIPT" transactionDate="2009-08-13 17:47:48.642" isPosted="Y" postedDate="2009-08-13 17:47:49.281" glFiscalTypeId="ACTUAL" partyId="DemoSupplier" shipmentId="9997"/> <AcctgTransEntry acctgTransId="9000" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" productId="GZ-2644" glAccountTypeId="UNINVOICED_SHIP_RCPT" glAccountId="214000" organizationPartyId="Company" amount="48.00" currencyUomId="USD" origAmount="48.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> <AcctgTransEntry acctgTransId="9000" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" productId="GZ-2644" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000" organizationPartyId="Company" amount="48.00" currencyUomId="USD" origAmount="48.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> - + <InventoryItem inventoryItemId="9025" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-2644" ownerPartyId="Company" datetimeReceived="2009-08-13 17:47:31.095" facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL01" quantityOnHandTotal="2.000000" availableToPromiseTotal="2.000000" unitCost="24.000000" currencyUomId="USD"/> <ShipmentReceipt receiptId="9000" inventoryItemId="9025" productId="GZ-2644" shipmentId="9997" orderId="Demo1001" orderItemSeqId="00001" datetimeReceived="2009-08-13 17:47:31.095" quantityAccepted="2.000000" quantityRejected="0.000000"/> <InventoryItemDetail inventoryItemId="9025" inventoryItemDetailSeqId="00001" effectiveDate="2009-08-13 17:47:46.78" quantityOnHandDiff="2.000000" availableToPromiseDiff="2.000000" accountingQuantityDiff="2.000000" unitCost="24.000000" orderId="Demo1001" orderItemSeqId="00001" shipmentId="9997" receiptId="9000"/> @@ -218,7 +218,7 @@ under the License. <PaymentGatewayResponse paymentGatewayResponseId="9001" paymentServiceTypeEnumId="PRDS_PAY_AUTH" orderPaymentPreferenceId="9001" paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" transCodeEnumId="PGT_AUTHORIZE" amount="127.09" currencyUomId="USD" referenceNum="1250501206473" altReference="1250501206473" gatewayCode="100" gatewayFlag="A" gatewayMessage="This is a test processor; no payments were captured or authorized." transactionDate="2009-08-17 14:56:46.498"/> <PaymentGatewayResponse paymentGatewayResponseId="9002" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" orderPaymentPreferenceId="9001" paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" transCodeEnumId="PGT_CAPTURE" amount="127.09" currencyUomId="USD" referenceNum="1250501224763" altReference="1250501224763" gatewayFlag="C" gatewayMessage="This is a test capture; no money was transferred" transactionDate="2009-08-17 14:57:04.836"/> <Payment paymentId="8004" paymentTypeId="CUSTOMER_PAYMENT" paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" paymentGatewayResponseId="9002" paymentPreferenceId="9001" partyIdFrom="DemoCustomer" partyIdTo="Company" statusId="PMNT_RECEIVED" effectiveDate="2009-08-17 14:57:04.99" paymentRefNum="1250501224763" amount="127.09" currencyUomId="USD"/> - <AcctgTrans acctgTransId="9005" acctgTransTypeId="INCOMING_PAYMENT" transactionDate="2009-08-17 14:57:05.182" isPosted="Y" postedDate="2009-08-17 14:57:05.56" glFiscalTypeId="ACTUAL" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" paymentId="8004"/> + <AcctgTrans acctgTransId="9005" acctgTransTypeId="INCOMING_PAYMENT" transactionDate="2009-08-17 14:57:05.182" isPosted="Y" postedDate="2009-08-17 14:57:05.56" glFiscalTypeId="ACTUAL" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" paymentId="8004"/> <AcctgTransEntry acctgTransId="9005" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" glAccountId="122300" organizationPartyId="Company" amount="127.09" currencyUomId="USD" origAmount="127.09" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> <AcctgTransEntry acctgTransId="9005" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000" organizationPartyId="Company" amount="127.09" currencyUomId="USD" origAmount="127.09" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> @@ -244,4 +244,23 @@ under the License. <AcctgTransEntry acctgTransId="9007" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" productId="WG-1111" glAccountId="400000" organizationPartyId="Company" amount="179.97" currencyUomId="USD" origAmount="179.97" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> <AcctgTransEntry acctgTransId="9007" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000" organizationPartyId="Company" amount="179.97" currencyUomId="USD" origAmount="179.97" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> -</entity-engine-xml> \ No newline at end of file + <!-- The agreement AGR_SALES is a SALES_AGREEMENT between the Company party and the DemoCustomer party (in the role of CUSTOMER) --> + <!-- For a sales agreement the roleTypeIdFrom and roleTypeIdTo are not mandatory see OrderAgreements.groovy[31] --> + <!-- Here is now to create a SALES_AGREEMENT + * create an agreement and set: + ** agreement type: Sales + ** party if from: the customer + ** party id to: the Company + * create an agreement item of type "Pricing" and set the currency + ** go to the "product" tab + ** enter the product id and price (they will override the ProductPrice if the agreement is selected in the order) + ** and (for a PO only) Supplier + ** go to the terms: they will be copied to the order and invoice + --> + <Agreement agreementId="AGR_SALES" partyIdFrom="DemoCustomer" partyIdTo="Company" roleTypeIdFrom="CUSTOMER" roleTypeIdTo="INTERNAL_ORGANIZATIO" agreementTypeId="SALES_AGREEMENT" description="Agreement for DemoCustomer"/> + <AgreementItem agreementId="AGR_SALES" agreementItemSeqId="00001" currencyUomId="USD" agreementItemTypeId="AGREEMENT_PRICING_PR" agreementText="Price list in US Dollars"/> + <AgreementTerm agreementId="AGR_SALES" agreementItemSeqId="00001" agreementTermId="10000" description="Sales test agreement" termDays="30" termTypeId="FIN_PAYMENT_FIXDAY"/> + <!-- An AgreementProductAppls aris related to an AgreementItem. AgreementProductAppls are optional. If a product id and a price are specified the price will override the ProductPrice if the agreement is selected in the order --> + <AgreementProductAppl agreementId="AGR_SALES" agreementItemSeqId="00001" price="10.000" productId="GZ-1000"/> + +</entity-engine-xml> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=1587173&r1=1587172&r2=1587173&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Mon Apr 14 10:16:37 2014 @@ -58,7 +58,7 @@ under the License. <label for="countryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </label> - <select name="countryGeoId" id="countryGeoId" class="required" style="width: 70%"> + <select name="countryGeoId" id="countryGeoId" class="required"> <#if countryGeoId??> <option value="${countryGeoId}">${countryGeoId}</option> </#if> @@ -69,7 +69,7 @@ under the License. <label for="stateProvinceGeoId">${uiLabelMap.PartyState}* <span id="advice-required-stateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </label> - <select name="stateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%"> + <select name="stateProvinceGeoId" id="stateProvinceGeoId"> <#if stateProvinceGeoId?has_content> <option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option> <#else> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |