Author: jacopoc
Date: Wed Feb 7 03:03:37 2007
New Revision: 504496
URL: http://svn.apache.org/viewvc?view=rev&rev=504496
Log:
Added new screens and services to manage the AgreementGeoApplicability entity.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.properties
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?view=diff&rev=504496&r1=504495&r2=504496
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
Wed Feb 7 03:03:37 2007
@@ -309,7 +309,48 @@
<remove-value value-name="agreementPartyApplic"/>
<check-errors/>
</simple-method>
-
+
+ <!-- create a new AgreementGeographicalApplic -->
+ <simple-method method-name="createAgreementGeographicalApplic"
short-description="Create an AgreementGeographicalApplic">
+ <check-permission permission="ACCOUNTING" action="_CREATE">
+ <alt-permission permission="ACCOUNTING_ROLE" action="_CREATE"/>
+ <fail-message message="Security Error: to run
createAgreementGeographicalApplic 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="AgreementGeographicalApplic"/>
+ <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 AgreementGeographicalApplic -->
+ <simple-method method-name="updateAgreementGeographicalApplic"
short-description="Update an existing AgreementGeographicalApplic">
+ <check-permission permission="ACCOUNTING" action="_UPDATE">
+ <alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
+ <fail-message message="Security Error: to run
updateAgreementGeographicalApplic 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="AgreementGeographicalApplic"
value-name="agreementGeographicalApplic" auto-field-map="true"/>
+ <check-errors/>
+ <set-nonpk-fields map-name="parameters"
value-name="agreementGeographicalApplic"/>
+ <store-value value-name="agreementGeographicalApplic"/>
+ <check-errors/>
+ </simple-method>
+
+ <!-- remove an existing AgreementGeographicalApplic -->
+ <simple-method method-name="removeAgreementGeographicalApplic"
short-description="Remove an existing AgreementGeographicalApplic">
+ <check-permission permission="ACCOUNTING" action="_UPDATE">
+ <alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
+ <fail-message message="Security Error: to run
removeAgreementGeographicalApplic 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="AgreementGeographicalApplic"
value-name="agreementGeographicalApplic" auto-field-map="true"/>
+ <check-errors/>
+ <remove-value value-name="agreementGeographicalApplic"/>
+ <check-errors/>
+ </simple-method>
+
<!-- copy an existing Agreement -->
<simple-method method-name="copyAgreement" short-description="Copy an
existing Agreement">
<check-permission permission="ACCOUNTING" action="_CREATE">
Modified: ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml?view=diff&rev=504496&r1=504495&r2=504496
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml Wed
Feb 7 03:03:37 2007
@@ -165,4 +165,23 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
+ <!-- AgreementGeographicalApplic -->
+ <service name="createAgreementGeographicalApplic"
default-entity-name="AgreementGeographicalApplic" engine="simple"
+
location="org/ofbiz/accounting/agreement/AgreementServices.xml"
invoke="createAgreementGeographicalApplic" auth="true">
+ <description>Create an AgreementGeographicalApplic</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateAgreementGeographicalApplic"
default-entity-name="AgreementGeographicalApplic" engine="simple"
+
location="org/ofbiz/accounting/agreement/AgreementServices.xml"
invoke="updateAgreementGeographicalApplic" auth="true">
+ <description>Update an AgreementGeographicalApplic</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="removeAgreementGeographicalApplic"
default-entity-name="AgreementGeographicalApplic" engine="simple"
+
location="org/ofbiz/accounting/agreement/AgreementServices.xml"
invoke="removeAgreementGeographicalApplic" auth="true">
+ <description>Remove an AgreementGeographicalApplic</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
</services>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?view=diff&rev=504496&r1=504495&r2=504496
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Wed Feb 7 03:03:37 2007
@@ -781,6 +781,22 @@
<response name="error" type="view" value="EditAgreementItemParty"/>
</request-map>
+ <request-map uri="ListAgreementGeographicalApplic"><security https="true"
auth="true"/><response name="success" type="view"
value="ListAgreementGeographicalApplic"/></request-map>
+ <request-map uri="removeAgreementGeographicalApplic">
+ <security https="true" auth="true"/>
+ <event type="service" path=""
invoke="removeAgreementGeographicalApplic"/>
+ <response name="success" type="view"
value="ListAgreementGeographicalApplic"/>
+ <response name="error" type="view"
value="ListAgreementGeographicalApplic"/>
+ </request-map>
+
+ <request-map uri="EditAgreementGeographicalApplic"><security https="true"
auth="true"/><response name="success" type="view"
value="EditAgreementGeographicalApplic"/></request-map>
+ <request-map uri="createAgreementGeographicalApplic">
+ <security https="true" auth="true"/>
+ <event type="service" path=""
invoke="createAgreementGeographicalApplic"/>
+ <response name="success" type="view"
value="ListAgreementGeographicalApplic"/>
+ <response name="error" type="view"
value="EditAgreementGeographicalApplic"/>
+ </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>
@@ -1292,6 +1308,8 @@
<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"/>
+ <view-map name="ListAgreementGeographicalApplic" type="screen"
page="component://accounting/widget/AgreementScreens.xml#ListAgreementGeographicalApplic"/>
+ <view-map name="EditAgreementGeographicalApplic" type="screen"
page="component://accounting/widget/AgreementScreens.xml#EditAgreementGeographicalApplic"/>
<!-- 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:
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?view=diff&rev=504496&r1=504495&r2=504496
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
Wed Feb 7 03:03:37 2007
@@ -379,4 +379,36 @@
<submit button-type="button"/>
</field>
</form>
+ <form name="ListAgreementGeographicalApplic"
default-title-style="tableheadtext"
+ default-tooltip-style="tabletext" default-widget-style="tabletext"
list-name="agreementGeographicalApplics"
+ target="" paginate-target="ListAgreementGeographicalApplic"
title="" type="list">
+ <auto-fields-entity entity-name="AgreementGeographicalApplic"
default-field-type="display"/>
+ <field name="agreementId"><hidden/></field>
+ <field name="agreementItemSeqId"><hidden/></field>
+ <field name="geoId" title="${uiLabelMap.CommonDescription}">
+ <display-entity entity-name="Geo" key-field-name="geoId"
description="${geoName} [${geoId}]"/>
+ </field>
+ <field name="deleteLink" title="" widget-style="buttontext">
+ <hyperlink
target="removeAgreementGeographicalApplic?geoId=${geoId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}"
description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ </field>
+ </form>
+ <form name="EditAgreementGeographicalApplic" type="single"
+ target="updateAgreementGeographicalApplic" title=""
default-map-name="agreementGeographicalApplic"
+ default-title-style="tableheadtext"
default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <alt-target use-when="agreementGeographicalApplic==null"
target="createAgreementGeographicalApplic"/>
+ <auto-fields-entity entity-name="AgreementGeographicalApplic"
default-field-type="edit"/>
+ <field name="agreementId"><hidden/></field>
+ <field name="agreementItemSeqId"><hidden/></field>
+ <field name="geoId" use-when="agreementGeographicalApplic==null">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="Geo" description="${geoName}
[${geoId}]">
+ <entity-order-by field-name="geoName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="geoId"
use-when="agreementPartyApplic!=null"><display/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
</forms>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl?view=diff&rev=504496&r1=504495&r2=504496
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
Wed Feb 7 03:03:37 2007
@@ -33,6 +33,7 @@
<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>
+ <a
href="<@ofbizUrl>ListAgreementGeographicalApplic?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>"
class="${selectedClassMap.ListAgreementGeographicalApplic?default(unselectedClassName)}">${uiLabelMap.CommonGeo}</a>
</div>
</#if>
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?view=diff&rev=504496&r1=504495&r2=504496
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Wed Feb 7
03:03:37 2007
@@ -428,4 +428,59 @@
</widgets>
</section>
</screen>
+ <screen name="ListAgreementGeographicalApplic">
+ <section>
+ <actions>
+ <set field="title" value="List Agreement Geos"/>
+ <set field="titleProperty"
value="PageTitleListAgreementGeographicalApplic"/>
+ <set field="headerItem" value="agreement"/>
+ <set field="tabButtonItem"
value="ListAgreementGeographicalApplic"/>
+
+ <entity-one entity-name="Agreement" value-name="agreement"
auto-field-map="true"/>
+ <entity-one entity-name="AgreementItem"
value-name="agreementItem"/>
+ <entity-and entity-name="AgreementGeographicalApplic"
list-name="agreementGeographicalApplics">
+ <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="EditAgreementGeographicalApplic?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"
text="${uiLabelMap.CommonNew}" style="buttontext"/>
+ </container>
+ <include-form name="ListAgreementGeographicalApplic"
location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditAgreementGeographicalApplic">
+ <section>
+ <actions>
+ <set field="title" value="Edit Agreement Geo"/>
+ <set field="titleProperty"
value="PageTitleEditAgreementGeographicalApplic"/>
+ <set field="headerItem" value="agreement"/>
+ <set field="tabButtonItem"
value="ListAgreementGeographicalApplic"/>
+
+ <set field="agreementId" from-field="parameters.agreementId"/>
+ <set field="agreementItemSeqId"
from-field="parameters.agreementItemSeqId"/>
+ <set field="geoId" from-field="parameters.geoId"/>
+
+ <entity-one entity-name="Agreement" value-name="agreement"
auto-field-map="true"/>
+ <entity-one entity-name="AgreementItem"
value-name="agreementItem" auto-field-map="true"/>
+ <entity-one entity-name="AgreementGeographicalApplic"
value-name="agreementGeographicalApplic" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAgreementDecorator">
+ <decorator-section name="body">
+ <container>
+ <link
target="EditAgreementGeographicalApplic?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"
text="${uiLabelMap.CommonNew}" style="buttontext"/>
+ </container>
+ <include-form name="EditAgreementGeographicalApplic"
location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.properties?view=diff&rev=504496&r1=504495&r2=504496
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.properties (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.properties Wed Feb 7
03:03:37 2007
@@ -177,6 +177,7 @@
CommonFromDateNotValidDateTime=From Date is not a valid Date-Time.
CommonFromDateThruDate=From Date / Thru Date
CommonFromDateTime=From Date & Time
+CommonGeo=Geo
CommonGetPasswordHint=Get Password Hint
CommonGlobal=Global
CommonGo=Go!
