svn commit: r1597158 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1597158 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Fri May 23 19:00:23 2014 New Revision: 1597158 URL: http://svn.apache.org/r1597158 Log: Merges trunk HEAD in SEO branch Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/lib/README ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/catalog.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/price/PriceServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/ecommerce.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/servicedef/secas.xml Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1590573-1597157 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore Fri May 23 19:00:23 2014 @@ -25,6 +25,7 @@ runtime/data/utilcache.* runtime/catalina/work/* runtime/jetty runtime/tempfiles/* +runtime/indexes/products/ themes/flatgrey/webapp/flatgrey/javascript-min.css themes/flatgrey/webapp/flatgrey/js/application-min.js themes/flatgrey/webapp/flatgrey/maincss-min.css @@ -37,3 +38,4 @@ themes/flatgrey/webapp/flatgrey/mainrtl- *# .*.swp .*.swo +framework/entity/lib/jdbc Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/lib/README URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/lib/README?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/lib/README (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/lib/README Fri May 23 19:00:23 2014 @@ -1,3 +1,10 @@ To use the cybersource or worldpay or securepay libraries you can copy them to this directory. See the ofbiz/OPTIONAL_LIBRARIES file for more information. + +Copy in ofbiz-component.xml if necessary +<classpath type="jar" location="lib/securepay/*"/> +<classpath type="jar" location="lib/cybersource/*"/> +<classpath type="jar" location="lib/worldpay/*"/> +<classpath type="dir" location="lib/worldpay"/> + Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml Fri May 23 19:00:23 2014 @@ -25,10 +25,6 @@ under the License. <classpath type="jar" location="build/lib/*"/> <classpath type="dir" location="config"/> <classpath type="jar" location="lib/*"/> - <classpath type="jar" location="lib/securepay/*"/> - <classpath type="jar" location="lib/cybersource/*"/> - <classpath type="jar" location="lib/worldpay/*"/> - <classpath type="dir" location="lib/worldpay"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_reports.xml"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri May 23 19:00:23 2014 @@ -1098,7 +1098,11 @@ public class InvoiceServices { } catch (GenericEntityException e) { return ServiceUtil.returnError(e.getMessage()); } - } else { + } + + // Either no orderShipment exists, or there's a null invoicePerShipment in the OrderHeader. + // In either case, use the default value from the properties + if (invoicePerShipment == null) { invoicePerShipment = UtilProperties.getPropertyValue("AccountingConfig","create.invoice.per.shipment"); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Fri May 23 19:00:23 2014 @@ -1198,7 +1198,11 @@ public class ShoppingCartItem implements } } } - priceContext.put("currencyUomIdTo", cart.getCurrency()); + if ("true".equals(UtilProperties.getPropertyValue("catalog.properties", "convertProductPriceCurrency"))){ + priceContext.put("currencyUomIdTo", cart.getCurrency()); + } else { + priceContext.put("currencyUomId", cart.getCurrency()); + } priceContext.put("prodCatalogId", this.getProdCatalogId()); priceContext.put("webSiteId", cart.getWebSiteId()); priceContext.put("productStoreId", cart.getProductStoreId()); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml Fri May 23 19:00:23 2014 @@ -241,7 +241,7 @@ under the License. <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl --> <set field="asm_multipleSelectForm" value="lookuporder"/> <set field="asm_multipleSelect" value="roleTypeId"/> - <set field="asm_formSize" value="700"/> + <set field="asm_formSize" value="1000"/> <set field="asm_asmListItemPercentOfForm" value="95"/> <set field="asm_sortable" value="false"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -334,11 +334,11 @@ under the License. <set field="headerItem" value="findorders"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/ReceivePayment.groovy"/> <entity-and entity-name="OrderRole" list="orderRoles"> - <field-map field-name="orderId" value="${parameters.orderId}"/> - <field-map field-name="roleTypeId" value="BILL_FROM_VENDOR"/> + <field-map field-name="orderId" value="${parameters.orderId}"/> + <field-map field-name="roleTypeId" value="BILL_FROM_VENDOR"/> </entity-and> <entity-and entity-name="PaymentMethod" list="paymentMethods"> - <field-map field-name="partyId" from-field="orderRoles[0].partyId"/> + <field-map field-name="partyId" from-field="orderRoles[0].partyId"/> </entity-and> </actions> <widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/catalog.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/catalog.properties?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/catalog.properties (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/catalog.properties Fri May 23 19:00:23 2014 @@ -41,3 +41,6 @@ image.management.url=/images/products/ma image.management.nameofthumbnail=-100 image.management.autoApproveImage=Y image.management.multipleApproval=N + +# Automatic product price currency conversion +convertProductPriceCurrency=false Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Fri May 23 19:00:23 2014 @@ -643,7 +643,7 @@ under the License. <!-- Check/Reserve Inventory Services --> <!-- ================================================================ --> - <simple-method method-name="getProductInventoryAvailable" short-description="Get Inventory Available for a Product" login-required="false" use-transaction="false"> + <simple-method method-name="getProductInventoryAvailable" short-description="Get Inventory Available for a Product" login-required="false" use-transaction="true"> <!-- this method can be called with some optional parameters: -facilityId Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/price/PriceServices.java Fri May 23 19:00:23 2014 @@ -522,9 +522,9 @@ public class PriceServices { } // Convert the value to the price currency, if required - if("true".equals(UtilProperties.getPropertyValue("ecommerce.properties", "convertProductPriceCurrency"))){ + if ("true".equals(UtilProperties.getPropertyValue("catalog.properties", "convertProductPriceCurrency"))) { if (UtilValidate.isNotEmpty(currencyDefaultUomId) && UtilValidate.isNotEmpty(currencyUomIdTo) && !currencyDefaultUomId.equals(currencyUomIdTo)) { - if(UtilValidate.isNotEmpty(result)){ + if (UtilValidate.isNotEmpty(result)) { Map<String, Object> convertPriceMap = FastMap.newInstance(); for (Map.Entry<String, Object> entry : result.entrySet()) { BigDecimal tempPrice = BigDecimal.ZERO; @@ -545,22 +545,23 @@ public class PriceServices { else if (entry.getKey() == "listPrice") tempPrice = (BigDecimal) entry.getValue(); - if(tempPrice != null && tempPrice != BigDecimal.ZERO){ + if (tempPrice != null && tempPrice != BigDecimal.ZERO) { Map<String, Object> priceResults = FastMap.newInstance(); try { - priceResults = dispatcher.runSync("convertUom", UtilMisc.<String, Object>toMap("uomId", currencyDefaultUomId, "uomIdTo", currencyUomIdTo, "originalValue", tempPrice , "defaultDecimalScale" , Long.valueOf(2) , "defaultRoundingMode" , "HalfUp")); + priceResults = dispatcher.runSync("convertUom", UtilMisc.<String, Object> toMap("uomId", currencyDefaultUomId, "uomIdTo", currencyUomIdTo, + "originalValue", tempPrice, "defaultDecimalScale", Long.valueOf(2), "defaultRoundingMode", "HalfUp")); if (ServiceUtil.isError(priceResults) || (priceResults.get("convertedValue") == null)) { - Debug.logWarning("Unable to convert " + entry.getKey() + " for product " + productId , module); - } + Debug.logWarning("Unable to convert " + entry.getKey() + " for product " + productId, module); + } } catch (GenericServiceException e) { Debug.logError(e, module); } convertPriceMap.put(entry.getKey(), priceResults.get("convertedValue")); - }else{ + } else { convertPriceMap.put(entry.getKey(), entry.getValue()); } } - if(UtilValidate.isNotEmpty(convertPriceMap)){ + if (UtilValidate.isNotEmpty(convertPriceMap)) { convertPriceMap.put("currencyUsed", currencyUomIdTo); result = convertPriceMap; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Fri May 23 19:00:23 2014 @@ -24,7 +24,7 @@ under the License. for (var x = 0; x <= rowCount; x++) { var quantityAcceptedInput = document.getElementById('quantityAccepted_o_' + x); var quantityInput = document.getElementById('quantity_o_' + x); - if (quantityAcceptedInput?? && quantityInput??) { + if (quantityAcceptedInput != null && quantityInput != null) { quantityInput.value = quantityAcceptedInput.value; } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductStoreForms.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductStoreForms.xml Fri May 23 19:00:23 2014 @@ -53,8 +53,8 @@ </entity-options> </drop-down> </field> - <field name="storeName" title="${uiLabelMap.ProductStoreName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> - <field name="title" title="${uiLabelMap.ProductTitle}"><text size="30" maxlength="60"/></field> + <field name="storeName" title="${uiLabelMap.ProductStoreName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="100"/></field> + <field name="title" title="${uiLabelMap.ProductTitle}"><text size="30" maxlength="100"/></field> <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><text size="60" maxlength="250"/></field> <field name="payToPartyId"><lookup target-form-name="LookupPartyName"/></field> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/widget/WorkEffortForms.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/widget/WorkEffortForms.xml Fri May 23 19:00:23 2014 @@ -404,7 +404,7 @@ under the License. <field-map field-name="entityName" value="WorkEffortFindView"/> <field-map field-name="orderBy" value="lastModifiedDate DESC"/> <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> <service service-name="removeDuplicateWorkEfforts" result-map="result" result-map-list="workEfforts"> <field-map field-name="workEffortIterator" from-field="listIt"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml Fri May 23 19:00:23 2014 @@ -333,7 +333,7 @@ under the License. <field-to-result field="geoList"/> </simple-method> - <simple-method method-name="checkUomConversion" short-description="Returns true if an UomConversion exists"> + <simple-method method-name="checkUomConversion" short-description="Returns true if an UomConversion record exists"> <entity-one entity-name="UomConversion" value-field="uomConversion"> <field-map field-name="uomId" from-field="parameters.uomId"/> <field-map field-name="uomIdTo" from-field="parameters.uomIdTo"/> @@ -341,25 +341,43 @@ under the License. <if-not-empty field="uomConversion"> <set field="exist" value="true" type="Boolean"/> <else> - <set field="exist" value="false" type="Boolean"/> + <set field="exist" value="false" type="Boolean"/> </else> </if-not-empty> <field-to-result field="exist"/> </simple-method> + + <simple-method method-name="checkUomConversionDated" short-description="Returns true if an UomConversionDated record exists"> + <entity-condition entity-name="UomConversionDated" list="uomConversions" filter-by-date="true"> + <condition-list> + <condition-expr field-name="uomId" operator="equals" from-field="parameters.uomId"/> + <condition-expr field-name="uomIdTo" operator="equals" from-field="parameters.uomIdTo"/> + <condition-expr field-name="purposeEnumId" operator="equals" from-field="parameters.purposeEnumId" ignore-if-empty="true"/> + </condition-list> + </entity-condition> + <if-not-empty field="uomConversions"> + <set field="exist" value="true" type="Boolean"/> + <else> + <set field="exist" value="false" type="Boolean"/> + </else> + </if-not-empty> + <field-to-result field="exist"/> + </simple-method> + - <simple-method method-name="getServerTimestamp" login-required="false"> + <simple-method method-name="getServerTimestamp" login-required="false"> <now field="serverTimestamp" type="java.sql.Timestamp"/> <field-to-result field="serverTimestamp"/> - </simple-method> + </simple-method> - <simple-method method-name="getServerTimeZone" login-required="false"> + <simple-method method-name="getServerTimeZone" login-required="false"> <set field="serverTimeZone" value="${util:defaultTimeZone()}" type="String"/> <field-to-result field="serverTimeZone"/> - </simple-method> + </simple-method> - <simple-method method-name="getServerTimestampAsLong" login-required="false"> + <simple-method method-name="getServerTimestampAsLong" login-required="false"> <now field="serverTimestamp" type="java.lang.Long"/> <field-to-result field="serverTimestamp"/> - </simple-method> + </simple-method> </simple-methods> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml Fri May 23 19:00:23 2014 @@ -336,6 +336,24 @@ under the License. <attribute name="conversionParameters" mode="IN" type="Map" optional="true"/> <attribute name="convertedValue" mode="OUT" type="BigDecimal" optional="true"/> </service> + + <service name="checkUomConversion" engine="simple" default-entity-name="UomConversion" + location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="checkUomConversion"> + <description>Returns true if an UomConversion record exists</description> + <permission-service service-name="commonGenericPermission" main-action="VIEW"/> + <auto-attributes include="pk" mode="IN"/> + <attribute name="exist" mode="OUT" type="Boolean"/> + </service> + + <service name="checkUomConversionDated" engine="simple" default-entity-name="UomConversionDated" + location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="checkUomConversionDated"> + <description>Returns true if an UomConversionDated record exists</description> + <permission-service service-name="commonGenericPermission" main-action="VIEW"/> + <auto-attributes include="pk" mode="IN"/> + <attribute name="exist" mode="OUT" type="Boolean"/> + </service> + + <service name="getFileUploadProgressStatus" engine="simple" location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getFileUploadProgressStatus" auth="false"> <description>Look up progress made in File Upload process</description> <attribute name="uploadProgressListener" mode="IN" type="org.ofbiz.webapp.event.FileUploadProgressListener" optional="true"/> @@ -769,14 +787,6 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="checkUomConversion" engine="simple" default-entity-name="UomConversion" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="checkUomConversion"> - <description>Returns true if an UomConversion exists</description> - <permission-service service-name="commonGenericPermission" main-action="VIEW"/> - <auto-attributes include="pk" mode="IN"/> - <attribute name="exist" mode="OUT" type="Boolean"/> - </service> - <service name="getServerTimestamp" engine="simple" auth="false" location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimestamp"> <attribute name="serverTimestamp" mode="OUT" type="TimeStamp"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java Fri May 23 19:00:23 2014 @@ -353,7 +353,7 @@ public class Config { if (args.length > 0) { for (String arg : args) { if (arg.toLowerCase().contains("portoffset=") && !arg.toLowerCase().contains("${portoffset}")) { - adminPort = adminPort == 0 ? adminPort : 10523; // This is necessary because the ASF machines don't allow ports 1 to 3, see INFRA-6790 + adminPort = adminPort != 0 ? adminPort : 10523; // This is necessary because the ASF machines don't allow ports 1 to 3, see INFRA-6790 adminPort += Integer.parseInt(arg.split("=")[1]); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/ecommerce.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/ecommerce.properties?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/ecommerce.properties (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/ecommerce.properties Fri May 23 19:00:23 2014 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. ############################################################################### -convertProductPriceCurrency=true + ############################################ # Janrain Engage Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/ofbiz-component.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/ofbiz-component.xml Fri May 23 19:00:23 2014 @@ -25,12 +25,7 @@ under the License. <!-- place the config directory on the classpath to access configuration files --> <classpath type="dir" location="config"/> - <classpath type="dir" location="dtd"/> - - <!-- load single or multiple external libraries --> - <classpath type="jar" location="build/lib/*"/> - <classpath type="jar" location="lib/*"/> - + <!-- entity resources: model(s), eca(s), group, and data definitions --> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/servicedef/secas.xml?rev=1597158&r1=1597157&r2=1597158&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/servicedef/secas.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/servicedef/secas.xml Fri May 23 19:00:23 2014 @@ -71,7 +71,7 @@ under the License. <action mode="sync" service="autoScrumNotification"/> </eca> <!-- when a communcation event is created check the subject for a PD# string, if found link the email to the certain product--> - <eca service="createCommunicationEvent" event="commit"> +<!-- <eca service="createCommunicationEvent" event="commit"> <action service="linkToProduct" mode="sync"/> </eca> -</service-eca> +--></service-eca> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |