svn commit: r1235513 - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/widget/ framework/common/config/ specialpurpose/myportal/data/

[erwan]

Author: erwan
Date: Tue Jan 24 21:38:48 2012
New Revision: 1235513

URL: http://svn.apache.org/viewvc?rev=1235513&view=rev
Log:
OFBIZ-2405 - Create a Portlet to show the payments

Modified:
    ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml
    ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
    ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
    ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml

Modified: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml?rev=1235513&r1=1235512&r2=1235513&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml Tue Jan 24 21:38:48 2012
@@ -74,4 +74,11 @@
         screenLocation="component://accounting/widget/InvoiceScreens.xml"
         description="List Invoices for a certain supplier who is just logged in"/>
     <PortletPortletCategory portalPortletId="ListSupplierInvoices" portletCategoryId="ACCOUNTING"/>
+
+    <PortalPortlet portalPortletId="ListPayments" portletName="List Customer Payments"
+        screenName="ListPayments"
+        screenLocation="component://accounting/widget/PaymentScreens.xml"
+        description="List of Payments"
+        editFormName="EditPaymentAttributes" editFormLocation="component://accounting/widget/PaymentForms.xml"/>
+    <PortletPortletCategory portalPortletId="ListPayments" portletCategoryId="ACCOUNTING"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1235513&r1=1235512&r2=1235513&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Tue Jan 24 21:38:48 2012
@@ -90,6 +90,20 @@ under the License.
         <field name="amountToApply"><display also-hidden="false" type="currency" currency="${currencyUomId}"/></field>
     </form>
 
+    <form name="EditPaymentAttributes" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
+        <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="statusId" entry-name="attributeMap.statusId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                    <entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="saveButton"><submit/></field>
+    </form>
+
     <form name="NewPaymentOut" type="single" target="createPayment" default-map-name="payment"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1235513&r1=1235512&r2=1235513&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Tue Jan 24 21:38:48 2012
@@ -94,6 +94,21 @@ under the License.
             </widgets>
         </section>
     </screen>
+
+    <screen name="ListPayments">
+        <section>
+            <actions>
+                <set field="noConditionFind" value="Y"/>
+                <set field="parameters.statusId" from-field="statusId"/>
+            </actions>
+            <widgets>
+                <screenlet title="${uiLabelMap.AccountingInvoicePayments}">
+                    <include-form name="ListPayments"  location="component://accounting/widget/PaymentForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="NewPayment">
         <section>
             <actions>

Modified: ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml?rev=1235513&r1=1235512&r2=1235513&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml Tue Jan 24 21:38:48 2012
@@ -57,6 +57,10 @@
         <value xml:lang="en">My trainings</value>
         <value xml:lang="fr">Mes formations</value>
     </property>
+    <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE8">
+        <value xml:lang="en">My Payments</value>
+        <value xml:lang="fr">Mes paiements</value>
+    </property>
     <property key="PortalPage.portalPageName.ProductStoreFacility">
         <value xml:lang="de">Lager</value>
         <value xml:lang="en">Facility</value>

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=1235513&r1=1235512&r2=1235513&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Jan 24 21:38:48 2012
@@ -31,6 +31,7 @@
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="500" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE6" sequenceNum="600" portalPageName="My Leave" description="The OFBiz My Portal My Leave page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE7" sequenceNum="700" portalPageName="My Trainings" description="My Portal trainings page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+    <PortalPage portalPageId="MYPORTAL_EMPLOYEE8" sequenceNum="800" portalPageName="My Payments" description="The OFBiz My Portal My Payments page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
 
     <PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="0" portalPageName="Main" description="The OFBiz System info page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML"/>
     <PortalPage portalPageId="MYPORTAL_EMPL-NOEML0" sequenceNum="50" portalPageName="My Comms" description="The OFBiz My Communications page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
@@ -57,6 +58,7 @@
     <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001"/>
     <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE6" columnSeqId="00001"/>
     <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE7" columnSeqId="00001"/>
+    <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE8" columnSeqId="00001"/>
 
     <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML" columnSeqId="00001"/>
     <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML0" columnSeqId="00001"/>
@@ -104,6 +106,8 @@
     <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE6" portalPortletId="myLeave" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE7" portalPortletId="MyTrainings" portletSeqId="00001" columnSeqId="00001"  sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE8" portalPortletId="ListPayments" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+    <PortletAttribute portalPageId="MYPORTAL_EMPLOYEE8" portalPortletId="ListPayments" portletSeqId="00001" attrName="statusId" attrValue="PMNT_NOT_PAID"/>
 
     <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="SystemInfoNotes" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="SystemInfoStatus" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>