Skip to content

Fixed: Agreement and agreement item attributes can't be viewed in accounting (OFBIZ-12349, OFBIZ-12350) #2543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toaditi wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fixed: Agreement and agreement item attributes can't be viewed in accounting (OFBIZ-12349, OFBIZ-12350) #2543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions applications/accounting/config/AccountingUiLabels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20988,6 +20988,9 @@
<value xml:lang="en">Add Agreement Content</value>
<value xml:lang="fr">Ajout de contenu à l'accord commercial</value>
</property>
<property key="PageTitleEditAgreementAttributes">
<value xml:lang="en">Agreement Attributes</value>
</property>
<property key="PageTitleEditAgreementGeographicalApplic">
<value xml:lang="de">Standort Vereinbarung bearbeiten</value>
<value xml:lang="en">Edit Agreement Geographical Applic</value>
Expand Down Expand Up @@ -21075,6 +21078,9 @@
<value xml:lang="zh">编辑合同条款条件</value>
<value xml:lang="zh-TW">修改合約條款條件</value>
</property>
<property key="PageTitleEditAgreementItemAttributes">
<value xml:lang="en">Agreement Item Attributes</value>
</property>
<property key="PageTitleEditAgreementItemFacility">
<value xml:lang="de">Vereinbarungsposition Anlage bearbeiten</value>
<value xml:lang="en">Edit Agreement Item Facility</value>
Expand Down
19 changes: 19 additions & 0 deletions applications/accounting/servicedef/services_agreement.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,25 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>

<!-- AgreementAttribute -->
<service name="createAgreementAttribute" default-entity-name="AgreementAttribute" engine="entity-auto" invoke="create" auth="true">
<description>Create an AgreementAttribute</description>
<permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="updateAgreementAttribute" default-entity-name="AgreementAttribute" engine="entity-auto" invoke="update" auth="true">
<description>Update an AgreementAttribute</description>
<permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="deleteAgreementAttribute" default-entity-name="AgreementAttribute" engine="entity-auto" invoke="delete" auth="true">
<description>Delete an AgreementAttribute</description>
<permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>

<!-- AgreementItemAttribute -->
<service name="createAgreementItemAttribute" default-entity-name="AgreementItemAttribute" engine="entity-auto" invoke="create" auth="true">
<description>Create an AgreementItemAttribute</description>
Expand Down
42 changes: 42 additions & 0 deletions applications/accounting/webapp/accounting/WEB-INF/controller.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,46 @@ under the License.
<response name="error" type="view" value="EditAgreementTerms"/>
</request-map>

<request-map uri="EditAgreementAttributes"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementAttributes"/></request-map>
<request-map uri="createAgreementAttribute">
<security https="true" auth="true"/>
<event type="service" invoke="createAgreementAttribute"/>
<response name="success" type="view" value="EditAgreementAttributes"/>
<response name="error" type="view" value="EditAgreementAttributes"/>
</request-map>
<request-map uri="updateAgreementAttribute">
<security https="true" auth="true"/>
<event type="service" invoke="updateAgreementAttribute"/>
<response name="success" type="view" value="EditAgreementAttributes"/>
<response name="error" type="view" value="EditAgreementAttributes"/>
</request-map>
<request-map uri="deleteAgreementAttribute">
<security https="true" auth="true"/>
<event type="service" invoke="deleteAgreementAttribute"/>
<response name="success" type="view" value="EditAgreementAttributes"/>
<response name="error" type="view" value="EditAgreementAttributes"/>
</request-map>

<request-map uri="EditAgreementItemAttributes"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementItemAttributes"/></request-map>
<request-map uri="createAgreementItemAttribute">
<security https="true" auth="true"/>
<event type="service" invoke="createAgreementItemAttribute"/>
<response name="success" type="view" value="EditAgreementItemAttributes"/>
<response name="error" type="view" value="EditAgreementItemAttributes"/>
</request-map>
<request-map uri="updateAgreementItemAttribute">
<security https="true" auth="true"/>
<event type="service" invoke="updateAgreementItemAttribute"/>
<response name="success" type="view" value="EditAgreementItemAttributes"/>
<response name="error" type="view" value="EditAgreementItemAttributes"/>
</request-map>
<request-map uri="deleteAgreementItemAttribute">
<security https="true" auth="true"/>
<event type="service" invoke="deleteAgreementItemAttribute"/>
<response name="success" type="view" value="EditAgreementItemAttributes"/>
<response name="error" type="view" value="EditAgreementItemAttributes"/>
</request-map>

<request-map uri="EditAgreementContents">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditAgreementContents"/>
Expand Down Expand Up @@ -2731,6 +2771,8 @@ under the License.
<view-map name="ListAgreementItems" type="screen" page="component://accounting/widget/AgreementScreens.xml#ListAgreementItems"/>
<view-map name="EditAgreementItem" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementItem"/>
<view-map name="EditAgreementTerms" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementTerms"/>
<view-map name="EditAgreementAttributes" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementAttributes"/>
<view-map name="EditAgreementItemAttributes" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementItemAttributes"/>
<view-map name="EditAgreementContents" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementContents"/>
<view-map name="ListAgreementPromoAppls" type="screen" page="component://accounting/widget/AgreementScreens.xml#ListAgreementPromoAppls"/>
<view-map name="EditAgreementPromoAppl" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementPromoAppl"/>
Expand Down
11 changes: 11 additions & 0 deletions applications/accounting/widget/AccountingMenus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,6 +1394,11 @@ under the License.
<parameter param-name="agreementId" from-field="agreement.agreementId"/>
</link>
</menu-item>
<menu-item name="AgreementAttributes" title="${uiLabelMap.CommonAttributes}">
<link target="EditAgreementAttributes">
<parameter param-name="agreementId" from-field="agreement.agreementId"/>
</link>
</menu-item>
<menu-item name="AgreementItems" title="${uiLabelMap.AccountingAgreementItems}">
<link target="ListAgreementItems">
<parameter param-name="agreementId" from-field="agreement.agreementId"/>
Expand Down Expand Up @@ -1436,6 +1441,12 @@ under the License.
<parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/>
</link>
</menu-item>
<menu-item name="EditAgreementItemAttributes" title="${uiLabelMap.CommonAttributes}">
<link target="EditAgreementItemAttributes">
<parameter param-name="agreementId" from-field="agreementItem.agreementId"/>
<parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/>
</link>
</menu-item>

