Compare commits
32
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c69bc8ff85 | ||
|
|
e778e4588e | ||
|
|
d84ed771c2 | ||
|
|
89ad3d8207 | ||
|
|
fda970d434 | ||
|
|
1b740fad0a | ||
|
|
2ba0afe458 | ||
|
|
32a310ca14 | ||
|
|
63df767bee | ||
|
|
e7f198427b | ||
|
|
38419ef257 | ||
|
|
4bef6dd715 | ||
|
|
1c355bb6d8 | ||
|
|
581c68f3c6 | ||
|
|
96e2deea3b | ||
|
|
aff4aa19ff | ||
|
|
819be88570 | ||
|
|
feef385e7e | ||
|
|
128c252942 | ||
|
|
eadffa215b | ||
|
|
39494e6a57 | ||
|
|
b52a5e85e2 | ||
|
|
1ada36d74d | ||
|
|
c903c71aa8 | ||
|
|
e6e7351309 | ||
|
|
2386d02960 | ||
|
|
486f1d8a59 | ||
|
|
d335f7890f | ||
|
|
1a8410f98b | ||
|
|
6d87d52388 | ||
|
|
76775e4a7c | ||
|
|
369088d732 |
@@ -0,0 +1,11 @@
|
||||
Improved:
|
||||
Implemented:
|
||||
Documented:
|
||||
Completed:
|
||||
Reverted:
|
||||
Fixed:
|
||||
(OFBIZ-)
|
||||
|
||||
Explanation
|
||||
|
||||
Thanks:
|
||||
+1
-1
@@ -1 +1 @@
|
||||
.DS_Store
|
||||
/bin/
|
||||
|
||||
@@ -209,11 +209,6 @@ webpos/webapp/webpos/images/js/WebPosHotkeys.js
|
||||
|
||||
=========================================================================
|
||||
|
||||
This product bundles files from the "Birt" technology platform (www.eclipse.org/birt/)
|
||||
which are available under the "Eclipse Public License - v 1.0".
|
||||
For details, see birt/webapp/birt/webcontent/birt/
|
||||
=========================================================================
|
||||
|
||||
This product bundles "Webhelp for DocBook", which is available
|
||||
under the "MIT" License. For details, see cmssite/template/docbook/webhelp/
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="AssetMaintApplication">
|
||||
<value xml:lang="de">Instandhaltungsanwendung</value>
|
||||
<value xml:lang="en">Asset Maintenance Application</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="IsMgrApplication">
|
||||
<value xml:lang="en">Information Systems Management Application</value>
|
||||
<value xml:lang="fr">Gestion du parc informatique</value>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<ofbiz-component name="assetmaint" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<!-- define resource loaders; most common is to use the component resource loader -->
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
|
||||
<!-- ECAs used to extend service permission checking -->
|
||||
<eca service="fixedAssetPermissionCheck" event="return" run-on-failure="true">
|
||||
|
||||
@@ -14,7 +14,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Assetmaint Services: Fixed Asset </description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<test-suite suite-name="assetmainttests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="assetmaint-tests">
|
||||
<simple-method-test location="component://assetmaint/minilang/test/FixedAssetMaintTests.xml"/>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="BusinessIntelligenceApplication">
|
||||
<value xml:lang="en">Business Intelligence Application</value>
|
||||
<value xml:lang="fr">Application d'informatique décisionnelle</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitygroup.xsd">
|
||||
|
||||
<!-- ========================================================= -->
|
||||
<!-- Dimensions -->
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
<!-- ========================================================= -->
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="bi" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
|
||||
<!-- dimension entities -->
|
||||
<eca service="createProduct" event="global-commit-post-run">
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
|
||||
<service name="storeGenericDimension" engine="java"
|
||||
location="org.apache.ofbiz.bi.util.DimensionServices" invoke="storeGenericDimension" auth="true">
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
-->
|
||||
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="BirtErrorCannotDetermineDataSource">
|
||||
<value xml:lang="en">Failed to determine data source for report</value>
|
||||
<value xml:lang="fr">La détermination de la source de données à échoué</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="BirtApplication">
|
||||
<value xml:lang="en">Eclipse BIRT Application</value>
|
||||
<value xml:lang="fr">Application Eclipse Birt</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<title>View definitions for master report services</title>
|
||||
<description>None</description>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="birt" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>OFBiz BIRT Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 211 KiB After Width: | Height: | Size: 196 KiB |
@@ -263,7 +263,8 @@ public final class BirtWorker {
|
||||
String reportForm = (String) resultElectronicText.get("textData");
|
||||
if (!reportForm.startsWith("<?xml")) {
|
||||
StringBuffer xmlHeaderForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
|
||||
xmlHeaderForm.append("<forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
|
||||
xmlHeaderForm.append("<forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:targetNamespace=\"http://ofbiz"
|
||||
+ ".apache.org/dtds/widget-form.xsd\">");
|
||||
xmlHeaderForm.append(reportForm);
|
||||
xmlHeaderForm.append("</forms>");
|
||||
reportForm = xmlHeaderForm.toString();
|
||||
|
||||
@@ -311,7 +311,9 @@ public class BirtServices {
|
||||
try {
|
||||
GenericValue content = EntityQuery.use(delegator).from("Content").where("contentId", reportContentId).queryOne();
|
||||
String dataResourceId = content.getString("dataResourceId");
|
||||
StringBuffer newForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?> <forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
|
||||
StringBuffer newForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?> <forms xmlns:xsi=\"http://www.w3"
|
||||
+ ".org/2001/XMLSchema-instance\" xsi:targetNamespace=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
|
||||
|
||||
newForm.append(overrideFilters);
|
||||
newForm.append("</forms>");
|
||||
Document xmlForm = UtilXml.readXmlDocument(newForm.toString());
|
||||
@@ -725,7 +727,7 @@ public class BirtServices {
|
||||
// user file is deleted straight away to prevent the use of the report as script entry (security)
|
||||
Path path = Paths.get(nameTempRpt);
|
||||
Files.deleteIfExists(path);
|
||||
} catch (Exception e) {
|
||||
} catch (DesignFileException | IOException e) {
|
||||
Debug.logError(e, module);
|
||||
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorInuploadRptDesignNoFile", locale));
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="cmssite" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
<entity-resource type="data" reader-name="demo" loader="main" location="data/CmsMultiSiteDemoData.xml"/>
|
||||
|
||||
@@ -53,7 +53,7 @@ import org.apache.ofbiz.webapp.stats.VisitHandler;
|
||||
// Used to filter website on the basis of hosted pathAlias.
|
||||
public class WebSiteFilter implements Filter {
|
||||
|
||||
public static final String MODULE = WebSiteFilter.class.getName();
|
||||
public static final String module = WebSiteFilter.class.getName();
|
||||
|
||||
protected FilterConfig m_config = null;
|
||||
|
||||
@@ -87,7 +87,7 @@ public class WebSiteFilter implements Filter {
|
||||
webSite = EntityQuery.use(delegator).from("WebSite").where("isDefault", "Y").cache().queryFirst();
|
||||
}
|
||||
} catch (GenericEntityException e) {
|
||||
Debug.logError(e, MODULE);
|
||||
Debug.logError(e, module);
|
||||
}
|
||||
if (webSite != null) {
|
||||
webSiteId = webSite.getString("webSiteId");
|
||||
@@ -95,7 +95,7 @@ public class WebSiteFilter implements Filter {
|
||||
try {
|
||||
productStore = webSite.getRelatedOne("ProductStore", false);
|
||||
} catch (GenericEntityException e) {
|
||||
Debug.logError(e, MODULE);
|
||||
Debug.logError(e, module);
|
||||
}
|
||||
|
||||
String newLocale = request.getParameter("newLocale");
|
||||
@@ -122,7 +122,7 @@ public class WebSiteFilter implements Filter {
|
||||
try {
|
||||
cart.setCurrency(dispatcher, productStore.getString("defaultCurrencyUomId"));
|
||||
} catch (CartItemModifyException e) {
|
||||
Debug.logError(e, MODULE);
|
||||
Debug.logError(e, module);
|
||||
}
|
||||
}
|
||||
session.removeAttribute("webSiteId");
|
||||
@@ -151,7 +151,7 @@ public class WebSiteFilter implements Filter {
|
||||
try {
|
||||
security = SecurityFactory.getInstance(delegator);
|
||||
} catch (SecurityConfigurationException e) {
|
||||
Debug.logError(e, MODULE);
|
||||
Debug.logError(e, module);
|
||||
}
|
||||
request.setAttribute("delegator", delegator);
|
||||
request.setAttribute("dispatcher", dispatcher);
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="buildEbayConfig.exceptionInGetOrdersFromEbay">
|
||||
<value xml:lang="en">Exception in getting orders from Ebay.</value>
|
||||
<value xml:lang="it">Eccezione nel ricevere gli ordini da eBay.</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="ebay" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
<!-- if the order has been imported from eBay, set the order status in eBay to completed -->
|
||||
<eca service="changeOrderStatus" event="commit" run-on-error="false">
|
||||
<condition field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>eBay Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="EbayStoreApplication">
|
||||
<value xml:lang="en">eBay Store</value>
|
||||
<value xml:lang="zh">eBay店铺</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="ebaystore" enabled="false"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
<eca service="createEbayProductStorePref" event="commit">
|
||||
<condition operator="equals" field-name="enabled" value="Y"/>
|
||||
<condition operator="is-not-empty" field-name="serviceName"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>eBay Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>eBay Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -40,6 +40,7 @@ import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.table.AbstractTableModel;
|
||||
import javax.swing.table.TableModel;
|
||||
|
||||
@@ -2258,12 +2259,20 @@ public class EbayStore {
|
||||
|
||||
// Upload image to ofbiz path /runtime/tmp .
|
||||
ByteBuffer byteWrap = (ByteBuffer) context.get("imageData");
|
||||
File file = new File(System.getProperty("ofbiz.home"), "runtime" + File.separator + "tmp" + File.separator + imageFileName);
|
||||
String fileToCheck = System.getProperty("ofbiz.home"), "runtime" + File.separator + "tmp" + File.separator + imageFileName;
|
||||
File file = new File(fileToCheck);
|
||||
FileOutputStream fileOutputStream = new FileOutputStream(file, false);
|
||||
FileChannel wChannel = fileOutputStream.getChannel();
|
||||
wChannel.write(byteWrap);
|
||||
wChannel.close();
|
||||
fileOutputStream.close();
|
||||
String fileToCheck = imageServerPath + "/" + newFileLocation + "." + imgExtension;
|
||||
ImageIO.write(bufNewImg, imgExtension, new File(fileToCheck));
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image")) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
|
||||
|
||||
// Set path file picture to api and set picture details.
|
||||
String [] pictureFiles = {System.getProperty("ofbiz.home") + File.separator + "runtime" + File.separator + "tmp" + File.separator + imageFileName};
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="EcommerceAboutUs">
|
||||
<value xml:lang="en">About Us</value>
|
||||
<value xml:lang="fr">A propos</value>
|
||||
|
||||
@@ -86,7 +86,7 @@ if (featureIdByType) {
|
||||
|
||||
if (searcher) {
|
||||
Debug.logInfo("in search searchFeature3, combQuery:" + combQuery.toString(), "")
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(100) //defaulting to 100 results
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(100, 100) //defaulting to 100 results
|
||||
searcher.search(combQuery.build(), collector)
|
||||
ScoreDoc[] hits = collector.topDocs().scoreDocs
|
||||
Debug.logInfo("in search, hits:" + collector.getTotalHits(), "")
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
|
||||
import org.apache.ofbiz.base.util.UtilProperties
|
||||
import org.apache.ofbiz.base.util.UtilHttp
|
||||
import org.apache.ofbiz.base.util.UtilMisc
|
||||
import org.apache.ofbiz.product.store.ProductStoreWorker
|
||||
|
||||
@@ -54,5 +55,5 @@ if (userInfoMap) {
|
||||
request.getSession().setAttribute("userInfoMap", userInfoMap)
|
||||
}
|
||||
|
||||
donePage = "main;" + parameters.visit.sessionId
|
||||
donePage = "main;" + UtilHttp.getSessionId(request)
|
||||
context.donePage = donePage
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="ecommerce" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
@@ -18,7 +18,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<#if productIds?has_content>
|
||||
<div class="card">
|
||||
<div class="card promotion-products">
|
||||
<div class="card-header">
|
||||
${uiLabelMap.OrderProductsForPromotion}
|
||||
</div>
|
||||
|
||||
@@ -336,6 +336,8 @@ $(function(){
|
||||
</#if>
|
||||
</#macro>
|
||||
|
||||
${screens.render("component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productvariantjs")}
|
||||
${variantInfoJavaScript!}
|
||||
<div id="product-detail" class="card">
|
||||
<#assign productAdditionalImage1 = productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
|
||||
<#assign productAdditionalImage2 = productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
|
||||
@@ -705,7 +707,7 @@ $(function(){
|
||||
<div id="addCart2" style="display:block;">
|
||||
<span style="white-space: nowrap;"><strong>${uiLabelMap.CommonQuantity}:</strong></span>
|
||||
<input type="text" class="form-control" size="5" value="1" disabled="disabled"/>
|
||||
<a href="javascript:showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonPleaseSelectAllFeaturesFirst}");"
|
||||
<a href="javascript:showErrorAlert('${uiLabelMap.CommonErrorMessage2}','${uiLabelMap.CommonPleaseSelectAllFeaturesFirst}');"
|
||||
class="btn btn-outline-secondary"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
|
||||
|
||||
</div>
|
||||
@@ -719,15 +721,13 @@ $(function(){
|
||||
</select>
|
||||
</div>
|
||||
</#list>
|
||||
<span id="product_uom"></span>
|
||||
<span id="product_uom"></span><br/>
|
||||
<div class="variant-price" style="display: none;">
|
||||
<strong><span class="product_id_display"> </span></strong>
|
||||
<strong><span class="variant_price_display"> </span></strong>
|
||||
</div>
|
||||
<input type="hidden" name="product_id" value="${product.productId}"/>
|
||||
<input type="hidden" name="add_product_id" value="NULL"/>
|
||||
<div>
|
||||
<strong><span id="product_id_display"> </span></strong>
|
||||
<strong>
|
||||
<div id="variant_price_display"></div>
|
||||
</strong>
|
||||
</div>
|
||||
<#else>
|
||||
<input type="hidden" name="add_product_id" value="NULL"/>
|
||||
<#assign inStock = false />
|
||||
@@ -737,17 +737,15 @@ $(function(){
|
||||
<input type="hidden" name="add_product_id" value="${product.productId}"/>
|
||||
<#if mainProducts?has_content>
|
||||
<input type="hidden" name="product_id" value=""/>
|
||||
<select name="productVariantId" class="form-control" onchange="javascript:displayProductVirtualVariantId(this.value);">
|
||||
<option value="">Select Unit Of Measure</option>
|
||||
<select name="productVariantId" class="form-control" onchange="javascript:variantUomSelection(this);">
|
||||
<option value="">${uiLabelMap.CommonSelect} ${uiLabelMap.ProductUnitOfMeasure}</option>
|
||||
<#list mainProducts as mainProduct>
|
||||
<option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>
|
||||
</#list>
|
||||
</select><br/>
|
||||
<div>
|
||||
<strong><span id="product_id_display"> </span></strong>
|
||||
<strong>
|
||||
<div id="variant_price_display"></div>
|
||||
</strong>
|
||||
<div class="variant-price" style="display: none;">
|
||||
<strong><span class="product_id_display"> </span></strong>
|
||||
<strong><span class="variant_price_display"> </span></strong>
|
||||
</div>
|
||||
</#if>
|
||||
<#if (availableInventory??) && (availableInventory <= 0) && "N" == product.requireAmount?default("N")>
|
||||
|
||||
@@ -51,6 +51,8 @@
|
||||
}
|
||||
//-->
|
||||
</script>
|
||||
${screens.render("component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productvariantjs")}
|
||||
${variantInfoJavaScript!}
|
||||
<#if product??>
|
||||
<#-- variable setup -->
|
||||
<#if "Y" == backendPath?default("N")>
|
||||
@@ -72,16 +74,15 @@
|
||||
<#assign productDetailId = "productDetailId"/>
|
||||
<#assign productDetailId = productDetailId + product.productId/>
|
||||
|
||||
<div class="col-md-3 products-card">
|
||||
<div class="col-md-4 products-card card-deck">
|
||||
<div class="card text-center">
|
||||
<a href="${productUrl}">
|
||||
<img class="card-img-top" src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image">
|
||||
</a>
|
||||
<div class="card-body">
|
||||
<h4 class="card-title"><a href="${productUrl}" class="btn btn-link">${productContentWrapper.get("PRODUCT_NAME", "html")!}</a></h4>
|
||||
<div class="cart-text">
|
||||
<div class="card-text">
|
||||
<div>${productContentWrapper.get("DESCRIPTION", "html")!}<#if daysToShip??> - ${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div>
|
||||
|
||||
<#-- Display category-specific product comments -->
|
||||
<#if prodCatMem?? && prodCatMem.comments?has_content>
|
||||
<p>${prodCatMem.comments}</p>
|
||||
@@ -196,15 +197,15 @@
|
||||
</div>
|
||||
<#if mainProducts?has_content>
|
||||
<input type="hidden" name="product_id" value=""/>
|
||||
<select name="productVariantId" onchange="javascript:displayProductVirtualId(this.value, '${product.productId}', this.form);">
|
||||
<option value="">Select Unit Of Measure</option>
|
||||
<select name="productVariantId" onchange="javascript:variantUomSelection(this);" style="width: 100%;">
|
||||
<option value="">${uiLabelMap.CommonSelect} ${uiLabelMap.ProductUnitOfMeasure}</option>
|
||||
<#list mainProducts as mainProduct>
|
||||
<option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>
|
||||
</#list>
|
||||
</select>
|
||||
<div style="display: inline-block;">
|
||||
<strong><span id="product_id_display"> </span></strong>
|
||||
<strong><span id="variant_price_display"> </span></strong>
|
||||
<div class="variant-price" style="display: none;">
|
||||
<strong><span class="product_id_display"> </span></strong>
|
||||
<strong><span class="variant_price_display"> </span></strong>
|
||||
</div>
|
||||
</#if>
|
||||
</div>
|
||||
|
||||
@@ -24,7 +24,6 @@ under the License.
|
||||
<#if !creditCard??>
|
||||
<h2>${uiLabelMap.AccountingAddNewCreditCard}</h2>
|
||||
<form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform">
|
||||
<div>
|
||||
<#else>
|
||||
<h2>${uiLabelMap.AccountingEditCreditCard}</h2>
|
||||
<form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform">
|
||||
@@ -32,6 +31,7 @@ under the License.
|
||||
</#if>
|
||||
<a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="btn btn-outline-secondary">${uiLabelMap.CommonGoBack}</a>
|
||||
<a href="javascript:document.editcreditcardform.submit()" class="btn btn-outline-secondary">${uiLabelMap.CommonSave}</a>
|
||||
<div>
|
||||
${screens.render("component://ecommerce/widget/CustomerScreens.xml#creditCardFields")}
|
||||
<label class="mb-2">${uiLabelMap.PartyBillingAddress}</label>
|
||||
<#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
|
||||
|
||||
@@ -464,10 +464,20 @@ under the License.
|
||||
<input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
|
||||
<input type="hidden" name="roleTypeId" value="OWNER"/>
|
||||
<label class="mr-2">${uiLabelMap.EcommerceUploadNewFile}</label>
|
||||
<label class="custom-file mr-2">
|
||||
<input type="file" name="uploadedFile" class="custom-file-input"/>
|
||||
<span class="custom-file-control"></span>
|
||||
</label>
|
||||
<div class="custom-file mr-2">
|
||||
<input type="file" class="custom-file-input" id="customFile" required/>
|
||||
<label class="custom-file-label" for="customFile">Choose file</label>
|
||||
<div class="invalid-feedback">Example invalid custom file feedback</div>
|
||||
</div>
|
||||
<script>
|
||||
$('#customFile').on('change',function(){
|
||||
//get the file name
|
||||
var fileName = $(this).val();
|
||||
fileName = fileName.replace('C:\\fakepath\\', " ");
|
||||
//replace the "Choose a file" label
|
||||
$(this).next('.custom-file-label').html(fileName);
|
||||
})
|
||||
</script>
|
||||
<select name="partyContentTypeId" class="custom-select mr-2">
|
||||
<option value="">${uiLabelMap.PartySelectPurpose}</option>
|
||||
<#list partyContentTypes as partyContentType>
|
||||
@@ -499,7 +509,7 @@ under the License.
|
||||
<th>${uiLabelMap.CommonThruDate}</th>
|
||||
<th>${uiLabelMap.CommonStatus}</th>
|
||||
<th>${uiLabelMap.CommonEmail}</th>
|
||||
<th></th>
|
||||
<th>${uiLabelMap.MarketingContactListOptInVerifyCode}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
<#list contactListPartyList as contactListParty>
|
||||
|
||||
@@ -25,6 +25,12 @@ under the License.
|
||||
<hr/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
|
||||
<tr>
|
||||
<td width="26%" align="right" valign="top">
|
||||
<div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div>
|
||||
</td>
|
||||
<td width="5"> </td>
|
||||
<td width="74%"> </td>
|
||||
</tr>
|
||||
${screens.render("component://ecommerce/widget/CustomerScreens.xml#creditCardFields")}
|
||||
|
||||
|
||||
@@ -21,6 +21,14 @@ under the License.
|
||||
<#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
|
||||
<#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
|
||||
<div class="card">
|
||||
<#if "Y" == maySelectItems?default("N") && "PLACING_CUSTOMER" == roleTypeId!>
|
||||
<form method="post" id="sendMeThisEveryMonthForm" name="sendMeThisEveryMonthForm" action="<@ofbizUrl fullPath='true'>createShoppingListFromOrder</@ofbizUrl>">
|
||||
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
|
||||
<input type="hidden" name="frequency" value="6"/>
|
||||
<input type="hidden" name="intervalNumber" value="1"/>
|
||||
<input type="hidden" name="shoppingListTypeId" value="SLT_AUTO_REODR"/>
|
||||
</form>
|
||||
</#if>
|
||||
<#if "Y" == maySelectItems?default("N")>
|
||||
<form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
|
||||
<input type="hidden" name="add_all" value="false" />
|
||||
@@ -36,8 +44,7 @@ under the License.
|
||||
class="btn btn-sm float-right">${uiLabelMap.OrderAddAllToCart}</a>
|
||||
<a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
|
||||
class="btn btn-sm float-right">${uiLabelMap.OrderAddCheckedToCart}</a>
|
||||
<a href="<@ofbizUrl fullPath="true">createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>"
|
||||
class="btn btn-sm float-right">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
|
||||
<button form="sendMeThisEveryMonthForm" class="btn btn-sm float-right" type="submit">${uiLabelMap.OrderSendMeThisEveryMonth}</button>
|
||||
</#if>
|
||||
</strong>
|
||||
</div>
|
||||
@@ -145,7 +152,7 @@ under the License.
|
||||
<#else>
|
||||
<#assign product = orderItem.getRelatedOne("Product", true)!/> <#-- should always exist because of FK constraint, but just in case -->
|
||||
<td>
|
||||
<a href="<@ofbizCatalogAltUrl fullPath="true" secure="false" productId=orderItem.productId/>"
|
||||
<a href="<@ofbizCatalogAltUrl secure="false" productId=orderItem.productId/>"
|
||||
class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a>
|
||||
<#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute", null, null, false)/>
|
||||
<#if orderItemAttributes?has_content>
|
||||
|
||||
@@ -25,7 +25,7 @@ under the License.
|
||||
|
||||
<handler name="java" type="request" class="org.apache.ofbiz.webapp.event.JavaEventHandler"/>
|
||||
<handler name="groovy" type="request" class="org.apache.ofbiz.webapp.event.GroovyEventHandler"/>
|
||||
<handler name="soap" type="request" class="org.apache.ofbiz.webapp.event.SOAPEventHandler"/>
|
||||
<!-- <handler name="soap" type="request" class="org.apache.ofbiz.webapp.event.SOAPEventHandler"/> -->
|
||||
<handler name="service" type="request" class="org.apache.ofbiz.webapp.event.ServiceEventHandler"/>
|
||||
<handler name="service-multi" type="request" class="org.apache.ofbiz.webapp.event.ServiceMultiEventHandler"/>
|
||||
<handler name="simple" type="request" class="org.apache.ofbiz.webapp.event.SimpleEventHandler"/>
|
||||
@@ -134,7 +134,7 @@ under the License.
|
||||
<request-map uri="setSessionLocale">
|
||||
<security https="false" auth="false"/>
|
||||
<event type="java" path="org.apache.ofbiz.common.CommonEvents" invoke="setSessionLocale"/>
|
||||
<response name="success" type="request-redirect" value="fromSetSessionLocale"/>
|
||||
<response name="success" type="request-redirect" value="fromSetSessionLocale"/>
|
||||
<response name="error" type="view" value="main"/>
|
||||
</request-map>
|
||||
|
||||
|
||||
@@ -120,4 +120,8 @@ button.jGrowl-close {
|
||||
.hidden {
|
||||
height: 0;
|
||||
visibility: hidden;
|
||||
}
|
||||
.promotion-products .products-card {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -31,6 +31,7 @@ under the License.
|
||||
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
<property-map resource="MarketingUiLabels.xml" map-name="uiLabelMap" global="true"/>
|
||||
|
||||
<set field="MainColumnStyle" value="nocolumns" global="true"/>
|
||||
<script location="component://ecommerce/groovyScripts/EcommerceSetup.groovy"/>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="ExampleFeatureApplType.description.DESIRED">
|
||||
<value xml:lang="en">Desired</value>
|
||||
<value xml:lang="fr">Désiré</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="ExampleEditHelp">
|
||||
<value xml:lang="en">An example of a Help screen.</value>
|
||||
<value xml:lang="fr">Un exemple d'écran d'aide</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="ContentFopFonts">
|
||||
<value xml:lang="en">FOP fonts in a PDF</value>
|
||||
<value xml:lang="fr">Polices FOP dans un PDF</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
<!-- ========================================================= -->
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
<!-- ========================================================= -->
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="example" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<!-- define resource loaders; most common is to use the component resource loader -->
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
<eca service="createExample" event="return">
|
||||
<action service="createExampleStatus" mode="sync"/>
|
||||
</eca>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Example Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<test-suite suite-name="example-tests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="userLoginEntityXmlAssert">
|
||||
<entity-xml action="assert" entity-xml-url="component://example/testdef/assertdata/TestUserLoginData.xml"/>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="exampleext" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
<webapp name="exampleext" title="ExampleExt" menu-name="secondary" server="default-server" location="webapp/exampleext"
|
||||
|
||||
+1
-1
@@ -18,5 +18,5 @@
|
||||
*/
|
||||
|
||||
dependencies {
|
||||
pluginLibsCompile 'org.jasig.cas:cas-server-core:3.3.5'
|
||||
pluginLibsCompile 'org.apereo.cas:cas-server-support-ldap-core:5.0.10'
|
||||
}
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="ldap" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<!-- define resource loaders; most common is to use the component resource loader -->
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
|
||||
+4
-2
@@ -29,7 +29,8 @@ import javax.naming.directory.InitialDirContext;
|
||||
import javax.naming.directory.SearchControls;
|
||||
import javax.naming.directory.SearchResult;
|
||||
|
||||
import org.jasig.cas.util.LdapUtils;
|
||||
import org.apereo.cas.util.LdapUtils;
|
||||
import org.ldaptive.LdapEntry;
|
||||
import org.apache.ofbiz.base.util.UtilXml;
|
||||
import org.apache.ofbiz.ldap.commons.AbstractOFBizAuthenticationHandler;
|
||||
import org.w3c.dom.Element;
|
||||
@@ -91,7 +92,8 @@ public final class OFBizActiveDirectoryAuthenticationHandler extends AbstractOFB
|
||||
}
|
||||
String filter = UtilXml.childElementValue(rootElement, "Filter", "(objectclass=*)");
|
||||
String attribute = UtilXml.childElementValue(rootElement, "Attribute", "uid=%u");
|
||||
attribute = LdapUtils.getFilterWithValues(attribute, username);
|
||||
LdapEntry entry = new LdapEntry(username);
|
||||
attribute = LdapUtils.getString(entry, attribute);
|
||||
NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
|
||||
// Filter expression
|
||||
"(&(" + filter + ") (" + attribute +"))",
|
||||
|
||||
+4
-2
@@ -27,7 +27,8 @@ import javax.naming.directory.DirContext;
|
||||
import javax.naming.directory.InitialDirContext;
|
||||
import javax.naming.directory.SearchControls;
|
||||
import javax.naming.directory.SearchResult;
|
||||
import org.jasig.cas.util.LdapUtils;
|
||||
import org.apereo.cas.util.LdapUtils;
|
||||
import org.ldaptive.LdapEntry;
|
||||
import org.apache.ofbiz.base.util.UtilXml;
|
||||
import org.apache.ofbiz.ldap.commons.AbstractOFBizAuthenticationHandler;
|
||||
import org.w3c.dom.Element;
|
||||
@@ -76,7 +77,8 @@ public final class OFBizLdapAuthenticationHandler extends AbstractOFBizAuthentic
|
||||
}
|
||||
String filter = UtilXml.childElementValue(rootElement, "Filter", "(objectclass=*)");
|
||||
String attribute = UtilXml.childElementValue(rootElement, "Attribute", "uid=%u");
|
||||
attribute = LdapUtils.getFilterWithValues(attribute, username);
|
||||
LdapEntry entry = new LdapEntry(username);
|
||||
attribute = LdapUtils.getString(entry, attribute);
|
||||
NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
|
||||
// Filter expression
|
||||
"(&(" + filter + ") (" + attribute +"))",
|
||||
|
||||
+6
-4
@@ -17,7 +17,9 @@
|
||||
* under the License.
|
||||
*/
|
||||
dependencies {
|
||||
pluginLibsCompile 'org.apache.lucene:lucene-core:7.1.0'
|
||||
pluginLibsCompile 'org.apache.lucene:lucene-queryparser:7.1.0'
|
||||
pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:7.1.0'
|
||||
}
|
||||
// Remember to change the version number in SearchWorker class when upgrading.
|
||||
// Also Solr et Lucene should use the same version, luceneMatchVersion should be updated in solrconfig.xml
|
||||
pluginLibsCompile 'org.apache.lucene:lucene-core:8.11.1'
|
||||
pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.11.1'
|
||||
pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.11.1'
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
|
||||
<!-- Product Keyword Indexing ECAs -->
|
||||
<eca entity="Product" operation="create-store-remove" event="return">
|
||||
|
||||
@@ -94,7 +94,7 @@ if (searchFeature1 || searchFeature2 || searchFeature3 || !featureIdByType.isEmp
|
||||
}
|
||||
}
|
||||
if (searcher) {
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(100) //defaulting to 100 results
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(100, 100) //defaulting to 100 results
|
||||
searcher.search(combQuery.build(), collector)
|
||||
ScoreDoc[] hits = collector.topDocs().scoreDocs
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ if (parameters.luceneQuery) {
|
||||
}
|
||||
combQuery.add(query, BooleanClause.Occur.MUST)
|
||||
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(100) // defaulting to 100 results
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(100, 100) // defaulting to 100 results
|
||||
searcher.search(combQuery, collector)
|
||||
ScoreDoc[] hits = collector.topDocs().scoreDocs
|
||||
productList = []
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
<ofbiz-component name="lucene" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<!-- define resource loaders; most common is to use the component resource loader -->
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Lucene Services</description>
|
||||
<vendor></vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -41,7 +41,7 @@ public final class SearchWorker {
|
||||
|
||||
public static final String module = SearchWorker.class.getName();
|
||||
|
||||
private static final Version LUCENE_VERSION = Version.LUCENE_7_1_0;
|
||||
private static final Version LUCENE_VERSION = Version.LUCENE_8_11_1;
|
||||
|
||||
private SearchWorker() {}
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ public class LuceneTests extends OFBizTestCase {
|
||||
combQueryBuilder.add(query, BooleanClause.Occur.MUST);
|
||||
BooleanQuery combQuery = combQueryBuilder.build();
|
||||
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(10);
|
||||
TopScoreDocCollector collector = TopScoreDocCollector.create(10, 10);
|
||||
searcher.search(combQuery, collector);
|
||||
|
||||
assertEquals("Only 1 result expected from the testdata", 1, collector.getTotalHits());
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<test-suite suite-name="lucenetests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="lucene-tests-data-load">
|
||||
<entity-xml action="load" entity-xml-url="component://lucene/testdef/data/LuceneTestsData.xml"/>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="multiflex"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<!-- define resource loaders; most common is to use the component resource loader -->
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ under the License.
|
||||
<property name="VT_STYLESHEET['add']" value="/ecommerce/images/blog.css"/>
|
||||
<property name="VT_STYLESHEET['add']" value="/multiflex/style.css"/>
|
||||
<property name="VT_STYLESHEET['add']" value="/contentimages/css/contentForum.css"/>
|
||||
<property name="VT_STYLESHEET['add']" value="/ecommerce/js/bootstrap/js/bootstrap-4.3.1.min.css"/>
|
||||
<property name="VT_STYLESHEET['add']" value="/ecommerce/js/bootstrap/css/bootstrap-4.3.1.min.css"/>
|
||||
<!--template location-->
|
||||
<property name="VT_HDR_TMPLT_LOC" value="component://multiflex/template/Header.ftl"/>
|
||||
<property name="VT_FTR_TMPLT_LOC" value="component://multiflex/template/Footer.ftl"/>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="MyPortalAppBar">
|
||||
<value xml:lang="en">My Page App Bar</value>
|
||||
<value xml:lang="fr">Menu des applications</value>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<ofbiz-component name="myportal" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Project Manager service definitions.</description>
|
||||
|
||||
<!-- check access in permission service -->
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<title>Entity of Passport Component</title>
|
||||
<description>Data Model Enhancements For Passport</description>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="passport"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<!-- define resource loaders; most common is to use the component resource loader -->
|
||||
<resource-loader name="main" type="component"/>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
|
||||
<entity entity-name="ExcelImportHistory"
|
||||
package-name="org.apache.ofbiz.product.catalog"
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="pricat" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://www.ofbiz.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="FormFieldTitle_actualHours">
|
||||
<value xml:lang="de">Ist-Stunden</value>
|
||||
<value xml:lang="en">Actual Hours</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
|
||||
<eca entity="WorkEffortPartyAssignment" operation="create" event="return">
|
||||
<condition field-name="statusId" operator="equals" value="PAS_ASSIGNED"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
<!-- ========================================================= -->
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="projectmgr" enabled="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Project Manager service definitions.</description>
|
||||
|
||||
<service name="createTimeEntryInTimesheet" default-entity-name="TimeEntry" engine="simple" auth="true"
|
||||
|
||||
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="PageTitleAddProductTimeToNewInvoice">
|
||||
<value xml:lang="en">Add all reported/approved task time to a new invoice</value>
|
||||
<value xml:lang="zh">把全部已报告的/已批准的任务时间添加到一个新的发票</value>
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
<!-- ========================================================= -->
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user