svn commit: r1728261 [1/3] - in /ofbiz/trunk/applications/product: script/org/ofbiz/product/category/ script/org/ofbiz/product/communication/ script/org/ofbiz/product/config/ script/org/ofbiz/product/inventory/ script/org/ofbiz/product/price/ script/or...

[nmalin]

Author: nmalin
Date: Wed Feb  3 07:27:21 2016
New Revision: 1728261

URL: http://svn.apache.org/viewvc?rev=1728261&view=rev
Log:
convert simple crud service to entity-auto for the follow entities :  
ProductPaymentMethodType, SupplierProduct, CommunicationEventProduct, ProductCategoryMember, ProductFeatureDataResource, ProductConfig, ProductConfigItem, ProductConfigOption, ProductConfigProduct, ProductPriceRule, ProductPriceCond, ProductPriceAction, PhysicalInventory, ProductFacilityLocation, Facility, FacilityLocation, FacilityGroupMember, FacilityGroupRollup, FacilityParty, FacilityContent, InventoryItemLabelType, InventoryItemLabelAppl, InventoryItemLabel, ProductPromo, ProductPromoCode, ProductPromoCategory, ProductPromoCodeEmail, ProductPromoCodeParty, ProductPromoProduct, ProductPromoRule
Added a new service productPriceGenericPermission for acces control to related price service. Issue OFBIZ-6873

Removed:
    ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/
Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml
    ofbiz/trunk/applications/product/servicedef/secas.xml
    ofbiz/trunk/applications/product/servicedef/services.xml
    ofbiz/trunk/applications/product/servicedef/services_facility.xml
    ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml
    ofbiz/trunk/applications/product/servicedef/services_store.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Wed Feb  3 07:27:21 2016
@@ -50,12 +50,7 @@ under the License.
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
         <call-service service-name="updateContent" in-map-name="updateContent"/>
     </simple-method>
-    <simple-method method-name="removeCategoryContent" short-description="Remove Content From Category">
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
+
     <simple-method method-name="createSimpleTextContentForCategory" short-description="Create Simple Text Content For Product Category">
         <set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContentMap"/>
         <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/>
@@ -70,6 +65,7 @@ under the License.
         <set-service-fields service-name="updateSimpleTextContent" map="parameters" to-map="updateSimpleText"/>
         <call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
     </simple-method>
+
     <simple-method method-name="updateContentSEOForCategory" short-description="Update SEO Content For Product Category">
         <if-not-empty field="parameters.title">
             <entity-and list="productCategoryContents" entity-name="ProductCategoryContentAndInfo">
@@ -138,6 +134,7 @@ under the License.
             </if-not-empty>
         </if-not-empty>
     </simple-method>
+
     <simple-method method-name="createRelatedUrlContentForCategory" short-description="Create Related URL Content For Product Category">
         <set field="dataResource.dataResourceName" from-field="parameters.title"/>
         <set field="dataResource.dataResourceTypeId" value="URL_RESOURCE"/>
@@ -163,27 +160,27 @@ under the License.
         <call-service service-name="createContent" in-map-name="content">
             <result-to-field result-name="contentId" field="parameters.contentId"/>
         </call-service>
-        
+
         <set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContentMap"/>
         <call-service service-name="createCategoryContent" in-map-name="createCategoryContentMap"/>
     </simple-method>
     <simple-method method-name="updateRelatedUrlContentForCategory" short-description="Update Related URL Content For Product Category">
         <set-service-fields service-name="updateCategoryContent" map="parameters" to-map="updateCategoryContent"/>
         <call-service service-name="updateCategoryContent" in-map-name="updateCategoryContent"/>
-        
+
         <set field="dataResource.dataResourceId" from-field="parameters.dataResourceId"/>
         <set field="dataResource.dataResourceName" from-field="parameters.title"/>
         <set field="dataResource.objectInfo" from-field="parameters.url"/>
         <set field="dataResource.localeString" from-field="parameters.localeString"/>
         <call-service service-name="updateDataResource" in-map-name="dataResource"/>
-        
+
         <set field="updateContent.contentId" from-field="parameters.contentId"/>
         <set field="updateContent.contentName" from-field="parameters.title"/>
         <set field="updateContent.description" from-field="parameters.description"/>
         <set field="updateContent.localeString" from-field="parameters.localeString"/>
         <call-service service-name="updateContent" in-map-name="updateContent"/>
     </simple-method>
-    
+
     <simple-method method-name="createDownloadContentForCategory" short-description="Create Download Content For Category">
         <set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContent"/>
         <!-- Create Data Resource -->
@@ -210,7 +207,7 @@ under the License.
         <set field="createCategoryContent.contentId" from-field="parameters.contentId"/>
         <call-service service-name="createCategoryContent" in-map-name="createCategoryContent"/>
     </simple-method>
-    
+
     <simple-method method-name="updateDownloadContentForCategory" short-description="Update Download Content For Category">
         <set field="attachMap.uploadedFile" from-field="parameters.imageData"/>
         <set field="attachMap._uploadedFile_fileName" from-field="parameters._imageData_fileName"/>
@@ -218,7 +215,7 @@ under the License.
         <set field="attachMap.mimeTypeId" from-field="parameters._imageData_contentType"/>
         <set field="attachMap.dataResourceId" from-field="parameters.fileDataResourceId"/>
         <call-service service-name="attachUploadToDataResource" in-map-name="attachMap"/>
-        
+
         <set-service-fields service-name="updateCategoryContent" map="parameters" to-map="updateCategoryContent"/>
         <call-service service-name="updateCategoryContent" in-map-name="updateCategoryContent"/>
     </simple-method>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Wed Feb  3 07:27:21 2016
@@ -106,49 +106,12 @@ under the License.
     <!-- ProductCategoryMember Services -->
     <!-- ================================================================ -->
 
-    <simple-method method-name="addProductToCategory" short-description="Add Product to Category">
-        <!-- note that the security semantics require the user to have the general admin permission,
-            or the role limited permission and association with the category, not the product -->
-            <!--
-        <set value="addProductToCategory" field="callingMethodName"/>
-        <set value="CREATE" field="checkAction"/>
-        <call-simple-method method-name="checkCategoryRelatedPermission"/>
-        <check-errors/>
-        -->
-        <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <if-empty field="newEntity.fromDate">
-            <now-timestamp field="newEntity.fromDate"/>
-        </if-empty>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-
     <simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories">
+        <set-service-fields service-name="addProductToCategory" to-map="addProductToCategoryMap" map="parameters"/>
         <if-instance-of field="parameters.categories" class="java.util.List">
             <iterate entry="category" list="parameters.categories">
-                <!-- note that the security semantics require the user to have the general admin permission,
-                    or the role limited permission and association with the category, not the product -->
-                <!--
-                <set field="productCategoryIdToCheck" from-field="category"/>
-                <set field="callingMethodName" value="addProductToCategories"/>
-                <set field="checkAction" value="CREATE"/>
-                <call-simple-method method-name="checkCategoryRelatedPermission"/>
-                <check-errors/>
-                 -->
-
-                <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
-                <set field="newEntity.productCategoryId" from-field="category"/>
-                <set-pk-fields map="parameters" value-field="newEntity"/>
-                <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-                <if-empty field="newEntity.fromDate">
-                    <now-timestamp field="newEntity.fromDate"/>
-                </if-empty>
-
-                <create-value value-field="newEntity"/>
+                <set field="addProductToCategoryMap.productCategoryId" from-field="category"/>
+                <call-service service-name="addProductToCategory" in-map-name="addProductToCategoryMap"/>
             </iterate>
             <else>
                 <!-- note that the security semantics require the user to have the general admin permission,
@@ -159,36 +122,12 @@ under the License.
                 <call-simple-method method-name="checkCategoryRelatedPermission"/>
                 <check-errors/>
 
-                <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
-                <set field="newEntity.productCategoryId" from-field="parameters.categories"/>
-                <set-pk-fields map="parameters" value-field="newEntity"/>
-                <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-                <if-empty field="newEntity.fromDate">
-                    <now-timestamp field="newEntity.fromDate"/>
-                </if-empty>
-
-                <create-value value-field="newEntity"/>
+                <set field="addProductToCategoryMap.productCategoryId" from-field="productCategoryIdToCheck"/>
+                <call-service service-name="addProductToCategory" in-map-name="addProductToCategoryMap"/>
             </else>
         </if-instance-of>
     </simple-method>
 
-    <simple-method method-name="updateProductToCategory" short-description="Update Product to Category Application">
-        <!-- note that the security semantics require the user to have the general admin permission,
-            or the role limited permission and association with the category, not the product -->
-        <!--
-        <set value="updateProductToCategory" field="callingMethodName"/>
-        <set value="UPDATE" field="checkAction"/>
-        <call-simple-method method-name="checkCategoryRelatedPermission"/>
-        <check-errors/>
-         -->
-
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
     <simple-method method-name="removeProductFromCategory" short-description="Remove Product From Category">
         <!-- note that the security semantics require the user to have the general admin permission,
             or the role limited permission and association with the category, not the product -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Wed Feb  3 07:27:21 2016
@@ -21,94 +21,6 @@ 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">
     <!-- ProductConfig methods -->
-    <simple-method method-name="createProductConfig" short-description="Create a ProductConfig">
-        <set field="callingMethodName" value="createProductConfig"/>
-        <set field="checkAction" value="CREATE"/>
-        <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductConfig"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-
-        <now-timestamp field="nowTimestamp"/>
-
-        <if-empty field="newEntity.fromDate">
-            <set field="newEntity.fromDate" from-field="nowTimestamp"/>
-        </if-empty>
-        <field-to-result field="newEntity.fromDate" result-name="fromDate"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductConfig" short-description="Update an ProductConfig">
-        <set field="callingMethodName" value="updateProductConfig"/>
-        <set field="checkAction" value="UPDATE"/>
-        <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductConfig" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductConfig" map="lookupPKMap" value-field="lookedUpValue"/>
-
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductConfig" short-description="Delete an ProductConfig">
-        <set field="callingMethodName" value="deleteProductConfig"/>
-        <set field="checkAction" value="DELETE"/>
-        <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductConfig" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductConfig" map="lookupPKMap" value-field="lookedUpValue"/>
-
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for Config Items -->
-    <simple-method method-name="createProductConfigItem" short-description="Create a Config Item">
-        <check-permission action="_CREATE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigItem" value-field="newEntity"/>
-        <sequenced-id sequence-name="ProductConfigItem" field="newEntity.configItemId"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <field-to-result field="newEntity.configItemId" result-name="configItemId"/>
-    </simple-method>
-    <simple-method method-name="updateProductConfigItem" short-description="Update a Config Item">
-        <check-permission action="_UPDATE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductConfigItem" short-description="Delete a Config Item">
-        <check-permission action="_DELETE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
     <!-- Methods for Config Options -->
     <simple-method method-name="createProductConfigOption" short-description="Create a Config Option">
         <check-permission action="_CREATE" permission="CATALOG">
@@ -123,58 +35,6 @@ under the License.
         <field-to-result field="newEntity.configItemId" result-name="configItemId"/>
         <field-to-result field="newEntity.configOptionId" result-name="configOptionId"/>
     </simple-method>
-    <simple-method method-name="updateProductConfigOption" short-description="Update a Config Option">
-        <check-permission action="_UPDATE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductConfigOption" short-description="Delete a Config Option">
-        <check-permission action="_DELETE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
     <!-- Methods for ProductConfigProduct -->
-    <simple-method method-name="createProductConfigProduct" short-description="Create a ProductConfigProduct">
-        <check-permission action="_CREATE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigProduct" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductConfigProduct" short-description="Update a ProductConfigProduct">
-        <check-permission action="_UPDATE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductConfigProduct" short-description="Delete a ProductConfigProduct">
-        <check-permission action="_DELETE" permission="CATALOG">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
 
 </simple-methods>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Wed Feb  3 07:27:21 2016
@@ -50,12 +50,6 @@ under the License.
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
         <call-service service-name="updateContent" in-map-name="updateContent"/>
     </simple-method>
-    <simple-method method-name="removeProductConfigItemContent" short-description="Remove Content From ProductConfigItem">
-        <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
 
     <!-- Specialized -->
     <simple-method method-name="createSimpleTextContentForProductConfigItem" short-description="Create Simple Text Content For Product">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Wed Feb  3 07:27:21 2016
@@ -282,7 +282,6 @@ under the License.
     </simple-method>
 
     <simple-method method-name="updateInventoryItem" short-description="Update an InventoryItem">
-
         <make-value entity-name="InventoryItem" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
