svn commit: r616045 [1/2] - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: mrisaliti
Date: Mon Jan 28 13:21:33 2008 New Revision: 616045 URL: http://svn.apache.org/viewvc?rev=616045&view=rev Log: Costs/Fixed Assets/Fin Account/Invoice Item Type/Payment Method Type forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1603) Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/CostForms.xml ofbiz/trunk/applications/accounting/widget/CostScreens.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeForms.xml ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Mon Jan 28 13:21:33 2008 @@ -498,6 +498,8 @@ PageTitleEditFixedAsset=Edit Fixed Asset PageTitleEditFixedAssetIdents=Edit Fixed Asset Idents PageTitleEditFixedAssetMaintenance=Edit Fixed Asset Maintenance +PageTitleEditFixedAssetMaintMeters=Edit Fixed Asset Maint Meters +PageTitleEditFixedAssetMaintOrders=Edit Fixed Asset Maint Orders PageTitleEditFixedAssetRegistrations=Edit Fixed Asset Registrations PageTitleEditFixedAssetStdCost=Edit Fixed Asset Standard Cost PageTitleEditGlAccount=Edit GL Account @@ -511,7 +513,6 @@ PageTitleFindInvoice=Find Invoice PageTitleFindPayment=Find Payment PageTitleFixedAssetDepreciationReport=Fixed Asset Depreciation Report -PageTitleInvoiceItemType=List Invoice Item Type PageTitleInvoiceOverview=Invoice Overview PageTitleListAccounts=List Accounts PageTitleListAgreement=List Agreement @@ -522,11 +523,19 @@ PageTitleListAgreementItemTerms=List Agreement Item Terms PageTitleListAgreementPromoAppls=List Agreement Promo Appls PageTitleListAgreementTerms=List Agreement Terms +PageTitleListFinAccountRoles=List Fin Account Roles +PageTitleListFinAccountTrans=List Fin Account Trans +PageTitleListFinAccountAuths=List Fin Account Auths PageTitleListFixedAssets=List Fixed Assets +PageTitleListPartyFixedAssetAssignments=List Party Fixed Asset Assignments PageTitleListFixedAssetChildren=Fixed Asset Children PageTitleListFixedAssetCalendar=List Fixed Asset Calendar +PageTitleListFixedAssetIdents=List Fixed Asset Idents PageTitleListFixedAssetMaints=List Fixed Asset Maints +PageTitleListFixedAssetMaintMeters=List Fixed Asset Maint Meters +PageTitleListFixedAssetMaintOrders=List Fixed Asset Maint Orders PageTitleListFixedAssetProducts=List Fixed Asset Products +PageTitleListFixedAssetRegistrations=List Fixed Asset Registrations PageTitleListFixedAssetStdCosts=List Fixed Asset Standard Costs PageTitleListEditInvoiceApplications=List Edit Invoice Applications PageTitleListInvoices=List Invoices @@ -848,7 +857,6 @@ FormFieldTitle_lastInvoiceRestartDate=Last Invoice Restart Date FormFieldTitle_lastQuoteNumber=Last Quote Number FormFieldTitle_conversionFactor=Rate -FormFieldTitle_invoiceItemTypeId=Sales Invoice Item Type FormFieldTitle_defaultGlAccountId=Default Gl Account Id FormFieldTitle_activeGlDescription=Active Gl Description FormFieldTitle_voucherRef=Voucher Ref Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Mon Jan 28 13:21:33 2008 @@ -121,6 +121,7 @@ AccountingCreateBillingAccountRolePermissionError=Errore Sicurezza : per eseguire createBillingAccountRole tu devi avere il permesso ACCOUNTING_CREATE o ACCOUNTING_ADMIN AccountingCreateBillingAccountTerm=Creare Termine Conto Fatturazione AccountingCreateBillingAccountTermPermissionError=Errore Sicurezza : per eseguire createBillingAccountTerm tu devi avere il permesso ACCOUNTING_CREATE o ACCOUNTING_ADMIN +AccountingCreateCostComponentCalc=Creare Nuovo Calcolo Costo Componente AccountingCreateNewCreditCard=Creare Nuova Carta Credito AccountingCreateNewEftAccount=Creare Nuovo Conto EFT AccountingCreateNewInvoice=Nuova fatture @@ -163,6 +164,7 @@ AccountingFixedAsset=Cespite AccountingFixedAssetCalendar=Calendario AccountingFixedAssetChildren=Figli +AccountingFixedAssetDepreciation=Svalutazioni AccountingFixedAssetEdit=Crea/Aggiorna Cespite AccountingFixedAssetId=Codice Cespite AccountingFixedAssetName=Nome Cespite @@ -185,6 +187,7 @@ AccountingFixedAssetMaintMeters=Lettura Contatore AccountingFixedAssetMaintMeterValue=Valore Contatore AccountingFixedAssetMessage1=*) vuoto, ma al massimo della capacit\u00e0 mostrate per il cespite +AccountingFixedAssetMaintOrders=Ordini di Acquisto AccountingFromParty=Dal Soggetto AccountingFromPartyId=Dal Codice Soggetto AccountingFX=Tasso Cambi Valuta @@ -217,6 +220,7 @@ AccountingInvoiceItem=Riga Fattura AccountingInvoiceItemAdd=Aggiungi una nuova Riga fattura AccountingInvoiceItemSeqId=N.Riga +AccountingInvoiceItemType=Tipo Riga Fattura AccountingInvoiceItems=Righe AccountingInvoiceOverview=Visione AccountingInvoicePaid=Pagato @@ -242,8 +246,10 @@ AccountingItemNr=Nr.Riga AccountingLastNameCard=Cognome sulla Carta AccountingLiabilities=Debiti +AccountingListPaymentMethodType=Lista Tipi Metodo di Pagamento AccountingListInvoices=Lista Fatture AccountingListInvoicesNotYetApplied=Possibili fatture da applicare +AccountingListInvoiceItemType=Lista Tipi Riga Fattura AccountingListPaymentsNotYetApplied=Possibili pagamenti da applicare AccountingLineTotal=Totale Riga AccountingLeaveEmptyForMaximumAmount=Lascia vuoto per importo massimo @@ -428,6 +434,8 @@ PageTitleEditFixedAsset=Aggiorna Cespite PageTitleEditFixedAssetIdents=Aggiorna Identit\u00e0 Cespite PageTitleEditFixedAssetMaintenance=Aggiorna Manutenzione Cespite +PageTitleEditFixedAssetMaintMeters=Aggiorna Manutenzione Cespite Contatori +PageTitleEditFixedAssetMaintOrders=Aggiorna Manutenzione Cespite Ordine PageTitleEditFixedAssetRegistrations=Aggiorna Registrazioni Cespite PageTitleEditFixedAssetStdCost=Aggiorna Costi Standard Cespiti PageTitleEditGlAccount=Aggiorna Conto Contabilit\u00e0 Generale @@ -440,6 +448,7 @@ PageTitleFindGlobalGlAccount=Ricerca Conto Contabilit\u00e0 Generale Globale PageTitleFindInvoice=Ricerca Fattura PageTitleFindPayment=Ricerca Pagamento +PageTitleFixedAssetDepreciationReport=Report Svalutazione Cespiti PageTitleInvoiceOverview=Visione Fattura PageTitleListAccounts=Lista Conti PageTitleListAgreement=Lista Contratti @@ -450,11 +459,19 @@ PageTitleListAgreementItemTerms=Lista Termini Riga Contratto PageTitleListAgreementPromoAppls=Lista Applicazioni Promozionali Contratto PageTitleListAgreementTerms=Lista Termini Contratto +PageTitleListFinAccountRoles=Lista Ruoli Conto Finanziario +PageTitleListFinAccountTrans=Lista Transazioni Conto Finanziario +PageTitleListFinAccountAuths=Lista Autorizzazioni Conto Finanziario PageTitleListFixedAssets=Lista Cespiti +PageTitleListPartyFixedAssetAssignments=Lista Assegnazioni Soggetto Cespite PageTitleListFixedAssetChildren=Figli Cespiti PageTitleListFixedAssetCalendar=Lista Calendario Cespite +PageTitleListFixedAssetIdents=Lista Identificazione Cespiti PageTitleListFixedAssetMaints=Lista Manutenzioni Cespiti +PageTitleListFixedAssetMaintMeters=Lista Manutenzioni Cespiti Contatori +PageTitleListFixedAssetMaintOrders=Lista Manutenzioni Cespiti Ordini PageTitleListFixedAssetProducts=Lista Prodotti Cespite +PageTitleListFixedAssetRegistrations=Lista Registrazioni Cespiti PageTitleListFixedAssetStdCosts=Lista Costi Standard Cespite PageTitleListEditInvoiceApplications=Aggiorna Applicazioni Fattura PageTitleListInvoices=Lista Fatture @@ -755,7 +772,6 @@ FormFieldTitle_lastInvoiceRestartDate=Ultima Data di Riavvia Fattura FormFieldTitle_lastQuoteNumber=Ultimo Numero Preventivo FormFieldTitle_conversionFactor=Tasso -FormFieldTitle_invoiceItemTypeId=Riga Tipo Ordine Vendita FormFieldTitle_defaultGlAccountId=Default Conto Gl FormFieldTitle_activeGlDescription=Attiva Descrizione Gl FormFieldTitle_voucherRef=Riferimento Voucher 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=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Mon Jan 28 13:21:33 2008 @@ -21,8 +21,8 @@ <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="fixedAssets" paginate-target="ListFixedAssets"> - + <form name="ListFixedAssets" type="list" list-name="fixedAssets" paginate-target="ListFixedAssets" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="fixedAssetId" widget-style="linktext"> <hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/> </field> @@ -38,7 +38,8 @@ </form> <!-- create and update a fixed asset --> - <form name="EditFixedAsset" type="single" target="updateFixedAsset" title="" default-map-name="fixedAsset"> + <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"/> @@ -92,8 +93,8 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListFixedAssetProducts" type="list" list-name="fixedAssetProducts" target="updateFixedAssetProduct"> - + <form name="ListFixedAssetProducts" type="list" list-name="fixedAssetProducts" target="updateFixedAssetProduct" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="productId" title="${uiLabelMap.AccountingProduct}"><display-entity entity-name="Product" description="${description}[${productId}]"/></field> <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity entity-name="FixedAssetProductType"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> @@ -107,8 +108,8 @@ </form> <!-- create and update a product on a fixed asset --> - <form name="AddFixedAssetProduct" type="single" target="addFixedAssetProduct" title="" default-map-name="fixedAssetProduct"> - + <form name="AddFixedAssetProduct" type="single" target="addFixedAssetProduct" title="" default-map-name="fixedAssetProduct" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="addFixedAssetProduct" map-name="fixedAssetProduct"/> <field name="fixedAssetId"><hidden/></field> @@ -133,7 +134,6 @@ <!-- list availability/occupation period on a fixed asset --> <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> <field name="Monday" title="${uiLabelMap.CommonEmptyHeader}"><display/></field> @@ -152,15 +152,16 @@ <field name="SundayData" title="${uiLabelMap.CommonSunday}" widget-style="calendarContent"><display/></field> </form> <!-- update the availability on a date basis of a fixed asset --> - <form name="updateFixedAssetCalendar" type="single" target="updateFixedAssetCalendar" title="Update the fixed Asset calendar" default-map-name="fixedAssetCalendar"> - + <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"> <auto-fields-service service-name="updateFixedAssetCalendar" map-name="parameters"/> <field name="fixedAssetId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListFixedAssetStdCosts" list-name="fixedAssetStdCosts" type="list" target="updateFixedAssetStdCost" title="" paginate-target="EditFixedAssetStdCosts"> + <form name="ListFixedAssetStdCosts" list-name="fixedAssetStdCosts" type="list" target="updateFixedAssetStdCost" title="" paginate-target="EditFixedAssetStdCosts" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetStdCost"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -186,7 +187,8 @@ </field> <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"> + <form name="EditFixedAssetStdCost" type="single" target="createFixedAssetStdCost" title="" default-map-name="fixedAssetStdCost" + 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}"> @@ -207,7 +209,8 @@ </form> <!-- List all fixed asset idents --> - <form name="ListFixedAssetIdents" type="list" list-name="fixedAssetIdents" target="updateFixedAssetIdent"> + <form name="ListFixedAssetIdents" type="list" list-name="fixedAssetIdents" target="updateFixedAssetIdent" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetIdent"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -227,7 +230,8 @@ </form> <!-- create a fixed asset Idents--> - <form name="AddFixedAssetIdent" type="single" target="createFixedAssetIdent" title=""> + <form name="AddFixedAssetIdent" type="single" target="createFixedAssetIdent" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFixedAssetIdent" /> <field name="fixedAssetId"><hidden/></field> <field name="fixedAssetIdentTypeId" title="${uiLabelMap.AccountingFixedAssetIdentType}"> @@ -242,7 +246,8 @@ </form> <!-- List all fixed asset Registration --> - <form name="ListFixedAssetRegistrations" type="list" list-name="fixedAssetRegistrations" target="updateFixedAssetRegistration"> + <form name="ListFixedAssetRegistrations" type="list" list-name="fixedAssetRegistrations" target="updateFixedAssetRegistration" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetRegistration"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -262,7 +267,8 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- create a fixed asset Registration--> - <form name="AddFixedAssetRegistration" type="single" target="createFixedAssetRegistration" title=""> + <form name="AddFixedAssetRegistration" type="single" target="createFixedAssetRegistration" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFixedAssetRegistration" /> <field name="fixedAssetId"><hidden/></field> <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20"/></field> @@ -271,7 +277,8 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- list all Fixed Asset Maintenance--> - <form name="ListFixedAssetMaints" type="list" list-name="fixedAssetMaints"> + <form name="ListFixedAssetMaints" type="list" list-name="fixedAssetMaints" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetMaint"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -289,7 +296,8 @@ <field name="intervalUomId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"><display/></field> <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field> </form> - <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaint" title=""> + <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaint" title="" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="fixedAssetMaint==null" target="createFixedAssetMaint"/> <auto-fields-service service-name="updateFixedAssetMaint"/> <field name="fixedAssetId"><hidden/></field> @@ -349,7 +357,8 @@ </form> <!-- List all fixed asset Maintenance Meter --> - <form name="ListFixedAssetMaintMeters" type="list" list-name="fixedAssetMaintMeters" target="updateFixedAssetMaintMeter"> + <form name="ListFixedAssetMaintMeters" type="list" list-name="fixedAssetMaintMeters" target="updateFixedAssetMaintMeter" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetMaintMeter"> <condition-list combine="and"> @@ -373,7 +382,8 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- create a fixed asset MaintMeter--> - <form name="AddFixedAssetMaintMeter" type="single" target="createFixedAssetMaintMeter" title=""> + <form name="AddFixedAssetMaintMeter" type="single" target="createFixedAssetMaintMeter" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFixedAssetMaintMeter" /> <field name="fixedAssetId"><hidden/></field> <field name="maintHistSeqId"><hidden/></field> @@ -388,7 +398,8 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- List all fixed asset Maintenance Order --> - <form name="ListFixedAssetMaintOrders" type="list" list-name="fixedAssetMaintOrders" target="updateFixedAssetMaintOrder"> + <form name="ListFixedAssetMaintOrders" type="list" list-name="fixedAssetMaintOrders" target="updateFixedAssetMaintOrder" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetMaintOrder" list-name="fixedAssetMaintOrders"> <condition-list combine="and"> @@ -410,7 +421,8 @@ </field> </form> <!-- create and update a Order on a fixed asset --> - <form name="AddFixedAssetMaintOrder" type="single" target="createFixedAssetMaintOrder" title="" default-map-name="fixedAssetMaintOrder"> + <form name="AddFixedAssetMaintOrder" type="single" target="createFixedAssetMaintOrder" title="" default-map-name="fixedAssetMaintOrder" + header-row-style="header-row" default-table-style="basic-table"> <field name="fixedAssetId"><hidden/></field> <field name="maintHistSeqId"><hidden/></field> <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> @@ -419,7 +431,8 @@ </form> <!-- =====================Party Fixed Asset Assignment Forms============== --> - <form name="ListPartyFixedAssetAssignments" type="list" list-name="listPartyFixedAssets" target="updatePartyFixedAssetAssignment"> + <form name="ListPartyFixedAssetAssignments" type="list" list-name="listPartyFixedAssets" target="updatePartyFixedAssetAssignment" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartyFixedAssetAssignment" list-name="listPartyFixedAssets"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -455,7 +468,8 @@ </field> </form> - <form name="AddPartyFixedAssetAssignment" type="single" target="createPartyFixedAssetAssignment"> + <form name="AddPartyFixedAssetAssignment" type="single" target="createPartyFixedAssetAssignment" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createPartyFixedAssetAssignment"/> <field name="fixedAssetId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> @@ -478,4 +492,4 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/CostForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostForms.xml?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CostForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CostForms.xml Mon Jan 28 13:21:33 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListCostComponentCalc" type="list" list-name="allCostComponentCalcs" use-row-submit="true" target="updateCostComponentCalc"> + <form name="ListCostComponentCalc" type="list" list-name="allCostComponentCalcs" use-row-submit="true" target="updateCostComponentCalc" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="CostComponentCalc" default-field-type="display"/> <field name="costComponentCalcId" widget-style="buttontext"></field> <field name="costGlAccountTypeId"> @@ -39,7 +40,8 @@ <hyperlink target="deleteCostComponentCalc?costComponentCalcId=${costComponentCalcId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="AddCostComponentCalc" type="single" target="createCostComponentCalc"> + <form name="AddCostComponentCalc" type="single" target="createCostComponentCalc" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createCostComponentCalc"/> <field name="costGlAccountTypeId"> <drop-down allow-empty="false"> Modified: ofbiz/trunk/applications/accounting/widget/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostScreens.xml?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CostScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CostScreens.xml Mon Jan 28 13:21:33 2008 @@ -25,7 +25,6 @@ <actions> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> - <set field="title" value="Edit cost component calc information"/> <set field="tabButtonItem" value="Costs"/> <set field="titleProperty" value="PageTitleEditCostCalcs"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -37,21 +36,37 @@ <widgets> <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="head1">${uiLabelMap.ManufacturingManageCostComponentCalc}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ManufacturingManageCostComponentCalc} ${uiLabelMap.ManufacturingListCostComponentCalc}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListCostComponentCalc" location="component://accounting/widget/CostForms.xml"/> + </widgets> + </section> + </container> </container> - <container> - <label style="head2">${uiLabelMap.ManufacturingListCostComponentCalc}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingCreateCostComponentCalc}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddCostComponentCalc" location="component://accounting/widget/CostForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ListCostComponentCalc" location="component://accounting/widget/CostForms.xml"/> - <container> - <label style="head2">${uiLabelMap.AccountingCreateCostComponentCalc}</label> - </container> - <include-form name="AddCostComponentCalc" location="component://accounting/widget/CostForms.xml"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> - +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Mon Jan 28 13:21:33 2008 @@ -20,8 +20,9 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - - <form name="FindFinAccounts" type="single" target="FindFinAccount"> + + <form name="FindFinAccounts" type="single" target="FindFinAccount" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="FinAccount" default-field-type="find"/> <field name="finAccountId"><text-find default-option="contains" ignore-case="true"/></field> <field name="finAccountTypeId"> @@ -37,7 +38,8 @@ <field name="noConditionFind"><hidden value="Y"/></field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListFinAccounts" type="list" separate-columns="true" default-entity-name="FinAccount" list-name="listIt" paginate-target="FindFinAccount" paginate="true"> + <form name="ListFinAccounts" type="list" separate-columns="true" default-entity-name="FinAccount" list-name="listIt" paginate-target="FindFinAccount" paginate="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -52,8 +54,9 @@ <hyperlink target="deleteFinAccount?finAccountId=${finAccountId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - - <form name="EditFinAccount" type="single" target="updateFinAccount" default-map-name="finAccount"> + + <form name="EditFinAccount" type="single" target="updateFinAccount" default-map-name="finAccount" + header-row-style="header-row" default-table-style="basic-table"> <actions> <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> <field-map field-name="statusId" env-name="finAccount.statusId"/> @@ -109,8 +112,9 @@ <field name="actualBalance"><display/></field> <field name="availableBalance"><display/></field> </form> - - <form name="ListFinAccountRoles" type="list" list-name="finAccountRoles" target="updateFinAccountRole" separate-columns="true"> + + <form name="ListFinAccountRoles" type="list" list-name="finAccountRoles" target="updateFinAccountRole" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FinAccountRole"> <condition-expr field-name="finAccountId" env-name="finAccountId"/> @@ -128,7 +132,8 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="AddFinAccountRole" type="single" target="createFinAccountRole"> + <form name="AddFinAccountRole" type="single" target="createFinAccountRole" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFinAccountRole"/> <field name="finAccountId"><hidden/></field> <field name="partyId"> <lookup target-form-name="LookupPartyName"/></field> @@ -143,8 +148,9 @@ <field name="thruDate"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - - <form name="ListFinAccountTransactions" type="list" list-name="finAccountTransactions" separate-columns="true"> + + <form name="ListFinAccountTransactions" type="list" list-name="finAccountTransactions" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FinAccountTrans"> <condition-expr field-name="finAccountId" env-name="finAccountId"/> @@ -155,7 +161,8 @@ <field name="finAccountTransId"><display/></field> <field name="finAccountTransTypeId"><display-entity entity-name="FinAccountTransType" description="${description}"/></field> </form> - <form name="AddFinAccountTrans" type="single" target="createFinAccountTrans"> + <form name="AddFinAccountTrans" type="single" target="createFinAccountTrans" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFinAccountTrans"/> <field name="finAccountId"><hidden/></field> <field name="finAccountTransId"><hidden/></field> @@ -170,11 +177,12 @@ <field name="transactionDate"> <date-time/> </field> <field name="entryDate"><date-time/></field> <field name="paymentId"><lookup target-form-name="LookupPayment"/></field> - <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> + <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListFinAccountAuths" type="list" list-name="finAccountauths" target="expireFinAccountAuth" separate-columns="true"> + <form name="ListFinAccountAuths" type="list" list-name="finAccountauths" target="expireFinAccountAuth" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FinAccountAuth"> <condition-expr field-name="finAccountId" env-name="finAccountId"/> @@ -189,7 +197,8 @@ description="${uiLabelMap.CommonExpire}" also-hidden="false"/> </field> </form> - <form name="AddFinAccountAuth" type="single" target="createFinAccountAuth"> + <form name="AddFinAccountAuth" type="single" target="createFinAccountAuth" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFinAccountAuth"/> <field name="finAccountId"><hidden/></field> <field name="finAccountAuthId"><hidden/></field> @@ -199,4 +208,4 @@ <field name="thruDate"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Mon Jan 28 13:21:33 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +In<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -53,7 +53,7 @@ </widgets> </section> </screen> - + <screen name="FindFinAccount"> <section> <actions> @@ -65,20 +65,43 @@ <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="head1" text="${uiLabelMap.AccountingFindFinAccount}"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingFindFinAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"> + <link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/> + </container> + <include-form name="FindFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> </container> - <container style="button-bar"> - <link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingFindFinAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="FindFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/> - <include-form name="ListFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> - + <screen name="EditFinAccount"> <section> <actions> @@ -93,16 +116,24 @@ <decorator-section name="body"> <section> <widgets> - <label style="head1" text="${uiLabelMap.AccountingEditFinAccount}"/> - <section> - <condition><not><if-empty field-name="finAccountId"/></not></condition> - <widgets> - <container style="button-bar"> - <link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingEditFinAccount}"/> </container> - </widgets> - </section> - <include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/> + </container> + <container style="screenlet-body"> + <section> + <condition><not><if-empty field-name="finAccountId"/></not></condition> + <widgets> + <container style="button-bar"> + <link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/> + </container> + </widgets> + </section> + <include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/> + </container> + </container> </widgets> </section> </decorator-section> @@ -110,7 +141,7 @@ </widgets> </section> </screen> - + <screen name="EditFinAccountRoles"> <section> <actions> @@ -125,16 +156,40 @@ <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <label style="head1" text="${uiLabelMap.PageTitleEditFinAccountRole} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]"/> -<!-- <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container> --> - <include-form name="AddFinAccountRole" location="component://accounting/widget/FinAccountForms.xml"/> - <include-form name="ListFinAccountRoles" location="component://accounting/widget/FinAccountForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFinAccountRole} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFinAccountRole" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFinAccountRoles}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFinAccountRoles" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> - + <screen name="EditFinAccountTrans"> <section> <actions> @@ -147,16 +202,40 @@ <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <label style="head1" text="${uiLabelMap.PageTitleEditFinAccountTrans} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]"/> -<!-- <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container> --> - <include-form name="AddFinAccountTrans" location="component://accounting/widget/FinAccountForms.xml"/> - <include-form name="ListFinAccountTransactions" location="component://accounting/widget/FinAccountForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFinAccountTrans} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFinAccountTrans" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFinAccountTrans}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFinAccountTransactions" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> - + <screen name="EditFinAccountAuths"> <section> <actions> @@ -170,14 +249,37 @@ <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <label style="head1" text="${uiLabelMap.PageTitleEditFinAccountAuths} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]"/> -<!-- <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container> --> - <include-form name="AddFinAccountAuth" location="component://accounting/widget/FinAccountForms.xml"/> - <include-form name="ListFinAccountAuths" location="component://accounting/widget/FinAccountForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFinAccountAuths} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFinAccountAuth" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFinAccountAuths}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFinAccountAuths" location="component://accounting/widget/FinAccountForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> - </screens> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Mon Jan 28 13:21:33 2008 @@ -37,12 +37,23 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.AccountingFixedAssets}</label></container> - <container> - <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingFixedAssets}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container> + <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/> + </container> + <include-form name="ListFixedAssets" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> </container> - <container></container> - <include-form name="ListFixedAssets" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -61,9 +72,21 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.AccountingFixedAssetEdit}</label></container> - <container><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/></container> - <include-form name="EditFixedAsset" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingFixedAssetEdit}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/></container> + <include-form name="EditFixedAsset" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -92,9 +115,34 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListFixedAssetProducts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <container><label style="head1">${uiLabelMap.AccountingFixedAssetProductNew}</label></container> - <include-form name="AddFixedAssetProduct" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetProducts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssetProducts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingFixedAssetProductNew}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFixedAssetProduct" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -116,21 +164,28 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=-3" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonQuarter}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=-1" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonMonth}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}" text="${uiLabelMap.CommonThis} ${uiLabelMap.CommonMonth}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=1" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonMonth}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=3" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonQuarter}" style="buttontext"/> - </container> - <include-form name="listFixedAssetCalendar" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <label text="${uiLabelMap.AccountingFixedAssetMessage1}"></label> - <!-- - <container> - <label style="head1">${uiLabelMap.AccountingUpdateAvailability}</label> - <include-form name="updateFixedAssetCalendar" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetCalendar}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"> + <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=-3" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonQuarter}" style="buttontext"/> + <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=-1" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonMonth}" style="buttontext"/> + <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}" text="${uiLabelMap.CommonThis} ${uiLabelMap.CommonMonth}" style="buttontext"/> + <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=1" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonMonth}" style="buttontext"/> + <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=3" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonQuarter}" style="buttontext"/> + </container> + <include-form name="listFixedAssetCalendar" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <label text="${uiLabelMap.AccountingFixedAssetMessage1}"></label> + </widgets> + </section> + </container> </container> - --> </decorator-section> </decorator-screen> </widgets> @@ -140,7 +195,7 @@ <screen name="EditFixedAssetStdCosts"> <section> <actions> - <set field="titleProperty" value="PageTitleEditFixedAssetStdCost"/> + <set field="titleProperty" value="PageTitleEditFixedAssetStdCosts"/> <set field="tabButtonItem" value="EditFixedAssetStdCosts"/> <set field="labelTitleProperty" value="PageTitleEditFixedAssetStdCosts"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> @@ -151,8 +206,34 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListFixedAssetStdCosts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <include-form name="EditFixedAssetStdCost" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetStdCosts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssetStdCosts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFixedAssetStdCost}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditFixedAssetStdCost" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -173,10 +254,34 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"><label/></container> - <include-form name="ListFixedAssetIdents" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <container style="button-bar"><label/></container> - <include-form name="AddFixedAssetIdent" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetIdents}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssetIdents" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFixedAssetIdents}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFixedAssetIdent" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -196,10 +301,34 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"><label/></container> - <include-form name="ListFixedAssetRegistrations" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <container style="button-bar"><label/></container> - <include-form name="AddFixedAssetRegistration" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetRegistrations}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssetRegistrations" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFixedAssetRegistrations}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFixedAssetRegistration" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -219,8 +348,21 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"><link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container> - <include-form name="ListFixedAssetMaints" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetMaints}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"><link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container> + <include-form name="ListFixedAssetMaints" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -242,8 +384,21 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container> - <include-form name="EditFixedAssetMaint" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFixedAssetMaintenance}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container> + <include-form name="EditFixedAssetMaint" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -253,7 +408,7 @@ <screen name="EditFixedAssetMaintMeters"> <section> <actions> - <set field="titleProperty" value="PageTitleEditFixedAssetMaintenance"/> + <set field="titleProperty" value="PageTitleEditFixedAssetMaintMeters"/> <set field="tabButtonItem" value="ListFixedAssetMaints"/> <set field="tabButtonItemFixedAssetMaint" value="EditFixedAssetMaintMeters"/> <set field="labelTitleProperty" value="PageTitleEditFixedAssetMaintenance"/> @@ -265,8 +420,34 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListFixedAssetMaintMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <include-form name="AddFixedAssetMaintMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetMaintMeters}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssetMaintMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFixedAssetMaintMeters}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFixedAssetMaintMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -287,7 +468,20 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-tree name="TreeFixedAsset" location="component://accounting/widget/AccountingTrees.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetChildren}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-tree name="TreeFixedAsset" location="component://accounting/widget/AccountingTrees.xml" /> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -297,7 +491,7 @@ <screen name="EditFixedAssetMaintOrders"> <section> <actions> - <set field="titleProperty" value="PageTitleEditFixedAssetMaintenance"/> + <set field="titleProperty" value="PageTitleEditFixedAssetMaintOrders"/> <set field="tabButtonItem" value="ListFixedAssetMaints"/> <set field="tabButtonItemFixedAssetMaint" value="EditFixedAssetMaintOrders"/> <set field="labelTitleProperty" value="PageTitleEditFixedAssetMaintenance"/> @@ -312,8 +506,34 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListFixedAssetMaintOrders" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <include-form name="AddFixedAssetMaintOrder" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListFixedAssetMaintOrders}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssetMaintOrders" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFixedAssetMaintOrders}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFixedAssetMaintOrder" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -336,10 +556,34 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"><label/></container> - <include-form name="ListPartyFixedAssetAssignments" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <container style="button-bar"><label/></container> - <include-form name="AddPartyFixedAssetAssignment" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListPartyFixedAssetAssignments}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListPartyFixedAssetAssignments" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditPartyFixedAssetAssignments}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddPartyFixedAssetAssignment" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -361,9 +605,22 @@ <decorator-section name="body"> <section> <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/fixedasset/DepreciationReport.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFixedAssetDepreciationReport}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://accounting/webapp/accounting/fixedasset/DepreciationReport.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> + </container> </widgets> </section> </decorator-section> @@ -371,4 +628,4 @@ </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeForms.xml?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeForms.xml Mon Jan 28 13:21:33 2008 @@ -21,7 +21,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListInvoiceItemType" type="list" target="updateInvoiceItemType" list-name="invoiceItemTypes"> + <form name="ListInvoiceItemType" type="list" target="updateInvoiceItemType" list-name="invoiceItemTypes" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="invoiceItemTypeId" title="InvoiceItemTypeId"><display/></field> <field name="description"><display/></field> <field name="defaultGlAccountId" title="${uiLabelMap.ProductGlAccount}" parameter-name="defaultGlAccountId"> @@ -32,6 +33,5 @@ </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - + </form> </forms> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml?rev=616045&r1=616044&r2=616045&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml Mon Jan 28 13:21:33 2008 @@ -24,7 +24,7 @@ <screen name="EditInvoiceItemType"> <section> <actions> - <set field="titleProperty" value="PageTitleInvoiceItemType"/> + <set field="titleProperty" value="AccountingListInvoiceItemType"/> <set field="tabButtonItem" value="InvoiceItemTypes"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> @@ -35,12 +35,23 @@ <widgets> <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.AccountingListInvoiceItemType}</label></container> - <include-form name="ListInvoiceItemType" location="component://accounting/widget/InvoiceItemTypeForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingListInvoiceItemType}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListInvoiceItemType" location="component://accounting/widget/InvoiceItemTypeForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> - </screen> - + </screen> </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |