You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/10/23 11:26:02 UTC
svn commit: r1766266 - in /ofbiz/trunk/applications:
accounting/widget/AgreementForms.xml
datamodel/entitydef/party-entitymodel.xml
Author: deepak
Date: Sun Oct 23 11:26:02 2016
New Revision: 1766266
URL: http://svn.apache.org/viewvc?rev=1766266&view=rev
Log:
Improved: Added agreementItemSeqId in AgreementContent entity, now content can be uploaded for item level as well (OFBIZ-7969)
Modified:
ofbiz/trunk/applications/accounting/widget/AgreementForms.xml
ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
Modified: ofbiz/trunk/applications/accounting/widget/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementForms.xml?rev=1766266&r1=1766265&r2=1766266&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementForms.xml Sun Oct 23 11:26:02 2016
@@ -267,6 +267,7 @@ under the License.
<form name="ListAgreementContent" target="removeAgreementContent" list-name="contentDataResourceList" paginate-target="ListAgreementContents" title="" type="list"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="agreementId"><hidden/></field>
+ <field name="agreementItemSeqId"><display/></field>
<field name="contentId"><hidden/></field>
<field name="contentName">
<display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
@@ -284,6 +285,15 @@ under the License.
</form>
<form name="AddAgreementContent" type="upload" target="uploadAgreementContent">
<field name="agreementId"><hidden value="${agreement.agreementId}"/></field>
+ <field name="agreementItemSeqId">
+ <drop-down allow-empty="false">
+ <option key="_NA_" description=" "/>
+ <entity-options entity-name="AgreementItem" description="${agreementItemSeqId}">
+ <entity-constraint name="agreementId" env-name="agreement.agreementId"/>
+ <entity-order-by field-name="agreementItemSeqId"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="agreementContentTypeId" >
<drop-down allow-empty="false">
<entity-options entity-name="AgreementContentType">
Modified: ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1766266&r1=1766265&r2=1766266&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml Sun Oct 23 11:26:02 2016
@@ -223,12 +223,14 @@ under the License.
package-name="org.apache.ofbiz.party.agreement"
title="Agreement Content Entity">
<field name="agreementId" type="id-ne"></field>
+ <field name="agreementItemSeqId" type="id-ne"></field>
<field name="agreementContentTypeId" type="id-ne"></field>
<field name="contentId" type="id-ne"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
<prim-key field="contentId"/>
<prim-key field="agreementId"/>
+ <prim-key field="agreementItemSeqId"/>
<prim-key field="agreementContentTypeId"/>
<prim-key field="fromDate"/>
<relation type="one" fk-name="AG_CNT_PROD" rel-entity-name="Agreement">