svn commit: r1369382 [3/19] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/script/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/webapp/accounting/WEB-INF/ applic...

[erwan]

Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/sfa/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/sfa/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/sfa/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/sfa/WEB-INF/web.xml Sat Aug  4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>
     <context-param>
-        <param-name>serviceReaderUrls</param-name>
-        <param-value>/WEB-INF/services.xml</param-value>
-        <description>Configuration File(s) For The Service Dispatcher</description>
-    </context-param>
-    <context-param>
         <param-name>mainDecoratorLocation</param-name>
         <param-value>component://marketing/widget/sfa/CommonScreens.xml</param-value>
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>

Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml Sat Aug  4 18:11:00 2012
@@ -114,31 +114,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
-    <screen name="portletUiLabelDecorator">
-        <section><!-- Decorator use by portlet define in their preference label -->
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="uiLabelDecorator"><!-- Main decorator -->
-        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
-            <actions/>
-            <widgets>
-                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
-                <decorator-section-include name="body"/>
-            </widgets>
-        </section>
-    </screen>
-    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml Sat Aug  4 18:11:00 2012
@@ -482,34 +482,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
-    <screen name="portletUiLabelDecorator">
-        <section><!-- Decorator use by portlet define in their preference label -->
-            <actions>
-                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="uiLabelDecorator"><!-- Main decorator -->
-        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
-            <actions/>
-            <widgets>
-                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
-                <decorator-section-include name="body"/>
-            </widgets>
-        </section>
-    </screen>
-    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/order/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/data/OrderPortletData.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/data/OrderPortletData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/data/OrderPortletData.xml Sat Aug  4 18:11:00 2012
@@ -115,78 +115,12 @@
         description=""/>
     <PortletPortletCategory portalPortletId="PurchByPaymMeth" portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PurchByPaymMeth" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/>
-    
     <PortalPortlet portalPortletId="ListPurchaseOrders"
         portletName="List Purchase Orders"
         screenName="ListPurchaseOrders"
         screenLocation="component://order/widget/ordermgr/OrderViewScreens.xml"
         description="List Purchase Orders"/>
     <PortletPortletCategory portalPortletId="ListPurchaseOrders" portletCategoryId="ORDERMGR"/>
-    
-    <PortalPortlet portalPortletId="OrderByReferrer"
-        portletName="Sale Orders By Referrer Report"
-        screenName="SaleOrdersByReferrerReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="OrderByReferrer" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByReferrer" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
-    
-    <PortalPortlet portalPortletId="OrderByChannel"
-        portletName="Sale Orders by Channel"
-        screenName="SaleOrdersByChannelReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="OrderByChannel" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByChannel" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
-    
-    <PortalPortlet portalPortletId="OrderDiscountCode"
-        portletName="Orders with discount code"
-        screenName="SaleOrderDiscountCodeReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="OrderDiscountCode" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderDiscountCode" portletSeqId="00001" columnSeqId="00001" sequenceNum="7"/>
-    
-    <PortalPortlet portalPortletId="Last3MSalesReport"
-        portletName="Last 3 Months Sales Report"
-        screenName="Last3MonthsSalesReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="Last3MSalesReport" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="Last3MSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
-    
-    <PortalPortlet portalPortletId="CouponSalesReport"
-        portletName="Coupon Sales Report"
-        screenName="CouponSalesReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="CouponSalesReport" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="CouponSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="9"/>
-  
-    <PortalPortlet portalPortletId="SalesReport"
-        portletName="Sales Report"
-        screenName="SalesReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="SalesReport" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="SalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/>
-  
-    <PortalPortlet portalPortletId="NBO_Report"
-        portletName="Net Before Overhead Report"
-        screenName="NetBeforeOverheadReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="NBO_Report" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="NBO_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="11"/>
-
-    <PortalPortlet portalPortletId="PDR_Report"
-        portletName="Product Demand Report"
-        screenName="ProductDemandReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/>
-
     <PortletCategory portletCategoryId="CUST_ORDERS" description="Customer Orders"/>
     <PortalPortlet portalPortletId="ListCustReturns"
         portletName="Customer Returns"

Modified: ofbiz/branches/20120329_portletWidget/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/entitydef/entitymodel.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/entitydef/entitymodel.xml Sat Aug  4 18:11:00 2012
@@ -769,6 +769,23 @@ under the License.
             <key-map field-name="parentGroupSeqId" rel-field-name="orderItemGroupSeqId"/>
         </relation>
     </entity>
+    <entity entity-name="OrderItemGroupOrder"
+            package-name="org.ofbiz.order.order"
+            title="Order Item Group Order Entity">
+      <field name="orderId" type="id-ne"></field>
+      <field name="orderItemSeqId" type="id-ne"></field>
+      <field name="groupOrderId" type="id-ne"></field>
+      <prim-key field="orderId"/>
+      <prim-key field="orderItemSeqId"/>
+      <prim-key field="groupOrderId"/>
+      <relation type="one" fk-name="OIGO_ORDER_ITEM" rel-entity-name="OrderItem">
+        <key-map field-name="orderId"/>
+        <key-map field-name="orderItemSeqId"/>
+      </relation>
+      <relation type="one" fk-name="OIGO_GROUP_ORDER" rel-entity-name="ProductGroupOrder">
+        <key-map field-name="groupOrderId"/>
+      </relation>
+    </entity>
     <entity entity-name="OrderItemPriceInfo"
             package-name="org.ofbiz.order.order"
             never-cache="true"

Propchange: ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352

Modified: ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml Sat Aug  4 18:11:00 2012
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods-v2.xsd">
 
     <simple-method method-name="createUpdateCustomerAndShippingAddress" short-description="Create/Update Customer, Shipping Address and other contact details." login-required="false">
         <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml"

Modified: ofbiz/branches/20120329_portletWidget/applications/order/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/servicedef/secas.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/servicedef/secas.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/servicedef/secas.xml Sat Aug  4 18:11:00 2012
@@ -60,6 +60,7 @@ under the License.
     <eca service="changeOrderItemStatus" event="commit">
         <condition field-name="statusId" operator="equals" value="ITEM_CANCELLED"/>
         <action service="cancelOrderInventoryReservation" mode="sync"/>
+        <action service="cancleOrderItemGroupOrder" mode="sync"/>
         <action service="recalcShippingTotal" mode="sync"/>
         <action service="recalcTaxTotal" mode="sync"/>
         <action service="resetGrandTotal" mode="sync"/>
@@ -447,8 +448,4 @@ under the License.
         <condition field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
         <action service="checkOrderItemForProductGroupOrder" mode="sync"/>
     </eca>
-    <eca service="changeOrderStatus" event="commit">
-        <condition field-name="statusId" operator="equals" value="ORDER_CANCELLED"/>
-        <action service="checkOrderItemForProductGroupOrder" mode="sync"/>
-    </eca>
 </service-eca>

Modified: ofbiz/branches/20120329_portletWidget/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/servicedef/services.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/servicedef/services.xml Sat Aug  4 18:11:00 2012
@@ -1142,4 +1142,10 @@ under the License.
         <auto-attributes mode="IN" entity-name="OrderItemAttribute" include="pk" optional="false"/>
     </service>
     
+    <!-- Order Item Group Order -->
+    <service name="createOrderItemGroupOrder" engine="entity-auto" default-entity-name="OrderItemGroupOrder" invoke="create" auth="true">
+        <description>Create Order Item Group Order</description>
+        <auto-attributes mode="IN" entity-name="OrderItemGroupOrder" include="pk" optional="false"/>
+    </service>
+    
 </services>

Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Aug  4 18:11:00 2012
@@ -1155,92 +1155,8 @@ under the License.
     <request-map uri="PurchasesByOrganizationReport.pdf"><security https="true" auth="true"/>
         <response name="success" type="view" value="PurchasesByOrganizationReport"/>
     </request-map>
-    
-    <request-map uri="checkReportBy">
-        <security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy"/>
-        <response name="dayPDF" type="request" value="SalesReport.pdf"/>
-        <response name="weekPDF" type="request" value="SalesReportWeek.pdf"/>
-        <response name="monthPDF" type="request" value="SalesReportMonth.pdf"/>
-        <response name="dayExcel" type="request" value="SalesReport.excel"/>
-        <response name="weekExcel" type="request" value="SalesReportWeek.excel"/>
-        <response name="monthExcel" type="request" value="SalesReportMonth.excel"/>
-        <response name="dayHTML" type="request" value="SalesReport.html"/>
-        <response name="weekHTML" type="request" value="SalesReportWeek.html"/>
-        <response name="monthHTML" type="request" value="SalesReportMonth.html"/>
-        <response name="error" type="request-redirect" value="OrderPurchaseReportOptions">
-            <redirect-parameter name="fromDate"/>
-            <redirect-parameter name="reportBy" from="parameters.reportDate"/>
-        </response>
-    </request-map>
-    <request-map uri="SalesReport.pdf"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportPDF"/>
-    </request-map>
-    <request-map uri="SalesReportWeek.pdf"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportWeekPDF"/>
-    </request-map>
-    <request-map uri="SalesReportMonth.pdf"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportMonthPDF"/>
-    </request-map>
-    <request-map uri="SalesReport.excel"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportExcel"/>
-    </request-map>
-    <request-map uri="SalesReportWeek.excel"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportWeekExcel"/>
-    </request-map>
-    <request-map uri="SalesReportMonth.excel"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportMonthExcel"/>
-    </request-map>
-    <request-map uri="SalesReport.html"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportHTML"/>
-    </request-map>
-    <request-map uri="SalesReportWeek.html"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportWeekHTML"/>
-    </request-map>
-    <request-map uri="SalesReportMonth.html"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
-        <response name="success" type="view" value="SalesOrderReportMonthHTML"/>
-    </request-map>
-    <request-map uri="NetBeforeOverheadReport.pdf"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy"/>
-        <response name="success" type="view" value="NetBeforeOverheadOrderReport"/>
-    </request-map>
-    <request-map uri="ProductDemandReport.pdf"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy"/>
-        <response name="success" type="view" value="ProductDemandOrderReport"/>
-    </request-map>
-    <request-map uri="ProductContributionReport.pdf"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductContributionReport.groovy"/>
-        <response name="success" type="view" value="ProductDemandOrderReport"/>
-    </request-map>
 
-    <request-map uri="OrderByReferrer.pdf"><security https="true" auth="true"/>
-        <response name="success" type="view" value="OrderByReferrerReport"/>
-    </request-map>
-    <request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/>
-        <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy"/>
-        <response name="success" type="view" value="OrdersByChannelReport"/>
-    </request-map>
-    <request-map uri="OrderDiscountCode.pdf">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="SaleOrderDiscountCodeReport"/>
-    </request-map>
-    <request-map uri="Last3MonthsSalesReport.pdf"><security https="true" auth="true"/>
-        <response name="success" type="view" value="Last3MonthsSalesReport"/>
-    </request-map>
-    <request-map uri="CouponSalesReport.pdf"><security https="true" auth="true"/>
-        <response name="success" type="view" value="CouponSalesReport"/>
-    </request-map>    
-
-     <!-- Requirement request mappings -->
+    <!-- Requirement request mappings -->
     <request-map uri="FindRequirements">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="FindRequirements"/>
@@ -2023,23 +1939,6 @@ under the License.
     <view-map name="OpenOrderItemsReport" type="screen" page="component://order/widget/ordermgr/ReportScreens.xml#OpenOrderItemsReport"/>
     <view-map name="PurchasesByOrganizationReport" type="screenfop" page="component://order/widget/ordermgr/ReportScreens.xml#PurchasesByOrganizationReport" content-type="application/pdf" encoding="none"/>
 
-    <view-map name="SalesOrderReportPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/pdf"/>
-    <view-map name="SalesOrderReportWeekPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/pdf"/>
-    <view-map name="SalesOrderReportMonthPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/pdf"/>
-    <view-map name="SalesOrderReportExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/vnd.ms-excel"/>
-    <view-map name="SalesOrderReportWeekExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/vnd.ms-excel"/>
-    <view-map name="SalesOrderReportMonthExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/vnd.ms-excel"/>
-    <view-map name="SalesOrderReportHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="text/html"/>
-    <view-map name="SalesOrderReportWeekHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="text/html"/>
-    <view-map name="SalesOrderReportMonthHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="text/html"/>
-    <view-map name="NetBeforeOverheadOrderReport" type="birt" page="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign" content-type="application/pdf"/>
-    <view-map name="ProductDemandOrderReport" type="birt" page="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign" content-type="application/pdf"/>
-    <view-map name="OrderByReferrerReport" type="birt" page="component://order/webapp/ordermgr/reports/OrderByReferrer.rptdesign" content-type="application/pdf"/>
-    <view-map name="OrdersByChannelReport" type="birt" page="component://order/webapp/ordermgr/reports/OrdersByChannel.rptdesign" content-type="application/pdf"/>
-    <view-map name="SaleOrderDiscountCodeReport" type="birt" page="component://order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign" content-type="application/pdf"/>
-    <view-map name="Last3MonthsSalesReport" type="birt" page="component://order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign" content-type="application/pdf"/>    
-    <view-map name="CouponSalesReport" type="birt" page="component://order/webapp/ordermgr/reports/CouponSalesReport.rptdesign" content-type="application/pdf"/>
-
     <view-map name="FindRequirements" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#FindRequirements"/>
     <view-map name="EditRequirement" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#EditRequirement"/>
     <view-map name="ListRequirementCustRequests" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementCustRequests"/>

Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/web.xml Sat Aug  4 18:11:00 2012
@@ -40,12 +40,6 @@ under the License.
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
     </context-param>
 
-    <context-param>
-        <param-name>serviceReaderUrls</param-name>
-        <param-value>/WEB-INF/services.xml</param-value>
-        <description>Configuration File(s) For The Service Dispatcher</description>
-    </context-param>
-
     <filter>
         <filter-name>ContextFilter</filter-name>
         <display-name>ContextFilter</display-name>

Copied: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl (from r1369352, ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl?p2=ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl&p1=ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl&r1=1369352&r2=1369382&rev=1369382&view=diff
==============================================================================
    (empty)

Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sat Aug  4 18:11:00 2012
@@ -54,7 +54,7 @@ under the License.
            <#assign statusItem = payment.getRelatedOne("StatusItem", false)>
            <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)>
            <tr>
-             <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+             <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
                <td><a href="/accounting/control/paymentOverview?paymentId=${payment.paymentId}">${payment.paymentId}</a></td>
              <#else>
                <td>${payment.paymentId}</td>
@@ -342,7 +342,7 @@ under the License.
                       <#if creditCard.suffixOnCard?has_content>&nbsp;${creditCard.suffixOnCard}</#if>
                       <br />
 
-                      <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                      <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
                         ${creditCard.cardType}
                         <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/>
                         ${creditCard.expireDate}
@@ -469,7 +469,7 @@ under the License.
                 <td valign="top" width="60%">
                   <div>
                     <#if giftCard?has_content>
-                      <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                      <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
                         ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}]
                         &nbsp;[<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
                       <#else>
@@ -596,7 +596,7 @@ under the License.
                <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
                  <#assign creditCard = paymentMethodValueMap.creditCard/>
                  <#if (creditCard?has_content)>
-                   <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                   <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
                      ${creditCard.cardType?if_exists} <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate?if_exists}
                    <#else>
                      ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}

Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml Sat Aug  4 18:11:00 2012
@@ -128,39 +128,5 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
-    <screen name="portletUiLabelDecorator">
-        <section><!-- Decorator use by portlet define in their preference label -->
-            <actions>
-                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="OrderErrorUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="uiLabelDecorator"><!-- Main decorator -->
-        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
-            <actions>
-                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
-                <decorator-section-include name="body"/>
-            </widgets>
-        </section>
-    </screen>
-    <!--#Eam# uiLabelDecorator  -->
 </screens>
 

Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportForms.xml Sat Aug  4 18:11:00 2012
@@ -195,78 +195,4 @@ under the License.
         <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
-    <!--New From-->
-    <form name="SalesReport" type="single" target="checkReportBy" title=""
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field>
-        <field name="reportBy" title="Report By">
-            <drop-down>
-                <option key="day" description="Days"></option>
-                <option key="week" description="Weeks"></option>
-                <option key="month" description="Months"></option>
-            </drop-down>
-        </field>
-        <field name="exportType" title="Format Type">
-            <drop-down>
-                <option key="pdf" description="PDF"></option>
-                <option key="excel" description="Excel"></option>
-                <option key="html" description="HTML"></option>
-            </drop-down>
-        </field>
-        <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-
-    <form name="NetBeforeOverheadReport" type="single" target="NetBeforeOverheadReport.pdf" title=""
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="productStoreId">
-            <drop-down allow-empty="false">
-                <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
-                    <entity-order-by field-name="storeName"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-    
-    <form name="ProductDemandReport" type="single" target="ProductDemandReport.pdf" title=""
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="productStoreId">
-            <drop-down allow-empty="false">
-                <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
-                    <entity-order-by field-name="storeName"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-    
-    <form name="OrderByReferrer" type="single" target="OrderByReferrer.pdf" target-window="_BLANK">
-        <!--field name="referrerUrl"><text-find default-option="contains"/></field-->
-        <field name="referrerUrl" title=" "><display description="All Referrer"></display></field>
-        <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
-    </form>
-    <form name="SaleOrdersByChannel" type="single" target="OrdersByChannel.pdf" target-window="_BLANK">
-        <field name="saleChannel">
-            <drop-down allow-empty="false">
-                <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="description">
-                    <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
-    </form>
-    <form name="SaleOrderDiscountCode" type="single" target="OrderDiscountCode.pdf" target-window="_BLANK">
-        <field name="discountCodeUrl" title=" "><display description="All order items with discount code"></display></field>
-        <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
-    </form>
-    <form name="Last3MonthsSalesReport" type="single" target="Last3MonthsSalesReport.pdf" target-window="_BLANK">
-        <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
-    </form>
-    <form name="CouponSalesReport" type="single" target="CouponSalesReport.pdf" target-window="_BLANK">
-        <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
-    </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportScreens.xml Sat Aug  4 18:11:00 2012
@@ -107,46 +107,6 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
-    <!--New Screen-->
-    <screen name="SalesReport">
-        <section>
-            <actions>
-                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <screenlet title="Sales Report">
-                    <include-form name="SalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="NetBeforeOverheadReport">
-        <section>
-            <actions>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <screenlet title="Net Before Overhead Report">
-                    <include-form name="NetBeforeOverheadReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="ProductDemandReport">
-        <section>
-            <actions>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <screenlet title="Product Demand Report">
-                    <include-form name="ProductDemandReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
 
     <screen name="OrderPurchaseReportPayment">
         <section>
@@ -331,93 +291,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
-    <screen name="SalesOrderReport">
-        <section>
-            <actions>
-                <entity-condition entity-name="SalesOrderItemStarSchema" list="SalesReportList">
-                    <condition-list combine="and">
-                        <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/>
-                        <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/>
-                    </condition-list>
-                </entity-condition>
-            </actions>
-            <widgets>
-                <platform-specific>
-                    <xml><html-template location="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"/></xml>
-                </platform-specific>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="NetBeforeOverheadOrderReport">
-        <section>
-            <widgets>
-                <platform-specific>
-                    <xml><html-template location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml>
-                </platform-specific>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="ProductDemandOrderReport ">
-        <section>
-            <widgets>
-                <platform-specific>
-                    <xml><html-template location="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign"/></xml>
-                </platform-specific>
-            </widgets>
-        </section>
-    </screen>
-    
-    <!-- Sale Order By Referrer -->
-    <screen name="SaleOrdersByReferrerReport">
-        <section>
-            <widgets>
-                <screenlet title="Sale Orders by Referrer Report">
-                    <include-form name="OrderByReferrer" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-    <!-- Sale Order By Channel -->
-    <screen name="SaleOrdersByChannelReport">
-        <section>
-            <widgets>
-                <screenlet title="Sale Orders By Channel Report">
-                    <include-form name="SaleOrdersByChannel" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-    <!-- Sale Order with Discount Code -->
-    <screen name="SaleOrderDiscountCodeReport">
-        <section>
-            <widgets>
-                <screenlet title="Sale Orders Discount Code Report">
-                    <include-form name="SaleOrderDiscountCode" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-    <!-- Last Three Months Sales Report -->
-    <screen name="Last3MonthsSalesReport">
-        <section>
-            <widgets>
-                <screenlet title="Last Three Months Sales Report">
-                    <include-form name="Last3MonthsSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-    <!-- Coupon Sales Report -->
-    <screen name="CouponSalesReport">
-        <section>
-            <widgets>
-                <screenlet title="Coupon Sales Report">
-                    <include-form name="CouponSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy Sat Aug  4 18:11:00 2012
@@ -23,7 +23,7 @@ context.hasCreatePermission = security.h
 context.hasUpdatePermission = security.hasEntityPermission("PARTYMGR", "_UPDATE", session);
 context.hasDeletePermission = security.hasEntityPermission("PARTYMGR", "_DELETE", session);
 // extended pay_info permissions
-context.hasPayInfoPermission = security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session);
+context.hasPayInfoPermission = security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session);
 // extended pcm (party contact mechanism) permissions
 context.hasPcmCreatePermission = security.hasEntityPermission("PARTYMGR_PCM", "_CREATE", session);
 context.hasPcmUpdatePermission = security.hasEntityPermission("PARTYMGR_PCM", "_UPDATE", session);

Propchange: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352

Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/web.xml Sat Aug  4 18:11:00 2012
@@ -40,11 +40,6 @@ under the License.
     <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
   </context-param>
   <context-param>
-    <param-name>serviceReaderUrls</param-name>
-    <param-value>/WEB-INF/services.xml</param-value>
-    <description>Configuration File(s) For The Service Dispatcher</description>
-  </context-param>
-  <context-param>
     <param-name>scriptLocationPath</param-name>
     <param-value>/WEB-INF/bsh</param-value>
     <description>BeanShell Script Location</description>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/editShoppingList.ftl Sat Aug  4 18:11:00 2012
@@ -196,7 +196,7 @@ under the License.
           <td>&nbsp;</td>
         </tr>
         <#assign alt_row = false>
-        <#list shoppingListItemDatas[lowIndex-1..highIndex-1] as shoppingListItemData>
+        <#list shoppingListItemDatas[lowIndex..highIndex-1] as shoppingListItemData>
           <#assign shoppingListItem = shoppingListItemData.shoppingListItem>
           <#assign product = shoppingListItemData.product>
           <#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Sat Aug  4 18:11:00 2012
@@ -38,7 +38,7 @@ under the License.
     <div class="screenlet-title-bar">
       <ul>
         <li class="h3">${uiLabelMap.PartyPaymentMethodInformation}</li>
-        <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+        <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session) || security.hasEntityPermission("ACCOUNTING", "_CREATE", session)>
           <li><a href="<@ofbizUrl>editeftaccount?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li>
           <li><a href="<@ofbizUrl>editgiftcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li>
           <li><a href="<@ofbizUrl>editcreditcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewCreditCard}</a></li>
@@ -67,7 +67,7 @@ under the License.
                   ${creditCard.lastNameOnCard}
                   <#if creditCard.suffixOnCard?has_content>&nbsp;${creditCard.suffixOnCard}</#if>
                   &nbsp;-&nbsp;
-                  <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                  <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
                     ${creditCard.cardType}
                     <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/>
                     ${creditCard.expireDate}
@@ -83,7 +83,7 @@ under the License.
                   <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
                     <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">${uiLabelMap.PartyManualTx}</a>
                   </#if>
-                  <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                  <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
                     <a href="<@ofbizUrl>editcreditcard?partyId=${partyId}&amp;paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
                   </#if>
                 <#-- </td> -->
@@ -93,7 +93,7 @@ under the License.
                   ${uiLabelMap.AccountingGiftCard}
                 </td>
                 <td>
-                  <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                  <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
                     ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}]
                   <#else>
                     <@maskSensitiveNumber cardNumber=giftCard.cardNumber?if_exists/>
@@ -105,7 +105,7 @@ under the License.
                   <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}:&nbsp;${paymentMethod.thruDate.toString()}</b></#if>
                 </td>
                 <td class="button-col">
-                  <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                  <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
                     <a href="<@ofbizUrl>editgiftcard?partyId=${partyId}&amp;paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
                   </#if>
                 <#-- </td> -->
@@ -121,7 +121,7 @@ under the License.
                   <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}:&nbsp;${paymentMethod.thruDate.toString()}</#if>
                 </td>
                 <td class="button-col">
-                  <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+                  <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
                     <a href="<@ofbizUrl>editeftaccount?partyId=${partyId}&amp;paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
                   </#if>
                 <#-- </td> -->
@@ -143,7 +143,7 @@ under the License.
                 <td class="button-col">
                   &nbsp;
               </#if>
-              <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+              <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session) || security.hasEntityPermission("ACCOUNTING", "_DELETE", session)>
                 <a href="<@ofbizUrl>deletePaymentMethod/viewprofile?partyId=${partyId}&amp;paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
               <#else>
                 &nbsp;

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml Sat Aug  4 18:11:00 2012
@@ -145,17 +145,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
-    <screen name="uiLabelDecorator"><!-- Main decorator -->
-        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
-            <actions>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
-                <decorator-section-include name="body"/>
-            </widgets>
-        </section>
-    </screen>
-    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml Sat Aug  4 18:11:00 2012
@@ -159,7 +159,7 @@ under the License.
     </form>
 
     <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson">
-        <field name="personalImage" use-when="personalImage!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image value="${personalImage}" style="cssImgStandard"/></field>
+        <field name="personalImage" use-when="partyContentId!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image value="${personalImage}" style="cssImgStandard"/></field>
         <field name="partyId"><display/></field>
         <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field>
         <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
@@ -893,8 +893,8 @@ under the License.
     </form>
 
     <form name="ListInvoicesApplPayments" type="list" list-name="ListInvoicesApplPayments"
-        default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
-        default-tooltip-style="tabletext">
+        default-title-style="tableheadtext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
+       >
         <actions>
             <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
             <set field="actualCurrencyUomId" from-field="actualCurrencyUomId" default-value="${defaultOrganizationPartyCurrencyUomId}"/>
