Author: jleroux
Date: Thu Nov 7 06:49:47 2013
New Revision: 1539534
URL: http://svn.apache.org/r1539534
Log:
Merges trunk HEAD
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/olap/FactServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services_olap.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl
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/applications/order/widget/ordermgr/OrderMenus.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/config/BirtUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1537506-1539531
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml
Thu Nov 7 06:49:47 2013
@@ -1820,11 +1820,11 @@
</property>
<property key="ContentIndexAll">
<value xml:lang="ar">دÙ٠عÙÙ Ù٠اÙÙ
ØتÙ٠تØت</value>
- <value xml:lang="da">Indeks alt indhold under</value>
+ <value xml:lang="da">Indeks alt indhold under:</value>
<value xml:lang="de">Alle Inhalte indexieren unter</value>
<value xml:lang="en">Index All Content Under</value>
<value xml:lang="es">Indice de todo el contenido</value>
- <value xml:lang="fr">Indexez tout le contenu dessous</value>
+ <value xml:lang="fr">Indexer tout le contenu sous :</value>
<value xml:lang="it">Indicizza Tutti i Contenuti Sotto</value>
<value
xml:lang="ja">ãã¹ã¦ã®ã³ã³ãã³ãã®ç´¢å¼ãä½æ</value>
<value xml:lang="pt">Indexar todo o conteúdo sob</value>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/olap/FactServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/olap/FactServices.xml?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/olap/FactServices.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/olap/FactServices.xml
Thu Nov 7 06:49:47 2013
@@ -482,6 +482,10 @@ under the License.
</simple-method>
<simple-method method-name="convertUomCurrency" short-description="Convert
Uom Currency from UomConversionDated entity">
+ <if-empty field="parameters.nowDate">
+ <now field="now"/>
+ <set field="parameters.nowDate" from-field="now"/>
+ </if-empty>
<entity-condition entity-name="UomConversionDated"
list="UomConversionDatedList">
<condition-list combine="and">
<condition-expr field-name="uomId" operator="equals"
from-field="parameters.uomId"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services_olap.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services_olap.xml?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services_olap.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services_olap.xml
Thu Nov 7 06:49:47 2013
@@ -55,9 +55,9 @@ under the License.
<service name="convertUomCurrency" auth="true" engine="simple"
location="component://order/script/org/ofbiz/order/olap/FactServices.xml"
invoke="convertUomCurrency">
<description>Import Sales Order Data.</description>
- <attribute name="uomId" type="String" mode="IN" optional="false"/>
- <attribute name="uomIdTo" type="String" mode="IN" optional="false"/>
- <attribute name="nowDate" type="Timestamp" mode="IN" optional="false"/>
+ <attribute name="uomId" type="String" mode="IN"/>
+ <attribute name="uomIdTo" type="String" mode="IN"/>
+ <attribute name="nowDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="conversionFactor" type="Double" mode="OUT"
optional="true"/>
</service>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
Thu Nov 7 06:49:47 2013
@@ -60,6 +60,6 @@ if (partyId) {
contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party,
"SHIPPING_LOCATION", "POSTAL_ADDRESS", false));
if (contactMech) {
ShoppingCart shoppingCart = ShoppingCartEvents.getCartObject(request);
- shoppingCart.setShippingContactMechId(contactMech.contactMechId);
+ shoppingCart.setAllShippingContactMechId(contactMech.contactMechId);
}
}
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
Thu Nov 7 06:49:47 2013
@@ -59,7 +59,7 @@ if (shoppingCart.getShipmentMethodTypeId
// other profile defaults
if (!shoppingCart.getShippingAddress() && profiledefs?.defaultShipAddr) {
- shoppingCart.setShippingContactMechId(profiledefs.defaultShipAddr);
+ shoppingCart.setAllShippingContactMechId(profiledefs.defaultShipAddr);
}
if (shoppingCart.selectedPayments() == 0 && profiledefs?.defaultPayMeth) {
shoppingCart.addPayment(profiledefs.defaultPayMeth);
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl
Thu Nov 7 06:49:47 2013
@@ -116,7 +116,7 @@ under the License.
<tr>
<input type='hidden'
name='${shipGroupIndex?default("0")}_shipping_method' value="STANDARD@_NA_" />
<td>
- <input type='text'
name='${shipGroupIndex?default("0")}_ship_estimate'/>
+ <input type='text'
name='${shipGroupIndex?default("0")}_ship_estimate'
value="${cart.getItemShipGroupEstimate(shipGroupIndex?default('0'))?if_exists}"/>
</td>
</tr>
</#if>
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=1539534&r1=1539533&r2=1539534&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
Thu Nov 7 06:49:47 2013
@@ -557,9 +557,9 @@ under the License.
<form name="setShipGroupDates_${shipGroup.shipGroupSeqId}"
method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>">
<input type="hidden" name="orderId"
value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId"
value="${shipGroup.shipGroupSeqId}"/>
- <@htmlTemplate.renderDateTimeField name="shipAfterDate"
event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className=""
alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30"
id="shipAfterDate" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate"
event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className=""
alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30"
id="shipAfterDate_${shipGroup.shipGroupSeqId}" dateType="date"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
<br/>
- <@htmlTemplate.renderDateTimeField name="shipByDate" event=""
action="" value="${shipGroup.shipByDate?if_exists}" className="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30"
id="shipByDate" dateType="date" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="shipByDate" event=""
action="" value="${shipGroup.shipByDate?if_exists}" className="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30"
id="shipByDate_${shipGroup.shipGroupSeqId}" dateType="date"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}"/>
</form>
</td>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderMenus.xml?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderMenus.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderMenus.xml
Thu Nov 7 06:49:47 2013
@@ -262,7 +262,7 @@ under the License.
<link target="EditQuote"/>
</menu-item>
<menu-item name="createOrder" title="${uiLabelMap.OrderCreateOrder}">
- <condition disabled-style="disabled">
+ <condition>
<and>
<not><if-empty field="quote"/></not>
<if-compare operator="equals" value="QUO_APPROVED"
field="quote.statusId"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/ReportScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/ReportScreens.xml?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/ReportScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/ReportScreens.xml
Thu Nov 7 06:49:47 2013
@@ -26,10 +26,12 @@ under the License.
<actions>
<set field="titleProperty" value="OrderReports"/>
<set field="headerItem" value="reports"/>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap"
global="true"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <label
style="h3">${uiLabelMap.BirtOrderReportsWarning}</label>
<include-portal-page id="OrderReportPage"/>
</decorator-section>
</decorator-screen>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
Thu Nov 7 06:49:47 2013
@@ -48,7 +48,7 @@ var autocomp = [
<#if (key == context.returnField)>
<#assign returnField = field/>
<#else>
- <#assign displayString = displayString +
StringUtil.wrapString(field) + " ">
+ <#assign displayString = displayString +
StringUtil.wrapString(field?string) + " ">
</#if>
</#if>
</#list>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Thu Nov 7 06:49:47 2013
@@ -55,19 +55,49 @@ public final class WebSiteProperties {
Assert.notNull("request", request);
WebSiteProperties webSiteProps = (WebSiteProperties)
request.getAttribute("_WEBSITE_PROPS_");
if (webSiteProps == null) {
+ WebSiteProperties defaults = new WebSiteProperties();
+ String httpPort = defaults.getHttpPort();
+ String httpHost = defaults.getHttpHost();
+ String httpsPort = defaults.getHttpsPort();
+ String httpsHost = defaults.getHttpsHost();
+ boolean enableHttps = defaults.getEnableHttps();
Delegator delegator = (Delegator)
request.getAttribute("delegator");
if (delegator != null) {
String webSiteId = WebSiteWorker.getWebSiteId(request);
if (webSiteId != null) {
GenericValue webSiteValue = delegator.findOne("WebSite",
UtilMisc.toMap("webSiteId", webSiteId), true);
if (webSiteValue != null) {
- webSiteProps = from(webSiteValue);
+ if (webSiteValue.get("httpPort") != null) {
+ httpPort = webSiteValue.getString("httpPort");
+ }
+ if (webSiteValue.get("httpHost") != null) {
+ httpHost = webSiteValue.getString("httpHost");
+ }
+ if (webSiteValue.get("httpsPort") != null) {
+ httpsPort = webSiteValue.getString("httpsPort");
+ }
+ if (webSiteValue.get("httpsHost") != null) {
+ httpsHost = webSiteValue.getString("httpsHost");
+ }
+ if (webSiteValue.get("enableHttps") != null) {
+ enableHttps =
webSiteValue.getBoolean("enableHttps");
+ }
}
}
}
- if (webSiteProps == null) {
- webSiteProps = new WebSiteProperties();
+ if (httpPort.isEmpty() && !request.isSecure()) {
+ httpPort = String.valueOf(request.getServerPort());
}
+ if (httpHost.isEmpty() && !request.isSecure()) {
+ httpHost = request.getServerName();
+ }
+ if (httpsPort.isEmpty() && request.isSecure()) {
+ httpsPort = String.valueOf(request.getServerPort());
+ }
+ if (httpsHost.isEmpty() && request.isSecure()) {
+ httpsHost = request.getServerName();
+ }
+ webSiteProps = new WebSiteProperties(httpPort, httpHost,
httpsPort, httpsHost, enableHttps);
request.setAttribute("_WEBSITE_PROPS_", webSiteProps);
}
return webSiteProps;
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/config/BirtUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/config/BirtUiLabels.xml?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/config/BirtUiLabels.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/config/BirtUiLabels.xml
Thu Nov 7 06:49:47 2013
@@ -99,8 +99,8 @@
<value xml:lang="fr">Ventes par canaux</value>
</property>
<property key="BirtOrderReportsWarning">
- <value xml:lang="en">Four Birt reports (Last 3 Months Sales, Sales,
Sales Order Discount Code, Product Demand) require to feed the BI data base
(note that the bi.properties file will need to be updated after September
2023). Then only new approved orders will be taken into account</value>
- <value xml:lang="fr">Quatre tableau créés par Birt (Ventes des 3
derniers mois, Ventes, Ventes par codes promotionels, Demandes par produit)
nécessitent d'alimenter la base de données d'Inform. décis. (notez aussi la
mà j du fichier bi.properties nécessaire après septembre 2023). Seulemnt
ensuite les commandes approuvées seront prises en compte.</value>
+ <value xml:lang="en">Four Birt reports (Last 3 Months Sales, Sales,
Sales Order Discount Code, Product Demand) require to feed the BI data base
(note that the bi.properties file will need to be updated after September
2023). Then only new approved orders will be taken into account.</value>
+ <value xml:lang="fr">Quatre tableau créés par Birt (Ventes des 3
derniers mois, Ventes, Ventes par codes promotionels, Demandes par produit)
nécessitent d'alimenter la base de données d'Inform. décis. (notez aussi la
nécessaire mà j du fichier bi.properties après septembre 2023). Ensuite
seules les commandes nouvellement approuvées seront prises en compte.</value>
</property>
<property key="ExampleBirtExamples">
<value xml:lang="en">BIRT Examples</value>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1539534&r1=1539533&r2=1539534&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
Thu Nov 7 06:49:47 2013
@@ -393,7 +393,8 @@ under the License.
<Product productId="GZ-1006-2" productTypeId="FINISHED_GOOD"
primaryProductCategoryId="102" productName="Open Gizmo (GPL)"
internalName="Open Gizmo (GPL)" description="Gizmo based on open standards"
longDescription="Highest quality gizmo around." taxable="Y" chargeShipping="Y"
autoCreateKeywords="Y" isVirtual="N" isVariant="Y" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
<Product productId="GZ-1006-3" productTypeId="FINISHED_GOOD"
primaryProductCategoryId="102" productName="Open Gizmo (BSD)"
internalName="Open Gizmo (BSD)" description="Gizmo based on open standards"
longDescription="Highest quality gizmo around." taxable="Y" chargeShipping="Y"
autoCreateKeywords="Y" isVirtual="N" isVariant="Y" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
<Product productId="GZ-1006-4" productTypeId="FINISHED_GOOD"
primaryProductCategoryId="102" productName="Open Gizmo (MIT)"
internalName="Open Gizmo (MIT)" description="Gizmo based on open standards"
longDescription="Highest quality gizmo around." taxable="Y" chargeShipping="Y"
autoCreateKeywords="Y" isVirtual="N" isVariant="Y" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
-
+ <Product productId="GZ-1006-5" productTypeId="FINISHED_GOOD"
primaryProductCategoryId="102" productName="Open Gizmo (ASL2)"
internalName="Open Gizmo (ASL)" description="Gizmo based on open standards"
longDescription="Highest quality gizmo around." taxable="Y" chargeShipping="Y"
autoCreateKeywords="Y" isVirtual="N" isVariant="Y" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
+
<Product productId="GZ-2002" productTypeId="FINISHED_GOOD"
primaryProductCategoryId="101" productName="Square Gizmo" internalName="Square
Gizmo" description="A square gizmo" taxable="Y" chargeShipping="Y"
autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
<Product productId="GZ-2644" productTypeId="FINISHED_GOOD"
primaryProductCategoryId="101" internalName="Round Gizmo" longDescription="A
small round gizmo with multi-colored lights. Works great in the dark. Small and
compact." isVirtual="N" isVariant="N" quantityIncluded="100.0" weight="7.0"/>
<Product productId="GZ-5005" productTypeId="FINISHED_GOOD"
primaryProductCategoryId="101" productName="Purple Gizmo" internalName="Purple
Gizmo" description="The stylish gizmo" taxable="Y" chargeShipping="Y"
autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2001-05-13
12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0"
lastModifiedByUserLogin="admin"/>
@@ -422,6 +423,8 @@ under the License.
<DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="DRGZ-1006-3-ALTEN" localeString="en_US"/>
<DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="GZ-1006-4-ALT" localeString="en"/>
<DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="DRGZ-1006-4-ALTEN" localeString="en_US"/>
+ <DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="GZ-1006-5-ALT" localeString="en"/>
+ <DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="DRGZ-1006-5-ALTEN" localeString="en_US"/>
<DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="GZ-2002-ALT" localeString="en"/>
<DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="DRGZ-2002-ALTEN" localeString="en_US"/>
<DataResource dataResourceTypeId="ELECTRONIC_TEXT"
dataResourceId="GZ-2644-ALT" localeString="en"/>
@@ -501,6 +504,8 @@ under the License.
<Content contentId="CGZ-1006-3-ALTEN" contentTypeId="DOCUMENT"
dataResourceId="DRGZ-1006-3-ALTEN" localeString="en_US"/>
<Content contentId="GZ-1006-4-ALT" contentTypeId="DOCUMENT"
dataResourceId="GZ-1006-4-ALT" localeString="en"/>
<Content contentId="CGZ-1006-4-ALTEN" contentTypeId="DOCUMENT"
dataResourceId="DRGZ-1006-4-ALTEN" localeString="en_US"/>
+ <Content contentId="GZ-1006-5-ALT" contentTypeId="DOCUMENT"
dataResourceId="GZ-1006-5-ALT" localeString="en"/>
+ <Content contentId="CGZ-1006-5-ALTEN" contentTypeId="DOCUMENT"
dataResourceId="DRGZ-1006-5-ALTEN" localeString="en_US"/>
<Content contentId="GZ-2002-ALT" contentTypeId="DOCUMENT"
dataResourceId="GZ-2002-ALT" localeString="en"/>
<Content contentId="CGZ-2002-ALTEN" contentTypeId="DOCUMENT"
dataResourceId="DRGZ-2002-ALTEN" localeString="en_US"/>
<Content contentId="GZ-2644-ALT" contentTypeId="DOCUMENT"
dataResourceId="GZ-2644-ALT" localeString="en"/>
@@ -535,6 +540,7 @@ under the License.
<ContentAssoc contentId="GZ-1006-2-ALT" contentIdTo="CGZ-1006-2-ALTEN"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
<ContentAssoc contentId="GZ-1006-3-ALT" contentIdTo="CGZ-1006-3-ALTEN"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
<ContentAssoc contentId="GZ-1006-4-ALT" contentIdTo="CGZ-1006-4-ALTEN"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
+ <ContentAssoc contentId="GZ-1006-5-ALT" contentIdTo="CGZ-1006-5-ALTEN"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
<ContentAssoc contentId="GZ-2002-ALT" contentIdTo="CGZ-2002-ALTEN"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
<ContentAssoc contentId="GZ-2644-ALT" contentIdTo="CGZ-2644-ALTEN"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
<ContentAssoc contentId="GZ-5005-ALT" contentIdTo="CGZ-5005-ALTEN"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
@@ -555,6 +561,7 @@ under the License.
<ProductContent productId="GZ-1006-2" contentId="GZ-1006-2-ALT"
productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>
<ProductContent productId="GZ-1006-3" contentId="GZ-1006-3-ALT"
productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>
<ProductContent productId="GZ-1006-4" contentId="GZ-1006-4-ALT"
productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>
+ <ProductContent productId="GZ-1006-5" contentId="GZ-1006-5-ALT"
productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>
<ProductContent productId="GZ-2002" contentId="GZ-2002-ALT"
productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>
<ProductContent productId="GZ-2644" contentId="GZ-2644-ALT"
productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>
@@ -815,7 +822,8 @@ under the License.
<ProductFeature productFeatureId="8001" productFeatureCategoryId="8000"
productFeatureTypeId="LICENSE" description="GPL"/>
<ProductFeature productFeatureId="8002" productFeatureCategoryId="8000"
productFeatureTypeId="LICENSE" description="BSD"/>
<ProductFeature productFeatureId="8003" productFeatureCategoryId="8000"
productFeatureTypeId="LICENSE" description="MIT"/>
-
+ <ProductFeature productFeatureId="8004" productFeatureCategoryId="8000"
productFeatureTypeId="LICENSE" description="ASL2"/>
+
<ProductFeatureCategory productFeatureCategoryId="9000"
description="Widget Features"/>
<ProductFeatureCategoryAppl productFeatureCategoryId="9000"
productCategoryId="CATALOG1_SEARCH" fromDate="2001-05-13 12:00:00.0"/>
@@ -839,8 +847,10 @@ under the License.
<ProductFeatureAppl productId="GZ-1006" productFeatureId="8002"
productFeatureApplTypeId="SELECTABLE_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="3"/>
<ProductFeatureAppl productId="GZ-1006" productFeatureId="8003"
+ productFeatureApplTypeId="SELECTABLE_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="4"/>
+ <ProductFeatureAppl productId="GZ-1006" productFeatureId="8004"
productFeatureApplTypeId="SELECTABLE_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="4"/>
-
+
<ProductFeatureAppl productId="GZ-1006-1" productFeatureId="8000"
productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="1"/>
<ProductFeatureAppl productId="GZ-1006-2" productFeatureId="8001"
@@ -849,7 +859,9 @@ under the License.
productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="1"/>
<ProductFeatureAppl productId="GZ-1006-4" productFeatureId="8003"
productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="1"/>
-
+ <ProductFeatureAppl productId="GZ-1006-5" productFeatureId="8004"
+ productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="1"/>
+
<ProductFeatureAppl productId="WG-9943" productFeatureId="9000"
productFeatureApplTypeId="SELECTABLE_FEATURE" fromDate="2001-05-13
12:00:00.0" sequenceNum="1"/>
<ProductFeatureAppl productId="WG-9943" productFeatureId="9001"
@@ -892,7 +904,9 @@ under the License.
productIdTo="GZ-1006-3" quantity="1.0" reason=""/>
<ProductAssoc fromDate="2001-05-13 12:00:00.0"
productAssocTypeId="PRODUCT_VARIANT" productId="GZ-1006"
productIdTo="GZ-1006-4" quantity="1.0" reason=""/>
-
+ <ProductAssoc fromDate="2001-05-13 12:00:00.0"
productAssocTypeId="PRODUCT_VARIANT" productId="GZ-1006"
+ productIdTo="GZ-1006-5" quantity="1.0" reason=""/>
+
<ProductAssoc fromDate="2001-05-13 12:00:00.0"
productAssocTypeId="PRODUCT_VARIANT" productId="WG-9943"
productIdTo="WG-9943-B3" quantity="1.0" reason=""/>
<ProductAssoc fromDate="2001-05-13 12:00:00.0"
productAssocTypeId="PRODUCT_VARIANT" productId="WG-9943"
@@ -1110,6 +1124,8 @@ under the License.
<InventoryItemDetail inventoryItemId="9023"
inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0"
availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
<InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9024"
inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01
08:00:00.000" productId="GZ-1006-4" ownerPartyId="Company" currencyUomId="USD"
unitCost="2.4"/>
<InventoryItemDetail inventoryItemId="9024"
inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0"
availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9025"
inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01
08:00:00.000" productId="GZ-1006-5" ownerPartyId="Company" currencyUomId="USD"
unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9025"
inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0"
availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
<InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9026"
inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01
08:00:00.000" productId="GZ-1000" ownerPartyId="Company" currencyUomId="USD"
unitCost="2.4"/>
<InventoryItemDetail inventoryItemId="9026"
inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0"
availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
