Author: ashish
Date: Thu Jun 23 06:32:18 2016
New Revision: 1749843
URL: http://svn.apache.org/viewvc?rev=1749843&view=rev
Log:
Applied patch from trunk r1749840(I am considering it as display bug and it has
missing functionality so backporting changes to branches as well).
==========================================================
Applied patch from jira issue - OFBIZ-7528 - Display commission agreements on
product detail page.
Thanks Ravi for the contribution.
Modified:
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductForms.xml
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductScreens.xml
Modified:
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/widget/catalog/ProductForms.xml?rev=1749843&r1=1749842&r2=1749843&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductForms.xml
(original)
+++
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductForms.xml
Thu Jun 23 06:32:18 2016
@@ -1789,6 +1789,23 @@ under the License.
<field name="currencyUomId"><display/></field>
<field name="price"><display/></field>
</form>
+ <form name="ListCommissionAgreements" type="list"
list-name="commissionAgreements"
+ odd-row-style="alternate-row" default-table-style="basic-table">
+ <field name="agreementId" widget-style="buttontext">
+ <hyperlink target="/accounting/control/EditAgreementItemProduct"
target-type="inter-app" description="${agreementId}/${agreementItemSeqId}"
also-hidden="false">
+ <parameter param-name="agreementId"/>
+ <parameter param-name="agreementItemSeqId"/>
+ <parameter param-name="productId"/>
+ </hyperlink>
+ </field>
+ <field name="partyIdTo"><display/></field>
+ <field name="agreementText"><display/></field>
+ <field name="description"><display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ <field name="currencyUomId"><display/></field>
+ <field name="price"><display/></field>
+ </form>
<!-- ProductWorkEfforts forms -->
<form name="AddProductWorkEffort" target="createWorkEffortGoodStandard"
title="" type="single"
Modified:
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/widget/catalog/ProductScreens.xml?rev=1749843&r1=1749842&r2=1749843&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductScreens.xml
(original)
+++
ofbiz/branches/release13.07/applications/product/widget/catalog/ProductScreens.xml
Thu Jun 23 06:32:18 2016
@@ -229,6 +229,11 @@ under the License.
<field-map field-name="agreementTypeId"
value="PRODUCT_AGREEMENT"/>
<order-by field-name="fromDate"/>
</entity-and>
+ <entity-and entity-name="AgreementItemAndProductAppl"
list="commissionAgreements">
+ <field-map field-name="productId"/>
+ <field-map field-name="agreementTypeId"
value="COMMISSION_AGREEMENT"/>
+ <order-by field-name="fromDate"/>
+ </entity-and>
</actions>
<widgets>
<decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
@@ -245,6 +250,9 @@ under the License.
<include-form name="ListSalesAgreements"
location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductCommissions}">
+ <include-form name="ListCommissionAgreements"
location="component://product/widget/catalog/ProductForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.ProductProducts}">
<include-form name="ListProductAgreements"
location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>
</decorator-section>