<menu-item name="ListAgreementItemSupplierProducts" title="${uiLabelMap.ProductProducts}">
<condition>
Expand Down
60 changes: 60 additions & 0 deletions applications/accounting/widget/AgreementForms.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,66 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</grid>

<grid name="ListAgreementAttributes" target="updateAgreementAttribute" list-name="agreementAttributes" paginate-target="EditAgreementAttributes" title=""
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="AgreementAttribute" list="agreementAttributes">
<field-map field-name="agreementId" from-field="agreementId"/>
<order-by field-name="attrName"/>
</entity-and>
</actions>
<auto-fields-service service-name="updateAgreementAttribute"/>
<field name="agreementId"><hidden/></field>
<field name="attrName"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAgreementAttribute" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="attrName"/>
</hyperlink>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</grid>

<form name="AddAgreementAttribute" type="single" target="createAgreementAttribute" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createAgreementAttribute"/>
<field name="agreementId"><hidden/></field>
<field name="attrName" required-field="true"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

<grid name="ListAgreementItemAttributes" target="updateAgreementItemAttribute" list-name="agreementItemAttributes" paginate-target="EditAgreementItemAttributes" title=""
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="AgreementItemAttribute" list="agreementItemAttributes">
<field-map field-name="agreementId" from-field="agreementId"/>
<field-map field-name="agreementItemSeqId" from-field="agreementItemSeqId"/>
<order-by field-name="attrName"/>
</entity-and>
</actions>
<auto-fields-service service-name="updateAgreementItemAttribute"/>
<field name="agreementId"><hidden/></field>
<field name="agreementItemSeqId"><hidden/></field>
<field name="attrName"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAgreementItemAttribute" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="attrName"/>
</hyperlink>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</grid>

<form name="AddAgreementItemAttribute" type="single" target="createAgreementItemAttribute" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createAgreementItemAttribute"/>
<field name="agreementId"><hidden/></field>
<field name="agreementItemSeqId"><hidden/></field>
<field name="attrName" required-field="true"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

<form name="AddAgreementTerm" type="single" target="createAgreementTerm" title="" default-map-name="agreementTerm"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="AgreementTerm" default-field-type="edit"/>
Expand Down
49 changes: 49 additions & 0 deletions applications/accounting/widget/AgreementScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,55 @@ under the License.
</section>
</screen>

<screen name="EditAgreementAttributes">
<section>
<actions>
<set field="titleProperty" value="PageTitleEditAgreementAttributes"/>
<set field="tabButtonItem" value="AgreementAttributes"/>
<set field="agreementId" from-field="parameters.agreementId"/>
<entity-one entity-name="Agreement" value-field="agreement"/>
</actions>
<widgets>
<decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AgreementAttributePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.CommonAttribute}" collapsible="true">
<include-form name="AddAgreementAttribute" location="component://accounting/widget/AgreementForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleEditAgreementAttributes}">
<include-grid name="ListAgreementAttributes" location="component://accounting/widget/AgreementForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>

<screen name="EditAgreementItemAttributes">
<section>
<actions>
<set field="titleProperty" value="PageTitleEditAgreementItemAttributes"/>
<set field="tabButtonItem" value="AgreementItems"/>
<set field="buttonBarItem" value="EditAgreementItemAttributes"/>
<set field="agreementId" from-field="parameters.agreementId"/>
<set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
<entity-one entity-name="Agreement" value-field="agreement"/>
<entity-one entity-name="AgreementItem" value-field="agreementItem"/>
</actions>
<widgets>
<decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AgreementItemAttributePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.CommonAttribute}" collapsible="true">
<include-form name="AddAgreementItemAttribute" location="component://accounting/widget/AgreementForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleEditAgreementItemAttributes}">
<include-grid name="ListAgreementItemAttributes" location="component://accounting/widget/AgreementForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>

<screen name="EditAgreementContents">
<section>
<actions>
Expand Down
15 changes: 0 additions & 15 deletions applications/party/servicedef/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,21 +1532,6 @@ under the License.
</type-validate>
</attribute>
</service>
<service name="createAgreementAttribute" default-entity-name="AgreementAttribute" engine="entity-auto" invoke="create" auth="true">
<description>Create a AgreementAttribute entry</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="updateAgreementAttribute" default-entity-name="AgreementAttribute" engine="entity-auto" invoke="update" auth="true">
<description>Update a AgreementAttribute record</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="deleteAgreementAttribute" default-entity-name="AgreementAttribute" engine="entity-auto" invoke="delete" auth="true">
<description>Delete a AgreementAttribute record</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>

<service name="importParty" engine="java"
location="org.apache.ofbiz.party.party.PartyServices" invoke="importParty" auth="true">
<description>Import an party with related main role, company and contact info in csv format, will ignore parties already entered</description>
Expand Down