@@ -489,7 +488,7 @@ under the License.
                             <set field="product.salesDiscWhenNotAvail" from-field="virtProduct.salesDiscWhenNotAvail"/>
                         </if-empty>
                     </if-not-empty>
-                </if-not-empty>    
+                </if-not-empty>
             </if-compare>
         </if-not-empty>
 
@@ -563,24 +562,7 @@ under the License.
         <!-- TODO: (possibly a big deal?) check to see if any reserved inventory needs to be changed because of a change in availableToPromise -->
         <!-- TODO: make sure availableToPromise is never greater than the quantityOnHand? -->
     </simple-method>
-    <simple-method method-name="createPhysicalInventory" short-description="Create a PhysicalInventory">
-
-        <make-value value-field="newEntity" entity-name="PhysicalInventory"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
-        <if-empty field="newEntity.physicalInventoryDate">
-            <now-timestamp field="newEntity.physicalInventoryDate"/>
-        </if-empty>
-        <if-empty field="newEntity.partyId">
-            <set from-field="userLogin.partyId" field="newEntity.partyId"/>
-        </if-empty>
-
-        <sequenced-id sequence-name="PhysicalInventory" field="physicalInventoryId"/>
-        <set from-field="physicalInventoryId" field="newEntity.physicalInventoryId"/>
-        <field-to-result field="physicalInventoryId" result-name="physicalInventoryId"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
     <simple-method method-name="createPhysicalInventoryAndVariance" short-description="Create a PhysicalInventory and an InventoryItemVariance">
         <set-service-fields service-name="createPhysicalInventory" map="parameters" to-map="createPhysicalInventoryMap"/>
         <call-service service-name="createPhysicalInventory" in-map-name="createPhysicalInventoryMap">
@@ -591,54 +573,6 @@ under the License.
         <call-service service-name="createInventoryItemVariance" in-map-name="createInventoryItemVarianceMap"/>
     </simple-method>
 
-    <!-- ProductFacility methods -->
-    <simple-method method-name="createProductFacility" short-description="Create a ProductFacility">
-
-        <make-value value-field="newEntity" entity-name="ProductFacility"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductFacility" short-description="Update a ProductFacility">
-
-        <make-value entity-name="ProductFacility" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductFacility" short-description="Delete a ProductFacility">
-
-        <make-value entity-name="ProductFacility" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductFacilityLocation methods -->
-    <simple-method method-name="createProductFacilityLocation" short-description="Create a ProductFacilityLocation">
-
-        <make-value value-field="newEntity" entity-name="ProductFacilityLocation"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductFacilityLocation" short-description="Update a ProductFacilityLocation">
-
-        <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductFacilityLocation" short-description="Delete a ProductFacilityLocation">
-
-        <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- ================================================================ -->
     <!-- Check/Reserve Inventory Services -->
     <!-- ================================================================ -->
@@ -1153,55 +1087,6 @@ under the License.
         <field-to-result field="quantityNotTransferred"/>
     </simple-method>
 
-    <!-- Inventory Label Services -->
-    <simple-method method-name="createInventoryItemLabelType" short-description="Create an InventoryItemLabelType">
-        <make-value entity-name="InventoryItemLabelType" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateInventoryItemLabelType" short-description="Update an InventoryItemLabelType">
-        <entity-one entity-name="InventoryItemLabelType" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteInventoryItemLabelType" short-description="Delete an InventoryItemLabelType">
-        <entity-one entity-name="InventoryItemLabelType" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="createInventoryItemLabel" short-description="Create an InventoryItemLabel">
-        <make-value entity-name="InventoryItemLabel" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateInventoryItemLabel" short-description="Update an InventoryItemLabel">
-        <entity-one entity-name="InventoryItemLabel" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteInventoryItemLabel" short-description="Delete an InventoryItemLabel">
-        <entity-one entity-name="InventoryItemLabel" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="createInventoryItemLabelAppl" short-description="Create an InventoryItemLabelAppl">
-        <make-value entity-name="InventoryItemLabelAppl" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <entity-one entity-name="InventoryItemLabel" value-field="inventoryItemLabel"/>
-        <set field="newEntity.inventoryItemLabelTypeId" from-field="inventoryItemLabel.inventoryItemLabelTypeId"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateInventoryItemLabelAppl" short-description="Update an InventoryItemLabel">
-        <entity-one entity-name="InventoryItemLabelAppl" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteInventoryItemLabelAppl" short-description="Delete an InventoryItemLabel">
-        <entity-one entity-name="InventoryItemLabelAppl" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <simple-method method-name="changeOwnerUponIssuance" short-description="If product store setOwnerUponIssuance is Y or empty, set the inventory item owner upon issuance.">
         <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
         <get-related-one value-field="itemIssuance" relation-name="InventoryItem" to-value-field="inventoryItem"/>
