svn commit: r663966 - in /ofbiz/trunk/applications: accounting/config/ accounting/script/org/ofbiz/ac
Locked
svn commit: r663966 - in /ofbiz/trunk/applications: accounting/config/ accounting/script/org/ofbiz/ac
 
|
Author: ashish
Date: Fri Jun 6 07:40:39 2008 New Revision: 663966 URL: http://svn.apache.org/viewvc?rev=663966&view=rev Log: Patch applied from JIRA issue # OFBIZ-1722. Following things are covered in this patch :- 1) Create CRUD services for AgreementWorkEffortAppl. This should go in Accounting Component. 2) Create CRUD UI for AgreementWorkEffortAppl in Accounting --> Agreement to Add/Edit/Delete an AgreementWorkEffortAppl for an agreementId. 3) Create another CRUD UI in WorkEffort --> WorkEffort to Add/Edit/Delete an AgreementWorkEffortAppl for a workEffortId. 4) Create Lookups for Agreement and AgreementItems. Thanks Nitin Bhawsar,Ravindra Mandre for working on this. Special thanks to Jacopo and Mridul for your helpful comments. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml 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/webapp/accounting/lookup/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml ofbiz/trunk/applications/accounting/widget/LookupScreens.xml ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Jun 6 07:40:39 2008 @@ -137,6 +137,9 @@ <value xml:lang="ru">ÐейÑÑвиÑелÑнÑй код валÑÑÑ</value> <value xml:lang="th">รหัสหà¸à¹à¸§à¸¢à¸§à¸±à¸à¸à¸³à¸à¸§à¸à¹à¸à¸´à¸</value> </property> + <property key="AccountingAddAgreementWorkEffortAppl"> + <value xml:lang="en">Add Agreement Work Effort Appl</value> + </property> <property key="AccountingAddCategoryGlAccount"> <value xml:lang="en">Add Category GL Account</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸</value> @@ -415,6 +418,12 @@ <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸ªà¸±à¸à¸à¸²</value> <value xml:lang="zh">ååç±»åæ è¯</value> </property> + <property key="AccountingAgreementWorkEffortApplAlreadyExists"> + <value xml:lang="en">Agreement Work Effort Appl Already Exists</value> + </property> + <property key="AccountingAgreementWorkEffortAppls"> + <value xml:lang="en">Agreement Work Effort Appls</value> + </property> <property key="AccountingAgreements"> <value xml:lang="ar">إتÙاÙÙات</value> <value xml:lang="en">Agreements</value> @@ -3607,6 +3616,9 @@ <value xml:lang="th">à¸à¸¥à¸£à¸§à¸¡à¹à¸à¸§</value> <value xml:lang="zh">æ»è¡æ°</value> </property> + <property key="AccountingListAgreementWorkEffortAppls"> + <value xml:lang="en">List Agreement Work Effort Appls</value> + </property> <property key="AccountingListInvoiceItemType"> <value xml:lang="en">Invoice Item Type List</value> <value xml:lang="it">Lista Tipi Riga Fattura</value> @@ -3646,6 +3658,12 @@ <value xml:lang="th">à¸à¸§à¸²à¸¡à¹à¸à¹à¸à¹à¸à¹à¸à¹à¸à¸à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸à¸à¸µà¹à¸à¸³à¹à¸à¹à¸à¹à¹à¸à¹</value> <value xml:lang="zh">å¯ç¨çæ¯ä»</value> </property> + <property key="AccountingLookupAgreement"> + <value xml:lang="en">Lookup Agreement</value> + </property> + <property key="AccountingLookupAgreementItem"> + <value xml:lang="en">Lookup Agreement Item</value> + </property> <property key="AccountingLookupInvoices"> <value xml:lang="ar">إطÙاÙØ© عÙ٠اÙÙÙاتÙر</value> <value xml:lang="en">Lookup Invoices</value> @@ -8222,6 +8240,9 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸±à¸à¸à¸²à¸à¸µà¹à¸à¸³à¸«à¸à¸</value> <value xml:lang="zh">ç¼è¾ååæ¡ä»¶</value> </property> + <property key="PageTitleEditAgreementWorkEffortAppls"> + <value xml:lang="en">Edit Agreement Work Effort Appls</value> + </property> <property key="PageTitleEditBillingAccount"> <value xml:lang="en">Edit Billing Account</value> <value xml:lang="es">Editar Cuenta de Facturación</value> 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?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml Fri Jun 6 07:40:39 2008 @@ -308,4 +308,23 @@ <remove-value value-name="agreementRole"/> </simple-method> + <!--AgreementWorkEffortAppl--> + <simple-method method-name="createAgreementWorkEffortAppl" short-description="Create a link between a WorkEffort and a Agreement Appl"> + <entity-one entity-name="AgreementWorkEffortAppl" value-name="agreementWorkEffortAppl"/> + <if-not-empty field-name="agreementWorkEffortAppl"> + <add-error><fail-property resource="AccountingUiLabels" property="AccountingAgreementWorkEffortApplAlreadyExists"/></add-error> + <check-errors/> + <else> + <make-value value-name="newEntity" entity-name="AgreementWorkEffortAppl"/> + <set-pk-fields map-name="parameters" value-name="newEntity"/> + <create-value value-name="newEntity"/> + </else> + </if-not-empty> + </simple-method> + + <simple-method method-name="deleteAgreementWorkEffortAppl" short-description="Remove a link between a WorkEffort and a Agreement Appl"> + <entity-one entity-name="AgreementWorkEffortAppl" value-name="agreementWorkEffortAppl"/> + <remove-value value-name="agreementWorkEffortAppl"/> + </simple-method> + </simple-methods> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml Fri Jun 6 07:40:39 2008 @@ -232,6 +232,18 @@ <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="commissions" type="List" mode="OUT" optional="false"/> </service> + + <!--AgrementWorkEffortAppl--> + <service name="createAgreementWorkEffortAppl" engine="simple" default-entity-name="AgreementWorkEffortAppl" + location="org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementWorkEffortAppl"> + <description> Create AgreementWorkEffortAppl </description> + <auto-attributes include="pk" mode="IN" optional="false"/> + </service> + <service name="deleteAgreementWorkEffortAppl" engine="simple" default-entity-name="AgreementWorkEffortAppl" + location="org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="deleteAgreementWorkEffortAppl"> + <description>Delete AgreementWorkEffortAppl</description> + <auto-attributes mode="IN" include="pk" optional="false"/> + </service> <!-- Permission services --> <service name="acctgAgreementPermissionCheck" engine="simple" 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?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jun 6 07:40:39 2008 @@ -1108,6 +1108,24 @@ <response name="success" type="view" value="ListAgreementGeographicalApplic"/> <response name="error" type="view" value="EditAgreementGeographicalApplic"/> </request-map> + + <!--WorkEffort Agreements--> + <request-map uri="EditAgreementWorkEffortAppls"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditAgreementWorkEffortAppls"/> + </request-map> + <request-map uri="createAgreementWorkEffortAppl"> + <security https="true" auth="true"/> + <event type="service" invoke="createAgreementWorkEffortAppl"/> + <response name="success" type="view" value="EditAgreementWorkEffortAppls"/> + <response name="error" type="view" value="EditAgreementWorkEffortAppls"/> + </request-map> + <request-map uri="deleteAgreementWorkEffortAppl"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteAgreementWorkEffortAppl"/> + <response name="success" type="view" value="EditAgreementWorkEffortAppls"/> + <response name="error" type="view" value="EditAgreementWorkEffortAppls"/> + </request-map> <!-- TaxAuthority Requests --> <request-map uri="FindTaxAuthority"><security https="true" auth="true"/><response name="success" type="view" value="FindTaxAuthority"/></request-map> @@ -1765,6 +1783,9 @@ <request-map uri="LookupFacility"><security https="true" auth="true"/><response name="success" type="view" value="LookupFacility"/></request-map> <request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map> <request-map uri="LookupShipment"><security auth="true" https="true"/><response name="success" type="view" value="LookupShipment"/></request-map> + <request-map uri="LookupAgreement"><security https="true" auth="true"/><response name="success" type="view" value="LookupAgreement"/></request-map> + <request-map uri="LookupAgreementItem"><security auth="true" https="true"/><response name="success" type="view" value="LookupAgreementItem"/></request-map> + <request-map uri="viewprofile"><security https="true" auth="true"/><response name="success" type="view" value="viewprofile"/></request-map> @@ -1949,6 +1970,7 @@ <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"/> + <view-map name="EditAgreementWorkEffortAppls" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementWorkEffortAppls"/> <!-- TaxAuthority --> <view-map name="FindTaxAuthority" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#FindTaxAuthority"/> @@ -2010,6 +2032,8 @@ <view-map name="LookupFacility" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/> <view-map name="LookupFacilityLocation" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation"/> <view-map name="LookupShipment" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupShipment"/> + <view-map name="LookupAgreement" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreement"/> + <view-map name="LookupAgreementItem" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem"/> <!-- PDFs --> <view-map name="InvoicePDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF" content-type="application/pdf" encoding="none"/> 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?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Fri Jun 6 07:40:39 2008 @@ -472,4 +472,34 @@ <submit button-type="button"/> </field> </form> + <!-- Agreement WorkEffort Appl--> + <form name="AddAgreementWorkEffortAppl" target="createAgreementWorkEffortAppl" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field name="agreementId"><hidden value="${agreementId}"/></field> + <field name="agreementItemSeqId"> + <drop-down allow-empty="false"> + <entity-options entity-name="AgreementItem" description="${agreementItemSeqId}"> + <entity-constraint name="agreementId" operator="equals" env-name="agreementId"/> + <entity-order-by field-name="agreementItemSeqId"/> + </entity-options> + </drop-down> + </field> + <field name="workEffortId"> + <lookup target-form-name="LookupWorkEffort"/> + </field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListAgreementWorkEffortAppls" type="list" target="updateAgreementWorkEffortAppl" list-name="agreementWorkEffortAppls" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list-name="agreementWorkEffortAppls"> + <field-map env-name="agreementId" field-name="agreementId" /> + </entity-and> + </actions> + <field name="agreementItemSeqId" widget-style="tabletext"><display/></field> + <field name="workEffortId" widget-style="tabletext"><display/></field> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortAppl?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&workEffortId=${workEffortId}"/> + </field> + </form> </forms> \ No newline at end of file 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?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl Fri Jun 6 07:40:39 2008 @@ -23,6 +23,7 @@ <li<#if selected == "AgreementMain"> class="selected"</#if>><a href="<@ofbizUrl>EditAgreement?agreementId=${agreement.agreementId}</@ofbizUrl>">${uiLabelMap.AccountingAgreement}</a></li> <li<#if selected == "AgreementTerms"> class="selected"</#if>><a href="<@ofbizUrl>EditAgreementTerms?agreementId=${agreement.agreementId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementTerms}</a></li> <li<#if selected == "AgreementItems"> class="selected"</#if>><a href="<@ofbizUrl>ListAgreementItems?agreementId=${agreement.agreementId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementItems}</a></li> + <li<#if selected == "AgreementWorkEffortAppls"> class="selected"</#if>><a href="<@ofbizUrl>EditAgreementWorkEffortAppls?agreementId=${agreement.agreementId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementWorkEffortAppls}</a></li> </ul> <br class="clear"/> </div> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Fri Jun 6 07:40:39 2008 @@ -185,4 +185,61 @@ <field name="amount"><display/></field> <field name="currencyUomId"><display/></field> </form> + + <form name="lookupAgreement" target="LookupAgreement" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field name="agreementId" ><text-find/></field> + <field name="productId" ><text-find/></field> + <field name="partyIdFrom"><text-find/></field> + <field name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><text-find/></field> + <field name="agreementDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="listAgreements" list-name="listIt" title="" type="list" target="LookupAgreement" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> + <field-map field-name="inputFields" env-name="parameters"/> + <field-map field-name="entityName" value="Agreement"/> + </service> + </actions> + <field name="agreementId" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${agreementId}" target="javascript:set_value('${agreementId}')"/> + </field> + <field name="productId"><display/></field> + <field name="partyIdFrom"><display/></field> + <field name="partyIdTo"><display/></field> + <field name="agreementDate" title="${uiLabelMap.CommonFromDate}"><display/></field> + <field name="agreementTypeId"><display/></field> + <field name="description"><display/></field> + </form> + + <form name="lookupAgreementItem" target="LookupAgreementItem" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field name="agreementId"><text-find/></field> + <field name="agreementItemSeqId"><text-find/></field> + <field name="agreementItemTypeId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="AgreementItemType"/> + </drop-down> + </field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="listAgreementItems" list-name="listIt" title="" type="list" target="LookupAgreementItem" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> + <field-map field-name="inputFields" env-name="parameters"/> + <field-map field-name="entityName" value="AgreementItem"/> + </service> + </actions> + <field name="agreementId"><display/></field> + <field name="agreementItemSeqId" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')"/> + </field> + <field name="agreementItemTypeId"><display/></field> + <field name="currencyUomId"><display/></field> + </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Fri Jun 6 07:40:39 2008 @@ -917,4 +917,48 @@ </widgets> </section> </screen> + + <screen name="EditAgreementWorkEffortAppls"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditAgreementWorkEffortAppls"/> + <set field="headerItem" value="agreement"/> + <set field="tabButtonItem" value="AgreementWorkEffortAppls"/> + <set field="agreementId" from-field="parameters.agreementId"/> + <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/> + </actions> + <widgets> + <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> + <decorator-section name="body"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingListAgreementWorkEffortAppls}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListAgreementWorkEffortAppls" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + </widgets> + </section> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingAddAgreementWorkEffortAppl}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddAgreementWorkEffortAppl" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Fri Jun 6 07:40:39 2008 @@ -206,4 +206,76 @@ </widgets> </section> </screen> + + <screen name="LookupAgreement"> + <section> + <condition> + <if-has-permission permission="ACCOUNTING" action="_VIEW"/> + </condition> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.AccountingLookupAgreement}"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingLookupAgreement}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="lookupAgreement" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listAgreements" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="LookupAgreementItem"> + <section> + <condition> + <if-has-permission permission="ACCOUNTING" action="_VIEW"/> + </condition> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.AccountingLookupAgreementItem}"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingLookupAgreementItem}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="lookupAgreementItem" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="listAgreementItems" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Fri Jun 6 07:40:39 2008 @@ -3826,4 +3826,7 @@ <value xml:lang="es">Hojas de trabajo</value> <value xml:lang="th">à¸à¸²à¸</value> </property> + <property key="WorkEffortAgreementAppls"> + <value xml:lang="en">Agreement Appls</value> + </property> </resource> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Fri Jun 6 07:40:39 2008 @@ -595,6 +595,27 @@ <request-map uri="LookupInvoice"><security https="true" auth="true"/><response name="success" type="view" value="LookupInvoice"/></request-map> <request-map uri="LookupContent"><security auth="true" https="true"/><response name="success" type="view" value="LookupContent"/></request-map> + <request-map uri="LookupAgreement"><security https="true" auth="true"/><response name="success" type="view" value="LookupAgreement"/></request-map> + <request-map uri="LookupAgreementItem"><security auth="true" https="true"/><response name="success" type="view" value="LookupAgreementItem"/></request-map> + + <!--WorkEffort Agreements--> + <request-map uri="EditAgreementWorkEffortAppls"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditAgreementWorkEffortAppls"/> + </request-map> + <request-map uri="createAgreementWorkEffortAppl"> + <security https="true" auth="true"/> + <event type="service" invoke="createAgreementWorkEffortAppl"/> + <response name="success" type="view" value="EditAgreementWorkEffortAppls"/> + <response name="error" type="view" value="EditAgreementWorkEffortAppls"/> + </request-map> + <request-map uri="deleteAgreementWorkEffortAppl"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteAgreementWorkEffortAppl"/> + <response name="success" type="view" value="EditAgreementWorkEffortAppls"/> + <response name="error" type="view" value="EditAgreementWorkEffortAppls"/> + </request-map> + <!-- end of request mappings --> <!-- View Mappings --> @@ -678,5 +699,9 @@ <view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/> <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> <view-map name="LookupContactMech" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupContactMech"/> + + <view-map name="EditAgreementWorkEffortAppls" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditAgreementWorkEffortAppls"/> + <view-map name="LookupAgreement" page="component://accounting/widget/LookupScreens.xml#LookupAgreement" type="screen"/> + <view-map name="LookupAgreementItem" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem" type="screen"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Fri Jun 6 07:40:39 2008 @@ -30,6 +30,7 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.WorkEffortCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WorkEffortCompanySubtitle" global="true"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Jun 6 07:40:39 2008 @@ -1025,4 +1025,34 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech?workEffortId=${workEffortId}&contactMechId=${contactMechId}"/> </field> </form> + <!-- Agreement WorkEffort Appl--> + <form name="AddAgreementWorkEffortAppl" target="createAgreementWorkEffortAppl" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> + <field name="agreementId"> + <lookup target-form-name="LookupAgreement"/> + </field> + <field name="agreementItemSeqId"> + <lookup target-form-name="LookupAgreementItem"/> + </field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListAgreementWorkEffortAppls" type="list" target="updateAgreementWorkEffortAppl" list-name="agreementWorkEffortAppls" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list-name="agreementWorkEffortAppls"> + <field-map env-name="workEffortId" field-name="workEffortId" /> + </entity-and> + </actions> + <field name="agreementId" widget-style="tabletext"> + <display-entity entity-name="Agreement" key-field-name="agreementId" also-hidden="true"> + <sub-hyperlink target="/accounting/control/FindAgreement?agreementId=${agreementId}" description="${agreementId}" link-style="buttontext" target-type="inter-app"/> + </display-entity> + </field> + <field name="agreementItemSeqId" widget-style="tabletext"><display/></field> + <field name="workEffortId" widget-style="tabletext"><display/></field> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortAppl?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&workEffortId=${workEffortId}"/> + </field> + </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Fri Jun 6 07:40:39 2008 @@ -95,5 +95,8 @@ <menu-item name="WorkEffortContactMechs" title="${uiLabelMap.WorkEffortContactMechs}"> <link target="EditWorkEffortContactMechs?workEffortId=${workEffortId}"/> </menu-item> + <menu-item name="WorkEffortAgreementAppls" title="${uiLabelMap.WorkEffortAgreementAppls}"> + <link target="EditAgreementWorkEffortAppls?workEffortId=${workEffortId}"/> + </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=663966&r1=663965&r2=663966&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Fri Jun 6 07:40:39 2008 @@ -1243,4 +1243,47 @@ </widgets> </section> </screen> + <screen name="EditAgreementWorkEffortAppls"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditAgreementWorkEffortAppls"/> + <set field="tabButtonItem" value="WorkEffortAgreementAppls"/> + <set field="workEffortId" from-field="parameters.workEffortId" /> + </actions> + <widgets> + <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingAgreementWorkEffortAppls}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListAgreementWorkEffortAppls" location="component://workeffort/widget/WorkEffortForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingAddAgreementWorkEffortAppl}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddAgreementWorkEffortAppl" location="component://workeffort/widget/WorkEffortForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |