svn commit: r431863 - in /incubator/ofbiz/trunk/applications/accounting: webapp/accounting/agreement/AgreementForms.xml widget/AgreementScreens.xml

[ja...@apache.org]

Author: jacopoc
Date: Wed Aug 16 01:36:47 2006
New Revision: 431863

URL: http://svn.apache.org/viewvc?rev=431863&view=rev
Log:
Improved agreement price list report with information from agreement header (id, party from, party to, description, validity dates) and from agreement item (id and currency).

Modified:
    incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
    incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml

Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=431863&r1=431862&r2=431863&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Wed Aug 16 01:36:47 2006
@@ -263,6 +263,33 @@
             <hyperlink target="removeAgreementItemProduct?productId=${productId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}" description="[${uiLabelMap.CommonRemove}]" also-hidden="false"/>
         </field>
     </form>
+    <form name="ViewAgreementInfoForReport" type="single"
+            title="" default-map-name="agreement"
+            default-title-style="tableheadtext">
+        <field name="agreementId"><text/></field>
+        <field name="partyIdFrom"><text/></field>
+        <field name="partyIdTo">
+            <display-entity entity-name="PartyGroup" key-field-name="partyId" description="${partyId} - ${groupName}"/>
+        </field>
+        <field name="fromDate"><display/></field>
+        <field name="thruDate"><display/></field>
+        <field name="description"><display/></field>
+    </form>
+    <form name="ViewAgreementItemInfoForReport" type="single"
+            title="" default-map-name="agreementItem"
+            default-title-style="tableheadtext">
+        <field name="agreementItemSeqId"><display/></field>
+        <field name="currencyUomId"><display/></field>
+    </form>
+    <form name="ListAgreementItemProductsForReport" default-title-style="tableheadtext"
+            default-tooltip-style="tabletext" default-widget-style="tabletext" list-name="agreementProducts"
+            target="" title="" type="list">
+        <field name="productId" title-area-style="tableheadmedium"><display/></field>
+        <field name="internalName" entry-name="productId">
+            <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/>
+        </field>
+        <field name="price" title-area-style="tableheadmedium" widget-area-style="tabletextright"><display/></field>
+    </form>
     <form name="EditAgreementItemProduct" type="single"
             target="updateAgreementItemProduct" title="" default-map-name="agreementProductAppl"
             default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">

Modified: incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=431863&r1=431862&r2=431863&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Wed Aug 16 01:36:47 2006
@@ -334,7 +334,9 @@
             <widgets>
                 <decorator-screen name="FoDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <include-form name="ListAgreementItemProducts" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+                        <include-form name="ViewAgreementInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+                        <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+                        <include-form name="ListAgreementItemProductsForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>