@@ -1314,4 +1199,14 @@ under the License.
             </else>
         </if-empty>
     </simple-method>
+
+    <simple-method method-name="createInventoryItemLabelAppl" short-description="Create an InventoryItemLabelAppl">
+        <make-value entity-name="InventoryItemLabelAppl" value-field="newEntity"/>
+        <set-pk-fields map="parameters" value-field="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
+        <entity-one entity-name="InventoryItemLabel" value-field="inventoryItemLabel"/>
+        <set field="newEntity.inventoryItemLabelTypeId" from-field="inventoryItemLabel.inventoryItemLabelTypeId"/>
+        <create-value value-field="newEntity"/>
+    </simple-method>
+
 </simple-methods>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Wed Feb  3 07:27:21 2016
@@ -173,17 +173,8 @@ under the License.
         </if>
     </simple-method>
 
+    <!-- TODO NMA convert to entity auto when changed fileds are managed -->
     <simple-method method-name="saveProductPriceChange" short-description="Save History of ProductPrice Change">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <alt-permission permission="CATALOG" action="_CREATE"/>
-            <alt-permission permission="CATALOG" action="_DELETE"/>
-            <alt-permission permission="CATALOG_ROLE" action="_CREATE"/>
-            <alt-permission permission="CATALOG_ROLE" action="_UPDATE"/>
-            <alt-permission permission="CATALOG_ROLE" action="_DELETE"/>
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-
         <!-- Note that this is kept pretty simple: if a price is specific but no oldPrice, then it is generally a create, if both are specified it is generally an update, if only the oldPrice is specified it is generally a delete -->
         <make-value value-field="newEntity" entity-name="ProductPriceChange"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -197,86 +188,6 @@ under the License.
         <create-value value-field="newEntity"/>
     </simple-method>
 
-    <!-- ProductPaymentMethodType methods -->
-    <simple-method method-name="createProductPaymentMethodType" short-description="create a ProductPaymentMethodType">
-        <set field="callingMethodName" value="createProductPaymentMethodType"/>
-        <set field="checkAction" value="CREATE"/>
-        <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
-        <check-errors/>
-        <make-value entity-name="ProductPaymentMethodType" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPaymentMethodType" short-description="update a ProductPaymentMethodType">
-        <set field="callingMethodName" value="updateProductPaymentMethodType"/>
-        <set field="checkAction" value="UPDATE"/>
-        <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
-        <check-errors/>
-        <entity-one entity-name="ProductPaymentMethodType" value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPaymentMethodType" short-description="delete a ProductPaymentMethodType">
-        <set field="callingMethodName" value="deleteProductPaymentMethodType"/>
-        <set field="checkAction" value="DELETE"/>
-        <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
-        <check-errors/>
-        <entity-one entity-name="ProductPaymentMethodType" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPriceRule methods -->
-    <simple-method method-name="createProductPriceRule" short-description="Create an ProductPriceRule">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPriceRule"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="parameters.fromDate">
-            <now-timestamp field="newEntity.fromDate"/>
-        </if-empty>
-        <sequenced-id sequence-name="ProductPriceRule" field="newEntity.productPriceRuleId"/>
-        <field-to-result field="newEntity.productPriceRuleId" result-name="productPriceRuleId"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPriceRule" short-description="Update an ProductPriceRule">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPriceRule" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPriceRule" short-description="Delete an ProductPriceRule">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPriceRule" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- ProductPriceCond methods -->
     <simple-method method-name="createProductPriceCond" short-description="Create an ProductPriceCond">
         <check-permission permission="CATALOG" action="_CREATE">
