svn commit: r759666 [1/6] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r759666 [1/6] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: jleroux
Date: Sun Mar 29 11:00:00 2009 New Revision: 759666 URL: http://svn.apache.org/viewvc?rev=759666&view=rev Log: 18th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243 In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements This one is huge, with some changes by hand, conversion from tabs to 4 spaces and some trailing spaces (I have activated it AnyEdit plugin following the changes I made in http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions but I wonder if I should not reverse all that - I mean my plugin setting and in wiki -, it's a nightmare!) I did my best on this one, but I'm not sure some typos did not slip in. Anyway, alea jacta est Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/CostForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml ofbiz/trunk/applications/content/widget/forum/BlogForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml ofbiz/trunk/framework/common/widget/PortalPageForms.xml ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml ofbiz/trunk/framework/example/widget/example/ExampleForms.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Sun Mar 29 11:00:00 2009 @@ -79,7 +79,9 @@ <field name="textData" title="${uiLabelMap.AccountingTextData}"><hidden/></field> <field name="description" sort-field="true"></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="cancelAgreement?agreementId=${agreementId}" description="${uiLabelMap.CommonCancel}" also-hidden="false"/> + <hyperlink target="cancelAgreement" description="${uiLabelMap.CommonCancel}" also-hidden="false"> + <parameter param-name="agreementId" from-field="agreementId"/> + </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Sun Mar 29 11:00:00 2009 @@ -18,7 +18,7 @@ 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"> <!-- list all assets in a tabular format --> <form name="ListFixedAssets" type="list" list-name="listIt" paginate-target="ListFixedAssets" @@ -48,13 +48,13 @@ target="ListFixedAssets"> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- create and update a fixed asset --> <form name="EditFixedAsset" type="single" target="updateFixedAsset" title="" default-map-name="fixedAsset" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="fixedAsset==null" target="createFixedAsset"/> <auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/> - + <field use-when="fixedAsset!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="fixedAsset==null&&fixedAssetId==null" name="fixedAssetId"><text size="20" maxlength="20"/></field> <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field> @@ -63,14 +63,14 @@ <drop-down allow-empty="false"> <entity-options entity-name="FixedAssetType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field> <field name="classEnumId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> - <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/> + <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -80,14 +80,14 @@ <drop-down allow-empty="true"> <entity-options entity-name="RoleType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="uomId" title="${uiLabelMap.CommonUom}"> <drop-down allow-empty="true"> <entity-options entity-name="UomAndType" description="[${typeDescription}] ${description}"> <entity-order-by field-name="uomTypeId"/> - </entity-options> + </entity-options> </drop-down> </field> <!--<field name="calendarId"><hidden/></field>--> <!-- not show, can better be maintained by the system --> @@ -95,13 +95,13 @@ <drop-down allow-empty="true"> <entity-options entity-name="TechDataCalendar" description="[${calendarId}] ${description}"> <entity-order-by field-name="calendarId"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="parentFixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> - <field name="locatedAtFacilityId"><lookup target-form-name="LookupFacility"/></field> - <field name="locatedAtLocationSeqId"><lookup target-form-name="LookupFacilityLocation"/></field> - + <field name="locatedAtFacilityId"><lookup target-form-name="LookupFacility"/></field> + <field name="locatedAtLocationSeqId"><lookup target-form-name="LookupFacilityLocation"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -121,7 +121,7 @@ <!-- create and update a product on a fixed asset --> <form name="AddFixedAssetProduct" type="single" target="addFixedAssetProduct" title="" default-map-name="fixedAssetProduct" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="addFixedAssetProduct" map-name="fixedAssetProduct"/> <field name="fixedAssetId"><hidden/></field> @@ -130,21 +130,21 @@ <drop-down allow-empty="true"> <entity-options entity-name="FixedAssetProductType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="quantityUomId"> <drop-down allow-empty="true"> <entity-options entity-name="UomAndType" key-field-name="uomId" description="[${typeDescription}] ${description}"> <entity-order-by field-name="uomTypeId"/> - </entity-options> + </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <!-- TO BE REMOVED + <!-- TO BE REMOVED <form name="listFixedAssetCalendar" type="list" list-name="weeks" target="updateFixedAssetProductCalendar" default-table-style="calendar-table"> <field name="productId"><hidden value="${parameters.productId}"/></field> <field name="week" title="${uiLabelMap.Common${month}} ${year}" widget-area-style="calendarWeek"><display description="${uiLabelMap.CommonWeek} ${week}"/></field> @@ -163,9 +163,9 @@ <field name="Sunday" title="${uiLabelMap.CommonEmptyHeader}"><display/></field> <field name="SundayData" title="${uiLabelMap.CommonSunday}" widget-style="calendarContent"><display/></field> </form> - + <form name="updateFixedAssetCalendar" type="single" target="updateFixedAssetCalendar" title="Update the fixed Asset calendar" default-map-name="fixedAssetCalendar" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="updateFixedAssetCalendar" map-name="parameters"/> <field name="fixedAssetId"><hidden/></field> @@ -200,7 +200,7 @@ <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/> <order-by field-name="fromDate"/> </entity-condition> - </actions> + </actions> <auto-fields-entity entity-name="FixedAssetStdCost"/> <field name="fixedAssetId"><hidden/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> @@ -225,7 +225,7 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="EditFixedAssetStdCost" type="single" target="createFixedAssetStdCost" title="" default-map-name="fixedAssetStdCost" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFixedAssetStdCost" default-field-type="edit"/> <field name="fixedAssetId"><hidden/></field> <field name="fixedAssetStdCostTypeId" title="${uiLabelMap.AccountingFixedAssetStdCostTypeId}"> @@ -265,20 +265,20 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- create a fixed asset Idents--> <form name="AddFixedAssetIdent" type="single" target="createFixedAssetIdent" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createFixedAssetIdent" /> + <auto-fields-service service-name="createFixedAssetIdent" /> <field name="fixedAssetId"><hidden/></field> <field name="fixedAssetIdentTypeId" title="${uiLabelMap.AccountingFixedAssetIdentType}"> <drop-down allow-empty="false"> <entity-options entity-name="FixedAssetIdentType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> - <field name="idValue" title="${uiLabelMap.AccountingFixedAssetIdentIdValue}"><text size="20" maxlength="20"/></field> + <field name="idValue" title="${uiLabelMap.AccountingFixedAssetIdentIdValue}"><text size="20" maxlength="20"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -293,9 +293,9 @@ <auto-fields-service service-name="updateFixedAssetRegistration"/> <field name="fixedAssetId"><hidden/></field> <field name="fromDate"><display/></field> - <field name="registrationNumber" title="${uiLabelMap.AccountingFixedAssetRegNumber}"><text size="20" /></field> - <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20" /></field> - <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="registrationNumber" title="${uiLabelMap.AccountingFixedAssetRegNumber}"><text size="20" /></field> + <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20" /></field> + <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteFixedAssetRegistration?fixedAssetId=${fixedAssetId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> @@ -306,11 +306,11 @@ <!-- create a fixed asset Registration--> <form name="AddFixedAssetRegistration" type="single" target="createFixedAssetRegistration" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createFixedAssetRegistration" /> + <auto-fields-service service-name="createFixedAssetRegistration" /> <field name="fixedAssetId"><hidden/></field> <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20"/></field> <field name="registrationNumber" title="${uiLabelMap.AccountingFixedAssetRegNumber}"><text size="20"/></field> - <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -332,9 +332,9 @@ </field> <field name="productMaintTypeId" ><display-entity entity-name="ProductMaintType"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> - <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field> - <field name="intervalQuantity" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><display/></field> - <field name="intervalUomId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"><display/></field> + <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field> + <field name="intervalQuantity" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><display/></field> + <field name="intervalUomId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"><display/></field> </form> <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaint" title="" @@ -379,7 +379,7 @@ </entity-options> </drop-down> </field> - <field name="intervalQuantity" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><text size="10"/></field> + <field name="intervalQuantity" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><text size="10"/></field> <field name="intervalUomId" position="2" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"> <drop-down allow-empty="true"> <entity-options description="${uiLabelMap.CommonTime}: ${description}" entity-name="Uom" key-field-name="uomId"> @@ -393,7 +393,9 @@ </drop-down> </field> <field name="scheduleWorkEffortId" widget-style="buttontext"> - <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${fixedAssetMaint.scheduleWorkEffortId}" also-hidden="false" description="${fixedAssetMaint.scheduleWorkEffortId}" target-type="inter-app"/> + <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${fixedAssetMaint.scheduleWorkEffortId}" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/> + </hyperlink> </field> <field name="purchaseOrderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -416,7 +418,7 @@ <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId" description="${description}"/> </field> <field name="readingDate"><display/></field> - <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text/></field> + <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text/></field> <field name="maintHistSeqId" title="${uiLabelMap.AccountingFixedAssetMaint}"> <hyperlink target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}" description="${maintHistSeqId}" also-hidden="false"/> @@ -430,18 +432,18 @@ <!-- create a fixed asset meter reading --> <form name="AddFixedAssetMeter" type="single" target="createFixedAssetMeter" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createFixedAssetMeter" /> + <auto-fields-service service-name="createFixedAssetMeter" /> <field name="fixedAssetId"><hidden/></field> <field name="maintHistSeqId" use-when="maintHistSeqId != null"><hidden/></field> <field name="maintHistSeqId" use-when="maintHistSeqId == null"><ignored/></field> - <field name="productMeterTypeId" > + <field name="productMeterTypeId" > <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId"> <entity-order-by field-name="productMeterTypeId"/> </entity-options> </drop-down> </field> - <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text size="20" /></field> + <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text size="20" /></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- List all fixed asset Maintenance Order --> @@ -459,7 +461,9 @@ <field name="fixedAssetId"><hidden/></field> <field name="maintHistSeqId"><hidden/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" also-hidden="false" description="${orderId}" target-type="inter-app"/> + <hyperlink target="/ordermgr/control/orderview" also-hidden="false" description="${orderId}" target-type="inter-app"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="orderItemSeqId"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -476,7 +480,7 @@ <field name="orderItemSeqId"><text size="20" /></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- =====================Party Fixed Asset Assignment Forms============== --> <form name="ListPartyFixedAssetAssignments" type="list" list-name="listPartyFixedAssets" target="updatePartyFixedAssetAssignment" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> @@ -486,11 +490,13 @@ <order-by field-name="fromDate" /> </entity-condition> </actions> - <auto-fields-service service-name="updatePartyFixedAssetAssignment"/> + <auto-fields-service service-name="updatePartyFixedAssetAssignment"/> <field name="fixedAssetId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="roleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}"><display/></field> @@ -514,7 +520,7 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - + <form name="AddPartyFixedAssetAssignment" type="single" target="createPartyFixedAssetAssignment" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createPartyFixedAssetAssignment"/> 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=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sun Mar 29 11:00:00 2009 @@ -77,10 +77,14 @@ <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"/></field> <field name="description" sort-field="true"><display/></field> <field name="partyIdFrom" sort-field="true"> - <hyperlink target="/partymgr/control/PartyFinancialHistory?partyId=${partyIdFrom}" target-type="inter-app" description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/> + <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultFrom.fullName} [${partyIdFrom}]"> + <parameter param-name="partyId" from-field="partyIdFrom"/> + </hyperlink> </field> <field name="partyIdTo" parameter-name="partyId"> - <hyperlink target="/partymgr/control/PartyFinancialHistory?partyId=${partyId}" target-type="inter-app" description="${partyNameResultTo.fullName} [${partyId}]"/> + <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultTo.fullName} [${partyId}]"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> @@ -109,15 +113,15 @@ <field position="1" name="description"><display/></field> <field position="2" name="invoiceMessage"><display/></field> <field position="1" name="partyIdFrom"> - <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]"> - <parameter param-name="partyId" from-field="invoice.partyIdFrom"/> - </hyperlink> - </field> + <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]"> + <parameter param-name="partyId" from-field="invoice.partyIdFrom"/> + </hyperlink> + </field> <field position="2" name="partyIdTo" entry-name="partyId"> - <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${invoice.partyId}]"> - <parameter param-name="partyId" from-field="invoice.partyId"/> - </hyperlink> - </field> + <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${invoice.partyId}]"> + <parameter param-name="partyId" from-field="invoice.partyId"/> + </hyperlink> + </field> <field position="1" name="roleTypeId"><display/></field> <field position="2" name="billingAccountId"><display/></field> <field position="1" name="invoiceDate"><display description="${bsh:if(invoice.get("invoiceDate")!=null)return(invoice.getString("invoiceDate").substring(0,10));}"/></field> @@ -142,19 +146,19 @@ <field name="invoiceItemSeqId"><display/></field> <field name="invoiceItemTypeId"><display-entity description="${description}" entity-name="InvoiceItemType"/></field> <field name="orderId" widget-style="linktext"> - <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}"> - <parameter param-name="orderId" from-field="orderId"/> - </hyperlink> - </field> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> + </field> <field name="inventoryItemId" widget-area-style="align-text"><display/></field> <field name="quantity" widget-area-style="align-text"><display/></field> <field name="amount" title="${uiLabelMap.AccountingUnitPrice}" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field> <field name="total"><display type="currency" currency="${invoice.currencyUomId}"/></field> <field name="productId" widget-style="linktext"> - <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> - <parameter param-name="productId" from-field="productId"/> - </hyperlink> - </field> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> + </field> <field name="overrideGlAccountId" widget-area-style="align-text"><hyperlink target="GlAccountNavigate?glAccountId=${overrideGlAccountId}" description="${overrideGlAccountId}"/></field> </form> @@ -539,18 +543,22 @@ <field name="invoiceItemSeqId"><display/></field> <field name="timeEntryId"><display/></field> <field name="timesheetId" entry-name="timesheet.timesheetId"> - <hyperlink target="/workeffort/control/EditTimesheet" target-type="inter-app" description="${timesheetId}"> - <parameter param-name="timesheetId" from-field="timesheetId"/> - </hyperlink> - </field> + <hyperlink target="/workeffort/control/EditTimesheet" target-type="inter-app" description="${timesheetId}"> + <parameter param-name="timesheetId" from-field="timesheetId"/> + </hyperlink> + </field> <field name="partyId" entry-name="partyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description=" [${partyId}]"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description=" [${partyId}]"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="timesheetPartyId" entry-name="timesheet.partyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${timesheet.partyId}" target-type="inter-app" description=" [${timesheet.partyId}]"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description=" [${timesheet.partyId}]"> + <parameter param-name="partyId" from-field="timesheet.partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="hours"><display/></field> 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=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sun Mar 29 11:00:00 2009 @@ -67,12 +67,16 @@ <field name="comments"><display/></field> <field name="partyIdFrom"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdFrom}" target-type="inter-app" description="[${partyIdFrom}]" /> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]" > + <parameter param-name="partyId" from-field="partyIdFrom"/> + </sub-hyperlink> </display-entity> </field> <field name="partyIdTo"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdTo}" target-type="inter-app" description="[${partyIdTo}]" /> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]" > + <parameter param-name="partyId" from-field="partyIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="effectiveDate"><display/></field> @@ -383,15 +387,15 @@ <field name="statusId" position="1"><display-entity entity-name="StatusItem"/></field> <field name="paymentMethodId" position="2"><display-entity entity-name="PaymentMethod" description="${paymentMethodId}[${paymentMethodTypeId}]"/></field> <field name="partyIdFrom" position="1"> - <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]"> - <parameter param-name="partyId" from-field="payment.partyIdFrom"/> - </hyperlink> - </field> + <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]"> + <parameter param-name="partyId" from-field="payment.partyIdFrom"/> + </hyperlink> + </field> <field name="partyIdTo" position="2"> - <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${payment.partyIdTo}]"> - <parameter param-name="partyId" from-field="payment.partyIdTo"/> - </hyperlink> - </field> + <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${payment.partyIdTo}]"> + <parameter param-name="partyId" from-field="payment.partyIdTo"/> + </hyperlink> + </field> <field name="paymentRefNum" position="1"><display/></field> <field name="paymentPreferenceId" position="2"><display/></field> <field name="amount" position="1"><display type="currency" currency="${payment.currencyUomId}"/></field> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Sun Mar 29 11:00:00 2009 @@ -18,7 +18,7 @@ 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="ListBillingAccounts" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount" default-entity-name="BillingAccount" @@ -50,7 +50,7 @@ </form> <form name="ListBillingAccountInvoices" type="list" list-name="billingAccountInvoices" paginate-target="BillingAccountInvoices" default-entity-name="Invoice" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="Invoice" list="billingAccountInvoices"> <condition-list> @@ -108,15 +108,15 @@ <alt-target use-when="billingAccount==null" target="createBillingAccount"/> <auto-fields-service service-name="updateBillingAccount" map-name="billingAccount"/> - <field name="description"><text size="60"/></field> - + <field name="description"><text size="60"/></field> + <field use-when="billingAccount!=null" name="billingAccountId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="partyId != null" name="partyId"><hidden/></field> <field use-when="roleTypeId != null" name="roleTypeId"><hidden/></field> <field name="partyId" use-when="partyId == null" title="${uiLabelMap.AccountingPartyBilledTo}"><lookup target-form-name="LookupPartyName"/></field> <field use-when="roleTypeId == null" name="roleTypeId"><hidden value="BILL_TO_CUSTOMER"/></field> - + <field name="accountCurrencyUomId"> <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}"> <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> @@ -154,20 +154,22 @@ <order-by field-name="roleTypeId"/> </entity-condition> </actions> - + <auto-fields-service service-name="updateBillingAccountRole" default-field-type="edit"/> <field name="billingAccountId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"> <display-entity entity-name="RoleType" description="${description}"/> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></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="deleteBillingAccountRole?billingAccountId=${billingAccountId}&roleTypeId=${roleTypeId}&partyId=${partyId}&fromDate=${fromDate}" @@ -175,7 +177,7 @@ </field> </form> <form name="AddBillingAccountRole" type="single" target="createBillingAccountRole" title="" default-map-name="billingAccountRole" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createBillingAccountRole"/> <field name="billingAccountId"><hidden/></field> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"> @@ -303,8 +305,10 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="billingAccountId"><hidden/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" also-hidden="false"/> - </field> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" also-hidden="false"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> + </field> <field name="orderDate"><display/></field> <field name="paymentMethodTypeId" title="${uiLabelMap.CommonType}"> <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/> Modified: ofbiz/trunk/applications/accounting/widget/CostForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CostForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CostForms.xml Sun Mar 29 11:00:00 2009 @@ -37,7 +37,9 @@ <field name="updateCostComponentCalc" title="${uiLabelMap.CommonUpdate}"><submit/></field> <field name="costCustomMethodId"><display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description}"/></field> <field name="deleteCostComponentCalc" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteCostComponentCalc?costComponentCalcId=${costComponentCalcId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteCostComponentCalc" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="costComponentCalcId" from-field="costComponentCalcId"/> + </hyperlink> </field> </form> <form name="AddCostComponentCalc" type="single" target="createCostComponentCalc" Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Sun Mar 29 11:00:00 2009 @@ -51,7 +51,9 @@ <field name="finAccountId"> <hyperlink description="${finAccountId}" target="EditFinAccount?finAccountId=${finAccountId}"/> </field> <field name="finAccountTypeId"><display-entity entity-name="FinAccountType" description="${description}"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteFinAccount?finAccountId=${finAccountId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteFinAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="finAccountId" from-field="finAccountId"/> + </hyperlink> </field> </form> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |