Author: hansbak
Date: Fri Jan 7 07:05:59 2011
New Revision: 1056211
URL: http://svn.apache.org/viewvc?rev=1056211&view=rev
Log:
after action return back on the correct page, in invoice, also made the
description field longer and move hidden fields to the top of the form
Modified:
ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1056211&r1=1056210&r2=1056211&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Fri Jan 7
07:05:59 2011
@@ -358,6 +358,8 @@ under the License.
<field name="viewSize"><hidden value="${viewSize}"/></field>
<field name="viewIndex"><hidden value="${viewIndex}"/></field>
<field name="invoiceId"><hidden/></field>
+ <field name="uomId"><hidden/></field>
+ <field name="taxableFlag"><hidden/></field>
<field name="invoiceItemSeqId" widget-style="buttontext">
<hyperlink target="listInvoiceItems"
description="${invoiceItemSeqId}">
<parameter param-name="invoiceId"/>
@@ -371,7 +373,7 @@ under the License.
</drop-down>
</field>
<field name="productId"><lookup target-form-name="LookupProduct"
size="20"/></field>
- <field name="description"><text size="30"/></field>
+ <field name="description"><text size="50"/></field>
<field name="overrideGlAccountId">
<drop-down allow-empty="true">
<list-options list-name="glAccountOrganizationAndClassList"
key-name="glAccountId" description="${glAccountId} ${accountName}"/>
@@ -379,8 +381,6 @@ under the License.
</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>
- <field name="taxableFlag"><hidden/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}"
widget-style="buttontext" ><submit button-type="text-link"/></field>
<field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonRemove}"
target="removeInvoiceItem">
@@ -579,6 +579,8 @@ under the License.
<hyperlink target="unlinkInvoiceFromTimeEntry"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="timeEntryId"/>
<parameter param-name="invoiceId"/>
+ <parameter param-name="viewIndex"/>
+ <parameter param-name="viewSize"/>
</hyperlink>
</field>
</form>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1056211&r1=1056210&r2=1056211&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Fri Jan 7
07:05:59 2011
@@ -418,6 +418,8 @@ under the License.
<screen name="EditInvoiceItems">
<section>
<actions>
+ <set field="viewIndex" from-field="parameters.viewIndex"/>
+ <set field="viewSize" from-field="parameters.viewSize"/>
<set field="titleProperty" value="PageTitleListInvoices"/>
<set field="tabButtonItem" value="listInvoiceItems"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
@@ -463,6 +465,8 @@ under the License.
<screen name="EditInvoiceTimeEntries">
<section>
<actions>
+ <set field="viewIndex" from-field="parameters.viewIndex"/>
+ <set field="viewSize" from-field="parameters.viewSize"/>
<set field="titleProperty"
value="PageTitleListInvoiceTimeEntries"/>
<set field="tabButtonItem" value="EditInvoiceTimeEntries"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
