You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2008/04/06 20:24:05 UTC
svn commit: r645279 - in /ofbiz/trunk/applications/accounting:
webapp/accounting/invoice/InvoiceForms.xml widget/GlForms.xml
widget/GlScreens.xml
Author: jacopoc
Date: Sun Apr 6 11:23:53 2008
New Revision: 645279
URL: http://svn.apache.org/viewvc?rev=645279&view=rev
Log:
Misc cleanups and enhancements.
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=645279&r1=645278&r2=645279&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sun Apr 6 11:23:53 2008
@@ -308,7 +308,13 @@
</field>
<field name="productId"><lookup target-form-name="LookupProduct" size="20"/></field>
<field name="description"><text size="30"/></field>
- <!--field name="overrideGlAccountId"><text size="10"/></field-->
+ <field name="overrideGlAccountId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}" key-field-name="glAccountId">
+ <entity-order-by field-name="glAccountId"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="amount" title="${uiLabelMap.AccountingUnitPrice}"><text size="7"/></field>
<field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field> <!-- this should not look like something you can modify, hence display -->
<field name="uomId"><hidden/></field>
@@ -330,7 +336,13 @@
</drop-down>
</field>
<field position="1" name="description"><text size="80"/></field>
- <field position="1" name="overrideGlAccountId"><text/></field>
+ <field position="1" name="overrideGlAccountId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}" key-field-name="glAccountId">
+ <entity-order-by field-name="glAccountId"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field position="2" name="inventoryItemId"><text/></field>
<field position="1" name="productId">
<lookup target-form-name="LookupProduct"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=645279&r1=645278&r2=645279&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sun Apr 6 11:23:53 2008
@@ -391,35 +391,35 @@
<field name="workEffortId"><text size="20" maxlength="20"/></field>
<field name="debitGlAccountId" use-when="debitGlAccountClassId!=null">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
<entity-constraint name="glAccountClassId" operator="equals" env-name="debitGlAccountClassId" ignore-if-null="true"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
<field name="debitGlAccountId" use-when="debitGlAccountClassId==null">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
<field name="creditGlAccountId" use-when="creditGlAccountClassId!=null">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
<entity-constraint name="glAccountClassId" operator="equals" env-name="creditGlAccountClassId" ignore-if-null="true"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
<field name="creditGlAccountId" use-when="creditGlAccountClassId==null">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -497,16 +497,9 @@
<field name="description"><text size="30"/></field>
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
- <entity-order-by field-name="glAccountId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="glAccountId">
- <drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -533,9 +526,9 @@
<field name="acctgTransEntrySeqId"><display/></field>
<field name="glAccountId">
<drop-down allow-empty="true">
- <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -635,7 +628,7 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId">
<drop-down allow-empty="false">
- <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
+ <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}" key-field-name="glAccountId">
<entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
@@ -698,7 +691,7 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId">
<drop-down allow-empty="false">
- <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
+ <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}" key-field-name="glAccountId">
<entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=645279&r1=645278&r2=645279&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sun Apr 6 11:23:53 2008
@@ -217,7 +217,6 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="acctgTransId" from-field="parameters.acctgTransId"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/editGlJournalEntry.bsh"/>
- <set field="isPosted" from-field="parameters.isPosted"/>
<entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
<entity-one entity-name="AcctgTransEntry" value-name="acctgTransEntry">
@@ -267,7 +266,7 @@
</section>
<section>
<condition>
- <if-empty field-name="isPosted"/>
+ <if-compare field-name="acctgTrans.isPosted" operator="not-equals" value="Y"/>
</condition>
<widgets>
<container>