Author: apatel
Date: Sat Sep 15 20:05:48 2007
New Revision: 576026
URL: http://svn.apache.org/viewvc?rev=576026&view=rev
Log:
No functional change. Changed looks of Summary screen to look similar to Order
Summary screen.
Modified:
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=576026&r1=576025&r2=576026&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sat Sep 15
20:05:48 2007
@@ -91,7 +91,7 @@
<widgets>
<include-menu name="PaymentTabBar"
location="component://accounting/widget/Menus.xml"/>
<include-menu name="PaymentSubTabBar"
location="component://accounting/widget/Menus.xml"/>
- <label style="head1"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
+ <label style="head2"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=576026&r1=576025&r2=576026&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sat Sep 15
20:05:48 2007
@@ -253,42 +253,74 @@
<if-compare field-name="payment.statusId"
operator="equals" value="PMNT_NOT_PAID"/>
</condition>
<widgets>
- <container>
- <label style="head1"
text="${uiLabelMap.AccountingPaymentHeader}"/>
- <link
target="editPayment?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}"
style="buttontext"/>
- <include-form name="paymentHeader"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </container>
- <container>
- <label style="head1"
text="${uiLabelMap.AccountingPaymentsApplied}:
${appliedAmount?currency(${payment.currencyUomId})},
${uiLabelMap.AccountingOpenPayments}:
${notAppliedAmount?currency(${payment.currencyUomId})}"/>
- <link
target="editPaymentApplications?paymentId=${paymentId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
- <include-form name="paymentApplications"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </container>
- <container>
- <label style="head1"
text="${uiLabelMap.AccountingTransactions}"/>
- <include-form name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </container>
+ <container style="lefthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <label
style="boxhead">${uiLabelMap.AccountingPaymentHeader}</label>
+ </container>
+ <container style="screenlet-body">
+ <link
target="editPayment?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}"
style="buttontext"/>
+ <include-form name="paymentHeader"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container style="righthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <label
style="boxhead">${uiLabelMap.AccountingPaymentsApplied}:
${appliedAmount?currency(${payment.currencyUomId})},
${uiLabelMap.AccountingOpenPayments}:
${notAppliedAmount?currency(${payment.currencyUomId})}</label>
+ </container>
+ <container style="screenlet-body">
+ <link
target="editPaymentApplications?paymentId=${paymentId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
+ <include-form
name="paymentApplications"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container style="screenlet bothclear">
+ <container style="screenlet-title-bar">
+ <label style="boxhead"
text="${uiLabelMap.AccountingTransactions}"/>
+ </container>
+ <container style="screenlet-body">
+ <include-form
name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
</widgets>
<fail-widgets>
- <container>
- <label style="head1"
text="${uiLabelMap.AccountingPaymentHeader}"/>
- <include-form name="paymentHeader"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </container>
- <container>
- <label style="head1"
text="${uiLabelMap.AccountingPaymentsApplied}:
${appliedAmount?currency(${payment.currencyUomId})}, open:
${notAppliedAmount?currency(${payment.currencyUomId})}"/>
- <section>
- <condition>
- <if-compare
field-name="payment.statusId" operator="not-equals" value="PMNT_CONFIRMED"/>
- </condition>
- <widgets>
- <link
target="editPaymentApplications?paymentId=${paymentId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
- </widgets>
- </section>
- <include-form name="paymentApplications"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </container>
- <container>
- <label style="head1"
text="${uiLabelMap.AccountingTransactions}"/>
- <include-form name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </container>
+ <container style="lefthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <label
style="boxhead">${uiLabelMap.AccountingPaymentHeader}</label>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="paymentHeader"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container style="righthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <label
style="boxhead">${uiLabelMap.AccountingPaymentsApplied}:
${appliedAmount?currency(${payment.currencyUomId})},
${uiLabelMap.AccountingOpenPayments}:
${notAppliedAmount?currency(${payment.currencyUomId})}</label>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <condition>
+ <if-compare
field-name="payment.statusId" operator="not-equals" value="PMNT_CONFIRMED"/>
+ </condition>
+ <widgets>
+ <link
target="editPaymentApplications?paymentId=${paymentId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
+ </widgets>
+ </section>
+ <include-form
name="paymentApplications"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container style="screenlet bothclear">
+ <container style="screenlet-title-bar">
+ <label style="boxhead"
text="${uiLabelMap.AccountingTransactions}"/>
+ </container>
+ <container style="screenlet-body">
+ <include-form
name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
</fail-widgets>
</section>
</decorator-section>
