You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/09/01 09:29:24 UTC
svn commit: r1621696 [12/12] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/order/webapp/ordermgr/WEB-INF/actions/return/
applications/party/webapp/partymgr/party/contactmechtemplates/
applications/party/widget/partymgr...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/config/conditional.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/config/conditional.xml?rev=1621696&r1=1621695&r2=1621696&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/config/conditional.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/config/conditional.xml Mon Sep 1 07:29:23 2014
@@ -64,7 +64,7 @@
<value xml:lang="ru">РавнÑеÑÑÑ</value>
<value xml:lang="th">à¹à¸à¹à¸²à¸à¸±à¸</value>
<value xml:lang="zh">çäº</value>
- <value xml:lang="zh_TW">çäº</value>
+ <value xml:lang="zh_TW">çæ¼</value>
</property>
<property key="greater_than">
<value xml:lang="ar">Ø£Ùبر Ù
Ù</value>
@@ -80,7 +80,7 @@
<value xml:lang="ru">ÐолÑÑе Ñем</value>
<value xml:lang="th">มาà¸à¸à¸§à¹à¸²</value>
<value xml:lang="zh">大äº</value>
- <value xml:lang="zh_TW">大äº</value>
+ <value xml:lang="zh_TW">大æ¼</value>
</property>
<property key="greater_than_equals">
<value xml:lang="ar">Ø£Ùبر Ù
٠أ٠ÙساÙÙ</value>
@@ -96,7 +96,7 @@
<value xml:lang="ru">ÐолÑÑе Ñем Ñавно</value>
<value xml:lang="th">มาà¸à¸à¸§à¹à¸²à¹à¸à¹à¸²à¸à¸±à¸</value>
<value xml:lang="zh">大äºçäº</value>
- <value xml:lang="zh_TW">大äºçäº</value>
+ <value xml:lang="zh_TW">大æ¼çæ¼</value>
</property>
<property key="greater_than_from_day_start">
<value xml:lang="ar">Ø£Ùبر Ù
Ù ÙÙÙ
</value>
@@ -112,7 +112,7 @@
<value xml:lang="ru">ÐолÑÑе Ñем на даÑÑ Ð½Ð°Ñала</value>
<value xml:lang="th">มาà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸§à¸±à¸à¸à¸µà¹à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value>
<value xml:lang="zh">大äºå¼å§æ¥æ</value>
- <value xml:lang="zh_TW">大äºéå§æ¥æ</value>
+ <value xml:lang="zh_TW">大æ¼éå§æ¥æ</value>
</property>
<property key="ignore_case">
<value xml:lang="ar">Øساس ÙØجÙ
اÙØرÙ</value>
@@ -160,7 +160,7 @@
<value xml:lang="ru">ÐенÑÑе Ñем</value>
<value xml:lang="th">à¸à¹à¸à¸¢à¸à¸§à¹à¸²</value>
<value xml:lang="zh">å°äº</value>
- <value xml:lang="zh_TW">å°äº</value>
+ <value xml:lang="zh_TW">å°æ¼</value>
</property>
<property key="less_than_equals">
<value xml:lang="ar">Ø£ÙÙ Ù
٠أ٠ÙساÙÙ</value>
@@ -176,7 +176,7 @@
<value xml:lang="ru">ÐенÑÑе Ñем Ñавно</value>
<value xml:lang="th">à¸à¹à¸à¸¢à¸à¸§à¹à¸²à¹à¸à¹à¸²à¸à¸±à¸</value>
<value xml:lang="zh">å°äºçäº</value>
- <value xml:lang="zh_TW">å°äºçäº</value>
+ <value xml:lang="zh_TW">å°æ¼çæ¼</value>
</property>
<property key="not_equal">
<value xml:lang="de">ungleich</value>
@@ -187,7 +187,7 @@
<value xml:lang="ja">ç°ãªã</value>
<value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¸²à¸à¸±à¸</value>
<value xml:lang="zh">ä¸çäº</value>
- <value xml:lang="zh_TW">ä¸çäº</value>
+ <value xml:lang="zh_TW">ä¸çæ¼</value>
</property>
<property key="same_day">
<value xml:lang="ar">ÙÙس اÙÙÙÙ
</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java?rev=1621696&r1=1621695&r2=1621696&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java Mon Sep 1 07:29:23 2014
@@ -41,7 +41,6 @@ import org.ofbiz.base.util.UtilPropertie
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.ebay.EbayHelper;
import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.serialize.SerializeException;
@@ -715,7 +714,7 @@ public class EbayStoreHelper {
}
}
- public static boolean isReserveInventory(GenericDelegator delegator, String productId, String productStoreId) {
+ public static boolean isReserveInventory(Delegator delegator, String productId, String productStoreId) {
boolean isReserve = false;
try {
GenericValue ebayProductStore = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory", UtilMisc.toMap("productStoreId", productStoreId, "productId", productId), null, false)));