svn commit: r759572 - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r759572 - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: jleroux
Date: Sat Mar 28 20:11:02 2009 New Revision: 759572 URL: http://svn.apache.org/viewvc?rev=759572&view=rev Log: Fix some bad changes in previous commit Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.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=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sat Mar 28 20:11:02 2009 @@ -23,7 +23,7 @@ <!-- Invoice forms --> <form name="FindInvoices" type="single" target="findInvoices" title="Find and list invoices" header-row-style="header-row" default-table-style="basic-table"> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="hideSearch"><hidden value="Y"/></field> <field name="invoiceId"><text-find default-option="contains" ignore-case="true"/></field> <field name="description"><text-find default-option="contains" ignore-case="true"/></field> @@ -44,7 +44,7 @@ <field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="ListInvoices" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice" paginate-target="findInvoices" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -68,7 +68,7 @@ <set field="amountToApply" value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId));}"/> <set field="total" value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId));}"/> </row-actions> - + <field name="invoiceId" widget-style="buttontext" sort-field="true"> <hyperlink description="${invoiceId}" target="invoiceOverview?invoiceId=${invoiceId}"/> </field> @@ -141,7 +141,7 @@ <field name="productId" widget-style="linktext"><hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/></field> <field name="overrideGlAccountId" widget-area-style="align-text"><hyperlink target="GlAccountNavigate?glAccountId=${overrideGlAccountId}" description="${overrideGlAccountId}"/></field> </form> - + <form name="invoiceRoles" type="list" use-row-submit="true" title="" list-name="invoiceRoles" paginate-target="invoiceRoles" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <!--auto-fields-entity entity-name="InvoiceRole" default-field-type="display"/--> @@ -183,7 +183,7 @@ <auto-fields-entity entity-name="AcctgTransAndEntries" default-field-type="display"/> <field name="paymentId"><hidden/></field> </form> - + <form name="NewSalesInvoice" type="single" target="createInvoice" title="Edit Invoice Header" default-map-name="invoice" header-row-style="header-row" default-table-style="basic-table"> <field name="statusId"><hidden value="INVOICE_IN_PROCESS"/></field> @@ -194,7 +194,7 @@ <entity-order-by field-name="description"/> </entity-options> </drop-down> - </field> + </field> <field position="1" name="organizationPartyId" parameter-name="partyIdFrom"> <drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyId}"> <entity-options description="${groupName}" entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId"> @@ -217,7 +217,7 @@ <entity-order-by field-name="description"/> </entity-options> </drop-down> - </field> + </field> <field position="1" name="organizationPartyId" parameter-name="partyId"> <drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyId}"> <entity-options description="${groupName}" entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId"> @@ -244,7 +244,7 @@ <entity-order-by field-name="description"/> </entity-options> </drop-down> - </field> + </field> <field name="statusId" use-when="invoice==null"><hidden value="INVOICE_IN_PROCESS"/></field> <field position="2" name="statusId" use-when="invoice!=null"><display-entity entity-name="StatusItem"/></field> <field position="1" name="description"><text size="100"/></field> @@ -290,7 +290,7 @@ <submit button-type="button"/> </field> </form> - + <form name="EditInvoiceItems" type="list" list-name="invoiceItems" default-entity-name="InvoiceItem" target="updateInvoiceItem" title="Edit Invoice Items" paginate-target="listInvoiceItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> @@ -302,9 +302,9 @@ </row-actions> <field name="invoiceId"><hidden/></field> <field name="invoiceItemSeqId" widget-style="buttontext"> - <hyperlink target="listInvoiceItems"> + <hyperlink target="listInvoiceItems" description="${invoiceItemSeqId"> <parameter param-name="invoiceId" from-field="invoiceId"/> - <parameter param-name="invoiceItemSeqId" from-field="invoiceItemSeqId}" description="${invoiceItemSeqId"/> + <parameter param-name="invoiceItemSeqId" from-field="invoiceItemSeqId"/> </hyperlink> </field> <field name="quantity"><text size="3"/></field> @@ -361,7 +361,7 @@ <drop-down allow-empty="true"> <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field position="1" name="amount" title="${uiLabelMap.AccountingUnitPrice}"><text size="10"/></field> @@ -378,7 +378,7 @@ <submit button-type="button"/> </field> </form> - + <form name="ListInvoiceStatus" list-name="invoiceStatus" target="" title="" type="list" paginate-target="ListInvoiceStatus" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="invoiceId"><hidden/></field> @@ -416,7 +416,7 @@ </hyperlink> </field> </form> - + <form name="AddPayment" type="single" target="updateInvoiceApplication" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="invoiceId"><hidden/></field> @@ -442,7 +442,7 @@ </form> <form name="ListPaymentsNotAppliedForeignCurrency" extends="ListPaymentsNotApplied" list-name="paymentsActualCurrency"/> - + <form name="ListInvoiceRoles" type="list" use-row-submit="true" title="" list-name="invoiceRoles" paginate-target="invoiceRoles" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <!--auto-fields-entity entity-name="InvoiceRole" default-field-type="display"/--> @@ -504,9 +504,9 @@ <form name="EditTimeEntries" type="list" list-name="timeEntries" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateTimeEntry" default-field-type="display"/> - + <field name="invoiceId"><hidden/></field> - + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="unlinkInvoiceFromTimeEntry?timeEntryId=${timeEntryId}&invoiceId=${invoiceId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sat Mar 28 20:11:02 2009 @@ -23,7 +23,7 @@ <form name="FindPayments" type="single" target="findPayments" header-row-style="header-row" default-table-style="basic-table"> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="paymentId"><text-find default-option="contains" ignore-case="true"/></field> <field name="comments"><text-find default-option="contains" ignore-case="true"/></field> <field position="1" name="paymentTypeId"> @@ -165,13 +165,13 @@ <submit button-type="button"/> </field> </form> - + <form name="EditPayment" type="single" target="updatePayment" default-map-name="payment"> <actions> <entity-one entity-name="Party" value-field="partyFrom"> <field-map field-name="partyId" from-field="payment.partyIdFrom"/> </entity-one> - <set field="uomId" from-field="partyFrom.preferredCurrencyUomId" default-value="${defaultCurrencyUomId}"/> + <set field="uomId" from-field="partyFrom.preferredCurrencyUomId" default-value="${defaultCurrencyUomId}"/> <entity-one entity-name="StatusItem" value-field="currentStatus"> <field-map field-name="statusId" from-field="payment.statusId"/> </entity-one> @@ -246,7 +246,7 @@ <field name="actualAmount"><ignored/></field> <field position="1" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="editPaymentApplicationsInv" default-entity-name="PaymentApplication" list-name="paymentApplicationsInv" target="updatePaymentApplication" type="list" separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentApplicationId"><hidden/></field> @@ -260,7 +260,7 @@ <field name="amountApplied"><text size="15"/></field> <field name="updateButton" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink description="${uiLabelMap.CommonRemove}" + <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication?paymentApplicationId=${paymentApplicationId}&paymentId=${paymentId}"/> </field> </form> @@ -272,7 +272,7 @@ <field name="amountApplied"><text size="15"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext"> - <hyperlink description="${uiLabelMap.CommonRemove}" + <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication?paymentApplicationId=${paymentApplicationId}&paymentId=${paymentId}"/> </field> </form> @@ -285,7 +285,7 @@ <field name="amountApplied"><text size="15"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext"> - <hyperlink description="${uiLabelMap.CommonRemove}" + <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication?paymentApplicationId=${paymentApplicationId}&paymentId=${paymentId}"/> </field> </form> @@ -304,11 +304,11 @@ <field name="amountApplied"><text size="15"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext"> - <hyperlink description="${uiLabelMap.CommonRemove}" + <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication?paymentApplicationId=${paymentApplicationId}&paymentId=${paymentId}"/> </field> </form> - + <form name="listInvoicesNotApplied" type="list" list-name="invoices" target="updatePaymentApplication" title="" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentId"><hidden/></field> @@ -339,7 +339,7 @@ <submit button-type="button"/> </field> </form> - + <form name="addPaymentApplication" type="single" target="updatePaymentApplication" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="paymentId"><hidden/></field> @@ -394,7 +394,7 @@ <field name="finAccountTransId" position="1"><display/></field> <field name="overrideGlAccountId" position="2"><display/></field> </form> - + <form name="paymentApplications" type="list" list-name="paymentApplications" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -415,9 +415,9 @@ <field name="paymentId"><hidden/></field> <field name="invoiceId" widget-style="buttontext"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field> <field name="invoiceItemSeqId" widget-style="buttontext"> - <hyperlink target="listInvoiceItems"> + <hyperlink target="listInvoiceItems" description="${invoiceItemSeqId"> <parameter param-name="invoiceId" from-field="invoiceId"/> - <parameter param-name="invoiceItemSeqId" from-field="invoiceItemSeqId}" description="${invoiceItemSeqId"/> + <parameter param-name="invoiceItemSeqId" from-field="invoiceItemSeqId"/> </hyperlink> </field> <field name="toPaymentId" widget-style="buttontext"><hyperlink target="paymentOverview?paymentId=${toPaymentId}" description="${toPaymentId}"/></field> Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sat Mar 28 20:11:02 2009 @@ -42,9 +42,9 @@ <field name="contentAssocTypeId"><hidden value="${caContentAssocTypeId}"/></field> <field name="contentTypeId"><hidden/></field> <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"> - <hyperlink target="findForumMessages"> + <hyperlink target="findForumMessages" description="${uiLabelMap.ContentForumMessages"> <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> - <parameter param-name="forumId" from-field="contentId}" description="${uiLabelMap.ContentForumMessages"/> + <parameter param-name="forumId" from-field="contentId"/> </hyperlink> </field> <field name="forumName" entry-name="contentName" parameter-name="contentName"><text/></field> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sat Mar 28 20:11:02 2009 @@ -338,16 +338,18 @@ </hyperlink> </field> <field name="issueLinkAtp" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""${issueTaskId}".equals("${workEffortId}")"> - <hyperlink target="issueProductionRunRoutingTask" also-hidden="false"> + <hyperlink target="issueProductionRunRoutingTask" description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask" also-hidden="false"> <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="productionRunId" from-field="workEffortParentId}&failIfItemsAreNotAvailable=Y" description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask"/> - </hyperlink> + <parameter param-name="productionRunId" from-field="workEffortParentId"/> + <parameter param-name="failIfItemsAreNotAvailable" value="Y"/> + </hyperlink> </field> <field name="issueLinkQoh" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""${issueTaskId}".equals("${workEffortId}")"> - <hyperlink target="issueProductionRunRoutingTask" also-hidden="false"> + <hyperlink target="issueProductionRunRoutingTask" description="${uiLabelMap.ManufacturingIssueProductionRunTask" also-hidden="false"> <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="productionRunId" from-field="workEffortParentId}&failIfItemsAreNotAvailable=N" description="${uiLabelMap.ManufacturingIssueProductionRunTask"/> - </hyperlink> + <parameter param-name="productionRunId" from-field="workEffortParentId"/> + <parameter param-name="failIfItemsAreNotAvailable" value="N"/> + </hyperlink> </field> <field name="declareLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""PRUN_RUNNING".equals("${currentStatusId}")"> <hyperlink target="ProductionRunDeclaration" description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" also-hidden="false"> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sat Mar 28 20:11:02 2009 @@ -60,7 +60,7 @@ <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> - </field> + </field> <field name="existingCustomer"> <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> @@ -115,7 +115,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - + <form name="ViewPartyGroup" type="single" default-map-name="lookupGroup"> <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/> <field name="partyTypeId"><ignored/></field> @@ -126,27 +126,27 @@ <field name="externalId"><display/></field> <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> </form> - + <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson"> <field name="partyId"><display/></field> <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field> - <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field> + <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field> <field name="externalId"><display/></field> <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> </form> - + <form name="ViewPartyPersonHistory" type="list" list-name="partyNameHistoryList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="was" title="${uiLabelMap.PartyHistoryWas}"><display description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix}"/></field> <field name="changed" title="${uiLabelMap.PartyHistoryChanged}"><display description="${changeDate}"/></field> </form> - + <form name="ViewPartyGroupHistory" type="list" list-name="partyNameHistoryList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="was" title="${uiLabelMap.PartyHistoryWas}"><display description="${groupName}"/></field> <field name="changed" title="${uiLabelMap.PartyHistoryChanged}"><display description="${changeDate}"/></field> </form> - + <form name="AddUserLogin" type="single" target="createUserLogin" focus-field-name="userLoginId" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createUserLogin"/> @@ -190,7 +190,7 @@ <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - <form name="EditVendor" type="single" target="updateVendor" default-map-name="vendor" + <form name="EditVendor" type="single" target="updateVendor" default-map-name="vendor" focus-field-name="manifestCompanyName" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="vendor==null" target="createVendor"/> <auto-fields-service service-name="updateVendor" map-name="vendor"/> @@ -487,9 +487,9 @@ <field name="partyId"><hidden value="${partyId}"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - + <!-- Party Content Form --> - + <form name="AddPartyContent" target="updatePartyContent" type="upload" default-map-name="content" focus-field-name="contentTypeId" header-row-style="header-row" default-table-style="basic-table"> <actions> @@ -500,10 +500,10 @@ <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> </actions> - + <alt-target use-when="content==null" target="createPartyContent"/> <!-- <auto-fields-entity entity-name="Content"/> --> - + <field name="partyId" map-name="parameters"><hidden/></field> <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field name="partyContentTypeId"> @@ -512,7 +512,7 @@ </drop-down> </field> <!-- note sure if these two are necessray, but they are kind of confusing in this context: - <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> + <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="dataResourceId"><lookup target-form-name="LookupDataResource"/></field> --> <field name="contentTypeId"> @@ -591,7 +591,7 @@ <parameter param-name="dataResourceId" from-field="dataResourceId"/> </hyperlink> </field> - </form> + </form> <form name="ApplyServiceCredit" type="single" target="applyServiceCredit" default-map-name="serviceCredit" focus-field-name="amount" header-row-style="header-row" default-table-style="basic-table"> @@ -621,17 +621,17 @@ </drop-down> </field> <field name="partyId"><hidden value="${partyId}"/></field> - <field name="finAccountTypeId"><ignored/></field> + <field name="finAccountTypeId"><ignored/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - + <form name="ListCarrierAccounts" type="list" target="updatePartyCarrierAccount" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate="true" view-size="3" paginate-target="viewprofile" paginate-target-anchor="ListCarrierAccounts"> <actions> <entity-condition entity-name="PartyCarrierAccount" list="carrierAccounts" filter-by-date="true"> <condition-expr field-name="partyId" from-field="parameters.partyId"></condition-expr> - <order-by field-name="fromDate"/> + <order-by field-name="fromDate"/> </entity-condition> </actions> <auto-fields-service service-name="updatePartyCarrierAccount"/> @@ -644,7 +644,7 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - + <form name="EditCarrierAccount" type="single" target="createPartyCarrierAccount" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createPartyCarrierAccount"/> @@ -653,15 +653,15 @@ <drop-down allow-empty="false"> <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId"> <entity-constraint name="roleTypeId" operator="equals" value="CARRIER"/> - <entity-constraint name="partyId" operator="not-equals" value="_NA_"/> + <entity-constraint name="partyId" operator="not-equals" value="_NA_"/> </entity-options> </drop-down> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"/> <field name="accountNumber" title="${uiLabelMap.AccountingAccountNumber}" tooltip="${uiLabelMap.CommonRequired}"/> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> - </form> - + </form> + <form name="ListSubscriptions" type="list" list-name="subscriptionList" default-table-style="basic-table"> <field name="subscriptionId"> <display-entity entity-name="Subscription" description="${description}"> @@ -783,8 +783,8 @@ </field> <field name="comments"><text/></field> <field name="submitButton"><submit button-type="button"/></field> - </form> - + </form> + <form name="AddAccount" type="single" target="createPartyRelationship"> <field name="partyId"><hidden value="${parameters.partyId}"/></field> <field name="partyIdFrom"><lookup target-form-name="LookupAccount"/></field> @@ -793,8 +793,8 @@ <field name="roleTypeIdTo"><hidden value="CONTACT"/></field> <field name="partyRelationshipTypeId"><hidden value="EMPLOYMENT"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> - </form> - + </form> + <form name="AddContact" type="single" target="createPartyRelationship"> <field name="partyId"><hidden value="${parameters.partyId}"/></field> <field name="partyIdFrom"><hidden value="${parameters.partyId}"/></field> @@ -804,8 +804,8 @@ <field name="partyRelationshipTypeId"><hidden value="EMPLOYMENT"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - - <form name="ListInvoicesApplPayments" type="list" list-name="ListInvoicesApplPayments" + + <form name="ListInvoicesApplPayments" type="list" list-name="ListInvoicesApplPayments" default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" default-tooltip-style="tabletext"> <actions> @@ -836,7 +836,7 @@ <field name="pmAmount" title="${uiLabelMap.AccountingPaymentAmount}" use-when="actualCurrency==false"><display type="currency" currency="${actualCurrencyUomId}"/></field> <field name="pmAmount" title="${uiLabelMap.AccountingPaymentAmount}" entry-name="pmActualCurrencyAmount" use-when="actualCurrency==true"><display type="currency" currency="${actualCurrencyUomId}"/></field> </form> - <form name="ListUnAppliedInvoices" type="list" list-name="ListUnAppliedInvoices" + <form name="ListUnAppliedInvoices" type="list" list-name="ListUnAppliedInvoices" default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" default-tooltip-style="tabletext"> <actions> @@ -855,7 +855,7 @@ <field name="amount"><display type="currency" currency="${invoiceCurrencyUomId}"/></field> <field name="unAppliedAmount"><display type="currency" currency="${invoiceCurrencyUomId}"/></field> </form> - <form name="ListUnAppliedPayments" type="list" list-name="paymentList" + <form name="ListUnAppliedPayments" type="list" list-name="paymentList" default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" default-tooltip-style="tabletext"> <actions> @@ -895,16 +895,16 @@ <field position="1" name="totalToBeReceived" use-when="finanSummary.get("totalToBeReceived")!=null" title="${uiLabelMap.PartyToBePaidTo} ${parameters.partyId}"><display type="currency" currency="${actualCurrencyUomId}"/></field> </form> <form name="ViewPartyRoles" type="list" list-name="partyRoles" target="viewroles" - default-title-style="tableheadtext" default-widget-style="tabletext" + default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" default-tooltip-style="tabletext"> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field> <field name="description" title="${uiLabelMap.PartyRole}"><display/></field> <field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/></field> <field name="remove"> - <hyperlink target="deleterole"> + <hyperlink target="deleterole" description="${uiLabelMap.CommonRemove"> <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="roleTypeId" from-field="roleTypeId}" description="${uiLabelMap.CommonRemove"/> + <parameter param-name="roleTypeId" from-field="roleTypeId"/> </hyperlink> </field> </form> @@ -924,7 +924,7 @@ <field name="description" title="${uiLabelMap.CommonDescription}" required-field="true"><text/></field> <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - <form name="ListPreference" type="list" target="updatePreference?partyId=${partyId}" list-name="userPreferenceList" + <form name="ListPreference" type="list" target="updatePreference?partyId=${partyId}" list-name="userPreferenceList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true" use-row-submit="true" > <row-actions> <service service-name="getUserPreference" result-map="values"> @@ -948,7 +948,7 @@ </entity-options> </drop-down> </field> - + <field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field> </form> </forms> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sat Mar 28 20:11:02 2009 @@ -18,12 +18,12 @@ under the License. --> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="FindProductConfigItems" type="list" list-name="listIt" + <form name="FindProductConfigItems" type="list" list-name="listIt" default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems" target="" header-row-style="header-row-2" paginate="true"> - <actions> + <actions> <service service-name="performFind" result-map-list="listIt" result-map="performFindResult"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="ProductConfigItem"/> @@ -39,7 +39,7 @@ </field> <field name="description"><display/></field> </form> - <form name="FindProductConfigItemsFrom" type="single" target="FindProductConfigItems" + <form name="FindProductConfigItemsFrom" type="single" target="FindProductConfigItems" default-map-name="productconfigitems" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ProductConfigItem" default-field-type="find"/> <field name="configItemId" title="${uiLabelMap.ProductConfigItem}"/> @@ -48,14 +48,14 @@ <field name="description"/> <field name="longDescription"><hidden/></field> <field name="imageUrl"><hidden/></field> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="EditProductConfigItem" type="single" target="updateProductConfigItem" title="" default-map-name="configItem" header-row-style="header-row" default-table-style="basic-table"> - + <alt-target use-when="configItem==null" target="createProductConfigItem"/> - + <auto-fields-service service-name="updateProductConfigItem"/> <field name="longDescription" title="${uiLabelMap.ProductLongDescription}"><ignored/></field> <field name="imageUrl"><ignored/></field> @@ -68,12 +68,12 @@ <option key="MULTIPLE" description="${uiLabelMap.ProductMultiChoice}"/> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="EditConfigOption" type="list" target="updateProductConfigOption" title="" list-name="configOptionList" list-entry-name="configOption" odd-row-style="alternate-row" default-table-style="basic-table"> - + <auto-fields-service service-name="updateProductConfigOption" map-name="configOption"/> <field use-when="configOption!=null" name="configOptionId"><hidden/></field> <field name="configItemId"><hidden/></field> @@ -104,7 +104,7 @@ <field use-when="productConfigProduct!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- ProdConfItemContent --> <form name="AddProductConfigItemContentAssoc" type="single" target="addContentToProductConfigItem" title="Add ProdConfItemContent (select Content Id, enter From Date):" header-row-style="header-row" default-table-style="basic-table"> @@ -178,8 +178,8 @@ <field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - - <form name="ListProductConfigItem" type="list" list-name="productConfigs" + + <form name="ListProductConfigItem" type="list" list-name="productConfigs" default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems" target="" header-row-style="header-row-2" paginate="true"> <actions> @@ -198,28 +198,28 @@ <field name="productName" title="${uiLabelMap.ProductName}"><display description="${productName}"/></field> <field name="piecesIncluded" title="${uiLabelMap.ProductPiecesIncluded}"><display description="${piecesIncluded}"/></field> </form> - - <form name="ProductConfigOptionList" type="list" list-name="configOptionList" + + <form name="ProductConfigOptionList" type="list" list-name="configOptionList" default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems" target="" header-row-style="header-row-2" paginate="true"> <auto-fields-entity entity-name="ProductConfigOption" default-field-type="display" /> <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.ProductConfigItem}"> - <hyperlink target="EditProductConfigOptions"> + <hyperlink target="EditProductConfigOptions" description="${configOptionId} - ${configOptionName"> <parameter param-name="configItemId" from-field="configItemId"/> - <parameter param-name="configOptionId" from-field="configOptionId}" description="${configOptionId} - ${configOptionName"/> + <parameter param-name="configOptionId" from-field="configOptionId"/> </hyperlink> </field> <field name="configOptionId" ><hidden/></field> <field name="configOptionName" ><hidden/></field> <field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext" > - <hyperlink target="deleteProductConfigOption"> + <hyperlink target="deleteProductConfigOption" description="${uiLabelMap.CommonRemove"> <parameter param-name="configItemId" from-field="configItemId"/> - <parameter param-name="configOptionId" from-field="configOptionId}" description="${uiLabelMap.CommonRemove"/> + <parameter param-name="configOptionId" from-field="configOptionId"/> </hyperlink> </field> </form> - - <form name="ProductConfigList" type="list" list-name="configProducts" + + <form name="ProductConfigList" type="list" list-name="configProducts" default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems" target="" header-row-style="header-row-2" paginate="true"> <row-actions> @@ -245,5 +245,5 @@ <hyperlink> </field> </form> - + </forms> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Sat Mar 28 20:11:02 2009 @@ -38,13 +38,13 @@ <field name="description"><text size="40"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteCommunicationEventWorkEff"> + <hyperlink target="deleteCommunicationEventWorkEff" also-hidden="false" description="${uiLabelMap.CommonDelete"> <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="communicationEventId" from-field="communicationEventId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> </hyperlink> </field> </form> - <form name="AddWorkEffortCommEvent" default-map-name="communicationEvent" target="createWorkEffortCommEvent" title="" type="single" extends="EditCommEvent" + <form name="AddWorkEffortCommEvent" default-map-name="communicationEvent" target="createWorkEffortCommEvent" title="" type="single" extends="EditCommEvent" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="description"><textarea/></field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Mar 28 20:11:02 2009 @@ -48,12 +48,12 @@ <field name="runtimeDataId"><hidden/></field> <field name="recurrenceInfoId"><hidden/></field> </form> - + <form name="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffort" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffort" use-when="workEffort==null"/> <auto-fields-service service-name="updateWorkEffort"/> - + <field name="workEffortId" use-when="workEffort!=null" title="${uiLabelMap.WorkEffortWorkEffortId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field name="workEffortId" use-when="workEffort==null&&workEffortId==null" title="${uiLabelMap.WorkEffortWorkEffortId}"><ignored/></field> <field name="workEffortId" use-when="workEffort==null&&workEffortId!=null" title="${uiLabelMap.WorkEffortWorkEffortId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${workEffortId}]"><display also-hidden="false"/></field> @@ -90,7 +90,7 @@ </drop-down> </field> <field name="percentComplete" position="2"/> - + <field name="priority" position="1"> <drop-down allow-empty="true"> <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> @@ -112,7 +112,7 @@ </entity-options> </drop-down> </field> - + <field name="estimatedStartDate" position="1"/> <field name="estimatedCompletionDate" position="2"/> <field name="actualStartDate" position="1"/> @@ -122,7 +122,7 @@ <entity-options key-field-name="tempExprId" description="${tempExprId}" entity-name="TemporalExpression"/> </drop-down> </field> - + <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> @@ -150,11 +150,11 @@ <field name="reservPersons" position="1"/> <field name="reserv2ndPPPerc" position="1"/> <field name="reservNthPPPerc" position="2"/> - + <field use-when="workEffort==null" name="quickAssignPartyId"><lookup target-form-name="LookupPartyName" default-value="${userLogin.partyId}"/></field> <field use-when="workEffort==null" name="requirementId"><lookup target-form-name="LookupRequirement"/></field> <field name="communicationEventId" map-name="context"><lookup target-form-name="LookupCommEvent"/></field> - + <field name="revisionNumber" use-when="workEffort!=null"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field> @@ -167,7 +167,7 @@ <field name="recurrenceInfoId"><ignored/></field> <field name="runtimeDataId"><ignored/></field> <field name="noteId"><ignored/></field> - + <sort-order> <sort-field name="quickAssignPartyId"/> <sort-field name="workEffortId"/> @@ -185,7 +185,7 @@ <sort-field name="actualCompletionDate"/> </sort-order> </form> - + <form name="FindWorkEffort" default-map-name="workEffort" target="ListWorkEfforts" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <!-- auto-fields-entity entity-name="WorkEffort" default-field-type="find"/--> @@ -254,7 +254,7 @@ </entity-options> </drop-down> </field> - + <field name="workflowPackageId"><ignored/></field> <field name="workflowPackageVersion"><ignored/></field> <field name="workflowProcessId"><ignored/></field> @@ -264,7 +264,7 @@ <field name="runtimeDataId"><ignored/></field> <field name="noteId"><ignored/></field> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> <form name="ListLookupWorkEffort" target="" title="" list-name="listIt" type="list" @@ -285,7 +285,7 @@ <form name="AddWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="createWorkEffortAndAssoc" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <!-- Commenting this field for now as the form widget cannot override useWhen fields from + <!-- Commenting this field for now as the form widget cannot override useWhen fields from the form it is extending (results in two workEffortId fields in the form) <field name="workEffortId"><hidden value=""/></field> --> @@ -354,7 +354,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - + <form name="EditWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffortAndAssoc" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffortAndAssoc" use-when="workEffortAssoc==null"/> @@ -386,8 +386,8 @@ <sort-field name="description"/> </sort-order> </form> - - <form name="ListWorkEfforts" type="list" list-name="listIt" paginate-target="ListWorkEfforts" + + <form name="ListWorkEfforts" type="list" list-name="listIt" paginate-target="ListWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -437,7 +437,7 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffort?workEffortId=${workEffortId}"/> </field> </form> - + <form name="EditWorkEffortParty" default-map-name="workEffortParty" target="updateWorkEffortParty" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffortParty" use-when="workEffortParty==null"/> @@ -517,7 +517,7 @@ </entity-options> </drop-down> </field> - + <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}"> @@ -535,7 +535,7 @@ </entity-options> </drop-down> </field> - + <field name="contactMechTypeId" use-when="commEventContactMechType!=null&&parentCommEventContactMechType==null"> <drop-down> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"> @@ -557,7 +557,7 @@ </entity-options> </drop-down> </field> - + <field name="roleTypeIdFrom" use-when="commEventRoleTypeIdFrom!=null"> <drop-down> <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"> @@ -573,7 +573,7 @@ </drop-down> </field> -<!-- +<!-- <field name="custRequestId"> <lookup size="20" target-form-name="LookupCustRequest"> <sub-hyperlink target="/ordermgr/control/EditRequest?custRequestId=${communicationEvent.custRequestId}" target-type="inter-app" link-style="buttontext"/> @@ -789,7 +789,7 @@ <sub-hyperlink target="EditTimesheet?timesheetId=${timesheetId}" link-style="buttontext" description="${uiLabelMap.WorkEffortTimesheet}:${timesheetId}"/> </lookup> </field> - + <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"> <drop-down no-current-selected-key="STANDARD"> @@ -798,17 +798,17 @@ </entity-options> </drop-down> </field> - + <field name="workEffortId"><hidden/></field> - + <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field> <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field> <field name="invoiceInfo"><display description="${invoiceId}:${invoiceItemSeqId}" also-hidden="false"/></field> - + <field name="comments"><text size="60"/></field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteWorkEffortTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false"> <parameter param-name="workEffortId" from-field="workEffortId"/> @@ -819,10 +819,10 @@ <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createTimeEntry"/> - + <field name="timeEntryId"><ignored/><!-- don't pass, will be sequenced --></field> <field name="timesheetId"><lookup size="10" target-form-name="LookupTimesheet"/></field> - + <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"> <drop-down no-current-selected-key="STANDARD"> @@ -831,12 +831,12 @@ </entity-options> </drop-down> </field> - + <field name="workEffortId"><hidden/></field> - + <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field> <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field> - + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="AddWorkEffortTimeToInvoice" target="addWorkEffortTimeToInvoice" title="" type="single" @@ -852,7 +852,7 @@ <field name="partyId" title="${uiLabelMap.WorkEffortTimeBillToParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.clientPartyId}"/></field> <field name="submitButton" title="${uiLabelMap.PageTitleAddWorkEffortTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- WorkEffort Note --> <form name="ListWorkEffortNotes" type="list" list-name="workEffortNotes" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -869,21 +869,22 @@ </hyperlink> </field> <field name="workEffortId" entity-name="WorkEffort" widget-style="buttontext"> - <hyperlink target="EditWorkEffort?workEffortId=${workEffortId}" also-hidden="false" description="${workEffortId}"/> + <hyperlink target="EditWorkEffort?workEffortId=${workEffortId}" also-hidden="false" description="${workEffortId}"/> </field> <field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field> <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("N")"> - <hyperlink target="updateWorkEffortNote" > + <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPrivate"> <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="noteId" from-field="noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate"/> - </hyperlink> + <parameter param-name="noteId" from-field="noteId"/> + <parameter param-name="internalNote" value="Y"/> + </hyperlink> </field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("Y")"> <hyperlink target="updateWorkEffortNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=N" description="${uiLabelMap.OrderNotesPublic}"/> </field> </form> - + <form name="AddWorkEffortNote" type="single" target="updateWorkEffortNote" title="" default-map-name="workEffortNoteAndData" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="noteId == null" target="createWorkEffortNote"/> @@ -894,7 +895,7 @@ <field name="internalNote" title="${uiLabelMap.WorkEffortInternalNote}"> <drop-down no-current-selected-key=""> <option key="Y" description="${uiLabelMap.CommonYes}"/> - <option key="N" description="${uiLabelMap.CommonNo}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="noteParty"><hidden/></field> @@ -928,7 +929,7 @@ </entity-and> </actions> <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit" /> - <field name="workEffortId"><hidden/></field> + <field name="workEffortId"><hidden/></field> <field name="contentId"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true"> <sub-hyperlink target="/content/control/editContent?contentId=${contentId}" description="${contentId}" link-style="buttontext" target-type="inter-app"/> @@ -980,7 +981,7 @@ </entity-and> </actions> <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit" /> - <field name="workEffortId"><hidden/></field> + <field name="workEffortId"><hidden/></field> <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field> <field name="productId"> <display-entity entity-name="Product" key-field-name="productId" description="${productName}" also-hidden="true"> @@ -1006,7 +1007,7 @@ </hyperlink> </field> </form> - + <!-- WorkEffort Reviews --> <form name="AddWorkEffortReview" target="createWorkEffortReview" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> @@ -1035,12 +1036,12 @@ </entity-and> </actions> <auto-fields-service service-name="updateWorkEffortReview" default-field-type="edit" /> - <field name="workEffortId" widget-style="buttontext"><hidden/></field> + <field name="workEffortId" widget-style="buttontext"><hidden/></field> <field name="userLoginId" widget-style="buttontext"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}" also-hidden="true"> <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="${userLoginId}" link-style="buttontext" target-type="inter-app"/> </display-entity> - </field> + </field> <field name="reviewDate"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}*"> <drop-down> @@ -1075,7 +1076,7 @@ <field-map from-field="workEffortId" field-name="workEffortId" /> </entity-and> </actions> - <field name="workEffortId" widget-style="buttontext"><hidden/></field> + <field name="workEffortId" widget-style="buttontext"><hidden/></field> <field name="keyword" title="${uiLabelMap.WorkEffortKeywords}" ><display/></field> <field name="relevancyWeight" header-link="createWorkEffortKeywords?workEffortId=${workEffortId}" title="${uiLabelMap.ProductReInduceKeywords}" header-link-style="buttontext" ><display/></field> <field name="deleteLink" title="${uiLabelMap.ProductDeleteAllKeywords}" header-link="deleteWorkEffortKeywords?workEffortId=${workEffortId}" widget-style="buttontext" header-link-style="buttontext" > @@ -1128,7 +1129,7 @@ </field> <field name="agreementItemSeqId"> <lookup target-form-name="LookupAgreementItem"/> - </field> + </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListAgreementWorkEffortAppls" type="list" target="updateAgreementWorkEffortAppl" list-name="agreementWorkEffortAppls" @@ -1137,7 +1138,7 @@ <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list="agreementWorkEffortAppls"> <field-map from-field="workEffortId" field-name="workEffortId" /> </entity-and> - </actions> + </actions> <field name="agreementId"> <display-entity entity-name="Agreement" key-field-name="agreementId" also-hidden="true"> <sub-hyperlink target="/accounting/control/FindAgreement?agreementId=${agreementId}" description="${agreementId}" link-style="buttontext" target-type="inter-app"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml Sat Mar 28 20:11:02 2009 @@ -19,7 +19,7 @@ --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - + <form name="ListWorkEffortOrderHeaders" separate-columns="true" target="" title="" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -40,9 +40,9 @@ <field name="orderDate"><display/></field> <field name="grandTotal"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteWorkEffortOrderHeader"> + <hyperlink target="deleteWorkEffortOrderHeader" also-hidden="false" description="${uiLabelMap.CommonDelete"> <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="orderId" from-field="orderId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/> + <parameter param-name="orderId" from-field="orderId"/> </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Sat Mar 28 20:11:02 2009 @@ -19,7 +19,7 @@ --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - + <form name="ListWorkEffortRequirements" separate-columns="true" target="" title="" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -36,13 +36,13 @@ <field name="statusItemDescription"><display/></field> <field name="requirementDescription"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteWorkEffortRequirement"> + <hyperlink target="deleteWorkEffortRequirement" also-hidden="false" description="${uiLabelMap.CommonDelete"> <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="requirementId" from-field="requirementId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/> + <parameter param-name="requirementId" from-field="requirementId"/> </hyperlink> </field> </form> - <form name="AddWorkEffortRequirement" default-map-name="workRequirementFulfillment" target="createWorkEffortRequirement" title="" type="single" extends="EditRequirement" + <form name="AddWorkEffortRequirement" default-map-name="workRequirementFulfillment" target="createWorkEffortRequirement" title="" type="single" extends="EditRequirement" extends-resource="component://order/webapp/ordermgr/requirement/RequirementForms.xml" header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="requirementId"><lookup target-form-name="/ordermgr/control/LookupRequirement"/></field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml Sat Mar 28 20:11:02 2009 @@ -36,9 +36,9 @@ <field name="description"><display/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteShoppingListWorkEffort"> + <hyperlink target="deleteShoppingListWorkEffort" also-hidden="false" description="${uiLabelMap.CommonDelete"> <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="shoppingListId" from-field="shoppingListId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/> + <parameter param-name="shoppingListId" from-field="shoppingListId"/> </hyperlink> </field> </form> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=759572&r1=759571&r2=759572&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sat Mar 28 20:11:02 2009 @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -47,19 +47,19 @@ <field use-when="telResult.get("extension")==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field> <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field> <field name="remove" title="${uiLabelMap.CommonRemove}"> - <hyperlink target="removeResource"> + <hyperlink target="removeResource" description="${uiLabelMap.CommonRemove"> <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="roleTypeId" from-field="roleTypeId}" description="${uiLabelMap.CommonRemove"/> + <parameter param-name="roleTypeId" from-field="roleTypeId"/> </hyperlink> </field> - </form> + </form> <form name="ListBillingHours" type="list" list-name="billingList" paginate-target="ListResourcesBillingHours" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectName"><hyperlink target="projectView?projectId=${projectId}" description="${projectName} [${projectId}]"/></field> <field name="originalActualHours"><display/></field> <field name="actualHours"><display/></field> <field name="actualNonBilledHours"><display/></field> - </form> + </form> <form name="AddResource" type="single" target="addResource" header-row-style="header-row" default-table-style="basic-table"> <field name="PartyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |