[OFBiz] SVN: r7922 - in trunk/applications/accounting: script/org/ofbiz/accounting/agreement servicedef webapp/accounting/WEB-INF webapp/accounting/agreement widget
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Sat Jul 1 05:27:56 CDT 2006
Author: jacopo
Date: 2006-07-01 05:27:30 -0500 (Sat, 01 Jul 2006)
New Revision: 7922
Modified:
trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
trunk/applications/accounting/servicedef/services_agreement.xml
trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
trunk/applications/accounting/widget/AgreementScreens.xml
Log:
Added AgreementPartyApplic screens and services, from Mario Cappellato.
Modified: trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
===================================================================
--- trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml 2006-07-01 08:22:30 UTC (rev 7921)
+++ trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml 2006-07-01 10:27:30 UTC (rev 7922)
@@ -269,5 +269,45 @@
<remove-value value-name="agreementProductAppl"/>
<check-errors/>
</simple-method>
-
+
+ <!-- create a new AgreementPartyApplic -->
+ <simple-method method-name="createAgreementPartyApplic" short-description="Create an AgreementPartyApplic">
+ <check-permission permission="ACCOUNTING" action="_CREATE">
+ <alt-permission permission="ACCOUNTING_ROLE" action="_CREATE"/>
+ <fail-message message="Security Error: to run createAgreementPartyApplic you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission, or the limited ACCOUNTING_ROLE_CREATE permission"/>
+ </check-permission>
+ <check-errors/>
+ <make-value value-name="newEntity" entity-name="AgreementPartyApplic"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ <check-errors/>
+ </simple-method>
+
+ <!-- update an existing AgreementPartyApplic -->
+ <simple-method method-name="updateAgreementPartyApplic" short-description="Update an existing AgreementPartyApplic">
+ <check-permission permission="ACCOUNTING" action="_UPDATE">
+ <alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
+ <fail-message message="Security Error: to run updateAgreementPartyApplic you must have the ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permission, or the limited ACCOUNTING_ROLE_UPDATE permission"/>
+ </check-permission>
+ <check-errors/>
+ <entity-one entity-name="AgreementPartyApplic" value-name="agreementPartyApplic" auto-field-map="true"/>
+ <check-errors/>
+ <set-nonpk-fields map-name="parameters" value-name="agreementPartyApplic"/>
+ <store-value value-name="agreementPartyApplic"/>
+ <check-errors/>
+ </simple-method>
+
+ <!-- remove an existing AgreementPartyApplic -->
+ <simple-method method-name="removeAgreementPartyApplic" short-description="Remove an existing AgreementPartyApplic">
+ <check-permission permission="ACCOUNTING" action="_UPDATE">
+ <alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
+ <fail-message message="Security Error: to run removeAgreementPartyApplic you must have the ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permission, or the limited ACCOUNTING_ROLE_UPDATE permission"/>
+ </check-permission>
+ <check-errors/>
+ <entity-one entity-name="AgreementPartyApplic" value-name="agreementPartyApplic" auto-field-map="true"/>
+ <check-errors/>
+ <remove-value value-name="agreementPartyApplic"/>
+ <check-errors/>
+ </simple-method>
</simple-methods>
Modified: trunk/applications/accounting/servicedef/services_agreement.xml
===================================================================
--- trunk/applications/accounting/servicedef/services_agreement.xml 2006-07-01 08:22:30 UTC (rev 7921)
+++ trunk/applications/accounting/servicedef/services_agreement.xml 2006-07-01 10:27:30 UTC (rev 7922)
@@ -141,4 +141,23 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
+ <!-- AgreementPartyApplic -->
+ <service name="createAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="simple"
+ location="org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementPartyApplic" auth="true">
+ <description>Create an AgreementPartyApplic</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="simple"
+ location="org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementPartyApplic" auth="true">
+ <description>Update an AgreementPartyApplic</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="removeAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="simple"
+ location="org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementPartyApplic" auth="true">
+ <description>Remove an AgreementPartyApplic</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
</services>
Modified: trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 2006-07-01 08:22:30 UTC (rev 7921)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 2006-07-01 10:27:30 UTC (rev 7922)
@@ -740,6 +740,27 @@
<response name="error" type="view" value="EditAgreementItemProduct"/>
</request-map>
+ <request-map uri="ListAgreementItemParties"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementItemParties"/></request-map>
+ <request-map uri="removeAgreementItemParty">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="removeAgreementPartyApplic"/>
+ <response name="success" type="view" value="ListAgreementItemParties"/>
+ <response name="error" type="view" value="ListAgreementItemParties"/>
+ </request-map>
+ <request-map uri="EditAgreementItemParty"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementItemParty"/></request-map>
+ <request-map uri="createAgreementItemParty">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createAgreementPartyApplic"/>
+ <response name="success" type="view" value="EditAgreementItemParty"/>
+ <response name="error" type="view" value="EditAgreementItemParty"/>
+ </request-map>
+ <request-map uri="updateAgreementItemParty">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateAgreementPartyApplic"/>
+ <response name="success" type="view" value="EditAgreementItemParty"/>
+ <response name="error" type="view" value="EditAgreementItemParty"/>
+ </request-map>
+
<!-- TaxAuthority Requests -->
<request-map uri="FindTaxAuthority"><security https="true" auth="true"/><response name="success" type="view" value="FindTaxAuthority"/></request-map>
<request-map uri="EditTaxAuthority"><security https="true" auth="true"/><response name="success" type="view" value="EditTaxAuthority"/></request-map>
@@ -1228,6 +1249,8 @@
<view-map name="EditAgreementItemTerm" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementItemTerm"/>
<view-map name="ListAgreementItemProducts" type="screen" page="component://accounting/widget/AgreementScreens.xml#ListAgreementItemProducts"/>
<view-map name="EditAgreementItemProduct" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementItemProduct"/>
+ <view-map name="ListAgreementItemParties" type="screen" page="component://accounting/widget/AgreementScreens.xml#ListAgreementItemParties"/>
+ <view-map name="EditAgreementItemParty" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementItemParty"/>
<!-- tax authority -->
<view-map name="FindTaxAuthority" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#FindTaxAuthority"/>
<view-map name="EditTaxAuthority" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthority"/>
Modified: trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml 2006-07-01 08:22:30 UTC (rev 7921)
+++ trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml 2006-07-01 10:27:30 UTC (rev 7922)
@@ -293,4 +293,35 @@
<submit button-type="button"/>
</field>
</form>
+ <form name="ListAgreementItemParties" default-title-style="tableheadtext"
+ default-tooltip-style="tabletext" default-widget-style="tabletext" list-name="agreementParties"
+ target="" paginate-target="ListAgreementItemParties" title="" type="list">
+ <auto-fields-entity entity-name="AgreementPartyApplic" default-field-type="display"/>
+ <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
+ <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
+ <field name="partyId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${partyId}" target="EditAgreementItemParty?partyId=${partyId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}"/>
+ </field>
+ <field name="partyName" entry-name="partyId">
+ <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}"/>
+ </field>
+ <field name="deleteLink" title="" widget-style="buttontext">
+ <hyperlink target="removeAgreementItemParty?partyId=${partyId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}" description="[${uiLabelMap.CommonRemove}]" also-hidden="false"/>
+ </field>
+ </form>
+ <form name="EditAgreementItemParty" type="single"
+ target="updateAgreementItemParty" title="" default-map-name="agreementPartyApplic"
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <alt-target use-when="agreementPartyApplic==null" target="createAgreementItemParty"/>
+ <auto-fields-entity entity-name="AgreementPartyApplic" default-field-type="edit"/>
+ <field name="agreementId"><hidden/></field>
+ <field name="agreementItemSeqId"><hidden/></field>
+ <field name="partyId" use-when="agreementPartyApplic==null">
+ <lookup target-form-name="LookupPartyName"/>
+ </field>
+ <field name="partyId" use-when="agreementPartyApplic!=null"><display/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
</forms>
Modified: trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl 2006-07-01 08:22:30 UTC (rev 7921)
+++ trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl 2006-07-01 10:27:30 UTC (rev 7922)
@@ -40,6 +40,7 @@
<a href="<@ofbizUrl>ListAgreementPromoAppls?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementPromoAppls?default(unselectedClassName)}">${uiLabelMap.AccountingAgreementPromoAppls}</a>
<a href="<@ofbizUrl>ListAgreementItemTerms?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementItemTerms?default(unselectedClassName)}">${uiLabelMap.AccountingAgreementItemTerms}</a>
<a href="<@ofbizUrl>ListAgreementItemProducts?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementItemProducts?default(unselectedClassName)}">${uiLabelMap.ProductProducts}</a>
+ <a href="<@ofbizUrl>ListAgreementItemParties?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementItemParties?default(unselectedClassName)}">${uiLabelMap.Party}</a>
</div>
</#if>
Modified: trunk/applications/accounting/widget/AgreementScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AgreementScreens.xml 2006-07-01 08:22:30 UTC (rev 7921)
+++ trunk/applications/accounting/widget/AgreementScreens.xml 2006-07-01 10:27:30 UTC (rev 7922)
@@ -373,4 +373,59 @@
</widgets>
</section>
</screen>
+ <screen name="ListAgreementItemParties">
+ <section>
+ <actions>
+ <set field="title" value="List Agreement Item Parties"/>
+ <set field="titleProperty" value="PageTitleListAgreementItemParties"/>
+ <set field="headerItem" value="agreement"/>
+ <set field="tabButtonItem" value="ListAgreementItemParties"/>
+
+ <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+ <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
+ <entity-and entity-name="AgreementPartyApplic" list-name="agreementParties">
+ <field-map env-name="agreement.agreementId" field-name="agreementId"/>
+ <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAgreementDecorator">
+ <decorator-section name="body">
+ <container>
+ <link target="EditAgreementItemParty?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/>
+ </container>
+ <include-form name="ListAgreementItemParties" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditAgreementItemParty">
+ <section>
+ <actions>
+ <set field="title" value="Edit Agreement Item Party"/>
+ <set field="titleProperty" value="PageTitleEditAgreementItemParty"/>
+ <set field="headerItem" value="agreement"/>
+ <set field="tabButtonItem" value="ListAgreementItemParties"/>
+
+ <set field="agreementId" from-field="parameters.agreementId"/>
+ <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+
+ <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+ <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
+ <entity-one entity-name="AgreementPartyApplic" value-name="agreementPartyApplic" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAgreementDecorator">
+ <decorator-section name="body">
+ <container>
+ <link target="EditAgreementItemParty?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/>
+ </container>
+ <include-form name="EditAgreementItemParty" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
More information about the Svn
mailing list