svn commit: r828868 [1/2] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r828868 [1/2] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: buscob
Date: Thu Oct 22 21:57:30 2009 New Revision: 828868 URL: http://svn.apache.org/viewvc?rev=828868&view=rev Log: Part of OFBIZ-3067 - Menus and form widget files location Accounting component Moved forms from webapp to widget folder Added: ofbiz/trunk/applications/accounting/widget/AgreementForms.xml - copied unchanged from r828854, ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml - copied unchanged from r828854, ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml - copied, changed from r828854, ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml - copied unchanged from r828854, ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/PaymentForms.xml - copied, changed from r828854, ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Removed: 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/lookup/FieldLookupForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/LookupScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Thu Oct 22 21:57:30 2009 @@ -88,10 +88,10 @@ </container> </decorator-section> <decorator-section name="search-options"> - <include-form name="FindAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="FindAgreements" location="component://accounting/widget/AgreementForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreements" location="component://accounting/widget/AgreementForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -128,7 +128,7 @@ </widgets> </section> <screenlet title="${uiLabelMap.PageTitleEditAgreement}"> - <include-form name="EditAgreement" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreement" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> <platform-specific> <html><html-template location="component://accounting/webapp/accounting/agreement/CopyAgreement.ftl"/></html> @@ -159,7 +159,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleListAgreementItems}"> - <include-form name="ListAgreementItems" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementItems" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -188,7 +188,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleEditAgreementItem}"> - <include-form name="EditAgreementItem" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreementItem" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -209,9 +209,9 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <screenlet id="AgreementTermPanel" title="${uiLabelMap.PageTitleEditAgreementTerm}" collapsible="true"> - <include-form name="AddAgreementTerm" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="AddAgreementTerm" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> - <include-form name="ListAgreementTerms" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementTerms" location="component://accounting/widget/AgreementForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -243,7 +243,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleListAgreementPromoAppls}"> - <include-form name="ListAgreementPromoAppls" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementPromoAppls" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -273,7 +273,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleEditAgreementPromoAppl}"> - <include-form name="EditAgreementPromoAppl" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreementPromoAppl" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -305,7 +305,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleListAgreementItemTerms}"> - <include-form name="ListAgreementItemTerms" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementItemTerms" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -336,7 +336,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleEditAgreementItemTerm}"> - <include-form name="EditAgreementItemTerm" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreementItemTerm" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -371,7 +371,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleListAgreementItemProducts}"> - <include-form name="ListAgreementItemProducts" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementItemProducts" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -397,13 +397,13 @@ <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingAgreement}"> - <include-form name="ViewAgreementInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ViewAgreementInfoForReport" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingAgreementItem}"> - <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingAgreementItemProductsForReport}"> - <include-form name="ListAgreementItemProductsForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementItemProductsForReport" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -435,7 +435,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleEditAgreementItemProduct}"> - <include-form name="EditAgreementItemProduct" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreementItemProduct" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -470,7 +470,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleListAgreementItemProducts}"> - <include-form name="ListAgreementItemSupplierProducts" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementItemSupplierProducts" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -496,13 +496,13 @@ <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingAgreement}"> - <include-form name="ViewAgreementInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ViewAgreementInfoForReport" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingAgreementItem}"> - <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingAgreementItemSupplierProductsForReport}"> - <include-form name="ListAgreementItemSupplierProductsForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementItemSupplierProductsForReport" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -541,7 +541,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleEditAgreementItemProduct}"> - <include-form name="EditAgreementItemSupplierProduct" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreementItemSupplierProduct" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -583,7 +583,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleListAgreementItemParties}"> - <include-form name="ListAgreementItemParties" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementItemParties" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -614,7 +614,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleEditAgreementItemParty}"> - <include-form name="EditAgreementItemParty" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreementItemParty" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -645,7 +645,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleListAgreementGeographicalApplic}"> - <include-form name="ListAgreementGeographicalApplic" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementGeographicalApplic" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -676,7 +676,7 @@ </link> </container> <screenlet title="${uiLabelMap.PageTitleEditAgreementGeographicalApplic}"> - <include-form name="EditAgreementGeographicalApplic" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="EditAgreementGeographicalApplic" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -696,9 +696,9 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <screenlet id="AgreementWorkEffortApplsPanel" title="${uiLabelMap.AccountingAddAgreementWorkEffortAppl}" collapsible="true"> - <include-form name="AddAgreementWorkEffortAppl" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="AddAgreementWorkEffortAppl" location="component://accounting/widget/AgreementForms.xml"/> </screenlet> - <include-form name="ListAgreementWorkEffortAppls" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementWorkEffortAppls" location="component://accounting/widget/AgreementForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -718,11 +718,11 @@ <screenlet id="add-agreement-roles" title="${uiLabelMap.PageTitleAddAgreementRoles}" collapsible="true"> <section> <widgets> - <include-form name="AddAgreementRole" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="AddAgreementRole" location="component://accounting/widget/AgreementForms.xml"/> </widgets> </section> </screenlet> - <include-form name="ListAgreementRoles" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/> + <include-form name="ListAgreementRoles" location="component://accounting/widget/AgreementForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Thu Oct 22 21:57:30 2009 @@ -201,7 +201,7 @@ <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}"> <decorator-section name="body"> <screenlet id="BillingAccountInvoicePanel" title="${uiLabelMap.AccountingFindInvoices}" collapsible="true"> - <include-form name="lookupInvoicesStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="lookupInvoicesStatus" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <include-form name="ListBillingAccountInvoices" location="component://accounting/widget/BillingAccountForms.xml"/> </decorator-section> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Thu Oct 22 21:57:30 2009 @@ -353,7 +353,7 @@ </field> </form> <form name="EditDepositPayment" extends="EditPayment" - extends-resource="component://accounting/webapp/accounting/payment/PaymentForms.xml" target="createDepositPayment"> + extends-resource="component://accounting/widget/PaymentForms.xml" target="createDepositPayment"> <actions> <entity-one entity-name="FinAccount" value-field="finAccount"/> <set field="finAccountTypeId" from-field="finAccount.finAccountTypeId"/> Copied: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (from r828854, ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?p2=ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml&p1=ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml&r1=828854&r2=828868&rev=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Thu Oct 22 21:57:30 2009 @@ -50,7 +50,7 @@ <on-event-update-area event-type="paginate" area-id="search-results" area-target="FixedAssetSearchResults"/> </form> - <form name="FindFixedAssetOptions" extends="lookupFixedAsset" extends-resource="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" + <form name="FindFixedAssetOptions" extends="lookupFixedAsset" extends-resource="component://accounting/widget/FieldLookupForms.xml" target="ListFixedAssets"> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Oct 22 21:57:30 2009 @@ -44,7 +44,7 @@ </section> </decorator-section> <decorator-section name="search-options"> - <include-form name="FindFixedAssetOptions" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="FindFixedAssetOptions" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> <decorator-section name="search-results"> <include-screen name="FixedAssetSearchResults"/> @@ -66,7 +66,7 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> - <include-form name="ListFixedAssets" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssets" location="component://accounting/widget/FixedAssetForms.xml"/> </widgets> </section> </screen> @@ -140,7 +140,7 @@ <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/></container> </widgets> </section> - <include-form name="EditFixedAsset" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="EditFixedAsset" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -168,9 +168,9 @@ <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> <screenlet id="add-fixedasset-product" title="${uiLabelMap.AccountingFixedAssetProductAdd}" collapsible="true"> - <include-form name="AddFixedAssetProduct" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="AddFixedAssetProduct" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <include-form name="ListFixedAssetProducts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssetProducts" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -188,7 +188,7 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <include-form name="WorkEffortSummary" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="WorkEffortSummary" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -210,9 +210,9 @@ <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> <screenlet id="add-fixed-asset-std-cost" title="${uiLabelMap.AccountingAddFixedAssetStdCost}" collapsible="true"> - <include-form name="EditFixedAssetStdCost" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="EditFixedAssetStdCost" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <include-form name="ListFixedAssetStdCosts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssetStdCosts" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -234,9 +234,9 @@ <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> <screenlet id="edit-fixed-asset-idents" title="${uiLabelMap.AccountingAddFixedAssetIdent}" collapsible="true"> - <include-form name="AddFixedAssetIdent" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="AddFixedAssetIdent" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <include-form name="ListFixedAssetIdents" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssetIdents" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -308,9 +308,9 @@ <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> <screenlet id="add-fixed-asset-registration" title="${uiLabelMap.AccountingAddFixedAssetRegistration}" collapsible="true"> - <include-form name="AddFixedAssetRegistration" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="AddFixedAssetRegistration" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <include-form name="ListFixedAssetRegistrations" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssetRegistrations" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -357,7 +357,7 @@ <parameter param-name="fixedAssetId"/> </link> </container> - <include-form name="ListFixedAssetMaints" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssetMaints" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -398,7 +398,7 @@ </container> </widgets> </section> - <include-form name="EditFixedAssetMaint" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="EditFixedAssetMaint" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -421,9 +421,9 @@ <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.fixedAssetMaintDecoratorLocation}"> <decorator-section name="body"> <screenlet id="add-fixedasset-meter" title="${uiLabelMap.AccountingAddFixedAssetMeter}" collapsible="true"> - <include-form name="AddFixedAssetMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="AddFixedAssetMeter" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <include-form name="ListFixedAssetMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssetMeters" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -471,9 +471,9 @@ <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.fixedAssetMaintDecoratorLocation}"> <decorator-section name="body"> <screenlet id="add-fixedasset-maint-order" title="${uiLabelMap.AccountingAddFixedAssetMaintOrder}" collapsible="true"> - <include-form name="AddFixedAssetMaintOrder" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="AddFixedAssetMaintOrder" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <include-form name="ListFixedAssetMaintOrders" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListFixedAssetMaintOrders" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -497,9 +497,9 @@ <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> <screenlet id="add-party-fixedasset-assignments" title="${uiLabelMap.AccountingAddFixedAssetPartyAssignment}" collapsible="true"> - <include-form name="AddPartyFixedAssetAssignment" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="AddPartyFixedAssetAssignment" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <include-form name="ListPartyFixedAssetAssignments" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <include-form name="ListPartyFixedAssetAssignments" location="component://accounting/widget/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Thu Oct 22 21:57:30 2009 @@ -391,7 +391,7 @@ <condition><if-has-permission permission="ACCOUNTING" action="_PRINT_CHECKS"/></condition> <widgets> <screenlet title="${uiLabelMap.AccountingPrintChecks}"> - <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="ListChecksToPrint" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -433,7 +433,7 @@ <condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition> <widgets> <screenlet title="${uiLabelMap.AccountingSendChecks}"> - <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="ListChecksToSend" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> <fail-widgets> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Thu Oct 22 21:57:30 2009 @@ -77,10 +77,10 @@ <container style="clear"/> </decorator-section> <decorator-section name="search-options"> - <include-form name="FindInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="FindInvoices" location="component://accounting/widget/InvoiceForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoices" location="component://accounting/widget/InvoiceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -103,10 +103,10 @@ <section> <widgets> <screenlet title="${uiLabelMap.AccountingCreateNewSalesInvoice}"> - <include-form name="NewSalesInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="NewSalesInvoice" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingCreateNewPurchaseInvoice}"> - <include-form name="NewPurchaseInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="NewPurchaseInvoice" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </widgets> </section> @@ -136,12 +136,12 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleEditInvoice}"> - <include-form name="EditInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="EditInvoice" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PageTitleEditInvoice}"> - <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </fail-widgets> </section> @@ -196,18 +196,18 @@ <link target="editInvoice" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="invoiceId"/> </link> - <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <container style="lefthalf"> <screenlet title="${uiLabelMap.AccountingInvoiceStatus}" navigation-form-name="ListInvoiceStatus"> - <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceStatus" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}" navigation-form-name="ListInvoiceApplications"> <link target="editInvoiceApplications" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="invoiceId"/> </link> - <include-form name="ListInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </container> <container style="righthalf"> @@ -217,11 +217,11 @@ <parameter param-name="invoiceId"/> </link> </container> - <include-form name="invoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="invoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyTerms}"> - <include-form name="ListInvoiceTerms" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - <include-form name="ListInvoicePaymentInfo" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="ListInvoicePaymentInfo" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </container> <container style="clear"/> @@ -229,7 +229,7 @@ <link target="listInvoiceItems" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="invoiceId"/> </link> - <include-form name="invoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="invoiceItems" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <section> <condition> @@ -240,39 +240,39 @@ <link target="editInvoiceTimeEntries" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="invoiceId"/> </link> - <include-form name="ListTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListTimeEntries" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> - <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="AcctgTransAndEntries" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.AccountingInvoiceHeader}"> - <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <container style="lefthalf"> <screenlet title="${uiLabelMap.AccountingInvoiceStatus}" navigation-form-name="ListInvoiceStatus"> - <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceStatus" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}" navigation-form-name="ListInvoiceApplications"> - <include-form name="ListInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </container> <container style="righthalf"> <screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="invoiceRoles"> - <include-form name="invoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="invoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyTerms}"> - <include-form name="ListInvoiceTerms" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - <include-form name="ListInvoicePaymentInfo" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="ListInvoicePaymentInfo" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </container> <container style="clear"/> <screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="invoiceItems"> - <include-form name="invoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="invoiceItems" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <section> <condition> @@ -280,12 +280,12 @@ </condition> <widgets> <screenlet title="${uiLabelMap.AccountingInvoiceTimeEntries}" navigation-form-name="ListTimeEntries"> - <include-form name="ListTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListTimeEntries" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> - <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="AcctgTransAndEntries" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </fail-widgets> </section> @@ -311,7 +311,7 @@ <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingInvoiceStatusHistory}"> - <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceStatus" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -342,7 +342,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"> - <include-form name="EditInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="EditInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <section> <condition> @@ -366,7 +366,7 @@ <not><if-empty field="payments"/></not> </condition> <widgets> - <include-form name="ListPaymentsNotApplied" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListPaymentsNotApplied" location="component://accounting/widget/InvoiceForms.xml"/> </widgets> </section> <section> @@ -374,19 +374,19 @@ <not><if-empty field="paymentsActualCurrency"/></not> </condition> <widgets> - <include-form name="ListPaymentsNotAppliedForeignCurrency" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListPaymentsNotAppliedForeignCurrency" location="component://accounting/widget/InvoiceForms.xml"/> </widgets> </section> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.AccountingAssignPaymentToInvoice}"> - <include-form name="AddPayment" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="AddPayment" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"> - <include-form name="EditInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="EditInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <section> <condition> @@ -428,7 +428,7 @@ <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingInvoiceItems}"> - <include-form name="EditInvoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="EditInvoiceItems" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingInvoiceItemAdd}"> <section> @@ -436,7 +436,7 @@ <not><if-compare field="invoice.invoiceTypeId" operator="equals" value="PAYROL_INVOICE"/></not> </condition> <widgets> - <include-form name="EditInvoiceItem" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="EditInvoiceItem" location="component://accounting/widget/InvoiceForms.xml"/> </widgets> <fail-widgets> <platform-specific><html><html-template location="component://accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl"/></html></platform-specific> @@ -465,7 +465,7 @@ <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingInvoiceTimeEntries}"> - <include-form name="EditTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="EditTimeEntries" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -489,9 +489,9 @@ <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> <screenlet id="PartyInvoiceRolePanel" title="${uiLabelMap.AccountingPartyRoleAdd}" collapsible="true"> - <include-form name="EditInvoiceRole" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="EditInvoiceRole" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> - <include-form name="ListInvoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListInvoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -510,7 +510,7 @@ <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.CommonSendPerEmail}"> - <include-form name="SendPerEmail" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="SendPerEmail" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -545,7 +545,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.PageTitleListInvoices}" navigation-form-name="ListInvoices"> - <include-form name="ListCustomerInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + <include-form name="ListCustomerInvoices" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </widgets> </section> Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Thu Oct 22 21:57:30 2009 @@ -37,10 +37,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -63,10 +63,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -87,10 +87,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -115,10 +115,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupBillingAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listBillingAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -142,10 +142,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -167,10 +167,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupAgreement" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupAgreement" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listAgreements" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listAgreements" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -192,10 +192,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupAgreementItem" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupAgreementItem" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listAgreementItems" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listAgreementItems" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -217,10 +217,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPaymentGroupMember" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="lookupPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listPaymentGroupMember" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> + <include-form name="listPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Copied: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (from r828854, ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?p2=ofbiz/trunk/applications/accounting/widget/PaymentForms.xml&p1=ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml&r1=828854&r2=828868&rev=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Thu Oct 22 21:57:30 2009 @@ -485,7 +485,7 @@ <field name="amountApplied"><display type="currency" currency="${payment.currencyUomId}"/></field> </form> - <form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries" extends="AcctgTransAndEntries" extends-resource="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"> + <form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries" extends="AcctgTransAndEntries" extends-resource="component://accounting/widget/InvoiceForms.xml"> <field name="paymentId"><hidden/></field> <field name="invoiceId"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field> </form> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Thu Oct 22 21:57:30 2009 @@ -71,10 +71,10 @@ </container> </decorator-section> <decorator-section name="search-options"> - <include-form name="FindPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="FindPayments" location="component://accounting/widget/PaymentForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="ListPayments" location="component://accounting/widget/PaymentForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -99,10 +99,10 @@ <section> <widgets> <screenlet title="${uiLabelMap.AccountingNewPaymentIncoming}"> - <include-form name="NewPaymentIn" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="NewPaymentIn" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.AccountingNewPaymentOutgoing}"> - <include-form name="NewPaymentOut" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="NewPaymentOut" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> @@ -127,7 +127,7 @@ <section> <widgets> <screenlet title="${uiLabelMap.AccountingInvoiceHeaderDetailedInformation}"> - <include-form name="EditPayment" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="EditPayment" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> @@ -210,7 +210,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.AccountingPayment} ${uiLabelMap.AccountingApplications}"> - <include-form name="editPaymentApplicationsInv" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="editPaymentApplicationsInv" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> @@ -229,7 +229,7 @@ <not><if-empty field="paymentApplicationsPay"/></not> </condition> <widgets> - <include-form name="editPaymentApplicationsPay" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="editPaymentApplicationsPay" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> <section> @@ -237,7 +237,7 @@ <not><if-empty field="paymentApplicationsBil"/></not> </condition> <widgets> - <include-form name="editPaymentApplicationsBil" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="editPaymentApplicationsBil" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> <section> @@ -245,7 +245,7 @@ <not><if-empty field="paymentApplicationsTax"/></not> </condition> <widgets> - <include-form name="editPaymentApplicationsTax" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="editPaymentApplicationsTax" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> </screenlet> @@ -276,7 +276,7 @@ <not><if-empty field="invoices"/></not> </condition> <widgets> - <include-form name="listInvoicesNotApplied" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="listInvoicesNotApplied" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> <section> @@ -285,7 +285,7 @@ </condition> <widgets> <label style="h2" text="${uiLabelMap.FormFieldTitle_otherCurrency}"/> - <include-form name="listInvoicesNotAppliedOtherCurrency" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="listInvoicesNotAppliedOtherCurrency" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> </screenlet> @@ -301,12 +301,12 @@ <label style="h2" text="${uiLabelMap.CommonFrom}: ${partyNameViewTo.groupName}${partyNameViewTo.lastName},${partyNameViewTo.firstName} ${partyNameViewTo.middleName}[${payment.partyIdTo}]"/> <label style="h2" text="${uiLabelMap.CommonTo}: ${partyNameViewFrom.groupName}${partyNameViewFrom.lastName},${partyNameViewFrom.firstName} ${partyNameViewFrom.middleName} [${payment.partyIdFrom}]"/> </container> - <include-form name="listPaymentsNotApplied" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="listPaymentsNotApplied" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.AccountingApplyPaymentoTo}"> - <include-form name="addPaymentApplication" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="addPaymentApplication" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> @@ -346,7 +346,7 @@ <link target="editPayment" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="paymentId"/> </link> - <include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="paymentHeader" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </container> <container style="righthalf"> @@ -354,7 +354,7 @@ <link target="editPaymentApplications" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="paymentId"/> </link> - <include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="paymentApplications" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> <section> <condition> @@ -362,25 +362,25 @@ </condition> <widgets> <screenlet title="${uiLabelMap.AccountingFinAccountTransaction}"> - <include-form name="FinAccountTransAssociatedWithPayment" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="FinAccountTransAssociatedWithPayment" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> </container> <container style="clear"/> <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> - <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="AcctgTransAndEntries" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> <fail-widgets> <container style="lefthalf"> <screenlet title="${uiLabelMap.AccountingPaymentHeader}"> - <include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="paymentHeader" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </container> <container style="righthalf"> <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}"> - <include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="paymentApplications" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> <section> <condition> @@ -388,14 +388,14 @@ </condition> <widgets> <screenlet title="${uiLabelMap.AccountingFinAccountTransaction}"> - <include-form name="FinAccountTransAssociatedWithPayment" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="FinAccountTransAssociatedWithPayment" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> </container> <container style="clear"/> <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> - <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="AcctgTransAndEntries" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </fail-widgets> </section> @@ -481,7 +481,7 @@ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"> - <include-form name="FindSalesInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="FindSalesInvoicesByDueDate" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> <section> <condition> @@ -489,7 +489,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"> - <include-form name="ListInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="ListInvoicesByDueDate" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> @@ -512,7 +512,7 @@ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"> - <include-form name="FindPurchaseInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="FindPurchaseInvoicesByDueDate" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> <section> <condition> @@ -520,7 +520,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"> - <include-form name="ListInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="ListInvoicesByDueDate" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> Modified: ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml?rev=828868&r1=828867&r2=828868&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml Thu Oct 22 21:57:30 2009 @@ -40,7 +40,7 @@ <include-form name="FindApPayments" location="component://accounting/widget/ap/forms/VendorForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="ListPayments" location="component://accounting/widget/PaymentForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -62,7 +62,7 @@ <section> <widgets> <screenlet title="${uiLabelMap.AccountingNewPaymentOutgoing}"> - <include-form name="NewPaymentOut" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="NewPaymentOut" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |