Author: jleroux
Date: Thu Jul 24 13:46:45 2014
New Revision: 1613127
URL:
http://svn.apache.org/r1613127Log:
"Applied fix from trunk for revision: 1613121"
------------------------------------------------------------------------
r1613121 | jleroux | 2014-07-24 15:35:15 +0200 (jeu. 24 juil. 2014) | 1 ligne
Fixes descriptions in createProductPrice service definition and implementation (no functional changes)
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/price/PriceServices.xml
ofbiz/branches/release12.04/applications/product/servicedef/services.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1613121
Modified: ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1613127&r1=1613126&r2=1613127&view=diff==============================================================================
--- ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/price/PriceServices.xml Thu Jul 24 13:46:45 2014
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="
http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
<!-- ProductPrice methods -->
- <simple-method method-name="createProductPrice" short-description="Create an ProductPrice">
+ <simple-method method-name="createProductPrice" short-description="Create a Product Price">
<set field="callingMethodName" value="createProductPrice"/>
<set field="checkAction" value="CREATE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
Modified: ofbiz/branches/release12.04/applications/product/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/servicedef/services.xml?rev=1613127&r1=1613126&r2=1613127&view=diff==============================================================================
--- ofbiz/branches/release12.04/applications/product/servicedef/services.xml (original)
+++ ofbiz/branches/release12.04/applications/product/servicedef/services.xml Thu Jul 24 13:46:45 2014
@@ -240,12 +240,14 @@ under the License.
<service name="createProductPrice" default-entity-name="ProductPrice" engine="simple"
location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="createProductPrice" auth="true">
<description>
- Create an ProductPrice.
- Price is always stored without tax.
+ Create a Product Price.
+
If taxAuthGeoId and taxAuthPartyId are (or taxAuthCombinedId is) passed in then the price will be considered a price
with tax included (the priceWithoutTax, priceWithTax, taxAmount, and taxPercentage fields will also be populated).
- If the taxInPrice field is 'Y' then the price field will be left with the price included (price will be equal to priceWithTax),
+
+ If the taxInPrice field is 'Y' then the price field will be left with the tax included (price will be equal to priceWithTax),
otherwise tax will be removed from the passed in price and the price field will be equal to the priceWithoutTax field.
+
If taxAuthGeoId or taxAuthPartyId empty, and taxAuthCombinedId is empty, then the taxInPrice field will be ignored.
</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
Locked
