Author: hansbak
Date: Sun Jul 5 06:46:00 2009
New Revision: 791200
URL: http://svn.apache.org/viewvc?rev=791200&view=rev
Log:
missing parameter on reconcilliationlink, screenlet conversion and descriptions
in transactionlist
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
ofbiz/trunk/applications/accounting/widget/GlForms.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=791200&r1=791199&r2=791200&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
Sun Jul 5 06:46:00 2009
@@ -218,6 +218,12 @@
</actions>
<auto-fields-entity entity-name="AcctgTransAndEntries"
default-field-type="display"/>
<field name="paymentId"><hidden/></field>
+ <field name="acctgTransTypeId"><display-entity
entity-name="AcctgTransType" description="${description}"/></field>
+ <field name="glJournalId"><display-entity entity-name="GlJournal"
description="${glJournalName}"/></field>
+ <field name="glAccountTypeId"><display-entity
entity-name="GlAccountType" description="${description}"/></field>
+ <field name="glAccountClassId"><display-entity
entity-name="GlAccountClass" description="${description}"/></field>
+ <field name="partyId"><display-entity entity-name="PartyNameView"
description="${lastName} ${groupName}"/></field>
+ <field name="reconcileStatusId"><display-entity
entity-name="StatusItem" key-field-name="statusId"/></field>
</form>
<form name="NewSalesInvoice" type="single" target="createInvoice"
title="Edit Invoice Header" default-map-name="invoice"
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=791200&r1=791199&r2=791200&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sun Jul 5 06:46:00
2009
@@ -813,6 +813,7 @@
<hyperlink also-hidden="false" description="${glReconciliationId}"
target="EditGlReconciliations">
<parameter param-name="glReconciliationId"/>
<parameter param-name="tabButtonItem"
from-field="AccountReconciliations"/>
+ <parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
<field name="glReconciliationName"><display/></field>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=791200&r1=791199&r2=791200&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sun Jul 5
06:46:00 2009
@@ -701,42 +701,12 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingEditAcctRecon}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="EditGlReconciliation"
location="component://accounting/widget/GlForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </widgets>
- </section>
- <section>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingEditAcctRecon}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListGlReconciliationEntries"
location="component://accounting/widget/GlForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </widgets>
- </section>
+ <screenlet
title="${uiLabelMap.AccountingEditAcctRecon}">
+ <include-form name="EditGlReconciliation"
location="component://accounting/widget/GlForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingEditAcctRecon}">
+ <include-form name="ListGlReconciliationEntries"
location="component://accounting/widget/GlForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
