Author: jacopoc
Date: Tue Feb 23 13:32:04 2010
New Revision: 915336
URL: http://svn.apache.org/viewvc?rev=915336&view=rev
Log:
Added ability to set the transaction date from the "quick create accounting
transaction screen".
Also fixed the position of form fields in the same screen.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/trunk/applications/accounting/widget/GlForms.xml
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=915336&r1=915335&r2=915336&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
Tue Feb 23 13:32:04 2010
@@ -80,7 +80,9 @@
<!-- first, create the AcctgTrans -->
<set-service-fields service-name="createAcctgTrans"
to-map="createAcctgTransParams" map="parameters"/>
- <now-timestamp field="createAcctgTransParams.transactionDate"/>
+ <if-empty field="createAcctgTransParams.transactionDate">
+ <now-timestamp field="createAcctgTransParams.transactionDate"/>
+ </if-empty>
<call-service service-name="createAcctgTrans"
in-map-name="createAcctgTransParams">
<result-to-field result-name="acctgTransId"/>
</call-service>
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=915336&r1=915335&r2=915336&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Tue Feb 23 13:32:04
2010
@@ -455,7 +455,7 @@
<field name="produtId" position="1"><lookup
target-form-name="LookupProduct" size="20" maxlength="20"/></field>
<field name="workEffortId" position="2"><lookup
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
<field name="shipmentId" position="1"><lookup
target-form-name="LookupShipment" size="20" maxlength="20"/></field>
- <field name="fixedAssetId">
+ <field name="fixedAssetId" position="2">
<drop-down allow-empty="true">
<entity-options entity-name="FixedAsset"
description="${fixedAssetId}">
<entity-order-by field-name="fixedAssetId"/>
@@ -497,6 +497,7 @@
</drop-down>
</field>
<field name="amount"><text size="20" maxlength="20"/></field>
+ <field name="transactionDate"><date-time/></field>
<field name="description"><text size="60"/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
button-type="button"/></field>
</form>