@@ -319,69 +230,7 @@ under the License.
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="deleteProductPriceCond" short-description="Delete an ProductPriceCond">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPriceCond" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPriceAction methods -->
-    <simple-method method-name="createProductPriceAction" short-description="Create an ProductPriceAction">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPriceAction"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <make-next-seq-id value-field="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
-        <field-to-result field="newEntity.productPriceActionSeqId" result-name="productPriceActionSeqId"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPriceAction" short-description="Update an ProductPriceAction">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPriceAction" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPriceAction" short-description="Delete an ProductPriceAction">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
 
-        <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPriceAction" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-    
     <simple-method method-name="getAssociatedPriceRulesConds" short-description="Set the Value options for selected Price Rule Condition Input" login-required="false">
         <if>
             <condition>
@@ -394,7 +243,7 @@ under the License.
                 <return/>
             </then>
         </if>
-        
+
         <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PRODUCT_ID">
             <entity-condition entity-name="Product" list="condValues">
                 <!-- May prove more useful rather than an entity-and in custom cases-->
@@ -454,7 +303,7 @@ under the License.
                 <set field="option" value="${condValue.description}: ${condValue.roleTypeId}"/>
                 <field-to-list list="productPriceRulesCondValues" field="option"/>
             </iterate>
-        </if-compare>        
+        </if-compare>
         <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_WEBSITE_ID">
             <entity-condition entity-name="WebSite" list="condValues"/>
             <iterate list="condValues" entry="condValue">
@@ -485,12 +334,12 @@ under the License.
                 <field-to-list list="productPriceRulesCondValues" field="option"/>
             </iterate>
         </if-compare>
-        
+
         <if-empty field="productPriceRulesCondValues">
             <property-to-field resource="CommonUiLabels" property="CommonNoOptions" field="noOptions"/>
             <field-to-list list="productPriceRulesCondValues" field="noOptions"/>
         </if-empty>
         <field-to-result field="productPriceRulesCondValues"/>
     </simple-method>
-    
+
 </simple-methods>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Wed Feb  3 07:27:21 2016
@@ -116,19 +116,6 @@ under the License.
         <call-service service-name="createContentAssoc" in-map-name="createContentAssocMap"/>
     </simple-method>
 
-    <!-- ProductFeatureDataResource -->
-    <simple-method method-name="createProductFeatureDataResource" short-description="Create ProductFeature-DataResource">
-        <make-value value-field="newEntity" entity-name="ProductFeatureDataResource"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="removeProductFeatureDataResource" short-description="Remove ProductFeature-DataResource">
-        <make-value value-field="lookupPKMap" entity-name="ProductFeatureDataResource"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-    
     <simple-method method-name="uploadProductAdditionalViewImages" short-description="Method to upload multiple Additional View images for product">
         <set-service-fields service-name="addAdditionalViewForProduct" map="parameters" to-map="addAdditionalViewForProductMap"/>
         <if-not-empty field="parameters.additionalImageOne">
@@ -171,38 +158,12 @@ under the License.
     </simple-method>
 
     <!-- ProductPromoContent -->
-    <simple-method method-name="createProductPromoContent" short-description="Create Content For Product Promo">
-        <make-value value-field="newEntity" entity-name="ProductPromoContent"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.fromDate">
-            <now-timestamp field="nowTimestamp"/>
-            <set field="newEntity.fromDate" from-field="nowTimestamp"/>
-        </if-empty>
-        <create-value value-field="newEntity"/>
-        <field-to-result field="newEntity.contentId" result-name="contentId"/>
-        <field-to-result field="newEntity.productPromoId" result-name="productPromoId"/>
-        <field-to-result field="newEntity.productPromoContentTypeId" result-name="productPromoContentTypeId"/>
-    </simple-method>
-
-    <simple-method method-name="updateProductPromoContent" short-description="Update Content For Product Promo">
-        <make-value value-field="lookupPKMap" entity-name="ProductPromoContent"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <simple-method method-name="removeProductPromoContent" short-description="Remove Content From Product Promo">
-        <make-value value-field="lookupPKMap" entity-name="ProductPromoContent"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <if-empty field="lookedUpValue.thruDate">
-            <now-timestamp field="nowTimestamp"/>
-            <set from-field="nowTimestamp" field="lookedUpValue.thruDate"/>
+        <set-service-fields service-name="updateProductPromoContent" to-map="updateProductPromoContentMap" map="parameters"/>
+        <if-empty field="updateProductPromoContentMap.thruDate">
+            <now-timestamp field="updateProductPromoContentMap.thruDate"/>
         </if-empty>
-        <store-value value-field="lookedUpValue"/>
+        <call-service service-name="updateProductPromoContent" in-map-name="updateProductPromoContentMap"/>
     </simple-method>
 
     <!-- Product Content SEO -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Wed Feb  3 07:27:21 2016
@@ -711,6 +711,29 @@ under the License.
             </else>
         </if-empty>
     </simple-method>
+    <simple-method method-name="productPriceGenericPermission" short-description="product price permission logic">
+        <set field="mainAction" from-field="parameters.mainAction"/>
+        <if-empty field="mainAction">
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductMissingMainActionInPermissionService"/>
+            </add-error>
+            <check-errors/>
+        </if-empty>
+        <check-permission permission="CATALOG_PRICE_MAINT">
+            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
+        </check-permission>
+        <call-simple-method method-name="checkProductRelatedPermission"/>
+        <if-empty field="error_list">
+            <set field="hasPermission" type="Boolean" value="true"/>
+            <field-to-result field="hasPermission"/>
+            <else>
+                <property-to-field resource="ProductUiLabels" property="ProductPermissionError" field="failMessage"/>
+                <set field="hasPermission" type="Boolean" value="false"/>
+                <field-to-result field="hasPermission"/>
+                <field-to-result field="failMessage"/>
+            </else>
+        </if-empty>
+    </simple-method>
 
     <!-- ================================================================ -->
     <!-- ProductRole Services -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Wed Feb  3 07:27:21 2016
@@ -20,303 +20,9 @@ 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">
-    <!-- ProductPromo methods -->
-    <simple-method method-name="createProductPromo" short-description="Create a ProductPromo">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromo"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <sequenced-id sequence-name="ProductPromo" field="newEntity.productPromoId"/>
-        <field-to-result field="newEntity.productPromoId" result-name="productPromoId"/>
-
-        <if-empty field="newEntity.userEntered">
-            <set value="Y" set-if-empty="true" field="newEntity.userEntered"/>
-        </if-empty>
-
-        <now-timestamp field="nowTimestamp"/>
-        <set from-field="nowTimestamp" field="newEntity.createdDate"/>
-        <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
-        <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
-        <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPromo" short-description="Update a ProductPromo">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <set from-field="parameters.productPromoId" field="lookupPKMap.productPromoId"/>
-        <find-by-primary-key entity-name="ProductPromo" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-
-        <if-empty field="lookedUpValue.userEntered">
-            <set value="Y" set-if-empty="true" field="lookedUpValue.userEntered"/>
-        </if-empty>
-
-        <now-timestamp field="nowTimestamp"/>
-        <set from-field="nowTimestamp" field="lookedUpValue.lastModifiedDate"/>
-        <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
-
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromo" short-description="Delete a ProductPromo">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <!-- TODO: if a force remove flag is passed, remove related info first, maybe just rules, store assocs, etc -->
-
-        <set from-field="parameters.productPromoId" field="lookupPKMap.productPromoId"/>
-        <find-by-primary-key entity-name="ProductPromo" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromoAction methods -->
-    <simple-method method-name="createProductPromoAction" short-description="Create an ProductPromoAction">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromoAction"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <make-next-seq-id value-field="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
-        <field-to-result field="newEntity.productPromoActionSeqId" result-name="productPromoActionSeqId"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPromoAction" short-description="Update an ProductPromoAction">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromoAction" short-description="Delete an ProductPromoAction">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromoCategory methods -->
-    <simple-method method-name="createProductPromoCategory" short-description="Create an ProductPromoCategory">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromoCategory"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPromoCategory" short-description="Update an ProductPromoCategory">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-         </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromoCategory" short-description="Delete an ProductPromoCategory">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromoCode methods -->
-    <simple-method method-name="createProductPromoCode" short-description="Create an ProductPromoCode">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromoCode"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.productPromoCodeId">
-            <sequenced-id sequence-name="ProductPromoCode" field="newEntity.productPromoCodeId" stagger-max="100"/>
-        </if-empty>
-
-        <field-to-result field="newEntity.productPromoCodeId" result-name="productPromoCodeId"/>
-
-        <now-timestamp field="nowTimestamp"/>
-        <if-empty field="newEntity.fromDate">
-            <set field="newEntity.fromDate" from-field="nowTimestamp"/>
-        </if-empty>
-        <set from-field="nowTimestamp" field="newEntity.createdDate"/>
-        <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
-        <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
-        <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPromoCode" short-description="Update an ProductPromoCode">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-
-        <now-timestamp field="nowTimestamp"/>
-        <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
-        <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
-
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromoCode" short-description="Delete an ProductPromoCode">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromoCodeEmail methods -->
-    <simple-method method-name="createProductPromoCodeEmail" short-description="Create an ProductPromoCodeEmail">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromoCodeEmail"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromoCodeEmail" short-description="Delete an ProductPromoCodeEmail">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoCodeEmail" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromoCodeParty methods -->
-    <simple-method method-name="createProductPromoCodeParty" short-description="Create an ProductPromoCodeParty">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromoCodeParty"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromoCodeParty" short-description="Delete an ProductPromoCodeParty">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoCodeParty" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
 
     <!-- ProductPromoCond methods -->
     <simple-method method-name="createProductPromoCond" short-description="Create an ProductPromoCond">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
         <make-value value-field="newEntity" entity-name="ProductPromoCond"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-not-empty field="parameters.carrierShipmentMethod">
@@ -329,14 +35,6 @@ under the License.
         <create-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="updateProductPromoCond" short-description="Update an ProductPromoCond">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
         <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
@@ -346,163 +44,4 @@ under the License.
         </if-not-empty>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="deleteProductPromoCond" short-description="Delete an ProductPromoCond">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromoProduct methods -->
-    <simple-method method-name="createProductPromoProduct" short-description="Create an ProductPromoProduct">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromoProduct"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPromoProduct" short-description="Update an ProductPromoProduct">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromoProduct" short-description="Delete an ProductPromoProduct">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromoRule methods -->
-    <simple-method method-name="createProductPromoRule" short-description="Create a ProductPromoRule">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductPromoRule"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <make-next-seq-id value-field="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
-        <field-to-result field="newEntity.productPromoRuleId" result-name="productPromoRuleId"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductPromoRule" short-description="Update a ProductPromoRule">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPromoRule" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductPromoRule" short-description="Delete a ProductPromoRule">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPromoRule" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- ProductPromo to ProductStore methods -->
-    <simple-method method-name="createProductStorePromoAppl" short-description="Create ProductStorePromoAppl">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="ProductStorePromoAppl"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <if-empty field="newEntity.fromDate">
-            <now-timestamp field="nowTimestamp"/>
-            <set from-field="nowTimestamp" set-if-empty="true" field="newEntity.fromDate"/>
-        </if-empty>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateProductStorePromoAppl" short-description="Update ProductStorePromoAppl">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteProductStorePromoAppl" short-description="Delete ProductStorePromoAppl">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-permission permission="CATALOG_PRICE_MAINT">
-            <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Wed Feb  3 07:27:21 2016
@@ -51,7 +51,7 @@ under the License.
         <create-value value-field="newValue"/>
         
         <!-- now create the FacilityContactMechPurpose record -->
-        <if-not-empty field="parameters.contactMechPurposeTypeId">        
+        <if-not-empty field="parameters.contactMechPurposeTypeId">
             <make-value value-field="facilityContactMechPurpose" entity-name="FacilityContactMechPurpose"/>
             <set-pk-fields map="newValue" value-field="facilityContactMechPurpose"/>
             <set field="facilityContactMechPurpose.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
@@ -153,7 +153,6 @@ under the License.
         </if-empty>
         <now-timestamp field="facilityContactMech.thruDate"/>
         <store-value value-field="facilityContactMech"/>
-
     </simple-method>
 
     <simple-method method-name="createFacilityPostalAddress" short-description="Create a PostalAddress for facility">
@@ -254,7 +253,6 @@ under the License.
         <log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
         <field-to-request field="newFacilityContactMech.contactMechId" request-name="contactMechId"/>
         <field-to-result field="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
-
     </simple-method>
 
     <simple-method method-name="createFacilityEmailAddress" short-description="Create an email address for facility">
@@ -362,4 +360,4 @@ under the License.
 
         <store-value value-field="purposeEntity"/>
     </simple-method>
-</simple-methods>
+</simple-methods>
\ No newline at end of file