You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/06/19 23:36:33 UTC
svn commit: r1351866 [43/48] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/ applications/accounting/config/
applications/accounting/data/ applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/i...
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -24,7 +24,7 @@ under the License.
<resource-loader name="main" type="component"/>
<classpath type="jar" location="build/lib/*"/>
<classpath type="dir" location="config"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsSecurityData.xml"/>
+ <entity-resource type="data" reader-name="security" loader="main" location="data/WebtoolsSecurityData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<webapp name="webtools"
title="WebTools"
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Tue Jun 19 21:36:11 2012
@@ -63,7 +63,7 @@ public class ArtifactInfoFactory {
public static final String module = ArtifactInfoFactory.class.getName();
- protected static UtilCache<String, ArtifactInfoFactory> artifactInfoFactoryCache = UtilCache.createUtilCache("ArtifactInfoFactory");
+ private static final UtilCache<String, ArtifactInfoFactory> artifactInfoFactoryCache = UtilCache.createUtilCache("ArtifactInfoFactory");
public static final String EntityInfoTypeId = "entity";
public static final String ServiceInfoTypeId = "service";
@@ -121,8 +121,7 @@ public class ArtifactInfoFactory {
ArtifactInfoFactory aif = artifactInfoFactoryCache.get(delegatorName);
if (aif == null) {
- aif = new ArtifactInfoFactory(delegatorName);
- artifactInfoFactoryCache.put(delegatorName, aif);
+ aif = artifactInfoFactoryCache.putIfAbsentAndGet(delegatorName, new ArtifactInfoFactory(delegatorName));
}
return aif;
}
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java Tue Jun 19 21:36:11 2012
@@ -79,7 +79,6 @@ public class LabelManagerFactory {
for (ComponentConfig componentConfig : componentConfigs) {
componentNamesFound.add(componentConfig.getComponentName());
}
- componentNamesFound.add("shark");
}
protected static void loadLabelFiles() throws IOException {
@@ -102,10 +101,6 @@ public class LabelManagerFactory {
}
}
}
- List<File> resourceFiles = FileUtil.findXmlFiles(System.getProperty("ofbiz.home") + "/specialpurpose/shark/config", null, "resource", null);
- for (File resourceFile : resourceFiles) {
- filesFound.put(resourceFile.getName(), new LabelFile(resourceFile, "shark"));
- }
}
public void findMatchingLabels(String component, String fileName, String key, String locale) throws MalformedURLException, SAXException, ParserConfigurationException, IOException, EncodingException, GeneralException {
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Tue Jun 19 21:36:11 2012
@@ -81,7 +81,6 @@ public class LabelReferences {
}
this.rootFolders.add(rootFolder);
}
- this.rootFolders.add(System.getProperty("ofbiz.home") + "/specialpurpose/shark/");
}
public Map<String, Map<String, Integer>> getLabelReferences() throws IOException, SAXException, ParserConfigurationException, GenericServiceException {
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy Tue Jun 19 21:36:11 2012
@@ -325,7 +325,7 @@ for (int relIndex = 0; relIndex < entity
if ("one".equals(relation.getType()) || "one-nofk".equals(relation.getType())) {
if (value != null) {
if (hasAllView || security.hasEntityPermission(relatedEntity.getPlainTableName(), "_VIEW", session)) {
- Iterator tempIter = UtilMisc.toIterator(value.getRelated(relation.getTitle() + relatedEntity.getEntityName()));
+ Iterator tempIter = UtilMisc.toIterator(value.getRelated(relation.getTitle() + relatedEntity.getEntityName(), null, null, false));
GenericValue valueRelated = null;
if (tempIter != null && tempIter.hasNext()) {
valueRelated = (GenericValue) tempIter.next();
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue Jun 19 21:36:11 2012
@@ -26,7 +26,8 @@ under the License.
<include location="component://common/webcommon/WEB-INF/tempexpr-controller.xml"/>
<include location="component://testtools/webapp/testtools/WEB-INF/controller.xml"/>
<description>WebTools Site Configuration File</description>
-
+
+ <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
<handler name="datavision" type="view" class="org.ofbiz.webapp.view.DataVisionViewHandler"/>
<!-- Events to run on every request before security (chains exempt) -->
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Tue Jun 19 21:36:11 2012
@@ -33,7 +33,7 @@ under the License.
<select name="DEFINITION_NAME">
<option value=""></option>
<#list definitionNames as oneDefinitionName>
- boolean isSelected = definitionName != null && definitionName.equals(oneDefinitionName);
+ boolean isSelected = definitionName?? && definitionName.equals(oneDefinitionName);
<option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected="selected" </#if>>${oneDefinitionName}</option>
</#list>
</select>
@@ -82,7 +82,7 @@ under the License.
<#assign modelRecord = record.getModelRecord()>
<#-- if record is different than the last displayed, make a new table and header row -->
<#if !modelRecord.name.equals(lastRecordName)>
- <#if lastRecordName != null>
+ <#if lastRecordName??>
</table><br />
</#if>
<table class="basic-table hover-bar" cellspacing="0">
@@ -113,7 +113,7 @@ under the License.
</#if>
</#list>
</tr>
- <#if record.getChildRecords() != null && (record.getChildRecords().size() > 0)>
+ <#if (record.getChildRecords())?has_content>
<@displayrecords records = record.getChildRecords()/>
</#if>
</#list>
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/widget/GeoManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/widget/GeoManagementForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/widget/GeoManagementForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/widget/GeoManagementForms.xml Tue Jun 19 21:36:11 2012
@@ -75,7 +75,7 @@
</entity-options>
</drop-down>
</field>
- <field name="dummy" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
+ <field name="dummy" title=" "><display/></field>
<field name="geoAssocTypeId" title="${uiLabelMap.CommonGeoAssocTypeId}"
event="onChange"
action="typeValue = jQuery('#${asm_typeField}').val(); selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');">
Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/widget/StatsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/widget/StatsForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/widget/StatsForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/widget/StatsForms.xml Tue Jun 19 21:36:11 2012
@@ -31,7 +31,7 @@ under the License.
<field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field>
<field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field>
<field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field>
- <field name="viewBins" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}">
+ <field name="viewBins" widget-style="buttontext" title=" ">
<hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory">
<parameter param-name="statsId" from-field="requestId"/>
<parameter param-name="type" from-field="requestType"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java Tue Jun 19 21:36:11 2012
@@ -607,11 +607,7 @@ public abstract class ModelWidgetAction
}
GenericValue value = (GenericValue) valueObject;
try {
- if (useCache) {
- toValueNameAcsr.put(context, value.getRelatedOneCache(relationName));
- } else {
- toValueNameAcsr.put(context, value.getRelatedOne(relationName));
- }
+ toValueNameAcsr.put(context, value.getRelatedOne(relationName, useCache));
} catch (GenericEntityException e) {
String errMsg = "Problem getting related one from entity with name " + value.getEntityName() + " for the relation-name: " + relationName + ": " + e.getMessage();
Debug.logError(e, errMsg, module);
@@ -668,11 +664,7 @@ public abstract class ModelWidgetAction
constraintMap = mapAcsr.get(context);
}
try {
- if (useCache) {
- listNameAcsr.put(context, value.getRelatedCache(relationName, constraintMap, orderByNames));
- } else {
- listNameAcsr.put(context, value.getRelated(relationName, constraintMap, orderByNames));
- }
+ listNameAcsr.put(context, value.getRelated(relationName, constraintMap, orderByNames, useCache));
} catch (GenericEntityException e) {
String errMsg = "Problem getting related from entity with name " + value.getEntityName() + " for the relation-name: " + relationName + ": " + e.getMessage();
Debug.logError(e, errMsg, module);
Modified: ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Tue Jun 19 21:36:11 2012
@@ -1619,7 +1619,10 @@ public class ModelFormField {
if (modelEntity == null) {
throw new IllegalArgumentException("Error in entity-options: could not find entity [" + this.entityName + "]");
}
- expandedConditionList.add(condition.createCondition(context, modelEntity, delegator.getModelFieldTypeReader(modelEntity)));
+ EntityCondition createdCondition = condition.createCondition(context, modelEntity, delegator.getModelFieldTypeReader(modelEntity));
+ if (createdCondition!=null) {
+ expandedConditionList.add(createdCondition);
+ }
}
findCondition = EntityCondition.makeCondition(expandedConditionList);
}
Modified: ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Tue Jun 19 21:36:11 2012
@@ -57,8 +57,8 @@ import freemarker.template.TemplateModel
public class HtmlWidget extends ModelScreenWidget {
public static final String module = HtmlWidget.class.getName();
- public static UtilCache<String, Template> specialTemplateCache = UtilCache.createUtilCache("widget.screen.template.ftl.general", 0, 0, false);
- protected static Configuration specialConfig = FreeMarkerWorker.makeConfiguration((BeansWrapper)new ExtendedWrapper());
+ private static final UtilCache<String, Template> specialTemplateCache = UtilCache.createUtilCache("widget.screen.template.ftl.general", 0, 0, false);
+ protected static Configuration specialConfig = FreeMarkerWorker.makeConfiguration(FreeMarkerWorker.configureBeansWrapper(new ExtendedWrapper()));
// not sure if this is the best way to get FTL to use my fancy MapModel derivative, but should work at least...
public static class ExtendedWrapper extends BeansWrapper {
Modified: ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Tue Jun 19 21:36:11 2012
@@ -348,8 +348,8 @@ public class ModelScreen extends ModelWi
* use the same screen definitions for many types of screen UIs
*/
public void renderScreenString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws ScreenRenderException {
- // make sure the "null" object is in there for entity ops
- context.put("null", GenericEntity.NULL_FIELD);
+ // make sure the "nullField" object is in there for entity ops
+ context.put("nullField", GenericEntity.NULL_FIELD);
// wrap the whole screen rendering in a transaction, should improve performance in querying and such
Map<String, String> parameters = UtilGenerics.cast(context.get("parameters"));
Modified: ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Tue Jun 19 21:36:11 2012
@@ -608,11 +608,7 @@ public abstract class ModelScreenAction
}
GenericValue value = (GenericValue) valueObject;
try {
- if (useCache) {
- toValueNameAcsr.put(context, value.getRelatedOneCache(relationName));
- } else {
- toValueNameAcsr.put(context, value.getRelatedOne(relationName));
- }
+ toValueNameAcsr.put(context, value.getRelatedOne(relationName, useCache));
} catch (GenericEntityException e) {
String errMsg = "Problem getting related one from entity with name " + value.getEntityName() + " for the relation-name: " + relationName + ": " + e.getMessage();
Debug.logError(e, errMsg, module);
@@ -667,11 +663,7 @@ public abstract class ModelScreenAction
constraintMap = mapAcsr.get(context);
}
try {
- if (useCache) {
- listNameAcsr.put(context, value.getRelatedCache(relationName, constraintMap, orderByNames));
- } else {
- listNameAcsr.put(context, value.getRelated(relationName, constraintMap, orderByNames));
- }
+ listNameAcsr.put(context, value.getRelated(relationName, constraintMap, orderByNames, useCache));
} catch (GenericEntityException e) {
String errMsg = "Problem getting related from entity with name " + value.getEntityName() + " for the relation-name: " + relationName + ": " + e.getMessage();
Debug.logError(e, errMsg, module);
Modified: ofbiz/branches/20120329_portletWidget/ivy.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/ivy.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/ivy.xml (original)
+++ ofbiz/branches/20120329_portletWidget/ivy.xml Tue Jun 19 21:36:11 2012
@@ -38,9 +38,6 @@
<dependency org="org.codehaus.sonar-plugins" name="sonar-ant-task" rev="1.3" conf="sonar-ant-task->default"/>
<!--Exclusions for cobertura-->
- <exclude module="oro" conf="cobertura"/>
- <exclude module="asm" conf="cobertura"/>
- <exclude module="asm-tree" conf="cobertura"/>
<exclude module="log4j" conf="cobertura"/>
<exclude module="ant" conf="cobertura"/>
</dependencies>
Modified: ofbiz/branches/20120329_portletWidget/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/macros.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/macros.xml (original)
+++ ofbiz/branches/20120329_portletWidget/macros.xml Tue Jun 19 21:36:11 2012
@@ -120,7 +120,6 @@ under the License.
<exclude name="**/FopPdfViewHandler.java"/>
<exclude name="**/FreeMarkerViewRenderer.java"/>
<exclude name="**/JpCacheIncludeTransform.java"/>
- <exclude name="**/shark/"/>
</fileset>
<link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/>
</javadoc>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml Tue Jun 19 21:36:11 2012
@@ -25,6 +25,7 @@
<value xml:lang="fr">Application de maintenance des biens</value>
<value xml:lang="it">Applicazione manutenzione cespiti</value>
<value xml:lang="th">à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¹à¸à¸£à¹à¸à¸£à¸¡</value>
+ <value xml:lang="vi">Ứng dụng Quản lý Tà i sản</value>
<value xml:lang="zh">èµäº§ç»´æ¤åºç¨ç¨åº</value>
</property>
<property key="AssetMaintCompanyName">
@@ -33,6 +34,7 @@
<value xml:lang="fr">OFBiz : maintenance des biens</value>
<value xml:lang="it">OFBiz: Manutenzione cespiti</value>
<value xml:lang="th">OFBiz: à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²</value>
+ <value xml:lang="vi">OFBiz: Quản lý tà i sản</value>
<value xml:lang="zh">OFBizï¼èµäº§ç»´æ¤</value>
</property>
<property key="AssetMaintCompanySubtitle">
@@ -40,6 +42,7 @@
<value xml:lang="fr">Service de maintenance</value>
<value xml:lang="it">Servizio manutenzione</value>
<value xml:lang="th">à¹à¸à¸à¸à¸à¸²à¸£à¸à¸¹à¹à¸¥à¸£à¸±à¸à¸©à¸²</value>
+ <value xml:lang="vi">Phòng Quản lý tà i sản</value>
<value xml:lang="zh">ç»´æ¤é¨é¨</value>
</property>
<property key="AssetMaintInvalidPartProductIdError">
@@ -47,6 +50,7 @@
<value xml:lang="fr">"La réf. de piéce ${productId} fournie n'est pas valable, SVP recommencez"</value>
<value xml:lang="it">"Il Codice parte ${productId} fornito non è valido. Per favore controllare e riprovare"</value>
<value xml:lang="th">รหัสสà¹à¸§à¸ ${productId} à¹à¸à¹à¹à¸¡à¹à¹à¸à¹ à¸à¸£à¸¸à¸à¸²à¸à¸£à¸§à¸à¸ªà¸à¸à¹à¸¥à¸°à¸¥à¸à¸à¸à¸µà¸à¸à¸£à¸±à¹à¸</value>
+ <value xml:lang="vi">"Tà i sản Id ${productId} không hợp lá», bạn hãy kiá»m tra và thá» lại"</value>
<value xml:lang="zh">"æä¾çé¶é¨ä»¶æ è¯${productId}æ æï¼è¯·æ£æ¥éè¯"</value>
</property>
<property key="AssetMaintItemIssuance">
@@ -54,6 +58,7 @@
<value xml:lang="fr">Pièces</value>
<value xml:lang="it">Parti</value>
<value xml:lang="th">สà¹à¸§à¸à¸«à¸à¸¶à¹à¸</value>
+ <value xml:lang="vi">Tà i sản</value>
<value xml:lang="zh">é¶é¨ä»¶</value>
</property>
<property key="AssetMaintLowPartInventoryError">
@@ -61,6 +66,7 @@
<value xml:lang="fr">"Le niveau de stock disponible pour ${productId} est ${quantity"</value>
<value xml:lang="it">"La quantità disponibile a magazzino per ${productId} è ${quantity}"</value>
<value xml:lang="th">รà¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸à¸à¸à¸ ${productId} à¸à¸·à¸ ${quantity}</value>
+ <value xml:lang="vi">"Mức Äá» sẵn có trong kho của Sản phẩm ${productId} vá»i sá» lượng là ${quantity}"</value>
<value xml:lang="zh">"${productId}çææçåºå级å«æ¯${quantity}"</value>
</property>
<property key="AssetMaintManager">
@@ -69,34 +75,40 @@
<value xml:lang="fr">Application de maintenance des biens</value>
<value xml:lang="it">Manutenzione cespiti</value>
<value xml:lang="th">à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¹à¸à¸£à¹à¸à¸£à¸¡</value>
+ <value xml:lang="vi">Quản lý Tà i sản</value>
<value xml:lang="zh">èµäº§ç»´æ¤åºç¨ç¨åº</value>
</property>
<property key="AssetMaintParentWorkEffort">
<value xml:lang="en">Parent Work Effort</value>
<value xml:lang="fr">"Tâche parente"</value>
<value xml:lang="it">Impegno di lavoro padre</value>
+ <value xml:lang="vi">Lượng giá nguá»n lá»±c cấp trên</value>
<value xml:lang="zh">ä¸çº§äººå·¥æå¡</value>
</property>
<property key="AssetMaintPartId">
<value xml:lang="en">Part Id</value>
<value xml:lang="fr">Réf. de la pièce</value>
<value xml:lang="it">Codice parte</value>
+ <value xml:lang="vi">Id Tà i sản</value>
<value xml:lang="zh">é¶é¨ä»¶æ è¯</value>
</property>
<property key="AssetMaintProblemCallingService">
<value xml:lang="en">Problem in calling service issueInventoryItemToFixedAssetMaint</value>
<value xml:lang="it">Problema durante la chiamata al servizio issueInventoryItemToFixedAssetMaint</value>
+ <value xml:lang="vi">Lá»i khi thá»±c hiá»n dá»ch vụ issueInventoryItemToFixedAssetMaint</value>
<value xml:lang="zh">è°ç¨åéåºåæç»å°åºå®èµäº§ç»´æ¤ï¼issueInventoryItemToFixedAssetMaintï¼æå¡æ¶åºé</value>
</property>
<property key="AssetMaintProblemGettingInventoryLevel">
<value xml:lang="en">Problem in getting Inventory level for </value>
<value xml:lang="it">Problema ad ottenere il livello di inventario per </value>
+ <value xml:lang="vi">Lá»i khi lấy Mức Äá» cung ứng (kho) của</value>
<value xml:lang="zh">è·ååºåæ°´å¹³æ¶åºéï¼ </value>
</property>
<property key="AssetMaintProductMaint">
<value xml:lang="en">Product Maint</value>
<value xml:lang="fr">Maintenance</value>
<value xml:lang="it">Manutenzione</value>
+ <value xml:lang="vi">Quản trỠSản phẩm</value>
<value xml:lang="zh">产åç»´æ¤</value>
</property>
<property key="AssetMaintViewPermissionError">
@@ -104,6 +116,7 @@
<value xml:lang="fr">Afficher l'erreur d'autorisation</value>
<value xml:lang="it">Mostra errore di autorizzazione</value>
<value xml:lang="th">à¹à¸ªà¸à¸à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸</value>
+ <value xml:lang="vi">Bạn chÆ°a có quyá»n Xem</value>
<value xml:lang="zh">æµè§æéé误</value>
</property>
<property key="PageTitleAddItemIssuance">
@@ -111,6 +124,7 @@
<value xml:lang="fr">Ajouter une émission d'article</value>
<value xml:lang="it">Aggiungi prelievo articolo</value>
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸µà¹à¸à¸à¸à¸¡à¸²</value>
+ <value xml:lang="vi">Thêm hạng mục ban hà nh</value>
<value xml:lang="zh">æ·»å 交ä»æç»</value>
</property>
<property key="PageTitleChildWorkEfforts">
@@ -118,6 +132,7 @@
<value xml:lang="fr">Décomposition de tâche</value>
<value xml:lang="it">Scoposizione compito</value>
<value xml:lang="th">à¸à¸²à¸à¸«à¸¢à¸¸à¸</value>
+ <value xml:lang="vi">Phân nhỠTác vụ</value>
<value xml:lang="zh">ä»»å¡å解</value>
</property>
<property key="PageTitleFindFixedAssetMaints">
@@ -126,6 +141,7 @@
<value xml:lang="fr">Chercher des maintenances</value>
<value xml:lang="it">Ricerca manutenzioni</value>
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²</value>
+ <value xml:lang="vi">Tìm Bảo trì</value>
<value xml:lang="zh">æ¥æ¾ç»´ä¿®ä¿å
»</value>
</property>
<property key="PageTitleFindFixedAssets">
@@ -133,6 +149,7 @@
<value xml:lang="fr">Chercher des équipements</value>
<value xml:lang="it">Ricerca cespite</value>
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸à¸£à¸·à¹à¸à¸à¸¡à¸·à¸</value>
+ <value xml:lang="vi">Tìm Thiết bá»</value>
<value xml:lang="zh">æ¥æ¾è®¾å¤</value>
</property>
<property key="PageTitleListItemIssuance">
@@ -140,6 +157,7 @@
<value xml:lang="fr">Liste des pièces</value>
<value xml:lang="it">Lista parti</value>
<value xml:lang="th">สà¹à¸§à¸à¸«à¸à¸¶à¹à¸à¸à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£</value>
+ <value xml:lang="vi">Danh sách Tà i sản</value>
<value xml:lang="zh">é¶é¨ä»¶å表</value>
</property>
</resource>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/IsMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/IsMgrUiLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/IsMgrUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/IsMgrUiLabels.xml Tue Jun 19 21:36:11 2012
@@ -23,90 +23,105 @@
<value xml:lang="en">Information Systems Management Application</value>
<value xml:lang="fr">Gestion du parc informatique</value>
<value xml:lang="it">Applicazione gestione sistemi informativi</value>
+ <value xml:lang="vi">Ứng dụng Quản lý há» thá»ng thông tin</value>
<value xml:lang="zh">ä¿¡æ¯ç³»ç»ç®¡çåºç¨ç¨åº</value>
</property>
<property key="IsMgrCompanyName">
<value xml:lang="en">OFBiz: Is Manager</value>
<value xml:lang="fr">OFBiz: application de gestion du parc informatique</value>
<value xml:lang="it">OFBiz: Gestione sistemi informativi</value>
+ <value xml:lang="vi">OFBiz: Là Quản lý</value>
<value xml:lang="zh">OFBiz: ä¿¡æ¯ç³»ç»ç®¡ç</value>
</property>
<property key="IsMgrCompanySubtitle">
<value xml:lang="en">Information Systems Department</value>
<value xml:lang="fr">Département du système d'information</value>
<value xml:lang="it">Dipartimento sistemi informativi</value>
+ <value xml:lang="vi">Phòng/Ban</value>
<value xml:lang="zh">ä¿¡æ¯ç³»ç»é¨é¨</value>
</property>
<property key="IsMgrComputerHardware">
<value xml:lang="en">Hardware</value>
<value xml:lang="fr">Matériel informatique</value>
<value xml:lang="it">Hardware</value>
+ <value xml:lang="vi">Phần cứng</value>
<value xml:lang="zh">硬件</value>
</property>
<property key="IsMgrComputerSoftware">
<value xml:lang="en">Software</value>
<value xml:lang="fr">Logiciels</value>
<value xml:lang="it">Software</value>
+ <value xml:lang="vi">Phần má»m</value>
<value xml:lang="zh">软件</value>
</property>
<property key="IsMgrFindComputerHardware">
<value xml:lang="en">Find Hardware</value>
<value xml:lang="fr">Rechercher du matériel informatique</value>
<value xml:lang="it">Ricerca hardware</value>
+ <value xml:lang="vi">Tìm phần cứng</value>
<value xml:lang="zh">æ¥æ¾ç¡¬ä»¶</value>
</property>
<property key="IsMgrFindComputerSoftware">
<value xml:lang="en">Find Software</value>
<value xml:lang="fr">Rechercher du logiciel</value>
<value xml:lang="it">Ricerca software</value>
+ <value xml:lang="vi">Tìm phần má»m</value>
<value xml:lang="zh">æ¥æ¾è½¯ä»¶</value>
</property>
<property key="IsMgrHardwareAccessories">
<value xml:lang="en">Accessories</value>
<value xml:lang="fr">Accessoires</value>
<value xml:lang="it">Accessori</value>
+ <value xml:lang="vi">Ngoại vi</value>
<value xml:lang="zh">é¶é
件</value>
</property>
<property key="IsMgrInstalledSoftware">
<value xml:lang="en">Installed Software</value>
<value xml:lang="fr">Logiciels installés</value>
<value xml:lang="it">Software installati</value>
+ <value xml:lang="vi">Phần má»m Äã cà i</value>
<value xml:lang="zh">å·²å®è£
ç软件</value>
</property>
<property key="IsMgrNewComputerHardware">
<value xml:lang="en">New Hardware</value>
<value xml:lang="fr">Nouveau matériel informatique</value>
<value xml:lang="it">Nuovo hardware</value>
+ <value xml:lang="vi">Phần cứng má»i</value>
<value xml:lang="zh">æ°ç¡¬ä»¶</value>
</property>
<property key="IsMgrNewComputerSoftware">
<value xml:lang="en">New Software</value>
<value xml:lang="fr">Nouveau logiciel</value>
<value xml:lang="it">Nuovo software</value>
+ <value xml:lang="vi">Phần má»m má»i</value>
<value xml:lang="zh">æ°è½¯ä»¶</value>
</property>
<property key="PageTitleEditComputerHardware">
<value xml:lang="en">Edit Hardware</value>
<value xml:lang="fr">Modifier le matériel informatique</value>
<value xml:lang="it">Aggiorna hardware</value>
+ <value xml:lang="vi">Cáºp nháºt Phần cứng</value>
<value xml:lang="zh">ç¼è¾ç¡¬ä»¶</value>
</property>
<property key="PageTitleEditComputerSoftware">
<value xml:lang="en">Edit Software</value>
<value xml:lang="fr">Modifier le logiciel</value>
<value xml:lang="it">Aggiorna software</value>
+ <value xml:lang="vi">Cáºp nháºt Phần má»m</value>
<value xml:lang="zh">ç¼è¾è½¯ä»¶</value>
</property>
<property key="PageTitleLookupComputerHardware">
<value xml:lang="en">Lookup Computer Hardware</value>
<value xml:lang="fr">Rechercher du matériel informatique</value>
<value xml:lang="it">Ricerca hardware per computer</value>
+ <value xml:lang="vi">Tìm phần cứng máy tÃnh</value>
<value xml:lang="zh">æ¥æ¾è®¡ç®æºç¡¬ä»¶</value>
</property>
<property key="PageTitleLookupComputerSoftware">
<value xml:lang="en">Lookup Computer Software</value>
<value xml:lang="fr">Consultation de logiciel(s)</value>
<value xml:lang="it">Ricerca software per computer</value>
+ <value xml:lang="vi">Tìm phần má»m máy tÃnh</value>
<value xml:lang="zh">æ¥æ¾è®¡ç®æºè½¯ä»¶</value>
</property>
</resource>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -32,7 +32,7 @@
<!-- entity resources: model(s), eca(s), group, and data definitions -->
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSecurityData.xml"/>
+ <entity-resource type="data" reader-name="security" loader="main" location="data/AssetMaintSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSeedData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAssetMaintData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy Tue Jun 19 21:36:11 2012
@@ -20,7 +20,7 @@ under the License.
import org.ofbiz.entity.*;
import org.ofbiz.entity.condition.*;
-facility = fixedAsset.getRelatedOne("LocatedAtFacility");
+facility = fixedAsset.getRelatedOne("LocatedAtFacility", false);
context.locatedAtFacility = facility;
fixedAssetIdents = delegator.findList("FixedAssetIdent", EntityCondition.makeCondition([fixedAssetId : fixedAssetId]), null, null, null, false);
@@ -32,13 +32,13 @@ if (fixedAssetIdents) {
}
context.fixedAssetIdentValue = fixedAssetIdentValue;
-status = fixedAssetMaint.getRelatedOne("StatusItem");
+status = fixedAssetMaint.getRelatedOne("StatusItem", false);
if (status) {
context.statusItemDesc = status.description;
}
//context.put("fixedAssetMaint",fixedAssetMaint);
-intervalUom = fixedAssetMaint.getRelatedOne("IntervalUom");
+intervalUom = fixedAssetMaint.getRelatedOne("IntervalUom", false);
if (intervalUom) {
context.intervalUomDesc = intervalUom.description;
}
@@ -67,5 +67,5 @@ if (intervalMeterTypeId) {
}
context.productMeterTypeDesc = productMeterTypeDesc;
-scheduleWorkEffort = fixedAssetMaint.getRelatedOne("ScheduleWorkEffort");
+scheduleWorkEffort = fixedAssetMaint.getRelatedOne("ScheduleWorkEffort", false);
context.scheduleWorkEffort = scheduleWorkEffort;
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl Tue Jun 19 21:36:11 2012
@@ -138,7 +138,7 @@ under the License.
<fo:table-cell><fo:block></fo:block></fo:table-cell>
</#if>
</fo:table-row>
- <#assign workEffortPurposeType = scheduleWorkEffort.getRelatedOne("WorkEffortPurposeType")?if_exists>
+ <#assign workEffortPurposeType = scheduleWorkEffort.getRelatedOne("WorkEffortPurposeType", false)?if_exists>
<#if workEffortPurposeType?has_content>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_workEffortPurposeTypeId}</fo:block></fo:table-cell>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml Tue Jun 19 21:36:11 2012
@@ -39,7 +39,6 @@
example/build.xml
"/>
<!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above -->
- <!-- For Shark add "shark/build.xml" to the list above, in the specialpurpose-builds list (after workflow) -->
<!-- ================================================================== -->
<!-- Removes all created files and directories -->
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml Tue Jun 19 21:36:11 2012
@@ -43,5 +43,4 @@ under the License.
Still they are functional (or at least should be).
So if you need them simply uncomment and have a look also in the build file -->
<!-- <load-component component-location="workflow"/> -->
- <!-- <load-component component-location="shark"/> -->
</component-loader>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -26,7 +26,7 @@ under the License.
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityData.xml"/>
+ <entity-resource type="data" reader-name="security" loader="main" location="data/EbaySecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoEbayData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Tue Jun 19 21:36:11 2012
@@ -74,7 +74,7 @@ public class ProductsExportToEbay {
List<GenericValue> productsList = delegator.findList("Product", EntityCondition.makeCondition("productId", EntityOperator.IN, selectResult), null, null, null, false);
if (UtilValidate.isNotEmpty(productsList)) {
for (GenericValue product : productsList) {
- GenericValue startPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(product.getRelatedByAnd("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MINIMUM_PRICE"))));
+ GenericValue startPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(product.getRelated("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MINIMUM_PRICE"), null, false)));
if (UtilValidate.isEmpty(startPriceValue)) {
String startPriceMissingMsg = "Unable to find a starting price for auction of product with id (" + product.getString("productId") + "), So Ignoring the export of this product to eBay.";
productExportFailureMessageList.add(startPriceMissingMsg);
@@ -206,7 +206,7 @@ public class ProductsExportToEbay {
String startPrice = (String)context.get("startPrice");
String startPriceCurrencyUomId = null;
if (UtilValidate.isEmpty(startPrice)) {
- GenericValue startPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(prod.getRelatedByAnd("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MINIMUM_PRICE"))));
+ GenericValue startPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(prod.getRelated("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MINIMUM_PRICE"), null, false)));
if (UtilValidate.isNotEmpty(startPriceValue)) {
startPrice = startPriceValue.getString("price");
startPriceCurrencyUomId = startPriceValue.getString("currencyUomId");
@@ -217,7 +217,7 @@ public class ProductsExportToEbay {
String buyItNowPrice = (String)context.get("buyItNowPrice");
String buyItNowCurrencyUomId = null;
if (UtilValidate.isEmpty(buyItNowPrice)) {
- GenericValue buyItNowPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(prod.getRelatedByAnd("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MAXIMUM_PRICE"))));
+ GenericValue buyItNowPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(prod.getRelated("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MAXIMUM_PRICE"), null, false)));
if (UtilValidate.isNotEmpty(buyItNowPriceValue)) {
buyItNowPrice = buyItNowPriceValue.getString("price");
buyItNowCurrencyUomId = buyItNowPriceValue.getString("currencyUomId");
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/ebaystore/lib:r1340642-1346323
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -28,7 +28,7 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreSecurityData.xml"/>
+ <entity-resource type="data" reader-name="security" loader="main" location="data/EbayStoreSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStorePortletData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Tue Jun 19 21:36:11 2012
@@ -242,7 +242,7 @@ public class EbayStore {
List<StoreCustomCategoryType> listEdit = FastList.newInstance();
//start at level 0 of categories
for (GenericValue catalogCategory : catalogCategories) {
- GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory");
+ GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory", false);
if (productCategory != null) {
String ebayCategoryId = EbayStoreHelper.retriveEbayCategoryIdByPartyId(delegator,productCategory.getString("productCategoryId"),context.get("partyId").toString());
StoreCustomCategoryType categoryType = new StoreCustomCategoryType();
@@ -275,7 +275,7 @@ public class EbayStore {
listAdd = FastList.newInstance();
listEdit = FastList.newInstance();
for (GenericValue catalogCategory : catalogCategories) {
- GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory");
+ GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory", false);
if (productCategory != null) {
String ebayParentCategoryId = EbayStoreHelper.retriveEbayCategoryIdByPartyId(delegator, productCategory.getString("productCategoryId"), context.get("partyId").toString());
if (ebayParentCategoryId != null) {
@@ -316,7 +316,7 @@ public class EbayStore {
listAdd = FastList.newInstance();
listEdit = FastList.newInstance();
for (GenericValue catalogCategory : catalogCategories) {
- GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory");
+ GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory", false);
if (productCategory != null) {
List<GenericValue> productParentCategoryRollupList = delegator.findByAnd("ProductCategoryRollup", UtilMisc.toMap("parentProductCategoryId",productCategory.getString("productCategoryId")),UtilMisc.toList("sequenceNum ASC"), false);
for (GenericValue productParentCategoryRollup : productParentCategoryRollupList) {
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java Tue Jun 19 21:36:11 2012
@@ -619,9 +619,9 @@ public class EbayStoreHelper {
GenericValue orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false);
if (UtilValidate.isNotEmpty(orderHeader)) {
String externalId = orderHeader.getString("externalId").toString();
- List<GenericValue> orderShipment = orderHeader.getRelated("OrderShipment");
+ List<GenericValue> orderShipment = orderHeader.getRelated("OrderShipment", null, null, false);
if (orderShipment.size() > 0) {
- List<GenericValue> trackingOrders = orderHeader.getRelated("TrackingCodeOrder");
+ List<GenericValue> trackingOrders = orderHeader.getRelated("TrackingCodeOrder", null, null, false);
ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
GetOrdersCall ordersCall = new GetOrdersCall(apiContext);
OrderIDArrayType orderIdArr = new OrderIDArrayType();
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl Tue Jun 19 21:36:11 2012
@@ -63,8 +63,8 @@ function uploadTrackingCode(orderId, pro
<#assign alt_row = false>
<#list orderList as orderHeader>
<#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
- <#assign statusItem = orderHeader.getRelatedOneCache("StatusItem")>
- <#assign orderType = orderHeader.getRelatedOneCache("OrderType")>
+ <#assign statusItem = orderHeader.getRelatedOne("StatusItem", true)>
+ <#assign orderType = orderHeader.getRelatedOne("OrderType", true)>
<#if orderType.orderTypeId == "PURCHASE_ORDER">
<#assign displayParty = orh.getSupplierAgent()?if_exists>
<#else>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Tue Jun 19 21:36:11 2012
@@ -715,7 +715,7 @@ under the License.
<table>
<#assign j = 0>
<#list paymentMethods as paymentMethod>
- <#if paymentMethod.value() != null>
+ <#if paymentMethod.value()??>
<#if j == 0><tr></#if>
<#if paymentMethod.compareTo(buyerPayMethCode_PAY_PAL?if_exists) == 0 >
<#assign is_payPal = true>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl Tue Jun 19 21:36:11 2012
@@ -47,7 +47,7 @@ under the License.
<#list retAccpTypeArray as retAccpType>
<#assign returnAccepted = "">
<option value="${retAccpType.getReturnsAcceptedOption()?if_exists}"
- <#if returnAccepted != null && returnAccepted.equalsIgnoreCase(retAccpType.getReturnsAcceptedOption()?if_exists)>selected="select"</#if>>
+ <#if returnAccepted?? && returnAccepted.equalsIgnoreCase(retAccpType.getReturnsAcceptedOption()?if_exists)>selected="select"</#if>>
${retAccpType.getDescription()?if_exists}</option>
</#list>
</#if>
@@ -68,7 +68,7 @@ under the License.
<#list retWithinArray as retWithin>
<#assign returnWithin = "">
<option value="${retWithin.getReturnsWithinOption()?if_exists}"
- <#if returnWithin!=null && returnWithin.equalsIgnoreCase(retWithin.getReturnsWithinOption()?if_exists)>selected="select"</#if>>
+ <#if returnWithin?? && returnWithin.equalsIgnoreCase(retWithin.getReturnsWithinOption()?if_exists)>selected="select"</#if>>
${retWithin.getDescription()?if_exists}</option>
</#list>
</#if>
@@ -91,7 +91,7 @@ under the License.
<#list refundArray as refundAr>
<#assign refund = "">
<option value="${refundAr.getRefundOption()?if_exists}"
- <#if refund!=null && refund.equalsIgnoreCase(refundAr.getRefundOption())>selected="select"</#if>>
+ <#if refund?? && refund.equalsIgnoreCase(refundAr.getRefundOption())>selected="select"</#if>>
${refundArray[j].getDescription()?if_exists}</option>
</#list>
</#if>
@@ -113,7 +113,7 @@ under the License.
<#list paidByArray as paidBy>
<#assign shippingCostPaidBy = "">
<option value="${paidBy.getShippingCostPaidByOption()?if_exists}"
- <#if shippingCostPaidBy!=null && shippingCostPaidBy.equalsIgnoreCase(paidBy.getShippingCostPaidByOption()?if_exists)>selected="select"</#if>>
+ <#if shippingCostPaidBy?? && shippingCostPaidBy.equalsIgnoreCase(paidBy.getShippingCostPaidByOption()?if_exists)>selected="select"</#if>>
${paidBy.getDescription()?if_exists}</option>
</#list>
</#if>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Tue Jun 19 21:36:11 2012
@@ -393,7 +393,7 @@ under the License.
<field name="emailType"><hidden value="${emailType}"/></field>
<field name="fromAddress"><hidden value="${fromAddress}"/></field>
<field name="dataResourceId"><hidden value="${dataResourceId}"/></field>
- <field name="emailDetail" title="${uiLabelMap.CommonEmptyHeader}" widget-area-style="h2"><display description="${uiLabelMap.EbayEmailDetail}"/></field>
+ <field name="emailDetail" title=" " widget-area-style="h2"><display description="${uiLabelMap.EbayEmailDetail}"/></field>
<field name="autoText" action="doSelect(this.id)" event="onchange" >
<drop-down allow-empty="true">
<option key="$\{buyerUserId}" description="Buyer User ID"/>
@@ -449,10 +449,10 @@ under the License.
</field>
<field name="subject"><text/></field>
<field name="textData" title="${uiLabelMap.CommonMessage}"><textarea visual-editor-enable="true" rows="20" cols="120" default-value="${textData}"/></field>
- <!--field name="paymentInfo" title="${uiLabelMap.CommonEmptyHeader}" widget-area-style="h2"><display description="${uiLabelMap.EbayPaymentInformation}"/></field>
- <field name="includePayment" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.EbayIncludePayNowButtonAndAcceptPaymentMethods}" tooltip-style="h3"><check/></field>
- <field name="crossPromotions" title="${uiLabelMap.CommonEmptyHeader}" widget-area-style="h2"><display description="${uiLabelMap.EbayCrossPromotions}"/></field>
- <field name="includeCrossPromotions" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.EbayIncludeMyDefaultCrossPromotionInThisEmail}" tooltip-style="h3"><check/></field-->
+ <!--field name="paymentInfo" title=" " widget-area-style="h2"><display description="${uiLabelMap.EbayPaymentInformation}"/></field>
+ <field name="includePayment" title=" " tooltip="${uiLabelMap.EbayIncludePayNowButtonAndAcceptPaymentMethods}" tooltip-style="h3"><check/></field>
+ <field name="crossPromotions" title=" " widget-area-style="h2"><display description="${uiLabelMap.EbayCrossPromotions}"/></field>
+ <field name="includeCrossPromotions" title=" " tooltip="${uiLabelMap.EbayIncludeMyDefaultCrossPromotionInThisEmail}" tooltip-style="h3"><check/></field-->
<field name="submitButton"><submit/></field>
</form>
<form name="blockItemsOutOfStock" type="single" target="runBlockItemOutOfStock" header-row-style="header-row" default-table-style="basic-table">