@@ -928,8 +928,8 @@ under the License.
         <field name="pmAmount" title="${uiLabelMap.AccountingPaymentAmount}" entry-name="pmActualCurrencyAmount" use-when="actualCurrency==true"><display type="currency" currency="${actualCurrencyUomId}"/></field>
     </form>
     <form name="ListUnAppliedInvoices" type="list" list-name="ListUnAppliedInvoices"
-        default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
-        default-tooltip-style="tabletext">
+        default-title-style="tableheadtext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
+       >
         <actions>
             <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
             <script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy"/>
@@ -949,8 +949,8 @@ under the License.
         <field name="unAppliedAmount"><display type="currency" currency="${invoiceCurrencyUomId}"/></field>
     </form>
     <form name="ListUnAppliedPayments" type="list" list-name="paymentList"
-        default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
-        default-tooltip-style="tabletext">
+        default-title-style="tableheadtext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
+       >
         <actions>
             <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
             <script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy"/>
@@ -974,7 +974,7 @@ under the License.
         <field name="unAppliedAmount"><display type="currency" currency="${paymentCurrencyUomId}"/></field>
     </form>
     <form name="partyFinancialSummary" type="single" title="Financial summary" default-map-name="finanSummary"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        default-title-style="tableheadtext">
         <actions>
             <set field="actualCurrency" from-field="actualCurrency" default-value="true"/>
             <set field="actualCurrencyUomId" from-field="actualCurrencyUomId" default-value="${defaultOrganizationPartyCurrencyUomId}"/>
@@ -990,9 +990,9 @@ under the License.
         <field position="1" name="totalToBeReceived" use-when="finanSummary.get(&quot;totalToBeReceived&quot;)!=null" title="${uiLabelMap.PartyToBePaidTo} ${parameters.partyId}"><display type="currency" currency="${actualCurrencyUomId}"/></field>
     </form>
     <form name="ViewPartyRoles" type="list" list-name="partyRoles" target="viewroles"
-        default-title-style="tableheadtext" default-widget-style="tabletext"
+        default-title-style="tableheadtext"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
-        default-tooltip-style="tabletext">
+       >
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.PartyRole}"><display/></field>
         <field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/></field>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml Sat Aug  4 18:11:00 2012
@@ -2333,7 +2333,7 @@
         <value xml:lang="zh_TW">使用計數表</value>
     </property>
     <property key="ProductMeterType.description.TRIP_METER">
-        <value xml:lang="en">Tageskilometerzähler</value>
+        <value xml:lang="de">Tageskilometerzähler</value>
         <value xml:lang="en">Use Trip Meter</value>
         <value xml:lang="fr">Utiliser le compteur de distance par trajet</value>
         <value xml:lang="vi">Sá»­ dụng đồng hồ đo quãng đường chuyến đi</value>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml Sat Aug  4 18:11:00 2012
@@ -188,6 +188,12 @@
         <value xml:lang="zh">已请求退货。</value>
         <value xml:lang="zh_TW">已請求退貨。</value>
     </property>
+    <property key="ProductReviewErrorCouldNotChangeOrderStatusFromTo">
+        <value xml:lang="de">Status ist keine gültige Änderung: von ${productReview.statusId} nach ${parameters.statusId}</value>
+        <value xml:lang="en">Status is not a valid change: from ${productReview.statusId} to ${parameters.statusId}</value>
+        <value xml:lang="fr">Le changement de statut de ${productReview.statusId} à ${parameters.statusId} n'est pas autorisé</value>
+        <value xml:lang="it">Cambio di stato non è valido: da ${productReview.statusId} a ${parameters.statusId}</value>
+    </property>
     <property key="productSearchEvents.added_param_features">
         <value xml:lang="de">${numAdded} Merkmale hinzugefügt mit ID ${productFeatureId}</value>
         <value xml:lang="en">Added ${numAdded} features with ID ${productFeatureId}</value>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml Sat Aug  4 18:11:00 2012
@@ -3527,7 +3527,7 @@
         <value xml:lang="de">Wert ID</value>
         <value xml:lang="en">Id Value</value>
         <value xml:lang="es">Valor de identificación</value>
-        <value xml:lang="fr">Réf. de valeur</value>
+        <value xml:lang="fr">Valeur</value>
         <value xml:lang="it">Valore</value>
         <value xml:lang="th">ค่ารหัส</value>
         <value xml:lang="vi">Giá trị (value)</value>
@@ -22652,6 +22652,17 @@
         <value xml:lang="zh">重新索引关键字</value>
         <value xml:lang="zh_TW">重新索引關鍵字</value>
     </property>
+    <property key="ProductReviewBy">
+        <value xml:lang="de">Bewertung durch</value>
+        <value xml:lang="en">Review By</value>
+        <value xml:lang="es">Revisión por</value>
+        <value xml:lang="fr">A approuver par</value>
+        <value xml:lang="it">Recensito da</value>
+        <value xml:lang="th">การตรวจสอบโดย</value>
+        <value xml:lang="vi">Xem xét bởi</value>
+        <value xml:lang="zh">检查员</value>
+        <value xml:lang="zh_TW">檢查員</value>
+    </property>
     <property key="ProductReWeighPackage">
         <value xml:lang="de">Paket neu wägeny</value>
         <value xml:lang="en">Re-Weigh Package</value>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/data/ProductTypeData.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/data/ProductTypeData.xml Sat Aug  4 18:11:00 2012
@@ -650,4 +650,10 @@ under the License.
     <Enumeration description="Remove Logo" enumCode="REMOVE_LOGO" enumId="REMOVE_LOGO" sequenceId="02" enumTypeId="IMAGE_REJECT_REASON"/>
     <Enumeration description="Other" enumCode="OTHER" enumId="OTHER" sequenceId="03" enumTypeId="IMAGE_REJECT_REASON"/>
     
+    <!-- Group Order -->
+    <StatusType description="Group Order Status" hasTable="N" parentTypeId="" statusTypeId="GROUP_ORDER_STATUS"/>
+    <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="GO_CREATED" statusTypeId="GROUP_ORDER_STATUS"/>
+    <StatusItem description="Success" sequenceId="02" statusCode="SUCCESS" statusId="GO_SUCCESS" statusTypeId="GROUP_ORDER_STATUS"/>
+    <StatusItem description="Cancelled" sequenceId="03" statusCode="CANCELLED" statusId="GO_CANCELLED" statusTypeId="GROUP_ORDER_STATUS"/>
+    
 </entity-engine-xml>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/entitydef/entitymodel.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/entitydef/entitymodel.xml Sat Aug  4 18:11:00 2012
@@ -2717,7 +2717,7 @@ under the License.
       <field name="inventoryMessage" type="description"></field>
       <field name="requireInventory" type="indicator"></field>
       <field name="quantityUomId" type="id"></field>
-      <field name="quantityIncluded" type="fixed-point"></field>
+      <field name="quantityIncluded" type="fixed-point"><description>If you have a six-pack of 12oz soda cans you would have quantityIncluded=12, quantityUomId=oz, piecesIncluded=6.</description></field>
       <field name="piecesIncluded" type="numeric"></field>
       <field name="requireAmount" type="indicator"></field>
       <field name="fixedAmount" type="currency-amount"><description>Use this for products which are sold in fixed denominations, such as gift certificates or calling cards.</description></field>
@@ -4812,6 +4812,7 @@ under the License.
       <field name="productId" type="id-ne"></field>
       <field name="fromDate" type="date-time"></field>
       <field name="thruDate" type="date-time"></field>
+      <field name="statusId" type="id-ne"></field>
       <field name="reqOrderQty" type="fixed-point"></field>
       <field name="soldOrderQty" type="fixed-point"></field>
       <field name="jobId" type="id-ne"></field>
@@ -4819,6 +4820,9 @@ under the License.
       <relation type="one" fk-name="PROD_GROUP_ORDER" rel-entity-name="Product">
         <key-map field-name="productId"/>
       </relation>
+      <relation type="one" fk-name="GROUP_ORDER_STATUS" rel-entity-name="StatusItem">
+        <key-map field-name="statusId"/>
+      </relation>
       <relation type="one" fk-name="GROUP_ORDER_JOB" rel-entity-name="JobSandbox">
         <key-map field-name="jobId"/>
       </relation>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/price/PriceServices.xml Sat Aug  4 18:11:00 2012
@@ -307,9 +307,12 @@ under the License.
         </check-permission>
         <check-errors/>
 
-        <if-not-empty field="parameters.condValueInput">
+        <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_QUANTITY">
             <set field="parameters.condValue" from-field="parameters.condValueInput"/>
-        </if-not-empty>
+        </if-compare>
+        <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_LIST_PRICE">
+            <set field="parameters.condValue" from-field="parameters.condValueInput"/>
+        </if-compare>
         <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"/>