Author: mor
Date: Sat Jun 27 12:45:11 2009
New Revision: 788963
URL: http://svn.apache.org/viewvc?rev=788963&view=rev
Log:
Implemented entity, crud services and ui for payment groups which will be
enable user to generate checks in a batch from selected bank account (which is
not implemented yet).
Thanks to Jacopo for notes.
Added:
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (with
props)
ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml (with
props)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=788963&r1=788962&r2=788963&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat Jun
27 12:45:11 2009
@@ -1925,6 +1925,9 @@
<value xml:lang="nl">Maak nieuwe factuur</value>
<value
xml:lang="th">สรà¹à¸²à¸à¹à¸à¸à¸³à¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸«à¸¡à¹</value>
</property>
+ <property key="AccountingCreateNewPaymentGroup">
+ <value xml:lang="en">Create New Payment Group</value>
+ </property>
<property key="AccountingCreateNewPurchaseInvoice">
<value xml:lang="de">Neue Einkaufsrechnung</value>
<value xml:lang="en">New Purchase Invoice</value>
@@ -2392,6 +2395,12 @@
<value
xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
<value xml:lang="zh">ç¼è¾æ¯ä»</value>
</property>
+ <property key="AccountingEditPaymentGroup">
+ <value xml:lang="en">Edit Payment Group</value>
+ </property>
+ <property key="AccountingEditPaymentGroupMember">
+ <value xml:lang="en">Edit Payment Group Member</value>
+ </property>
<property key="AccountingEditTaxAuthorityGlAccounts">
<value xml:lang="de">Steuerkonten bearbeiten</value>
<value xml:lang="en">Edit TaxAuthority GL Accounts</value>
@@ -2738,6 +2747,9 @@
<value
xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸à¸à¸³à¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">æ¥æ¾å票</value>
</property>
+ <property key="AccountingFindPaymentGroup">
+ <value xml:lang="en">Find Payment Group</value>
+ </property>
<property key="AccountingFindPurchaseInvoicesByDueDate">
<value xml:lang="de">Suche Einkaufsrechnungen über Fälligkeit</value>
<value xml:lang="en">Find Purchase Invoices By Due Date</value>
@@ -4963,6 +4975,9 @@
<value
xml:lang="th">à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸à¹à¸«à¸¡à¹</value>
<value xml:lang="zh">æ°å»ºæ¯ä»</value>
</property>
+ <property key="AccountingNewPaymentGroup">
+ <value xml:lang="en">New Payment Group</value>
+ </property>
<property key="AccountingNewPaymentIncoming">
<value xml:lang="en">New incoming payment</value>
<value xml:lang="fr">Nouveau paiement reçu</value>
@@ -5881,6 +5896,12 @@
<value xml:lang="th">Accounting Payment Gateway Response Id</value>
<value xml:lang="zh">è´¢å¡æ¯ä»ç½å
³ååºç¼å·</value>
</property>
+ <property key="AccountingPaymentGroup">
+ <value xml:lang="en">Payment Group</value>
+ </property>
+ <property key="AccountingPaymentGroupMember">
+ <value xml:lang="en">Group Member</value>
+ </property>
<property key="AccountingPaymentHeader">
<value xml:lang="ar">رأسÙØ© اÙتسدÙد</value>
<value xml:lang="en">Payment Header</value>
Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=788963&r1=788962&r2=788963&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Sat Jun 27
12:45:11 2009
@@ -665,6 +665,10 @@
<!-- payment types for POS PAID IN/OUT -->
<PaymentType description="POS Paid Out" hasTable="N"
parentTypeId="DISBURSEMENT" paymentTypeId="POS_PAID_OUT"/>
<PaymentType description="POS Paid In" hasTable="N" parentTypeId="RECEIPT"
paymentTypeId="POS_PAID_IN"/>
+
+ <!-- Payment Group Type -->
+ <PaymentGroupType paymentGroupTypeId="CHECK_RUN" parentTypeId=""
hasTable="N" description="Check Run"/>
+ <PaymentGroupType paymentGroupTypeId="PAYMENT_BATCH" parentTypeId=""
hasTable="N" description="Payment Batch"/>
<!-- Payment Gateway Config -->
<PaymentGatewayConfigType paymentGatewayConfigTypeId="AUTHORIZE_NET"
hasTable="N" description="Authorize Dot Net Payment Gateway"/>
Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=788963&r1=788962&r2=788963&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Sat Jun 27
12:45:11 2009
@@ -3196,6 +3196,52 @@
<prim-key field="merchantId"/>
</entity>
+ <entity entity-name="PaymentGroup"
+ package-name="org.ofbiz.accounting.payment"
+ title="Payment Group Entity">
+ <description>Payment Group</description>
+ <field name="paymentGroupId" type="id-ne"></field>
+ <field name="paymentGroupTypeId" type="id-ne"></field>
+ <field name="paymentGroupName" type="name"></field>
+ <prim-key field="paymentGroupId"/>
+ <relation type="one" fk-name="PAYMNTGP_PGTYPE"
rel-entity-name="PaymentGroupType">
+ <key-map field-name="paymentGroupTypeId"/>
+ </relation>
+ </entity>
+
+ <entity entity-name="PaymentGroupType"
+ package-name="org.ofbiz.accounting.payment"
+ title="Payment Group Type Entity">
+ <description>Payment Group Type</description>
+ <field name="paymentGroupTypeId" type="id-ne"></field>
+ <field name="parentTypeId" type="id-ne"></field>
+ <field name="hasTable" type="indicator"></field>
+ <field name="description" type="description"></field>
+ <prim-key field="paymentGroupTypeId"/>
+ <relation type="one" fk-name="PAYMNTGP_TYP_PAR" title="Parent"
rel-entity-name="PaymentGroupType">
+ <key-map field-name="parentTypeId"
rel-field-name="paymentGroupTypeId"/>
+ </relation>
+ </entity>
+
+ <entity entity-name="PaymentGroupMember"
+ package-name="org.ofbiz.accounting.payment"
+ title="Payment Group Member Entity">
+ <description>Payment Group Member</description>
+ <field name="paymentGroupId" type="id-ne"></field>
+ <field name="paymentId" type="id-ne"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
+ <field name="sequenceNum" type="numeric"></field>
+ <prim-key field="paymentGroupId"/>
+ <prim-key field="paymentId"/>
+ <prim-key field="fromDate"/>
+ <relation type="one" fk-name="PAYGRPMMBR_PG"
rel-entity-name="PaymentGroup">
+ <key-map field-name="paymentGroupId"/>
+ </relation>
+ <relation type="one" fk-name="PAYGRPMMBR_PAYMNT"
rel-entity-name="Payment">
+ <key-map field-name="paymentId"/>
+ </relation>
+ </entity>
<!-- ========================================================= -->
<!-- org.ofbiz.accounting.tax -->
<!-- ========================================================= -->
Modified:
ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml?rev=788963&r1=788962&r2=788963&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
Sat Jun 27 12:45:11 2009
@@ -745,4 +745,38 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
+
+ <!-- Payment Group -->
+ <service name="createPaymentGroup" default-entity-name="PaymentGroup"
engine="entity-auto" invoke="create" auth="true">
+ <description>Create a Payment Group</description>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="paymentGroupTypeId" optional="false"/>
+ <override name="paymentGroupName" optional="false"/>
+ </service>
+ <service name="updatePaymentGroup" default-entity-name="PaymentGroup"
engine="entity-auto" invoke="update" auth="true">
+ <description>Update a Payment Group</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deletePaymentGroup" default-entity-name="PaymentGroup"
engine="entity-auto" invoke="delete" auth="true">
+ <description>Delete a Payment Group</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- Payment Group Member -->
+ <service name="createPaymentGroupMember"
default-entity-name="PaymentGroupMember" engine="entity-auto" invoke="create"
auth="true">
+ <description>Create a Payment Group Member</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updatePaymentGroupMember"
default-entity-name="PaymentGroupMember" engine="entity-auto" invoke="update"
auth="true">
+ <description>Update a Payment Group Member</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deletePaymentGroupMember"
default-entity-name="PaymentGroupMember" engine="entity-auto" invoke="delete"
auth="true">
+ <description>Delete a Payment Group Member</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
</services>
\ No newline at end of file
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=788963&r1=788962&r2=788963&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Sat Jun 27 12:45:11 2009
@@ -374,6 +374,58 @@
<response name="error" type="view"
value="FindPurchaseInvoicesByDueDate"/>
</request-map>
+ <!-- Payment Group requests -->
+
+ <request-map uri="FindPaymentGroup">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindPaymentGroup"/>
+ </request-map>
+ <request-map uri="EditPaymentGroup">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditPaymentGroup"/>
+ </request-map>
+ <request-map uri="createPaymentGroup">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPaymentGroup"/>
+ <response name="success" type="view" value="EditPaymentGroup"/>
+ <response name="error" type="view" value="EditPaymentGroup"/>
+ </request-map>
+ <request-map uri="updatePaymentGroup">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePaymentGroup"/>
+ <response name="success" type="view" value="EditPaymentGroup"/>
+ <response name="error" type="view" value="EditPaymentGroup"/>
+ </request-map>
+ <request-map uri="deletePaymentGroup">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deletePaymentGroup"/>
+ <response name="success" type="view" value="FindPaymentGroup"/>
+ <response name="error" type="view" value="FindPaymentGroup"/>
+ </request-map>
+
+ <request-map uri="EditPaymentGroupMember">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditPaymentGroupMember"/>
+ </request-map>
+ <request-map uri="createPaymentGroupMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPaymentGroupMember"/>
+ <response name="success" type="view" value="EditPaymentGroupMember"/>
+ <response name="error" type="view" value="EditPaymentGroupMember"/>
+ </request-map>
+ <request-map uri="updatePaymentGroupMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePaymentGroupMember"/>
+ <response name="success" type="view" value="EditPaymentGroupMember"/>
+ <response name="error" type="view" value="EditPaymentGroupMember"/>
+ </request-map>
+ <request-map uri="deletePaymentGroupMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deletePaymentGroupMember"/>
+ <response name="success" type="view" value="EditPaymentGroupMember"/>
+ <response name="error" type="view" value="EditPaymentGroupMember"/>
+ </request-map>
+
<!-- transaction page requests -->
<request-map uri="FindGatewayResponses">
<security https="true" auth="true"/>
@@ -2038,6 +2090,10 @@
<view-map name="FindSalesInvoicesByDueDate" type="screen"
page="component://accounting/widget/PaymentScreens.xml#FindSalesInvoicesByDueDate"/>
<view-map name="FindPurchaseInvoicesByDueDate" type="screen"
page="component://accounting/widget/PaymentScreens.xml#FindPurchaseInvoicesByDueDate"/>
+ <!-- Payment Group -->
+ <view-map name="FindPaymentGroup" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#FindPaymentGroup"/>
+ <view-map name="EditPaymentGroup" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#EditPaymentGroup"/>
+ <view-map name="EditPaymentGroupMember" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#EditPaymentGroupMember"/>
<!-- Party Accounts -->
<view-map name="PartyAccountsSummary" type="screen"
page="component://accounting/widget/GlScreens.xml#PartyAccountsSummary"/>
<view-map name="FindAcctgTrans" type="screen"
page="component://accounting/widget/GlScreens.xml#FindAcctgTrans"/>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=788963&r1=788962&r2=788963&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sat Jun 27
12:45:11 2009
@@ -79,6 +79,61 @@
</section>
</screen>
+ <screen name="CommonPaymentGroupDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="PaymentGroup"/>
+ <set field="paymentGroupId"
from-field="parameters.paymentGroupId"/>
+ <entity-one entity-name="PaymentGroup"
value-field="paymentGroup"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
+ <not><if-empty field="paymentGroup"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/Menus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <!-- do check for ACCOUNTING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <not><if-empty
field="paymentGroup"/></not>
+ </condition>
+ <widgets>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
+ <container style="button-bar">
+ <link target="EditPaymentGroup"
text="${uiLabelMap.AccountingCreateNewPaymentGroup}" style="buttontext"/>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container
style="h1"><label>${uiLabelMap.AccountingNewPaymentGroup}</label></container>
+ </fail-widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CommonTaxAuthorityDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=788963&r1=788962&r2=788963&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sat Jun 27 12:45:11
2009
@@ -24,6 +24,7 @@
<menu name="AccountingAppBar"
title="${uiLabelMap.AccountingManagerApplication}" extends="CommonAppBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="invoices"
title="${uiLabelMap.AccountingInvoicesMenu}"><link
target="findInvoices"/></menu-item>
<menu-item name="payments"
title="${uiLabelMap.AccountingPaymentsMenu}"><link
target="findPayments"/></menu-item>
+ <menu-item name="PaymentGroup"
title="${uiLabelMap.AccountingPaymentGroup}"><link
target="FindPaymentGroup"/></menu-item>
<menu-item name="transaction"
title="${uiLabelMap.AccountingTransactions}">
<condition>
<if-has-permission permission="MANUAL" action="_PAYMENT"/>
@@ -446,6 +447,27 @@
</menu-item>
</menu>
+ <menu name="PaymentGroupTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="Find" title="${uiLabelMap.CommonFind}">
+ <condition>
+ <if-compare field="tabButtonItem" operator="not-equals"
value="Find"/>
+ </condition>
+ <link target="FindPaymentGroup"/>
+ </menu-item>
+ <menu-item name="EditPaymentGroup" title="${uiLabelMap.CommonGroup}">
+ <condition><not><if-empty
field="paymentGroup.paymentGroupId"/></not></condition>
+ <link target="EditPaymentGroup">
+ <parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditPaymentGroupMember"
title="${uiLabelMap.AccountingPaymentGroupMember}">
+ <condition><not><if-empty
field="paymentGroup.paymentGroupId"/></not></condition>
+ <link target="EditPaymentGroupMember">
+ <parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
+ </link>
+ </menu-item>
+ </menu>
+
<menu name="FixedAssetMaintTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint"
default-menu-item-name="EditFixedAssetMaint">
<menu-item name="EditFixedAssetMaint"
title="${uiLabelMap.AccountingFixedAssetMaint}">
Added: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=788963&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Sat Jun 27
12:45:11 2009
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
+
+ <!-- Payment Group -->
+ <form name="FindPaymentGroup" type="single" target="FindPaymentGroup"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PaymentGroup"
default-field-type="find"/>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
+ </form>
+
+ <form name="ListPaymentGroup" type="list" separate-columns="true"
default-entity-name="PaymentGroup" list-name="listIt"
+ paginate-target="FindPaymentGroup" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result"
result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="PaymentGroup"/>
+ </service>
+ </actions>
+ <field name="paymentGroupId" widget-style="buttontext">
+ <hyperlink description="${paymentGroupId}"
target="EditPaymentGroup">
+ <parameter param-name="paymentGroupId"/>
+ </hyperlink>
+ </field>
+ <field name="paymentGroupTypeId"><display-entity
entity-name="PaymentGroupType" description="${description}"/></field>
+ <field name="paymentGroupName"><display/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
+ <hyperlink target="deletePaymentGroup"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="paymentGroupId"/>
+ </hyperlink>
+ </field>
+ </form>
+
+ <form name="EditPaymentGroup" type="single" target="updatePaymentGroup"
title="" default-map-name="paymentGroup">
+ <alt-target use-when="paymentGroup==null" target="createPaymentGroup"/>
+ <auto-fields-service service-name="updatePaymentGroup"/>
+ <field use-when="paymentGroup!=null" name="paymentGroupId"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field use-when="paymentGroup==null @and paymentGroupId==null"
name="paymentGroupId"><ignored/></field>
+ <field use-when="paymentGroup==null @and paymentGroupId!=null"
name="paymentGroupId"><display description="${uiLabelMap.CommonCannotBeFound}:
[${paymentGroupId}]" also-hidden="false"/></field>
+ <field name="paymentGroupTypeId" title="${uiLabelMap.CommonType}">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="PaymentGroupType"
description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" use-when="paymentMethod==null"
title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+ <field name="submitButton" use-when="paymentMethod!=null"
title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ </form>
+
+ <!-- Payment Group Member -->
+ <form name="ListPaymentGroupMember" type="list"
list-name="paymentGroupMembers" target="updatePaymentGroupMember">
+ <auto-fields-service service-name="updatePaymentGroupMember"/>
+ <field name="paymentGroupId"><hidden/></field>
+ <field name="paymentId"><text size="20"/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="deleteLink" title="" widget-style="buttontext">
+ <hyperlink target="deletePaymentGroupMember"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="paymentGroupId"/>
+ <parameter param-name="paymentId"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
+ </form>
+
+ <form name="AddPaymentGroupMember" type="single"
target="createPaymentGroupMember">
+ <auto-fields-service service-name="createPaymentGroupMember"/>
+ <field name="paymentGroupId"><hidden/></field>
+ <field name="paymentId"><text size="30"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit
button-type="button"/></field>
+ </form>
+</forms>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml?rev=788963&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml Sat Jun
27 12:45:11 2009
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
+
+ <screen name="FindPaymentGroup">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingFindPaymentGroup"/>
+ <set field="headerItem" value="PaymentGroup"/>
+ <set field="tabButtonItem" value="Find"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar">
+ <link target="EditPaymentGroup"
text="Create New Payment Group" style="buttontext"/>
+ </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindPaymentGroup"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPaymentGroup"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditPaymentGroup">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingEditPaymentGroup"/>
+ <set field="tabButtonItem" value="EditPaymentGroup"/>
+ <set field="paymentGroupId"
from-field="parameters.paymentGroupId"/>
+ <entity-one entity-name="PaymentGroup"
value-field="paymentGroup"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPaymentGroupDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="EditPaymentGroup"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditPaymentGroupMember">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="AccountingEditPaymentGroupMember"/>
+ <set field="tabButtonItem" value="EditPaymentGroupMember"/>
+ <set field="paymentGroupId"
from-field="parameters.paymentGroupId"/>
+ <entity-and entity-name="PaymentGroupMember"
list="paymentGroupMembers">
+ <field-map field-name="paymentGroupId"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPaymentGroupDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListPaymentGroupMember"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ <include-form name="AddPaymentGroupMember"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
